diff options
Diffstat (limited to 'rapid/glade3')
| -rw-r--r-- | rapid/glade3/about.ui | 1 | ||||
| -rw-r--r-- | rapid/glade3/prefs.ui | 689 | ||||
| -rw-r--r-- | rapid/glade3/rapid.ui | 153 |
3 files changed, 207 insertions, 636 deletions
diff --git a/rapid/glade3/about.ui b/rapid/glade3/about.ui index 3e59698..7e10e37 100644 --- a/rapid/glade3/about.ui +++ b/rapid/glade3/about.ui @@ -55,6 +55,7 @@ Aron Xu <happyaron.xu@gmail.com> <object class="GtkBox" id="dialog-vbox1"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="orientation">vertical</property> <property name="spacing">2</property> <child internal-child="action_area"> <object class="GtkButtonBox" id="dialog-action_area1"> diff --git a/rapid/glade3/prefs.ui b/rapid/glade3/prefs.ui index 0a13978..2e0e53c 100644 --- a/rapid/glade3/prefs.ui +++ b/rapid/glade3/prefs.ui @@ -1,7 +1,7 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0"?> <interface> <requires lib="gtk+" version="2.16"/> - <!-- interface-naming-policy project-wide --> + <!-- interface-naming-policy toplevel-contextual --> <object class="GtkAdjustment" id="hour_adjustment"> <property name="upper">23</property> <property name="step_increment">1</property> @@ -13,7 +13,6 @@ <property name="page_increment">10</property> </object> <object class="GtkDialog" id="preferencesdialog"> - <property name="can_focus">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="border_width">5</property> <property name="title" translatable="yes">Preferences: Rapid Photo Downloader</property> @@ -22,69 +21,21 @@ <property name="default_height">500</property> <property name="icon">rapid-photo-downloader.svg</property> <property name="type_hint">dialog</property> - <signal name="destroy" handler="on_preferencesdialog_destroy" swapped="no"/> - <signal name="response" handler="on_preferencesdialog_response" swapped="no"/> + <signal name="destroy" handler="on_preferencesdialog_destroy"/> + <signal name="response" handler="on_preferencesdialog_response"/> <child internal-child="vbox"> <object class="GtkVBox" id="dialog-vbox2"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="spacing">2</property> - <child internal-child="action_area"> - <object class="GtkHButtonBox" id="dialog-action_area2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="layout_style">end</property> - <child> - <object class="GtkButton" id="help_button1"> - <property name="label">gtk-help</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> - <property name="use_stock">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - <property name="secondary">True</property> - </packing> - </child> - <child> - <object class="GtkButton" id="close_button"> - <property name="label">gtk-close</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> - <property name="use_stock">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="pack_type">end</property> - <property name="position">0</property> - </packing> - </child> <child> <object class="GtkHBox" id="hbox7"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="spacing">2</property> <child> <object class="GtkScrolledWindow" id="scrolled_window"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="resize_mode">queue</property> - <property name="hscrollbar_policy">automatic</property> - <property name="vscrollbar_policy">automatic</property> <property name="shadow_type">in</property> <child> <object class="GtkTreeView" id="treeview"> @@ -93,13 +44,11 @@ <property name="can_focus">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="headers_visible">False</property> - <signal name="cursor-changed" handler="on_treeview_cursor_changed" swapped="no"/> + <signal name="cursor_changed" handler="on_treeview_cursor_changed"/> </object> </child> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> <property name="padding">5</property> <property name="position">0</property> </packing> @@ -112,33 +61,27 @@ <child> <object class="GtkVBox" id="folder_tab"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="spacing">12</property> <child> <object class="GtkVBox" id="vbox6"> <property name="visible">True</property> - <property name="can_focus">False</property> <child> <object class="GtkHBox" id="hbox8"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkImage" id="image2"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="stock">gtk-directory</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkLabel" id="label4"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="label" translatable="yes"><span weight="bold" size="x-large">Photo Download Folders</span></property> <property name="use_markup">True</property> </object> @@ -150,19 +93,15 @@ </child> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkHSeparator" id="hseparator1"> <property name="visible">True</property> - <property name="can_focus">False</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">1</property> </packing> </child> @@ -176,29 +115,24 @@ <child> <object class="GtkHBox" id="hbox9"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="spacing">12</property> <child> <object class="GtkLabel" id="label16"> <property name="visible">True</property> - <property name="can_focus">False</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkTable" id="download_folder_table"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="n_rows">7</property> <property name="n_columns">3</property> <child> <object class="GtkLabel" id="example_photo_download_path_label"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes"><i>Example: /home/user/Pictures</i></property> <property name="use_markup">True</property> @@ -214,7 +148,6 @@ <child> <object class="GtkLabel" id="label8"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes"><b>Download Subfolders</b></property> <property name="use_markup">True</property> @@ -229,7 +162,6 @@ <child> <object class="GtkLabel" id="lblPhotos1"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">Download folder:</property> </object> @@ -245,7 +177,6 @@ <child> <object class="GtkLabel" id="label7"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="xalign">0</property> <property name="ypad">12</property> <property name="label" translatable="yes">Choose the download folder. Subfolders for the downloaded photos will be automatically created in this folder using the structure specified below.</property> @@ -263,7 +194,6 @@ <child> <object class="GtkLabel" id="label5"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes"><b>Download Folder</b></property> <property name="use_markup">True</property> @@ -276,7 +206,6 @@ <child> <object class="GtkLabel" id="photo_subfolder_warning_label"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="xalign">0</property> <property name="yalign">0</property> <property name="wrap">True</property> @@ -293,7 +222,6 @@ <child> <object class="GtkVBox" id="subfolder_vbox"> <property name="visible">True</property> - <property name="can_focus">False</property> <child> <placeholder/> </child> @@ -326,26 +254,20 @@ </child> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> <object class="GtkLabel" id="label23"> <property name="visible">True</property> - <property name="can_focus">False</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">2</property> </packing> </child> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> <property name="padding">12</property> <property name="position">1</property> </packing> @@ -358,7 +280,6 @@ <child type="tab"> <object class="GtkLabel" id="download_label"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="label" translatable="yes">Photo Folders</property> </object> <packing> @@ -368,57 +289,46 @@ <child> <object class="GtkVBox" id="rename_tab"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="spacing">12</property> <child> <object class="GtkVBox" id="vbox7"> <property name="visible">True</property> - <property name="can_focus">False</property> <child> <object class="GtkHBox" id="hbox10"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkImage" id="image3"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="stock">gtk-convert</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkLabel" id="label6"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="label" translatable="yes"><span weight="bold" size="x-large">Photo Rename</span> </property> <property name="use_markup">True</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">1</property> </packing> </child> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkHSeparator" id="hseparator2"> <property name="visible">True</property> - <property name="can_focus">False</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">1</property> </packing> </child> @@ -432,34 +342,28 @@ <child> <object class="GtkHBox" id="hbox12"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="spacing">12</property> <child> <object class="GtkLabel" id="label24"> <property name="visible">True</property> - <property name="can_focus">False</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkVBox" id="rename_vbox"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="spacing">12</property> <child> <object class="GtkLabel" id="label42"> - <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes"><b>Photo Rename</b></property> <property name="use_markup">True</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">0</property> </packing> </child> @@ -467,19 +371,15 @@ <object class="GtkScrolledWindow" id="rename_scrolledwindow"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="hscrollbar_policy">automatic</property> - <property name="vscrollbar_policy">automatic</property> <property name="window_placement_set">True</property> <child> <object class="GtkViewport" id="viewport2"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="resize_mode">queue</property> <property name="shadow_type">none</property> <child> <object class="GtkVBox" id="rename_table_vbox"> <property name="visible">True</property> - <property name="can_focus">False</property> <child> <placeholder/> </child> @@ -489,21 +389,17 @@ </child> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> <object class="GtkTable" id="rename_example_table"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="n_rows">3</property> <property name="n_columns">3</property> <child> <object class="GtkLabel" id="label17"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="label" translatable="yes"> </property> </object> <packing> @@ -515,7 +411,6 @@ <child> <object class="GtkLabel" id="label15"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="label" translatable="yes"> </property> </object> <packing> @@ -528,7 +423,6 @@ <child> <object class="GtkLabel" id="new_name_label"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="xalign">0</property> <property name="yalign">0</property> <property name="label">translators please ignore this</property> @@ -545,7 +439,6 @@ <child> <object class="GtkLabel" id="original_name_label"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label">translators please ignore this</property> </object> @@ -560,7 +453,6 @@ <child> <object class="GtkLabel" id="label21"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="xalign">0</property> <property name="yalign">0</property> <property name="label" translatable="yes"><i>New:</i></property> @@ -578,7 +470,6 @@ <child> <object class="GtkLabel" id="label20"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes"><i>Original:</i></property> <property name="use_markup">True</property> @@ -595,7 +486,6 @@ <child> <object class="GtkLabel" id="label14"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes"><b>Example</b></property> <property name="use_markup">True</property> @@ -614,26 +504,20 @@ </child> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> <object class="GtkLabel" id="label25"> <property name="visible">True</property> - <property name="can_focus">False</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">2</property> </packing> </child> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> <property name="padding">12</property> <property name="position">1</property> </packing> @@ -647,7 +531,6 @@ <child type="tab"> <object class="GtkLabel" id="rename_label"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="label" translatable="yes">Photo Rename</property> </object> <packing> @@ -658,33 +541,27 @@ <child> <object class="GtkVBox" id="folder_tab1"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="spacing">12</property> <child> <object class="GtkVBox" id="vbox12"> <property name="visible">True</property> - <property name="can_focus">False</property> <child> <object class="GtkHBox" id="hbox11"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkImage" id="image5"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="stock">gtk-directory</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkLabel" id="label46"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="label" translatable="yes"><span weight="bold" size="x-large">Video Download Folders</span></property> <property name="use_markup">True</property> </object> @@ -696,19 +573,15 @@ </child> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkHSeparator" id="hseparator8"> <property name="visible">True</property> - <property name="can_focus">False</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">1</property> </packing> </child> @@ -721,20 +594,16 @@ </child> <child> <object class="GtkHBox" id="folder_videos_cannot_be_downloaded_hbox"> - <property name="can_focus">False</property> <child> <object class="GtkLabel" id="folder_videos_cannot_be_downloaded_label"> - <property name="can_focus">False</property> <property name="xalign">0</property> <property name="xpad">12</property> <property name="ypad">10</property> - <property name="label" translatable="yes">Sorry, video downloading functionality disabled. To download videos, please install the <i>hachoir metadata</i> and <i>kaa metadata</i> packages for python.</property> + <property name="label" translatable="yes">Sorry, video downloading functionality disabled. To download videos, please install either the <i>hachoir metadata</i> and <i>kaa metadata</i> packages for python, or <i>exiftool</i>.</property> <property name="use_markup">True</property> <property name="wrap">True</property> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> <property name="position">0</property> </packing> </child> @@ -748,29 +617,24 @@ <child> <object class="GtkHBox" id="video_folders_hbox"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="spacing">12</property> <child> <object class="GtkLabel" id="label57"> <property name="visible">True</property> - <property name="can_focus">False</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkTable" id="video_download_folder_table"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="n_rows">7</property> <property name="n_columns">3</property> <child> <object class="GtkLabel" id="lblPhotos2"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">Download folder:</property> </object> @@ -786,7 +650,6 @@ <child> <object class="GtkLabel" id="label59"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="xalign">0</property> <property name="ypad">12</property> <property name="label" translatable="yes">Choose the download folder. Subfolders for the downloaded videos will be automatically created in this folder using the structure specified below.</property> @@ -804,7 +667,6 @@ <child> <object class="GtkLabel" id="label61"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes"><b>Download Folder</b></property> <property name="use_markup">True</property> @@ -817,7 +679,6 @@ <child> <object class="GtkLabel" id="label62"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes"><b>Download Subfolders</b></property> <property name="use_markup">True</property> @@ -832,7 +693,6 @@ <child> <object class="GtkLabel" id="example_video_download_path_label"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes"><i>Example: /home/user/Pictures</i></property> <property name="use_markup">True</property> @@ -848,7 +708,6 @@ <child> <object class="GtkLabel" id="video_subfolder_warning_label"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="xalign">0</property> <property name="yalign">0</property> <property name="wrap">True</property> @@ -865,7 +724,6 @@ <child> <object class="GtkVBox" id="video_subfolder_vbox"> <property name="visible">True</property> - <property name="can_focus">False</property> <child> <placeholder/> </child> @@ -898,26 +756,20 @@ </child> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> <object class="GtkLabel" id="label63"> <property name="visible">True</property> - <property name="can_focus">False</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">2</property> </packing> </child> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> <property name="padding">12</property> <property name="position">2</property> </packing> @@ -930,7 +782,6 @@ <child type="tab"> <object class="GtkLabel" id="video_download_folder"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="label" translatable="yes">Video Folders</property> </object> <packing> @@ -941,57 +792,46 @@ <child> <object class="GtkVBox" id="video_rename_tab"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="spacing">12</property> <child> <object class="GtkVBox" id="vbox10"> <property name="visible">True</property> - <property name="can_focus">False</property> <child> <object class="GtkHBox" id="hbox13"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkImage" id="image1"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="stock">gtk-convert</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkLabel" id="label32"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="label" translatable="yes"><span weight="bold" size="x-large">Video Rename</span> </property> <property name="use_markup">True</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">1</property> </packing> </child> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkHSeparator" id="hseparator4"> <property name="visible">True</property> - <property name="can_focus">False</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">1</property> </packing> </child> @@ -1005,29 +845,24 @@ <child> <object class="GtkHBox" id="hbox14"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="spacing">12</property> <child> <object class="GtkLabel" id="label44"> <property name="visible">True</property> - <property name="can_focus">False</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkVBox" id="rename_vbox1"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="spacing">12</property> <child> <object class="GtkLabel" id="videos_cannot_be_downloaded_label"> - <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Sorry, video downloading functionality disabled. To download videos, please install the <i>hachoir metadata</i> and <i>kaa metadata</i> packages for python.</property> + <property name="label" translatable="yes">Sorry, video downloading functionality disabled. To download videos, please install either the <i>hachoir metadata</i> and <i>kaa metadata</i> packages for python, or <i>exiftool</i>.</property> <property name="use_markup">True</property> <property name="wrap">True</property> </object> @@ -1041,19 +876,15 @@ <object class="GtkScrolledWindow" id="video_rename_scrolledwindow"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="hscrollbar_policy">automatic</property> - <property name="vscrollbar_policy">automatic</property> <property name="window_placement_set">True</property> <child> <object class="GtkViewport" id="viewport1"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="resize_mode">queue</property> <property name="shadow_type">none</property> <child> <object class="GtkVBox" id="video_rename_table_vbox"> <property name="visible">True</property> - <property name="can_focus">False</property> <child> <placeholder/> </child> @@ -1063,21 +894,17 @@ </child> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> <object class="GtkTable" id="video_rename_example_table"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="n_rows">3</property> <property name="n_columns">3</property> <child> <object class="GtkLabel" id="label55"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="label" translatable="yes"> </property> </object> <packing> @@ -1089,7 +916,6 @@ <child> <object class="GtkLabel" id="label56"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="label" translatable="yes"> </property> </object> <packing> @@ -1102,7 +928,6 @@ <child> <object class="GtkLabel" id="video_new_name_label"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="xalign">0</property> <property name="yalign">0</property> <property name="label">translators please ignore this</property> @@ -1119,7 +944,6 @@ <child> <object class="GtkLabel" id="video_original_name_label"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label">translators please ignore this</property> </object> @@ -1134,7 +958,6 @@ <child> <object class="GtkLabel" id="new_video_filename_label"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="xalign">0</property> <property name="yalign">0</property> <property name="label" translatable="yes"><i>New:</i></property> @@ -1152,7 +975,6 @@ <child> <object class="GtkLabel" id="original_video_filename_label"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes"><i>Original:</i></property> <property name="use_markup">True</property> @@ -1169,7 +991,6 @@ <child> <object class="GtkLabel" id="example_video_filename_label"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes"><b>Example</b></property> <property name="use_markup">True</property> @@ -1188,26 +1009,20 @@ </child> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> <object class="GtkLabel" id="label60"> <property name="visible">True</property> - <property name="can_focus">False</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">2</property> </packing> </child> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> <property name="padding">12</property> <property name="position">1</property> </packing> @@ -1220,7 +1035,6 @@ <child type="tab"> <object class="GtkLabel" id="video_rename_label"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="label" translatable="yes">Video Rename</property> </object> <packing> @@ -1231,57 +1045,46 @@ <child> <object class="GtkVBox" id="rename_options_tab"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="spacing">12</property> <child> <object class="GtkVBox" id="vbox14"> <property name="visible">True</property> - <property name="can_focus">False</property> <child> <object class="GtkHBox" id="hbox18"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkImage" id="image7"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="icon_name">input-keyboard</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkLabel" id="label10"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="label" translatable="yes"><span weight="bold" size="x-large">Rename Options</span></property> <property name="use_markup">True</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">1</property> </packing> </child> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkHSeparator" id="hseparator5"> <property name="visible">True</property> - <property name="can_focus">False</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">1</property> </packing> </child> @@ -1295,11 +1098,9 @@ <child> <object class="GtkVBox" id="reame_options_vbox"> <property name="visible">True</property> - <property name="can_focus">False</property> <child> <object class="GtkLabel" id="sequence_number_label"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="xalign">0</property> <property name="xpad">12</property> <property name="label" translatable="yes"><b>Sequence Numbers</b></property> @@ -1307,140 +1108,112 @@ </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkHBox" id="sequence_number_hbox"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="spacing">12</property> <child> <object class="GtkLabel" id="spacer_seq_label"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="xpad">12</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkVBox" id="seq_vbox"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="spacing">12</property> <child> <object class="GtkLabel" id="label47"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">Specify the time in 24 hour format at which the <i>Downloads today</i> sequence number should be reset.</property> <property name="use_markup">True</property> <property name="wrap">True</property> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkHBox" id="hbox23"> <property name="visible">True</property> - <property name="can_focus">False</property> <child> <object class="GtkVBox" id="vbox3"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkLabel" id="label49"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">Day start:</property> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkLabel" id="label51"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">Downloads today:</property> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> <object class="GtkLabel" id="label52"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">Stored number:</property> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> <property name="position">2</property> </packing> </child> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkLabel" id="label54"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="xpad">6</property> <property name="label" translatable="yes"> </property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> <object class="GtkVBox" id="sequence_vbox"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkHBox" id="hbox22"> <property name="visible">True</property> - <property name="can_focus">False</property> <child> <object class="GtkSpinButton" id="hour_spinbutton"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="max_length">2</property> - <property name="invisible_char">•</property> + <property name="invisible_char">•</property> <property name="width_chars">2</property> <property name="xalign">1</property> <property name="truncate_multiline">True</property> - <property name="primary_icon_activatable">False</property> - <property name="secondary_icon_activatable">False</property> - <property name="primary_icon_sensitive">True</property> - <property name="secondary_icon_sensitive">True</property> <property name="adjustment">hour_adjustment</property> <property name="numeric">True</property> - <signal name="value-changed" handler="on_hour_spinbutton_value_changed" swapped="no"/> + <signal name="value_changed" handler="on_hour_spinbutton_value_changed"/> </object> <packing> <property name="expand">False</property> @@ -1451,7 +1224,6 @@ <child> <object class="GtkLabel" id="label50"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="label" translatable="yes">:</property> </object> <packing> @@ -1465,17 +1237,13 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="max_length">2</property> - <property name="invisible_char">•</property> + <property name="invisible_char">•</property> <property name="width_chars">2</property> <property name="xalign">1</property> <property name="truncate_multiline">True</property> - <property name="primary_icon_activatable">False</property> - <property name="secondary_icon_activatable">False</property> - <property name="primary_icon_sensitive">True</property> - <property name="secondary_icon_sensitive">True</property> <property name="adjustment">minute_adjustment</property> <property name="numeric">True</property> - <signal name="value-changed" handler="on_minute_spinbutton_value_changed" swapped="no"/> + <signal name="value_changed" handler="on_minute_spinbutton_value_changed"/> </object> <packing> <property name="expand">False</property> @@ -1486,20 +1254,17 @@ <child> <object class="GtkLabel" id="label53"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes"> hh:mm</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">3</property> </packing> </child> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">0</property> </packing> </child> @@ -1512,14 +1277,11 @@ </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">2</property> </packing> </child> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> <property name="position">1</property> </packing> </child> @@ -1529,38 +1291,30 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_synchronize_raw_jpg_checkbutton_toggled" swapped="no"/> + <signal name="toggled" handler="on_synchronize_raw_jpg_checkbutton_toggled"/> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> <property name="position">2</property> </packing> </child> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> <object class="GtkLabel" id="label48"> <property name="visible">True</property> - <property name="can_focus">False</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">2</property> </packing> </child> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="padding">12</property> <property name="position">1</property> </packing> @@ -1568,7 +1322,6 @@ <child> <object class="GtkLabel" id="compatibility_label"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="xalign">0</property> <property name="xpad">12</property> <property name="label" translatable="yes"><b>Compatibility with Other Operating Systems</b></property> @@ -1576,37 +1329,31 @@ </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">3</property> </packing> </child> <child> <object class="GtkHBox" id="compatibility_hbox"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="spacing">12</property> <child> <object class="GtkLabel" id="compatibility_spacer_label"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="xpad">12</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkTable" id="compatibility_table"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="n_rows">2</property> <property name="n_columns">2</property> <child> <object class="GtkLabel" id="label9"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">Specify whether photo, video and folder names should have any characters removed that are not allowed by other operating systems.</property> <property name="wrap">True</property> @@ -1621,10 +1368,9 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_strip_characters_checkbutton_toggled" swapped="no"/> + <signal name="toggled" handler="on_strip_characters_checkbutton_toggled"/> </object> <packing> <property name="right_attach">2</property> @@ -1634,34 +1380,27 @@ </child> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> <object class="GtkLabel" id="label33"> <property name="visible">True</property> - <property name="can_focus">False</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">2</property> </packing> </child> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="padding">12</property> <property name="position">4</property> </packing> </child> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> <property name="padding">12</property> <property name="position">1</property> </packing> @@ -1674,7 +1413,6 @@ <child type="tab"> <object class="GtkLabel" id="rename_options_label"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="label" translatable="yes">Rename Options</property> </object> <packing> @@ -1685,57 +1423,46 @@ <child> <object class="GtkVBox" id="job_codes_tab"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="spacing">12</property> <child> <object class="GtkVBox" id="job_codes_header_vbox"> <property name="visible">True</property> - <property name="can_focus">False</property> <child> <object class="GtkHBox" id="hbox188"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkImage" id="image77"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="stock">rapid-photo-downloader-jobcode</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkLabel" id="label1340"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="label" translatable="yes"><span weight="bold" size="x-large">Job Codes</span></property> <property name="use_markup">True</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">1</property> </packing> </child> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkHSeparator" id="hseparator44"> <property name="visible">True</property> - <property name="can_focus">False</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">1</property> </packing> </child> @@ -1749,14 +1476,11 @@ <child> <object class="GtkVBox" id="job_codes_vbox"> <property name="visible">True</property> - <property name="can_focus">False</property> <child> <object class="GtkVBox" id="job_code_vbox"> <property name="visible">True</property> - <property name="can_focus">False</property> <child> <object class="GtkLabel" id="job_code_label"> - <property name="can_focus">False</property> <property name="xalign">0</property> <property name="xpad">12</property> <property name="label" translatable="yes"><b>Job Codes</b></property> @@ -1764,23 +1488,19 @@ </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkHBox" id="job_code_hbox"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="spacing">12</property> <child> <object class="GtkLabel" id="job_code_spacer_label"> <property name="visible">True</property> - <property name="can_focus">False</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">0</property> </packing> </child> @@ -1788,8 +1508,6 @@ <object class="GtkScrolledWindow" id="job_code_scrolledwindow"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="hscrollbar_policy">automatic</property> - <property name="vscrollbar_policy">automatic</property> <property name="shadow_type">in</property> <child> <object class="GtkTreeView" id="job_code_treeview"> @@ -1803,18 +1521,15 @@ </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> <object class="GtkHBox" id="job_code_button_hbox"> <property name="visible">True</property> - <property name="can_focus">False</property> <child> <object class="GtkVButtonBox" id="job_code_vbuttonbox"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="spacing">12</property> <property name="layout_style">start</property> <child> @@ -1823,9 +1538,8 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> <property name="use_underline">True</property> - <signal name="clicked" handler="on_add_job_code_button_clicked" swapped="no"/> + <signal name="clicked" handler="on_add_job_code_button_clicked"/> </object> <packing> <property name="expand">False</property> @@ -1839,9 +1553,8 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> <property name="use_stock">True</property> - <signal name="clicked" handler="on_remove_job_code_button_clicked" swapped="no"/> + <signal name="clicked" handler="on_remove_job_code_button_clicked"/> </object> <packing> <property name="expand">False</property> @@ -1855,9 +1568,8 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> <property name="use_underline">True</property> - <signal name="clicked" handler="on_remove_all_job_code_button_clicked" swapped="no"/> + <signal name="clicked" handler="on_remove_all_job_code_button_clicked"/> </object> <packing> <property name="expand">False</property> @@ -1867,22 +1579,17 @@ </child> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> <property name="position">0</property> </packing> </child> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">2</property> </packing> </child> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> <property name="position">1</property> </packing> </child> @@ -1891,15 +1598,11 @@ </child> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> <property name="position">0</property> </packing> </child> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> <property name="position">1</property> </packing> </child> @@ -1911,7 +1614,6 @@ <child type="tab"> <object class="GtkLabel" id="job_codes_tab_label"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="label" translatable="yes">Job Codes</property> </object> <packing> @@ -1922,57 +1624,46 @@ <child> <object class="GtkVBox" id="device_tab"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="spacing">12</property> <child> <object class="GtkVBox" id="vbox4"> <property name="visible">True</property> - <property name="can_focus">False</property> <child> <object class="GtkHBox" id="hbox15"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkImage" id="image6"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">media-flash</property> + <property name="icon_name">drive-removable-media</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkLabel" id="label22"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="label" translatable="yes"><span weight="bold" size="x-large">Devices</span></property> <property name="use_markup">True</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">1</property> </packing> </child> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkHSeparator" id="hseparator6"> <property name="visible">True</property> - <property name="can_focus">False</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">1</property> </packing> </child> @@ -1986,11 +1677,9 @@ <child> <object class="GtkVBox" id="vbox5"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="spacing">12</property> <child> <object class="GtkLabel" id="label41"> - <property name="can_focus">False</property> <property name="xalign">0</property> <property name="xpad">12</property> <property name="label" translatable="yes">Devices</property> @@ -2000,14 +1689,12 @@ </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkLabel" id="label18"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="xalign">0</property> <property name="xpad">12</property> <property name="label" translatable="yes">Devices are from where to download photos and videos, such as cameras, memory cards or Portable Storage Devices. @@ -2019,31 +1706,25 @@ You can download from multiple devices simultaneously, or you can specify a loca <property name="wrap">True</property> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> <object class="GtkHBox" id="hbox16"> <property name="visible">True</property> - <property name="can_focus">False</property> <child> <object class="GtkLabel" id="label26"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="xpad">3</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkTable" id="devices_table"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="n_rows">3</property> <property name="n_columns">2</property> <property name="row_spacing">3</property> @@ -2053,9 +1734,8 @@ You can download from multiple devices simultaneously, or you can specify a loca <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_autodetect_psd_checkbutton_toggled" swapped="no"/> + <signal name="toggled" handler="on_autodetect_psd_checkbutton_toggled"/> </object> <packing> <property name="left_attach">1</property> @@ -2071,9 +1751,8 @@ You can download from multiple devices simultaneously, or you can specify a loca <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="use_action_appearance">False</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_autodetect_device_checkbutton_toggled" swapped="no"/> + <signal name="toggled" handler="on_autodetect_device_checkbutton_toggled"/> </object> <packing> <property name="right_attach">2</property> @@ -2082,7 +1761,6 @@ You can download from multiple devices simultaneously, or you can specify a loca <child> <object class="GtkLabel" id="autodetect_image_devices_label"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="xalign">0</property> <property name="ypad">6</property> <property name="label" translatable="yes">If you enable automatic detection of Portable Storage Devices, the entire device will be scanned. On large devices, this could take some time. @@ -2105,44 +1783,36 @@ When this option is enabled, and a potential device is detected, you will be pro </child> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> <object class="GtkLabel" id="label28"> <property name="visible">True</property> - <property name="can_focus">False</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">2</property> </packing> </child> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">2</property> </packing> </child> <child> <object class="GtkHBox" id="hbox17"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="spacing">12</property> <child> <object class="GtkTable" id="devices2_table"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="n_rows">2</property> <property name="n_columns">2</property> <child> <object class="GtkLabel" id="device_location_label"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="xalign">0</property> <property name="xpad">12</property> <property name="label" translatable="yes">Location:</property> @@ -2157,7 +1827,6 @@ When this option is enabled, and a potential device is detected, you will be pro <child> <object class="GtkLabel" id="device_location_explanation_label"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="xalign">0</property> <property name="xpad">12</property> @@ -2174,8 +1843,6 @@ When this option is enabled, and a potential device is detected, you will be pro </child> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> <property name="position">0</property> </packing> </child> @@ -2185,25 +1852,21 @@ When this option is enabled, and a potential device is detected, you will be pro <child> <object class="GtkLabel" id="label30"> <property name="visible">True</property> - <property name="can_focus">False</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">2</property> </packing> </child> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">3</property> </packing> </child> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="padding">12</property> <property name="position">1</property> </packing> @@ -2216,7 +1879,6 @@ When this option is enabled, and a potential device is detected, you will be pro <child type="tab"> <object class="GtkLabel" id="device_label"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="label" translatable="yes">Devices</property> </object> <packing> @@ -2227,69 +1889,57 @@ When this option is enabled, and a potential device is detected, you will be pro <child> <object class="GtkVBox" id="device_options_tab"> <property name="visible">True</property> - <property name="can_focus">False</property> <child> <object class="GtkHBox" id="exclusions_header_hbox"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkImage" id="image10"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="stock">gtk-preferences</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkLabel" id="exclusionlabel"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="label" translatable="yes"><span weight="bold" size="x-large">Device Options</span></property> <property name="use_markup">True</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">1</property> </packing> </child> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkHSeparator" id="hseparator3"> <property name="visible">True</property> - <property name="can_focus">False</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> <object class="GtkVBox" id="vbox2"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="spacing">12</property> <child> <object class="GtkVBox" id="vbox15"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="spacing">12</property> <child> <object class="GtkLabel" id="remebered_devices_label"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="xalign">0</property> <property name="xpad">12</property> <property name="label" translatable="yes">Remembered Paths</property> @@ -2299,14 +1949,12 @@ When this option is enabled, and a potential device is detected, you will be pro </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkLabel" id="remembered_devices_explanation_label"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="xalign">0</property> <property name="xpad">12</property> <property name="label" translatable="yes">Remembered paths are those associated with devices that you have chosen to always scan or ignore when automatic detection of Portable Storage Devices is enabled.</property> @@ -2314,23 +1962,19 @@ When this option is enabled, and a potential device is detected, you will be pro </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> <object class="GtkHBox" id="remembered_devices_hbox"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="spacing">12</property> <child> <object class="GtkLabel" id="remembered_devices_spacer_label"> <property name="visible">True</property> - <property name="can_focus">False</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">0</property> </packing> </child> @@ -2338,8 +1982,6 @@ When this option is enabled, and a potential device is detected, you will be pro <object class="GtkScrolledWindow" id="remembered_devices_scrolledwindow"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="hscrollbar_policy">automatic</property> - <property name="vscrollbar_policy">automatic</property> <child> <object class="GtkTreeView" id="remembered_devices_treeview"> <property name="width_request">250</property> @@ -2351,18 +1993,15 @@ When this option is enabled, and a potential device is detected, you will be pro </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> <object class="GtkHBox" id="remembered_devices_button_hbox"> <property name="visible">True</property> - <property name="can_focus">False</property> <child> <object class="GtkVButtonBox" id="remembered_devices_vbuttonbox"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="spacing">12</property> <property name="layout_style">start</property> <child> @@ -2371,9 +2010,8 @@ When this option is enabled, and a potential device is detected, you will be pro <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> <property name="use_stock">True</property> - <signal name="clicked" handler="on_remove_remembered_device_button_clicked" swapped="no"/> + <signal name="clicked" handler="on_remove_remembered_device_button_clicked"/> </object> <packing> <property name="expand">False</property> @@ -2387,9 +2025,8 @@ When this option is enabled, and a potential device is detected, you will be pro <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> <property name="use_underline">True</property> - <signal name="clicked" handler="on_remove_all_remembered_device_button_clicked" swapped="no"/> + <signal name="clicked" handler="on_remove_all_remembered_device_button_clicked"/> </object> <packing> <property name="expand">False</property> @@ -2399,29 +2036,22 @@ When this option is enabled, and a potential device is detected, you will be pro </child> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> <property name="position">0</property> </packing> </child> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">2</property> </packing> </child> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> <property name="position">2</property> </packing> </child> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> <property name="padding">12</property> <property name="position">0</property> </packing> @@ -2429,12 +2059,10 @@ When this option is enabled, and a potential device is detected, you will be pro <child> <object class="GtkVBox" id="vbox1"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="spacing">12</property> <child> <object class="GtkLabel" id="ignored_paths_label"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="xalign">0</property> <property name="xpad">12</property> <property name="label" translatable="yes">Ignored Paths</property> @@ -2444,14 +2072,12 @@ When this option is enabled, and a potential device is detected, you will be pro </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkLabel" id="ignored_paths_explanation_label"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="xalign">0</property> <property name="xpad">12</property> <property name="label" translatable="yes">Specify the ending portion of any paths you want ignored when scanning devices for photos or videos. Any path ending with the values below will not be scanned.</property> @@ -2459,23 +2085,19 @@ When this option is enabled, and a potential device is detected, you will be pro </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> <object class="GtkHBox" id="ignored_paths_hbox"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="spacing">12</property> <child> <object class="GtkLabel" id="ignored_paths_spacer_label"> <property name="visible">True</property> - <property name="can_focus">False</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">0</property> </packing> </child> @@ -2483,8 +2105,6 @@ When this option is enabled, and a potential device is detected, you will be pro <object class="GtkScrolledWindow" id="ignored_paths_scrolledwindow"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="hscrollbar_policy">automatic</property> - <property name="vscrollbar_policy">automatic</property> <child> <object class="GtkTreeView" id="ignored_paths_treeview"> <property name="width_request">250</property> @@ -2496,18 +2116,15 @@ When this option is enabled, and a potential device is detected, you will be pro </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> <object class="GtkHBox" id="ignored_paths_button_hbox"> <property name="visible">True</property> - <property name="can_focus">False</property> <child> <object class="GtkVButtonBox" id="ignored_paths_vbuttonbox"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="spacing">12</property> <property name="layout_style">start</property> <child> @@ -2516,9 +2133,8 @@ When this option is enabled, and a potential device is detected, you will be pro <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> <property name="use_underline">True</property> - <signal name="clicked" handler="on_add_ignored_path_button_clicked" swapped="no"/> + <signal name="clicked" handler="on_add_ignored_path_button_clicked"/> </object> <packing> <property name="expand">False</property> @@ -2532,9 +2148,8 @@ When this option is enabled, and a potential device is detected, you will be pro <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> <property name="use_stock">True</property> - <signal name="clicked" handler="on_remove_ignored_path_button_clicked" swapped="no"/> + <signal name="clicked" handler="on_remove_ignored_path_button_clicked"/> </object> <packing> <property name="expand">False</property> @@ -2548,9 +2163,8 @@ When this option is enabled, and a potential device is detected, you will be pro <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> <property name="use_underline">True</property> - <signal name="clicked" handler="on_remove_all_ignored_paths_button_clicked" swapped="no"/> + <signal name="clicked" handler="on_remove_all_ignored_paths_button_clicked"/> </object> <packing> <property name="expand">False</property> @@ -2560,43 +2174,35 @@ When this option is enabled, and a potential device is detected, you will be pro </child> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> <property name="position">0</property> </packing> </child> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">2</property> </packing> </child> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> <property name="position">2</property> </packing> </child> <child> <object class="GtkHBox" id="hbox1"> <property name="visible">True</property> - <property name="can_focus">False</property> <child> <object class="GtkCheckButton" id="ignored_paths_use_re_checkbutton"> <property name="label" translatable="yes">Use _python-style regular expressions</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_ignored_paths_use_re_checkbutton_toggled" swapped="no"/> + <signal name="toggled" handler="on_ignored_paths_use_re_checkbutton_toggled"/> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="padding">12</property> <property name="position">0</property> </packing> @@ -2604,21 +2210,16 @@ When this option is enabled, and a potential device is detected, you will be pro </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">3</property> </packing> </child> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> <property name="position">1</property> </packing> </child> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> <property name="position">2</property> </packing> </child> @@ -2630,7 +2231,6 @@ When this option is enabled, and a potential device is detected, you will be pro <child type="tab"> <object class="GtkLabel" id="device_options_label"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="label" translatable="yes">Device Options</property> </object> <packing> @@ -2641,56 +2241,45 @@ When this option is enabled, and a potential device is detected, you will be pro <child> <object class="GtkVBox" id="backup_tab"> <property name="visible">True</property> - <property name="can_focus">False</property> <child> <object class="GtkVBox" id="vbox8"> <property name="visible">True</property> - <property name="can_focus">False</property> <child> <object class="GtkHBox" id="hbox19"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkImage" id="image8"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="icon_name">drive-removable-media</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkLabel" id="label27"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="label" translatable="yes"><span weight="bold" size="x-large">Backup</span> </property> <property name="use_markup">True</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">1</property> </packing> </child> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkHSeparator" id="hseparator7"> <property name="visible">True</property> - <property name="can_focus">False</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">1</property> </packing> </child> @@ -2704,10 +2293,8 @@ When this option is enabled, and a potential device is detected, you will be pro <child> <object class="GtkVBox" id="vbox9"> <property name="visible">True</property> - <property name="can_focus">False</property> <child> <object class="GtkLabel" id="label43"> - <property name="can_focus">False</property> <property name="xalign">0</property> <property name="xpad">12</property> <property name="label" translatable="yes"><b>Backup</b></property> @@ -2715,36 +2302,30 @@ When this option is enabled, and a potential device is detected, you will be pro </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkHBox" id="hbox20"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="spacing">12</property> <child> <object class="GtkLabel" id="label38"> <property name="visible">True</property> - <property name="can_focus">False</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkTable" id="backup_table"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="n_rows">10</property> <property name="n_columns">4</property> <child> <object class="GtkLabel" id="backup_location_explanation_label"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="xalign">0</property> <property name="ypad">12</property> @@ -2766,9 +2347,8 @@ When this option is enabled, and a potential device is detected, you will be pro <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="use_action_appearance">False</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_auto_detect_backup_checkbutton_toggled" swapped="no"/> + <signal name="toggled" handler="on_auto_detect_backup_checkbutton_toggled"/> </object> <packing> <property name="left_attach">1</property> @@ -2781,7 +2361,6 @@ When this option is enabled, and a potential device is detected, you will be pro <child> <object class="GtkLabel" id="label11"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="xalign">0</property> <property name="ypad">12</property> <property name="label" translatable="yes">You can have your photos and videos backed up to multiple locations as they are downloaded, e.g. external hard drives.</property> @@ -2798,10 +2377,9 @@ When this option is enabled, and a potential device is detected, you will be pro <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_backup_checkbutton_toggled" swapped="no"/> + <signal name="toggled" handler="on_backup_checkbutton_toggled"/> </object> <packing> <property name="right_attach">4</property> @@ -2813,7 +2391,6 @@ When this option is enabled, and a potential device is detected, you will be pro <child> <object class="GtkLabel" id="backup_identifier_explanation_label"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="xalign">0</property> <property name="ypad">6</property> <property name="label" translatable="yes">Specify the folder in which backups are stored on the device. @@ -2832,7 +2409,6 @@ When this option is enabled, and a potential device is detected, you will be pro <child> <object class="GtkLabel" id="backup_location_label"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">Photo backup location:</property> </object> @@ -2848,7 +2424,6 @@ When this option is enabled, and a potential device is detected, you will be pro <child> <object class="GtkLabel" id="backup_identifier_label"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">Photo backup folder name:</property> </object> @@ -2865,7 +2440,6 @@ When this option is enabled, and a potential device is detected, you will be pro <child> <object class="GtkLabel" id="backup_example_label"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="xalign">0</property> <property name="yalign">0</property> <property name="ypad">6</property> @@ -2883,7 +2457,6 @@ When this option is enabled, and a potential device is detected, you will be pro <child> <object class="GtkLabel" id="example_backup_path_label"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="xalign">0</property> <property name="yalign">0</property> <property name="ypad">6</property> @@ -2902,12 +2475,8 @@ When this option is enabled, and a potential device is detected, you will be pro <property name="visible">True</property> <property name="can_focus">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="invisible_char">•</property> - <property name="primary_icon_activatable">False</property> - <property name="secondary_icon_activatable">False</property> - <property name="primary_icon_sensitive">True</property> - <property name="secondary_icon_sensitive">True</property> - <signal name="changed" handler="on_backup_identifier_entry_changed" swapped="no"/> + <property name="invisible_char">•</property> + <signal name="changed" handler="on_backup_identifier_entry_changed"/> </object> <packing> <property name="left_attach">3</property> @@ -2921,7 +2490,6 @@ When this option is enabled, and a potential device is detected, you will be pro <child> <object class="GtkLabel" id="video_backup_identifier_label"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">Video backup folder name:</property> </object> @@ -2940,12 +2508,8 @@ When this option is enabled, and a potential device is detected, you will be pro <property name="visible">True</property> <property name="can_focus">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="invisible_char">•</property> - <property name="primary_icon_activatable">False</property> - <property name="secondary_icon_activatable">False</property> - <property name="primary_icon_sensitive">True</property> - <property name="secondary_icon_sensitive">True</property> - <signal name="changed" handler="on_video_backup_identifier_entry_changed" swapped="no"/> + <property name="invisible_char">•</property> + <signal name="changed" handler="on_video_backup_identifier_entry_changed"/> </object> <packing> <property name="left_attach">3</property> @@ -2959,7 +2523,6 @@ When this option is enabled, and a potential device is detected, you will be pro <child> <object class="GtkLabel" id="backup_video_location_label"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">Video backup location:</property> </object> @@ -3016,33 +2579,26 @@ When this option is enabled, and a potential device is detected, you will be pro </child> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> <object class="GtkLabel" id="label39"> <property name="visible">True</property> - <property name="can_focus">False</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">2</property> </packing> </child> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">1</property> </packing> </child> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> <property name="padding">12</property> <property name="position">1</property> </packing> @@ -3055,7 +2611,6 @@ When this option is enabled, and a potential device is detected, you will be pro <child type="tab"> <object class="GtkLabel" id="backup_label"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="label" translatable="yes">Backup</property> </object> <packing> @@ -3066,56 +2621,45 @@ When this option is enabled, and a potential device is detected, you will be pro <child> <object class="GtkVBox" id="automation_tab"> <property name="visible">True</property> - <property name="can_focus">False</property> <child> <object class="GtkVBox" id="vbox11"> <property name="visible">True</property> - <property name="can_focus">False</property> <child> <object class="GtkHBox" id="hbox21"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkImage" id="image4"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="stock">gtk-execute</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkLabel" id="label31"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="label" translatable="yes"><span weight="bold" size="x-large">Miscellaneous</span></property> <property name="use_markup">True</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">1</property> </packing> </child> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkHSeparator" id="hseparator9"> <property name="visible">True</property> - <property name="can_focus">False</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">1</property> </packing> </child> @@ -3129,11 +2673,9 @@ When this option is enabled, and a potential device is detected, you will be pro <child> <object class="GtkVBox" id="vbox13"> <property name="visible">True</property> - <property name="can_focus">False</property> <child> <object class="GtkLabel" id="label45"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="xalign">0</property> <property name="xpad">12</property> <property name="label" translatable="yes"><b>Program Automation</b></property> @@ -3141,30 +2683,24 @@ When this option is enabled, and a potential device is detected, you will be pro </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkHBox" id="hbox24"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="spacing">6</property> <child> - <object class="GtkLabel" id="label34"> - <property name="can_focus">False</property> - </object> + <object class="GtkLabel" id="label34"/> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkTable" id="automation_table"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="n_rows">7</property> + <property name="n_rows">6</property> <property name="n_columns">3</property> <child> <object class="GtkCheckButton" id="auto_unmount_checkbutton"> @@ -3173,9 +2709,9 @@ When this option is enabled, and a potential device is detected, you will be pro <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="use_action_appearance">False</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_auto_unmount_checkbutton_toggled" swapped="no"/> + <signal name="toggled" handler="on_auto_unmount_checkbutton_toggled"/> </object> <packing> <property name="right_attach">3</property> @@ -3190,9 +2726,9 @@ When this option is enabled, and a potential device is detected, you will be pro <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="use_action_appearance">False</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_auto_startup_checkbutton_toggled" swapped="no"/> + <signal name="toggled" handler="on_auto_startup_checkbutton_toggled"/> </object> <packing> <property name="right_attach">3</property> @@ -3205,9 +2741,9 @@ When this option is enabled, and a potential device is detected, you will be pro <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="use_action_appearance">False</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_auto_insertion_checkbutton_toggled" swapped="no"/> + <signal name="toggled" handler="on_auto_insertion_checkbutton_toggled"/> </object> <packing> <property name="right_attach">3</property> @@ -3221,9 +2757,9 @@ When this option is enabled, and a potential device is detected, you will be pro <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_auto_exit_checkbutton_toggled" swapped="no"/> + <signal name="toggled" handler="on_auto_exit_checkbutton_toggled"/> </object> <packing> <property name="right_attach">3</property> @@ -3232,36 +2768,36 @@ When this option is enabled, and a potential device is detected, you will be pro </packing> </child> <child> - <object class="GtkCheckButton" id="auto_delete_checkbutton"> - <property name="label" translatable="yes">Delete photos and videos from device upon download completion</property> + <object class="GtkCheckButton" id="auto_exit_force_checkbutton"> + <property name="label" translatable="yes">Exit program even if download had warnings or errors</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_auto_delete_checkbutton_toggled" swapped="no"/> + <signal name="toggled" handler="on_auto_exit_force_checkbutton_toggled"/> </object> <packing> - <property name="right_attach">3</property> - <property name="top_attach">5</property> - <property name="bottom_attach">6</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> </packing> </child> <child> - <object class="GtkCheckButton" id="auto_exit_force_checkbutton"> - <property name="label" translatable="yes">Exit program even if download had warnings or errors</property> + <object class="GtkCheckButton" id="auto_rotate_checkbutton"> + <property name="label" translatable="yes">Automatically rotate JPEG images</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_auto_exit_force_checkbutton_toggled" swapped="no"/> + <signal name="toggled" handler="on_auto_rotate_checkbutton_toggled"/> </object> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> + <property name="right_attach">3</property> + <property name="top_attach">5</property> + <property name="bottom_attach">6</property> </packing> </child> <child> @@ -3270,19 +2806,8 @@ When this option is enabled, and a potential device is detected, you will be pro <child> <placeholder/> </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> <property name="padding">24</property> <property name="position">1</property> </packing> @@ -3290,18 +2815,15 @@ When this option is enabled, and a potential device is detected, you will be pro <child> <object class="GtkLabel" id="label35"> <property name="visible">True</property> - <property name="can_focus">False</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">2</property> </packing> </child> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="padding">12</property> <property name="position">1</property> </packing> @@ -3309,7 +2831,6 @@ When this option is enabled, and a potential device is detected, you will be pro <child> <object class="GtkLabel" id="label1"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="xalign">0</property> <property name="xpad">12</property> <property name="label" translatable="yes">Performance</property> @@ -3319,29 +2840,23 @@ When this option is enabled, and a potential device is detected, you will be pro </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">2</property> </packing> </child> <child> <object class="GtkHBox" id="hbox25"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="spacing">6</property> <child> - <object class="GtkLabel" id="label19"> - <property name="can_focus">False</property> - </object> + <object class="GtkLabel" id="label19"/> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkTable" id="table1"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="n_columns">3</property> <child> <object class="GtkCheckButton" id="generate_thumbnails_checkbutton"> @@ -3349,9 +2864,8 @@ When this option is enabled, and a potential device is detected, you will be pro <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_generate_thumbnails_checkbutton_toggled" swapped="no"/> + <signal name="toggled" handler="on_generate_thumbnails_checkbutton_toggled"/> </object> </child> <child> @@ -3362,8 +2876,6 @@ When this option is enabled, and a potential device is detected, you will be pro </child> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> <property name="padding">24</property> <property name="position">1</property> </packing> @@ -3371,26 +2883,21 @@ When this option is enabled, and a potential device is detected, you will be pro <child> <object class="GtkLabel" id="label29"> <property name="visible">True</property> - <property name="can_focus">False</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">2</property> </packing> </child> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="padding">12</property> <property name="position">3</property> </packing> </child> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> <property name="padding">12</property> <property name="position">1</property> </packing> @@ -3403,7 +2910,6 @@ When this option is enabled, and a potential device is detected, you will be pro <child type="tab"> <object class="GtkLabel" id="miscillaneous_label"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="label" translatable="yes">Miscellaneous</property> </object> @@ -3415,57 +2921,46 @@ When this option is enabled, and a potential device is detected, you will be pro <child> <object class="GtkVBox" id="error_tab"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="spacing">12</property> <child> <object class="GtkVBox" id="vbox16"> <property name="visible">True</property> - <property name="can_focus">False</property> <child> <object class="GtkHBox" id="hbox26"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkImage" id="image9"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="stock">gtk-dialog-error</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkLabel" id="label40"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="label" translatable="yes"><span weight="bold" size="x-large">Error Handling</span></property> <property name="use_markup">True</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">1</property> </packing> </child> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkHSeparator" id="hseparator10"> <property name="visible">True</property> - <property name="can_focus">False</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">1</property> </packing> </child> @@ -3479,29 +2974,24 @@ When this option is enabled, and a potential device is detected, you will be pro <child> <object class="GtkHBox" id="hbox27"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="spacing">12</property> <child> <object class="GtkLabel" id="label36"> <property name="visible">True</property> - <property name="can_focus">False</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkTable" id="error_table"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="n_rows">14</property> <property name="n_columns">2</property> <child> <object class="GtkLabel" id="label13"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="label" translatable="yes"> </property> </object> @@ -3515,7 +3005,6 @@ When this option is enabled, and a potential device is detected, you will be pro <child> <object class="GtkLabel" id="label37"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes"><b>Photo and Video Name Conflicts</b></property> <property name="use_markup">True</property> @@ -3531,11 +3020,10 @@ When this option is enabled, and a potential device is detected, you will be pro <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="use_underline">True</property> <property name="active">True</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_add_identifier_radiobutton_toggled" swapped="no"/> + <signal name="toggled" handler="on_add_identifier_radiobutton_toggled"/> </object> <packing> <property name="left_attach">1</property> @@ -3551,7 +3039,6 @@ When this option is enabled, and a potential device is detected, you will be pro <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> <property name="group">add_identifier_radiobutton</property> @@ -3567,7 +3054,6 @@ When this option is enabled, and a potential device is detected, you will be pro <child> <object class="GtkLabel" id="label58"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="xalign">0</property> <property name="ypad">12</property> <property name="label" translatable="yes">When a photo or video of the same name has already been downloaded, choose whether to skip downloading the file, or to add a unique indentifier.</property> @@ -3584,7 +3070,6 @@ When this option is enabled, and a potential device is detected, you will be pro <child> <object class="GtkLabel" id="label64"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="xalign">0</property> <property name="ypad">12</property> <property name="label" translatable="yes">When backing up, choose whether to overwrite a file on the backup device that has the same name, or skip backing it up.</property> @@ -3604,10 +3089,9 @@ When this option is enabled, and a potential device is detected, you will be pro <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="draw_indicator">True</property> <property name="group">backup_duplicate_skip_radiobutton</property> - <signal name="toggled" handler="on_backup_duplicate_overwrite_radiobutton_toggled" swapped="no"/> + <signal name="toggled" handler="on_backup_duplicate_overwrite_radiobutton_toggled"/> </object> <packing> <property name="left_attach">1</property> @@ -3622,10 +3106,9 @@ When this option is enabled, and a potential device is detected, you will be pro <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="active">True</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_backup_duplicate_skip_radiobutton_toggled" swapped="no"/> + <signal name="toggled" handler="on_backup_duplicate_skip_radiobutton_toggled"/> </object> <packing> <property name="left_attach">1</property> @@ -3693,26 +3176,21 @@ When this option is enabled, and a potential device is detected, you will be pro </child> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> <object class="GtkLabel" id="label65"> <property name="visible">True</property> - <property name="can_focus">False</property> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="position">2</property> </packing> </child> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> <property name="padding">12</property> <property name="position">1</property> </packing> @@ -3725,7 +3203,6 @@ When this option is enabled, and a potential device is detected, you will be pro <child type="tab"> <object class="GtkLabel" id="error_label"> <property name="visible">True</property> - <property name="can_focus">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="label" translatable="yes">Error Handling</property> </object> @@ -3736,16 +3213,12 @@ When this option is enabled, and a potential device is detected, you will be pro </child> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> <property name="padding">6</property> <property name="position">1</property> </packing> </child> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> <property name="padding">5</property> <property name="position">1</property> </packing> @@ -3753,6 +3226,46 @@ When this option is enabled, and a potential device is detected, you will be pro <child> <placeholder/> </child> + <child internal-child="action_area"> + <object class="GtkHButtonBox" id="dialog-action_area2"> + <property name="visible">True</property> + <property name="layout_style">end</property> + <child> + <object class="GtkButton" id="help_button1"> + <property name="label">gtk-help</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + <property name="secondary">True</property> + </packing> + </child> + <child> + <object class="GtkButton" id="close_button"> + <property name="label">gtk-close</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="pack_type">end</property> + <property name="position">0</property> + </packing> + </child> </object> </child> <action-widgets> diff --git a/rapid/glade3/rapid.ui b/rapid/glade3/rapid.ui index 1e49e4e..3ec67f4 100644 --- a/rapid/glade3/rapid.ui +++ b/rapid/glade3/rapid.ui @@ -1,73 +1,66 @@ <?xml version="1.0" encoding="UTF-8"?> <interface> <requires lib="gtk+" version="2.20"/> - <!-- interface-naming-policy project-wide --> <object class="GtkAction" id="about_action"> - <property name="label" translatable="yes">About...</property> + <property name="label">About...</property> <property name="stock_id">gtk-about</property> <signal name="activate" handler="on_about_action_activate" swapped="no"/> </object> <object class="GtkAction" id="check_all_action"> - <property name="label" translatable="yes">Check All</property> + <property name="label">Check All</property> <signal name="activate" handler="on_check_all_action_activate" swapped="no"/> </object> <object class="GtkAction" id="check_all_photos_action"> - <property name="label" translatable="yes">Check All Photos</property> + <property name="label">Check All Photos</property> <signal name="activate" handler="on_check_all_photos_action_activate" swapped="no"/> </object> <object class="GtkAction" id="check_all_videos_action"> - <property name="label" translatable="yes">Check All Videos</property> + <property name="label">Check All Videos</property> <signal name="activate" handler="on_check_all_videos_action_activate" swapped="no"/> </object> <object class="GtkAction" id="donate_action"> - <property name="label" translatable="yes">Make a Donation...</property> + <property name="label">Make a Donation...</property> <signal name="activate" handler="on_donate_action_activate" swapped="no"/> </object> <object class="GtkAction" id="download_action"> - <property name="label" translatable="yes">Download</property> + <property name="label">Download</property> <property name="icon_name">system-run</property> <property name="sensitive">False</property> <signal name="activate" handler="on_download_action_activate" swapped="no"/> </object> <object class="GtkAction" id="get_help_action"> - <property name="label" translatable="yes">Get Help Online...</property> + <property name="label">Get Help Online...</property> <property name="stock_id">gtk-help</property> <signal name="activate" handler="on_get_help_action_activate" swapped="no"/> </object> <object class="GtkAction" id="help_action"> - <property name="label" translatable="yes">Help</property> + <property name="label">Help</property> <signal name="activate" handler="on_help_action_activate" swapped="no"/> </object> <object class="GtkAction" id="next_image_action"> - <property name="label" translatable="yes">Next File</property> <property name="tooltip">Next file</property> - <property name="stock_id">gtk-go-forward</property> - <property name="always_show_image">True</property> <signal name="activate" handler="on_next_image_action_activate" swapped="no"/> </object> <object class="GtkAction" id="preferences_action"> - <property name="label" translatable="yes">Preferences</property> + <property name="label">Preferences</property> <signal name="activate" handler="on_preferences_action_activate" swapped="no"/> </object> <object class="GtkAction" id="prev_image_action"> - <property name="label" translatable="yes">Previous File</property> <property name="tooltip">Previous file</property> - <property name="stock_id">gtk-go-back</property> - <property name="always_show_image">True</property> <signal name="activate" handler="on_prev_image_action_activate" swapped="no"/> </object> <object class="GtkAction" id="quit_action"> - <property name="label" translatable="yes">Quit</property> + <property name="label">Quit</property> <property name="stock_id">gtk-quit</property> <signal name="activate" handler="on_quit_action_activate" swapped="no"/> </object> <object class="GtkAction" id="refresh_action"> - <property name="label" translatable="yes">Refresh</property> + <property name="label">Refresh</property> <property name="stock_id">gtk-refresh</property> <signal name="activate" handler="on_refresh_action_activate" swapped="no"/> </object> <object class="GtkAction" id="report_problem_action"> - <property name="label" translatable="yes">Report a Problem...</property> + <property name="label">Report a Problem...</property> <property name="stock_id">gtk-dialog-warning</property> <signal name="activate" handler="on_report_problem_action_activate" swapped="no"/> </object> @@ -80,11 +73,11 @@ <signal name="activate" handler="on_show_thumbnails_action_activate" swapped="no"/> </object> <object class="GtkAction" id="translate_action"> - <property name="label" translatable="yes">Translate this Application...</property> + <property name="label">Translate this Application...</property> <signal name="activate" handler="on_translate_action_activate" swapped="no"/> </object> <object class="GtkAction" id="uncheck_all_action"> - <property name="label" translatable="yes">Uncheck All</property> + <property name="label">Uncheck All</property> <signal name="activate" handler="on_uncheck_all_action_activate" swapped="no"/> </object> <object class="GtkWindow" id="rapidapp"> @@ -102,7 +95,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="ubuntu_local">True</property> <child> <object class="GtkMenuItem" id="menuitem7"> <property name="visible">True</property> @@ -113,7 +105,6 @@ <child type="submenu"> <object class="GtkMenu" id="menuitem7_menu"> <property name="can_focus">False</property> - <property name="ubuntu_local">True</property> <child> <object class="GtkImageMenuItem" id="menu_download_pause"> <property name="label" translatable="yes">Download / Pause</property> @@ -151,7 +142,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="related_action">quit_action</property> - <property name="use_action_appearance">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> <accelerator key="q" signal="activate" modifiers="GDK_CONTROL_MASK"/> @@ -171,7 +161,6 @@ <child type="submenu"> <object class="GtkMenu" id="select_menu"> <property name="can_focus">False</property> - <property name="ubuntu_local">True</property> <child> <object class="GtkMenuItem" id="menu_check_all"> <property name="visible">True</property> @@ -244,7 +233,6 @@ <child type="submenu"> <object class="GtkMenu" id="menuitem10_menu"> <property name="can_focus">False</property> - <property name="ubuntu_local">True</property> <child> <object class="GtkImageMenuItem" id="menu_zoom_in"> <property name="label">gtk-zoom-in</property> @@ -253,8 +241,8 @@ <property name="use_action_appearance">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> - <accelerator key="equal" signal="activate" modifiers="GDK_CONTROL_MASK"/> <accelerator key="plus" signal="activate" modifiers="GDK_CONTROL_MASK"/> + <accelerator key="equal" signal="activate" modifiers="GDK_CONTROL_MASK"/> </object> </child> <child> @@ -304,6 +292,8 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="related_action">prev_image_action</property> + <property name="use_action_appearance">False</property> + <property name="label" translatable="yes">Previous File</property> <accelerator key="bracketleft" signal="activate"/> </object> </child> @@ -312,6 +302,8 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="related_action">next_image_action</property> + <property name="use_action_appearance">False</property> + <property name="label" translatable="yes">Next File</property> <accelerator key="bracketright" signal="activate"/> </object> </child> @@ -329,7 +321,6 @@ <child type="submenu"> <object class="GtkMenu" id="help_menu"> <property name="can_focus">False</property> - <property name="ubuntu_local">True</property> <child> <object class="GtkImageMenuItem" id="menu_get_help_online"> <property name="visible">True</property> @@ -352,7 +343,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="related_action">donate_action</property> - <property name="use_action_appearance">False</property> <property name="label" translatable="yes">_Make a Donation...</property> <property name="use_underline">True</property> </object> @@ -362,7 +352,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="related_action">translate_action</property> - <property name="use_action_appearance">False</property> <property name="label" translatable="yes">_Translate this Application...</property> <property name="use_underline">True</property> </object> @@ -379,7 +368,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="related_action">about_action</property> - <property name="use_action_appearance">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> </object> @@ -396,27 +384,102 @@ </packing> </child> <child> + <object class="GtkHBox" id="toobar_box"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="homogeneous">True</property> + <child> + <object class="GtkToolbar" id="from_toolbar"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <property name="show_arrow">False</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkToolbar" id="copy_toolbar"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <property name="show_arrow">False</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkToolbar" id="dest_toolbar"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <property name="show_arrow">False</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkToolbar" id="menu_toolbar"> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="pack_type">end</property> + <property name="position">3</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> <object class="GtkVPaned" id="main_vpaned"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="position">1</property> <property name="position_set">True</property> <child> - <object class="GtkScrolledWindow" id="device_collection_scrolledwindow"> + <object class="GtkHBox" id="devices_box"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">never</property> - <property name="vscrollbar_policy">automatic</property> + <property name="can_focus">False</property> <child> - <object class="GtkViewport" id="device_collection_viewport"> + <object class="GtkScrolledWindow" id="device_collection_scrolledwindow"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="resize_mode">queue</property> - <property name="shadow_type">none</property> + <property name="hscrollbar_policy">never</property> + <property name="shadow_type">etched-out</property> <child> - <placeholder/> + <object class="GtkViewport" id="device_collection_viewport"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="resize_mode">queue</property> + <property name="shadow_type">none</property> + <child> + <placeholder/> + </child> + </object> </child> </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="padding">6</property> + <property name="position">0</property> + </packing> </child> </object> <packing> @@ -442,8 +505,6 @@ <object class="GtkScrolledWindow" id="thumbnails_scrolledwindow"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="hscrollbar_policy">automatic</property> - <property name="vscrollbar_policy">automatic</property> <child> <placeholder/> </child> @@ -581,7 +642,6 @@ <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="related_action">next_image_action</property> - <property name="use_action_appearance">False</property> <property name="relief">none</property> <property name="focus_on_click">False</property> <accelerator key="bracketright" signal="activate"/> @@ -602,7 +662,6 @@ <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="related_action">prev_image_action</property> - <property name="use_action_appearance">False</property> <property name="relief">none</property> <property name="focus_on_click">False</property> <accelerator key="bracketleft" signal="activate"/> @@ -740,7 +799,7 @@ <packing> <property name="expand">True</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> <child> @@ -751,7 +810,6 @@ <object class="GtkHButtonBox" id="main_buttonbox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="layout_style">edge</property> <child> <object class="GtkButton" id="help_button"> <property name="label">_Help</property> @@ -797,7 +855,7 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="padding">6</property> - <property name="position">2</property> + <property name="position">3</property> </packing> </child> <child> @@ -832,7 +890,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">2</property> - <property name="has_resize_grip">False</property> </object> <packing> <property name="expand">True</property> @@ -984,7 +1041,7 @@ <property name="expand">False</property> <property name="fill">False</property> <property name="pack_type">end</property> - <property name="position">3</property> + <property name="position">4</property> </packing> </child> </object> |