[gthumb] removed the help buttons from the dialogs
- From: Paolo Bacchilega <paobac src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gthumb] removed the help buttons from the dialogs
- Date: Tue, 19 Nov 2013 10:35:13 +0000 (UTC)
commit 48fb011c878402f0b139124cd1334943b23558f9
Author: Paolo Bacchilega <paobac src gnome org>
Date: Tue Nov 19 11:31:20 2013 +0100
removed the help buttons from the dialogs
data/ui/preferences.ui | 19 +--
extensions/burn_disc/gth-burn-task.c | 69 +++---
extensions/catalogs/data/ui/catalog-properties.ui | 25 +--
extensions/catalogs/data/ui/organize-files.ui | 19 +--
extensions/catalogs/dlg-catalog-properties.c | 12 -
extensions/catalogs/dlg-organize-files.c | 12 -
extensions/change_date/data/ui/change-date.ui | 61 ++----
extensions/change_date/dlg-change-date.c | 12 -
extensions/contact_sheet/data/ui/contact-sheet.ui | 122 ++++-------
extensions/contact_sheet/data/ui/image-wall.ui | 83 +++-----
extensions/contact_sheet/dlg-contact-sheet.c | 12 -
extensions/contact_sheet/dlg-image-wall.c | 12 -
.../convert_format/data/ui/convert-format.ui | 45 +---
extensions/convert_format/dlg-convert-format.c | 12 -
extensions/edit_metadata/dlg-edit-metadata.c | 5 -
extensions/edit_metadata/gth-edit-comment-dialog.c | 1 -
.../data/ui/find-duplicates-dialog.ui | 19 +--
.../find_duplicates/data/ui/find-duplicates.ui | 27 +--
extensions/find_duplicates/dlg-find-duplicates.c | 12 -
extensions/find_duplicates/gth-find-duplicates.c | 14 --
.../flicker_utils/data/ui/export-to-flickr.ui | 147 ++++++-------
extensions/flicker_utils/dlg-export-to-flickr.c | 4 -
extensions/flicker_utils/dlg-import-from-flickr.c | 4 -
.../photo_importer/data/ui/photo-importer.ui | 24 +--
extensions/photo_importer/dlg-photo-importer.c | 12 -
.../photobucket/data/ui/export-to-photobucket.ui | 103 ++++-----
extensions/photobucket/dlg-export-to-photobucket.c | 4 -
extensions/rename_series/data/ui/rename-series.ui | 36 +---
extensions/rename_series/dlg-rename-series.c | 4 -
extensions/resize_images/data/ui/resize-images.ui | 230 +++++++++++---------
extensions/resize_images/dlg-resize-images.c | 12 -
extensions/webalbums/data/ui/web-album-exporter.ui | 20 +--
extensions/webalbums/dlg-web-exporter.c | 12 -
gthumb/dlg-preferences.c | 12 -
34 files changed, 397 insertions(+), 820 deletions(-)
---
diff --git a/data/ui/preferences.ui b/data/ui/preferences.ui
index 7447a70..6eb9943 100644
--- a/data/ui/preferences.ui
+++ b/data/ui/preferences.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.0 on Tue Oct 22 16:12:56 2013 -->
+<!-- Generated with glade 3.16.0 on Tue Nov 19 11:20:04 2013 -->
<interface>
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkListStore" id="file_properties_position_liststore">
@@ -31,22 +31,6 @@
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
- <object class="GtkButton" id="help_button">
- <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">True</property>
- <property name="position">0</property>
- <property name="secondary">True</property>
- </packing>
- </child>
- <child>
<object class="GtkButton" id="close_button">
<property name="label">gtk-ok</property>
<property name="use_action_appearance">False</property>
@@ -639,7 +623,6 @@
</object>
</child>
<action-widgets>
- <action-widget response="0">help_button</action-widget>
<action-widget response="0">close_button</action-widget>
</action-widgets>
</object>
diff --git a/extensions/burn_disc/gth-burn-task.c b/extensions/burn_disc/gth-burn-task.c
index a3c9641..105f422 100644
--- a/extensions/burn_disc/gth-burn-task.c
+++ b/extensions/burn_disc/gth-burn-task.c
@@ -348,44 +348,40 @@ source_dialog_response_cb (GtkDialog *dialog,
int response,
GthBurnTask *task)
{
- if (response == GTK_RESPONSE_HELP) {
- show_help_dialog (GTK_WINDOW (dialog), "gthumb-export-disk");
- } else {
- gtk_widget_hide (task->priv->dialog);
- gth_task_dialog (GTH_TASK (task), FALSE, NULL);
-
- if (response == GTK_RESPONSE_OK) {
- if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (_gtk_builder_get_widget
(task->priv->builder, "selection_radiobutton")))) {
- g_hash_table_replace (task->priv->content, g_file_get_uri
(task->priv->location), g_list_reverse (task->priv->selected_files));
- task->priv->selected_files = NULL;
- burn_content_to_disc (task);
- }
- else {
- GSettings *settings;
- gboolean recursive;
-
- _g_object_list_unref (task->priv->selected_files);
- task->priv->selected_files = NULL;
-
- settings = g_settings_new (GTHUMB_BROWSER_SCHEMA);
- recursive = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON
(_gtk_builder_get_widget (task->priv->builder, "folder_recursive_radiobutton")));
- task->priv->test = gth_main_get_general_filter ();
- task->priv->file_source = gth_main_get_file_source (task->priv->location);
- gth_file_source_for_each_child (task->priv->file_source,
- task->priv->location,
- recursive,
- g_settings_get_boolean (settings,
PREF_BROWSER_FAST_FILE_TYPE) ? GFILE_STANDARD_ATTRIBUTES_WITH_FAST_CONTENT_TYPE :
GFILE_STANDARD_ATTRIBUTES_WITH_CONTENT_TYPE,
- start_dir_func,
- for_each_file_func,
- done_func,
- task);
-
- g_object_unref (settings);
- }
+ gtk_widget_hide (task->priv->dialog);
+ gth_task_dialog (GTH_TASK (task), FALSE, NULL);
+
+ if (response == GTK_RESPONSE_OK) {
+ if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (_gtk_builder_get_widget
(task->priv->builder, "selection_radiobutton")))) {
+ g_hash_table_replace (task->priv->content, g_file_get_uri (task->priv->location),
g_list_reverse (task->priv->selected_files));
+ task->priv->selected_files = NULL;
+ burn_content_to_disc (task);
+ }
+ else {
+ GSettings *settings;
+ gboolean recursive;
+
+ _g_object_list_unref (task->priv->selected_files);
+ task->priv->selected_files = NULL;
+
+ settings = g_settings_new (GTHUMB_BROWSER_SCHEMA);
+ recursive = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (_gtk_builder_get_widget
(task->priv->builder, "folder_recursive_radiobutton")));
+ task->priv->test = gth_main_get_general_filter ();
+ task->priv->file_source = gth_main_get_file_source (task->priv->location);
+ gth_file_source_for_each_child (task->priv->file_source,
+ task->priv->location,
+ recursive,
+ g_settings_get_boolean (settings,
PREF_BROWSER_FAST_FILE_TYPE) ? GFILE_STANDARD_ATTRIBUTES_WITH_FAST_CONTENT_TYPE :
GFILE_STANDARD_ATTRIBUTES_WITH_CONTENT_TYPE,
+ start_dir_func,
+ for_each_file_func,
+ done_func,
+ task);
+
+ g_object_unref (settings);
}
- else
- gth_task_completed (GTH_TASK (task), NULL);
}
+ else
+ gth_task_completed (GTH_TASK (task), NULL);
}
static void
@@ -397,7 +393,6 @@ gth_burn_task_exec (GthTask *base)
task->priv->dialog = gtk_dialog_new_with_buttons (_("Write to Disc"),
GTK_WINDOW (task->priv->browser),
0,
- _GTK_LABEL_HELP, GTK_RESPONSE_HELP,
_GTK_LABEL_CANCEL, GTK_RESPONSE_CANCEL,
_GTK_LABEL_OK, GTK_RESPONSE_OK,
NULL);
diff --git a/extensions/catalogs/data/ui/catalog-properties.ui
b/extensions/catalogs/data/ui/catalog-properties.ui
index 8961e0e..e23e776 100644
--- a/extensions/catalogs/data/ui/catalog-properties.ui
+++ b/extensions/catalogs/data/ui/catalog-properties.ui
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.0 on Tue Nov 19 11:00:12 2013 -->
<interface>
- <requires lib="gtk+" version="2.16"/>
+ <!-- interface-requires gtk+ 3.0 -->
<object class="GtkDialog" id="properties_dialog">
<property name="can_focus">False</property>
<property name="border_width">5</property>
@@ -24,7 +25,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -42,7 +42,6 @@
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -51,23 +50,6 @@
<property name="position">1</property>
</packing>
</child>
- <child>
- <object class="GtkButton" id="help_button">
- <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_action_appearance">False</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- <property name="secondary">True</property>
- </packing>
- </child>
</object>
<packing>
<property name="expand">False</property>
@@ -181,7 +163,7 @@
<property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
</object>
@@ -243,7 +225,6 @@
<action-widgets>
<action-widget response="0">cancel_button</action-widget>
<action-widget response="0">save_button</action-widget>
- <action-widget response="0">help_button</action-widget>
</action-widgets>
</object>
</interface>
diff --git a/extensions/catalogs/data/ui/organize-files.ui b/extensions/catalogs/data/ui/organize-files.ui
index 2279386..9b318b9 100644
--- a/extensions/catalogs/data/ui/organize-files.ui
+++ b/extensions/catalogs/data/ui/organize-files.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.0 on Wed Nov 6 13:31:06 2013 -->
+<!-- Generated with glade 3.16.0 on Tue Nov 19 11:01:06 2013 -->
<interface>
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkListStore" id="group_by_liststore">
@@ -35,22 +35,6 @@
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
- <object class="GtkButton" id="help_button">
- <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="cancel_button">
<property name="label">gtk-cancel</property>
<property name="use_action_appearance">False</property>
@@ -315,7 +299,6 @@
</object>
</child>
<action-widgets>
- <action-widget response="0">help_button</action-widget>
<action-widget response="0">cancel_button</action-widget>
<action-widget response="0">start_button</action-widget>
</action-widgets>
diff --git a/extensions/catalogs/dlg-catalog-properties.c b/extensions/catalogs/dlg-catalog-properties.c
index d2a0974..7461c07 100644
--- a/extensions/catalogs/dlg-catalog-properties.c
+++ b/extensions/catalogs/dlg-catalog-properties.c
@@ -141,14 +141,6 @@ save_button_clicked_cb (GtkButton *button,
static void
-help_button_clicked_cb (GtkWidget *widget,
- DialogData *data)
-{
- show_help_dialog (GTK_WINDOW (data->dialog), "catalog-properties");
-}
-
-
-static void
catalog_ready_cb (GObject *object,
GError *error,
gpointer user_data)
@@ -225,10 +217,6 @@ dlg_catalog_properties (GthBrowser *browser,
"clicked",
G_CALLBACK (gtk_widget_destroy),
data->dialog);
- g_signal_connect (G_OBJECT (GET_WIDGET ("help_button")),
- "clicked",
- G_CALLBACK (help_button_clicked_cb),
- data);
/* run dialog. */
diff --git a/extensions/catalogs/dlg-organize-files.c b/extensions/catalogs/dlg-organize-files.c
index 767e478..110e3cb 100644
--- a/extensions/catalogs/dlg-organize-files.c
+++ b/extensions/catalogs/dlg-organize-files.c
@@ -65,14 +65,6 @@ start_button_clicked_cb (GtkWidget *widget,
static void
-help_button_clicked_cb (GtkWidget *widget,
- DialogData *data)
-{
- show_help_dialog (GTK_WINDOW (data->dialog), "organize-files");
-}
-
-
-static void
ignore_singletons_checkbutton_clicked_cb (GtkToggleButton *button,
DialogData *data)
{
@@ -167,10 +159,6 @@ dlg_organize_files (GthBrowser *browser,
"clicked",
G_CALLBACK (gtk_widget_destroy),
data->dialog);
- g_signal_connect (G_OBJECT (GET_WIDGET ("help_button")),
- "clicked",
- G_CALLBACK (help_button_clicked_cb),
- data);
g_signal_connect (G_OBJECT (GET_WIDGET ("start_button")),
"clicked",
G_CALLBACK (start_button_clicked_cb),
diff --git a/extensions/change_date/data/ui/change-date.ui b/extensions/change_date/data/ui/change-date.ui
index fabd3a8..a032be2 100644
--- a/extensions/change_date/data/ui/change-date.ui
+++ b/extensions/change_date/data/ui/change-date.ui
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.0 on Tue Nov 19 11:02:20 2013 -->
<interface>
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkListStore" id="adjust_sign_liststore">
@@ -15,6 +16,21 @@
</row>
</data>
</object>
+ <object class="GtkAdjustment" id="time_h_adjustment">
+ <property name="upper">999999</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkAdjustment" id="time_m_adjustment">
+ <property name="upper">59</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkAdjustment" id="time_s_adjustment">
+ <property name="upper">59</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
<object class="GtkDialog" id="change_date_dialog">
<property name="can_focus">False</property>
<property name="border_width">5</property>
@@ -33,30 +49,12 @@
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
- <object class="GtkButton" id="help_button">
- <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_action_appearance">False</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- <property name="secondary">True</property>
- </packing>
- </child>
- <child>
<object class="GtkButton" id="close_button">
<property name="label">gtk-cancel</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_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -72,7 +70,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -133,7 +130,6 @@
<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="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -151,7 +147,6 @@
<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="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -221,7 +216,6 @@
<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="xalign">0</property>
<property name="active">True</property>
@@ -268,7 +262,6 @@
<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="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -287,7 +280,6 @@
<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="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -306,7 +298,6 @@
<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="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -343,7 +334,6 @@
<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="xalign">0.5</property>
<property name="draw_indicator">True</property>
@@ -384,7 +374,6 @@
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
<property name="width_chars">5</property>
- <property name="invisible_char_set">True</property>
<property name="adjustment">time_h_adjustment</property>
<property name="climb_rate">1</property>
<property name="numeric">True</property>
@@ -401,7 +390,6 @@
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
<property name="width_chars">5</property>
- <property name="invisible_char_set">True</property>
<property name="adjustment">time_m_adjustment</property>
<property name="climb_rate">1</property>
<property name="numeric">True</property>
@@ -420,7 +408,6 @@
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
<property name="width_chars">5</property>
- <property name="invisible_char_set">True</property>
<property name="adjustment">time_s_adjustment</property>
<property name="climb_rate">1</property>
<property name="numeric">True</property>
@@ -543,24 +530,8 @@
</object>
</child>
<action-widgets>
- <action-widget response="0">help_button</action-widget>
<action-widget response="0">close_button</action-widget>
<action-widget response="0">ok_button</action-widget>
</action-widgets>
</object>
- <object class="GtkAdjustment" id="time_h_adjustment">
- <property name="upper">999999</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
- <object class="GtkAdjustment" id="time_m_adjustment">
- <property name="upper">59</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
- <object class="GtkAdjustment" id="time_s_adjustment">
- <property name="upper">59</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
</interface>
diff --git a/extensions/change_date/dlg-change-date.c b/extensions/change_date/dlg-change-date.c
index 3bcd7fc..60fb05a 100644
--- a/extensions/change_date/dlg-change-date.c
+++ b/extensions/change_date/dlg-change-date.c
@@ -130,14 +130,6 @@ ok_button_clicked (GtkWidget *button,
static void
-help_button_cb (GtkWidget *widget,
- DialogData *data)
-{
- show_help_dialog (GTK_WINDOW (data->dialog), "gthumb-batch-change-date");
-}
-
-
-static void
update_sensitivity (DialogData *data)
{
gtk_widget_set_sensitive (GET_WIDGET ("ok_button"),
@@ -265,10 +257,6 @@ dlg_change_date (GthBrowser *browser,
"clicked",
G_CALLBACK (ok_button_clicked),
data);
- g_signal_connect (GET_WIDGET ("help_button"),
- "clicked",
- G_CALLBACK (help_button_cb),
- data);
g_signal_connect (GET_WIDGET ("change_last_modified_checkbutton"),
"clicked",
G_CALLBACK (radio_button_clicked),
diff --git a/extensions/contact_sheet/data/ui/contact-sheet.ui
b/extensions/contact_sheet/data/ui/contact-sheet.ui
index e3d2d93..cdcdd52 100644
--- a/extensions/contact_sheet/data/ui/contact-sheet.ui
+++ b/extensions/contact_sheet/data/ui/contact-sheet.ui
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.0 on Tue Nov 19 11:06:57 2013 -->
<interface>
- <requires lib="gtk+" version="2.16"/>
+ <!-- interface-requires gtk+ 3.0 -->
<object class="GtkAdjustment" id="cols_adjustment">
<property name="upper">100</property>
<property name="step_increment">1</property>
@@ -14,6 +15,37 @@
<column type="gchararray"/>
</columns>
</object>
+ <object class="GtkAdjustment" id="rows_adjustment">
+ <property name="upper">100</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkListStore" id="sort_liststore">
+ <columns>
+ <!-- column-name data -->
+ <column type="gpointer"/>
+ <!-- column-name name -->
+ <column type="gchararray"/>
+ </columns>
+ </object>
+ <object class="GtkListStore" id="theme_liststore">
+ <columns>
+ <!-- column-name theme -->
+ <column type="gpointer"/>
+ <!-- column-name display_name -->
+ <column type="gchararray"/>
+ <!-- column-name preview -->
+ <column type="GdkPixbuf"/>
+ </columns>
+ </object>
+ <object class="GtkListStore" id="thumbnail_size_liststore">
+ <columns>
+ <!-- column-name size -->
+ <column type="gint"/>
+ <!-- column-name name -->
+ <column type="gchararray"/>
+ </columns>
+ </object>
<object class="GtkDialog" id="contact_sheet_dialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
@@ -31,24 +63,6 @@
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
- <object class="GtkButton" id="help_button">
- <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="can_default">True</property>
- <property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- <property name="secondary">True</property>
- </packing>
- </child>
- <child>
<object class="GtkButton" id="cancel_button">
<property name="label">gtk-cancel</property>
<property name="use_action_appearance">False</property>
@@ -56,7 +70,6 @@
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -74,7 +87,6 @@
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -123,6 +135,9 @@
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
+ <placeholder/>
+ </child>
+ <child>
<object class="GtkTable" id="page_footer_help_table">
<property name="can_focus">False</property>
<property name="n_rows">4</property>
@@ -302,7 +317,7 @@
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
@@ -329,12 +344,9 @@
</object>
<packing>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
</object>
</child>
</object>
@@ -383,6 +395,9 @@
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
+ <placeholder/>
+ </child>
+ <child>
<object class="GtkLabel" id="label84">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -556,9 +571,6 @@
<property name="y_options">GTK_FILL</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
</object>
<packing>
<property name="expand">False</property>
@@ -573,7 +585,6 @@
<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="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -632,6 +643,7 @@
<object class="GtkIconView" id="theme_iconview">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="margin">0</property>
<property name="selection_mode">browse</property>
<property name="model">theme_liststore</property>
<property name="row_spacing">0</property>
@@ -674,7 +686,6 @@
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes">Create a new
theme</property>
- <property name="use_action_appearance">False</property>
<child>
<object class="GtkImage" id="image1">
<property name="visible">True</property>
@@ -696,7 +707,6 @@
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes">Edit the selected
theme</property>
- <property name="use_action_appearance">False</property>
<child>
<object class="GtkImage" id="image3">
<property name="visible">True</property>
@@ -718,7 +728,6 @@
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes">Delete the selected
theme</property>
- <property name="use_action_appearance">False</property>
<child>
<object class="GtkImage" id="image2">
<property name="visible">True</property>
@@ -801,6 +810,9 @@
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
+ <placeholder/>
+ </child>
+ <child>
<object class="GtkLabel" id="label18">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -893,7 +905,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
@@ -910,7 +921,6 @@
<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="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -920,12 +930,9 @@
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
</object>
</child>
</object>
@@ -984,7 +991,7 @@
</object>
<packing>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
@@ -1017,7 +1024,6 @@
<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="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -1082,8 +1088,8 @@
<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="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -1196,40 +1202,8 @@
</object>
</child>
<action-widgets>
- <action-widget response="-11">help_button</action-widget>
<action-widget response="-6">cancel_button</action-widget>
<action-widget response="-5">ok_button</action-widget>
</action-widgets>
</object>
- <object class="GtkAdjustment" id="rows_adjustment">
- <property name="upper">100</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
- <object class="GtkListStore" id="sort_liststore">
- <columns>
- <!-- column-name data -->
- <column type="gpointer"/>
- <!-- column-name name -->
- <column type="gchararray"/>
- </columns>
- </object>
- <object class="GtkListStore" id="theme_liststore">
- <columns>
- <!-- column-name theme -->
- <column type="gpointer"/>
- <!-- column-name display_name -->
- <column type="gchararray"/>
- <!-- column-name preview -->
- <column type="GdkPixbuf"/>
- </columns>
- </object>
- <object class="GtkListStore" id="thumbnail_size_liststore">
- <columns>
- <!-- column-name size -->
- <column type="gint"/>
- <!-- column-name name -->
- <column type="gchararray"/>
- </columns>
- </object>
</interface>
diff --git a/extensions/contact_sheet/data/ui/image-wall.ui b/extensions/contact_sheet/data/ui/image-wall.ui
index bb449a1..410ea81 100644
--- a/extensions/contact_sheet/data/ui/image-wall.ui
+++ b/extensions/contact_sheet/data/ui/image-wall.ui
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.0 on Tue Nov 19 11:07:17 2013 -->
<interface>
- <requires lib="gtk+" version="2.16"/>
+ <!-- interface-requires gtk+ 3.0 -->
<object class="GtkAdjustment" id="cols_adjustment">
<property name="upper">100</property>
<property name="step_increment">1</property>
@@ -14,6 +15,27 @@
<column type="gchararray"/>
</columns>
</object>
+ <object class="GtkAdjustment" id="rows_adjustment">
+ <property name="upper">100</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkListStore" id="sort_liststore">
+ <columns>
+ <!-- column-name data -->
+ <column type="gpointer"/>
+ <!-- column-name name -->
+ <column type="gchararray"/>
+ </columns>
+ </object>
+ <object class="GtkListStore" id="thumbnail_size_liststore">
+ <columns>
+ <!-- column-name size -->
+ <column type="gint"/>
+ <!-- column-name name -->
+ <column type="gchararray"/>
+ </columns>
+ </object>
<object class="GtkDialog" id="image_wall_dialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
@@ -31,24 +53,6 @@
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
- <object class="GtkButton" id="help_button">
- <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="can_default">True</property>
- <property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- <property name="secondary">True</property>
- </packing>
- </child>
- <child>
<object class="GtkButton" id="cancel_button">
<property name="label">gtk-cancel</property>
<property name="use_action_appearance">False</property>
@@ -56,7 +60,6 @@
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -74,7 +77,6 @@
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -123,6 +125,9 @@
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
+ <placeholder/>
+ </child>
+ <child>
<object class="GtkLabel" id="label84">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -295,9 +300,6 @@
<property name="y_options">GTK_FILL</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
</object>
<packing>
<property name="expand">False</property>
@@ -348,6 +350,9 @@
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
+ <placeholder/>
+ </child>
+ <child>
<object class="GtkLabel" id="label18">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -438,7 +443,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -447,9 +452,6 @@
<property name="y_options">GTK_FILL</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
</object>
</child>
</object>
@@ -507,7 +509,7 @@
</object>
<packing>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
@@ -540,7 +542,6 @@
<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="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -645,30 +646,8 @@
</object>
</child>
<action-widgets>
- <action-widget response="-11">help_button</action-widget>
<action-widget response="-6">cancel_button</action-widget>
<action-widget response="-5">ok_button</action-widget>
</action-widgets>
</object>
- <object class="GtkAdjustment" id="rows_adjustment">
- <property name="upper">100</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
- <object class="GtkListStore" id="sort_liststore">
- <columns>
- <!-- column-name data -->
- <column type="gpointer"/>
- <!-- column-name name -->
- <column type="gchararray"/>
- </columns>
- </object>
- <object class="GtkListStore" id="thumbnail_size_liststore">
- <columns>
- <!-- column-name size -->
- <column type="gint"/>
- <!-- column-name name -->
- <column type="gchararray"/>
- </columns>
- </object>
</interface>
diff --git a/extensions/contact_sheet/dlg-contact-sheet.c b/extensions/contact_sheet/dlg-contact-sheet.c
index 44c037d..c00357b 100644
--- a/extensions/contact_sheet/dlg-contact-sheet.c
+++ b/extensions/contact_sheet/dlg-contact-sheet.c
@@ -90,14 +90,6 @@ destroy_cb (GtkWidget *widget,
}
-static void
-help_clicked_cb (GtkWidget *widget,
- DialogData *data)
-{
- show_help_dialog (GTK_WINDOW (data->dialog), "contact-sheet");
-}
-
-
static GthContactSheetTheme *
get_selected_theme (DialogData *data)
{
@@ -819,10 +811,6 @@ dlg_contact_sheet (GthBrowser *browser,
"clicked",
G_CALLBACK (ok_clicked_cb),
data);
- g_signal_connect (GET_WIDGET ("help_button"),
- "clicked",
- G_CALLBACK (help_clicked_cb),
- data);
g_signal_connect_swapped (GET_WIDGET ("cancel_button"),
"clicked",
G_CALLBACK (gtk_widget_destroy),
diff --git a/extensions/contact_sheet/dlg-image-wall.c b/extensions/contact_sheet/dlg-image-wall.c
index de7c93f..fdb0591 100644
--- a/extensions/contact_sheet/dlg-image-wall.c
+++ b/extensions/contact_sheet/dlg-image-wall.c
@@ -83,14 +83,6 @@ destroy_cb (GtkWidget *widget,
static void
-help_clicked_cb (GtkWidget *widget,
- DialogData *data)
-{
- show_help_dialog (GTK_WINDOW (data->dialog), "image-wall");
-}
-
-
-static void
ok_clicked_cb (GtkWidget *widget,
DialogData *data)
{
@@ -350,10 +342,6 @@ dlg_image_wall (GthBrowser *browser,
"clicked",
G_CALLBACK (ok_clicked_cb),
data);
- g_signal_connect (GET_WIDGET ("help_button"),
- "clicked",
- G_CALLBACK (help_clicked_cb),
- data);
g_signal_connect_swapped (GET_WIDGET ("cancel_button"),
"clicked",
G_CALLBACK (gtk_widget_destroy),
diff --git a/extensions/convert_format/data/ui/convert-format.ui
b/extensions/convert_format/data/ui/convert-format.ui
index 8136232..9d23d22 100644
--- a/extensions/convert_format/data/ui/convert-format.ui
+++ b/extensions/convert_format/data/ui/convert-format.ui
@@ -1,6 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.0 on Tue Nov 19 11:07:55 2013 -->
<interface>
- <requires lib="gtk+" version="2.16"/>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkListStore" id="mime_type_liststore">
+ <columns>
+ <!-- column-name icon -->
+ <column type="GdkPixbuf"/>
+ <!-- column-name mime_type -->
+ <column type="gchararray"/>
+ <!-- column-name description -->
+ <column type="gchararray"/>
+ </columns>
+ </object>
<object class="GtkDialog" id="convert_format_dialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
@@ -19,24 +30,6 @@
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
- <object class="GtkButton" id="help_button">
- <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="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- <property name="secondary">True</property>
- </packing>
- </child>
- <child>
<object class="GtkButton" id="cancel_button">
<property name="label">gtk-cancel</property>
<property name="use_action_appearance">False</property>
@@ -44,7 +37,6 @@
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -60,7 +52,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -195,7 +186,6 @@
<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="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -232,21 +222,10 @@
</object>
</child>
<action-widgets>
- <action-widget response="-11">help_button</action-widget>
<action-widget response="-6">cancel_button</action-widget>
<action-widget response="0">ok_button</action-widget>
</action-widgets>
</object>
- <object class="GtkListStore" id="mime_type_liststore">
- <columns>
- <!-- column-name icon -->
- <column type="GdkPixbuf"/>
- <!-- column-name mime_type -->
- <column type="gchararray"/>
- <!-- column-name description -->
- <column type="gchararray"/>
- </columns>
- </object>
<object class="GtkImage" id="ok_image">
<property name="visible">True</property>
<property name="can_focus">False</property>
diff --git a/extensions/convert_format/dlg-convert-format.c b/extensions/convert_format/dlg-convert-format.c
index ca46f02..6d966da 100644
--- a/extensions/convert_format/dlg-convert-format.c
+++ b/extensions/convert_format/dlg-convert-format.c
@@ -60,14 +60,6 @@ dialog_destroy_cb (GtkWidget *widget,
}
-static void
-help_button_clicked_cb (GtkWidget *widget,
- DialogData *data)
-{
- show_help_dialog (GTK_WINDOW (data->dialog), "gthumb-batch-convert-format");
-}
-
-
static gpointer
exec_convert (GthAsyncTask *task,
gpointer user_data)
@@ -213,10 +205,6 @@ dlg_convert_format (GthBrowser *browser,
"clicked",
G_CALLBACK (ok_button_clicked_cb),
data);
- g_signal_connect (GET_WIDGET ("help_button"),
- "clicked",
- G_CALLBACK (help_button_clicked_cb),
- data);
g_signal_connect_swapped (GET_WIDGET ("cancel_button"),
"clicked",
G_CALLBACK (gtk_widget_destroy),
diff --git a/extensions/edit_metadata/dlg-edit-metadata.c b/extensions/edit_metadata/dlg-edit-metadata.c
index be378ca..2ebde71 100644
--- a/extensions/edit_metadata/dlg-edit-metadata.c
+++ b/extensions/edit_metadata/dlg-edit-metadata.c
@@ -150,11 +150,6 @@ edit_metadata_dialog__response_cb (GtkDialog *dialog,
GList *scan;
GthTask *task;
- if (response == GTK_RESPONSE_HELP) {
- show_help_dialog (GTK_WINDOW (dialog), data->dialog_name);
- return;
- }
-
if ((response != GTK_RESPONSE_OK) && (response != GTK_RESPONSE_APPLY)) {
cancel_file_list_loading (data);
close_dialog (data);
diff --git a/extensions/edit_metadata/gth-edit-comment-dialog.c
b/extensions/edit_metadata/gth-edit-comment-dialog.c
index adf7c44..a7bbc2b 100644
--- a/extensions/edit_metadata/gth-edit-comment-dialog.c
+++ b/extensions/edit_metadata/gth-edit-comment-dialog.c
@@ -142,7 +142,6 @@ gth_edit_comment_dialog_init (GthEditCommentDialog *self)
gtk_dialog_add_button (GTK_DIALOG (self), _GTK_LABEL_CANCEL, GTK_RESPONSE_CANCEL);
gtk_dialog_add_button (GTK_DIALOG (self), _GTK_LABEL_SAVE, GTK_RESPONSE_APPLY);
gtk_dialog_add_button (GTK_DIALOG (self), _("Sa_ve and Close"), GTK_RESPONSE_OK);
- gtk_dialog_add_button (GTK_DIALOG (self), _GTK_LABEL_HELP, GTK_RESPONSE_HELP);
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
diff --git a/extensions/find_duplicates/data/ui/find-duplicates-dialog.ui
b/extensions/find_duplicates/data/ui/find-duplicates-dialog.ui
index fdba693..3e986cb 100644
--- a/extensions/find_duplicates/data/ui/find-duplicates-dialog.ui
+++ b/extensions/find_duplicates/data/ui/find-duplicates-dialog.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.0 on Wed Nov 13 09:26:44 2013 -->
+<!-- Generated with glade 3.16.0 on Tue Nov 19 11:15:46 2013 -->
<interface>
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkListStore" id="files_liststore">
@@ -40,22 +40,6 @@
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
- <object class="GtkButton" id="help_button">
- <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="stop_button">
<property name="label">gtk-stop</property>
<property name="use_action_appearance">False</property>
@@ -598,7 +582,6 @@
</object>
</child>
<action-widgets>
- <action-widget response="0">help_button</action-widget>
<action-widget response="0">stop_button</action-widget>
<action-widget response="0">close_button</action-widget>
</action-widgets>
diff --git a/extensions/find_duplicates/data/ui/find-duplicates.ui
b/extensions/find_duplicates/data/ui/find-duplicates.ui
index b46f1f0..cfcb4f8 100644
--- a/extensions/find_duplicates/data/ui/find-duplicates.ui
+++ b/extensions/find_duplicates/data/ui/find-duplicates.ui
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.0 on Tue Nov 19 11:15:07 2013 -->
<interface>
- <requires lib="gtk+" version="2.16"/>
+ <!-- interface-requires gtk+ 3.0 -->
<object class="GtkListStore" id="file_type_liststore">
<columns>
<!-- column-name name -->
@@ -25,30 +26,12 @@
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
- <object class="GtkButton" id="help_button">
- <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_action_appearance">False</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- <property name="secondary">True</property>
- </packing>
- </child>
- <child>
<object class="GtkButton" id="cancel_button">
<property name="label">gtk-cancel</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_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -64,7 +47,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -119,7 +101,7 @@
<property name="action">select-folder</property>
<property name="local_only">False</property>
<property name="preview_widget_active">False</property>
- <property name="title" translatable="yes"></property>
+ <property name="title" translatable="yes"/>
</object>
<packing>
<property name="expand">True</property>
@@ -141,8 +123,8 @@
<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="xalign">0.5</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -214,7 +196,6 @@
</object>
</child>
<action-widgets>
- <action-widget response="0">help_button</action-widget>
<action-widget response="0">cancel_button</action-widget>
<action-widget response="0">ok_button</action-widget>
</action-widgets>
diff --git a/extensions/find_duplicates/dlg-find-duplicates.c
b/extensions/find_duplicates/dlg-find-duplicates.c
index 7e48717..0fa135d 100644
--- a/extensions/find_duplicates/dlg-find-duplicates.c
+++ b/extensions/find_duplicates/dlg-find-duplicates.c
@@ -50,14 +50,6 @@ destroy_cb (GtkWidget *widget,
static void
-help_clicked_cb (GtkWidget *widget,
- DialogData *data)
-{
- show_help_dialog (GTK_WINDOW (data->dialog), "gthumb-find-duplicates");
-}
-
-
-static void
ok_clicked_cb (GtkWidget *widget,
DialogData *data)
{
@@ -159,10 +151,6 @@ dlg_find_duplicates (GthBrowser *browser)
"clicked",
G_CALLBACK (ok_clicked_cb),
data);
- g_signal_connect (GET_WIDGET ("help_button"),
- "clicked",
- G_CALLBACK (help_clicked_cb),
- data);
g_signal_connect_swapped (GET_WIDGET ("cancel_button"),
"clicked",
G_CALLBACK (gtk_widget_destroy),
diff --git a/extensions/find_duplicates/gth-find-duplicates.c
b/extensions/find_duplicates/gth-find-duplicates.c
index 4a6e073..8cd01db 100644
--- a/extensions/find_duplicates/gth-find-duplicates.c
+++ b/extensions/find_duplicates/gth-find-duplicates.c
@@ -868,16 +868,6 @@ close_button_clicked_cb (GtkButton *button,
static void
-help_button_clicked_cb (GtkButton *button,
- gpointer user_data)
-{
- GthFindDuplicates *self = user_data;
-
- show_help_dialog (GTK_WINDOW (GET_WIDGET ("find_duplicates_dialog")), "gthumb-find-duplicates");
-}
-
-
-static void
file_cellrenderertoggle_toggled_cb (GtkCellRendererToggle *cell_renderer,
char *path,
gpointer user_data)
@@ -1340,10 +1330,6 @@ gth_find_duplicates_exec (GthBrowser *browser,
"clicked",
G_CALLBACK (g_cancellable_cancel),
self->priv->cancellable);
- g_signal_connect (GET_WIDGET ("help_button"),
- "clicked",
- G_CALLBACK (help_button_clicked_cb),
- self);
g_signal_connect (gth_file_list_get_view (GTH_FILE_LIST (self->priv->duplicates_list)),
"file-selection-changed",
G_CALLBACK (duplicates_list_view_selection_changed_cb),
diff --git a/extensions/flicker_utils/data/ui/export-to-flickr.ui
b/extensions/flicker_utils/data/ui/export-to-flickr.ui
index 34bb7ee..196e27c 100644
--- a/extensions/flicker_utils/data/ui/export-to-flickr.ui
+++ b/extensions/flicker_utils/data/ui/export-to-flickr.ui
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.0 on Tue Nov 19 11:16:31 2013 -->
<interface>
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkListStore" id="account_liststore">
@@ -9,6 +10,71 @@
<column type="gchararray"/>
</columns>
</object>
+ <object class="GtkListStore" id="privacy_liststore">
+ <columns>
+ <!-- column-name value -->
+ <column type="gint"/>
+ <!-- column-name name -->
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0">0</col>
+ <col id="1" translatable="yes">Public photos</col>
+ </row>
+ <row>
+ <col id="0">1</col>
+ <col id="1" translatable="yes">Private photos, visible to family and friends</col>
+ </row>
+ <row>
+ <col id="0">2</col>
+ <col id="1" translatable="yes">Private photos, visible to friends</col>
+ </row>
+ <row>
+ <col id="0">3</col>
+ <col id="1" translatable="yes">Private photos, visible to family</col>
+ </row>
+ <row>
+ <col id="0">4</col>
+ <col id="1" translatable="yes">Private photos</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkListStore" id="resize_liststore">
+ <columns>
+ <!-- column-name description -->
+ <column type="gchararray"/>
+ <!-- column-name size -->
+ <column type="gint"/>
+ </columns>
+ </object>
+ <object class="GtkListStore" id="safety_liststore">
+ <columns>
+ <!-- column-name value -->
+ <column type="gint"/>
+ <!-- column-name name -->
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0">0</col>
+ <col id="1" translatable="yes">Safe content</col>
+ </row>
+ <row>
+ <col id="0">1</col>
+ <col id="1" translatable="yes">Moderate content</col>
+ </row>
+ <row>
+ <col id="0">2</col>
+ <col id="1" translatable="yes">Restricted content</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkImage" id="upload_image">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-goto-top</property>
+ </object>
<object class="GtkDialog" id="export_dialog">
<property name="can_focus">False</property>
<property name="border_width">5</property>
@@ -53,21 +119,6 @@
<property name="position">1</property>
</packing>
</child>
- <child>
- <object class="GtkButton" id="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">2</property>
- <property name="secondary">True</property>
- </packing>
- </child>
</object>
<packing>
<property name="expand">False</property>
@@ -457,7 +508,6 @@
<action-widgets>
<action-widget response="-6">close_button</action-widget>
<action-widget response="-5">upload_button</action-widget>
- <action-widget response="-11">button1</action-widget>
</action-widgets>
</object>
<object class="GtkListStore" id="photoset_liststore">
@@ -472,69 +522,4 @@
<column type="gchararray"/>
</columns>
</object>
- <object class="GtkListStore" id="privacy_liststore">
- <columns>
- <!-- column-name value -->
- <column type="gint"/>
- <!-- column-name name -->
- <column type="gchararray"/>
- </columns>
- <data>
- <row>
- <col id="0">0</col>
- <col id="1" translatable="yes">Public photos</col>
- </row>
- <row>
- <col id="0">1</col>
- <col id="1" translatable="yes">Private photos, visible to family and friends</col>
- </row>
- <row>
- <col id="0">2</col>
- <col id="1" translatable="yes">Private photos, visible to friends</col>
- </row>
- <row>
- <col id="0">3</col>
- <col id="1" translatable="yes">Private photos, visible to family</col>
- </row>
- <row>
- <col id="0">4</col>
- <col id="1" translatable="yes">Private photos</col>
- </row>
- </data>
- </object>
- <object class="GtkListStore" id="resize_liststore">
- <columns>
- <!-- column-name description -->
- <column type="gchararray"/>
- <!-- column-name size -->
- <column type="gint"/>
- </columns>
- </object>
- <object class="GtkListStore" id="safety_liststore">
- <columns>
- <!-- column-name value -->
- <column type="gint"/>
- <!-- column-name name -->
- <column type="gchararray"/>
- </columns>
- <data>
- <row>
- <col id="0">0</col>
- <col id="1" translatable="yes">Safe content</col>
- </row>
- <row>
- <col id="0">1</col>
- <col id="1" translatable="yes">Moderate content</col>
- </row>
- <row>
- <col id="0">2</col>
- <col id="1" translatable="yes">Restricted content</col>
- </row>
- </data>
- </object>
- <object class="GtkImage" id="upload_image">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-goto-top</property>
- </object>
</interface>
diff --git a/extensions/flicker_utils/dlg-export-to-flickr.c b/extensions/flicker_utils/dlg-export-to-flickr.c
index 92dc515..a2f01c0 100644
--- a/extensions/flicker_utils/dlg-export-to-flickr.c
+++ b/extensions/flicker_utils/dlg-export-to-flickr.c
@@ -288,10 +288,6 @@ export_dialog_response_cb (GtkDialog *dialog,
DialogData *data = user_data;
switch (response_id) {
- case GTK_RESPONSE_HELP:
- show_help_dialog (GTK_WINDOW (data->browser), "gthumb-export-social");
- break;
-
case GTK_RESPONSE_DELETE_EVENT:
case GTK_RESPONSE_CANCEL:
gth_file_list_cancel (GTH_FILE_LIST (data->list_view), (DataFunc) destroy_dialog, data);
diff --git a/extensions/flicker_utils/dlg-import-from-flickr.c
b/extensions/flicker_utils/dlg-import-from-flickr.c
index e685cd7..c83a8f4 100644
--- a/extensions/flicker_utils/dlg-import-from-flickr.c
+++ b/extensions/flicker_utils/dlg-import-from-flickr.c
@@ -113,10 +113,6 @@ import_dialog_response_cb (GtkDialog *dialog,
DialogData *data = user_data;
switch (response_id) {
- case GTK_RESPONSE_HELP:
- show_help_dialog (GTK_WINDOW (data->browser), "export-to-picasaweb");
- break;
-
case GTK_RESPONSE_DELETE_EVENT:
case GTK_RESPONSE_CANCEL:
gth_file_list_cancel (GTH_FILE_LIST (data->file_list), (DataFunc) gtk_widget_destroy,
data->dialog);
diff --git a/extensions/photo_importer/data/ui/photo-importer.ui
b/extensions/photo_importer/data/ui/photo-importer.ui
index 6f83b19..d699bd3 100644
--- a/extensions/photo_importer/data/ui/photo-importer.ui
+++ b/extensions/photo_importer/data/ui/photo-importer.ui
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.0 on Tue Nov 19 11:17:23 2013 -->
<interface>
- <requires lib="gtk+" version="2.24"/>
+ <!-- interface-requires gtk+ 3.0 -->
<object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -28,7 +29,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -44,7 +44,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="image">image1</property>
<property name="use_underline">True</property>
</object>
@@ -54,23 +53,6 @@
<property name="position">1</property>
</packing>
</child>
- <child>
- <object class="GtkButton" id="help_button">
- <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_action_appearance">False</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- <property name="secondary">True</property>
- </packing>
- </child>
</object>
<packing>
<property name="expand">False</property>
@@ -338,7 +320,6 @@
<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="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -361,7 +342,6 @@
<action-widgets>
<action-widget response="0">cancel_button</action-widget>
<action-widget response="0">ok_button</action-widget>
- <action-widget response="0">help_button</action-widget>
</action-widgets>
</object>
</interface>
diff --git a/extensions/photo_importer/dlg-photo-importer.c b/extensions/photo_importer/dlg-photo-importer.c
index a8fa15e..f7f5779 100644
--- a/extensions/photo_importer/dlg-photo-importer.c
+++ b/extensions/photo_importer/dlg-photo-importer.c
@@ -244,14 +244,6 @@ ok_clicked_cb (GtkWidget *widget,
static void
-help_clicked_cb (GtkWidget *widget,
- DialogData *data)
-{
- show_help_dialog (GTK_WINDOW (data->dialog), "gthumb-importing");
-}
-
-
-static void
update_sensitivity (DialogData *data)
{
gboolean can_import;
@@ -703,10 +695,6 @@ dlg_photo_importer (GthBrowser *browser,
"clicked",
G_CALLBACK (close_dialog),
data);
- g_signal_connect (GET_WIDGET ("help_button"),
- "clicked",
- G_CALLBACK (help_clicked_cb),
- data);
if (data->selector_type == DLG_IMPORTER_SOURCE_TYPE_DEVICE)
g_signal_connect (data->device_chooser,
"changed",
diff --git a/extensions/photobucket/data/ui/export-to-photobucket.ui
b/extensions/photobucket/data/ui/export-to-photobucket.ui
index 5c8adbc..38e3b04 100644
--- a/extensions/photobucket/data/ui/export-to-photobucket.ui
+++ b/extensions/photobucket/data/ui/export-to-photobucket.ui
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.0 on Tue Nov 19 11:17:41 2013 -->
<interface>
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkListStore" id="account_liststore">
@@ -21,6 +22,49 @@
<column type="gchararray"/>
</columns>
</object>
+ <object class="GtkListStore" id="resize_liststore">
+ <columns>
+ <!-- column-name name -->
+ <column type="gchararray"/>
+ <!-- column-name size -->
+ <column type="gint"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">Tiny ( 100 x 75 )</col>
+ <col id="1">100</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Small ( 160 x 120 )</col>
+ <col id="1">160</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Medium ( 320 x 240 )</col>
+ <col id="1">320</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Large ( 640 x 480 )</col>
+ <col id="1">640</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">15ʺ screen ( 800 x 600 )</col>
+ <col id="1">800</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">17ʺ screen ( 1024 x 768 )</col>
+ <col id="1">1024</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">1 megabyte file size</col>
+ <col id="1">0</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkImage" id="upload_image">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-goto-top</property>
+ </object>
<object class="GtkDialog" id="export_dialog">
<property name="can_focus">False</property>
<property name="border_width">5</property>
@@ -66,21 +110,6 @@
<property name="position">1</property>
</packing>
</child>
- <child>
- <object class="GtkButton" id="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">2</property>
- <property name="secondary">True</property>
- </packing>
- </child>
</object>
<packing>
<property name="expand">False</property>
@@ -410,50 +439,6 @@
<action-widgets>
<action-widget response="-6">close_button</action-widget>
<action-widget response="-5">upload_button</action-widget>
- <action-widget response="-11">button1</action-widget>
</action-widgets>
</object>
- <object class="GtkListStore" id="resize_liststore">
- <columns>
- <!-- column-name name -->
- <column type="gchararray"/>
- <!-- column-name size -->
- <column type="gint"/>
- </columns>
- <data>
- <row>
- <col id="0" translatable="yes">Tiny ( 100 x 75 )</col>
- <col id="1">100</col>
- </row>
- <row>
- <col id="0" translatable="yes">Small ( 160 x 120 )</col>
- <col id="1">160</col>
- </row>
- <row>
- <col id="0" translatable="yes">Medium ( 320 x 240 )</col>
- <col id="1">320</col>
- </row>
- <row>
- <col id="0" translatable="yes">Large ( 640 x 480 )</col>
- <col id="1">640</col>
- </row>
- <row>
- <col id="0" translatable="yes">15ʺ screen ( 800 x 600 )</col>
- <col id="1">800</col>
- </row>
- <row>
- <col id="0" translatable="yes">17ʺ screen ( 1024 x 768 )</col>
- <col id="1">1024</col>
- </row>
- <row>
- <col id="0" translatable="yes">1 megabyte file size</col>
- <col id="1">0</col>
- </row>
- </data>
- </object>
- <object class="GtkImage" id="upload_image">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-goto-top</property>
- </object>
</interface>
diff --git a/extensions/photobucket/dlg-export-to-photobucket.c
b/extensions/photobucket/dlg-export-to-photobucket.c
index 3a4243a..3c48375 100644
--- a/extensions/photobucket/dlg-export-to-photobucket.c
+++ b/extensions/photobucket/dlg-export-to-photobucket.c
@@ -197,10 +197,6 @@ export_dialog_response_cb (GtkDialog *dialog,
DialogData *data = user_data;
switch (response_id) {
- case GTK_RESPONSE_HELP:
- show_help_dialog (GTK_WINDOW (data->browser), "gthumb-export-social");
- break;
-
case GTK_RESPONSE_DELETE_EVENT:
case GTK_RESPONSE_CANCEL:
gth_file_list_cancel (GTH_FILE_LIST (data->list_view), (DataFunc) destroy_dialog, data);
diff --git a/extensions/rename_series/data/ui/rename-series.ui
b/extensions/rename_series/data/ui/rename-series.ui
index 63c51a9..314c11a 100644
--- a/extensions/rename_series/data/ui/rename-series.ui
+++ b/extensions/rename_series/data/ui/rename-series.ui
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.0 on Tue Nov 19 11:18:09 2013 -->
<interface>
- <requires lib="gtk+" version="2.16"/>
+ <!-- interface-requires gtk+ 3.0 -->
<object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -29,7 +30,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -47,7 +47,6 @@
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="image">image1</property>
<property name="use_underline">True</property>
</object>
@@ -57,23 +56,6 @@
<property name="position">1</property>
</packing>
</child>
- <child>
- <object class="GtkButton" id="help_button">
- <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_action_appearance">False</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- <property name="secondary">True</property>
- </packing>
- </child>
</object>
<packing>
<property name="expand">False</property>
@@ -109,7 +91,7 @@
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
@@ -124,7 +106,7 @@
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
@@ -139,7 +121,7 @@
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
@@ -165,7 +147,7 @@
<property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
@@ -181,7 +163,7 @@
<property name="right_attach">2</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
@@ -216,7 +198,6 @@
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes">Edit template</property>
- <property name="use_action_appearance">False</property>
<child>
<object class="GtkImage" id="image2">
<property name="visible">True</property>
@@ -573,8 +554,8 @@
<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="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -669,7 +650,6 @@
<action-widgets>
<action-widget response="-6">cancel_button</action-widget>
<action-widget response="-5">ok_button</action-widget>
- <action-widget response="-11">help_button</action-widget>
</action-widgets>
</object>
<object class="GtkSizeGroup" id="sizegroup1">
diff --git a/extensions/rename_series/dlg-rename-series.c b/extensions/rename_series/dlg-rename-series.c
index a0c864b..2325775 100644
--- a/extensions/rename_series/dlg-rename-series.c
+++ b/extensions/rename_series/dlg-rename-series.c
@@ -647,10 +647,6 @@ dialog_response_cb (GtkDialog *dialog,
destroy_dialog (data);
break;
- case GTK_RESPONSE_HELP:
- show_help_dialog (GTK_WINDOW (dialog), "gthumb-rename-series");
- break;
-
case GTK_RESPONSE_OK:
ok_button_clicked (data);
break;
diff --git a/extensions/resize_images/data/ui/resize-images.ui
b/extensions/resize_images/data/ui/resize-images.ui
index 1856761..8e5d7a6 100644
--- a/extensions/resize_images/data/ui/resize-images.ui
+++ b/extensions/resize_images/data/ui/resize-images.ui
@@ -1,42 +1,119 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.0 on Tue Nov 19 11:18:39 2013 -->
<interface>
- <requires lib="gtk+" version="2.16"/>
- <!-- interface-naming-policy toplevel-contextual -->
- <object class="GtkAdjustment" id="width_adjustment">
- <property name="value">2</property>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkAdjustment" id="height_adjustment">
<property name="lower">2</property>
<property name="upper">999999</property>
+ <property name="value">2</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
- <object class="GtkAdjustment" id="height_adjustment">
- <property name="value">2</property>
+ <object class="GtkListStore" id="mime_type_liststore">
+ <columns>
+ <!-- column-name icon -->
+ <column type="GdkPixbuf"/>
+ <!-- column-name mime_type -->
+ <column type="gchararray"/>
+ <!-- column-name description -->
+ <column type="gchararray"/>
+ </columns>
+ </object>
+ <object class="GtkImage" id="ok_image">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-ok</property>
+ </object>
+ <object class="GtkListStore" id="unit_model">
+ <columns>
+ <!-- column-name gchararray -->
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">pixel</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">%</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkAdjustment" id="width_adjustment">
<property name="lower">2</property>
<property name="upper">999999</property>
+ <property name="value">2</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
<object class="GtkDialog" id="resize_images_dialog">
+ <property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="title" translatable="yes">Resize Images</property>
<property name="resizable">False</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
- <object class="GtkVBox" id="dialog-vbox8">
+ <object class="GtkBox" id="dialog-vbox8">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<property name="spacing">12</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area8">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="cancel_button">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="ok_button">
+ <property name="label">gtk-execute</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">2</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="GtkVBox" id="vbox61">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="spacing">12</property>
<child>
<object class="GtkVBox" id="vbox63">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="label106">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">New dimensions</property>
<attributes>
@@ -52,21 +129,28 @@
<child>
<object class="GtkAlignment" id="alignment2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
<object class="GtkVBox" id="vbox62">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkTable" id="table8">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="n_rows">2</property>
<property name="n_columns">3</property>
<property name="column_spacing">12</property>
<property name="row_spacing">6</property>
<child>
+ <placeholder/>
+ </child>
+ <child>
<object class="GtkLabel" id="label103">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Width:</property>
<property name="use_underline">True</property>
@@ -74,12 +158,13 @@
</object>
<packing>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkLabel" id="label104">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Height:</property>
<property name="use_underline">True</property>
@@ -89,14 +174,14 @@
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkSpinButton" id="width_spinbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">●</property>
+ <property name="invisible_char">●</property>
<property name="width_chars">6</property>
<property name="adjustment">width_adjustment</property>
<property name="climb_rate">1</property>
@@ -105,14 +190,14 @@
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkSpinButton" id="height_spinbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">●</property>
+ <property name="invisible_char">●</property>
<property name="width_chars">6</property>
<property name="adjustment">height_adjustment</property>
<property name="climb_rate">1</property>
@@ -123,15 +208,17 @@
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkHBox" id="hbox2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkComboBox" id="unit_combobox">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="model">unit_model</property>
<property name="active">0</property>
<child>
@@ -143,6 +230,7 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -152,9 +240,6 @@
<property name="right_attach">3</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
</object>
<packing>
<property name="expand">False</property>
@@ -169,6 +254,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -182,22 +268,27 @@
</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">False</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkVBox" id="saving_box">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Destination</property>
<attributes>
@@ -213,20 +304,25 @@
<child>
<object class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
<object class="GtkVBox" id="vbox1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkFileChooserButton" id="destination_filechooserbutton">
<property name="visible">True</property>
- <property name="local_only">False</property>
+ <property name="can_focus">False</property>
<property name="action">select-folder</property>
<property name="create_folders">False</property>
+ <property name="local_only">False</property>
<property name="title" translatable="yes">Choose destination folder</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -237,9 +333,12 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -247,22 +346,27 @@
</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">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">6</property>
<child>
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Format</property>
<attributes>
@@ -278,10 +382,12 @@
<child>
<object class="GtkAlignment" id="alignment3">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
<object class="GtkComboBox" id="mime_type_combobox">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="model">mime_type_liststore</property>
<child>
<object class="GtkCellRendererPixbuf" id="cellrenderertext1"/>
@@ -299,12 +405,15 @@
</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">False</property>
+ <property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
@@ -315,96 +424,11 @@
<property name="position">1</property>
</packing>
</child>
- <child internal-child="action_area">
- <object class="GtkHButtonBox" id="dialog-action_area8">
- <property name="visible">True</property>
- <property name="layout_style">end</property>
- <child>
- <object class="GtkButton" id="help_button">
- <property name="label">gtk-help</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- <property name="secondary">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="cancel_button">
- <property name="label">gtk-cancel</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="ok_button">
- <property name="label">gtk-execute</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">2</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>
- <action-widget response="-11">help_button</action-widget>
<action-widget response="-6">cancel_button</action-widget>
<action-widget response="0">ok_button</action-widget>
</action-widgets>
</object>
- <object class="GtkImage" id="ok_image">
- <property name="visible">True</property>
- <property name="stock">gtk-ok</property>
- </object>
- <object class="GtkListStore" id="unit_model">
- <columns>
- <!-- column-name gchararray -->
- <column type="gchararray"/>
- </columns>
- <data>
- <row>
- <col id="0" translatable="yes">pixel</col>
- </row>
- <row>
- <col id="0" translatable="yes">%</col>
- </row>
- </data>
- </object>
- <object class="GtkListStore" id="mime_type_liststore">
- <columns>
- <!-- column-name icon -->
- <column type="GdkPixbuf"/>
- <!-- column-name mime_type -->
- <column type="gchararray"/>
- <!-- column-name description -->
- <column type="gchararray"/>
- </columns>
- </object>
</interface>
diff --git a/extensions/resize_images/dlg-resize-images.c b/extensions/resize_images/dlg-resize-images.c
index e04ef94..aa3deaa 100644
--- a/extensions/resize_images/dlg-resize-images.c
+++ b/extensions/resize_images/dlg-resize-images.c
@@ -142,14 +142,6 @@ exec_resize (GthAsyncTask *task,
static void
-help_clicked_cb (GtkWidget *widget,
- DialogData *data)
-{
- show_help_dialog (GTK_WINDOW (data->dialog), "gthumb-batch-resize");
-}
-
-
-static void
ok_clicked_cb (GtkWidget *widget,
DialogData *data)
{
@@ -465,10 +457,6 @@ dlg_resize_images (GthBrowser *browser,
"clicked",
G_CALLBACK (ok_clicked_cb),
data);
- g_signal_connect (GET_WIDGET ("help_button"),
- "clicked",
- G_CALLBACK (help_clicked_cb),
- data);
g_signal_connect_swapped (GET_WIDGET ("cancel_button"),
"clicked",
G_CALLBACK (gtk_widget_destroy),
diff --git a/extensions/webalbums/data/ui/web-album-exporter.ui
b/extensions/webalbums/data/ui/web-album-exporter.ui
index 79bfe95..018145a 100644
--- a/extensions/webalbums/data/ui/web-album-exporter.ui
+++ b/extensions/webalbums/data/ui/web-album-exporter.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.0 on Thu Oct 10 22:02:17 2013 -->
+<!-- Generated with glade 3.16.0 on Tue Nov 19 11:19:15 2013 -->
<interface>
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkAdjustment" id="cols_adjustment">
@@ -71,23 +71,6 @@
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
- <object class="GtkButton" id="help_button">
- <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="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- <property name="secondary">True</property>
- </packing>
- </child>
- <child>
<object class="GtkButton" id="cancel_button">
<property name="label">gtk-cancel</property>
<property name="use_action_appearance">False</property>
@@ -1400,7 +1383,6 @@
</object>
</child>
<action-widgets>
- <action-widget response="-11">help_button</action-widget>
<action-widget response="-6">cancel_button</action-widget>
<action-widget response="-5">ok_button</action-widget>
</action-widgets>
diff --git a/extensions/webalbums/dlg-web-exporter.c b/extensions/webalbums/dlg-web-exporter.c
index 650023b..34123a3 100644
--- a/extensions/webalbums/dlg-web-exporter.c
+++ b/extensions/webalbums/dlg-web-exporter.c
@@ -66,14 +66,6 @@ destroy_cb (GtkWidget *widget,
static void
-help_clicked_cb (GtkWidget *widget,
- DialogData *data)
-{
- show_help_dialog (GTK_WINDOW (data->dialog), "webalbums");
-}
-
-
-static void
ok_clicked_cb (GtkWidget *widget,
DialogData *data)
{
@@ -489,10 +481,6 @@ dlg_web_exporter (GthBrowser *browser,
"clicked",
G_CALLBACK (ok_clicked_cb),
data);
- g_signal_connect (GET_WIDGET ("help_button"),
- "clicked",
- G_CALLBACK (help_clicked_cb),
- data);
g_signal_connect_swapped (GET_WIDGET ("cancel_button"),
"clicked",
G_CALLBACK (gtk_widget_destroy),
diff --git a/gthumb/dlg-preferences.c b/gthumb/dlg-preferences.c
index 9f73a81..e273877 100644
--- a/gthumb/dlg-preferences.c
+++ b/gthumb/dlg-preferences.c
@@ -108,14 +108,6 @@ close_button_clicked_cb (GtkWidget *widget,
static void
-help_button_clicked_cb (GtkWidget *widget,
- DialogData *data)
-{
- show_help_dialog (GTK_WINDOW (data->dialog), NULL);
-}
-
-
-static void
use_startup_toggled_cb (GtkWidget *widget,
DialogData *data)
{
@@ -314,10 +306,6 @@ dlg_preferences (GthBrowser *browser)
"clicked",
G_CALLBACK (close_button_clicked_cb),
data);
- g_signal_connect (G_OBJECT (GET_WIDGET ("help_button")),
- "clicked",
- G_CALLBACK (help_button_clicked_cb),
- data);
/* general */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
