Commit 48fb011c authored by Paolo Bacchilega's avatar Paolo Bacchilega
Browse files

removed the help buttons from the dialogs

parent 6a8c1c32
<?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">
......@@ -30,22 +30,6 @@
<object class="GtkButtonBox" id="dialog-action_area1">
<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>
......@@ -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>
......
......@@ -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);
......
<?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>
<?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">
......@@ -34,22 +34,6 @@
<property name="visible">True</property>
<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>
......@@ -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>
......
......@@ -140,14 +140,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,
......@@ -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. */
......
......@@ -64,14 +64,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),
......
<?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>
......@@ -32,23 +48,6 @@
<property name="visible">True</property>
<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>
......@@ -56,7 +55,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>
......@@ -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>
......@@ -129,14 +129,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)
{
......@@ -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),
......
<?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>
......@@ -30,24 +62,6 @@
<property name="visible">True</property>
<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>
......@@ -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>
......@@ -122,6 +134,9 @@
<property name="n_columns">2</property>
<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>
......@@ -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>
......@@ -382,6 +394,9 @@
<property name="n_columns">2</property>
<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>
......@@ -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>