Photos

Merge lp:~fabiozaramella/pantheon-photos/fix-1322404 into lp:~pantheon-photos/pantheon-photos/trunk

  1. fix-1322404
  2. Merge into trunk
Proposed by Fabio Zaramella
Status: Merged
Approved by: Cody Garver
Approved revision: 2678
Merged at revision: 2682
Proposed branch: lp:~fabiozaramella/pantheon-photos/fix-1322404
Merge into: lp:~pantheon-photos/pantheon-photos/trunk
Diff against target: 1999 lines (+703/-851)
4 files modified
po/shotwell.pot (+9/-1)
src/Dialogs.vala (+0/-46)
src/Resources.vala (+1/-1)
ui/shotwell.glade (+693/-803)
To merge this branch: bzr merge lp:~fabiozaramella/pantheon-photos/fix-1322404
Reviewer Review Type Date Requested Status
Viko Adi Rahmawan (community) code Approve
elementary UX ux Pending
Review via email: mp+241723@code.launchpad.net

Commit message

Remove background color option (lp:1322404)

Description of the change

The code is from an old branch it just needed to be based on latest code

To post a comment you must log in.
Revision history for this message
Viko Adi Rahmawan (vikoadi) wrote :

code is good

review: Approve (code)

Preview Diff

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

Subscribers

People subscribed via source and target branches