GNOME Bugzilla – Bug 125555
New window list mode, just like in windows
Last modified: 2004-12-22 21:47:04 UTC
Description of Problem: I got tired of window list applet behavior, so I hacked it a bit. Now it has two modes, the old one and "ms windows-like", in second mode you just set maximum buttons size, and applet is gonna be filled with buttons of that size. If applet gets too small, buttons are gonna shrink. It only works in horizontal panel, so the mode is disabled if your panel is vertical. --- libwnck-2.4.0.1/libwnck/tasklist.c 2003-07-17 16:17:50.000000000 -0400 +++ libwnck-2.4.0.1-del1/libwnck/tasklist.c 2003-10-26 09:25:22.000000000 -0500 @@ -127,7 +127,8 @@ WnckTask *active_app; /* NULL if active window not in tasklist */ gboolean include_all_workspaces; - + gboolean window_list_or_buttons_size; + /* Calculated by update_lists */ GList *windows; GList *applications; @@ -159,6 +160,12 @@ gint minimum_width; gint minimum_height; + gint minimum_buttons_width; + gint minimum_buttons_height; + + gint maximum_buttons_width; + gint maximum_buttons_height; + WnckLoadIconFunction icon_loader; void *icon_loader_data; GDestroyNotify free_icon_loader_data; @@ -213,7 +220,8 @@ int max_height, int n_buttons, int *n_cols_out, - int *n_rows_out); + int *n_rows_out, + WnckTasklist *tasklist); static void wnck_tasklist_active_window_changed (WnckScreen *screen, WnckTasklist *tasklist); @@ -552,6 +560,22 @@ } void +wnck_tasklist_set_window_list_or_buttons_size (WnckTasklist *tasklist, + gboolean window_list_or_buttons_size) +{ + g_return_if_fail (WNCK_IS_TASKLIST (tasklist)); + + window_list_or_buttons_size = (window_list_or_buttons_size != 0); + + if (tasklist->priv->window_list_or_buttons_size == window_list_or_buttons_size) + return; + + tasklist->priv->window_list_or_buttons_size = window_list_or_buttons_size; + wnck_tasklist_update_lists (tasklist); + gtk_widget_queue_resize (GTK_WIDGET (tasklist)); +} + +void wnck_tasklist_set_grouping_limit (WnckTasklist *tasklist, gint limit) { @@ -613,6 +637,104 @@ return tasklist->priv->minimum_height; } +/* set the minimum buttons width + * use -1 to unset it (resulting in the default width */ +void +wnck_tasklist_set_minimum_buttons_width (WnckTasklist *tasklist, gint size) +{ + g_return_if_fail (WNCK_IS_TASKLIST (tasklist)); + + if (size == -1) size = DEFAULT_WIDTH; + + if (tasklist->priv->minimum_buttons_width == size) + return; + + tasklist->priv->minimum_buttons_width = size; + gtk_widget_queue_resize (GTK_WIDGET (tasklist)); +} + +/* get the minimum buttons width */ +gint +wnck_tasklist_get_minimum_buttons_width (WnckTasklist *tasklist) +{ + g_return_val_if_fail (WNCK_IS_TASKLIST (tasklist), 0); + + return tasklist->priv->minimum_buttons_width; +} + +/* set the minimum buttons height + * use -1 to unset it (resulting in the default height */ +void +wnck_tasklist_set_minimum_buttons_height (WnckTasklist *tasklist, gint size) +{ + g_return_if_fail (WNCK_IS_TASKLIST (tasklist)); + + if (size == -1) size = DEFAULT_HEIGHT; + + if (tasklist->priv->minimum_buttons_height == size) + return; + + tasklist->priv->minimum_buttons_height = size; + gtk_widget_queue_resize (GTK_WIDGET (tasklist)); +} + +/* get the minimum buttons height */ +gint +wnck_tasklist_get_minimum_buttons_height (WnckTasklist *tasklist) +{ + g_return_val_if_fail (WNCK_IS_TASKLIST (tasklist), 0); + + return tasklist->priv->minimum_buttons_height; +} +/* set the maximum buttons width + * use -1 to unset it (resulting in the default width */ +void +wnck_tasklist_set_maximum_buttons_width (WnckTasklist *tasklist, gint size) +{ + g_return_if_fail (WNCK_IS_TASKLIST (tasklist)); + + if (size == -1) size = DEFAULT_WIDTH; + + if (tasklist->priv->maximum_buttons_width == size) + return; + + tasklist->priv->maximum_buttons_width = size; + gtk_widget_queue_resize (GTK_WIDGET (tasklist)); +} + +/* get the maximum buttons width */ +gint +wnck_tasklist_get_maximum_buttons_width (WnckTasklist *tasklist) +{ + g_return_val_if_fail (WNCK_IS_TASKLIST (tasklist), 0); + + return tasklist->priv->maximum_buttons_width; +} + +/* set the maximum buttons height + * use -1 to unset it (resulting in the default height */ +void +wnck_tasklist_set_maximum_buttons_height (WnckTasklist *tasklist, gint size) +{ + g_return_if_fail (WNCK_IS_TASKLIST (tasklist)); + + if (size == -1) size = DEFAULT_HEIGHT; + + if (tasklist->priv->maximum_buttons_height == size) + return; + + tasklist->priv->maximum_buttons_height = size; + gtk_widget_queue_resize (GTK_WIDGET (tasklist)); +} + +/* get the maximum buttons height */ +gint +wnck_tasklist_get_maximum_buttons_height (WnckTasklist *tasklist) +{ + g_return_val_if_fail (WNCK_IS_TASKLIST (tasklist), 0); + + return tasklist->priv->maximum_buttons_height; +} /** * wnck_tasklist_set_icon_loader: @@ -650,25 +772,48 @@ int max_height, int n_buttons, int *n_cols_out, - int *n_rows_out) + int *n_rows_out, + WnckTasklist *tasklist) { int n_cols, n_rows; + int buttons_width; - /* How many rows fit in the allocation */ - n_rows = allocation->height / max_height; - - /* Don't have more rows than buttons */ - n_rows = MIN (n_rows, n_buttons); - - /* At least one row */ - n_rows = MAX (n_rows, 1); - - /* We want to use as many rows as possible to limit the width */ - n_cols = (n_buttons + n_rows - 1) / n_rows; - - /* At least one column */ - n_cols = MAX (n_cols, 1); - + if (tasklist->priv->window_list_or_buttons_size) + { + /* How many rows fit in the allocation */ + n_rows = allocation->height / max_height; + + /* Don't have more rows than buttons */ + n_rows = MIN (n_rows, n_buttons); + + /* At least one row */ + n_rows = MAX (n_rows, 1); + + /* We want to use as many rows as possible to limit the width */ + /* Well, not true in max buttons size case */ + n_cols = (n_buttons + n_rows - 1) / n_rows; + + /* At least one column */ + n_cols = MAX (n_cols, 1); + } + else + { + n_rows = allocation->height / max_height; + n_rows = MIN (n_rows, n_buttons); + n_rows = MAX (n_rows, 1); + + buttons_width = wnck_tasklist_get_maximum_buttons_width(tasklist); + + if (allocation->width == 0) + n_cols = n_buttons; + else + { + buttons_width = MIN (wnck_tasklist_get_maximum_buttons_width(tasklist), (allocation->width * n_rows)/(n_buttons>0?n_buttons:1)); + buttons_width = MAX (10, buttons_width); + n_cols = ( (allocation->width * n_rows) / buttons_width + n_rows - 1 ) / n_rows; + } + n_cols = MAX (n_cols, 1); + } *n_cols_out = n_cols; *n_rows_out = n_rows; @@ -825,10 +970,18 @@ l = l->next; } - - tasklist->priv->max_button_width = max_width; - tasklist->priv->max_button_height = max_height; +//by del +//if we are in the fixed buttons size mode, we do not care about children's sizes + if (tasklist->priv->window_list_or_buttons_size) + { + tasklist->priv->max_button_width = max_width; + } + else + { + tasklist->priv->max_button_width = tasklist->priv->maximum_buttons_width; + } + tasklist->priv->max_button_height = max_height; /* this snippet of code seems to want to allocate at least * four buttons' worth of height for the widget. I think this isn't @@ -850,7 +1003,10 @@ requisition->width = MAX(requisition->width, tasklist->priv->minimum_width); requisition->height = MAX(requisition->height, tasklist->priv->minimum_height); */ - requisition->width = tasklist->priv->minimum_width; + if (tasklist->priv->window_list_or_buttons_size) + requisition->width = tasklist->priv->minimum_width; + else + requisition->width = 0; requisition->height = tasklist->priv->minimum_height; fake_allocation.width = requisition->width; @@ -870,11 +1026,12 @@ tasklist->priv->max_button_width); /* Try ungrouped mode */ + wnck_tasklist_layout (&fake_allocation, tasklist->priv->max_button_width, tasklist->priv->max_button_height, n_windows + n_startup_sequences, - &n_cols, &n_rows); + &n_cols, &n_rows, tasklist); last_n_cols = G_MAXINT; lowest_range = G_MAXINT; @@ -906,7 +1063,7 @@ tasklist->priv->max_button_width, tasklist->priv->max_button_height, n_startup_sequences + n_windows - n_grouped_buttons, - &n_cols, &n_rows); + &n_cols, &n_rows, tasklist); if (n_cols != last_n_cols && (tasklist->priv->grouping == WNCK_TASKLIST_AUTO_GROUP || ungrouped_apps == NULL)) @@ -991,12 +1148,14 @@ grouping_limit = MIN (tasklist->priv->grouping_limit, tasklist->priv->max_button_width); + + /* Try ungrouped mode */ button_width = wnck_tasklist_layout (allocation, tasklist->priv->max_button_width, tasklist->priv->max_button_height, n_startup_sequences + n_windows, - &n_cols, &n_rows); + &n_cols, &n_rows, tasklist); while (ungrouped_apps != NULL && ((tasklist->priv->grouping == WNCK_TASKLIST_ALWAYS_GROUP) || ((tasklist->priv->grouping == WNCK_TASKLIST_AUTO_GROUP) && @@ -1036,7 +1195,7 @@ tasklist->priv->max_button_width, tasklist->priv->max_button_height, n_startup_sequences + n_windows - n_grouped_buttons, - &n_cols, &n_rows); + &n_cols, &n_rows, tasklist); } /* Add all ungrouped windows to visible_tasks, and hide their apps */ --- libwnck-2.4.0.1/libwnck/tasklist.h 2002-11-30 22:55:43.000000000 -0500 +++ libwnck-2.4.0.1-del1/libwnck/tasklist.h 2003-10-25 13:58:56.000000000 -0400 @@ -72,10 +72,22 @@ gint limit); void wnck_tasklist_set_include_all_workspaces (WnckTasklist *tasklist, gboolean include_all_workspaces); +void wnck_tasklist_set_window_list_or_buttons_size (WnckTasklist *tasklist, + gboolean window_list_or_buttons_size); void wnck_tasklist_set_minimum_width (WnckTasklist *tasklist, gint size); gint wnck_tasklist_get_minimum_width (WnckTasklist *tasklist); void wnck_tasklist_set_minimum_height (WnckTasklist *tasklist, gint size); gint wnck_tasklist_get_minimum_height (WnckTasklist *tasklist); +void wnck_tasklist_set_minimum_buttons_width (WnckTasklist *tasklist, gint size); +gint wnck_tasklist_get_minimum_buttons_width (WnckTasklist *tasklist); +void wnck_tasklist_set_minimum_buttons_height (WnckTasklist *tasklist, gint size); +gint wnck_tasklist_get_minimum_buttons_height (WnckTasklist *tasklist); +void wnck_tasklist_set_maximum_buttons_width (WnckTasklist *tasklist, gint size); +gint wnck_tasklist_get_maximum_buttons_width (WnckTasklist *tasklist); +void wnck_tasklist_set_maximum_buttons_height (WnckTasklist *tasklist, gint size); +gint wnck_tasklist_get_maximum_buttons_height (WnckTasklist *tasklist); + + typedef GdkPixbuf* (*WnckLoadIconFunction) (const char *icon_name, int size, --- gnome-panel-2.4.1/applets/wncklet/window-list.c 2003-07-02 19:58:45.000000000 -0400 +++ gnome-panel-2.4.1-del1/applets/wncklet/window-list.c 2003-10-26 09:22:38.000000000 -0500 @@ -32,6 +32,7 @@ #include "egg-screen-help.h" + typedef struct { GtkWidget *applet; GtkWidget *tasklist; @@ -39,6 +40,7 @@ WnckScreen *screen; gboolean include_all_workspaces; + gboolean window_list_or_buttons_size; WnckTasklistGroupingType grouping; gboolean move_unminimized_windows; @@ -57,13 +59,17 @@ GtkWidget *always_group_radio; GtkWidget *move_minimized_radio; GtkWidget *change_workspace_radio; + GtkWidget *window_list_size_radio; + GtkWidget *buttons_size_radio; GtkWidget *minimum_size_spin; GtkWidget *maximum_size_spin; + GtkWidget *minimum_buttons_size_spin; + GtkWidget *maximum_buttons_size_spin; GtkWidget *about; /* gconf listeners id */ - guint listeners [5]; + guint listeners [8]; } TasklistData; static void display_properties_dialog (BonoboUIComponent *uic, @@ -75,6 +81,8 @@ static void display_about_dialog (BonoboUIComponent *uic, TasklistData *tasklist, const gchar *verbname); +static void +tasklist_properties_update_size_radio (TasklistData *tasklist); static void tasklist_update (TasklistData *tasklist) @@ -82,9 +90,11 @@ if (tasklist->orientation == GTK_ORIENTATION_HORIZONTAL) { gtk_widget_set_size_request (GTK_WIDGET (tasklist->tasklist), -1, tasklist->size); + wnck_tasklist_set_minimum_height (WNCK_TASKLIST (tasklist->tasklist), tasklist->size); } else { gtk_widget_set_size_request (GTK_WIDGET (tasklist->tasklist), tasklist->size, -1); + wnck_tasklist_set_minimum_width (WNCK_TASKLIST (tasklist->tasklist), tasklist->size); } wnck_tasklist_set_grouping (WNCK_TASKLIST (tasklist->tasklist), @@ -93,6 +103,8 @@ tasklist->include_all_workspaces); wnck_tasklist_set_switch_workspace_on_unminimize (WNCK_TASKLIST (tasklist->tasklist), tasklist->move_unminimized_windows); + wnck_tasklist_set_window_list_or_buttons_size (WNCK_TASKLIST (tasklist->tasklist), + tasklist->window_list_or_buttons_size); } static void @@ -167,11 +179,21 @@ case PANEL_APPLET_ORIENT_LEFT: case PANEL_APPLET_ORIENT_RIGHT: new_orient = GTK_ORIENTATION_VERTICAL; +//disable button max size mode + tasklist->window_list_or_buttons_size = TRUE; + gtk_widget_set_sensitive(GTK_WIDGET(tasklist->buttons_size_radio), FALSE); + gtk_widget_set_sensitive(GTK_WIDGET(tasklist->maximum_buttons_size_spin), FALSE); + tasklist_update (tasklist); + tasklist_properties_update_size_radio (tasklist); break; case PANEL_APPLET_ORIENT_UP: case PANEL_APPLET_ORIENT_DOWN: default: new_orient = GTK_ORIENTATION_HORIZONTAL; +//enable button max size mode + gtk_widget_set_sensitive(GTK_WIDGET(tasklist->buttons_size_radio), TRUE); + gtk_widget_set_sensitive(GTK_WIDGET(tasklist->maximum_buttons_size_spin), TRUE); + break; } @@ -231,7 +253,9 @@ return; tasklist->size = size; - + if (tasklist->orientation == GTK_ORIENTATION_HORIZONTAL) { + wnck_tasklist_set_minimum_height (WNCK_TASKLIST (tasklist->tasklist), tasklist->size); + } tasklist_update (tasklist); } @@ -248,6 +272,9 @@ gconf_client_notify_remove (client, tasklist->listeners[2]); gconf_client_notify_remove (client, tasklist->listeners[3]); gconf_client_notify_remove (client, tasklist->listeners[4]); + gconf_client_notify_remove (client, tasklist->listeners[5]); + gconf_client_notify_remove (client, tasklist->listeners[6]); + gconf_client_notify_remove (client, tasklist->listeners[7]); g_object_unref (G_OBJECT (client)); @@ -256,6 +283,9 @@ tasklist->listeners[2] = 0; tasklist->listeners[3] = 0; tasklist->listeners[4] = 0; + tasklist->listeners[5] = 0; + tasklist->listeners[6] = 0; + tasklist->listeners[7] = 0; if (tasklist->properties_dialog) gtk_widget_destroy (tasklist->properties_dialog); @@ -292,6 +322,24 @@ } static void +tasklist_properties_update_size_radio (TasklistData *tasklist) +{ + GtkWidget *button; + + if (tasklist->buttons_size_radio == NULL) + return; + + if (tasklist->window_list_or_buttons_size) { + button = tasklist->window_list_size_radio; + } else { + button = tasklist->buttons_size_radio; + } + + if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button))) + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE); +} + +static void display_all_workspaces_changed (GConfClient *client, guint cnxn_id, GConfEntry *entry, @@ -310,6 +358,24 @@ tasklist_properties_update_content_radio (tasklist); } +static void +window_list_or_buttons_size_changed (GConfClient *client, + guint cnxn_id, + GConfEntry *entry, + TasklistData *tasklist) +{ + gboolean value; + if (!entry->value || entry->value->type != GCONF_VALUE_BOOL) + return; + + value = gconf_value_get_bool (entry->value); + + tasklist->window_list_or_buttons_size = (value != 0); + tasklist_update (tasklist); + + tasklist_properties_update_size_radio (tasklist); +} + static WnckTasklistGroupingType get_grouping_type (GConfValue *value) { @@ -469,7 +535,57 @@ tasklist->maximum_size = value; gtk_widget_queue_resize (GTK_WIDGET (tasklist->applet)); } - + +/* GConf callback for changes in minimum_buttons_size */ +static void +minimum_buttons_size_changed (GConfClient *client, guint cnxn_id, + GConfEntry *entry, TasklistData *tasklist) +{ + WnckTasklist *wncktl = WNCK_TASKLIST (tasklist->tasklist); + gint value; + GtkSpinButton *button; + + if (!tasklist->minimum_buttons_size_spin) + return; + + button = GTK_SPIN_BUTTON (tasklist->minimum_buttons_size_spin); + + if (!entry->value || entry->value->type != GCONF_VALUE_INT) + return; + + value = gconf_value_get_int (entry->value); + + gtk_spin_button_set_value (button, value); + if (tasklist->orientation == GTK_ORIENTATION_HORIZONTAL) + wnck_tasklist_set_minimum_buttons_width (wncktl, value); + else + wnck_tasklist_set_minimum_buttons_height (wncktl, value); +} + +/* GConf callback for changes in maximum_buttons_size */ +static void +maximum_buttons_size_changed (GConfClient *client, guint cnxn_id, + GConfEntry *entry, TasklistData *tasklist) +{ + WnckTasklist *wncktl = WNCK_TASKLIST (tasklist->tasklist); + gint value; + GtkSpinButton *button; + + if (!tasklist->maximum_buttons_size_spin) + return; + + button = GTK_SPIN_BUTTON (tasklist->maximum_buttons_size_spin); + if (!entry->value || entry->value->type != GCONF_VALUE_INT) + return; + + value = gconf_value_get_int (entry->value); + + gtk_spin_button_set_value (button, value); + if (tasklist->orientation == GTK_ORIENTATION_HORIZONTAL) + wnck_tasklist_set_maximum_buttons_width (wncktl, value); + else + wnck_tasklist_set_maximum_buttons_height (wncktl, value); +} static void setup_gconf (TasklistData *tasklist) { @@ -516,6 +632,24 @@ tasklist, NULL, NULL); g_free (key); + key = panel_applet_gconf_get_full_key (PANEL_APPLET (tasklist->applet), + "window_list_or_buttons_size"); + tasklist->listeners[5] = gconf_client_notify_add(client, key, + (GConfClientNotifyFunc)window_list_or_buttons_size_changed, + tasklist, + NULL, NULL); + key = panel_applet_gconf_get_full_key (PANEL_APPLET (tasklist->applet), + "maximum_buttons_size"); + tasklist->listeners[6] = gconf_client_notify_add(client, key, + (GConfClientNotifyFunc)maximum_buttons_size_changed, + tasklist, + NULL, NULL); + key = panel_applet_gconf_get_full_key (PANEL_APPLET (tasklist->applet), + "minimum_buttons_size"); + tasklist->listeners[7] = gconf_client_notify_add(client, key, + (GConfClientNotifyFunc)minimum_buttons_size_changed, + tasklist, + NULL, NULL); g_object_unref (G_OBJECT (client)); } @@ -627,6 +761,13 @@ } error = NULL; + tasklist->window_list_or_buttons_size = panel_applet_gconf_get_bool (applet, "window_list_or_buttons_size", &error); + if (error) { + g_error_free (error); + tasklist->window_list_or_buttons_size = FALSE; /* Default value */ + } + + error = NULL; tasklist->grouping = -1; value = panel_applet_gconf_get_value (applet, "group_windows", &error); if (error) { @@ -692,6 +833,31 @@ tasklist->maximum_size = sizepref; + /* get buttons size preference */ + error = NULL; + sizepref = panel_applet_gconf_get_int (applet, "minimum_buttons_size", &error); + if (error) { + sizepref = 10; /* Default value */ + g_error_free (error); + } + + if (tasklist->orientation == GTK_ORIENTATION_HORIZONTAL) + wnck_tasklist_set_minimum_buttons_width (WNCK_TASKLIST (tasklist->tasklist), sizepref); + else + wnck_tasklist_set_minimum_buttons_height (WNCK_TASKLIST (tasklist->tasklist), sizepref); + + error = NULL; + sizepref = panel_applet_gconf_get_int (applet, "maximum_buttons_size", &error); + if (error) { + sizepref = 150; /* Default value */ + g_error_free (error); + } + if (tasklist->orientation == GTK_ORIENTATION_HORIZONTAL) + wnck_tasklist_set_maximum_buttons_width (WNCK_TASKLIST (tasklist->tasklist), sizepref); + else + wnck_tasklist_set_maximum_buttons_height (WNCK_TASKLIST (tasklist->tasklist), sizepref); + + g_signal_connect (G_OBJECT (tasklist->tasklist), "destroy", G_CALLBACK (destroy_tasklist), tasklist); @@ -850,7 +1016,15 @@ gtk_toggle_button_get_active (button), NULL); } - +static void +window_list_or_buttons_size_toggled (GtkToggleButton *button, + TasklistData *tasklist) +{ + panel_applet_gconf_set_bool (PANEL_APPLET (tasklist->applet), + "window_list_or_buttons_size", + gtk_toggle_button_get_active (button), + NULL); +} /* called when minimum width spin button is changed * check if it exceeds max width * saves numeric GConf preference values @@ -889,6 +1063,44 @@ panel_applet_gconf_set_int (applet, "maximum_size", prop_value, NULL); } +/* called when minimum buttons size spin button is changed + * check if it exceeds max width + * saves numeric GConf preference values + */ +static void +spin_minimum_buttons_size_changed (GtkSpinButton *button, TasklistData *tasklist) +{ + GtkSpinButton *max_b = GTK_SPIN_BUTTON (tasklist->maximum_buttons_size_spin); + PanelApplet *applet = PANEL_APPLET (tasklist->applet); + gint prop_value = gtk_spin_button_get_value (button); + gint max_size = gtk_spin_button_get_value (max_b); + + /* check if we exceed max width */ + if (prop_value > max_size) + panel_applet_gconf_set_int (applet, "maximum_buttons_size", + prop_value, NULL); + panel_applet_gconf_set_int (applet, "minimum_buttons_size", prop_value, NULL); +} + +/* called when maximum buttons size spin button is changed + * check if we drop below min width + * saves numeric GConf preference values + */ +static void +spin_maximum_buttons_size_changed (GtkSpinButton *button, TasklistData *tasklist) +{ + GtkSpinButton *min_b = GTK_SPIN_BUTTON (tasklist->minimum_buttons_size_spin); + PanelApplet *applet = PANEL_APPLET (tasklist->applet); + gint prop_value = gtk_spin_button_get_value (button); + gint min_size = gtk_spin_button_get_value (min_b); + + /* check if we drop below min width */ + if (prop_value < min_size) + panel_applet_gconf_set_int (applet, "minimum_buttons_size", + prop_value, NULL); + panel_applet_gconf_set_int (applet, "maximum_buttons_size", prop_value, NULL); +} + static void setup_sensitivity (TasklistData *tasklist, GConfClient *client, @@ -949,6 +1161,16 @@ NULL, "display_all_workspaces" /* key */); + tasklist->window_list_size_radio = WID ("window_list_size_radio"); + tasklist->buttons_size_radio = WID ("buttons_size_radio"); + + setup_sensitivity (tasklist, client, xml, + "window_list_size_radio", + "buttons_size_radio", + NULL, + "window_list_or_buttons_size"); + + tasklist->never_group_radio = WID ("never_group_radio"); tasklist->auto_group_radio = WID ("auto_group_radio"); tasklist->always_group_radio = WID ("always_group_radio"); @@ -982,6 +1204,38 @@ "maximum_size_post_label", "maximum_size" /* key */); + tasklist->minimum_buttons_size_spin = WID ("minimum_buttons_size"); +// setup_sensitivity (tasklist, client, xml, +// "minimum_buttons_size", +// "minimum_buttons_size_label", +// "minimum_buttons_size_post_label", +// "minimum_buttons_size" /* key */); + tasklist->maximum_buttons_size_spin = WID ("maximum_buttons_size"); + setup_sensitivity (tasklist, client, xml, + "maximum_buttons_size", + "maximum_buttons_size_label", + "maximum_buttons_size_post_label", + "maximum_buttons_size" /* key */); + + if (tasklist->orientation == GTK_ORIENTATION_HORIZONTAL) + { +//enable button max size mode + gtk_widget_set_sensitive(GTK_WIDGET(tasklist->buttons_size_radio), TRUE); + gtk_widget_set_sensitive(GTK_WIDGET(tasklist->maximum_buttons_size_spin), TRUE); + } + else + { +//disable button max size mode + tasklist->window_list_or_buttons_size = TRUE; + gtk_widget_set_sensitive(GTK_WIDGET(tasklist->buttons_size_radio), FALSE); + gtk_widget_set_sensitive(GTK_WIDGET(tasklist->maximum_buttons_size_spin), FALSE); + tasklist_update (tasklist); + tasklist_properties_update_size_radio (tasklist); + } + + + + /* Window grouping: */ button = get_grouping_button (tasklist, tasklist->grouping); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE); @@ -1000,6 +1254,13 @@ "maximum_size", NULL); gtk_spin_button_set_value (GTK_SPIN_BUTTON (tasklist->maximum_size_spin), sizepref); + sizepref = panel_applet_gconf_get_int (PANEL_APPLET (tasklist->applet), + "minimum_buttons_size", NULL); + gtk_spin_button_set_value (GTK_SPIN_BUTTON (tasklist->minimum_buttons_size_spin), sizepref); + sizepref = panel_applet_gconf_get_int (PANEL_APPLET (tasklist->applet), + "maximum_buttons_size", NULL); + gtk_spin_button_set_value (GTK_SPIN_BUTTON (tasklist->maximum_buttons_size_spin), sizepref); + g_signal_connect (G_OBJECT (tasklist->never_group_radio), "toggled", (GCallback) group_windows_toggled, tasklist); g_signal_connect (G_OBJECT (tasklist->auto_group_radio), "toggled", @@ -1025,6 +1286,24 @@ "value_changed", (GCallback) spin_maximum_size_changed, tasklist); + + tasklist_properties_update_size_radio (tasklist); + g_signal_connect (G_OBJECT (tasklist->window_list_size_radio), "toggled", + (GCallback) window_list_or_buttons_size_toggled, tasklist); + + g_signal_connect (G_OBJECT (tasklist->minimum_buttons_size_spin), + "value_changed", + (GCallback) spin_minimum_buttons_size_changed, + tasklist); + + g_signal_connect (G_OBJECT (tasklist->maximum_buttons_size_spin), + "value_changed", + (GCallback) spin_maximum_buttons_size_changed, + tasklist); + + + + g_signal_connect_swapped (WID ("done_button"), "clicked", (GCallback) gtk_widget_hide, tasklist->properties_dialog); --- gnome-panel-2.4.1/applets/wncklet/window-list.glade 2003-08-20 05:18:37.000000000 -0400 +++ gnome-panel-2.4.1-del1/applets/wncklet/window-list.glade 2003-10-25 19:09:24.000000000 -0400 @@ -503,18 +503,49 @@ <property name="spacing">6</property> <child> - <widget class="GtkLabel" id="label4"> + <widget class="GtkHBox" id="hbox9"> <property name="visible">True</property> - <property name="label" translatable="yes"><b>Window List Size</b></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> + <property name="homogeneous">False</property> + <property name="spacing">0</property> + + <child> + <widget class="GtkRadioButton" id="window_list_size_radio"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes"></property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label15"> + <property name="visible">True</property> + <property name="label" translatable="yes"><b>Window List Size</b></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> </widget> <packing> <property name="padding">0</property> @@ -746,6 +777,278 @@ <property name="fill">True</property> </packing> </child> + + <child> + <widget class="GtkHBox" id="hbox10"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">0</property> + + <child> + <widget class="GtkRadioButton" id="buttons_size_radio"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes"></property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + <property name="group">window_list_size_radio</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label14"> + <property name="visible">True</property> + <property name="label" translatable="yes"><b>Buttons Size</b></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> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkHBox" id="hbox11"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">6</property> + + <child> + <widget class="GtkLabel" id="label16"> + <property name="visible">True</property> + <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">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkVBox" id="vbox15"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">6</property> + + <child> + <widget class="GtkTable" id="table3"> + <property name="visible">True</property> + <property name="n_rows">1</property> + <property name="n_columns">2</property> + <property name="homogeneous">False</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + + <child> + <widget class="GtkLabel" id="label17"> + <property name="label" translatable="yes">M_inimum size:</property> + <property name="use_underline">True</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</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="mnemonic_widget">minimum_size</property> + </widget> + <packing> + <property name="left_attach">0</property> + <property name="right_attach">1</property> + <property name="top_attach">0</property> + <property name="bottom_attach">1</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkHBox" id="hbox12"> + <property name="homogeneous">False</property> + <property name="spacing">6</property> + + <child> + <widget class="GtkSpinButton" id="minimum_buttons_size"> + <property name="can_focus">True</property> + <property name="climb_rate">1</property> + <property name="digits">0</property> + <property name="numeric">True</property> + <property name="update_policy">GTK_UPDATE_ALWAYS</property> + <property name="snap_to_ticks">False</property> + <property name="wrap">False</property> + <property name="adjustment">128 0 4096 1 10 10</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label19"> + <property name="label" translatable="yes">pixels</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</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> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">0</property> + <property name="bottom_attach">1</property> + <property name="y_options">fill</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label18"> + <property name="visible">True</property> + <property name="label" translatable="yes">Ma_ximum size:</property> + <property name="use_underline">True</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</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="mnemonic_widget">maximum_size</property> + </widget> + <packing> + <property name="left_attach">0</property> + <property name="right_attach">1</property> + <property name="top_attach">0</property> + <property name="bottom_attach">1</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkHBox" id="hbox13"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">6</property> + + <child> + <widget class="GtkSpinButton" id="maximum_buttons_size"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="climb_rate">1</property> + <property name="digits">0</property> + <property name="numeric">True</property> + <property name="update_policy">GTK_UPDATE_ALWAYS</property> + <property name="snap_to_ticks">False</property> + <property name="wrap">False</property> + <property name="adjustment">256 0 4096 1 10 10</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label20"> + <property name="visible">True</property> + <property name="label" translatable="yes">pixels</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</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> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">0</property> + <property name="bottom_attach">1</property> + <property name="y_options">fill</property> + </packing> + </child> + </widget> + <packing> + <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="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> </widget> <packing> <property name="tab_expand">False</property>
Created attachment 20954 [details] [review] The patch
Please attach your libwnck patch too
Created attachment 21001 [details] [review] patch for libwnck, file tasklist.c
Created attachment 21003 [details] [review] patch for libwnck, file tasklist.h
Created attachment 21005 [details] [review] patch for gnome-panel, file applets/wncklet/window-list.c
Created attachment 21006 [details] [review] patch for gnome-panel, file applets/wncklet/window-list.glade
*** This bug has been marked as a duplicate of 126532 ***