fixed license text: it was rather strange

[simple-launcher] / simple-launcher.cc

diff --git a/simple-launcher.cc b/simple-launcher.cc
index f6773b6..6cb34b7 100644 (file)
--- a/simple-launcher.cc
+++ b/simple-launcher.cc
@@ -3,8 +3,8 @@
 // Copyright (C) 2006, Mikhail Sobolev
 //
 // Simple Launcher is free software; you can redistribute it and/or modify it
-// under the terms of the GNU General Public License as published by the Free
-// Software Foundation; either version 2 of the License.
+// under the terms of the GNU General Public License version 2 as published by
+// the Free Software Foundation.
 //
 // This program is distributed in the hope that it will be useful, but WITHOUT
 // ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -25,15 +25,6 @@
 
 #include "launcher-item.h"
 
-extern "C" {
-  void *hildon_home_applet_lib_initialize (void *state_data, int *state_size, GtkWidget **widget);
-  void hildon_home_applet_lib_deinitialize (void *applet_data);
-  void hildon_home_applet_lib_background (void *applet_data);
-  void hildon_home_applet_lib_foreground(void *applet_data);
-  int hildon_home_applet_lib_save_state(void *applet_data, void **state_data, int *state_size);
-  GtkWidget *hildon_home_applet_lib_settings(void *applet_data, GtkWindow *parent);
-};
-
 #define SLA_APPLET_DBUS_NAME  "simple-launcher"
 #define SLA_APPLET_VERSION    "0.0"
 #define SLA_APPLET_ICON_SIZE  26
@@ -54,16 +45,19 @@ public:
 
   GtkWidget *getWidget() { return myWidget; }
 
-  static void _button_clicked(GtkToolButton *, void *);
-
 private:
   bool initWidget();
 
   void buttonClicked(GtkToolButton *);
+  void runDialog();
+
+  static void _button_clicked(GtkToolButton *, void *);
+  static void _run_dialog(GtkMenuItem *, void *);
 
 private:
   osso_context_t *myContext;
   GtkWidget *myWidget;
+  GtkWindow *myParent;
 
   std::vector<LauncherItem *> myItems;
 
@@ -121,7 +115,7 @@ char *SimpleLauncherApplet::ourFiles[] = {
   0
 };
 
-SimpleLauncherApplet::SimpleLauncherApplet(): myContext(0), myWidget(0) {
+SimpleLauncherApplet::SimpleLauncherApplet(): myContext(0), myWidget(0), myParent(0) {
 }
 
 bool SimpleLauncherApplet::doInit(void *state_data, int *state_size) {
@@ -229,5 +223,36 @@ GtkWidget *SimpleLauncherApplet::settings(GtkWindow *parent) {
   // should return a gtk_menu_item that would be included in home settings
   // menu.  Method should make sure that when we activate that item, a
   // corresponding dialog appears.
-  return 0;
+  myParent = parent;  // FIXME: Ugly piece of code :(
+
+  GtkWidget *menuItem = gtk_menu_item_new_with_label("Launcher Settings...");
+
+  g_signal_connect(menuItem, "activate", G_CALLBACK(_run_dialog), this);
+
+  return menuItem;
+}
+
+void SimpleLauncherApplet::_run_dialog(GtkMenuItem *, void *self) {
+  ((SimpleLauncherApplet *)self)->runDialog();
+}
+
+void SimpleLauncherApplet::runDialog() {
+  GtkDialog *dialog = GTK_DIALOG(gtk_dialog_new_with_buttons("Launcher Settings", myParent, (GtkDialogFlags)(GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT), "OK", GTK_RESPONSE_OK, "Cancel", GTK_RESPONSE_CANCEL, 0));
+
+  int response = gtk_dialog_run(dialog);
+
+  gtk_widget_destroy(GTK_WIDGET(dialog));
+
+  switch (response) {
+    case GTK_RESPONSE_OK:
+      break;
+
+    case GTK_RESPONSE_CANCEL:
+      break;
+
+    default:
+      ;     // FIXME: do I want to do anything in here?
+  }
 }
+
+// vim:ts=2:sw=2:et