removed building of a test application for target 'all'

[simple-launcher] / settings-dialog.cc

diff --git a/settings-dialog.cc b/settings-dialog.cc
index b674af7..c691019 100644 (file)
--- a/settings-dialog.cc
+++ b/settings-dialog.cc
@@ -20,9 +20,12 @@
 #include <gtk/gtksizegroup.h>
 #include <gtk/gtknotebook.h>
 #include <gtk/gtklabel.h>
+#include <gtk/gtkcheckbutton.h>
 
 #include "settings-dialog.h"
 
+#define SL_APPLET_SETTINGS_ICON_SIZE  26
+
 // FIXME: UGLY!!!!
 
 inline void addPage(GtkNotebook *notebook, const std::string& name, GtkWidget *widget) {
@@ -31,41 +34,48 @@ inline void addPage(GtkNotebook *notebook, const std::string& name, GtkWidget *w
   gtk_notebook_append_page(notebook, widget, label);
 }
 
-inline GtkWidget *packItTogether(GtkSizeGroup *group, const std::string& name, GtkWidget *content) {
-       GtkWidget *box = gtk_hbox_new(false, 0);
-       GtkWidget *label = gtk_label_new(name.c_str());
+inline GtkWidget *packItTogether(GtkBox *parent, GtkSizeGroup *group, const std::string& name, GtkWidget *content) {
+  GtkWidget *box = gtk_hbox_new(false, 0);
+  GtkWidget *label = gtk_label_new(name.c_str());
 
-       gtk_size_group_add_widget(group, label);
+  gtk_size_group_add_widget(group, label);
   gtk_box_pack_start(GTK_BOX(box), label, true, true, 0);
   gtk_box_pack_start(GTK_BOX(box), content, true, true, 0);
 
-       return box;
+  gtk_box_pack_start(parent, box, false, false, 0);
+
+  return box;
 }
 
 inline GtkWidget *createUIPage() {
-       GtkSizeGroup *group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
-       GtkWidget *vbox = gtk_vbox_new(true, 0);
+  GtkSizeGroup *group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
+  GtkWidget *vbox = gtk_vbox_new(true, 0);
 
-       // packItTogether(group, "Button Size:", <small/big>);
-       // packItTogether(group, "Button Size:", [ ]);
-       // packItTogether(group, "Button Size:", [ ]);
+  // packItTogether(group, "Button Size:", <small/big>);
+  packItTogether(GTK_BOX(vbox), group, "Transparent background:", gtk_check_button_new());
+  packItTogether(GTK_BOX(vbox), group, "Show Infobanner:", gtk_check_button_new());
 
-       g_object_unref(G_OBJECT(group));
+  g_object_unref(G_OBJECT(group));
 
-       return vbox;
+  return vbox;
 }
 
-SettingsDialog::SettingsDialog(GtkWindow *parent, int size, LauncherItems& items) : myList(size, items) {
+SettingsDialog::SettingsDialog(GtkWindow *parent, LauncherItems& items, GConfBooleanOption& transparent, GConfIntegerOption& icon_size, GConfIntegerOption& canvas_size):
+  myList(SL_APPLET_SETTINGS_ICON_SIZE, items),
+  myTransparent(transparent, "Transparent background:"), myIconSize(icon_size, "Icon Size:"), myCanvasSize(canvas_size, "Canvas 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());
 
   gtk_container_add(GTK_CONTAINER(myDialog->vbox), GTK_WIDGET(notebook));
 
-  // addPage(notebook, "UI", createUIPage());
+  addPage(notebook, "UI", createUIPage());
   addPage(notebook, "Items", myList.getWidget());
 
-  gtk_widget_set_size_request(GTK_WIDGET(myDialog), 540, 257);
+  gtk_widget_set_size_request(GTK_WIDGET(myDialog), 540, 324);
+
+  gtk_widget_show_all(GTK_WIDGET(notebook));
+  gtk_notebook_set_current_page(notebook, 0);
 }
 
 SettingsDialog::~SettingsDialog() {
@@ -73,5 +83,15 @@ SettingsDialog::~SettingsDialog() {
 }
 
 gint SettingsDialog::run() {
+  gtk_widget_show_all(GTK_WIDGET(myDialog));
+
   return gtk_dialog_run(myDialog);
 }
+
+void SettingsDialog::updateValues() {
+  myTransparent.updateValue();
+  myIconSize.updateValue();
+  myCanvasSize.updateValue();
+}
+
+// vim:ts=2:sw=2:et