Software Properties

Merge ~osomon/software-properties:snap-updates-frequency into software-properties:ubuntu/master

  1. Git
  2. lp:~osomon/software-properties
  3. snap-updates-frequency
  4. Merge into ubuntu/master
Proposed by Olivier Tilloy
Status: Merged
Merged at revision: ed8570cf9b6e28f6f1721debd78c9e029c7b0ab6
Proposed branch: ~osomon/software-properties:snap-updates-frequency
Merge into: software-properties:ubuntu/master
Prerequisite: ~osomon/software-properties:updates-refresh
Diff against target: 606 lines (+215/-181)
2 files modified
data/gtkbuilder/main.ui (+188/-158)
po/software-properties.pot (+27/-23)
Reviewer Review Type Date Requested Status
Didier Roche-Tolomelli Approve
Review via email: mp+379346@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

Approving and +1 once the prerequisite branch is ready

review: Approve
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

I tested it in the ppa and I feel the label alignement is a little bit too much to the edge compared to other items (which are right aligned, so hard to compare), wdyt?

review: Needs Information
Revision history for this message
Olivier Tilloy (osomon) wrote :

I agree this looks a bit awkward. I've asked mpt to comment, let's see what he says.

Revision history for this message
Olivier Tilloy (osomon) wrote :

I rebased on the latest updates to the prerequisite branch, and I applied some changes to the spacing and alignment of the updates tab, as requested by mpt:

« First, the menus don’t need to be that wide. (Being that wide suggests
that they contain more complicated items than they really do.) Can you
set a maximum width, enough that all the labels fit (try in German) with
some room to spare? Then the tab contents as a whole can be centered
(maybe setting the left+right margins is a way of doing that), though
with the labels and menus still lined up as they are now.

Second, with the ESM UI, the next label starts “For other packages…”.
This is to emphasise the difference between how updates work for snap
packages (the first line) and how they work for other packages (the next
section). So if/while the ESM UI is not implemented yet, I suggest
achieving the same effect by changing “Subscribed to:” to “For other
packages, subscribe to:”. Incidentally, that will make the connection
between the first and second label more obvious, so the first one will
look less out of place. »

Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

Thanks for rebasing on top of the previous branch.

The changes match mpt’s description. Merging

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/data/gtkbuilder/main.ui b/data/gtkbuilder/main.ui
2index 149954b..c775e16 100644
3--- a/data/gtkbuilder/main.ui
4+++ b/data/gtkbuilder/main.ui
5@@ -522,33 +522,77 @@
6 </packing>
7 </child>
8 <child>
9- <object class="GtkVBox">
10+ <object class="GtkAlignment">
11 <property name="visible">True</property>
12 <property name="can_focus">False</property>
13- <property name="border_width">12</property>
14- <property name="spacing">18</property>
15+ <property name="xscale">0</property>
16+ <property name="xalign">0.5</property>
17 <child>
18- <object class="GtkAlignment">
19+ <object class="GtkVBox">
20 <property name="visible">True</property>
21 <property name="can_focus">False</property>
22- <property name="top_padding">6</property>
23- <property name="left_padding">12</property>
24+ <property name="border_width">12</property>
25+ <property name="spacing">18</property>
26 <child>
27- <object class="GtkVBox">
28+ <object class="GtkLabel">
29 <property name="visible">True</property>
30 <property name="can_focus">False</property>
31- <property name="spacing">6</property>
32+ <property name="label" translatable="yes">Snap package updates are checked routinely and installed automatically.</property>
33+ <property name="xalign">0.5</property>
34+ </object>
35+ <packing>
36+ <property name="expand">False</property>
37+ <property name="fill">False</property>
38+ <property name="position">0</property>
39+ </packing>
40+ </child>
41+ <child>
42+ <object class="GtkAlignment">
43+ <property name="visible">True</property>
44+ <property name="can_focus">False</property>
45+ <property name="top_padding">6</property>
46+ <property name="left_padding">12</property>
47 <child>
48- <object class="GtkHBox">
49+ <object class="GtkVBox">
50 <property name="visible">True</property>
51 <property name="can_focus">False</property>
52 <property name="spacing">6</property>
53 <child>
54- <object class="GtkLabel" id="label_updates_1">
55+ <object class="GtkHBox">
56 <property name="visible">True</property>
57 <property name="can_focus">False</property>
58- <property name="label" translatable="yes">Subscribed to:</property>
59- <property name="xalign">1</property>
60+ <property name="spacing">6</property>
61+ <child>
62+ <object class="GtkLabel" id="label_updates_1">
63+ <property name="visible">True</property>
64+ <property name="can_focus">False</property>
65+ <property name="label" translatable="yes">For other packages, subscribe to:</property>
66+ <property name="xalign">1</property>
67+ </object>
68+ <packing>
69+ <property name="expand">False</property>
70+ <property name="fill">False</property>
71+ <property name="position">0</property>
72+ </packing>
73+ </child>
74+ <child>
75+ <object class="GtkComboBox" id="combobox_updates_subscription">
76+ <property name="visible">True</property>
77+ <property name="can_focus">False</property>
78+ <property name="model">model_updates_subscription</property>
79+ <child>
80+ <object class="GtkCellRendererText"/>
81+ <attributes>
82+ <attribute name="text">0</attribute>
83+ </attributes>
84+ </child>
85+ </object>
86+ <packing>
87+ <property name="expand">False</property>
88+ <property name="fill">True</property>
89+ <property name="position">1</property>
90+ </packing>
91+ </child>
92 </object>
93 <packing>
94 <property name="expand">False</property>
95@@ -557,126 +601,158 @@
96 </packing>
97 </child>
98 <child>
99- <object class="GtkComboBox" id="combobox_updates_subscription">
100+ <object class="GtkHBox">
101 <property name="visible">True</property>
102 <property name="can_focus">False</property>
103- <property name="model">model_updates_subscription</property>
104+ <property name="spacing">6</property>
105 <child>
106- <object class="GtkCellRendererText"/>
107- <attributes>
108- <attribute name="text">0</attribute>
109- </attributes>
110+ <object class="GtkLabel" id="label_updates_2">
111+ <property name="visible">True</property>
112+ <property name="can_focus">False</property>
113+ <property name="label" translatable="yes">Automatically check for updates:</property>
114+ <property name="xalign">1</property>
115+ </object>
116+ <packing>
117+ <property name="expand">False</property>
118+ <property name="fill">False</property>
119+ <property name="position">0</property>
120+ </packing>
121+ </child>
122+ <child>
123+ <object class="GtkComboBox" id="combobox_update_interval">
124+ <property name="visible">True</property>
125+ <property name="can_focus">False</property>
126+ <property name="model">model_updates_interval</property>
127+ <child>
128+ <object class="GtkCellRendererText"/>
129+ <attributes>
130+ <attribute name="text">0</attribute>
131+ </attributes>
132+ </child>
133+ </object>
134+ <packing>
135+ <property name="expand">False</property>
136+ <property name="fill">True</property>
137+ <property name="position">1</property>
138+ </packing>
139 </child>
140- </object>
141- <packing>
142- <property name="expand">True</property>
143- <property name="fill">True</property>
144- <property name="position">1</property>
145- </packing>
146- </child>
147- </object>
148- <packing>
149- <property name="expand">False</property>
150- <property name="fill">False</property>
151- <property name="position">0</property>
152- </packing>
153- </child>
154- <child>
155- <object class="GtkHBox">
156- <property name="visible">True</property>
157- <property name="can_focus">False</property>
158- <property name="spacing">6</property>
159- <child>
160- <object class="GtkLabel" id="label_updates_2">
161- <property name="visible">True</property>
162- <property name="can_focus">False</property>
163- <property name="label" translatable="yes">Automatically check for updates:</property>
164- <property name="xalign">1</property>
165 </object>
166 <packing>
167 <property name="expand">False</property>
168 <property name="fill">False</property>
169- <property name="position">0</property>
170+ <property name="position">1</property>
171 </packing>
172 </child>
173 <child>
174- <object class="GtkComboBox" id="combobox_update_interval">
175+ <object class="GtkHBox">
176 <property name="visible">True</property>
177 <property name="can_focus">False</property>
178- <property name="model">model_updates_interval</property>
179+ <property name="spacing">6</property>
180 <child>
181- <object class="GtkCellRendererText"/>
182- <attributes>
183- <attribute name="text">0</attribute>
184- </attributes>
185+ <object class="GtkLabel" id="label_updates_3">
186+ <property name="visible">True</property>
187+ <property name="can_focus">False</property>
188+ <property name="label" translatable="yes">When there are security updates:</property>
189+ <property name="xalign">1</property>
190+ </object>
191+ <packing>
192+ <property name="expand">False</property>
193+ <property name="fill">False</property>
194+ <property name="position">0</property>
195+ </packing>
196+ </child>
197+ <child>
198+ <object class="GtkComboBox" id="combobox_security_updates">
199+ <property name="visible">True</property>
200+ <property name="can_focus">False</property>
201+ <property name="model">model_security_updates_display_behavior</property>
202+ <child>
203+ <object class="GtkCellRendererText"/>
204+ <attributes>
205+ <attribute name="text">0</attribute>
206+ </attributes>
207+ </child>
208+ </object>
209+ <packing>
210+ <property name="expand">False</property>
211+ <property name="fill">True</property>
212+ <property name="position">1</property>
213+ </packing>
214 </child>
215- </object>
216- <packing>
217- <property name="expand">True</property>
218- <property name="fill">True</property>
219- <property name="position">1</property>
220- </packing>
221- </child>
222- </object>
223- <packing>
224- <property name="expand">False</property>
225- <property name="fill">False</property>
226- <property name="position">1</property>
227- </packing>
228- </child>
229- <child>
230- <object class="GtkHBox">
231- <property name="visible">True</property>
232- <property name="can_focus">False</property>
233- <property name="spacing">6</property>
234- <child>
235- <object class="GtkLabel" id="label_updates_3">
236- <property name="visible">True</property>
237- <property name="can_focus">False</property>
238- <property name="label" translatable="yes">When there are security updates:</property>
239- <property name="xalign">1</property>
240 </object>
241 <packing>
242 <property name="expand">False</property>
243 <property name="fill">False</property>
244- <property name="position">0</property>
245+ <property name="position">2</property>
246 </packing>
247 </child>
248 <child>
249- <object class="GtkComboBox" id="combobox_security_updates">
250+ <object class="GtkHBox">
251 <property name="visible">True</property>
252 <property name="can_focus">False</property>
253- <property name="model">model_security_updates_display_behavior</property>
254+ <property name="spacing">6</property>
255 <child>
256- <object class="GtkCellRendererText"/>
257- <attributes>
258- <attribute name="text">0</attribute>
259- </attributes>
260+ <object class="GtkLabel" id="label_updates_4">
261+ <property name="visible">True</property>
262+ <property name="can_focus">False</property>
263+ <property name="label" translatable="yes">When there are other updates:</property>
264+ <property name="xalign">1</property>
265+ </object>
266+ <packing>
267+ <property name="expand">False</property>
268+ <property name="fill">False</property>
269+ <property name="position">0</property>
270+ </packing>
271+ </child>
272+ <child>
273+ <object class="GtkComboBox" id="combobox_other_updates">
274+ <property name="visible">True</property>
275+ <property name="can_focus">False</property>
276+ <property name="model">model_normal_updates_display</property>
277+ <child>
278+ <object class="GtkCellRendererText"/>
279+ <attributes>
280+ <attribute name="text">0</attribute>
281+ </attributes>
282+ </child>
283+ </object>
284+ <packing>
285+ <property name="expand">False</property>
286+ <property name="fill">True</property>
287+ <property name="position">1</property>
288+ </packing>
289 </child>
290 </object>
291 <packing>
292- <property name="expand">True</property>
293- <property name="fill">True</property>
294- <property name="position">1</property>
295+ <property name="expand">False</property>
296+ <property name="fill">False</property>
297+ <property name="position">3</property>
298 </packing>
299 </child>
300 </object>
301- <packing>
302- <property name="expand">False</property>
303- <property name="fill">False</property>
304- <property name="position">2</property>
305- </packing>
306 </child>
307+ </object>
308+ <packing>
309+ <property name="expand">False</property>
310+ <property name="fill">True</property>
311+ <property name="position">1</property>
312+ </packing>
313+ </child>
314+ <child>
315+ <object class="GtkAlignment" id="alignment15">
316+ <property name="visible">True</property>
317+ <property name="can_focus">False</property>
318+ <property name="left_padding">12</property>
319 <child>
320- <object class="GtkHBox">
321+ <object class="GtkHBox" id="hbox18">
322 <property name="visible">True</property>
323 <property name="can_focus">False</property>
324 <property name="spacing">6</property>
325 <child>
326- <object class="GtkLabel" id="label_updates_4">
327+ <object class="GtkLabel" id="label_updates_5">
328 <property name="visible">True</property>
329 <property name="can_focus">False</property>
330- <property name="label" translatable="yes">When there are other updates:</property>
331+ <property name="label" translatable="yes">Notify me of a new Ubuntu version:</property>
332 <property name="xalign">1</property>
333 </object>
334 <packing>
335@@ -686,88 +762,33 @@
336 </packing>
337 </child>
338 <child>
339- <object class="GtkComboBox" id="combobox_other_updates">
340+ <object class="GtkComboBox" id="combobox_release_upgrades">
341 <property name="visible">True</property>
342 <property name="can_focus">False</property>
343- <property name="model">model_normal_updates_display</property>
344+ <property name="model">model_release_upgrades</property>
345 <child>
346- <object class="GtkCellRendererText"/>
347+ <object class="GtkCellRendererText" id="renderer1"/>
348 <attributes>
349 <attribute name="text">0</attribute>
350 </attributes>
351 </child>
352 </object>
353 <packing>
354- <property name="expand">True</property>
355+ <property name="expand">False</property>
356 <property name="fill">True</property>
357 <property name="position">1</property>
358 </packing>
359 </child>
360 </object>
361- <packing>
362- <property name="expand">False</property>
363- <property name="fill">False</property>
364- <property name="position">3</property>
365- </packing>
366- </child>
367- </object>
368- </child>
369- </object>
370- <packing>
371- <property name="expand">True</property>
372- <property name="fill">True</property>
373- <property name="position">1</property>
374- </packing>
375- </child>
376- <child>
377- <object class="GtkAlignment" id="alignment15">
378- <property name="visible">True</property>
379- <property name="can_focus">False</property>
380- <property name="left_padding">12</property>
381- <child>
382- <object class="GtkHBox" id="hbox18">
383- <property name="visible">True</property>
384- <property name="can_focus">False</property>
385- <property name="spacing">6</property>
386- <child>
387- <object class="GtkLabel" id="label_updates_5">
388- <property name="visible">True</property>
389- <property name="can_focus">False</property>
390- <property name="label" translatable="yes">Notify me of a new Ubuntu version:</property>
391- <property name="xalign">1</property>
392- </object>
393- <packing>
394- <property name="expand">False</property>
395- <property name="fill">False</property>
396- <property name="position">0</property>
397- </packing>
398- </child>
399- <child>
400- <object class="GtkComboBox" id="combobox_release_upgrades">
401- <property name="visible">True</property>
402- <property name="can_focus">False</property>
403- <property name="model">model_release_upgrades</property>
404- <child>
405- <object class="GtkCellRendererText" id="renderer1"/>
406- <attributes>
407- <attribute name="text">0</attribute>
408- </attributes>
409- </child>
410- </object>
411- <packing>
412- <property name="expand">True</property>
413- <property name="fill">True</property>
414- <property name="position">1</property>
415- </packing>
416 </child>
417 </object>
418+ <packing>
419+ <property name="expand">False</property>
420+ <property name="fill">False</property>
421+ <property name="position">2</property>
422+ </packing>
423 </child>
424 </object>
425- <packing>
426- <property name="expand">False</property>
427- <property name="fill">False</property>
428- <property name="position">2</property>
429- </packing>
430 </child>
431 </object>
432 <packing>
433@@ -1421,7 +1442,7 @@
434 <placeholder/>
435 </child>
436 </object>
437- <object class="GtkSizeGroup" id="sizegroup1">
438+ <object class="GtkSizeGroup">
439 <widgets>
440 <widget name="label_updates_1"/>
441 <widget name="label_updates_2"/>
442@@ -1430,4 +1451,13 @@
443 <widget name="label_updates_5"/>
444 </widgets>
445 </object>
446+ <object class="GtkSizeGroup">
447+ <widgets>
448+ <widget name="combobox_updates_subscription"/>
449+ <widget name="combobox_update_interval"/>
450+ <widget name="combobox_security_updates"/>
451+ <widget name="combobox_other_updates"/>
452+ <widget name="combobox_release_upgrades"/>
453+ </widgets>
454+ </object>
455 </interface>
456diff --git a/po/software-properties.pot b/po/software-properties.pot
457index 6d5c53a..7f0619d 100644
458--- a/po/software-properties.pot
459+++ b/po/software-properties.pot
460@@ -8,7 +8,7 @@ msgid ""
461 msgstr ""
462 "Project-Id-Version: PACKAGE VERSION\n"
463 "Report-Msgid-Bugs-To: \n"
464-"POT-Creation-Date: 2020-02-26 19:01+0100\n"
465+"POT-Creation-Date: 2020-02-26 19:05+0100\n"
466 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
467 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
468 "Language-Team: LANGUAGE <LL@li.org>\n"
469@@ -439,7 +439,7 @@ msgstr ""
470
471 #: ../softwareproperties/qt/SoftwarePropertiesQt.py:1287
472 #: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1586
473-#: ../data/gtkbuilder/main.ui.h:40
474+#: ../data/gtkbuilder/main.ui.h:41
475 msgid "No proprietary drivers are in use."
476 msgstr ""
477
478@@ -562,7 +562,7 @@ msgid "Applying changes..."
479 msgstr ""
480
481 #: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1280
482-#: ../data/gtkbuilder/main.ui.h:48
483+#: ../data/gtkbuilder/main.ui.h:49
484 msgid "Re_vert"
485 msgstr ""
486
487@@ -889,96 +889,100 @@ msgid "Other Software"
488 msgstr ""
489
490 #: ../data/gtkbuilder/main.ui.h:26
491-msgid "Subscribed to:"
492+msgid "Snap package updates are checked routinely and installed automatically."
493 msgstr ""
494
495 #: ../data/gtkbuilder/main.ui.h:27
496-msgid "Automatically check for updates:"
497+msgid "For other packages, subscribe to:"
498 msgstr ""
499
500 #: ../data/gtkbuilder/main.ui.h:28
501-msgid "When there are security updates:"
502+msgid "Automatically check for updates:"
503 msgstr ""
504
505 #: ../data/gtkbuilder/main.ui.h:29
506-msgid "When there are other updates:"
507+msgid "When there are security updates:"
508 msgstr ""
509
510 #: ../data/gtkbuilder/main.ui.h:30
511-msgid "Notify me of a new Ubuntu version:"
512+msgid "When there are other updates:"
513 msgstr ""
514
515 #: ../data/gtkbuilder/main.ui.h:31
516-msgid "Updates"
517+msgid "Notify me of a new Ubuntu version:"
518 msgstr ""
519
520 #: ../data/gtkbuilder/main.ui.h:32
521-msgid "<b>Trusted software providers</b>"
522+msgid "Updates"
523 msgstr ""
524
525 #: ../data/gtkbuilder/main.ui.h:33
526-msgid " "
527+msgid "<b>Trusted software providers</b>"
528 msgstr ""
529
530 #: ../data/gtkbuilder/main.ui.h:34
531+msgid " "
532+msgstr ""
533+
534+#: ../data/gtkbuilder/main.ui.h:35
535 msgid ""
536 "Keys are used to authenticate the correct source of software and so protect "
537 "your computer from malicious software"
538 msgstr ""
539
540-#: ../data/gtkbuilder/main.ui.h:35
541+#: ../data/gtkbuilder/main.ui.h:36
542 msgid "_Import Key File..."
543 msgstr ""
544
545-#: ../data/gtkbuilder/main.ui.h:36
546+#: ../data/gtkbuilder/main.ui.h:37
547 msgid "Import the public key from a trusted software provider"
548 msgstr ""
549
550-#: ../data/gtkbuilder/main.ui.h:37
551+#: ../data/gtkbuilder/main.ui.h:38
552 msgid "Restore _Defaults"
553 msgstr ""
554
555-#: ../data/gtkbuilder/main.ui.h:38
556+#: ../data/gtkbuilder/main.ui.h:39
557 msgid "Restore the default keys of your distribution"
558 msgstr ""
559
560-#: ../data/gtkbuilder/main.ui.h:39
561+#: ../data/gtkbuilder/main.ui.h:40
562 msgid "Authentication"
563 msgstr ""
564
565-#: ../data/gtkbuilder/main.ui.h:41
566+#: ../data/gtkbuilder/main.ui.h:42
567 msgid ""
568 "<small>A proprietary driver has private code that Ubuntu developers can't "
569 "review or improve. Security and other updates are dependent on the driver "
570 "vendor.</small>"
571 msgstr ""
572
573-#: ../data/gtkbuilder/main.ui.h:42
574+#: ../data/gtkbuilder/main.ui.h:43
575 msgid "Additional Drivers"
576 msgstr ""
577
578-#: ../data/gtkbuilder/main.ui.h:43
579+#: ../data/gtkbuilder/main.ui.h:44
580 msgid ""
581 "Use proposed updates if you’re willing to report bugs on any problems that "
582 "occur."
583 msgstr ""
584
585-#: ../data/gtkbuilder/main.ui.h:44
586+#: ../data/gtkbuilder/main.ui.h:45
587 msgid "Developer Options"
588 msgstr ""
589
590-#: ../data/gtkbuilder/main.ui.h:45
591+#: ../data/gtkbuilder/main.ui.h:46
592 msgid ""
593 "Canonical Livepatch helps keep your system secure by applying security "
594 "updates that don't require a restart. <a href=\"https://www.ubuntu.com/"
595 "livepatch\">Learn More</a>"
596 msgstr ""
597
598-#: ../data/gtkbuilder/main.ui.h:46
599+#: ../data/gtkbuilder/main.ui.h:47
600 msgid "column"
601 msgstr ""
602
603-#: ../data/gtkbuilder/main.ui.h:47
604+#: ../data/gtkbuilder/main.ui.h:48
605 msgid "Show Livepatch status in the top bar"
606 msgstr ""
607

Subscribers

People subscribed via source and target branches