diff options
author | Gerald Combs <gerald@wireshark.org> | 2013-01-22 18:27:18 +0000 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2013-01-22 18:27:18 +0000 |
commit | 6ef1fc5002e8ed04019e81f236d4978010b0dfdb (patch) | |
tree | 1ababab774a91fa1cd79ee279c660714030f18f6 /ui/gtk/gui_utils.c | |
parent | 394b6c1c00395d463897bee86c416bec8b173b7f (diff) |
GTK+:
Get rid of user-hostile behavior. In the layout preferences pane 2 & 3
radio buttons overrode the user's selection if a duplicate item was
selected. Now we assume that the user knows what he or she is doing and
steal duplicate selections from the other panes.
Qt:
Match the new GTK+ behavior in the layout preferences. Add padding
around the layout images. Add toolbar style preferences to the
Appearance pane (instead of the layout pane).
All:
Remove the selection mode and scrollbar placement prefs and mark them
obsolete as recently discussed on -dev.
Adjust the layout images yet again after more Awful Monitor Testing.
svn path=/trunk/; revision=47214
Diffstat (limited to 'ui/gtk/gui_utils.c')
-rw-r--r-- | ui/gtk/gui_utils.c | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/ui/gtk/gui_utils.c b/ui/gtk/gui_utils.c index f3c5a3ddb6..4680b9ab02 100644 --- a/ui/gtk/gui_utils.c +++ b/ui/gtk/gui_utils.c @@ -881,7 +881,6 @@ static GList *scrolled_windows; static void setup_scrolled_window(GtkWidget *scrollw); static void forget_scrolled_window(GtkWidget *scrollw, gpointer data); -static void set_scrollbar_placement_scrollw(GtkWidget *scrollw); /* Create a GtkScrolledWindow, set its scrollbar placement appropriately, and remember it. */ @@ -901,8 +900,6 @@ scrolled_window_new(GtkAdjustment *hadjustment, static void setup_scrolled_window(GtkWidget *scrollw) { - set_scrollbar_placement_scrollw(scrollw); - gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrollw), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); @@ -921,35 +918,6 @@ forget_scrolled_window(GtkWidget *scrollw, scrolled_windows = g_list_remove(scrolled_windows, scrollw); } -/* Set the scrollbar placement of a GtkScrolledWindow based upon user - preference. */ -static void -set_scrollbar_placement_scrollw(GtkWidget *scrollw) -{ - if (prefs.gui_scrollbar_on_right) { - gtk_scrolled_window_set_placement(GTK_SCROLLED_WINDOW(scrollw), - GTK_CORNER_TOP_LEFT); - } else { - gtk_scrolled_window_set_placement(GTK_SCROLLED_WINDOW(scrollw), - GTK_CORNER_TOP_RIGHT); - } -} - -static void -set_scrollbar_placement_cb(gpointer data, - gpointer user_data _U_) -{ - set_scrollbar_placement_scrollw((GtkWidget *)data); -} - -/* Set the scrollbar placement of all GtkScrolledWindows based on - user preference. */ -void -set_scrollbar_placement_all(void) -{ - g_list_foreach(scrolled_windows, set_scrollbar_placement_cb, NULL); -} - /* List of all CTrees/TreeViews, so we can globally set the line and * expander style of all of them. */ static GList *trees; |