aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRodney Dawes <dobey@ximian.com>2004-03-16 04:37:48 +0800
committerRodney Dawes <dobey@src.gnome.org>2004-03-16 04:37:48 +0800
commit4080a5356c3543a554d689df467d6d72393e58c6 (patch)
tree31a7f4312f0cb506ffe7000010e5f22837491979
parentde554db704621dacfba118684f9d2ace694afd65 (diff)
downloadgsoc2013-evolution-4080a5356c3543a554d689df467d6d72393e58c6.tar
gsoc2013-evolution-4080a5356c3543a554d689df467d6d72393e58c6.tar.gz
gsoc2013-evolution-4080a5356c3543a554d689df467d6d72393e58c6.tar.bz2
gsoc2013-evolution-4080a5356c3543a554d689df467d6d72393e58c6.tar.lz
gsoc2013-evolution-4080a5356c3543a554d689df467d6d72393e58c6.tar.xz
gsoc2013-evolution-4080a5356c3543a554d689df467d6d72393e58c6.tar.zst
gsoc2013-evolution-4080a5356c3543a554d689df467d6d72393e58c6.zip
Hide the separators on these dialogs Re-pack the rule_editor widget in
2004-04-15 Rodney Dawes <dobey@ximian.com> * filter-datespec.c (validate): (button_clicked): Hide the separators on these dialogs * filter-editor.c (filter_editor_new): Re-pack the rule_editor widget in here, and get rid of the GtkFrame-related code * filter-file.c (validate): Hide the separators on these dialogs * filter-filter.c (get_widget): Get rid of the GtkFrame, and relayout the widgets to be HIG-compliant * filter-folder.c (validate): Hide the separator on this dialog * filter-input.c (validate): Hide the separator on this dialog * filter-part.c (main): Hide the separator on this dialog * filter-rule.c (validate): Hide the separator on this dialog (get_widget): Get rid of the GtkFrame, and relayout the widgets to be HIG-compliant * filter.glade: Make the widget layouts here be HIG-compliant * rule-context.c (new_rule_response): (rule_context_add_rule_gui): Hide the separators on these dialogs * rule-editor.c (rule_editor_new): Get rid of the GtkFrame-related code (add_editor_response): Hide the dialog separator here (rule_add): Hide the dialog separator here (edit_editor_response): Hide the dialog separator here (rule_edit): Hide the dialog separator here (rule_editor_construct): Remove the rule_editor repacking code Set the dialog vbox's border width to 12 Set the mnemonic for the filter label here Hide the dialog separator on the filter editor dialog * vfolder-editor.c (vfolder_editor_new): Re-pack the appropriate editor widget in here Get rid of the GtkFrame-related code * vfolder-rule.c (validate): Hide the dialog separators here svn path=/trunk/; revision=25083
-rw-r--r--filter/ChangeLog32
-rw-r--r--filter/filter-datespec.c2
-rw-r--r--filter/filter-editor.c7
-rw-r--r--filter/filter-file.c2
-rw-r--r--filter/filter-filter.c28
-rw-r--r--filter/filter-folder.c3
-rw-r--r--filter/filter-input.c1
-rw-r--r--filter/filter-part.c1
-rw-r--r--filter/filter-rule.c43
-rw-r--r--filter/filter.glade955
-rw-r--r--filter/rule-context.c2
-rw-r--r--filter/rule-editor.c23
-rw-r--r--filter/vfolder-editor.c11
-rw-r--r--filter/vfolder-rule.c2
14 files changed, 651 insertions, 461 deletions
diff --git a/filter/ChangeLog b/filter/ChangeLog
index 592045ef37..b12299bc8f 100644
--- a/filter/ChangeLog
+++ b/filter/ChangeLog
@@ -1,3 +1,35 @@
+2004-04-15 Rodney Dawes <dobey@ximian.com>
+
+ * filter-datespec.c (validate):
+ (button_clicked): Hide the separators on these dialogs
+ * filter-editor.c (filter_editor_new): Re-pack the rule_editor widget
+ in here, and get rid of the GtkFrame-related code
+ * filter-file.c (validate): Hide the separators on these dialogs
+ * filter-filter.c (get_widget): Get rid of the GtkFrame, and relayout
+ the widgets to be HIG-compliant
+ * filter-folder.c (validate): Hide the separator on this dialog
+ * filter-input.c (validate): Hide the separator on this dialog
+ * filter-part.c (main): Hide the separator on this dialog
+ * filter-rule.c (validate): Hide the separator on this dialog
+ (get_widget): Get rid of the GtkFrame, and relayout the widgets to be
+ HIG-compliant
+ * filter.glade: Make the widget layouts here be HIG-compliant
+ * rule-context.c (new_rule_response):
+ (rule_context_add_rule_gui): Hide the separators on these dialogs
+ * rule-editor.c (rule_editor_new): Get rid of the GtkFrame-related code
+ (add_editor_response): Hide the dialog separator here
+ (rule_add): Hide the dialog separator here
+ (edit_editor_response): Hide the dialog separator here
+ (rule_edit): Hide the dialog separator here
+ (rule_editor_construct): Remove the rule_editor repacking code
+ Set the dialog vbox's border width to 12
+ Set the mnemonic for the filter label here
+ Hide the dialog separator on the filter editor dialog
+ * vfolder-editor.c (vfolder_editor_new): Re-pack the appropriate
+ editor widget in here
+ Get rid of the GtkFrame-related code
+ * vfolder-rule.c (validate): Hide the dialog separators here
+
2004-02-20 Jeffrey Stedfast <fejj@ximian.com>
* rule-editor.c (rule_delete): After setting the new selected
diff --git a/filter/filter-datespec.c b/filter/filter-datespec.c
index 9b15c1dbdb..2c8ddb4a90 100644
--- a/filter/filter-datespec.c
+++ b/filter/filter-datespec.c
@@ -175,6 +175,7 @@ validate (FilterElement *fe)
GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
"%s", _("You must choose a date."));
+ gtk_dialog_set_has_separator ((GtkDialog *) dialog, FALSE);
gtk_dialog_run ((GtkDialog *) dialog);
gtk_widget_destroy (dialog);
}
@@ -408,6 +409,7 @@ button_clicked (GtkButton *button, FilterDatespec *fds)
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OK, GTK_RESPONSE_OK,
NULL);
+ gtk_dialog_set_has_separator (dialog, FALSE);
p->notebook_type = glade_xml_get_widget (gui, "notebook_type");
p->option_type = glade_xml_get_widget (gui, "option_type");
diff --git a/filter/filter-editor.c b/filter/filter-editor.c
index f6dc5700ec..58d33a8a4d 100644
--- a/filter/filter-editor.c
+++ b/filter/filter-editor.c
@@ -108,11 +108,12 @@ filter_editor_new (FilterContext *fc, const char **source_names)
GtkWidget *w;
gui = glade_xml_new (FILTER_GLADEDIR "/filter.glade", "rule_editor", NULL);
+
+ w = glade_xml_get_widget (gui, "rule_editor");
+ gtk_box_pack_start (GTK_BOX (GTK_DIALOG (fe)->vbox), w, TRUE, TRUE, 0);
+
filter_editor_construct (fe, fc, gui, source_names);
- w = glade_xml_get_widget (gui, "rule_frame");
- gtk_frame_set_label (GTK_FRAME (w), _("Filter Rules"));
-
g_object_unref (gui);
return fe;
diff --git a/filter/filter-file.c b/filter/filter-file.c
index 41c6b69c58..2a79fdc172 100644
--- a/filter/filter-file.c
+++ b/filter/filter-file.c
@@ -165,6 +165,7 @@ validate (FilterElement *fe)
GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
"%s", _("You must specify a file name."));
+ gtk_dialog_set_has_separator ((GtkDialog *) dialog, FALSE);
gtk_dialog_run ((GtkDialog *) dialog);
gtk_widget_destroy (dialog);
@@ -184,6 +185,7 @@ validate (FilterElement *fe)
_("File '%s' does not exist or is not a regular file."),
file->path);
+ gtk_dialog_set_has_separator ((GtkDialog *) dialog, FALSE);
gtk_dialog_run ((GtkDialog *) dialog);
gtk_widget_destroy (dialog);
diff --git a/filter/filter-filter.c b/filter/filter-filter.c
index 6719cb9ad4..0aa5920b98 100644
--- a/filter/filter-filter.c
+++ b/filter/filter-filter.c
@@ -475,7 +475,7 @@ more_parts (GtkWidget *button, struct _rule_data *data)
static GtkWidget *
get_widget (FilterRule *fr, RuleContext *rc)
{
- GtkWidget *widget, *hbox, *add, *frame;
+ GtkWidget *widget, *hbox, *add, *label;
GtkWidget *parts, *inframe, *w;
GtkWidget *scrolledwindow;
GtkObject *hadj, *vadj;
@@ -488,10 +488,22 @@ get_widget (FilterRule *fr, RuleContext *rc)
widget = FILTER_RULE_CLASS (parent_class)->get_widget (fr, rc);
/* and now for the action area */
- frame = gtk_frame_new (_("Then"));
- inframe = gtk_vbox_new (FALSE, 3);
- gtk_container_add (GTK_CONTAINER (frame), inframe);
- gtk_container_set_border_width (GTK_CONTAINER (inframe), 6);
+ label = gtk_label_new (_("<b>Then</b>"));
+ gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
+ gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_box_pack_start (GTK_BOX (widget), label, FALSE, FALSE, 0);
+ gtk_widget_show (label);
+
+ hbox = gtk_hbox_new (FALSE, 12);
+ gtk_box_pack_start (GTK_BOX (widget), hbox, FALSE, FALSE, 0);
+ gtk_widget_show (hbox);
+
+ label = gtk_label_new ("");
+ gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+ gtk_widget_show (label);
+
+ inframe = gtk_vbox_new (FALSE, 6);
+ gtk_box_pack_start (GTK_BOX (hbox), inframe, TRUE, TRUE, 0);
rows = g_list_length (ff->actions);
parts = gtk_table_new (rows, 2, FALSE);
@@ -526,13 +538,11 @@ get_widget (FilterRule *fr, RuleContext *rc)
gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolledwindow), parts);
- gtk_box_pack_start (GTK_BOX (inframe), scrolledwindow, TRUE, TRUE, 3);
+ gtk_box_pack_start (GTK_BOX (inframe), scrolledwindow, TRUE, TRUE, 0);
/*gtk_box_pack_start (GTK_BOX (inframe), parts, FALSE, FALSE, 3);*/
- gtk_widget_show_all (frame);
-
- gtk_box_pack_start (GTK_BOX (widget), frame, TRUE, TRUE, 3);
+ gtk_widget_show_all (widget);
return widget;
}
diff --git a/filter/filter-folder.c b/filter/filter-folder.c
index c19584484d..a2489e030b 100644
--- a/filter/filter-folder.c
+++ b/filter/filter-folder.c
@@ -151,7 +151,8 @@ validate (FilterElement *fe)
dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
"%s", _("You must specify a folder."));
-
+
+ gtk_dialog_set_has_separator ((GtkDialog *) dialog, FALSE);
gtk_dialog_run ((GtkDialog *) dialog);
gtk_widget_destroy (dialog);
diff --git a/filter/filter-input.c b/filter/filter-input.c
index ac2c59f610..ff5afe5337 100644
--- a/filter/filter-input.c
+++ b/filter/filter-input.c
@@ -193,6 +193,7 @@ validate (FilterElement *fe)
_("Error in regular expression '%s':\n%s"),
pattern, regmsg);
+ gtk_dialog_set_has_separator ((GtkDialog *) dialog, FALSE);
gtk_dialog_run ((GtkDialog *) dialog);
gtk_widget_destroy (dialog);
g_free (regmsg);
diff --git a/filter/filter-part.c b/filter/filter-part.c
index 5f8a53304a..f82d354dee 100644
--- a/filter/filter-part.c
+++ b/filter/filter-part.c
@@ -528,6 +528,7 @@ int main(int argc, char **argv)
dialog = gtk_dialog_new ();
gtk_dialog_add_buttons ((GtkDialog *) dialog, GTK_BUTTONS_OK, NULL);
+ gtk_dialog_set_has_separator ((GtkDialog *) dialog, FALSE);
gtk_window_set_title ((GtkWindow *) dialog, _("Test"));
gtk_window_set_policy ((GtkWindow *) dialog, FALSE, TRUE, FALSE);
gtk_box_pack_start ((GtkBox *) dialog->vbox, w, TRUE, TRUE, 0);
diff --git a/filter/filter-rule.c b/filter/filter-rule.c
index 87e6433167..fdf59a5c6f 100644
--- a/filter/filter-rule.c
+++ b/filter/filter-rule.c
@@ -218,6 +218,7 @@ validate (FilterRule *fr)
GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
"%s", _("You must name this filter."));
+ gtk_dialog_set_has_separator ((GtkDialog *) dialog, FALSE);
gtk_dialog_run ((GtkDialog *) dialog);
gtk_widget_destroy (dialog);
@@ -735,7 +736,7 @@ static GtkWidget *
get_widget (FilterRule *fr, struct _RuleContext *f)
{
GtkWidget *hbox, *vbox, *parts, *inframe;
- GtkWidget *add, *frame, *label, *name, *w;
+ GtkWidget *add, *label, *name, *w;
GtkWidget *omenu, *menu, *item;
GtkWidget *scrolledwindow;
GtkObject *hadj, *vadj;
@@ -746,9 +747,9 @@ get_widget (FilterRule *fr, struct _RuleContext *f)
/* this stuff should probably be a table, but the
rule parts need to be a vbox */
- vbox = gtk_vbox_new (FALSE, 3);
-
- label = gtk_label_new (_("Rule name: "));
+ vbox = gtk_vbox_new (FALSE, 6);
+
+ label = gtk_label_new (_("Rule name:"));
name = gtk_entry_new ();
if (!fr->name) {
@@ -763,16 +764,34 @@ get_widget (FilterRule *fr, struct _RuleContext *f)
/* evil kludgy hack because gtk sucks */
g_signal_connect (name, "realize", G_CALLBACK (grab_focus), name);
- hbox = gtk_hbox_new (FALSE, 3);
+ hbox = gtk_hbox_new (FALSE, 12);
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (hbox), name, TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
g_signal_connect (name, "changed", G_CALLBACK (name_changed), fr);
-
- frame = gtk_frame_new (_("If"));
- inframe = gtk_vbox_new (FALSE, 3);
- gtk_container_add (GTK_CONTAINER (frame), inframe);
- gtk_container_set_border_width (GTK_CONTAINER (inframe), 6);
+ gtk_widget_show (label);
+ gtk_widget_show (hbox);
+
+ hbox = gtk_hbox_new (FALSE, 12);
+ gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+ gtk_widget_show (hbox);
+
+ label = gtk_label_new (_("<b>If</b>"));
+ gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
+ gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+ gtk_widget_show (label);
+
+ hbox = gtk_hbox_new (FALSE, 12);
+ gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+ gtk_widget_show (hbox);
+
+ label = gtk_label_new ("");
+ gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+ gtk_widget_show (label);
+
+ inframe = gtk_vbox_new (FALSE, 6);
+ gtk_box_pack_start (GTK_BOX (hbox), inframe, TRUE, TRUE, 0);
/* this is the parts table, it should probably be inside a scrolling list */
rows = g_list_length (fr->parts);
@@ -836,10 +855,6 @@ get_widget (FilterRule *fr, struct _RuleContext *f)
gtk_box_pack_start (GTK_BOX (inframe), scrolledwindow, TRUE, TRUE, 3);
- /*gtk_box_pack_start (GTK_BOX (inframe), parts, FALSE, FALSE, 3); */
-
- gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
-
gtk_widget_show_all (vbox);
return vbox;
diff --git a/filter/filter.glade b/filter/filter.glade
index ac61b72c4d..03585a5f7d 100644
--- a/filter/filter.glade
+++ b/filter/filter.glade
@@ -4,7 +4,6 @@
<glade-interface>
<widget class="GtkDialog" id="filter-editor">
- <property name="border_width">6</property>
<property name="visible">True</property>
<property name="title" translatable="yes">Edit Filters</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
@@ -12,13 +11,13 @@
<property name="modal">False</property>
<property name="resizable">True</property>
<property name="destroy_with_parent">False</property>
- <property name="has_separator">True</property>
+ <property name="has_separator">False</property>
<child internal-child="vbox">
<widget class="GtkVBox" id="dialog-vbox1">
<property name="visible">True</property>
<property name="homogeneous">False</property>
- <property name="spacing">6</property>
+ <property name="spacing">0</property>
<child internal-child="action_area">
<widget class="GtkHButtonBox" id="dialog-action_area1">
@@ -58,144 +57,188 @@
</child>
<child>
- <widget class="GtkOptionMenu" id="filter_source">
+ <widget class="GtkVBox" id="vbox10">
+ <property name="border_width">12</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="history">0</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">6</property>
- <child internal-child="menu">
- <widget class="GtkMenu" id="convertwidget1">
+ <child>
+ <widget class="GtkOptionMenu" id="filter_source">
<property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="history">0</property>
- <child>
- <widget class="GtkMenuItem" id="convertwidget2">
+ <child internal-child="menu">
+ <widget class="GtkMenu" id="convertwidget1">
<property name="visible">True</property>
- <property name="label" translatable="yes">Incoming</property>
- <property name="use_underline">True</property>
- </widget>
- </child>
- <child>
- <widget class="GtkMenuItem" id="convertwidget3">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Outgoing</property>
- <property name="use_underline">True</property>
+ <child>
+ <widget class="GtkMenuItem" id="convertwidget2">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Incoming</property>
+ <property name="use_underline">True</property>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkMenuItem" id="convertwidget3">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Outgoing</property>
+ <property name="use_underline">True</property>
+ </widget>
+ </child>
</widget>
</child>
</widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
</child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkFrame" id="frame1">
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="label_yalign">0.5</property>
- <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+ <child>
+ <widget class="GtkLabel" id="label9">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">&lt;b&gt;Filter Rules&lt;/b&gt;</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">True</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
<child>
- <widget class="GtkHBox" id="hbox1">
- <property name="border_width">6</property>
+ <widget class="GtkHBox" id="hbox7">
<property name="visible">True</property>
<property name="homogeneous">False</property>
- <property name="spacing">6</property>
+ <property name="spacing">12</property>
<child>
- <widget class="GtkScrolledWindow" id="scrolledwindow1">
+ <widget class="GtkLabel" id="label10">
<property name="visible">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
- <child>
- <widget class="Custom" id="rule_list">
- <property name="visible">True</property>
- <property name="creation_function">rule_editor_treeview_new</property>
- <property name="int1">0</property>
- <property name="int2">0</property>
- <property name="last_modification_time">Thu, 12 Dec 2002 23:41:46 GMT</property>
- </widget>
- </child>
+ <property name="label" translatable="yes"></property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
</widget>
<packing>
<property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox1">
+ <widget class="GtkHBox" id="hbox1">
<property name="visible">True</property>
<property name="homogeneous">False</property>
- <property name="spacing">0</property>
+ <property name="spacing">6</property>
<child>
- <widget class="GtkVButtonBox" id="vbuttonbox1">
+ <widget class="Custom" id="rule_list">
<property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_DEFAULT_STYLE</property>
- <property name="spacing">6</property>
+ <property name="creation_function">rule_editor_treeview_new</property>
+ <property name="int1">0</property>
+ <property name="int2">0</property>
+ <property name="last_modification_time">Thu, 12 Dec 2002 23:41:46 GMT</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
- <child>
- <widget class="GtkButton" id="rule_add">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-add</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- </widget>
- </child>
+ <child>
+ <widget class="GtkVBox" id="vbox1">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
<child>
- <widget class="GtkButton" id="rule_edit">
+ <widget class="GtkVButtonBox" id="vbuttonbox1">
<property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">_Edit</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- </widget>
- </child>
+ <property name="layout_style">GTK_BUTTONBOX_DEFAULT_STYLE</property>
+ <property name="spacing">6</property>
- <child>
- <widget class="GtkButton" id="rule_delete">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-remove</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- </widget>
- </child>
+ <child>
+ <widget class="GtkButton" id="rule_add">
+ <property name="visible">True</property>
+ <property name="can_default">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-add</property>
+ <property name="use_stock">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ </widget>
+ </child>
- <child>
- <widget class="GtkButton" id="rule_up">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-go-up</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- </widget>
- </child>
+ <child>
+ <widget class="GtkButton" id="rule_edit">
+ <property name="visible">True</property>
+ <property name="can_default">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">_Edit</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ </widget>
+ </child>
- <child>
- <widget class="GtkButton" id="rule_down">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-go-down</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
+ <child>
+ <widget class="GtkButton" id="rule_delete">
+ <property name="visible">True</property>
+ <property name="can_default">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-remove</property>
+ <property name="use_stock">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkButton" id="rule_up">
+ <property name="visible">True</property>
+ <property name="can_default">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-go-up</property>
+ <property name="use_stock">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkButton" id="rule_down">
+ <property name="visible">True</property>
+ <property name="can_default">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-go-down</property>
+ <property name="use_stock">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ </widget>
+ </child>
</widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
</child>
</widget>
<packing>
@@ -207,34 +250,20 @@
</widget>
<packing>
<property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
</packing>
</child>
</widget>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Filter Rules</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
<packing>
- <property name="type">label_item</property>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
</packing>
</child>
</widget>
<packing>
- <property name="padding">0</property>
+ <property name="padding">3</property>
<property name="expand">True</property>
<property name="fill">True</property>
</packing>
@@ -244,7 +273,6 @@
</widget>
<widget class="GtkDialog" id="vfolder-editor">
- <property name="border_width">6</property>
<property name="visible">True</property>
<property name="title" translatable="yes">Edit VFolders</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
@@ -252,7 +280,7 @@
<property name="modal">False</property>
<property name="resizable">True</property>
<property name="destroy_with_parent">False</property>
- <property name="has_separator">True</property>
+ <property name="has_separator">False</property>
<child internal-child="vbox">
<widget class="GtkVBox" id="dialog-vbox2">
@@ -298,109 +326,153 @@
</child>
<child>
- <widget class="GtkFrame" id="frame2">
+ <widget class="GtkVBox" id="vfolder_editor">
+ <property name="border_width">12</property>
<property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="label_yalign">0.5</property>
- <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">6</property>
<child>
- <widget class="GtkHBox" id="hbox2">
- <property name="border_width">6</property>
+ <widget class="GtkLabel" id="filter_label">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">&lt;b&gt;Virtual _Folders&lt;/b&gt;</property>
+ <property name="use_underline">True</property>
+ <property name="use_markup">True</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkHBox" id="hbox8">
<property name="visible">True</property>
<property name="homogeneous">False</property>
- <property name="spacing">6</property>
+ <property name="spacing">12</property>
<child>
- <widget class="GtkScrolledWindow" id="scrolledwindow2">
+ <widget class="GtkLabel" id="label12">
<property name="visible">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
- <child>
- <widget class="Custom" id="rule_list">
- <property name="visible">True</property>
- <property name="creation_function">rule_editor_treeview_new</property>
- <property name="int1">0</property>
- <property name="int2">0</property>
- <property name="last_modification_time">Fri, 13 Dec 2002 00:15:04 GMT</property>
- </widget>
- </child>
+ <property name="label" translatable="yes"></property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
</widget>
<packing>
<property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox2">
+ <widget class="GtkHBox" id="hbox2">
<property name="visible">True</property>
<property name="homogeneous">False</property>
- <property name="spacing">0</property>
+ <property name="spacing">6</property>
<child>
- <widget class="GtkVButtonBox" id="vbuttonbox2">
+ <widget class="Custom" id="rule_list">
<property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_DEFAULT_STYLE</property>
- <property name="spacing">6</property>
+ <property name="creation_function">rule_editor_treeview_new</property>
+ <property name="int1">0</property>
+ <property name="int2">0</property>
+ <property name="last_modification_time">Fri, 13 Dec 2002 00:15:04 GMT</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
- <child>
- <widget class="GtkButton" id="rule_add">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-add</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- </widget>
- </child>
+ <child>
+ <widget class="GtkVBox" id="vbox2">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
<child>
- <widget class="GtkButton" id="rule_edit">
+ <widget class="GtkVButtonBox" id="vbuttonbox2">
<property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">_Edit</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- </widget>
- </child>
+ <property name="layout_style">GTK_BUTTONBOX_DEFAULT_STYLE</property>
+ <property name="spacing">6</property>
- <child>
- <widget class="GtkButton" id="rule_delete">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-remove</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- </widget>
- </child>
+ <child>
+ <widget class="GtkButton" id="rule_add">
+ <property name="visible">True</property>
+ <property name="can_default">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-add</property>
+ <property name="use_stock">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ </widget>
+ </child>
- <child>
- <widget class="GtkButton" id="rule_up">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-go-up</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- </widget>
- </child>
+ <child>
+ <widget class="GtkButton" id="rule_edit">
+ <property name="visible">True</property>
+ <property name="can_default">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">_Edit</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ </widget>
+ </child>
- <child>
- <widget class="GtkButton" id="rule_down">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-go-down</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
+ <child>
+ <widget class="GtkButton" id="rule_delete">
+ <property name="visible">True</property>
+ <property name="can_default">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-remove</property>
+ <property name="use_stock">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkButton" id="rule_up">
+ <property name="visible">True</property>
+ <property name="can_default">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-go-up</property>
+ <property name="use_stock">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkButton" id="rule_down">
+ <property name="visible">True</property>
+ <property name="can_default">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-go-down</property>
+ <property name="use_stock">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ </widget>
+ </child>
</widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
</child>
</widget>
<packing>
@@ -412,34 +484,20 @@
</widget>
<packing>
<property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
</packing>
</child>
</widget>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label2">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Virtual Folders</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
<packing>
- <property name="type">label_item</property>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
</packing>
</child>
</widget>
<packing>
- <property name="padding">0</property>
+ <property name="padding">3</property>
<property name="expand">True</property>
<property name="fill">True</property>
</packing>
@@ -457,13 +515,13 @@
<property name="modal">False</property>
<property name="resizable">True</property>
<property name="destroy_with_parent">False</property>
- <property name="has_separator">True</property>
+ <property name="has_separator">False</property>
<child internal-child="vbox">
<widget class="GtkVBox" id="dialog-vbox3">
<property name="visible">True</property>
<property name="homogeneous">False</property>
- <property name="spacing">8</property>
+ <property name="spacing">6</property>
<child internal-child="action_area">
<widget class="GtkHButtonBox" id="dialog-action_area3">
@@ -515,62 +573,51 @@
</child>
<child>
- <widget class="GtkFrame" id="vfolder_source_frame">
+ <widget class="GtkVBox" id="vfolder_source_frame">
<property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="label_yalign">0.5</property>
- <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">6</property>
<child>
- <widget class="GtkVBox" id="vbox3">
- <property name="border_width">6</property>
+ <widget class="GtkLabel" id="label13">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">&lt;b&gt;vFolder Sources&lt;/b&gt;</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">True</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkHBox" id="hbox9">
<property name="visible">True</property>
<property name="homogeneous">False</property>
- <property name="spacing">6</property>
+ <property name="spacing">0</property>
<child>
- <widget class="GtkOptionMenu" id="source_option">
+ <widget class="GtkLabel" id="label14">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="history">0</property>
-
- <child internal-child="menu">
- <widget class="GtkMenu" id="convertwidget8">
- <property name="visible">True</property>
-
- <child>
- <widget class="GtkMenuItem" id="convertwidget9">
- <property name="visible">True</property>
- <property name="label" translatable="yes">specific folders only</property>
- <property name="use_underline">True</property>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="convertwidget10">
- <property name="visible">True</property>
- <property name="label" translatable="yes">with all local folders</property>
- <property name="use_underline">True</property>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="convertwidget11">
- <property name="visible">True</property>
- <property name="label" translatable="yes">with all active remote folders</property>
- <property name="use_underline">True</property>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="convertwidget12">
- <property name="visible">True</property>
- <property name="label" translatable="yes">with all local and active remote folders</property>
- <property name="use_underline">True</property>
- </widget>
- </child>
- </widget>
- </child>
+ <property name="label" translatable="yes"> </property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -580,68 +627,123 @@
</child>
<child>
- <widget class="GtkHBox" id="hbox3">
+ <widget class="GtkVBox" id="vbox3">
+ <property name="border_width">6</property>
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkScrolledWindow" id="scrolledwindow3">
+ <widget class="GtkOptionMenu" id="source_option">
<property name="visible">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+ <property name="can_focus">True</property>
+ <property name="history">0</property>
+
+ <child internal-child="menu">
+ <widget class="GtkMenu" id="convertwidget8">
+ <property name="visible">True</property>
<child>
- <widget class="Custom" id="source_list">
+ <widget class="GtkMenuItem" id="convertwidget9">
<property name="visible">True</property>
- <property name="creation_function">vfolder_editor_sourcelist_new</property>
- <property name="int1">0</property>
- <property name="int2">0</property>
- <property name="last_modification_time">Fri, 13 Dec 2002 00:22:39 GMT</property>
+ <property name="label" translatable="yes">specific folders only</property>
+ <property name="use_underline">True</property>
</widget>
</child>
+
+ <child>
+ <widget class="GtkMenuItem" id="convertwidget10">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">with all local folders</property>
+ <property name="use_underline">True</property>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkMenuItem" id="convertwidget11">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">with all active remote folders</property>
+ <property name="use_underline">True</property>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkMenuItem" id="convertwidget12">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">with all local and active remote folders</property>
+ <property name="use_underline">True</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
</widget>
<packing>
<property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox3">
+ <widget class="GtkHBox" id="hbox3">
<property name="visible">True</property>
<property name="homogeneous">False</property>
- <property name="spacing">1</property>
+ <property name="spacing">6</property>
<child>
- <widget class="GtkVButtonBox" id="vbuttonbox3">
+ <widget class="Custom" id="source_list">
<property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_DEFAULT_STYLE</property>
- <property name="spacing">6</property>
+ <property name="creation_function">vfolder_editor_sourcelist_new</property>
+ <property name="int1">0</property>
+ <property name="int2">0</property>
+ <property name="last_modification_time">Fri, 13 Dec 2002 00:22:39 GMT</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
- <child>
- <widget class="GtkButton" id="source_add">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-add</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- </widget>
- </child>
+ <child>
+ <widget class="GtkVBox" id="vbox3">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">1</property>
<child>
- <widget class="GtkButton" id="source_remove">
+ <widget class="GtkVButtonBox" id="vbuttonbox3">
<property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-remove</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="layout_style">GTK_BUTTONBOX_DEFAULT_STYLE</property>
+ <property name="spacing">6</property>
+
+ <child>
+ <widget class="GtkButton" id="source_add">
+ <property name="visible">True</property>
+ <property name="can_default">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-add</property>
+ <property name="use_stock">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkButton" id="source_remove">
+ <property name="visible">True</property>
+ <property name="can_default">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-remove</property>
+ <property name="use_stock">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ </widget>
+ </child>
</widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
</child>
</widget>
<packing>
@@ -653,8 +755,8 @@
</widget>
<packing>
<property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
</packing>
</child>
</widget>
@@ -665,29 +767,15 @@
</packing>
</child>
</widget>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label3">
- <property name="visible">True</property>
- <property name="label" translatable="yes">vFolder Sources</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
<packing>
- <property name="type">label_item</property>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
</packing>
</child>
</widget>
<packing>
- <property name="padding">0</property>
+ <property name="padding">3</property>
<property name="expand">True</property>
<property name="fill">True</property>
</packing>
@@ -697,7 +785,6 @@
</widget>
<widget class="GtkWindow" id="rule-editor">
- <property name="border_width">6</property>
<property name="visible">True</property>
<property name="title" translatable="yes">window1</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
@@ -708,6 +795,7 @@
<child>
<widget class="GtkVBox" id="rule_editor">
+ <property name="border_width">12</property>
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">6</property>
@@ -739,109 +827,152 @@
</child>
<child>
- <widget class="GtkFrame" id="rule_frame">
+ <widget class="GtkVBox" id="rule_frame">
<property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="label_yalign">0.5</property>
- <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">6</property>
<child>
- <widget class="GtkHBox" id="hbox4">
- <property name="border_width">6</property>
+ <widget class="GtkLabel" id="filter_label">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">&lt;b&gt;_Filter Rules&lt;/b&gt;</property>
+ <property name="use_underline">True</property>
+ <property name="use_markup">True</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkHBox" id="hbox10">
<property name="visible">True</property>
<property name="homogeneous">False</property>
- <property name="spacing">6</property>
+ <property name="spacing">12</property>
<child>
- <widget class="GtkScrolledWindow" id="scrolledwindow4">
+ <widget class="GtkLabel" id="label16">
<property name="visible">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
- <child>
- <widget class="Custom" id="rule_list">
- <property name="visible">True</property>
- <property name="creation_function">rule_editor_treeview_new</property>
- <property name="int1">0</property>
- <property name="int2">0</property>
- <property name="last_modification_time">Thu, 12 Dec 2002 23:50:05 GMT</property>
- </widget>
- </child>
+ <property name="label" translatable="yes"></property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
</widget>
<packing>
<property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox5">
+ <widget class="GtkHBox" id="hbox4">
<property name="visible">True</property>
<property name="homogeneous">False</property>
- <property name="spacing">0</property>
+ <property name="spacing">6</property>
+
+ <child>
+ <widget class="Custom" id="rule_list">
+ <property name="visible">True</property>
+ <property name="creation_function">rule_editor_treeview_new</property>
+ <property name="int1">0</property>
+ <property name="int2">0</property>
+ <property name="last_modification_time">Thu, 12 Dec 2002 23:50:05 GMT</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
<child>
- <widget class="GtkVButtonBox" id="vbuttonbox4">
+ <widget class="GtkVBox" id="vbox5">
<property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_DEFAULT_STYLE</property>
+ <property name="homogeneous">False</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkButton" id="rule_add">
+ <widget class="GtkVButtonBox" id="vbuttonbox4">
<property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-add</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- </widget>
- </child>
+ <property name="layout_style">GTK_BUTTONBOX_DEFAULT_STYLE</property>
+ <property name="spacing">6</property>
- <child>
- <widget class="GtkButton" id="rule_edit">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">_Edit</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- </widget>
- </child>
+ <child>
+ <widget class="GtkButton" id="rule_add">
+ <property name="visible">True</property>
+ <property name="can_default">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-add</property>
+ <property name="use_stock">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ </widget>
+ </child>
- <child>
- <widget class="GtkButton" id="rule_delete">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-remove</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- </widget>
- </child>
+ <child>
+ <widget class="GtkButton" id="rule_edit">
+ <property name="visible">True</property>
+ <property name="can_default">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">_Edit</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ </widget>
+ </child>
- <child>
- <widget class="GtkButton" id="rule_up">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-go-up</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- </widget>
- </child>
+ <child>
+ <widget class="GtkButton" id="rule_delete">
+ <property name="visible">True</property>
+ <property name="can_default">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-remove</property>
+ <property name="use_stock">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ </widget>
+ </child>
- <child>
- <widget class="GtkButton" id="rule_down">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-go-down</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
+ <child>
+ <widget class="GtkButton" id="rule_up">
+ <property name="visible">True</property>
+ <property name="can_default">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-go-up</property>
+ <property name="use_stock">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkButton" id="rule_down">
+ <property name="visible">True</property>
+ <property name="can_default">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-go-down</property>
+ <property name="use_stock">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ </widget>
+ </child>
</widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
</child>
</widget>
<packing>
@@ -853,34 +984,20 @@
</widget>
<packing>
<property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
</packing>
</child>
</widget>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label4">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Filter Rules</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
<packing>
- <property name="type">label_item</property>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
</packing>
</child>
</widget>
<packing>
- <property name="padding">0</property>
+ <property name="padding">3</property>
<property name="expand">True</property>
<property name="fill">True</property>
</packing>
diff --git a/filter/rule-context.c b/filter/rule-context.c
index 791dc6ea20..07a3775e3e 100644
--- a/filter/rule-context.c
+++ b/filter/rule-context.c
@@ -682,6 +682,7 @@ new_rule_response(GtkWidget *dialog, int button, RuleContext *context)
_("Rule name '%s' is not unique, choose another."),
rule->name);
+ gtk_dialog_set_has_separator ((GtkDialog *) dialog, FALSE);
gtk_dialog_run ((GtkDialog *) dialog);
gtk_widget_destroy (dialog);
@@ -717,6 +718,7 @@ rule_context_add_rule_gui(RuleContext *rc, FilterRule *rule, const char *title,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OK, GTK_RESPONSE_OK,
NULL);
+ gtk_dialog_set_has_separator (dialog, FALSE);
gtk_window_set_title((GtkWindow *) dialog, title);
gtk_window_set_default_size((GtkWindow *) dialog, 600, 400);
diff --git a/filter/rule-editor.c b/filter/rule-editor.c
index 320e9851e1..f1a4606d98 100644
--- a/filter/rule-editor.c
+++ b/filter/rule-editor.c
@@ -163,14 +163,10 @@ rule_editor_new (RuleContext *rc, const char *source)
{
RuleEditor *re = (RuleEditor *) g_object_new (RULE_TYPE_EDITOR, NULL);
GladeXML *gui;
- GtkWidget *w;
gui = glade_xml_new (FILTER_GLADEDIR "/filter.glade", "rule_editor", NULL);
rule_editor_construct (re, rc, gui, source);
- w = glade_xml_get_widget (gui, "rule_frame");
- gtk_frame_set_label ((GtkFrame *) w, _("Rules"));
-
g_object_unref (gui);
return re;
@@ -243,6 +239,7 @@ add_editor_response (GtkWidget *dialog, int button, RuleEditor *re)
_("Rule name '%s' is not unique, choose another."),
re->edit->name);
+ gtk_dialog_set_has_separator ((GtkDialog *) dialog, FALSE);
gtk_dialog_run ((GtkDialog *) dialog);
gtk_widget_destroy (dialog);
@@ -289,6 +286,7 @@ rule_add (GtkWidget *widget, RuleEditor *re)
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OK, GTK_RESPONSE_OK,
NULL);
+ gtk_dialog_set_has_separator ((GtkDialog *) re->dialog, FALSE);
gtk_window_set_title ((GtkWindow *) re->dialog, _("Add Rule"));
gtk_window_set_default_size (GTK_WINDOW (re->dialog), 650, 400);
@@ -328,6 +326,7 @@ edit_editor_response (GtkWidget *dialog, int button, RuleEditor *re)
_("Rule name '%s' is not unique, choose another."),
re->edit->name);
+ gtk_dialog_set_has_separator ((GtkDialog *) dialog, FALSE);
gtk_dialog_run ((GtkDialog *) dialog);
gtk_widget_destroy (dialog);
@@ -371,6 +370,7 @@ rule_edit (GtkWidget *widget, RuleEditor *re)
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OK, GTK_RESPONSE_OK,
NULL);
+ gtk_dialog_set_has_separator ((GtkDialog *) re->dialog, FALSE);
gtk_window_set_title ((GtkWindow *) re->dialog, _("Edit Rule"));
gtk_window_set_default_size (GTK_WINDOW (re->dialog), 650, 400);
@@ -724,10 +724,9 @@ rule_editor_construct (RuleEditor *re, RuleContext *context, GladeXML *gui, cons
gtk_window_set_resizable ((GtkWindow *) re, TRUE);
gtk_window_set_default_size ((GtkWindow *) re, 350, 400);
- gtk_container_set_border_width ((GtkContainer *) re, 6);
-
- w = glade_xml_get_widget (gui, "rule_editor");
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (re)->vbox), w, TRUE, TRUE, 3);
+
+ gtk_widget_realize ((GtkWidget *) re);
+ gtk_container_set_border_width ((GtkContainer *) ((GtkDialog *) re)->action_area, 12);
for (i = 0; i < BUTTON_LAST; i++) {
re->priv->buttons[i] = (GtkButton *) w = glade_xml_get_widget (gui, edit_buttons[i].name);
@@ -740,10 +739,14 @@ rule_editor_construct (RuleEditor *re, RuleContext *context, GladeXML *gui, cons
g_signal_connect (re->list, "cursor-changed", G_CALLBACK (cursor_changed), re);
g_signal_connect (re->list, "row-activated", G_CALLBACK (double_click), re);
-
+
+ w = glade_xml_get_widget (gui, "filter_label");
+ gtk_label_set_mnemonic_widget ((GtkLabel *) w, (GtkWidget *) re->list);
+
g_signal_connect (re, "response", G_CALLBACK (editor_response), re);
rule_editor_set_source (re, source);
-
+
+ gtk_dialog_set_has_separator ((GtkDialog *) re, FALSE);
gtk_dialog_add_buttons ((GtkDialog *) re,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OK, GTK_RESPONSE_OK,
diff --git a/filter/vfolder-editor.c b/filter/vfolder-editor.c
index 87776c010d..4280d8cd2f 100644
--- a/filter/vfolder-editor.c
+++ b/filter/vfolder-editor.c
@@ -105,12 +105,13 @@ vfolder_editor_new (VfolderContext *vc)
GladeXML *gui;
GtkWidget *w;
- gui = glade_xml_new (FILTER_GLADEDIR "/filter.glade", "rule_editor", NULL);
+ gui = glade_xml_new (FILTER_GLADEDIR "/filter.glade", "vfolder_editor", NULL);
+
+ w = glade_xml_get_widget (gui, "vfolder_editor");
+ gtk_box_pack_start (GTK_BOX (GTK_DIALOG (ve)->vbox), w, TRUE, TRUE, 0);
+
rule_editor_construct ((RuleEditor *) ve, (RuleContext *) vc, gui, NULL);
-
- w = glade_xml_get_widget (gui, "rule_frame");
- gtk_frame_set_label ((GtkFrame *) w, _("Virtual Folders"));
-
+
g_object_unref (gui);
return ve;
diff --git a/filter/vfolder-rule.c b/filter/vfolder-rule.c
index b8acb3b94e..c71b9558de 100644
--- a/filter/vfolder-rule.c
+++ b/filter/vfolder-rule.c
@@ -214,6 +214,7 @@ validate (FilterRule *fr)
GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
"%s", _("You must name this vfolder."));
+ gtk_dialog_set_has_separator ((GtkDialog *) dialog, FALSE);
gtk_dialog_run ((GtkDialog *) dialog);
gtk_widget_destroy (dialog);
@@ -228,6 +229,7 @@ validate (FilterRule *fr)
GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
"%s", _("You need to to specify at least one folder as a source."));
+ gtk_dialog_set_has_separator ((GtkDialog *) dialog, FALSE);
gtk_dialog_run ((GtkDialog *) dialog);
gtk_widget_destroy (dialog);