preparation for new hildon (desktop and widgets) support

[simple-launcher] / settings-dialog.cc

diff --git a/settings-dialog.cc b/settings-dialog.cc
index 8646bf8..9589413 100644 (file)
--- a/settings-dialog.cc
+++ b/settings-dialog.cc
@@ -19,30 +19,60 @@
 #include <gtk/gtklabel.h>
 
 #include "settings-dialog.h"
+#include "settings-page-entries.h"
+#include "settings-page-items.h"
 
-inline void addPage(GtkNotebook *notebook, const std::string& name, GtkWidget *widget) {
-  GtkWidget *label = gtk_label_new(name.c_str());
-
-  gtk_notebook_append_page(notebook, widget, label);
-}
+#define SL_APPLET_SETTINGS_ICON_SIZE  26
 
-SettingsDialog::SettingsDialog(GtkWindow *parent, int size, LauncherItems& items) : myList(size, items) {
+SettingsDialog::SettingsDialog(GtkWindow *parent, LauncherItems& items, GConfBooleanOption& transparent, GConfIntegerOption& icon_size):
+  myTransparent(transparent, "Transparent background:"),
+  myIconSize(icon_size, "Icon Size:") {
   myDialog = GTK_DIALOG(gtk_dialog_new_with_buttons("Launcher Settings", parent, (GtkDialogFlags)(GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT), "OK", GTK_RESPONSE_OK, "Cancel", GTK_RESPONSE_CANCEL, NULL));
 
-  GtkNotebook *notebook = GTK_NOTEBOOK(gtk_notebook_new());
+  myNotebook = GTK_NOTEBOOK(gtk_notebook_new());
+
+  gtk_container_add(GTK_CONTAINER(myDialog->vbox), GTK_WIDGET(myNotebook));
 
-  gtk_container_add(GTK_CONTAINER(myDialog->vbox), GTK_WIDGET(notebook));
+  SettingsPageWithEntries *uiPage = new SettingsPageWithEntries();
+  uiPage->addEntry(&myTransparent);
+  uiPage->addEntry(&myIconSize);
 
-  // addPage(notebook, "UI", ...);
-  addPage(notebook, "Items", myList.getWidget());
+  SettingsPageWithItems *itemsPage = new SettingsPageWithItems(SL_APPLET_SETTINGS_ICON_SIZE, items);
 
-  gtk_widget_set_size_request(GTK_WIDGET(myDialog), 540, 257);
+  addPage("UI", uiPage);
+  addPage("Items", itemsPage);
+
+  gtk_widget_set_size_request(GTK_WIDGET(myDialog), 540, 324);
 }
 
 SettingsDialog::~SettingsDialog() {
+  for (std::vector<SettingsPage *>::iterator it = myPages.begin(); it != myPages.end() ; ++it) {
+    delete *it;
+  }
+
+  myPages.resize(0);
+
   gtk_widget_destroy(GTK_WIDGET(myDialog));
 }
 
+void SettingsDialog::addPage(const std::string& name, SettingsPage *page) {
+  myPages.push_back(page);
+
+  GtkWidget *label = gtk_label_new(name.c_str());
+
+  gtk_notebook_append_page(myNotebook, page->getWidget(), label);
+}
+
 gint SettingsDialog::run() {
+  gtk_widget_show_all(GTK_WIDGET(myDialog));
+  gtk_notebook_set_current_page(myNotebook, 0);
+
   return gtk_dialog_run(myDialog);
 }
+
+void SettingsDialog::updateValues() {
+  myTransparent.updateValue();
+  myIconSize.updateValue();
+}
+
+// vim:ts=2:sw=2:et