[file-roller] removed the help buttons from the dialogs
- From: Paolo Bacchilega <paobac src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [file-roller] removed the help buttons from the dialogs
- Date: Wed, 20 Jun 2012 08:03:30 +0000 (UTC)
commit 599ec8e233aa2f6de6c44cead4efdb77aa1943b2
Author: Paolo Bacchilega <paobac src gnome org>
Date: Wed Jun 20 10:01:41 2012 +0200
removed the help buttons from the dialogs
the help pages relative to the dialogs are not present anymore
src/dlg-batch-add.c | 12 ---
src/dlg-prop.c | 15 ----
src/ui/batch-add-files.ui | 19 -----
src/ui/new.ui | 181 ++++++++++++++++++++-------------------------
src/ui/properties.ui | 63 +++++++++-------
5 files changed, 115 insertions(+), 175 deletions(-)
---
diff --git a/src/dlg-batch-add.c b/src/dlg-batch-add.c
index ed9e202..f39587a 100644
--- a/src/dlg-batch-add.c
+++ b/src/dlg-batch-add.c
@@ -120,14 +120,6 @@ set_archive_options (DialogData *data)
static void
-help_clicked_cb (GtkWidget *widget,
- DialogData *data)
-{
- show_help_dialog (GTK_WINDOW (GET_WIDGET ("dialog")), "archive-create");
-}
-
-
-static void
add_clicked_cb (GtkWidget *widget,
DialogData *data)
{
@@ -557,10 +549,6 @@ dlg_batch_add_files (FrWindow *window,
"clicked",
G_CALLBACK (add_clicked_cb),
data);
- g_signal_connect (GET_WIDGET ("a_help_button"),
- "clicked",
- G_CALLBACK (help_clicked_cb),
- data);
g_signal_connect (G_OBJECT (data->archive_type_combo_box),
"changed",
G_CALLBACK (archive_type_combo_box_changed_cb),
diff --git a/src/dlg-prop.c b/src/dlg-prop.c
index dd9e762..feff2f0 100644
--- a/src/dlg-prop.c
+++ b/src/dlg-prop.c
@@ -62,21 +62,11 @@ set_label (GtkWidget *label, const char *text)
}
-static int
-help_cb (GtkWidget *w,
- DialogData *data)
-{
- show_help_dialog (GTK_WINDOW (data->dialog), "archive-properties");
- return TRUE;
-}
-
-
void
dlg_prop (FrWindow *window)
{
DialogData *data;
GtkWidget *ok_button;
- GtkWidget *help_button;
GtkWidget *label_label;
GtkWidget *label;
char *s;
@@ -97,7 +87,6 @@ dlg_prop (FrWindow *window)
data->dialog = _gtk_builder_get_widget (data->builder, "prop_dialog");
ok_button = _gtk_builder_get_widget (data->builder, "p_ok_button");
- help_button = _gtk_builder_get_widget (data->builder, "p_help_button");
/* Set widgets data. */
@@ -203,10 +192,6 @@ dlg_prop (FrWindow *window)
"clicked",
G_CALLBACK (gtk_widget_destroy),
G_OBJECT (data->dialog));
- g_signal_connect (G_OBJECT (help_button),
- "clicked",
- G_CALLBACK (help_cb),
- data);
/* Run dialog. */
diff --git a/src/ui/batch-add-files.ui b/src/ui/batch-add-files.ui
index d18e3e0..3a05c47 100644
--- a/src/ui/batch-add-files.ui
+++ b/src/ui/batch-add-files.ui
@@ -57,24 +57,6 @@
<property name="position">1</property>
</packing>
</child>
- <child>
- <object class="GtkButton" id="a_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">2</property>
- <property name="secondary">True</property>
- </packing>
- </child>
</object>
<packing>
<property name="expand">False</property>
@@ -374,7 +356,6 @@
<action-widgets>
<action-widget response="0">a_cancel_button</action-widget>
<action-widget response="0">a_add_button</action-widget>
- <action-widget response="-11">a_help_button</action-widget>
</action-widgets>
</object>
<object class="GtkAdjustment" id="volume_adjustment">
diff --git a/src/ui/new.ui b/src/ui/new.ui
index 0bd6735..e1a5a95 100644
--- a/src/ui/new.ui
+++ b/src/ui/new.ui
@@ -1,102 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
- <object class="GtkFileChooserDialog" id="filechooserdialog">
- <property name="can_focus">False</property>
- <property name="border_width">5</property>
- <property name="modal">True</property>
- <property name="window_position">center-on-parent</property>
- <property name="type_hint">normal</property>
- <property name="action">save</property>
- <property name="do_overwrite_confirmation">True</property>
- <property name="extra_widget">extra_widget</property>
- <child internal-child="vbox">
- <object class="GtkBox" id="dialog-vbox1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">2</property>
- <child internal-child="action_area">
- <object class="GtkButtonBox" id="dialog-action_area1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="layout_style">end</property>
- <child>
- <object class="GtkButton" id="n_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">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>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="n_new_button">
- <property name="label">gtk-new</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">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="n_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">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">2</property>
- <property name="secondary">True</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>
- <placeholder/>
- </child>
- </object>
- </child>
- <action-widgets>
- <action-widget response="-6">n_cancel_button</action-widget>
- <action-widget response="-5">n_new_button</action-widget>
- <action-widget response="-11">n_help_button</action-widget>
- </action-widgets>
- </object>
- <object class="GtkAdjustment" id="volume_adjustment">
- <property name="lower">0.10000000149</property>
- <property name="upper">1000</property>
- <property name="value">10</property>
- <property name="step_increment">0.10000000149</property>
- <property name="page_increment">10</property>
- </object>
<object class="GtkVBox" id="extra_widget">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -129,6 +33,7 @@
<object class="GtkVBox" id="vbox2">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="margin_left">12</property>
<property name="spacing">6</property>
<child>
<object class="GtkHBox" id="hbox2">
@@ -143,9 +48,6 @@
<property name="column_spacing">12</property>
<property name="row_spacing">6</property>
<child>
- <placeholder/>
- </child>
- <child>
<object class="GtkLabel" id="n_password_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -181,11 +83,10 @@
<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="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
<packing>
- <property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
@@ -283,4 +184,82 @@
</packing>
</child>
</object>
+ <object class="GtkFileChooserDialog" id="filechooserdialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="modal">True</property>
+ <property name="window_position">center-on-parent</property>
+ <property name="type_hint">normal</property>
+ <property name="action">save</property>
+ <property name="do_overwrite_confirmation">True</property>
+ <property name="extra_widget">extra_widget</property>
+ <child internal-child="vbox">
+ <object class="GtkBox" id="dialog-vbox1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">2</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="n_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">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>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="n_new_button">
+ <property name="label">gtk-new</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">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-6">n_cancel_button</action-widget>
+ <action-widget response="-5">n_new_button</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkAdjustment" id="volume_adjustment">
+ <property name="lower">0.10000000149</property>
+ <property name="upper">1000</property>
+ <property name="value">10</property>
+ <property name="step_increment">0.10000000149</property>
+ <property name="page_increment">10</property>
+ </object>
</interface>
diff --git a/src/ui/properties.ui b/src/ui/properties.ui
index 855b0c9..bfc80e8 100644
--- a/src/ui/properties.ui
+++ b/src/ui/properties.ui
@@ -18,26 +18,6 @@
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
- <object class="GtkButton" id="p_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="has_focus">True</property>
- <property name="can_default">True</property>
- <property name="has_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="p_ok_button">
<property name="label">gtk-close</property>
<property name="use_action_appearance">False</property>
@@ -75,8 +55,12 @@
<object class="GtkLabel" id="p_name_label_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes" context="File">Name:</property>
<property name="justify">center</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
<property name="x_options">GTK_FILL</property>
@@ -87,8 +71,12 @@
<object class="GtkLabel" id="p_size_label_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes">Archive size:</property>
<property name="justify">center</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
<property name="top_attach">3</property>
@@ -117,8 +105,12 @@
<object class="GtkLabel" id="p_path_label_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes" comments="after the colon there is a folder name.">Location:</property>
<property name="justify">center</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
<property name="top_attach">1</property>
@@ -147,7 +139,11 @@
<object class="GtkLabel" id="p_cratio_label_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes">Compression ratio:</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
<property name="top_attach">5</property>
@@ -176,8 +172,12 @@
<object class="GtkLabel" id="p_date_label_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes">Last modified:</property>
<property name="justify">center</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
<property name="top_attach">2</property>
@@ -190,7 +190,11 @@
<object class="GtkLabel" id="p_uncomp_size_label_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes">Content size:</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
<property name="top_attach">4</property>
@@ -235,8 +239,12 @@
<object class="GtkLabel" id="p_files_label_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes">Number of files:</property>
<property name="justify">center</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
<property name="top_attach">6</property>
@@ -286,7 +294,6 @@
</object>
</child>
<action-widgets>
- <action-widget response="-11">p_help_button</action-widget>
<action-widget response="-7">p_ok_button</action-widget>
</action-widgets>
</object>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
