Merge lp:~kjtehprogrammer/pantheon-photos/fix-1272476 into lp:~pantheon-photos/pantheon-photos/trunk

Proposed by KJ Lawrence
Status: Merged
Approved by: Danielle Foré
Approved revision: 2515
Merged at revision: 2512
Proposed branch: lp:~kjtehprogrammer/pantheon-photos/fix-1272476
Merge into: lp:~pantheon-photos/pantheon-photos/trunk
Diff against target: 1984 lines (+1204/-546)
2 files modified
src/Dialogs.vala (+37/-10)
ui/shotwell.glade (+1167/-536)
To merge this branch: bzr merge lp:~kjtehprogrammer/pantheon-photos/fix-1272476
Reviewer Review Type Date Requested Status
Victor Martinez (community) Approve
Danielle Foré Approve
Review via email: mp+211219@code.launchpad.net

Commit message

Switches Gtk.Notebook out with Gtk.Stack and Gtk.StackSwitcher for Preferences

Description of the change

Switches Gtk.Notebook out with Gtk.Stack and Gtk.StackSwitcher for Preferences and Gtk.Dialog with Granite.Windows.LightWindow (mimics the style of Scratch's preferences).

To post a comment you must log in.
Revision history for this message
Victor Martinez (victored) wrote :

I'm afraid Granite.Widgets.LightWindow may be deprecated due to the new theming capabilities of Gtk.Dialog.

Gtk.Stack and Gtk.StackSwitcher are great though!

Revision history for this message
Danielle Foré (danrabbit) wrote :

Indeed Victor is right. We'll most likely deprecate LightWindow. It's better to use Gtk.Dialog

review: Needs Fixing
2513. By KJ Lawrence

Switching back to Gtk.Dialog, LightWindow is deprecated.

Revision history for this message
KJ Lawrence (kjtehprogrammer) wrote :

Okay, it's back to Gtk.Dialog. Is there anything in the code I should do to make sure that it gets styled correctly, or is that something the UX team can do with CSS now?

Revision history for this message
KJ Lawrence (kjtehprogrammer) wrote :

> Okay, it's back to Gtk.Dialog. Is there anything in the code I should do to
> make sure that it gets styled correctly, or is that something the UX team can
> do with CSS now?

To add to this, are there any other deprecation's you guys are planning to do? I've only kept up with some of the recent GTK changes... I know Popovers are out now, right? Do you guys have a list of deprecated Granite widgets?

Revision history for this message
Cody Garver (codygarver) wrote :

As far as I know, everything that's deprecated other than lightwindow is documented in lp:granite and will give you a warning if you try to compile code that contain granite deprecations. I'm opening a bug for deprecating lightwindow now.

2514. By KJ Lawrence

Don't need the extra container for Gtk.Dialog

Revision history for this message
Danielle Foré (danrabbit) wrote :

Looks good on design side :) Nothing you need to do to get it to use the right CSS. It's automatically applied in Gtk 3.12.

But let's see if we can get Victor to re-review now that we're using Gtk.Dialog :)

Revision history for this message
Danielle Foré (danrabbit) :
review: Approve
Revision history for this message
Victor Martinez (victored) wrote :

I believe Shotwell developers wanted to keep the widget implementation details away from the clients of the PreferencesDialog class.

To avoid unnecessarily diverging the codebase from Shotwell, I'd recommend reverting the changes related to the subclassing of Gtk.Dialog and keep "dialog" as a field instead.

If you decided to keep PreferencesWindow as a subclass of Gtk.Dialog, please change diff line 93 to:

"public override void show () {"

review: Needs Fixing
2515. By KJ Lawrence

Removing Gtk.Dialog sub-class

Revision history for this message
KJ Lawrence (kjtehprogrammer) wrote :

> Looks good on design side :) Nothing you need to do to get it to use the right CSS. It's automatically applied in Gtk > 3.12.

Good to know!

> I believe Shotwell developers wanted to keep the widget implementation details
> away from the clients of the PreferencesDialog class.
>
> To avoid unnecessarily diverging the codebase from Shotwell, I'd recommend
> reverting the changes related to the subclassing of Gtk.Dialog and keep
> "dialog" as a field instead.
>
> If you decided to keep PreferencesWindow as a subclass of Gtk.Dialog, please
> change diff line 93 to:
>
> "public override void show () {"

Okay, it's back to Gtk.Dialog being split out. I'm not a personal fan of it, kind of goes against the spirit of OOP, but I understand not wanting to diverge the codebase too much. It's going to happen eventually though. :)

Revision history for this message
Victor Martinez (victored) wrote :

Thank you KJ.

Gtk.Dialog.get_action_area has been deprecated in the upcoming GTK+ 3.12. Please consider using Gtk.Dialog.add_button instead, for future proofness.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/Dialogs.vala'
2--- src/Dialogs.vala 2014-03-04 04:14:02 +0000
3+++ src/Dialogs.vala 2014-03-18 11:08:18 +0000
4@@ -2216,13 +2216,42 @@
5 private PreferencesDialog() {
6 builder = AppWindow.create_builder();
7
8- dialog = builder.get_object("preferences_dialog") as Gtk.Dialog;
9- dialog.set_parent_window(AppWindow.get_instance().get_parent_window());
10- dialog.set_transient_for(AppWindow.get_instance());
11+ // Preferences dialog window settings
12+ dialog = new Gtk.Dialog();
13+ dialog.title = _("Preferences");
14+ dialog.width_request = 450;
15+ dialog.type_hint = Gdk.WindowTypeHint.DIALOG;
16+ dialog.resizable = false;
17 dialog.delete_event.connect(on_delete);
18- dialog.response.connect(on_close);
19- dialog.set_has_resize_grip(false);
20-
21+ dialog.map_event.connect(map_event_handler);
22+ dialog.set_parent_window(AppWindow.get_instance().get_parent_window());
23+
24+ // Create our stack container and load in each preference container from shotwell.glade
25+ Gtk.Stack container = new Gtk.Stack ();
26+ container.expand = true;
27+ container.add_titled (builder.get_object("preferences_library") as Gtk.Box, "library", _("Library"));
28+ container.add_titled (builder.get_object("preferences_external") as Gtk.Box, "external", _("External"));
29+ container.add_titled (builder.get_object("preferences_plugins") as Gtk.Box, "plugins", _("Plugins"));
30+
31+ Gtk.StackSwitcher switcher = new Gtk.StackSwitcher ();
32+ switcher.stack = container;
33+ switcher.expand = true;
34+ switcher.halign = Gtk.Align.CENTER;
35+ switcher.margin_top = 7;
36+
37+ // Add the switcher, stack container and button container to the window
38+ Gtk.Box content = dialog.get_content_area () as Gtk.Box;
39+ content.add (switcher);
40+ content.add (container);
41+
42+ // Add close button to window
43+ close_button = new Gtk.Button.with_mnemonic (_("_Close"));
44+ close_button.clicked.connect(on_close);
45+
46+ Gtk.Box button_container = dialog.get_action_area () as Gtk.Box;
47+ button_container.add (close_button);
48+
49+ // Set the bg color value
50 bg_color_adjustment = builder.get_object("bg_color_adjustment") as Gtk.Adjustment;
51 bg_color_adjustment.set_value(bg_color_adjustment.get_upper() -
52 (Config.Facade.get_instance().get_bg_color().red * 65535.0));
53@@ -2258,7 +2287,7 @@
54 }
55
56 dir_pattern_combo = new Gtk.ComboBoxText();
57- Gtk.Alignment dir_choser_align = builder.get_object("dir choser") as Gtk.Alignment;
58+ Gtk.Alignment dir_choser_align = builder.get_object("dir_choser") as Gtk.Alignment;
59 dir_choser_align.add(dir_pattern_combo);
60 dir_pattern_entry = builder.get_object("dir_pattern_entry") as Gtk.Entry;
61 dir_pattern_example = builder.get_object("dynamic example") as Gtk.Label;
62@@ -2297,8 +2326,6 @@
63 default_raw_developer_combo.append_text(RawDeveloper.SHOTWELL.get_label());
64 set_raw_developer_combo(Config.Facade.get_instance().get_default_raw_developer());
65 default_raw_developer_combo.changed.connect(on_default_raw_developer_changed);
66-
67- dialog.map_event.connect(map_event);
68 }
69
70 public void populate_preference_options() {
71@@ -2586,7 +2613,7 @@
72 lib_dir = library_dir_button.get_filename();
73 }
74
75- private bool map_event() {
76+ private bool map_event_handler() {
77 // Set the signal for the lib dir button after the dialog is displayed,
78 // because the FileChooserButton has a nasty habbit of selecting a
79 // different folder when displayed if the provided path doesn't exist.
80
81=== modified file 'ui/shotwell.glade'
82--- ui/shotwell.glade 2013-04-11 22:17:44 +0000
83+++ ui/shotwell.glade 2014-03-18 11:08:18 +0000
84@@ -1,6 +1,7 @@
85 <?xml version="1.0" encoding="UTF-8"?>
86+<!-- Generated with glade 3.16.1 -->
87 <interface>
88- <!-- interface-requires gtk+ 3.0 -->
89+ <requires lib="gtk+" version="3.0"/>
90 <object class="GtkDialog" id="Search criteria">
91 <property name="can_focus">False</property>
92 <property name="border_width">5</property>
93@@ -205,514 +206,6 @@
94 <property name="page_increment">1000</property>
95 <property name="page_size">1000</property>
96 </object>
97- <object class="GtkBox" id="box_ImgSettingsPane">
98- <property name="visible">True</property>
99- <property name="can_focus">False</property>
100- <property name="orientation">vertical</property>
101- <child>
102- <object class="GtkLabel" id="lbl_PrintedImageSize">
103- <property name="visible">True</property>
104- <property name="can_focus">False</property>
105- <property name="margin_top">4</property>
106- <property name="xalign">0</property>
107- <property name="label" translatable="yes">&lt;b&gt;Printed Image Size&lt;/b&gt;</property>
108- <property name="use_markup">True</property>
109- </object>
110- <packing>
111- <property name="expand">False</property>
112- <property name="fill">True</property>
113- <property name="position">0</property>
114- </packing>
115- </child>
116- <child>
117- <object class="GtkBox" id="box2">
118- <property name="visible">True</property>
119- <property name="can_focus">False</property>
120- <property name="margin_left">24</property>
121- <property name="margin_top">2</property>
122- <child>
123- <object class="GtkRadioButton" id="radio_UseStandardSize">
124- <property name="label" translatable="yes">Use a _standard size:</property>
125- <property name="visible">True</property>
126- <property name="can_focus">True</property>
127- <property name="receives_default">False</property>
128- <property name="use_underline">True</property>
129- <property name="xalign">0</property>
130- <property name="active">True</property>
131- <property name="draw_indicator">True</property>
132- <property name="group">radio_UseCustomSize</property>
133- </object>
134- <packing>
135- <property name="expand">False</property>
136- <property name="fill">True</property>
137- <property name="position">0</property>
138- </packing>
139- </child>
140- <child>
141- <object class="GtkComboBox" id="combo_StdSizes">
142- <property name="visible">True</property>
143- <property name="can_focus">False</property>
144- <property name="margin_left">20</property>
145- </object>
146- <packing>
147- <property name="expand">False</property>
148- <property name="fill">True</property>
149- <property name="position">1</property>
150- </packing>
151- </child>
152- </object>
153- <packing>
154- <property name="expand">False</property>
155- <property name="fill">True</property>
156- <property name="position">1</property>
157- </packing>
158- </child>
159- <child>
160- <object class="GtkBox" id="box3">
161- <property name="visible">True</property>
162- <property name="can_focus">False</property>
163- <property name="margin_left">24</property>
164- <property name="margin_top">2</property>
165- <child>
166- <object class="GtkRadioButton" id="radio_UseCustomSize">
167- <property name="label" translatable="yes">Use a c_ustom size:</property>
168- <property name="visible">True</property>
169- <property name="can_focus">True</property>
170- <property name="receives_default">False</property>
171- <property name="use_underline">True</property>
172- <property name="xalign">0</property>
173- <property name="active">True</property>
174- <property name="draw_indicator">True</property>
175- </object>
176- <packing>
177- <property name="expand">False</property>
178- <property name="fill">True</property>
179- <property name="position">0</property>
180- </packing>
181- </child>
182- <child>
183- <object class="GtkBox" id="box4">
184- <property name="visible">True</property>
185- <property name="can_focus">False</property>
186- <property name="margin_left">19</property>
187- <child>
188- <object class="GtkEntry" id="entry_CustomWidth">
189- <property name="visible">True</property>
190- <property name="can_focus">True</property>
191- <property name="margin_right">3</property>
192- <property name="invisible_char">●</property>
193- <property name="width_chars">10</property>
194- <property name="invisible_char_set">True</property>
195- </object>
196- <packing>
197- <property name="expand">False</property>
198- <property name="fill">True</property>
199- <property name="position">0</property>
200- </packing>
201- </child>
202- <child>
203- <object class="GtkLabel" id="lbl_MultSymbol">
204- <property name="visible">True</property>
205- <property name="can_focus">False</property>
206- <property name="label">×</property>
207- </object>
208- <packing>
209- <property name="expand">False</property>
210- <property name="fill">True</property>
211- <property name="position">1</property>
212- </packing>
213- </child>
214- <child>
215- <object class="GtkEntry" id="entry_CustomHeight">
216- <property name="visible">True</property>
217- <property name="can_focus">True</property>
218- <property name="margin_left">3</property>
219- <property name="invisible_char">●</property>
220- <property name="width_chars">10</property>
221- <property name="invisible_char_set">True</property>
222- </object>
223- <packing>
224- <property name="expand">False</property>
225- <property name="fill">True</property>
226- <property name="position">2</property>
227- </packing>
228- </child>
229- <child>
230- <object class="GtkComboBoxText" id="combo_Units">
231- <property name="visible">True</property>
232- <property name="can_focus">False</property>
233- </object>
234- <packing>
235- <property name="expand">False</property>
236- <property name="fill">True</property>
237- <property name="position">3</property>
238- </packing>
239- </child>
240- </object>
241- <packing>
242- <property name="expand">False</property>
243- <property name="fill">True</property>
244- <property name="padding">14</property>
245- <property name="position">1</property>
246- </packing>
247- </child>
248- </object>
249- <packing>
250- <property name="expand">False</property>
251- <property name="fill">True</property>
252- <property name="position">2</property>
253- </packing>
254- </child>
255- <child>
256- <object class="GtkCheckButton" id="check_MatchAspectRatio">
257- <property name="label" translatable="yes">_Match photo aspect ratio</property>
258- <property name="visible">True</property>
259- <property name="can_focus">True</property>
260- <property name="receives_default">False</property>
261- <property name="margin_left">210</property>
262- <property name="use_underline">True</property>
263- <property name="xalign">0</property>
264- <property name="draw_indicator">True</property>
265- </object>
266- <packing>
267- <property name="expand">False</property>
268- <property name="fill">True</property>
269- <property name="position">3</property>
270- </packing>
271- </child>
272- <child>
273- <object class="GtkBox" id="box5">
274- <property name="visible">True</property>
275- <property name="can_focus">False</property>
276- <property name="margin_left">24</property>
277- <property name="margin_top">2</property>
278- <property name="margin_bottom">12</property>
279- <child>
280- <object class="GtkRadioButton" id="radio_Autosize">
281- <property name="label" translatable="yes">_Autosize:</property>
282- <property name="visible">True</property>
283- <property name="can_focus">True</property>
284- <property name="receives_default">False</property>
285- <property name="use_underline">True</property>
286- <property name="xalign">0</property>
287- <property name="active">True</property>
288- <property name="draw_indicator">True</property>
289- <property name="group">radio_UseCustomSize</property>
290- </object>
291- <packing>
292- <property name="expand">False</property>
293- <property name="fill">True</property>
294- <property name="position">0</property>
295- </packing>
296- </child>
297- <child>
298- <object class="GtkComboBox" id="combo_Autosize">
299- <property name="visible">True</property>
300- <property name="can_focus">False</property>
301- <property name="margin_left">95</property>
302- </object>
303- <packing>
304- <property name="expand">False</property>
305- <property name="fill">True</property>
306- <property name="position">1</property>
307- </packing>
308- </child>
309- </object>
310- <packing>
311- <property name="expand">False</property>
312- <property name="fill">True</property>
313- <property name="position">4</property>
314- </packing>
315- </child>
316- <child>
317- <object class="GtkLabel" id="lbl_Titles">
318- <property name="visible">True</property>
319- <property name="can_focus">False</property>
320- <property name="xalign">0</property>
321- <property name="label" translatable="yes">&lt;b&gt;Titles&lt;/b&gt;</property>
322- <property name="use_markup">True</property>
323- </object>
324- <packing>
325- <property name="expand">False</property>
326- <property name="fill">True</property>
327- <property name="position">5</property>
328- </packing>
329- </child>
330- <child>
331- <object class="GtkBox" id="box6">
332- <property name="visible">True</property>
333- <property name="can_focus">False</property>
334- <property name="margin_left">24</property>
335- <property name="margin_top">2</property>
336- <child>
337- <object class="GtkCheckButton" id="check_PrintImageTitle">
338- <property name="label" translatable="yes">Print image _title</property>
339- <property name="visible">True</property>
340- <property name="can_focus">True</property>
341- <property name="receives_default">False</property>
342- <property name="use_underline">True</property>
343- <property name="xalign">0</property>
344- <property name="draw_indicator">True</property>
345- </object>
346- <packing>
347- <property name="expand">False</property>
348- <property name="fill">True</property>
349- <property name="position">0</property>
350- </packing>
351- </child>
352- <child>
353- <object class="GtkFontButton" id="fntbn_TitleFont">
354- <property name="visible">True</property>
355- <property name="can_focus">True</property>
356- <property name="receives_default">True</property>
357- <property name="margin_left">49</property>
358- <property name="font">Sans Bold 12</property>
359- <property name="preview_text"/>
360- <property name="show_preview_entry">False</property>
361- <property name="font_name">Sans Bold 12</property>
362- </object>
363- <packing>
364- <property name="expand">False</property>
365- <property name="fill">True</property>
366- <property name="position">1</property>
367- </packing>
368- </child>
369- </object>
370- <packing>
371- <property name="expand">False</property>
372- <property name="fill">True</property>
373- <property name="position">6</property>
374- </packing>
375- </child>
376- <child>
377- <object class="GtkLabel" id="lbl_PixelResolution">
378- <property name="visible">True</property>
379- <property name="can_focus">False</property>
380- <property name="margin_top">12</property>
381- <property name="xalign">0</property>
382- <property name="label" translatable="yes">&lt;b&gt;Pixel Resolution&lt;/b&gt;</property>
383- <property name="use_markup">True</property>
384- </object>
385- <packing>
386- <property name="expand">False</property>
387- <property name="fill">True</property>
388- <property name="position">7</property>
389- </packing>
390- </child>
391- <child>
392- <object class="GtkBox" id="box7">
393- <property name="visible">True</property>
394- <property name="can_focus">False</property>
395- <property name="margin_left">24</property>
396- <property name="margin_top">2</property>
397- <child>
398- <object class="GtkLabel" id="lbl_OutputPhotoAt">
399- <property name="visible">True</property>
400- <property name="can_focus">False</property>
401- <property name="xalign">0</property>
402- <property name="label" translatable="yes">_Output photo at:</property>
403- <property name="use_underline">True</property>
404- <property name="mnemonic_widget">entry_PixelsPerInch</property>
405- <property name="ellipsize">start</property>
406- </object>
407- <packing>
408- <property name="expand">False</property>
409- <property name="fill">True</property>
410- <property name="position">0</property>
411- </packing>
412- </child>
413- <child>
414- <object class="GtkBox" id="box8">
415- <property name="visible">True</property>
416- <property name="can_focus">False</property>
417- <property name="margin_left">65</property>
418- <child>
419- <object class="GtkEntry" id="entry_PixelsPerInch">
420- <property name="visible">True</property>
421- <property name="can_focus">True</property>
422- <property name="margin_right">8</property>
423- <property name="invisible_char">●</property>
424- <property name="width_chars">13</property>
425- <property name="invisible_char_set">True</property>
426- </object>
427- <packing>
428- <property name="expand">False</property>
429- <property name="fill">True</property>
430- <property name="position">0</property>
431- </packing>
432- </child>
433- <child>
434- <object class="GtkLabel" id="lbl_PixelsPerInch">
435- <property name="visible">True</property>
436- <property name="can_focus">False</property>
437- <property name="label" translatable="yes">pixels per inch</property>
438- </object>
439- <packing>
440- <property name="expand">False</property>
441- <property name="fill">True</property>
442- <property name="position">1</property>
443- </packing>
444- </child>
445- </object>
446- <packing>
447- <property name="expand">False</property>
448- <property name="fill">True</property>
449- <property name="position">1</property>
450- </packing>
451- </child>
452- </object>
453- <packing>
454- <property name="expand">False</property>
455- <property name="fill">True</property>
456- <property name="position">8</property>
457- </packing>
458- </child>
459- </object>
460- <object class="GtkBox" id="dialog-vbox2">
461- <property name="visible">True</property>
462- <property name="can_focus">False</property>
463- <property name="orientation">vertical</property>
464- <child>
465- <object class="GtkLabel" id="label">
466- <property name="visible">True</property>
467- <property name="can_focus">False</property>
468- <property name="xalign">0</property>
469- <property name="xpad">4</property>
470- <property name="label" translatable="yes">label</property>
471- </object>
472- <packing>
473- <property name="expand">False</property>
474- <property name="fill">True</property>
475- <property name="padding">4</property>
476- <property name="position">0</property>
477- </packing>
478- </child>
479- <child>
480- <object class="GtkEntry" id="entry">
481- <property name="visible">True</property>
482- <property name="can_focus">True</property>
483- <property name="margin_left">7</property>
484- <property name="margin_right">7</property>
485- <property name="margin_bottom">2</property>
486- <property name="invisible_char">●</property>
487- <property name="activates_default">True</property>
488- </object>
489- <packing>
490- <property name="expand">False</property>
491- <property name="fill">True</property>
492- <property name="padding">1</property>
493- <property name="position">1</property>
494- </packing>
495- </child>
496- <child>
497- <placeholder/>
498- </child>
499- </object>
500- <object class="GtkBox" id="dialog-vbox4">
501- <property name="visible">True</property>
502- <property name="can_focus">False</property>
503- <property name="hexpand">True</property>
504- <property name="vexpand">True</property>
505- <property name="orientation">vertical</property>
506- <child>
507- <object class="GtkLabel" id="label9">
508- <property name="visible">True</property>
509- <property name="can_focus">False</property>
510- <property name="xalign">0</property>
511- <property name="xpad">4</property>
512- <property name="label" translatable="yes">label</property>
513- </object>
514- <packing>
515- <property name="expand">False</property>
516- <property name="fill">True</property>
517- <property name="padding">4</property>
518- <property name="position">0</property>
519- </packing>
520- </child>
521- <child>
522- <object class="GtkScrolledWindow" id="scrolledwindow1">
523- <property name="visible">True</property>
524- <property name="can_focus">True</property>
525- <property name="shadow_type">in</property>
526- <child>
527- <object class="GtkTextView" id="textview1">
528- <property name="visible">True</property>
529- <property name="can_focus">True</property>
530- <property name="margin_left">7</property>
531- <property name="margin_right">7</property>
532- <property name="margin_bottom">2</property>
533- <property name="hexpand">True</property>
534- <property name="vexpand">True</property>
535- <property name="border_width">1</property>
536- <property name="wrap_mode">word</property>
537- <property name="accepts_tab">False</property>
538- </object>
539- </child>
540- </object>
541- <packing>
542- <property name="expand">True</property>
543- <property name="fill">True</property>
544- <property name="position">1</property>
545- </packing>
546- </child>
547- <child>
548- <placeholder/>
549- </child>
550- </object>
551- <object class="GtkBox" id="plugin-manifest">
552- <property name="visible">True</property>
553- <property name="can_focus">False</property>
554- <property name="orientation">vertical</property>
555- <child>
556- <object class="GtkAlignment" id="plugin-list-alignment">
557- <property name="visible">True</property>
558- <property name="can_focus">False</property>
559- <child>
560- <object class="GtkScrolledWindow" id="plugin-list-scrolled-window">
561- <property name="visible">True</property>
562- <property name="can_focus">True</property>
563- <property name="hscrollbar_policy">never</property>
564- <property name="shadow_type">etched-in</property>
565- <child>
566- <placeholder/>
567- </child>
568- </object>
569- </child>
570- </object>
571- <packing>
572- <property name="expand">True</property>
573- <property name="fill">True</property>
574- <property name="position">0</property>
575- </packing>
576- </child>
577- <child>
578- <object class="GtkHButtonBox" id="hbuttonbox1">
579- <property name="visible">True</property>
580- <property name="can_focus">False</property>
581- <property name="layout_style">end</property>
582- <child>
583- <object class="GtkButton" id="about-plugin-button">
584- <property name="label">gtk-about</property>
585- <property name="visible">True</property>
586- <property name="can_focus">True</property>
587- <property name="receives_default">True</property>
588- <property name="use_stock">True</property>
589- </object>
590- <packing>
591- <property name="expand">False</property>
592- <property name="fill">False</property>
593- <property name="position">0</property>
594- </packing>
595- </child>
596- </object>
597- <packing>
598- <property name="expand">False</property>
599- <property name="fill">False</property>
600- <property name="padding">6</property>
601- <property name="position">1</property>
602- </packing>
603- </child>
604- </object>
605 <object class="GtkDialog" id="preferences_dialog">
606 <property name="can_focus">False</property>
607 <property name="border_width">5</property>
608@@ -755,7 +248,7 @@
609 </packing>
610 </child>
611 <child>
612- <object class="GtkNotebook" id="notebook1">
613+ <object class="GtkNotebook" id="preferences_notebook">
614 <property name="visible">True</property>
615 <property name="can_focus">True</property>
616 <child>
617@@ -772,7 +265,7 @@
618 <property name="column_spacing">8</property>
619 <property name="row_spacing">4</property>
620 <child>
621- <object class="GtkFileChooserButton" id="library_dir_button">
622+ <object class="GtkFileChooserButton" id="library_dir_button2">
623 <property name="visible">True</property>
624 <property name="can_focus">True</property>
625 <property name="action">select-folder</property>
626@@ -785,7 +278,7 @@
627 </packing>
628 </child>
629 <child>
630- <object class="GtkBox" id="slider container">
631+ <object class="GtkBox" id="slider container2">
632 <property name="visible">True</property>
633 <property name="can_focus">False</property>
634 <property name="spacing">6</property>
635@@ -802,7 +295,7 @@
636 </packing>
637 </child>
638 <child>
639- <object class="GtkHScale" id="bg_color_slider">
640+ <object class="GtkHScale" id="bg_color_slider2">
641 <property name="width_request">150</property>
642 <property name="visible">True</property>
643 <property name="can_focus">True</property>
644@@ -867,7 +360,7 @@
645 <property name="top_padding">2</property>
646 <property name="left_padding">10</property>
647 <child>
648- <object class="GtkCheckButton" id="autoimport">
649+ <object class="GtkCheckButton" id="autoimport2">
650 <property name="label" translatable="yes">_Watch library directory for new files</property>
651 <property name="visible">True</property>
652 <property name="can_focus">True</property>
653@@ -916,7 +409,7 @@
654 <property name="can_focus">False</property>
655 <property name="left_padding">10</property>
656 <child>
657- <object class="GtkCheckButton" id="write_metadata">
658+ <object class="GtkCheckButton" id="write_metadata2">
659 <property name="label" translatable="yes">Write tags, titles, and other _metadata to photo files</property>
660 <property name="visible">True</property>
661 <property name="can_focus">True</property>
662@@ -966,7 +459,7 @@
663 <property name="xalign">0</property>
664 <property name="label" translatable="yes">_Import photos to:</property>
665 <property name="use_underline">True</property>
666- <property name="mnemonic_widget">library_dir_button</property>
667+ <property name="mnemonic_widget">library_dir_button2</property>
668 </object>
669 </child>
670 </object>
671@@ -989,7 +482,7 @@
672 <property name="xpad">10</property>
673 <property name="label" translatable="yes">_Background:</property>
674 <property name="use_underline">True</property>
675- <property name="mnemonic_widget">bg_color_slider</property>
676+ <property name="mnemonic_widget">bg_color_slider2</property>
677 </object>
678 </child>
679 </object>
680@@ -1044,7 +537,7 @@
681 </packing>
682 </child>
683 <child>
684- <object class="GtkAlignment" id="dir choser">
685+ <object class="GtkAlignment" id="dir choser2">
686 <property name="visible">True</property>
687 <property name="can_focus">False</property>
688 <child>
689@@ -1074,7 +567,7 @@
690 <property name="xalign">0</property>
691 <property name="label" translatable="yes">_Pattern:</property>
692 <property name="use_underline">True</property>
693- <property name="mnemonic_widget">dir_pattern_entry</property>
694+ <property name="mnemonic_widget">dir_pattern_entry2</property>
695 </object>
696 <packing>
697 <property name="expand">True</property>
698@@ -1083,7 +576,7 @@
699 </packing>
700 </child>
701 <child>
702- <object class="GtkLabel" id="pattern_help">
703+ <object class="GtkLabel" id="pattern_help2">
704 <property name="visible">True</property>
705 <property name="can_focus">False</property>
706 <attributes>
707@@ -1105,11 +598,11 @@
708 </packing>
709 </child>
710 <child>
711- <object class="GtkAlignment" id="entry: pattern">
712+ <object class="GtkAlignment" id="entry: pattern2">
713 <property name="visible">True</property>
714 <property name="can_focus">False</property>
715 <child>
716- <object class="GtkEntry" id="dir_pattern_entry">
717+ <object class="GtkEntry" id="dir_pattern_entry2">
718 <property name="visible">True</property>
719 <property name="can_focus">True</property>
720 <property name="invisible_char">•</property>
721@@ -1130,7 +623,7 @@
722 <property name="visible">True</property>
723 <property name="can_focus">False</property>
724 <child>
725- <object class="GtkLabel" id="dynamic example">
726+ <object class="GtkLabel" id="dynamic example2">
727 <property name="visible">True</property>
728 <property name="can_focus">False</property>
729 <property name="xalign">0</property>
730@@ -1170,7 +663,7 @@
731 <property name="top_padding">2</property>
732 <property name="left_padding">10</property>
733 <child>
734- <object class="GtkCheckButton" id="lowercase">
735+ <object class="GtkCheckButton" id="lowercase2">
736 <property name="label" translatable="yes">R_ename imported files to lowercase</property>
737 <property name="visible">True</property>
738 <property name="can_focus">True</property>
739@@ -1214,7 +707,7 @@
740 </packing>
741 </child>
742 <child>
743- <object class="GtkComboBoxText" id="default_raw_developer">
744+ <object class="GtkComboBoxText" id="default_raw_developer2">
745 <property name="visible">True</property>
746 <property name="can_focus">False</property>
747 </object>
748@@ -1237,7 +730,7 @@
749 <property name="xalign">0</property>
750 <property name="label" translatable="yes">De_fault:</property>
751 <property name="use_underline">True</property>
752- <property name="mnemonic_widget">default_raw_developer</property>
753+ <property name="mnemonic_widget">default_raw_developer2</property>
754 </object>
755 </child>
756 </object>
757@@ -1254,7 +747,7 @@
758 <object class="GtkLabel" id="library-tab">
759 <property name="visible">True</property>
760 <property name="can_focus">False</property>
761- <property name="label" translatable="yes">Library</property>
762+ <property name="label" translatable="yes">Library Tab</property>
763 </object>
764 <packing>
765 <property name="tab_fill">False</property>
766@@ -1291,7 +784,7 @@
767 <property name="xpad">4</property>
768 <property name="label" translatable="yes">E_xternal photo editor:</property>
769 <property name="use_underline">True</property>
770- <property name="mnemonic_widget">external_photo_editor_combo</property>
771+ <property name="mnemonic_widget">external_photo_editor_combo2</property>
772 </object>
773 <packing>
774 <property name="expand">True</property>
775@@ -1307,7 +800,7 @@
776 <property name="xpad">4</property>
777 <property name="label" translatable="yes">External _RAW editor:</property>
778 <property name="use_underline">True</property>
779- <property name="mnemonic_widget">external_raw_editor_combo</property>
780+ <property name="mnemonic_widget">external_raw_editor_combo2</property>
781 </object>
782 <packing>
783 <property name="expand">True</property>
784@@ -1331,7 +824,7 @@
785 <property name="orientation">vertical</property>
786 <property name="spacing">6</property>
787 <child>
788- <object class="GtkComboBox" id="external_photo_editor_combo">
789+ <object class="GtkComboBox" id="external_photo_editor_combo2">
790 <property name="visible">True</property>
791 <property name="can_focus">False</property>
792 </object>
793@@ -1342,7 +835,7 @@
794 </packing>
795 </child>
796 <child>
797- <object class="GtkComboBox" id="external_raw_editor_combo">
798+ <object class="GtkComboBox" id="external_raw_editor_combo2">
799 <property name="visible">True</property>
800 <property name="can_focus">False</property>
801 </object>
802@@ -1378,7 +871,7 @@
803 </packing>
804 </child>
805 <child>
806- <object class="GtkAlignment" id="plugin-manifest-bin">
807+ <object class="GtkAlignment" id="plugin-manifest-bin2">
808 <property name="visible">True</property>
809 <property name="can_focus">False</property>
810 <property name="top_padding">12</property>
811@@ -1423,6 +916,1148 @@
812 <action-widget response="-5">close_button</action-widget>
813 </action-widgets>
814 </object>
815+ <object class="GtkBox" id="box_ImgSettingsPane">
816+ <property name="visible">True</property>
817+ <property name="can_focus">False</property>
818+ <property name="orientation">vertical</property>
819+ <child>
820+ <object class="GtkLabel" id="lbl_PrintedImageSize">
821+ <property name="visible">True</property>
822+ <property name="can_focus">False</property>
823+ <property name="margin_top">4</property>
824+ <property name="xalign">0</property>
825+ <property name="label" translatable="yes">&lt;b&gt;Printed Image Size&lt;/b&gt;</property>
826+ <property name="use_markup">True</property>
827+ </object>
828+ <packing>
829+ <property name="expand">False</property>
830+ <property name="fill">True</property>
831+ <property name="position">0</property>
832+ </packing>
833+ </child>
834+ <child>
835+ <object class="GtkBox" id="box2">
836+ <property name="visible">True</property>
837+ <property name="can_focus">False</property>
838+ <property name="margin_left">24</property>
839+ <property name="margin_top">2</property>
840+ <child>
841+ <object class="GtkRadioButton" id="radio_UseStandardSize">
842+ <property name="label" translatable="yes">Use a _standard size:</property>
843+ <property name="visible">True</property>
844+ <property name="can_focus">True</property>
845+ <property name="receives_default">False</property>
846+ <property name="use_underline">True</property>
847+ <property name="xalign">0</property>
848+ <property name="active">True</property>
849+ <property name="draw_indicator">True</property>
850+ <property name="group">radio_UseCustomSize</property>
851+ </object>
852+ <packing>
853+ <property name="expand">False</property>
854+ <property name="fill">True</property>
855+ <property name="position">0</property>
856+ </packing>
857+ </child>
858+ <child>
859+ <object class="GtkComboBox" id="combo_StdSizes">
860+ <property name="visible">True</property>
861+ <property name="can_focus">False</property>
862+ <property name="margin_left">20</property>
863+ </object>
864+ <packing>
865+ <property name="expand">False</property>
866+ <property name="fill">True</property>
867+ <property name="position">1</property>
868+ </packing>
869+ </child>
870+ </object>
871+ <packing>
872+ <property name="expand">False</property>
873+ <property name="fill">True</property>
874+ <property name="position">1</property>
875+ </packing>
876+ </child>
877+ <child>
878+ <object class="GtkBox" id="box3">
879+ <property name="visible">True</property>
880+ <property name="can_focus">False</property>
881+ <property name="margin_left">24</property>
882+ <property name="margin_top">2</property>
883+ <child>
884+ <object class="GtkRadioButton" id="radio_UseCustomSize">
885+ <property name="label" translatable="yes">Use a c_ustom size:</property>
886+ <property name="visible">True</property>
887+ <property name="can_focus">True</property>
888+ <property name="receives_default">False</property>
889+ <property name="use_underline">True</property>
890+ <property name="xalign">0</property>
891+ <property name="active">True</property>
892+ <property name="draw_indicator">True</property>
893+ </object>
894+ <packing>
895+ <property name="expand">False</property>
896+ <property name="fill">True</property>
897+ <property name="position">0</property>
898+ </packing>
899+ </child>
900+ <child>
901+ <object class="GtkBox" id="box4">
902+ <property name="visible">True</property>
903+ <property name="can_focus">False</property>
904+ <property name="margin_left">19</property>
905+ <child>
906+ <object class="GtkEntry" id="entry_CustomWidth">
907+ <property name="visible">True</property>
908+ <property name="can_focus">True</property>
909+ <property name="margin_right">3</property>
910+ <property name="invisible_char">●</property>
911+ <property name="width_chars">10</property>
912+ </object>
913+ <packing>
914+ <property name="expand">False</property>
915+ <property name="fill">True</property>
916+ <property name="position">0</property>
917+ </packing>
918+ </child>
919+ <child>
920+ <object class="GtkLabel" id="lbl_MultSymbol">
921+ <property name="visible">True</property>
922+ <property name="can_focus">False</property>
923+ <property name="label">×</property>
924+ </object>
925+ <packing>
926+ <property name="expand">False</property>
927+ <property name="fill">True</property>
928+ <property name="position">1</property>
929+ </packing>
930+ </child>
931+ <child>
932+ <object class="GtkEntry" id="entry_CustomHeight">
933+ <property name="visible">True</property>
934+ <property name="can_focus">True</property>
935+ <property name="margin_left">3</property>
936+ <property name="invisible_char">●</property>
937+ <property name="width_chars">10</property>
938+ </object>
939+ <packing>
940+ <property name="expand">False</property>
941+ <property name="fill">True</property>
942+ <property name="position">2</property>
943+ </packing>
944+ </child>
945+ <child>
946+ <object class="GtkComboBoxText" id="combo_Units">
947+ <property name="visible">True</property>
948+ <property name="can_focus">False</property>
949+ </object>
950+ <packing>
951+ <property name="expand">False</property>
952+ <property name="fill">True</property>
953+ <property name="position">3</property>
954+ </packing>
955+ </child>
956+ </object>
957+ <packing>
958+ <property name="expand">False</property>
959+ <property name="fill">True</property>
960+ <property name="padding">14</property>
961+ <property name="position">1</property>
962+ </packing>
963+ </child>
964+ </object>
965+ <packing>
966+ <property name="expand">False</property>
967+ <property name="fill">True</property>
968+ <property name="position">2</property>
969+ </packing>
970+ </child>
971+ <child>
972+ <object class="GtkCheckButton" id="check_MatchAspectRatio">
973+ <property name="label" translatable="yes">_Match photo aspect ratio</property>
974+ <property name="visible">True</property>
975+ <property name="can_focus">True</property>
976+ <property name="receives_default">False</property>
977+ <property name="margin_left">210</property>
978+ <property name="use_underline">True</property>
979+ <property name="xalign">0</property>
980+ <property name="draw_indicator">True</property>
981+ </object>
982+ <packing>
983+ <property name="expand">False</property>
984+ <property name="fill">True</property>
985+ <property name="position">3</property>
986+ </packing>
987+ </child>
988+ <child>
989+ <object class="GtkBox" id="box5">
990+ <property name="visible">True</property>
991+ <property name="can_focus">False</property>
992+ <property name="margin_left">24</property>
993+ <property name="margin_top">2</property>
994+ <property name="margin_bottom">12</property>
995+ <child>
996+ <object class="GtkRadioButton" id="radio_Autosize">
997+ <property name="label" translatable="yes">_Autosize:</property>
998+ <property name="visible">True</property>
999+ <property name="can_focus">True</property>
1000+ <property name="receives_default">False</property>
1001+ <property name="use_underline">True</property>
1002+ <property name="xalign">0</property>
1003+ <property name="active">True</property>
1004+ <property name="draw_indicator">True</property>
1005+ <property name="group">radio_UseCustomSize</property>
1006+ </object>
1007+ <packing>
1008+ <property name="expand">False</property>
1009+ <property name="fill">True</property>
1010+ <property name="position">0</property>
1011+ </packing>
1012+ </child>
1013+ <child>
1014+ <object class="GtkComboBox" id="combo_Autosize">
1015+ <property name="visible">True</property>
1016+ <property name="can_focus">False</property>
1017+ <property name="margin_left">95</property>
1018+ </object>
1019+ <packing>
1020+ <property name="expand">False</property>
1021+ <property name="fill">True</property>
1022+ <property name="position">1</property>
1023+ </packing>
1024+ </child>
1025+ </object>
1026+ <packing>
1027+ <property name="expand">False</property>
1028+ <property name="fill">True</property>
1029+ <property name="position">4</property>
1030+ </packing>
1031+ </child>
1032+ <child>
1033+ <object class="GtkLabel" id="lbl_Titles">
1034+ <property name="visible">True</property>
1035+ <property name="can_focus">False</property>
1036+ <property name="xalign">0</property>
1037+ <property name="label" translatable="yes">&lt;b&gt;Titles&lt;/b&gt;</property>
1038+ <property name="use_markup">True</property>
1039+ </object>
1040+ <packing>
1041+ <property name="expand">False</property>
1042+ <property name="fill">True</property>
1043+ <property name="position">5</property>
1044+ </packing>
1045+ </child>
1046+ <child>
1047+ <object class="GtkBox" id="box6">
1048+ <property name="visible">True</property>
1049+ <property name="can_focus">False</property>
1050+ <property name="margin_left">24</property>
1051+ <property name="margin_top">2</property>
1052+ <child>
1053+ <object class="GtkCheckButton" id="check_PrintImageTitle">
1054+ <property name="label" translatable="yes">Print image _title</property>
1055+ <property name="visible">True</property>
1056+ <property name="can_focus">True</property>
1057+ <property name="receives_default">False</property>
1058+ <property name="use_underline">True</property>
1059+ <property name="xalign">0</property>
1060+ <property name="draw_indicator">True</property>
1061+ </object>
1062+ <packing>
1063+ <property name="expand">False</property>
1064+ <property name="fill">True</property>
1065+ <property name="position">0</property>
1066+ </packing>
1067+ </child>
1068+ <child>
1069+ <object class="GtkFontButton" id="fntbn_TitleFont">
1070+ <property name="visible">True</property>
1071+ <property name="can_focus">True</property>
1072+ <property name="receives_default">True</property>
1073+ <property name="margin_left">49</property>
1074+ <property name="font">Sans Bold 12</property>
1075+ <property name="preview_text"/>
1076+ <property name="show_preview_entry">False</property>
1077+ </object>
1078+ <packing>
1079+ <property name="expand">False</property>
1080+ <property name="fill">True</property>
1081+ <property name="position">1</property>
1082+ </packing>
1083+ </child>
1084+ </object>
1085+ <packing>
1086+ <property name="expand">False</property>
1087+ <property name="fill">True</property>
1088+ <property name="position">6</property>
1089+ </packing>
1090+ </child>
1091+ <child>
1092+ <object class="GtkLabel" id="lbl_PixelResolution">
1093+ <property name="visible">True</property>
1094+ <property name="can_focus">False</property>
1095+ <property name="margin_top">12</property>
1096+ <property name="xalign">0</property>
1097+ <property name="label" translatable="yes">&lt;b&gt;Pixel Resolution&lt;/b&gt;</property>
1098+ <property name="use_markup">True</property>
1099+ </object>
1100+ <packing>
1101+ <property name="expand">False</property>
1102+ <property name="fill">True</property>
1103+ <property name="position">7</property>
1104+ </packing>
1105+ </child>
1106+ <child>
1107+ <object class="GtkBox" id="box7">
1108+ <property name="visible">True</property>
1109+ <property name="can_focus">False</property>
1110+ <property name="margin_left">24</property>
1111+ <property name="margin_top">2</property>
1112+ <child>
1113+ <object class="GtkLabel" id="lbl_OutputPhotoAt">
1114+ <property name="visible">True</property>
1115+ <property name="can_focus">False</property>
1116+ <property name="xalign">0</property>
1117+ <property name="label" translatable="yes">_Output photo at:</property>
1118+ <property name="use_underline">True</property>
1119+ <property name="mnemonic_widget">entry_PixelsPerInch</property>
1120+ <property name="ellipsize">start</property>
1121+ </object>
1122+ <packing>
1123+ <property name="expand">False</property>
1124+ <property name="fill">True</property>
1125+ <property name="position">0</property>
1126+ </packing>
1127+ </child>
1128+ <child>
1129+ <object class="GtkBox" id="box8">
1130+ <property name="visible">True</property>
1131+ <property name="can_focus">False</property>
1132+ <property name="margin_left">65</property>
1133+ <child>
1134+ <object class="GtkEntry" id="entry_PixelsPerInch">
1135+ <property name="visible">True</property>
1136+ <property name="can_focus">True</property>
1137+ <property name="margin_right">8</property>
1138+ <property name="invisible_char">●</property>
1139+ <property name="width_chars">13</property>
1140+ </object>
1141+ <packing>
1142+ <property name="expand">False</property>
1143+ <property name="fill">True</property>
1144+ <property name="position">0</property>
1145+ </packing>
1146+ </child>
1147+ <child>
1148+ <object class="GtkLabel" id="lbl_PixelsPerInch">
1149+ <property name="visible">True</property>
1150+ <property name="can_focus">False</property>
1151+ <property name="label" translatable="yes">pixels per inch</property>
1152+ </object>
1153+ <packing>
1154+ <property name="expand">False</property>
1155+ <property name="fill">True</property>
1156+ <property name="position">1</property>
1157+ </packing>
1158+ </child>
1159+ </object>
1160+ <packing>
1161+ <property name="expand">False</property>
1162+ <property name="fill">True</property>
1163+ <property name="position">1</property>
1164+ </packing>
1165+ </child>
1166+ </object>
1167+ <packing>
1168+ <property name="expand">False</property>
1169+ <property name="fill">True</property>
1170+ <property name="position">8</property>
1171+ </packing>
1172+ </child>
1173+ </object>
1174+ <object class="GtkBox" id="dialog-vbox2">
1175+ <property name="visible">True</property>
1176+ <property name="can_focus">False</property>
1177+ <property name="orientation">vertical</property>
1178+ <child>
1179+ <object class="GtkLabel" id="label">
1180+ <property name="visible">True</property>
1181+ <property name="can_focus">False</property>
1182+ <property name="xalign">0</property>
1183+ <property name="xpad">4</property>
1184+ <property name="label" translatable="yes">label</property>
1185+ </object>
1186+ <packing>
1187+ <property name="expand">False</property>
1188+ <property name="fill">True</property>
1189+ <property name="padding">4</property>
1190+ <property name="position">0</property>
1191+ </packing>
1192+ </child>
1193+ <child>
1194+ <object class="GtkEntry" id="entry">
1195+ <property name="visible">True</property>
1196+ <property name="can_focus">True</property>
1197+ <property name="margin_left">7</property>
1198+ <property name="margin_right">7</property>
1199+ <property name="margin_bottom">2</property>
1200+ <property name="invisible_char">●</property>
1201+ <property name="activates_default">True</property>
1202+ </object>
1203+ <packing>
1204+ <property name="expand">False</property>
1205+ <property name="fill">True</property>
1206+ <property name="padding">1</property>
1207+ <property name="position">1</property>
1208+ </packing>
1209+ </child>
1210+ <child>
1211+ <placeholder/>
1212+ </child>
1213+ </object>
1214+ <object class="GtkBox" id="dialog-vbox4">
1215+ <property name="visible">True</property>
1216+ <property name="can_focus">False</property>
1217+ <property name="hexpand">True</property>
1218+ <property name="vexpand">True</property>
1219+ <property name="orientation">vertical</property>
1220+ <child>
1221+ <object class="GtkLabel" id="label9">
1222+ <property name="visible">True</property>
1223+ <property name="can_focus">False</property>
1224+ <property name="xalign">0</property>
1225+ <property name="xpad">4</property>
1226+ <property name="label" translatable="yes">label</property>
1227+ </object>
1228+ <packing>
1229+ <property name="expand">False</property>
1230+ <property name="fill">True</property>
1231+ <property name="padding">4</property>
1232+ <property name="position">0</property>
1233+ </packing>
1234+ </child>
1235+ <child>
1236+ <object class="GtkScrolledWindow" id="scrolledwindow1">
1237+ <property name="visible">True</property>
1238+ <property name="can_focus">True</property>
1239+ <property name="shadow_type">in</property>
1240+ <child>
1241+ <object class="GtkTextView" id="textview1">
1242+ <property name="visible">True</property>
1243+ <property name="can_focus">True</property>
1244+ <property name="margin_left">7</property>
1245+ <property name="margin_right">7</property>
1246+ <property name="margin_bottom">2</property>
1247+ <property name="hexpand">True</property>
1248+ <property name="vexpand">True</property>
1249+ <property name="border_width">1</property>
1250+ <property name="wrap_mode">word</property>
1251+ <property name="accepts_tab">False</property>
1252+ </object>
1253+ </child>
1254+ </object>
1255+ <packing>
1256+ <property name="expand">True</property>
1257+ <property name="fill">True</property>
1258+ <property name="position">1</property>
1259+ </packing>
1260+ </child>
1261+ <child>
1262+ <placeholder/>
1263+ </child>
1264+ </object>
1265+ <object class="GtkBox" id="plugin-manifest">
1266+ <property name="visible">True</property>
1267+ <property name="can_focus">False</property>
1268+ <property name="orientation">vertical</property>
1269+ <child>
1270+ <object class="GtkAlignment" id="plugin-list-alignment">
1271+ <property name="visible">True</property>
1272+ <property name="can_focus">False</property>
1273+ <child>
1274+ <object class="GtkScrolledWindow" id="plugin-list-scrolled-window">
1275+ <property name="visible">True</property>
1276+ <property name="can_focus">True</property>
1277+ <property name="hscrollbar_policy">never</property>
1278+ <property name="shadow_type">etched-in</property>
1279+ <child>
1280+ <placeholder/>
1281+ </child>
1282+ </object>
1283+ </child>
1284+ </object>
1285+ <packing>
1286+ <property name="expand">True</property>
1287+ <property name="fill">True</property>
1288+ <property name="position">0</property>
1289+ </packing>
1290+ </child>
1291+ <child>
1292+ <object class="GtkHButtonBox" id="hbuttonbox1">
1293+ <property name="visible">True</property>
1294+ <property name="can_focus">False</property>
1295+ <property name="layout_style">end</property>
1296+ <child>
1297+ <object class="GtkButton" id="about-plugin-button">
1298+ <property name="label">gtk-about</property>
1299+ <property name="visible">True</property>
1300+ <property name="can_focus">True</property>
1301+ <property name="receives_default">True</property>
1302+ <property name="use_stock">True</property>
1303+ </object>
1304+ <packing>
1305+ <property name="expand">False</property>
1306+ <property name="fill">False</property>
1307+ <property name="position">0</property>
1308+ </packing>
1309+ </child>
1310+ </object>
1311+ <packing>
1312+ <property name="expand">False</property>
1313+ <property name="fill">False</property>
1314+ <property name="padding">6</property>
1315+ <property name="position">1</property>
1316+ </packing>
1317+ </child>
1318+ </object>
1319+ <object class="GtkBox" id="preferences_external">
1320+ <property name="visible">True</property>
1321+ <property name="can_focus">False</property>
1322+ <property name="orientation">vertical</property>
1323+ <child>
1324+ <object class="GtkAlignment" id="alignment11">
1325+ <property name="visible">True</property>
1326+ <property name="can_focus">False</property>
1327+ <property name="border_width">6</property>
1328+ <property name="xalign">0</property>
1329+ <property name="yalign">0</property>
1330+ <property name="yscale">0</property>
1331+ <child>
1332+ <object class="GtkBox" id="hbox6">
1333+ <property name="visible">True</property>
1334+ <property name="can_focus">False</property>
1335+ <child>
1336+ <object class="GtkAlignment" id="labels: external editors1">
1337+ <property name="visible">True</property>
1338+ <property name="can_focus">False</property>
1339+ <property name="left_padding">6</property>
1340+ <child>
1341+ <object class="GtkBox" id="vbox1">
1342+ <property name="visible">True</property>
1343+ <property name="can_focus">False</property>
1344+ <property name="orientation">vertical</property>
1345+ <property name="spacing">6</property>
1346+ <child>
1347+ <object class="GtkLabel" id="label18">
1348+ <property name="visible">True</property>
1349+ <property name="can_focus">False</property>
1350+ <property name="xalign">0</property>
1351+ <property name="xpad">4</property>
1352+ <property name="label" translatable="yes">E_xternal photo editor:</property>
1353+ <property name="use_underline">True</property>
1354+ <property name="mnemonic_widget">external_photo_editor_combo2</property>
1355+ </object>
1356+ <packing>
1357+ <property name="expand">True</property>
1358+ <property name="fill">True</property>
1359+ <property name="position">0</property>
1360+ </packing>
1361+ </child>
1362+ <child>
1363+ <object class="GtkLabel" id="label19">
1364+ <property name="visible">True</property>
1365+ <property name="can_focus">False</property>
1366+ <property name="xalign">0</property>
1367+ <property name="xpad">4</property>
1368+ <property name="label" translatable="yes">External _RAW editor:</property>
1369+ <property name="use_underline">True</property>
1370+ <property name="mnemonic_widget">external_raw_editor_combo2</property>
1371+ </object>
1372+ <packing>
1373+ <property name="expand">True</property>
1374+ <property name="fill">True</property>
1375+ <property name="position">1</property>
1376+ </packing>
1377+ </child>
1378+ </object>
1379+ </child>
1380+ </object>
1381+ <packing>
1382+ <property name="expand">True</property>
1383+ <property name="fill">True</property>
1384+ <property name="position">0</property>
1385+ </packing>
1386+ </child>
1387+ <child>
1388+ <object class="GtkBox" id="vbox4">
1389+ <property name="visible">True</property>
1390+ <property name="can_focus">False</property>
1391+ <property name="orientation">vertical</property>
1392+ <property name="spacing">6</property>
1393+ <child>
1394+ <object class="GtkComboBox" id="external_photo_editor_combo">
1395+ <property name="visible">True</property>
1396+ <property name="can_focus">False</property>
1397+ </object>
1398+ <packing>
1399+ <property name="expand">True</property>
1400+ <property name="fill">True</property>
1401+ <property name="position">0</property>
1402+ </packing>
1403+ </child>
1404+ <child>
1405+ <object class="GtkComboBox" id="external_raw_editor_combo">
1406+ <property name="visible">True</property>
1407+ <property name="can_focus">False</property>
1408+ </object>
1409+ <packing>
1410+ <property name="expand">True</property>
1411+ <property name="fill">True</property>
1412+ <property name="position">1</property>
1413+ </packing>
1414+ </child>
1415+ </object>
1416+ <packing>
1417+ <property name="expand">True</property>
1418+ <property name="fill">True</property>
1419+ <property name="position">1</property>
1420+ </packing>
1421+ </child>
1422+ </object>
1423+ </child>
1424+ </object>
1425+ <packing>
1426+ <property name="expand">False</property>
1427+ <property name="fill">True</property>
1428+ <property name="position">0</property>
1429+ </packing>
1430+ </child>
1431+ </object>
1432+ <object class="GtkBox" id="preferences_library">
1433+ <property name="visible">True</property>
1434+ <property name="can_focus">False</property>
1435+ <property name="orientation">vertical</property>
1436+ <child>
1437+ <object class="GtkAlignment" id="alignment3">
1438+ <property name="visible">True</property>
1439+ <property name="can_focus">False</property>
1440+ <property name="border_width">6</property>
1441+ <child>
1442+ <object class="GtkTable" id="table2">
1443+ <property name="visible">True</property>
1444+ <property name="can_focus">False</property>
1445+ <property name="n_rows">14</property>
1446+ <property name="n_columns">2</property>
1447+ <property name="column_spacing">8</property>
1448+ <property name="row_spacing">4</property>
1449+ <child>
1450+ <object class="GtkFileChooserButton" id="library_dir_button">
1451+ <property name="visible">True</property>
1452+ <property name="can_focus">False</property>
1453+ <property name="action">select-folder</property>
1454+ </object>
1455+ <packing>
1456+ <property name="left_attach">1</property>
1457+ <property name="right_attach">2</property>
1458+ <property name="top_attach">3</property>
1459+ <property name="bottom_attach">4</property>
1460+ </packing>
1461+ </child>
1462+ <child>
1463+ <object class="GtkBox" id="slider container">
1464+ <property name="visible">True</property>
1465+ <property name="can_focus">False</property>
1466+ <property name="spacing">6</property>
1467+ <child>
1468+ <object class="GtkLabel" id="label11">
1469+ <property name="visible">True</property>
1470+ <property name="can_focus">False</property>
1471+ <property name="label" translatable="yes">white</property>
1472+ </object>
1473+ <packing>
1474+ <property name="expand">False</property>
1475+ <property name="fill">True</property>
1476+ <property name="position">0</property>
1477+ </packing>
1478+ </child>
1479+ <child>
1480+ <object class="GtkHScale" id="bg_color_slider">
1481+ <property name="width_request">150</property>
1482+ <property name="visible">True</property>
1483+ <property name="can_focus">True</property>
1484+ <property name="adjustment">bg_color_adjustment</property>
1485+ <property name="draw_value">False</property>
1486+ <property name="value_pos">left</property>
1487+ </object>
1488+ <packing>
1489+ <property name="expand">True</property>
1490+ <property name="fill">True</property>
1491+ <property name="position">1</property>
1492+ </packing>
1493+ </child>
1494+ <child>
1495+ <object class="GtkLabel" id="label12">
1496+ <property name="visible">True</property>
1497+ <property name="can_focus">False</property>
1498+ <property name="label" translatable="yes">black</property>
1499+ </object>
1500+ <packing>
1501+ <property name="expand">False</property>
1502+ <property name="fill">True</property>
1503+ <property name="position">2</property>
1504+ </packing>
1505+ </child>
1506+ </object>
1507+ <packing>
1508+ <property name="left_attach">1</property>
1509+ <property name="right_attach">2</property>
1510+ <property name="top_attach">1</property>
1511+ <property name="bottom_attach">2</property>
1512+ </packing>
1513+ </child>
1514+ <child>
1515+ <object class="GtkAlignment" id="alignment6">
1516+ <property name="visible">True</property>
1517+ <property name="can_focus">False</property>
1518+ <property name="top_padding">14</property>
1519+ <property name="bottom_padding">3</property>
1520+ <child>
1521+ <object class="GtkLabel" id="library location1">
1522+ <property name="visible">True</property>
1523+ <property name="can_focus">False</property>
1524+ <property name="xalign">0</property>
1525+ <property name="label" translatable="yes">Library Location:</property>
1526+ <attributes>
1527+ <attribute name="weight" value="bold"/>
1528+ </attributes>
1529+ </object>
1530+ </child>
1531+ </object>
1532+ <packing>
1533+ <property name="right_attach">2</property>
1534+ <property name="top_attach">2</property>
1535+ <property name="bottom_attach">3</property>
1536+ </packing>
1537+ </child>
1538+ <child>
1539+ <object class="GtkAlignment" id="alignment7">
1540+ <property name="visible">True</property>
1541+ <property name="can_focus">False</property>
1542+ <property name="top_padding">2</property>
1543+ <property name="left_padding">10</property>
1544+ <child>
1545+ <object class="GtkCheckButton" id="autoimport">
1546+ <property name="label" translatable="yes">_Watch library directory for new files</property>
1547+ <property name="visible">True</property>
1548+ <property name="can_focus">True</property>
1549+ <property name="receives_default">False</property>
1550+ <property name="use_underline">True</property>
1551+ <property name="xalign">0</property>
1552+ <property name="draw_indicator">True</property>
1553+ </object>
1554+ </child>
1555+ </object>
1556+ <packing>
1557+ <property name="right_attach">2</property>
1558+ <property name="top_attach">4</property>
1559+ <property name="bottom_attach">5</property>
1560+ <property name="x_options">GTK_FILL</property>
1561+ <property name="y_options"/>
1562+ </packing>
1563+ </child>
1564+ <child>
1565+ <object class="GtkAlignment" id="label: metadata1">
1566+ <property name="visible">True</property>
1567+ <property name="can_focus">False</property>
1568+ <property name="top_padding">14</property>
1569+ <property name="bottom_padding">3</property>
1570+ <child>
1571+ <object class="GtkLabel" id="label13">
1572+ <property name="visible">True</property>
1573+ <property name="can_focus">False</property>
1574+ <property name="xalign">0</property>
1575+ <property name="label" translatable="yes">Metadata:</property>
1576+ <attributes>
1577+ <attribute name="weight" value="bold"/>
1578+ </attributes>
1579+ </object>
1580+ </child>
1581+ </object>
1582+ <packing>
1583+ <property name="right_attach">2</property>
1584+ <property name="top_attach">10</property>
1585+ <property name="bottom_attach">11</property>
1586+ </packing>
1587+ </child>
1588+ <child>
1589+ <object class="GtkAlignment" id="label: metadate write1">
1590+ <property name="visible">True</property>
1591+ <property name="can_focus">False</property>
1592+ <property name="left_padding">10</property>
1593+ <child>
1594+ <object class="GtkCheckButton" id="write_metadata">
1595+ <property name="label" translatable="yes">Write tags, titles, and other _metadata to photo files</property>
1596+ <property name="visible">True</property>
1597+ <property name="can_focus">True</property>
1598+ <property name="receives_default">False</property>
1599+ <property name="use_underline">True</property>
1600+ <property name="xalign">0</property>
1601+ <property name="draw_indicator">True</property>
1602+ </object>
1603+ </child>
1604+ </object>
1605+ <packing>
1606+ <property name="right_attach">2</property>
1607+ <property name="top_attach">11</property>
1608+ <property name="bottom_attach">12</property>
1609+ </packing>
1610+ </child>
1611+ <child>
1612+ <object class="GtkAlignment" id="label: display1">
1613+ <property name="visible">True</property>
1614+ <property name="can_focus">False</property>
1615+ <property name="bottom_padding">3</property>
1616+ <child>
1617+ <object class="GtkLabel" id="label14">
1618+ <property name="visible">True</property>
1619+ <property name="can_focus">False</property>
1620+ <property name="xalign">0</property>
1621+ <property name="label" translatable="yes">Display:</property>
1622+ <attributes>
1623+ <attribute name="weight" value="bold"/>
1624+ </attributes>
1625+ </object>
1626+ </child>
1627+ </object>
1628+ <packing>
1629+ <property name="right_attach">2</property>
1630+ </packing>
1631+ </child>
1632+ <child>
1633+ <object class="GtkAlignment" id="label: import to1">
1634+ <property name="visible">True</property>
1635+ <property name="can_focus">False</property>
1636+ <property name="left_padding">10</property>
1637+ <child>
1638+ <object class="GtkLabel" id="label15">
1639+ <property name="visible">True</property>
1640+ <property name="can_focus">False</property>
1641+ <property name="xalign">0</property>
1642+ <property name="label" translatable="yes">_Import photos to:</property>
1643+ <property name="use_underline">True</property>
1644+ <property name="mnemonic_widget">library_dir_button2</property>
1645+ </object>
1646+ </child>
1647+ </object>
1648+ <packing>
1649+ <property name="top_attach">3</property>
1650+ <property name="bottom_attach">4</property>
1651+ <property name="x_options">GTK_FILL</property>
1652+ <property name="y_options">GTK_FILL</property>
1653+ </packing>
1654+ </child>
1655+ <child>
1656+ <object class="GtkAlignment" id="label: background1">
1657+ <property name="visible">True</property>
1658+ <property name="can_focus">False</property>
1659+ <child>
1660+ <object class="GtkLabel" id="bg_color_label1">
1661+ <property name="visible">True</property>
1662+ <property name="can_focus">False</property>
1663+ <property name="xalign">0</property>
1664+ <property name="xpad">10</property>
1665+ <property name="label" translatable="yes">_Background:</property>
1666+ <property name="use_underline">True</property>
1667+ <property name="mnemonic_widget">bg_color_slider2</property>
1668+ </object>
1669+ </child>
1670+ </object>
1671+ <packing>
1672+ <property name="top_attach">1</property>
1673+ <property name="bottom_attach">2</property>
1674+ <property name="x_options">GTK_FILL</property>
1675+ </packing>
1676+ </child>
1677+ <child>
1678+ <object class="GtkAlignment" id="label: directory structure1">
1679+ <property name="visible">True</property>
1680+ <property name="can_focus">False</property>
1681+ <property name="left_padding">10</property>
1682+ <child>
1683+ <object class="GtkLabel" id="dir_structure_label1">
1684+ <property name="visible">True</property>
1685+ <property name="can_focus">False</property>
1686+ <property name="xalign">0</property>
1687+ <property name="label" translatable="yes">_Directory structure:</property>
1688+ <property name="use_underline">True</property>
1689+ </object>
1690+ </child>
1691+ </object>
1692+ <packing>
1693+ <property name="top_attach">6</property>
1694+ <property name="bottom_attach">7</property>
1695+ </packing>
1696+ </child>
1697+ <child>
1698+ <object class="GtkAlignment" id="dir_choser">
1699+ <property name="visible">True</property>
1700+ <property name="can_focus">False</property>
1701+ <child>
1702+ <placeholder/>
1703+ </child>
1704+ </object>
1705+ <packing>
1706+ <property name="left_attach">1</property>
1707+ <property name="right_attach">2</property>
1708+ <property name="top_attach">6</property>
1709+ <property name="bottom_attach">7</property>
1710+ </packing>
1711+ </child>
1712+ <child>
1713+ <object class="GtkAlignment" id="label: patern1">
1714+ <property name="visible">True</property>
1715+ <property name="can_focus">False</property>
1716+ <property name="left_padding">34</property>
1717+ <child>
1718+ <object class="GtkBox" id="hbox5">
1719+ <property name="visible">True</property>
1720+ <property name="can_focus">False</property>
1721+ <child>
1722+ <object class="GtkLabel" id="patern1">
1723+ <property name="visible">True</property>
1724+ <property name="can_focus">False</property>
1725+ <property name="xalign">0</property>
1726+ <property name="label" translatable="yes">_Pattern:</property>
1727+ <property name="use_underline">True</property>
1728+ <property name="mnemonic_widget">dir_pattern_entry2</property>
1729+ </object>
1730+ <packing>
1731+ <property name="expand">True</property>
1732+ <property name="fill">True</property>
1733+ <property name="position">0</property>
1734+ </packing>
1735+ </child>
1736+ <child>
1737+ <object class="GtkLabel" id="pattern_help">
1738+ <property name="visible">True</property>
1739+ <property name="can_focus">False</property>
1740+ <attributes>
1741+ <attribute name="underline" value="True"/>
1742+ </attributes>
1743+ </object>
1744+ <packing>
1745+ <property name="expand">True</property>
1746+ <property name="fill">True</property>
1747+ <property name="position">1</property>
1748+ </packing>
1749+ </child>
1750+ </object>
1751+ </child>
1752+ </object>
1753+ <packing>
1754+ <property name="top_attach">7</property>
1755+ <property name="bottom_attach">8</property>
1756+ </packing>
1757+ </child>
1758+ <child>
1759+ <object class="GtkAlignment" id="entry: pattern1">
1760+ <property name="visible">True</property>
1761+ <property name="can_focus">False</property>
1762+ <child>
1763+ <object class="GtkEntry" id="dir_pattern_entry">
1764+ <property name="visible">True</property>
1765+ <property name="can_focus">True</property>
1766+ <property name="invisible_char">•</property>
1767+ <property name="primary_icon_activatable">False</property>
1768+ <property name="secondary_icon_activatable">False</property>
1769+ </object>
1770+ </child>
1771+ </object>
1772+ <packing>
1773+ <property name="left_attach">1</property>
1774+ <property name="right_attach">2</property>
1775+ <property name="top_attach">7</property>
1776+ <property name="bottom_attach">8</property>
1777+ </packing>
1778+ </child>
1779+ <child>
1780+ <object class="GtkAlignment" id="label: dynamic example1">
1781+ <property name="visible">True</property>
1782+ <property name="can_focus">False</property>
1783+ <child>
1784+ <object class="GtkLabel" id="dynamic example">
1785+ <property name="visible">True</property>
1786+ <property name="can_focus">False</property>
1787+ <property name="xalign">0</property>
1788+ </object>
1789+ </child>
1790+ </object>
1791+ <packing>
1792+ <property name="left_attach">1</property>
1793+ <property name="right_attach">2</property>
1794+ <property name="top_attach">8</property>
1795+ <property name="bottom_attach">9</property>
1796+ </packing>
1797+ </child>
1798+ <child>
1799+ <object class="GtkAlignment" id="label: example1">
1800+ <property name="visible">True</property>
1801+ <property name="can_focus">False</property>
1802+ <property name="left_padding">34</property>
1803+ <child>
1804+ <object class="GtkLabel" id="example1">
1805+ <property name="visible">True</property>
1806+ <property name="can_focus">False</property>
1807+ <property name="xalign">0</property>
1808+ <property name="label" translatable="yes">Example:</property>
1809+ </object>
1810+ </child>
1811+ </object>
1812+ <packing>
1813+ <property name="top_attach">8</property>
1814+ <property name="bottom_attach">9</property>
1815+ </packing>
1816+ </child>
1817+ <child>
1818+ <object class="GtkAlignment" id="checkbox: lowercase1">
1819+ <property name="visible">True</property>
1820+ <property name="can_focus">False</property>
1821+ <property name="top_padding">2</property>
1822+ <property name="left_padding">10</property>
1823+ <child>
1824+ <object class="GtkCheckButton" id="lowercase">
1825+ <property name="label" translatable="yes">R_ename imported files to lowercase</property>
1826+ <property name="visible">True</property>
1827+ <property name="can_focus">True</property>
1828+ <property name="receives_default">False</property>
1829+ <property name="use_underline">True</property>
1830+ <property name="xalign">0</property>
1831+ <property name="draw_indicator">True</property>
1832+ </object>
1833+ </child>
1834+ </object>
1835+ <packing>
1836+ <property name="right_attach">2</property>
1837+ <property name="top_attach">9</property>
1838+ <property name="bottom_attach">10</property>
1839+ <property name="x_options">GTK_FILL</property>
1840+ <property name="y_options"/>
1841+ </packing>
1842+ </child>
1843+ <child>
1844+ <object class="GtkAlignment" id="label: developer1">
1845+ <property name="visible">True</property>
1846+ <property name="can_focus">False</property>
1847+ <property name="top_padding">14</property>
1848+ <property name="bottom_padding">3</property>
1849+ <child>
1850+ <object class="GtkLabel" id="label16">
1851+ <property name="visible">True</property>
1852+ <property name="can_focus">False</property>
1853+ <property name="xalign">0</property>
1854+ <property name="label" translatable="yes">RAW Developer:</property>
1855+ <attributes>
1856+ <attribute name="weight" value="bold"/>
1857+ </attributes>
1858+ </object>
1859+ </child>
1860+ </object>
1861+ <packing>
1862+ <property name="right_attach">2</property>
1863+ <property name="top_attach">12</property>
1864+ <property name="bottom_attach">13</property>
1865+ </packing>
1866+ </child>
1867+ <child>
1868+ <object class="GtkComboBoxText" id="default_raw_developer">
1869+ <property name="visible">True</property>
1870+ <property name="can_focus">False</property>
1871+ </object>
1872+ <packing>
1873+ <property name="left_attach">1</property>
1874+ <property name="right_attach">2</property>
1875+ <property name="top_attach">13</property>
1876+ <property name="bottom_attach">14</property>
1877+ </packing>
1878+ </child>
1879+ <child>
1880+ <object class="GtkAlignment" id="alignment10">
1881+ <property name="visible">True</property>
1882+ <property name="can_focus">False</property>
1883+ <property name="left_padding">10</property>
1884+ <child>
1885+ <object class="GtkLabel" id="label17">
1886+ <property name="visible">True</property>
1887+ <property name="can_focus">False</property>
1888+ <property name="xalign">0</property>
1889+ <property name="label" translatable="yes">De_fault:</property>
1890+ <property name="use_underline">True</property>
1891+ <property name="mnemonic_widget">default_raw_developer2</property>
1892+ </object>
1893+ </child>
1894+ </object>
1895+ <packing>
1896+ <property name="top_attach">13</property>
1897+ <property name="bottom_attach">14</property>
1898+ </packing>
1899+ </child>
1900+ <child>
1901+ <object class="GtkAlignment" id="label: importing1">
1902+ <property name="visible">True</property>
1903+ <property name="can_focus">False</property>
1904+ <property name="top_padding">14</property>
1905+ <property name="bottom_padding">3</property>
1906+ <child>
1907+ <object class="GtkLabel" id="importing1">
1908+ <property name="visible">True</property>
1909+ <property name="can_focus">False</property>
1910+ <property name="xalign">0</property>
1911+ <property name="label" translatable="yes">Importing:</property>
1912+ <attributes>
1913+ <attribute name="weight" value="bold"/>
1914+ </attributes>
1915+ </object>
1916+ </child>
1917+ </object>
1918+ <packing>
1919+ <property name="right_attach">2</property>
1920+ <property name="top_attach">5</property>
1921+ <property name="bottom_attach">6</property>
1922+ </packing>
1923+ </child>
1924+ </object>
1925+ </child>
1926+ </object>
1927+ <packing>
1928+ <property name="expand">False</property>
1929+ <property name="fill">True</property>
1930+ <property name="position">0</property>
1931+ </packing>
1932+ </child>
1933+ </object>
1934+ <object class="GtkBox" id="preferences_plugins">
1935+ <property name="visible">True</property>
1936+ <property name="can_focus">False</property>
1937+ <property name="orientation">vertical</property>
1938+ <child>
1939+ <object class="GtkAlignment" id="plugin-manifest-bin">
1940+ <property name="visible">True</property>
1941+ <property name="can_focus">False</property>
1942+ <property name="top_padding">12</property>
1943+ <property name="bottom_padding">12</property>
1944+ <property name="left_padding">12</property>
1945+ <property name="right_padding">12</property>
1946+ <child>
1947+ <placeholder/>
1948+ </child>
1949+ </object>
1950+ <packing>
1951+ <property name="expand">True</property>
1952+ <property name="fill">True</property>
1953+ <property name="position">0</property>
1954+ </packing>
1955+ </child>
1956+ </object>
1957 <object class="GtkBox" id="progress_pane_widget">
1958 <property name="visible">True</property>
1959 <property name="can_focus">False</property>
1960@@ -1529,8 +2164,6 @@
1961 <object class="GtkComboBoxText" id="transition_effect_selector">
1962 <property name="visible">True</property>
1963 <property name="can_focus">False</property>
1964- <property name="entry_text_column">0</property>
1965- <property name="id_column">1</property>
1966 </object>
1967 <packing>
1968 <property name="left_attach">1</property>
1969@@ -1572,7 +2205,6 @@
1970 <property name="visible">True</property>
1971 <property name="can_focus">True</property>
1972 <property name="invisible_char">●</property>
1973- <property name="invisible_char_set">True</property>
1974 </object>
1975 <packing>
1976 <property name="left_attach">2</property>
1977@@ -1586,7 +2218,6 @@
1978 <property name="visible">True</property>
1979 <property name="can_focus">True</property>
1980 <property name="invisible_char">●</property>
1981- <property name="invisible_char_set">True</property>
1982 <property name="digits">1</property>
1983 </object>
1984 <packing>

Subscribers

People subscribed via source and target branches

to all changes: