Granite

Merge lp:~leonardolemos/granite/bump-years into lp:~elementary-pantheon/granite/granite

  1. bump-years
  2. Merge into granite
Proposed by Leonardo Lemos
Status: Merged
Approved by: Cody Garver
Approved revision: 1021
Merged at revision: 1022
Proposed branch: lp:~leonardolemos/granite/bump-years
Merge into: lp:~elementary-pantheon/granite/granite
Diff against target: 390 lines (+48/-48)
15 files modified
lib/Services/Logger.vala (+25/-25)
lib/Widgets/AboutDialog.vala (+2/-2)
lib/Widgets/AlertView.vala (+1/-1)
lib/Widgets/Avatar.vala (+1/-1)
lib/Widgets/CellRendererExpander.vala (+1/-1)
lib/Widgets/DecoratedWindow.vala (+1/-1)
lib/Widgets/LightWindow.vala (+1/-1)
lib/Widgets/SidebarPaned.vala (+1/-1)
lib/Widgets/StatusBar.vala (+1/-1)
lib/Widgets/StorageBar.vala (+1/-1)
lib/Widgets/Toast.vala (+9/-9)
lib/Widgets/Utils.vala (+1/-1)
lib/Widgets/WelcomeButton.vala (+1/-1)
lib/Widgets/WrapLabel.vala (+1/-1)
lib/style-classes.vala (+1/-1)
To merge this branch: bzr merge lp:~leonardolemos/granite/bump-years
Reviewer Review Type Date Requested Status
elementary Pantheon team Pending
Review via email: mp+313944@code.launchpad.net

Commit message

Add 2017 to license copyright and app years.

Description of the change

Add 2017 to license copyright and app years.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/Services/Logger.vala'
2--- lib/Services/Logger.vala 2015-08-31 07:30:47 +0000
3+++ lib/Services/Logger.vala 2017-01-01 22:10:10 +0000
4@@ -1,6 +1,6 @@
5 /*
6 * Copyright (C) 2011-2013 Robert Dyer
7- * 2015 elementary LLC, Rico Tzschichholz
8+ * 2015-2017 elementary LLC, Rico Tzschichholz
9 *
10 * This program or library is free software; you can redistribute it
11 * and/or modify it under the terms of the GNU Lesser General Public
12@@ -28,7 +28,7 @@
13 * This level is for use in debugging.
14 */
15 DEBUG,
16-
17+
18 /**
19 * This level should be used for non-error, non-debugging that is not due to any direct event.
20 */
21@@ -54,7 +54,7 @@
22 */
23 FATAL
24 }
25-
26+
27 enum ConsoleColor {
28 BLACK,
29 RED,
30@@ -65,10 +65,10 @@
31 CYAN,
32 WHITE
33 }
34-
35+
36 /**
37 * This class helps in the use of logs in a Granite application.
38- *
39+ *
40 */
41 public class Logger : GLib.Object {
42 const string[] LOG_LEVEL_TO_STRING = {
43@@ -89,7 +89,7 @@
44
45 /**
46 * This method initializes the Logger
47- *
48+ *
49 * @param app_name name of app that is logging
50 */
51 public static void initialize (string app_name) {
52@@ -98,35 +98,35 @@
53
54 /**
55 * Logs message using Notify level formatting
56- *
57+ *
58 * @param msg message to be logged
59 */
60 public static void notification (string msg) {
61 write (LogLevel.NOTIFY, msg);
62 }
63-
64+
65 static string get_time () {
66 var now = new GLib.DateTime.now_local ();
67 return "%.2d:%.2d:%.2d.%.6d".printf (now.get_hour (), now.get_minute (), now.get_second (), now.get_microsecond ());
68 }
69-
70+
71 static void write (LogLevel level, owned string msg) {
72-
73+
74 if (level < DisplayLevel)
75 return;
76
77 write_mutex.lock ();
78 set_color_for_level (level);
79 stdout.printf ("[%s %s]", LOG_LEVEL_TO_STRING[level], get_time ());
80-
81+
82 reset_color ();
83 stdout.printf (" %s\n", msg);
84
85 write_mutex.unlock ();
86 }
87-
88+
89 static void set_color_for_level (LogLevel level) {
90-
91+
92 switch (level) {
93 case LogLevel.DEBUG:
94 set_foreground (ConsoleColor.GREEN);
95@@ -149,27 +149,27 @@
96 break;
97 }
98 }
99-
100+
101 static void reset_color () {
102 stdout.printf ("\x001b[0m");
103 }
104-
105+
106 static void set_foreground (ConsoleColor color) {
107 set_color (color, true);
108 }
109-
110+
111 static void set_background (ConsoleColor color) {
112 set_color (color, false);
113 }
114-
115+
116 static void set_color (ConsoleColor color, bool isForeground) {
117-
118+
119 var color_code = color + 30 + 60;
120 if (!isForeground)
121 color_code += 10;
122 stdout.printf ("\x001b[%dm", color_code);
123 }
124-
125+
126 static void glib_log_func (string? d, LogLevelFlags flags, string msg) {
127 string domain;
128 if (d != null)
129@@ -192,20 +192,20 @@
130 case LogLevelFlags.LEVEL_CRITICAL:
131 level = LogLevel.FATAL;
132 break;
133-
134+
135 case LogLevelFlags.LEVEL_ERROR:
136 level = LogLevel.ERROR;
137 break;
138-
139+
140 case LogLevelFlags.LEVEL_INFO:
141 case LogLevelFlags.LEVEL_MESSAGE:
142 level = LogLevel.INFO;
143 break;
144-
145+
146 case LogLevelFlags.LEVEL_DEBUG:
147 level = LogLevel.DEBUG;
148 break;
149-
150+
151 case LogLevelFlags.LEVEL_WARNING:
152 default:
153 level = LogLevel.WARN;
154@@ -214,7 +214,7 @@
155
156 write (level, message);
157 }
158-
159+
160 }
161-
162+
163 }
164
165=== modified file 'lib/Widgets/AboutDialog.vala'
166--- lib/Widgets/AboutDialog.vala 2016-09-28 19:47:44 +0000
167+++ lib/Widgets/AboutDialog.vala 2017-01-01 22:10:10 +0000
168@@ -1,5 +1,5 @@
169 /*
170- * Copyright (C) 2011-2016 elementary LLC (https://launchpad.net/granite)
171+ * Copyright (C) 2011-2017 elementary LLC (https://launchpad.net/granite)
172 *
173 * This program or library is free software; you can redistribute it
174 * and/or modify it under the terms of the GNU Lesser General Public
175@@ -23,7 +23,7 @@
176
177 /**
178 * This class makes an about dialog which goes in the App Menu on most apps.
179- *
180+ *
181 * {{../../doc/images/AboutDialog.png}}
182 */
183 public class AboutDialog : Granite.GtkPatch.AboutDialog {
184
185=== modified file 'lib/Widgets/AlertView.vala'
186--- lib/Widgets/AlertView.vala 2016-10-21 19:47:06 +0000
187+++ lib/Widgets/AlertView.vala 2017-01-01 22:10:10 +0000
188@@ -1,5 +1,5 @@
189 /*
190- * Copyright (C) 2012-2015 Granite Developers (https://launchpad.net/granite)
191+ * Copyright (C) 2012-2017 Granite Developers (https://launchpad.net/granite)
192 *
193 * This program or library is free software; you can redistribute it
194 * and/or modify it under the terms of the GNU Lesser General Public
195
196=== modified file 'lib/Widgets/Avatar.vala'
197--- lib/Widgets/Avatar.vala 2015-09-01 21:08:27 +0000
198+++ lib/Widgets/Avatar.vala 2017-01-01 22:10:10 +0000
199@@ -1,5 +1,5 @@
200 /*
201- * Copyright (C) 2015 Granite Developers (https://launchpad.net/granite)
202+ * Copyright (C) 2015-2017 Granite Developers (https://launchpad.net/granite)
203 *
204 * This program or library is free software; you can redistribute it
205 * and/or modify it under the terms of the GNU Lesser General Public
206
207=== modified file 'lib/Widgets/CellRendererExpander.vala'
208--- lib/Widgets/CellRendererExpander.vala 2016-06-09 01:28:31 +0000
209+++ lib/Widgets/CellRendererExpander.vala 2017-01-01 22:10:10 +0000
210@@ -1,5 +1,5 @@
211 /*
212- * Copyright (C) 2012-2013 Granite Developers
213+ * Copyright (C) 2012-2017 Granite Developers
214 *
215 * This program or library is free software; you can redistribute it
216 * and/or modify it under the terms of the GNU Lesser General Public
217
218=== modified file 'lib/Widgets/DecoratedWindow.vala'
219--- lib/Widgets/DecoratedWindow.vala 2016-06-09 01:28:31 +0000
220+++ lib/Widgets/DecoratedWindow.vala 2017-01-01 22:10:10 +0000
221@@ -1,5 +1,5 @@
222 /*
223- * Copyright (C) 2011-2013 Granite Developers
224+ * Copyright (C) 2011-2017 Granite Developers
225 *
226 * This program or library is free software; you can redistribute it
227 * and/or modify it under the terms of the GNU Lesser General Public
228
229=== modified file 'lib/Widgets/LightWindow.vala'
230--- lib/Widgets/LightWindow.vala 2016-06-09 01:28:31 +0000
231+++ lib/Widgets/LightWindow.vala 2017-01-01 22:10:10 +0000
232@@ -1,5 +1,5 @@
233 /*
234- * Copyright (C) 2012-2013 Granite Developers
235+ * Copyright (C) 2012-2017 Granite Developers
236 *
237 * This program or library is free software; you can redistribute it
238 * and/or modify it under the terms of the GNU Lesser General Public
239
240=== modified file 'lib/Widgets/SidebarPaned.vala'
241--- lib/Widgets/SidebarPaned.vala 2016-06-09 01:28:31 +0000
242+++ lib/Widgets/SidebarPaned.vala 2017-01-01 22:10:10 +0000
243@@ -1,5 +1,5 @@
244 /*
245- * Copyright (C) 2011-2013 Granite Developers
246+ * Copyright (C) 2011-2017 Granite Developers
247 *
248 * This program or library is free software; you can redistribute it
249 * and/or modify it under the terms of the GNU Lesser General Public
250
251=== modified file 'lib/Widgets/StatusBar.vala'
252--- lib/Widgets/StatusBar.vala 2016-06-09 01:28:31 +0000
253+++ lib/Widgets/StatusBar.vala 2017-01-01 22:10:10 +0000
254@@ -1,5 +1,5 @@
255 /*
256- * Copyright (C) 2012-2013 Granite Developers
257+ * Copyright (C) 2012-2017 Granite Developers
258 *
259 * This program or library is free software; you can redistribute it
260 * and/or modify it under the terms of the GNU Lesser General Public
261
262=== modified file 'lib/Widgets/StorageBar.vala'
263--- lib/Widgets/StorageBar.vala 2016-07-31 16:14:17 +0000
264+++ lib/Widgets/StorageBar.vala 2017-01-01 22:10:10 +0000
265@@ -1,5 +1,5 @@
266 /*
267- * Copyright (C) 2011-2015 Granite Developers (https://launchpad.net/granite)
268+ * Copyright (C) 2011-2017 Granite Developers (https://launchpad.net/granite)
269 *
270 * This program or library is free software; you can redistribute it
271 * and/or modify it under the terms of the GNU Lesser General Public
272
273=== modified file 'lib/Widgets/Toast.vala'
274--- lib/Widgets/Toast.vala 2016-09-28 18:36:03 +0000
275+++ lib/Widgets/Toast.vala 2017-01-01 22:10:10 +0000
276@@ -1,5 +1,5 @@
277 /*-
278- * Copyright (c) 2016 elementary LLC. (https://elementary.io)
279+ * Copyright (c) 2016-2017 elementary LLC. (https://elementary.io)
280 *
281 * This program is free software: you can redistribute it and/or modify
282 * it under the terms of the Lesser GNU General Public License as published by
283@@ -34,12 +34,12 @@
284
285 /**
286 * Emitted when the Toast is closed by activating the close button
287- */
288+ */
289 public signal void closed ();
290
291 /**
292 * Emitted when the default action button is activated
293- */
294+ */
295 public signal void default_action ();
296
297 private Gtk.Label notification_label;
298@@ -48,7 +48,7 @@
299
300 /**
301 * The notification text label to be displayed inside of #this
302- */
303+ */
304 public string title {
305 get {
306 return _title;
307@@ -63,7 +63,7 @@
308
309 /**
310 * Creates a new Toast with #title as its title
311- */
312+ */
313 public Toast (string title) {
314 Object (title: title);
315 }
316@@ -87,7 +87,7 @@
317 reveal_child = false;
318 closed ();
319 });
320-
321+
322 notification_label = new Gtk.Label (title);
323
324 var notification_box = new Gtk.Grid ();
325@@ -105,8 +105,8 @@
326
327 /**
328 * Sets the default action button label of #this to #label and hides the
329- * button if #label is #null.
330- */
331+ * button if #label is #null.
332+ */
333 public void set_default_action (string? label) {
334 if (label == "" || label == null) {
335 default_action_button.no_show_all = true;
336@@ -120,7 +120,7 @@
337
338 /**
339 * Sends the Toast on behalf of #this
340- */
341+ */
342 public void send_notification () {
343 reveal_child = true;
344 }
345
346=== modified file 'lib/Widgets/Utils.vala'
347--- lib/Widgets/Utils.vala 2016-08-01 21:11:56 +0000
348+++ lib/Widgets/Utils.vala 2017-01-01 22:10:10 +0000
349@@ -1,5 +1,5 @@
350 /*
351- * Copyright (C) 2012-2013 Granite Developers
352+ * Copyright (C) 2012-2017 Granite Developers
353 *
354 * This program or library is free software; you can redistribute it
355 * and/or modify it under the terms of the GNU Lesser General Public
356
357=== modified file 'lib/Widgets/WelcomeButton.vala'
358--- lib/Widgets/WelcomeButton.vala 2016-09-19 22:00:21 +0000
359+++ lib/Widgets/WelcomeButton.vala 2017-01-01 22:10:10 +0000
360@@ -1,5 +1,5 @@
361 /*
362- * Copyright (C) 2014-2015 Granite Developers
363+ * Copyright (C) 2014-2017 Granite Developers
364 *
365 * This program or library is free software; you can redistribute it
366 * and/or modify it under the terms of the GNU Lesser General Public
367
368=== modified file 'lib/Widgets/WrapLabel.vala'
369--- lib/Widgets/WrapLabel.vala 2016-06-09 01:28:31 +0000
370+++ lib/Widgets/WrapLabel.vala 2017-01-01 22:10:10 +0000
371@@ -1,7 +1,7 @@
372 /*
373 * Copyright (C) 2010 troorl <troorl@gmail.com>
374 * Copyright (C) 2011 ammonkey <am.monkeyd@gmail.com>
375- * Copyright (C) 2012-2013 Granite Developers
376+ * Copyright (C) 2012-2017 Granite Developers
377 *
378 * This program or library is free software; you can redistribute it
379 * and/or modify it under the terms of the GNU Lesser General Public
380
381=== modified file 'lib/style-classes.vala'
382--- lib/style-classes.vala 2014-09-04 12:39:00 +0000
383+++ lib/style-classes.vala 2017-01-01 22:10:10 +0000
384@@ -1,5 +1,5 @@
385 /*
386- * Copyright (C) 2012-2013 Granite Developers
387+ * Copyright (C) 2012-2017 Granite Developers
388 *
389 * This program or library is free software; you can redistribute it
390 * and/or modify it under the terms of the GNU Lesser General Public

Subscribers

People subscribed via source and target branches