Gtk: Change content settings window to use a list instead of tabs.

chrome/browser/gtk/options/content_settings_window_gtk.cc

Index: chrome/browser/gtk/options/content_settings_window_gtk.cc
diff --git a/chrome/browser/gtk/options/content_settings_window_gtk.cc b/chrome/browser/gtk/options/content_settings_window_gtk.cc
index 770c695e923866286aa22e8f924f46481ad3a66e..cd146f14b9ca8a1cbf70c9f89afa04f8ca2e03ee 100644
--- a/chrome/browser/gtk/options/content_settings_window_gtk.cc
+++ b/chrome/browser/gtk/options/content_settings_window_gtk.cc
@@ -15,6 +15,7 @@
 #include "chrome/browser/gtk/accessible_widget_helper_gtk.h"
 #include "chrome/browser/gtk/browser_window_gtk.h"
 #include "chrome/browser/gtk/gtk_util.h"
+#include "chrome/browser/gtk/gtk_tree.h"
 #include "chrome/browser/pref_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/common/chrome_switches.h"
@@ -63,6 +64,19 @@ ContentSettingsWindowGtk::ContentSettingsWindowGtk(GtkWindow* parent,
       popup_page_(profile, CONTENT_SETTINGS_TYPE_POPUPS),
       geolocation_page_(profile, CONTENT_SETTINGS_TYPE_GEOLOCATION),
       notifications_page_(profile, CONTENT_SETTINGS_TYPE_NOTIFICATIONS) {
+  const struct {
+    int message_id;
+    GtkWidget* widget;
+  } kNotebookPages[] = {
+    { IDS_COOKIES_TAB_LABEL, cookie_page_.get_page_widget() },
+    { IDS_IMAGES_TAB_LABEL, image_page_.get_page_widget() },
+    { IDS_JAVASCRIPT_TAB_LABEL, javascript_page_.get_page_widget() },
+    { IDS_PLUGIN_TAB_LABEL, plugin_page_.get_page_widget() },
+    { IDS_POPUP_TAB_LABEL, popup_page_.get_page_widget() },
+    { IDS_GEOLOCATION_TAB_LABEL, geolocation_page_.get_page_widget() },
+    { IDS_NOTIFICATIONS_TAB_LABEL, notifications_page_.get_page_widget() },
+  };
+
   // We don't need to observe changes in this value.
   last_selected_page_.Init(prefs::kContentSettingsWindowLastTabIndex,
                            profile->GetPrefs(), NULL);
@@ -89,36 +103,68 @@ ContentSettingsWindowGtk::ContentSettingsWindowGtk(GtkWindow* parent,
                       gtk_util::kContentAreaSpacing);
   gtk_util::SetWindowIcon(GTK_WINDOW(dialog_));
 
-  notebook_ = gtk_notebook_new();
+  // Create hbox with list view and notebook.
+  GtkWidget* hbox = gtk_hbox_new(FALSE, gtk_util::kContentAreaSpacing);
 
-  const struct {
-    int message_id;
-    GtkWidget* widget;
-  } kNotebookPages[] = {
-    { IDS_COOKIES_TAB_LABEL, cookie_page_.get_page_widget() },
-    { IDS_IMAGES_TAB_LABEL, image_page_.get_page_widget() },
-    { IDS_JAVASCRIPT_TAB_LABEL, javascript_page_.get_page_widget() },
-    { IDS_PLUGIN_TAB_LABEL, plugin_page_.get_page_widget() },
-    { IDS_POPUP_TAB_LABEL, popup_page_.get_page_widget() },
-    { IDS_GEOLOCATION_TAB_LABEL, geolocation_page_.get_page_widget() },
-    { IDS_NOTIFICATIONS_TAB_LABEL, notifications_page_.get_page_widget() },
-  };
+  list_ = gtk_tree_view_new();
+  gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(list_), FALSE);
+
+  GtkCellRenderer* renderer = gtk_cell_renderer_text_new();
+  GtkTreeViewColumn* column = gtk_tree_view_column_new_with_attributes(
+      "List Item", renderer, "text", 0, NULL);
+  gtk_tree_view_append_column(GTK_TREE_VIEW(list_), column);
+
+  const int kColumnCount = 1;
+  GtkListStore* store = gtk_list_store_new(kColumnCount, G_TYPE_STRING);
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kNotebookPages); ++i) {
+    GtkTreeIter iter;
+    gtk_list_store_append(store, &iter);
     std::string label = l10n_util::GetStringUTF8(kNotebookPages[i].message_id);
-    // Since the tabs are on the side, add some padding space to the label.
-    gtk_notebook_append_page(
-        GTK_NOTEBOOK(notebook_),
-        kNotebookPages[i].widget,
-        gtk_label_new((" " + label + " ").c_str()));
+    gtk_list_store_set(store, &iter, 0, label.c_str(), -1);
   }
+  gtk_tree_view_set_model(GTK_TREE_VIEW(list_), GTK_TREE_MODEL(store));
+  g_object_unref(store);
 
-  gtk_notebook_set_tab_pos(GTK_NOTEBOOK(notebook_), GTK_POS_LEFT);
+  // Need to show the list before connecting switch-page signal, otherwise
+  // we'll immediately get a signal switching to page 0 and overwrite our
+  // last_selected_page_ value.
+  gtk_util::ShowDialogWithLocalizedSize(dialog_, -1, -1, true);

[Evan Martin, 2010/07/08 17:43:22]

BTW, this function is completely crazy.  I kind of think "gtk_widget_show" does
what you want here, but it's probably better that you match the old code.

 
-  gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog_)->vbox), notebook_);
+  // Needs to happen after the model is all set up.
+  GtkTreeSelection* selection = gtk_tree_view_get_selection(
+      GTK_TREE_VIEW(list_));
+  gtk_tree_selection_set_mode(selection, GTK_SELECTION_BROWSE);

[Evan Martin, 2010/07/08 17:43:22]

I am happy you got this.

 
+  // Wrap the list widget in a scrolled window in order to have a frame.
+  GtkWidget* scrolled = gtk_scrolled_window_new(NULL, NULL);
+  gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled),
+                                      GTK_SHADOW_ETCHED_IN);
+  gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled),
+                                 GTK_POLICY_NEVER, GTK_POLICY_NEVER);
+  gtk_container_add(GTK_CONTAINER(scrolled), list_);
+  gtk_box_pack_start(GTK_BOX(hbox), scrolled, FALSE, FALSE, 0);
+
+  notebook_ = gtk_notebook_new();
+  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kNotebookPages); ++i) {
+    gtk_notebook_append_page(GTK_NOTEBOOK(notebook_),
+                             kNotebookPages[i].widget,
+                             NULL);
+  }
+  gtk_notebook_set_show_tabs(GTK_NOTEBOOK(notebook_), FALSE);
+  gtk_notebook_set_show_border(GTK_NOTEBOOK(notebook_), FALSE);
+  gtk_box_pack_start(GTK_BOX(hbox), notebook_, FALSE, FALSE, 0);
   DCHECK_EQ(gtk_notebook_get_n_pages(GTK_NOTEBOOK(notebook_)),
             CONTENT_SETTINGS_NUM_TYPES);
 
+  // Create vbox with "Features:" text and hbox below.
+  GtkWidget* vbox = gtk_vbox_new(FALSE, gtk_util::kControlSpacing);
+  GtkWidget* label = gtk_label_new(
+      l10n_util::GetStringUTF8(IDS_CONTENT_SETTINGS_FEATURES_LABEL).c_str());
+  gtk_misc_set_alignment(GTK_MISC(label), 0, .5);
+  gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
+  gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+  gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog_)->vbox), vbox);
+
   // Need to show the notebook before connecting switch-page signal, otherwise
   // we'll immediately get a signal switching to page 0 and overwrite our
   // last_selected_page_ value.
@@ -126,6 +172,8 @@ ContentSettingsWindowGtk::ContentSettingsWindowGtk(GtkWindow* parent,
 
   g_signal_connect(notebook_, "switch-page",
                    G_CALLBACK(OnSwitchPageThunk), this);
+  g_signal_connect(selection, "changed",
+                   G_CALLBACK(OnListSelectionChangedThunk), this);
 
   // We only have one button and don't do any special handling, so just hook it
   // directly to gtk_widget_destroy.
@@ -153,7 +201,7 @@ void ContentSettingsWindowGtk::ShowContentSettingsTab(
   if (page < 0 || page >= gtk_notebook_get_n_pages(GTK_NOTEBOOK(notebook_)))
     page = CONTENT_SETTINGS_TYPE_COOKIES;
 
-  gtk_notebook_set_current_page(GTK_NOTEBOOK(notebook_), page);
+  gtk_tree::SelectAndFocusRowNum(page, GTK_TREE_VIEW(list_));
 }
 
 void ContentSettingsWindowGtk::OnSwitchPage(
@@ -163,10 +211,39 @@ void ContentSettingsWindowGtk::OnSwitchPage(
   int index = page_num;
   DCHECK(index > CONTENT_SETTINGS_TYPE_DEFAULT &&
          index < CONTENT_SETTINGS_NUM_TYPES);
-  last_selected_page_.SetValue(index);
+
+  // Keep list in sync.
+  GtkTreeModel* model;
+  GtkTreeIter iter;
+  if (gtk_tree_selection_get_selected(
+      gtk_tree_view_get_selection(GTK_TREE_VIEW(list_)), &model, &iter)) {
+    gint row_index = gtk_tree::GetRowNumForIter(model, &iter);
+    if (row_index == index)
+      return;
+  }
+  gtk_tree::SelectAndFocusRowNum(index, GTK_TREE_VIEW(list_));
 }
 
 void ContentSettingsWindowGtk::OnWindowDestroy(GtkWidget* widget) {
   settings_window = NULL;
   MessageLoop::current()->DeleteSoon(FROM_HERE, this);
 }
+
+void ContentSettingsWindowGtk::OnListSelectionChanged(
+    GtkTreeSelection* selection) {
+  GtkTreeModel* model;
+  GtkTreeIter iter;
+  if (!gtk_tree_selection_get_selected(selection, &model, &iter)) {
+    NOTREACHED();
+    return;
+  }
+  gint row_index = gtk_tree::GetRowNumForIter(model, &iter);
+  DCHECK(row_index > CONTENT_SETTINGS_TYPE_DEFAULT &&
+         row_index < CONTENT_SETTINGS_NUM_TYPES);
+
+  last_selected_page_.SetValue(row_index);
+
+  if (row_index !=
+      gtk_notebook_get_current_page(GTK_NOTEBOOK(notebook_)))

[Evan Martin, 2010/07/08 17:43:22]

curlies, or fit on one line

+    gtk_notebook_set_current_page(GTK_NOTEBOOK(notebook_), row_index);
+}