* added code to create the actual toolbar

[simple-launcher] / simple-launcher.cc

diff --git a/simple-launcher.cc b/simple-launcher.cc
index 643d788..d60f195 100644 (file)
--- a/simple-launcher.cc
+++ b/simple-launcher.cc
@@ -35,7 +35,12 @@ public:
 
   GtkWidget *getWidget() { return myWidget; }
 
-  bool startApplication(const std::string& application);
+  static void _button_clicked(GtkToolButton *, void *);
+
+private:
+  bool initWidget();
+
+  void buttonClicked(GtkToolButton *);
 
 private:
   osso_context_t *myContext;
@@ -48,7 +53,7 @@ private:
 
 // Hildon home applet interface functions
 
-void *hildon_home_applet_lib_initialize (void *state_data, int *state_size, GtkWidget **widget) {
+void *hildon_home_applet_lib_initialize(void *state_data, int *state_size, GtkWidget **widget) {
   SimpleLauncherApplet *applet = new SimpleLauncherApplet();
 
   if (applet != 0) {
@@ -88,6 +93,12 @@ int hildon_home_applet_lib_save_state (void *applet_data, void **state_data, int
 // SimpleLauncherApplet implementation
 
 char *SimpleLauncherApplet::ourFiles[] = {
+  "/usr/share/applications/hildon/FBReader.desktop",
+  "/usr/share/applications/hildon/filemanager.desktop",
+  "/usr/share/applications/hildon/hildon-control-panel.desktop",
+  "/usr/share/applications/hildon/osso-application-installer.desktop",
+  "/usr/share/applications/hildon/osso-music-player.desktop",
+  "/usr/share/applications/hildon/osso-xterm.desktop",
   0
 };
 
@@ -100,11 +111,6 @@ bool SimpleLauncherApplet::doInit(void *state_data, int *state_size) {
     return false;
   }
 
-  // myWidget = mis_widget_new_with_engines_and_history();
-  if (myWidget == 0) {
-    return false;
-  }
-
   for (int i = 0 ; ourFiles[i] != 0 ; ++i) {
     LauncherItem *item = new LauncherItem();
 
@@ -115,7 +121,9 @@ bool SimpleLauncherApplet::doInit(void *state_data, int *state_size) {
     }
   }
 
-  // g_signal_connect (applet->myWidget, "do_search", G_CALLBACK (mis_applet_do_search), (gpointer)applet);
+  if (!initWidget()) {
+    return false;
+  }
 
   gtk_widget_show_all(myWidget);
 
@@ -143,6 +151,44 @@ SimpleLauncherApplet::~SimpleLauncherApplet() {
   }
 }
 
+bool SimpleLauncherApplet::initWidget() {
+  bool have_buttons = false;
+
+  myWidget = gtk_toolbar_new();
+
+  for (std::vector<LauncherItem *>::const_iterator it = myItems.begin(); it != myItems.end(); ++it) {
+    GtkToolItem *button = gtk_tool_button_new(gtk_image_new_from_pixbuf((*it)->getIcon(26)), 0);
+
+    gtk_object_set_user_data(GTK_OBJECT(button), *it);
+    g_signal_connect(button, "clicked", G_CALLBACK(_button_clicked), this);
+
+    gtk_toolbar_insert(GTK_TOOLBAR(myWidget), button, -1);
+
+    have_buttons = true;
+  }
+
+  if (!have_buttons) {
+    gtk_widget_destroy(myWidget);
+    myWidget = 0;
+  }
+
+  return true;
+}
+
+void SimpleLauncherApplet::_button_clicked(GtkToolButton *button, void *self) {
+  ((SimpleLauncherApplet *)self)->buttonClicked(button);
+}
+
+void SimpleLauncherApplet::buttonClicked(GtkToolButton *button) {
+  if (button != 0) {
+    LauncherItem *item = (LauncherItem *)gtk_object_get_user_data(GTK_OBJECT(button));
+
+    if (item != 0) {
+      item->activate(myContext);
+    }
+  }
+}
+
 int SimpleLauncherApplet::saveState(void **state_data, int *state_size) {
   if (state_data != 0) {
     *state_data = 0;
@@ -162,7 +208,3 @@ GtkWidget *SimpleLauncherApplet::settings(GtkWindow *parent) {
   // corresponding dialog appears.
   return 0;
 }
-
-bool SimpleLauncherApplet::startApplication(const std::string& application) {
-  return osso_application_top(myContext, application.c_str(), 0) == OSSO_OK;
-}