stupid re-ordering of function calls :(

[simple-launcher] / simple-launcher.cc

diff --git a/simple-launcher.cc b/simple-launcher.cc
index cd05b6d..8c2e319 100644 (file)
--- a/simple-launcher.cc
+++ b/simple-launcher.cc
@@ -19,6 +19,8 @@
 #include <vector>
 #include <fstream>
 
+#include <dirent.h>
+
 #include <gtk/gtk.h>
 
 #include <hildon-home-plugin/hildon-home-plugin-interface.h>
@@ -49,11 +51,14 @@ public:
   GtkWidget *getWidget() { return myWidget; }
 
 private:
-  void addItem(const std::string&, bool);
+  static void addItem(LauncherItems&, const std::string&, bool);
 
   void loadConfig();
   void saveConfig();
 
+  static void updateItems(LauncherItems&);
+  static void processDirectory(LauncherItems&, const std::string&);
+
   bool initWidget();
   void updateWidget();
 
@@ -134,8 +139,6 @@ bool SimpleLauncherApplet::doInit(void *state_data, int *state_size) {
     return false;
   }
 
-  gtk_widget_show_all(myWidget);
-
   return true;
 }
 
@@ -153,8 +156,8 @@ SimpleLauncherApplet::~SimpleLauncherApplet() {
   }
 }
 
-void SimpleLauncherApplet::addItem(const std::string& name, bool enabled) {
-  if (!myItems.exists(name)) {
+void SimpleLauncherApplet::addItem(LauncherItems& items, const std::string& name, bool enabled) {
+  if (!items.exists(name)) {
     LaunchableItem *item = new LaunchableItem();
 
     item->load(name);
@@ -165,7 +168,7 @@ void SimpleLauncherApplet::addItem(const std::string& name, bool enabled) {
       item->disable();
     }
 
-    myItems.add(name, item);
+    items.add(name, item);
   }
 }
 
@@ -184,23 +187,12 @@ void SimpleLauncherApplet::loadConfig() {
         *p++ = '\0';
       }
 
-      addItem(buffer, (p != NULL && (*p == '1' || *p == 'y' || *p == 'Y')));
+      addItem(myItems, buffer, (p != NULL && (*p == '1' || *p == 'y' || *p == 'Y')));
 
     }
 
     delete buffer;
   }
-#if 0
-  for (int i = 0 ; ourFiles[i] != NULL ; ++i) {
-    LaunchableItem *item = new LaunchableItem();
-
-    if (item->load(ourFiles[i])) {
-      myItems.push_back(std::pair<std::string, LauncherItem *>(ourFiles[i], item));
-    } else {
-      delete item;
-    }
-  }
-#endif
 }
 
 void SimpleLauncherApplet::saveConfig() {
@@ -214,6 +206,36 @@ void SimpleLauncherApplet::saveConfig() {
   }
 }
 
+void SimpleLauncherApplet::updateItems(LauncherItems& items) {
+  for (int i = 0 ; ourDirs[i] != NULL ; ++i) {
+    processDirectory(items, ourDirs[i]);
+  }
+}
+
+void SimpleLauncherApplet::processDirectory(LauncherItems& items, const std::string& dirname) {
+  DIR *dir = opendir(dirname.c_str());
+
+  if (dir != NULL) {
+    const std::string namePrefix = dirname + "/";
+    std::string shortName;
+    std::string desktopExtension = ".desktop";
+    const dirent *file;
+
+    while ((file = readdir(dir)) != 0) {
+      shortName = file->d_name;
+      if ((shortName == ".") || (shortName == "..")) {
+        continue;
+      }
+
+      if ((shortName.length() >= desktopExtension.length()) && (shortName.compare(shortName.length() - desktopExtension.length(), desktopExtension.length(), desktopExtension) == 0)) {
+        addItem(items, namePrefix+shortName, false);
+      }
+    }
+
+    closedir(dir);
+  }
+}
+
 bool SimpleLauncherApplet::initWidget() {
   myWidget = gtk_frame_new(NULL);
 
@@ -254,10 +276,16 @@ void SimpleLauncherApplet::updateWidget() {
 
   if (button_no) {
     gtk_container_add(GTK_CONTAINER(myWidget), GTK_WIDGET(toolbar));
-    gtk_widget_set_size_request(myWidget, button_no*(SL_APPLET_ICON_SIZE+SL_APPLET_CANVAS_SIZE), SL_APPLET_ICON_SIZE+SL_APPLET_CANVAS_SIZE);
+    if (button_no == 0) {
+      gtk_widget_set_size_request(myWidget, SL_APPLET_ICON_SIZE+SL_APPLET_CANVAS_SIZE, SL_APPLET_ICON_SIZE+SL_APPLET_CANVAS_SIZE);
+    } else {
+      gtk_widget_set_size_request(myWidget, button_no*(SL_APPLET_ICON_SIZE+SL_APPLET_CANVAS_SIZE), SL_APPLET_ICON_SIZE+SL_APPLET_CANVAS_SIZE);
+    }
   } else {
     gtk_widget_destroy(GTK_WIDGET(toolbar));
   }
+
+  gtk_widget_show_all(myWidget);
 }
 
 void SimpleLauncherApplet::_button_clicked(GtkToolButton *button, void *self) {
@@ -305,7 +333,11 @@ void SimpleLauncherApplet::_run_dialog(GtkMenuItem *, void *self) {
 }
 
 void SimpleLauncherApplet::runDialog() {
-  SLAList list(SL_APPLET_ICON_SIZE, myItems);
+  LauncherItems newItems = myItems;
+
+  updateItems(newItems);  // User requested 'settings', let's give her the latest stuff :)
+
+  SLAList list(SL_APPLET_ICON_SIZE, newItems);
 
   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, NULL));
 
@@ -319,6 +351,9 @@ void SimpleLauncherApplet::runDialog() {
 
   switch (response) {
     case GTK_RESPONSE_OK:
+      myItems = newItems;
+      saveConfig();   // save it immediately!
+      updateWidget();
       break;
 
     case GTK_RESPONSE_CANCEL: