aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--filter/ChangeLog6
-rw-r--r--filter/filter-editor.c6
-rw-r--r--filter/filter-filter.c4
-rw-r--r--filter/filter-folder.c1
-rw-r--r--filter/filter-part.c3
-rw-r--r--filter/filter-rule.c12
-rw-r--r--filter/rule-context.c3
-rw-r--r--filter/score-editor.c6
-rw-r--r--filter/vfolder-editor.c6
9 files changed, 31 insertions, 16 deletions
diff --git a/filter/ChangeLog b/filter/ChangeLog
index 44834ea3f8..59fbdab3cc 100644
--- a/filter/ChangeLog
+++ b/filter/ChangeLog
@@ -1,3 +1,9 @@
+2000-10-23 Christopher James Lahey <clahey@helixcode.com>
+
+ * filter-editor.c, filter-filter.c, filter-folder.c,
+ filter-part.c, filter-rule.c, rule-context.c, score-editor.c,
+ vfolder-editor.c: Fixed these widgets to resize properly.
+
2000-10-20 Jeffrey Stedfast <fejj@helixcode.com>
* Makefile.am: Added filter-url.[c,h].
diff --git a/filter/filter-editor.c b/filter/filter-editor.c
index bed8a0f032..681b062e2d 100644
--- a/filter/filter-editor.c
+++ b/filter/filter-editor.c
@@ -156,7 +156,8 @@ rule_add (GtkWidget *widget, struct _editor_data *data)
w = filter_rule_get_widget ((FilterRule *)rule, data->f);
gd = gnome_dialog_new (_("Add Rule"), GNOME_STOCK_BUTTON_OK, GNOME_STOCK_BUTTON_CANCEL, NULL);
- gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (gd)->vbox), w, FALSE, TRUE, 0);
+ gtk_window_set_policy(GTK_WINDOW(gd), FALSE, TRUE, FALSE);
+ gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (gd)->vbox), w, TRUE, TRUE, 0);
gtk_widget_show (gd);
result = gnome_dialog_run_and_close (GNOME_DIALOG (gd));
@@ -197,7 +198,8 @@ rule_edit (GtkWidget *widget, struct _editor_data *data)
rule = data->current;
w = filter_rule_get_widget (rule, data->f);
gd = gnome_dialog_new(_("Edit Rule"), GNOME_STOCK_BUTTON_OK, GNOME_STOCK_BUTTON_CANCEL, NULL);
- gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (gd)->vbox), w, FALSE, TRUE, 0);
+ gtk_window_set_policy(GTK_WINDOW(gd), FALSE, TRUE, FALSE);
+ gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (gd)->vbox), w, TRUE, TRUE, 0);
gtk_widget_show (gd);
result = gnome_dialog_run_and_close (GNOME_DIALOG (gd));
diff --git a/filter/filter-filter.c b/filter/filter-filter.c
index 5268381e30..12d7af2f19 100644
--- a/filter/filter-filter.c
+++ b/filter/filter-filter.c
@@ -436,13 +436,13 @@ get_widget (FilterRule *fr, struct _RuleContext *f)
gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolledwindow), parts);
- gtk_box_pack_start (GTK_BOX (inframe), scrolledwindow, FALSE, FALSE, 3);
+ gtk_box_pack_start (GTK_BOX (inframe), scrolledwindow, TRUE, TRUE, 3);
/*gtk_box_pack_start (GTK_BOX (inframe), parts, FALSE, FALSE, 3);*/
gtk_widget_show_all (frame);
- gtk_box_pack_start (GTK_BOX (widget), frame, FALSE, FALSE, 3);
+ gtk_box_pack_start (GTK_BOX (widget), frame, TRUE, TRUE, 3);
return widget;
}
diff --git a/filter/filter-folder.c b/filter/filter-folder.c
index 6df1fe9e1b..1682415009 100644
--- a/filter/filter-folder.c
+++ b/filter/filter-folder.c
@@ -209,6 +209,7 @@ static void button_clicked(GtkButton *button, FilterFolder *ff)
gd = (GnomeDialog *)gnome_dialog_new(_("Enter folder URI"),
GNOME_STOCK_BUTTON_OK, GNOME_STOCK_BUTTON_CANCEL,
NULL);
+ gtk_window_set_policy(GTK_WINDOW(gd), FALSE, TRUE, FALSE);
entry = (GtkEntry *)gtk_entry_new();
if (ff->uri) {
e_utf8_gtk_entry_set_text(entry, ff->uri);
diff --git a/filter/filter-part.c b/filter/filter-part.c
index 31394b63fd..5f478d3888 100644
--- a/filter/filter-part.c
+++ b/filter/filter-part.c
@@ -418,7 +418,8 @@ int main(int argc, char **argv)
w = filter_part_get_widget(ff);
gd = (GnomeDialog *)gnome_dialog_new(_("Test"), GNOME_STOCK_BUTTON_OK, NULL);
- gtk_box_pack_start((GtkBox *)gd->vbox, w, FALSE, TRUE, 0);
+ gtk_window_set_policy(GTK_WINDOW(gd), FALSE, TRUE, FALSE);
+ gtk_box_pack_start((GtkBox *)gd->vbox, w, TRUE, TRUE, 0);
gtk_widget_show((GtkWidget *)gd);
gnome_dialog_run_and_close(gd);
diff --git a/filter/filter-rule.c b/filter/filter-rule.c
index 11c5e1adde..c42f169f3e 100644
--- a/filter/filter-rule.c
+++ b/filter/filter-rule.c
@@ -547,19 +547,19 @@ get_widget(FilterRule * fr, struct _RuleContext *f)
gtk_widget_show(omenu);
pixmap = gnome_stock_new_with_icon(GNOME_STOCK_PIXMAP_ADD);
- button = gnome_pixmap_button(pixmap, _("More criterion"));
+ button = gnome_pixmap_button(pixmap, _("More criteria"));
gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
gtk_signal_connect(GTK_OBJECT(button), "clicked", more_parts, data);
gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 3);
pixmap = gnome_stock_new_with_icon(GNOME_STOCK_PIXMAP_REMOVE);
- button = gnome_pixmap_button(pixmap, _("Fewer criterion"));
+ button = gnome_pixmap_button(pixmap, _("Fewer criteria"));
gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
gtk_signal_connect(GTK_OBJECT(button), "clicked", less_parts, data);
gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 3);
- gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
- gtk_box_pack_start(GTK_BOX(hbox), omenu, FALSE, FALSE, 0);
+ gtk_box_pack_end(GTK_BOX(hbox), omenu, FALSE, FALSE, 0);
+ gtk_box_pack_end(GTK_BOX(hbox), label, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(inframe), hbox, FALSE, FALSE, 3);
@@ -578,11 +578,11 @@ get_widget(FilterRule * fr, struct _RuleContext *f)
gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolledwindow), parts);
- gtk_box_pack_start(GTK_BOX(inframe), scrolledwindow, FALSE, FALSE, 3);
+ 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, FALSE, FALSE, 3);
+ gtk_box_pack_start(GTK_BOX(vbox), frame, TRUE, TRUE, 3);
gtk_widget_show_all(vbox);
diff --git a/filter/rule-context.c b/filter/rule-context.c
index 399d5787ef..7bb0b8fb65 100644
--- a/filter/rule-context.c
+++ b/filter/rule-context.c
@@ -388,7 +388,8 @@ rule_context_add_rule_gui(RuleContext * f, FilterRule * rule, const char *title,
w = filter_rule_get_widget(rule, f);
gd = (GnomeDialog *) gnome_dialog_new(title, GNOME_STOCK_BUTTON_OK, GNOME_STOCK_BUTTON_CANCEL, NULL);
- gtk_box_pack_start((GtkBox *) gd->vbox, w, FALSE, TRUE, 0);
+ gtk_window_set_policy(GTK_WINDOW(gd), FALSE, TRUE, FALSE);
+ gtk_box_pack_start((GtkBox *) gd->vbox, w, TRUE, TRUE, 0);
gtk_widget_show((GtkWidget *) gd);
gtk_object_set_data_full((GtkObject *) gd, "rule", rule, (GtkDestroyNotify) gtk_object_unref);
if (path)
diff --git a/filter/score-editor.c b/filter/score-editor.c
index aa575120a8..77031d6e77 100644
--- a/filter/score-editor.c
+++ b/filter/score-editor.c
@@ -127,7 +127,8 @@ static void rule_add(GtkWidget *widget, struct _editor_data *data)
gd = (GnomeDialog *)gnome_dialog_new(_("Add Rule"),
GNOME_STOCK_BUTTON_OK, GNOME_STOCK_BUTTON_CANCEL,
NULL);
- gtk_box_pack_start((GtkBox *)gd->vbox, w, FALSE, TRUE, 0);
+ gtk_window_set_policy(GTK_WINDOW(gd), FALSE, TRUE, FALSE);
+ gtk_box_pack_start((GtkBox *)gd->vbox, w, TRUE, TRUE, 0);
gtk_widget_show((GtkWidget *)gd);
result = gnome_dialog_run_and_close(gd);
if (result == 0) {
@@ -163,7 +164,8 @@ static void rule_edit(GtkWidget *widget, struct _editor_data *data)
rule = data->current;
w = filter_rule_get_widget(rule, data->f);
gd = (GnomeDialog *)gnome_dialog_new(_("Edit Score Rule"), GNOME_STOCK_BUTTON_OK, NULL);
- gtk_box_pack_start((GtkBox *)gd->vbox, w, FALSE, TRUE, 0);
+ gtk_window_set_policy(GTK_WINDOW(gd), FALSE, TRUE, FALSE);
+ gtk_box_pack_start((GtkBox *)gd->vbox, w, TRUE, TRUE, 0);
gtk_widget_show((GtkWidget *)gd);
result = gnome_dialog_run_and_close(gd);
diff --git a/filter/vfolder-editor.c b/filter/vfolder-editor.c
index 327dc36e96..32be9bce3b 100644
--- a/filter/vfolder-editor.c
+++ b/filter/vfolder-editor.c
@@ -153,7 +153,8 @@ static void rule_add(GtkWidget *widget, struct _editor_data *data)
gd = (GnomeDialog *)gnome_dialog_new(_("Add Rule"),
GNOME_STOCK_BUTTON_OK, GNOME_STOCK_BUTTON_CANCEL,
NULL);
- gtk_box_pack_start((GtkBox *)gd->vbox, w, FALSE, TRUE, 0);
+ gtk_window_set_policy(GTK_WINDOW(gd), FALSE, TRUE, FALSE);
+ gtk_box_pack_start((GtkBox *)gd->vbox, w, TRUE, TRUE, 0);
gtk_widget_show((GtkWidget *)gd);
result = gnome_dialog_run_and_close(gd);
if (result == 0) {
@@ -190,7 +191,8 @@ static void rule_edit(GtkWidget *widget, struct _editor_data *data)
rule = data->current;
w = filter_rule_get_widget(rule, data->f);
gd = (GnomeDialog *)gnome_dialog_new(_("Edit VFolder Rule"), GNOME_STOCK_BUTTON_OK, NULL);
- gtk_box_pack_start((GtkBox *)gd->vbox, w, FALSE, TRUE, 0);
+ gtk_window_set_policy(GTK_WINDOW(gd), FALSE, TRUE, FALSE);
+ gtk_box_pack_start((GtkBox *)gd->vbox, w, TRUE, TRUE, 0);
gtk_widget_show((GtkWidget *)gd);
result = gnome_dialog_run_and_close(gd);
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-29 07:17:10 +0800