Hi,
Here's two patches to make the UI of tracker-search-tool a bit nicer.
The first changes the minimum size of the window to the size required by
the widgets, instead of a static size.
The second removes the empty vbox causing indentation of the search
label and uses GtkButtonBox to make all buttons larger and the
previous/next buttons of the same size.
Cheers,
Eskil
Index: tracker-search-tool-callbacks.c
===================================================================
RCS file: /cvs/gnome/tracker/src/tracker-search-tool/tracker-search-tool-callbacks.c,v
retrieving revision 1.2
diff -u -r1.2 tracker-search-tool-callbacks.c
--- tracker-search-tool-callbacks.c 19 Oct 2006 01:25:50 -0000 1.2
+++ tracker-search-tool-callbacks.c 24 Oct 2006 16:50:13 -0000
@@ -57,9 +57,6 @@
static void
store_window_state_and_geometry (GSearchWindow *gsearch)
{
- gsearch->window_width = MAX (gsearch->window_width, MINIMUM_WINDOW_WIDTH);
- gsearch->window_height = MAX (gsearch->window_height, MINIMUM_WINDOW_HEIGHT);
-
tracker_search_gconf_set_int ("/apps/tracker-search-tool/default_window_width",
gsearch->window_width);
tracker_search_gconf_set_int ("/apps/tracker-search-tool/default_window_height",
@@ -159,7 +156,7 @@
GDK_HINT_MIN_SIZE);
}
else {
- GdkGeometry default_geometry = {MINIMUM_WINDOW_WIDTH, MINIMUM_WINDOW_HEIGHT};
+ GdkGeometry default_geometry = {DEFAULT_WINDOW_WIDTH, DEFAULT_WINDOW_HEIGHT};
gtk_widget_hide (gsearch->available_options_vbox);
gtk_window_set_geometry_hints (GTK_WINDOW (gsearch->window),
Index: tracker-search-tool-support.c
===================================================================
RCS file: /cvs/gnome/tracker/src/tracker-search-tool/tracker-search-tool-support.c,v
retrieving revision 1.2
diff -u -r1.2 tracker-search-tool-support.c
--- tracker-search-tool-support.c 19 Oct 2006 01:25:50 -0000 1.2
+++ tracker-search-tool-support.c 24 Oct 2006 16:50:13 -0000
@@ -1519,6 +1519,6 @@
saved_height = DEFAULT_WINDOW_HEIGHT;
}
- *width = MAX (saved_width, MINIMUM_WINDOW_WIDTH);
- *height = MAX (saved_height, MINIMUM_WINDOW_HEIGHT);
+ *width = saved_width;
+ *height = saved_height;
}
Index: tracker-search-tool.c
===================================================================
RCS file: /cvs/gnome/tracker/src/tracker-search-tool/tracker-search-tool.c,v
retrieving revision 1.4
diff -u -r1.4 tracker-search-tool.c
--- tracker-search-tool.c 23 Oct 2006 00:15:36 -0000 1.4
+++ tracker-search-tool.c 24 Oct 2006 16:50:14 -0000
@@ -1538,7 +1538,6 @@
window = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (window), GTK_SHADOW_IN);
gtk_container_set_border_width (GTK_CONTAINER (window), 0);
- gtk_widget_set_size_request (window, 530, 160);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (window),
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
@@ -2032,8 +2031,8 @@
G_CALLBACK (gsearch_window_size_allocate),
gsearch);
gsearch->command_details = g_slice_new0 (GSearchCommandDetails);
- gsearch->window_geometry.min_height = MINIMUM_WINDOW_HEIGHT;
- gsearch->window_geometry.min_width = MINIMUM_WINDOW_WIDTH;
+ gsearch->window_geometry.min_height = -1;
+ gsearch->window_geometry.min_width = -1;
gtk_window_set_position (GTK_WINDOW (gsearch->window), GTK_WIN_POS_CENTER);
gtk_window_set_geometry_hints (GTK_WINDOW (gsearch->window), GTK_WIDGET (gsearch->window),
Index: tracker-search-tool.h
===================================================================
RCS file: /cvs/gnome/tracker/src/tracker-search-tool/tracker-search-tool.h,v
retrieving revision 1.3
diff -u -r1.3 tracker-search-tool.h
--- tracker-search-tool.h 23 Oct 2006 00:15:36 -0000 1.3
+++ tracker-search-tool.h 24 Oct 2006 16:50:14 -0000
@@ -47,8 +47,6 @@
#define TRACKER_SEARCH_TOOL_ICON "tracker-searchtool"
-#define MINIMUM_WINDOW_WIDTH 420
-#define MINIMUM_WINDOW_HEIGHT 400
#define DEFAULT_WINDOW_WIDTH 500
#define DEFAULT_WINDOW_HEIGHT 450
#define WINDOW_HEIGHT_STEP 35
--- tracker-search-tool.c.windowsize 2006-10-24 19:05:06.000000000 +0200
+++ tracker-search-tool.c 2006-10-24 19:07:19.000000000 +0200
@@ -2065,9 +2065,6 @@
hbox = gtk_hbox_new (FALSE, 12);
gtk_box_pack_start (GTK_BOX (container), hbox, FALSE, FALSE, 0);
- vbox = gtk_vbox_new (FALSE, 0);
- gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
-
gsearch->name_and_folder_table = gtk_table_new (1, 4, FALSE);
gtk_table_set_row_spacings (GTK_TABLE (gsearch->name_and_folder_table), 6);
gtk_table_set_col_spacings (GTK_TABLE (gsearch->name_and_folder_table), 12);
@@ -2092,8 +2089,11 @@
gtk_table_attach (GTK_TABLE (gsearch->name_and_folder_table), gsearch->combo, 2, 3, 0, 1, GTK_FILL, 0, 0, 0);
+ hbox = gtk_hbutton_box_new ();
+ gtk_table_attach (GTK_TABLE (gsearch->name_and_folder_table), hbox, 3, 4, 0, 1, GTK_FILL, 0, 0, 0);
+
gsearch->find_button = gtk_button_new_from_stock (GTK_STOCK_FIND);
- gtk_table_attach (GTK_TABLE (gsearch->name_and_folder_table), gsearch->find_button, 3, 4, 0, 1, GTK_FILL, 0, 0, 1);
+ gtk_container_add (GTK_CONTAINER (hbox), gsearch->find_button);
if (GTK_IS_ACCESSIBLE (gtk_widget_get_accessible (gsearch->search_entry))) {
gsearch->is_window_accessible = TRUE;
@@ -2138,16 +2138,10 @@
add_atk_namedesc (GTK_WIDGET (gsearch->find_button), NULL, _("Click to perform a search."));
}
- vbox = gtk_hbox_new (FALSE, 2);
- gtk_box_pack_start (GTK_BOX (container), vbox, FALSE, FALSE, 0);
-
- widget = gtk_button_new_with_mnemonic ("_Next");
- image = gtk_image_new_from_stock (GTK_STOCK_GO_FORWARD, GTK_ICON_SIZE_BUTTON);
- gtk_button_set_image (GTK_BUTTON (widget), image);
- gsearch->forward_button = widget;
- g_signal_connect (G_OBJECT (gsearch->forward_button), "clicked",
- G_CALLBACK (click_find_cb), (gpointer) gsearch);
- gtk_box_pack_end (GTK_BOX (vbox), widget, FALSE, FALSE, 2);
+ hbox = gtk_hbutton_box_new ();
+ gtk_button_box_set_layout (GTK_BUTTON_BOX (hbox), GTK_BUTTONBOX_END);
+ gtk_box_set_spacing (GTK_BOX (hbox), 6);
+ gtk_box_pack_start (GTK_BOX (container), hbox, FALSE, FALSE, 0);
widget = gtk_button_new_with_mnemonic ("_Previous");
image = gtk_image_new_from_stock (GTK_STOCK_GO_BACK, GTK_ICON_SIZE_BUTTON);
@@ -2155,8 +2149,15 @@
gsearch->back_button = widget;
g_signal_connect (G_OBJECT (gsearch->back_button), "clicked",
G_CALLBACK (click_find_cb), (gpointer) gsearch);
- gtk_box_pack_end (GTK_BOX (vbox), widget, FALSE, FALSE, 2);
+ gtk_container_add (GTK_CONTAINER (hbox), widget);
+ widget = gtk_button_new_with_mnemonic ("_Next");
+ image = gtk_image_new_from_stock (GTK_STOCK_GO_FORWARD, GTK_ICON_SIZE_BUTTON);
+ gtk_button_set_image (GTK_BUTTON (widget), image);
+ gsearch->forward_button = widget;
+ g_signal_connect (G_OBJECT (gsearch->forward_button), "clicked",
+ G_CALLBACK (click_find_cb), (gpointer) gsearch);
+ gtk_container_add (GTK_CONTAINER (hbox), widget);
// widget = gtk_label_new ("");
// gtk_box_pack_end (GTK_BOX (vbox), widget, TRUE, TRUE, 2);
_______________________________________________
tracker-list mailing list
[email protected]
http://mail.gnome.org/mailman/listinfo/tracker-list
