#include <libosso.h>
#include "launcher-item.h"
-#include "sla-list.h"
#include "launchable-item.h"
#include "settings-dialog.h"
+#include "gconf-wrapper.h"
#define SL_APPLET_DBUS_NAME "simple-launcher"
#define SL_APPLET_VERSION "0.0"
class SimpleLauncherApplet {
public:
- SimpleLauncherApplet();
+ SimpleLauncherApplet(const GConfKey&);
~SimpleLauncherApplet();
bool doInit(void *state_data, int *state_size);
LauncherItems myItems;
- bool myTransparent;
+ GConfBooleanOption myTransparent;
// bool myShowInfobanner; // FIXME: to implement
- int myIconSize;
+ GConfIntegerOption myIconSize;
static char *ourDirs[];
};
// Hildon home applet interface functions
void *hildon_home_applet_lib_initialize(void *state_data, int *state_size, GtkWidget **widget) {
- SimpleLauncherApplet *applet = new SimpleLauncherApplet();
+ GConfKey baseKey(SL_APPLET_GCONF_PATH);
+
+ SimpleLauncherApplet *applet = new SimpleLauncherApplet(baseKey);
if (applet != NULL) {
if (applet->doInit(state_data, state_size)) {
};
// SimpleLauncherApplet::SimpleLauncherApplet() : myMainSettings(myClient.getKey(SL_APPLET_GCONF_PATH)), myContext(NULL), myWidget(NULL), myParent(NULL) {
-SimpleLauncherApplet::SimpleLauncherApplet() : myContext(NULL), myWidget(NULL), myParent(NULL), myTransparent(true), myIconSize(48) {
+SimpleLauncherApplet::SimpleLauncherApplet(const GConfKey& base) : myContext(NULL), myWidget(NULL), myParent(NULL), myTransparent(base, "transparent", true), myIconSize(base, "icon_size", 48) {
}
bool SimpleLauncherApplet::doInit(void *state_data, int *state_size) {
SimpleLauncherApplet::~SimpleLauncherApplet() {
myItems.clear();
-
+#if 0
+ // This does not seem to be necessary
if (myWidget != NULL) {
gtk_widget_destroy(myWidget);
myWidget = NULL;
}
-
+#endif
if (myContext != NULL) {
osso_deinitialize(myContext);
myContext = NULL;
gtk_widget_set_events(button, GDK_BUTTON_PRESS_MASK);
g_signal_connect(button, "button-press-event", G_CALLBACK(_button_pressed), this);
- gtk_event_box_set_visible_window(GTK_EVENT_BOX(button), !myTransparent);
+ gtk_event_box_set_visible_window(GTK_EVENT_BOX(button), !myTransparent.value());
{
- GdkPixbuf *pixbuf = item->getIcon(myIconSize);
+ GdkPixbuf *pixbuf = item->getIcon(myIconSize.value());
gtk_container_add(GTK_CONTAINER(button), gtk_image_new_from_pixbuf(pixbuf));
g_object_unref(G_OBJECT(pixbuf));
}
g_object_unref(G_OBJECT(group));
+ int totalSize = myIconSize.value();
+
if (button_no == 0) {
- gtk_widget_set_size_request(myWidget, myIconSize, myIconSize);
+ gtk_widget_set_size_request(myWidget, totalSize, totalSize);
} else {
- gtk_widget_set_size_request(myWidget, button_no*myIconSize, myIconSize);
+ gtk_widget_set_size_request(myWidget, button_no*totalSize, totalSize);
}
gtk_widget_show_all(myWidget);
LauncherItems newItems = myItems;
- SettingsDialog dialog(myParent, newItems);
+ // TODO: make it nicer... this code is ugly :(
+ SettingsDialog dialog(myParent, newItems, myTransparent, myIconSize);
switch (dialog.run()) {
case GTK_RESPONSE_OK:
myItems = newItems;
+ dialog.updateValues(); // FIXME: hackish :( make it better
+
saveConfig(); // save it immediately!
updateWidget();
break;
default:
; // FIXME: do I want to do anything in here?
}
+
+ newItems.clear();
}
// vim:ts=2:sw=2:et