summaryrefslogtreecommitdiff
path: root/rapid/glade3
diff options
context:
space:
mode:
authorJulien Valroff <julien@kirya.net>2014-03-08 09:07:11 +0100
committerJulien Valroff <julien@kirya.net>2014-03-08 09:07:11 +0100
commit88da93d2f69f0a3dbf5b5f9bdaa11b3cb90ddb53 (patch)
treeb2d1a530df46001fb15cf7b9f07b9ac544838102 /rapid/glade3
parentfe8148d00d6503bdc3d4b7856a1535131bee73b6 (diff)
parente57608218ea2d7fa960b20f2aedf78094eeb79a5 (diff)
Merge tag 'upstream/0.4.10'
Upstream version 0.4.10
Diffstat (limited to 'rapid/glade3')
-rw-r--r--rapid/glade3/about.ui4
-rw-r--r--rapid/glade3/prefs.ui976
-rw-r--r--rapid/glade3/rapid.ui110
3 files changed, 796 insertions, 294 deletions
diff --git a/rapid/glade3/about.ui b/rapid/glade3/about.ui
index 0a82e74..c9a775a 100644
--- a/rapid/glade3/about.ui
+++ b/rapid/glade3/about.ui
@@ -9,7 +9,7 @@
<property name="icon">rapid-photo-downloader.svg</property>
<property name="type_hint">dialog</property>
<property name="program_name">Rapid Photo Downloader</property>
- <property name="copyright">Copyright Damon Lynch 2007-12</property>
+ <property name="copyright">Copyright Damon Lynch 2007-14</property>
<property name="comments" translatable="yes">Import your photos and videos efficiently and reliably</property>
<property name="website">http://www.damonlynch.net/rapid</property>
<property name="license">Rapid Photo Downloader is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
@@ -21,6 +21,7 @@ You should have received a copy of the GNU General Public License along with Rap
<property name="translator_credits">Anton Alyab'ev &lt;subeditor@dolgopa.org&gt;
Lőrincz András &lt;level.andrasnak@gmail.com&gt;
Michel Ange &lt;michelange@wanadoo.fr&gt;
+Adolfo Jayme Barrientos &lt;fitoschido@gmail.com&gt;
Alain J. Baudrez &lt;a.baudrez@gmail.com&gt;
Kevin Brubeck Unhammer &lt;unhammer@fsfe.org&gt;
Bert &lt;crinbert@yahoo.com&gt;
@@ -31,6 +32,7 @@ Tauno Erik &lt;tauno.erik@gmail.com&gt;
Sergiy Gavrylov &lt;sergiovana@bigmir.net&gt;
Emanuele Grande &lt;caccolangrifata@gmail.com&gt;
Torben Gundtofte-Bruun &lt;torben@g-b.dk&gt;
+Joachim Johansson &lt;joachim.j@gmail.com&gt;
Miroslav Matejaš &lt;silverspace@ubuntu-hr.org&gt;
Nicolás M. Zahlut &lt;nzahlut@live.com&gt;
Erik M
diff --git a/rapid/glade3/prefs.ui b/rapid/glade3/prefs.ui
index 2e0e53c..d4e6229 100644
--- a/rapid/glade3/prefs.ui
+++ b/rapid/glade3/prefs.ui
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk+" version="2.16"/>
<!-- interface-naming-policy toplevel-contextual -->
@@ -13,6 +13,7 @@
<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>
@@ -21,15 +22,61 @@
<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"/>
- <signal name="response" handler="on_preferencesdialog_response"/>
+ <signal name="destroy" handler="on_preferencesdialog_destroy" swapped="no"/>
+ <signal name="response" handler="on_preferencesdialog_response" swapped="no"/>
<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="use_action_appearance">False</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="use_action_appearance">False</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="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">
@@ -44,11 +91,13 @@
<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"/>
+ <signal name="cursor-changed" handler="on_treeview_cursor_changed" swapped="no"/>
</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>
@@ -61,27 +110,33 @@
<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">&lt;span weight="bold" size="x-large"&gt;Photo Download Folders&lt;/span&gt;</property>
<property name="use_markup">True</property>
</object>
@@ -93,15 +148,19 @@
</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>
@@ -115,24 +174,47 @@
<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>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <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">&lt;i&gt;Example: /home/user/Pictures&lt;/i&gt;</property>
<property name="use_markup">True</property>
@@ -148,6 +230,7 @@
<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">&lt;b&gt;Download Subfolders&lt;/b&gt;</property>
<property name="use_markup">True</property>
@@ -162,6 +245,7 @@
<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>
@@ -177,6 +261,7 @@
<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>
@@ -194,6 +279,7 @@
<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">&lt;b&gt;Download Folder&lt;/b&gt;</property>
<property name="use_markup">True</property>
@@ -206,6 +292,7 @@
<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>
@@ -222,6 +309,7 @@
<child>
<object class="GtkVBox" id="subfolder_vbox">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<placeholder/>
</child>
@@ -234,40 +322,28 @@
<property name="y_padding">12</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <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="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>
@@ -280,6 +356,7 @@
<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>
@@ -289,46 +366,57 @@
<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">&lt;span weight="bold" size="x-large"&gt;Photo Rename&lt;/span&gt; </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>
@@ -342,28 +430,34 @@
<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">&lt;b&gt;Photo Rename&lt;/b&gt;</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>
@@ -375,11 +469,13 @@
<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>
@@ -389,17 +485,21 @@
</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>
@@ -411,6 +511,7 @@
<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>
@@ -423,6 +524,7 @@
<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>
@@ -439,6 +541,7 @@
<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>
@@ -453,6 +556,7 @@
<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">&lt;i&gt;New:&lt;/i&gt;</property>
@@ -470,6 +574,7 @@
<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">&lt;i&gt;Original:&lt;/i&gt;</property>
<property name="use_markup">True</property>
@@ -486,6 +591,7 @@
<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">&lt;b&gt;Example&lt;/b&gt;</property>
<property name="use_markup">True</property>
@@ -504,20 +610,26 @@
</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>
@@ -531,6 +643,7 @@
<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>
@@ -541,27 +654,33 @@
<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">&lt;span weight="bold" size="x-large"&gt;Video Download Folders&lt;/span&gt;</property>
<property name="use_markup">True</property>
</object>
@@ -573,15 +692,19 @@
</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>
@@ -594,8 +717,10 @@
</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>
@@ -604,6 +729,8 @@
<property name="wrap">True</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -617,24 +744,47 @@
<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>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <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>
@@ -650,6 +800,7 @@
<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>
@@ -667,6 +818,7 @@
<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">&lt;b&gt;Download Folder&lt;/b&gt;</property>
<property name="use_markup">True</property>
@@ -679,6 +831,7 @@
<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">&lt;b&gt;Download Subfolders&lt;/b&gt;</property>
<property name="use_markup">True</property>
@@ -693,6 +846,7 @@
<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">&lt;i&gt;Example: /home/user/Pictures&lt;/i&gt;</property>
<property name="use_markup">True</property>
@@ -708,6 +862,7 @@
<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>
@@ -724,6 +879,7 @@
<child>
<object class="GtkVBox" id="video_subfolder_vbox">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<placeholder/>
</child>
@@ -736,40 +892,28 @@
<property name="y_padding">12</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <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="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>
@@ -782,6 +926,7 @@
<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>
@@ -792,46 +937,57 @@
<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">&lt;span weight="bold" size="x-large"&gt;Video Rename&lt;/span&gt; </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>
@@ -845,22 +1001,27 @@
<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 either the &lt;i&gt;hachoir metadata&lt;/i&gt; and &lt;i&gt;kaa metadata&lt;/i&gt; packages for python, or &lt;i&gt;exiftool&lt;/i&gt;.</property>
<property name="use_markup">True</property>
@@ -880,11 +1041,13 @@
<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>
@@ -894,17 +1057,21 @@
</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>
@@ -916,6 +1083,7 @@
<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>
@@ -928,6 +1096,7 @@
<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>
@@ -944,6 +1113,7 @@
<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>
@@ -958,6 +1128,7 @@
<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">&lt;i&gt;New:&lt;/i&gt;</property>
@@ -975,6 +1146,7 @@
<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">&lt;i&gt;Original:&lt;/i&gt;</property>
<property name="use_markup">True</property>
@@ -991,6 +1163,7 @@
<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">&lt;b&gt;Example&lt;/b&gt;</property>
<property name="use_markup">True</property>
@@ -1009,20 +1182,26 @@
</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>
@@ -1035,6 +1214,7 @@
<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>
@@ -1045,46 +1225,57 @@
<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">&lt;span weight="bold" size="x-large"&gt;Rename Options&lt;/span&gt;</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>
@@ -1098,9 +1289,11 @@
<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">&lt;b&gt;Sequence Numbers&lt;/b&gt;</property>
@@ -1108,112 +1301,140 @@
</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 &lt;i&gt;Downloads today&lt;/i&gt; 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">&#x2022;</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"/>
+ <signal name="value-changed" handler="on_hour_spinbutton_value_changed" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -1224,6 +1445,7 @@
<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>
@@ -1237,13 +1459,17 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="max_length">2</property>
- <property name="invisible_char">&#x2022;</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"/>
+ <signal name="value-changed" handler="on_minute_spinbutton_value_changed" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -1254,17 +1480,20 @@
<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>
@@ -1277,44 +1506,55 @@
</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>
<child>
<object class="GtkCheckButton" id="synchronize_raw_jpg_checkbutton">
<property name="label" translatable="yes">Synchronize RAW + JPEG sequence numbers</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_synchronize_raw_jpg_checkbutton_toggled"/>
+ <signal name="toggled" handler="on_synchronize_raw_jpg_checkbutton_toggled" swapped="no"/>
</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>
@@ -1322,6 +1562,7 @@
<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">&lt;b&gt;Compatibility with Other Operating Systems&lt;/b&gt;</property>
@@ -1329,31 +1570,37 @@
</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>
@@ -1365,12 +1612,13 @@
<child>
<object class="GtkCheckButton" id="strip_characters_checkbutton">
<property name="label" translatable="yes">Strip incompatible characters</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_strip_characters_checkbutton_toggled"/>
+ <signal name="toggled" handler="on_strip_characters_checkbutton_toggled" swapped="no"/>
</object>
<packing>
<property name="right_attach">2</property>
@@ -1380,27 +1628,34 @@
</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>
@@ -1413,6 +1668,7 @@
<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>
@@ -1423,46 +1679,57 @@
<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">&lt;span weight="bold" size="x-large"&gt;Job Codes&lt;/span&gt;</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>
@@ -1476,11 +1743,14 @@
<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">&lt;b&gt;Job Codes&lt;/b&gt;</property>
@@ -1488,19 +1758,23 @@
</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>
@@ -1521,25 +1795,29 @@
</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>
<object class="GtkButton" id="add_job_code_button">
<property name="label" translatable="yes">_Add...</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_underline">True</property>
- <signal name="clicked" handler="on_add_job_code_button_clicked"/>
+ <signal name="clicked" handler="on_add_job_code_button_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -1550,11 +1828,12 @@
<child>
<object class="GtkButton" id="remove_job_code_button">
<property name="label">gtk-remove</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
- <signal name="clicked" handler="on_remove_job_code_button_clicked"/>
+ <signal name="clicked" handler="on_remove_job_code_button_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -1565,11 +1844,12 @@
<child>
<object class="GtkButton" id="remove_all_job_code_button">
<property name="label" translatable="yes" comments="The underscore after the C signifies that the l is the accelerator key. This is the standard 'Clear' button, but I needed to change the accelerator from the standard 'c' to 'l' because the close button also used 'c'">R_emove All</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_underline">True</property>
- <signal name="clicked" handler="on_remove_all_job_code_button_clicked"/>
+ <signal name="clicked" handler="on_remove_all_job_code_button_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -1579,17 +1859,22 @@
</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>
@@ -1598,11 +1883,15 @@
</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>
@@ -1614,6 +1903,7 @@
<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>
@@ -1624,46 +1914,57 @@
<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">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">&lt;span weight="bold" size="x-large"&gt;Devices&lt;/span&gt;</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>
@@ -1677,9 +1978,11 @@
<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>
@@ -1689,12 +1992,14 @@
</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.
@@ -1706,36 +2011,49 @@ 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>
<child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
<object class="GtkCheckButton" id="autodetect_psd_checkbutton">
<property name="label" translatable="yes">Automatically detect Portable Storage Devices</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_autodetect_psd_checkbutton_toggled"/>
+ <signal name="toggled" handler="on_autodetect_psd_checkbutton_toggled" swapped="no"/>
</object>
<packing>
<property name="left_attach">1</property>
@@ -1747,12 +2065,13 @@ You can download from multiple devices simultaneously, or you can specify a loca
<child>
<object class="GtkCheckButton" id="autodetect_device_checkbutton">
<property name="label" translatable="yes">Automatically detect devices</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<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="draw_indicator">True</property>
- <signal name="toggled" handler="on_autodetect_device_checkbutton_toggled"/>
+ <signal name="toggled" handler="on_autodetect_device_checkbutton_toggled" swapped="no"/>
</object>
<packing>
<property name="right_attach">2</property>
@@ -1761,6 +2080,7 @@ 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.
@@ -1775,44 +2095,49 @@ When this option is enabled, and a potential device is detected, you will be pro
<property name="bottom_attach">3</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </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>
+ <placeholder/>
+ </child>
+ <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>
@@ -1827,6 +2152,7 @@ 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>
@@ -1838,11 +2164,10 @@ When this option is enabled, and a potential device is detected, you will be pro
<property name="right_attach">2</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -1852,21 +2177,25 @@ 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>
@@ -1879,6 +2208,7 @@ 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>
@@ -1889,57 +2219,69 @@ 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">&lt;span weight="bold" size="x-large"&gt;Device Options&lt;/span&gt;</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>
@@ -1949,12 +2291,14 @@ 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>
@@ -1962,19 +2306,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">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>
@@ -1993,25 +2341,29 @@ 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>
<object class="GtkButton" id="remove_remembered_device_button">
<property name="label">gtk-remove</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
- <signal name="clicked" handler="on_remove_remembered_device_button_clicked"/>
+ <signal name="clicked" handler="on_remove_remembered_device_button_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -2022,11 +2374,12 @@ When this option is enabled, and a potential device is detected, you will be pro
<child>
<object class="GtkButton" id="remove_all_remembered_device_button">
<property name="label" translatable="yes" comments="The underscore after the C signifies that the l is the accelerator key. This is the standard 'Clear' button, but I needed to change the accelerator from the standard 'c' to 'l' because the close button also used 'c'">R_emove All</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_underline">True</property>
- <signal name="clicked" handler="on_remove_all_remembered_device_button_clicked"/>
+ <signal name="clicked" handler="on_remove_all_remembered_device_button_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -2036,22 +2389,29 @@ 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>
@@ -2059,10 +2419,12 @@ 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>
@@ -2072,12 +2434,14 @@ 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>
@@ -2085,19 +2449,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">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>
@@ -2116,25 +2484,29 @@ 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>
<object class="GtkButton" id="add_ignored_path_button">
<property name="label" translatable="yes">_Add...</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_underline">True</property>
- <signal name="clicked" handler="on_add_ignored_path_button_clicked"/>
+ <signal name="clicked" handler="on_add_ignored_path_button_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -2145,11 +2517,12 @@ When this option is enabled, and a potential device is detected, you will be pro
<child>
<object class="GtkButton" id="remove_ignored_path_button">
<property name="label">gtk-remove</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
- <signal name="clicked" handler="on_remove_ignored_path_button_clicked"/>
+ <signal name="clicked" handler="on_remove_ignored_path_button_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -2160,11 +2533,12 @@ When this option is enabled, and a potential device is detected, you will be pro
<child>
<object class="GtkButton" id="remove_all_ignored_paths_button">
<property name="label" translatable="yes" comments="The underscore after the C signifies that the l is the accelerator key. This is the standard 'Clear' button, but I needed to change the accelerator from the standard 'c' to 'l' because the close button also used 'c'">Re_move All</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_underline">True</property>
- <signal name="clicked" handler="on_remove_all_ignored_paths_button_clicked"/>
+ <signal name="clicked" handler="on_remove_all_ignored_paths_button_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -2174,35 +2548,43 @@ 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="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">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"/>
+ <signal name="toggled" handler="on_ignored_paths_use_re_checkbutton_toggled" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="padding">12</property>
<property name="position">0</property>
</packing>
@@ -2210,16 +2592,21 @@ 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>
@@ -2231,6 +2618,7 @@ 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>
@@ -2241,45 +2629,56 @@ 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">&lt;span weight="bold" size="x-large"&gt;Backup&lt;/span&gt; </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>
@@ -2293,8 +2692,10 @@ 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">&lt;b&gt;Backup&lt;/b&gt;</property>
@@ -2302,30 +2703,78 @@ 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>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <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>
@@ -2343,12 +2792,13 @@ When this option is enabled, and a potential device is detected, you will be pro
<child>
<object class="GtkCheckButton" id="auto_detect_backup_checkbutton">
<property name="label" translatable="yes">Automatically detect backup devices</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<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="draw_indicator">True</property>
- <signal name="toggled" handler="on_auto_detect_backup_checkbutton_toggled"/>
+ <signal name="toggled" handler="on_auto_detect_backup_checkbutton_toggled" swapped="no"/>
</object>
<packing>
<property name="left_attach">1</property>
@@ -2361,6 +2811,7 @@ 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>
@@ -2373,13 +2824,14 @@ When this option is enabled, and a potential device is detected, you will be pro
</child>
<child>
<object class="GtkCheckButton" id="backup_checkbutton">
- <property name="label" translatable="yes">Backup photos and videos when downloading</property>
+ <property name="label" translatable="yes">Back up photos and videos when downloading</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_backup_checkbutton_toggled"/>
+ <signal name="toggled" handler="on_backup_checkbutton_toggled" swapped="no"/>
</object>
<packing>
<property name="right_attach">4</property>
@@ -2391,6 +2843,7 @@ 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.
@@ -2409,6 +2862,7 @@ 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>
@@ -2424,6 +2878,7 @@ 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>
@@ -2440,6 +2895,7 @@ 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>
@@ -2457,6 +2913,7 @@ 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>
@@ -2475,8 +2932,12 @@ 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">&#x2022;</property>
- <signal name="changed" handler="on_backup_identifier_entry_changed"/>
+ <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"/>
</object>
<packing>
<property name="left_attach">3</property>
@@ -2490,6 +2951,7 @@ 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>
@@ -2508,8 +2970,12 @@ 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">&#x2022;</property>
- <signal name="changed" handler="on_video_backup_identifier_entry_changed"/>
+ <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"/>
</object>
<packing>
<property name="left_attach">3</property>
@@ -2523,6 +2989,7 @@ 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>
@@ -2535,70 +3002,35 @@ When this option is enabled, and a potential device is detected, you will be pro
<property name="y_options"></property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <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="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>
@@ -2611,6 +3043,7 @@ 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>
@@ -2621,45 +3054,56 @@ 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">&lt;span weight="bold" size="x-large"&gt;Miscellaneous&lt;/span&gt;</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>
@@ -2673,9 +3117,11 @@ 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">&lt;b&gt;Program Automation&lt;/b&gt;</property>
@@ -2683,35 +3129,48 @@ 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"/>
+ <object class="GtkLabel" id="label34">
+ <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="automation_table">
<property name="visible">True</property>
- <property name="n_rows">6</property>
+ <property name="can_focus">False</property>
+ <property name="n_rows">7</property>
<property name="n_columns">3</property>
<child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
<object class="GtkCheckButton" id="auto_unmount_checkbutton">
<property name="label" translatable="yes">Unmount ("eject") device upon download completion</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<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="xalign">0</property>
<property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_auto_unmount_checkbutton_toggled"/>
+ <signal name="toggled" handler="on_auto_unmount_checkbutton_toggled" swapped="no"/>
</object>
<packing>
<property name="right_attach">3</property>
@@ -2722,13 +3181,14 @@ When this option is enabled, and a potential device is detected, you will be pro
<child>
<object class="GtkCheckButton" id="auto_startup_checkbutton">
<property name="label" translatable="yes">Start downloading at program startup</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<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="xalign">0</property>
<property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_auto_startup_checkbutton_toggled"/>
+ <signal name="toggled" handler="on_auto_startup_checkbutton_toggled" swapped="no"/>
</object>
<packing>
<property name="right_attach">3</property>
@@ -2737,13 +3197,14 @@ When this option is enabled, and a potential device is detected, you will be pro
<child>
<object class="GtkCheckButton" id="auto_insertion_checkbutton">
<property name="label" translatable="yes">Start downloading upon device insertion</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<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="xalign">0</property>
<property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_auto_insertion_checkbutton_toggled"/>
+ <signal name="toggled" handler="on_auto_insertion_checkbutton_toggled" swapped="no"/>
</object>
<packing>
<property name="right_attach">3</property>
@@ -2754,12 +3215,13 @@ When this option is enabled, and a potential device is detected, you will be pro
<child>
<object class="GtkCheckButton" id="auto_exit_checkbutton">
<property name="label" translatable="yes">Exit program when download completes</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_auto_exit_checkbutton_toggled"/>
+ <signal name="toggled" handler="on_auto_exit_checkbutton_toggled" swapped="no"/>
</object>
<packing>
<property name="right_attach">3</property>
@@ -2770,12 +3232,13 @@ When this option is enabled, and a potential device is detected, you will be pro
<child>
<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="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_auto_exit_force_checkbutton_toggled"/>
+ <signal name="toggled" handler="on_auto_exit_force_checkbutton_toggled" swapped="no"/>
</object>
<packing>
<property name="left_attach">1</property>
@@ -2787,12 +3250,13 @@ When this option is enabled, and a potential device is detected, you will be pro
<child>
<object class="GtkCheckButton" id="auto_rotate_checkbutton">
<property name="label" translatable="yes">Automatically rotate JPEG images</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_auto_rotate_checkbutton_toggled"/>
+ <signal name="toggled" handler="on_auto_rotate_checkbutton_toggled" swapped="no"/>
</object>
<packing>
<property name="right_attach">3</property>
@@ -2801,13 +3265,25 @@ When this option is enabled, and a potential device is detected, you will be pro
</packing>
</child>
<child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
+ <object class="GtkCheckButton" id="verify_file_checkbutton">
+ <property name="label" translatable="yes" comments="Checks files using MD5 to ensure they have downloaded and been saved correctly">Verify files as they are downloaded</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="on_verify_file_checkbutton_toggled" swapped="no"/>
+ </object>
+ <packing>
+ <property name="right_attach">3</property>
+ <property name="top_attach">6</property>
+ <property name="bottom_attach">7</property>
+ </packing>
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="padding">24</property>
<property name="position">1</property>
</packing>
@@ -2815,15 +3291,18 @@ 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>
@@ -2831,6 +3310,7 @@ 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>
@@ -2840,42 +3320,69 @@ 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"/>
+ <object class="GtkLabel" id="label19">
+ <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="table1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="n_columns">3</property>
<child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
<object class="GtkCheckButton" id="generate_thumbnails_checkbutton">
<property name="label" translatable="yes">Generate thumbnails (slower)</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_generate_thumbnails_checkbutton_toggled"/>
+ <signal name="toggled" handler="on_generate_thumbnails_checkbutton_toggled" swapped="no"/>
</object>
</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>
@@ -2883,21 +3390,26 @@ 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>
@@ -2910,6 +3422,7 @@ 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>
@@ -2921,46 +3434,57 @@ 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">&lt;span weight="bold" size="x-large"&gt;Error Handling&lt;/span&gt;</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>
@@ -2974,24 +3498,86 @@ 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>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <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>
@@ -3005,6 +3591,7 @@ 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">&lt;b&gt;Photo and Video Name Conflicts&lt;/b&gt;</property>
<property name="use_markup">True</property>
@@ -3017,13 +3604,14 @@ When this option is enabled, and a potential device is detected, you will be pro
<child>
<object class="GtkRadioButton" id="add_identifier_radiobutton">
<property name="label" translatable="yes">Add unique identifier</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">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"/>
+ <signal name="toggled" handler="on_add_identifier_radiobutton_toggled" swapped="no"/>
</object>
<packing>
<property name="left_attach">1</property>
@@ -3036,6 +3624,7 @@ When this option is enabled, and a potential device is detected, you will be pro
<child>
<object class="GtkRadioButton" id="skip_download_radiobutton">
<property name="label" translatable="yes">Skip download</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -3054,6 +3643,7 @@ 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>
@@ -3070,6 +3660,7 @@ 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>
@@ -3086,12 +3677,13 @@ When this option is enabled, and a potential device is detected, you will be pro
<child>
<object class="GtkRadioButton" id="backup_duplicate_overwrite_radiobutton">
<property name="label" translatable="yes">Overwrite</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">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"/>
+ <signal name="toggled" handler="on_backup_duplicate_overwrite_radiobutton_toggled" swapped="no"/>
</object>
<packing>
<property name="left_attach">1</property>
@@ -3103,12 +3695,13 @@ When this option is enabled, and a potential device is detected, you will be pro
<child>
<object class="GtkRadioButton" id="backup_duplicate_skip_radiobutton">
<property name="label" translatable="yes">Skip</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_backup_duplicate_skip_radiobutton_toggled"/>
+ <signal name="toggled" handler="on_backup_duplicate_skip_radiobutton_toggled" swapped="no"/>
</object>
<packing>
<property name="left_attach">1</property>
@@ -3117,80 +3710,28 @@ When this option is enabled, and a potential device is detected, you will be pro
<property name="bottom_attach">7</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <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="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>
@@ -3203,6 +3744,7 @@ 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>
@@ -3213,12 +3755,16 @@ 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>
@@ -3226,46 +3772,6 @@ 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 3ec67f4..75f145e 100644
--- a/rapid/glade3/rapid.ui
+++ b/rapid/glade3/rapid.ui
@@ -1,40 +1,39 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk+" version="2.20"/>
+ <!-- interface-naming-policy toplevel-contextual -->
<object class="GtkAction" id="about_action">
- <property name="label">About...</property>
- <property name="stock_id">gtk-about</property>
+ <property name="label" translatable="yes">About...</property>
<signal name="activate" handler="on_about_action_activate" swapped="no"/>
</object>
<object class="GtkAction" id="check_all_action">
- <property name="label">Check All</property>
+ <property name="label" translatable="yes">_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">Check All Photos</property>
+ <property name="label" translatable="yes">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">Check All Videos</property>
+ <property name="label" translatable="yes">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">Make a Donation...</property>
+ <property name="label" translatable="yes">_Make a Donation...</property>
<signal name="activate" handler="on_donate_action_activate" swapped="no"/>
</object>
<object class="GtkAction" id="download_action">
- <property name="label">Download</property>
+ <property name="label" translatable="yes">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">Get Help Online...</property>
- <property name="stock_id">gtk-help</property>
+ <property name="label" translatable="yes">_Get Help Online...</property>
<signal name="activate" handler="on_get_help_action_activate" swapped="no"/>
</object>
<object class="GtkAction" id="help_action">
- <property name="label">Help</property>
+ <property name="label" translatable="yes">Help</property>
<signal name="activate" handler="on_help_action_activate" swapped="no"/>
</object>
<object class="GtkAction" id="next_image_action">
@@ -42,7 +41,7 @@
<signal name="activate" handler="on_next_image_action_activate" swapped="no"/>
</object>
<object class="GtkAction" id="preferences_action">
- <property name="label">Preferences</property>
+ <property name="label" translatable="yes">Preferences</property>
<signal name="activate" handler="on_preferences_action_activate" swapped="no"/>
</object>
<object class="GtkAction" id="prev_image_action">
@@ -50,17 +49,15 @@
<signal name="activate" handler="on_prev_image_action_activate" swapped="no"/>
</object>
<object class="GtkAction" id="quit_action">
- <property name="label">Quit</property>
- <property name="stock_id">gtk-quit</property>
+ <property name="label" translatable="yes">Quit</property>
<signal name="activate" handler="on_quit_action_activate" swapped="no"/>
</object>
<object class="GtkAction" id="refresh_action">
- <property name="label">Refresh</property>
- <property name="stock_id">gtk-refresh</property>
+ <property name="label" translatable="yes">Refresh</property>
<signal name="activate" handler="on_refresh_action_activate" swapped="no"/>
</object>
<object class="GtkAction" id="report_problem_action">
- <property name="label">Report a Problem...</property>
+ <property name="label" translatable="yes">_Report a Problem...</property>
<property name="stock_id">gtk-dialog-warning</property>
<signal name="activate" handler="on_report_problem_action_activate" swapped="no"/>
</object>
@@ -73,11 +70,11 @@
<signal name="activate" handler="on_show_thumbnails_action_activate" swapped="no"/>
</object>
<object class="GtkAction" id="translate_action">
- <property name="label">Translate this Application...</property>
+ <property name="label" translatable="yes">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">Uncheck All</property>
+ <property name="label" translatable="yes">_Uncheck All</property>
<signal name="activate" handler="on_uncheck_all_action_activate" swapped="no"/>
</object>
<object class="GtkWindow" id="rapidapp">
@@ -97,9 +94,9 @@
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<child>
<object class="GtkMenuItem" id="menuitem7">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="label" translatable="yes">_File</property>
<property name="use_underline">True</property>
<child type="submenu">
@@ -108,18 +105,18 @@
<child>
<object class="GtkImageMenuItem" id="menu_download_pause">
<property name="label" translatable="yes">Download / Pause</property>
+ <property name="related_action">download_action</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="related_action">download_action</property>
<property name="use_stock">False</property>
<accelerator key="Return" signal="activate" modifiers="GDK_CONTROL_MASK"/>
</object>
</child>
<child>
<object class="GtkImageMenuItem" id="menu_refresh">
+ <property name="related_action">refresh_action</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="related_action">refresh_action</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<accelerator key="r" signal="activate" modifiers="GDK_CONTROL_MASK"/>
@@ -128,9 +125,9 @@
<child>
<object class="GtkImageMenuItem" id="menu_preferences">
<property name="label">gtk-preferences</property>
+ <property name="related_action">preferences_action</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="related_action">preferences_action</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<accelerator key="p" signal="activate" modifiers="GDK_CONTROL_MASK"/>
@@ -139,9 +136,9 @@
<child>
<object class="GtkImageMenuItem" id="menu_quit">
<property name="label">gtk-quit</property>
+ <property name="related_action">quit_action</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="related_action">quit_action</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<accelerator key="q" signal="activate" modifiers="GDK_CONTROL_MASK"/>
@@ -153,9 +150,9 @@
</child>
<child>
<object class="GtkMenuItem" id="select_menuitem">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="label" translatable="yes">_Select</property>
<property name="use_underline">True</property>
<child type="submenu">
@@ -163,33 +160,33 @@
<property name="can_focus">False</property>
<child>
<object class="GtkMenuItem" id="menu_check_all">
+ <property name="related_action">check_all_action</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="related_action">check_all_action</property>
<accelerator key="a" signal="activate" modifiers="GDK_CONTROL_MASK"/>
</object>
</child>
<child>
<object class="GtkMenuItem" id="menu_check_all_photos">
+ <property name="related_action">check_all_photos_action</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="related_action">check_all_photos_action</property>
<accelerator key="t" signal="activate" modifiers="GDK_CONTROL_MASK"/>
</object>
</child>
<child>
<object class="GtkMenuItem" id="menu_check_all_videos">
+ <property name="related_action">check_all_videos_action</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="related_action">check_all_videos_action</property>
<accelerator key="d" signal="activate" modifiers="GDK_CONTROL_MASK"/>
</object>
</child>
<child>
<object class="GtkMenuItem" id="menu_uncheck_all">
+ <property name="related_action">uncheck_all_action</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="related_action">uncheck_all_action</property>
<accelerator key="l" signal="activate" modifiers="GDK_CONTROL_MASK"/>
</object>
</child>
@@ -201,9 +198,9 @@
</child>
<child>
<object class="GtkMenuItem" id="menu_select_all_without_job_code">
+ <property name="use_action_appearance">False</property>
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
- <property name="use_action_appearance">False</property>
<property name="label" translatable="yes">Select All Without _Job Code</property>
<property name="use_underline">True</property>
<accelerator key="j" signal="activate" modifiers="GDK_CONTROL_MASK"/>
@@ -211,9 +208,9 @@
</child>
<child>
<object class="GtkMenuItem" id="menu_select_all_with_job_code">
+ <property name="use_action_appearance">False</property>
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
- <property name="use_action_appearance">False</property>
<property name="label" translatable="yes">Select All Wit_h Job Code</property>
<property name="use_underline">True</property>
<accelerator key="h" signal="activate" modifiers="GDK_CONTROL_MASK"/>
@@ -225,9 +222,9 @@
</child>
<child>
<object class="GtkMenuItem" id="menuitem10">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="label" translatable="yes">_View</property>
<property name="use_underline">True</property>
<child type="submenu">
@@ -236,21 +233,21 @@
<child>
<object class="GtkImageMenuItem" id="menu_zoom_in">
<property name="label">gtk-zoom-in</property>
+ <property name="use_action_appearance">False</property>
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
- <accelerator key="plus" signal="activate" modifiers="GDK_CONTROL_MASK"/>
<accelerator key="equal" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+ <accelerator key="plus" signal="activate" modifiers="GDK_CONTROL_MASK"/>
</object>
</child>
<child>
<object class="GtkImageMenuItem" id="menu_zoom_out">
<property name="label">gtk-zoom-out</property>
+ <property name="use_action_appearance">False</property>
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<accelerator key="minus" signal="activate" modifiers="GDK_CONTROL_MASK"/>
@@ -264,9 +261,9 @@
</child>
<child>
<object class="GtkCheckMenuItem" id="menu_log_window">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="label" translatable="yes">_Error Log</property>
<property name="use_underline">True</property>
<signal name="toggled" handler="on_menu_log_window_toggled" swapped="no"/>
@@ -274,9 +271,9 @@
</child>
<child>
<object class="GtkMenuItem" id="menu_clear">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="label" translatable="yes">_Clear Completed Downloads</property>
<property name="use_underline">True</property>
</object>
@@ -289,20 +286,20 @@
</child>
<child>
<object class="GtkMenuItem" id="previous_image_menuitem">
+ <property name="use_action_appearance">False</property>
+ <property name="related_action">prev_image_action</property>
<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>
<child>
<object class="GtkMenuItem" id="next_file_menuitem">
+ <property name="use_action_appearance">False</property>
+ <property name="related_action">next_image_action</property>
<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>
@@ -313,9 +310,9 @@
</child>
<child>
<object class="GtkMenuItem" id="help_menuitem">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="label" translatable="yes">_Help</property>
<property name="use_underline">True</property>
<child type="submenu">
@@ -323,9 +320,9 @@
<property name="can_focus">False</property>
<child>
<object class="GtkImageMenuItem" id="menu_get_help_online">
+ <property name="related_action">get_help_action</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="related_action">get_help_action</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<accelerator key="F1" signal="activate"/>
@@ -333,25 +330,25 @@
</child>
<child>
<object class="GtkMenuItem" id="menu_report_problem">
+ <property name="related_action">report_problem_action</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="related_action">report_problem_action</property>
</object>
</child>
<child>
<object class="GtkMenuItem" id="menu_donate">
+ <property name="related_action">donate_action</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="related_action">donate_action</property>
<property name="label" translatable="yes">_Make a Donation...</property>
<property name="use_underline">True</property>
</object>
</child>
<child>
<object class="GtkMenuItem" id="menu_translate">
+ <property name="related_action">translate_action</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="related_action">translate_action</property>
<property name="label" translatable="yes">_Translate this Application...</property>
<property name="use_underline">True</property>
</object>
@@ -364,11 +361,9 @@
</child>
<child>
<object class="GtkImageMenuItem" id="menu_about">
- <property name="label">gtk-about</property>
+ <property name="related_action">about_action</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="related_action">about_action</property>
- <property name="use_underline">True</property>
<property name="use_stock">True</property>
</object>
</child>
@@ -529,10 +524,10 @@
</child>
<child>
<object class="GtkButton" id="preview_button">
+ <property name="related_action">show_image_action</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="related_action">show_image_action</property>
<property name="relief">none</property>
<property name="focus_on_click">False</property>
</object>
@@ -544,11 +539,10 @@
</child>
<child>
<object class="GtkButton" id="check_all_button">
- <property name="label" translatable="yes">_Check All</property>
+ <property name="related_action">check_all_action</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="related_action">check_all_action</property>
<property name="relief">none</property>
<property name="use_underline">True</property>
<property name="focus_on_click">False</property>
@@ -562,10 +556,10 @@
<child>
<object class="GtkButton" id="uncheck_all_button">
<property name="label" translatable="yes">_Uncheck All</property>
+ <property name="related_action">uncheck_all_action</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="related_action">uncheck_all_action</property>
<property name="relief">none</property>
<property name="use_underline">True</property>
<property name="focus_on_click">False</property>
@@ -638,10 +632,10 @@
<property name="spacing">6</property>
<child>
<object class="GtkButton" id="next_image_button">
+ <property name="related_action">next_image_action</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="related_action">next_image_action</property>
<property name="relief">none</property>
<property name="focus_on_click">False</property>
<accelerator key="bracketright" signal="activate"/>
@@ -658,10 +652,10 @@
</child>
<child>
<object class="GtkButton" id="prev_image_button">
+ <property name="related_action">prev_image_action</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="related_action">prev_image_action</property>
<property name="relief">none</property>
<property name="focus_on_click">False</property>
<accelerator key="bracketleft" signal="activate"/>
@@ -691,10 +685,10 @@
<property name="can_focus">False</property>
<child>
<object class="GtkButton" id="thumbnails_button">
+ <property name="related_action">show_thumbnails_action</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="related_action">show_thumbnails_action</property>
<property name="relief">none</property>
<property name="use_underline">True</property>
<property name="focus_on_click">False</property>
@@ -723,10 +717,10 @@
<child>
<object class="GtkCheckButton" id="download_this_checkbutton">
<property name="label" translatable="yes">_Include in download</property>
+ <property name="use_action_appearance">False</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>
<accelerator key="i" signal="activate"/>
@@ -813,10 +807,10 @@
<child>
<object class="GtkButton" id="help_button">
<property name="label">_Help</property>
+ <property name="related_action">help_action</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="related_action">help_action</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -828,12 +822,12 @@
<child>
<object class="GtkButton" id="download_button">
<property name="label" translatable="yes">_Download</property>
+ <property name="related_action">download_action</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="receives_default">True</property>
- <property name="related_action">download_action</property>
<property name="use_underline">True</property>
</object>
<packing>