#include <libosso.h>
#include "launcher-item.h"
-#include "sla-list.h"
#include "launchable-item.h"
#include "settings-dialog.h"
#include "gconf-wrapper.h"
GConfBooleanOption myTransparent;
// bool myShowInfobanner; // FIXME: to implement
GConfIntegerOption myIconSize;
- GConfIntegerOption myCanvasSize;
static char *ourDirs[];
};
};
// SimpleLauncherApplet::SimpleLauncherApplet() : myMainSettings(myClient.getKey(SL_APPLET_GCONF_PATH)), myContext(NULL), myWidget(NULL), myParent(NULL) {
-SimpleLauncherApplet::SimpleLauncherApplet(const GConfKey& base) : myContext(NULL), myWidget(NULL), myParent(NULL), myTransparent(base, "transparent", true), myIconSize(base, "icon_size", 48), myCanvasSize(base, "canvas_size", 1) {
+SimpleLauncherApplet::SimpleLauncherApplet(const GConfKey& base) : myContext(NULL), myWidget(NULL), myParent(NULL), myTransparent(base, "transparent", true), myIconSize(base, "icon_size", 26) {
}
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;
}
}
-// FIXME: this probably should be done somehow differently
-static char *configFileName="/home/user/.slarc";
+static const gchar *getConfigFileName() {
+ static gchar *configFileName = NULL;
+
+ if (configFileName == NULL) {
+ configFileName = g_build_filename(g_get_home_dir(), ".slarc", NULL);
+ }
+
+ return configFileName;
+}
void SimpleLauncherApplet::loadConfig() {
- std::ifstream config(configFileName);
+ std::ifstream config(getConfigFileName());
if (config) {
char *buffer = new char [1024];
addItem(myItems, buffer, (p != NULL && (*p == '1' || *p == 'y' || *p == 'Y')));
}
- delete buffer;
+ delete [] buffer;
}
}
}
bool SimpleLauncherApplet::initWidget() {
- myWidget = gtk_hbox_new(false, 0);
+ myWidget = gtk_hbox_new(false, 2);
if (myWidget != NULL) {
updateWidget();
g_signal_connect(button, "button-press-event", G_CALLBACK(_button_pressed), this);
gtk_event_box_set_visible_window(GTK_EVENT_BOX(button), !myTransparent.value());
- gtk_container_set_border_width(GTK_CONTAINER(button), myCanvasSize.value());
{
GdkPixbuf *pixbuf = item->getIcon(myIconSize.value());
g_object_unref(G_OBJECT(group));
- int totalSize = myIconSize.value()+2*myCanvasSize.value();
+ int totalSize = myIconSize.value();
if (button_no == 0) {
gtk_widget_set_size_request(myWidget, totalSize, totalSize);
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(); // TODO: do I really need it?
}
// vim:ts=2:sw=2:et