#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"
#define SL_APPLET_ICON_SIZE 26
-#define SL_APPLET_BORDER_SIZE 14
-#define SL_APPLET_CANVAS_SIZE (SL_APPLET_BORDER_SIZE+SL_APPLET_BORDER_SIZE)
+
+#define SL_APPLET_GCONF_PATH "/apps/simple-launcher"
class SimpleLauncherApplet {
public:
bool initWidget();
void updateWidget();
- void buttonClicked(GtkToolButton *);
+ void buttonPressed(GtkWidget *button, GdkEventButton *event);
void runDialog();
- static void _button_clicked(GtkToolButton *, void *);
+ static void _button_pressed(GtkWidget *button, GdkEventButton *event, void *self);
static void _run_dialog(GtkMenuItem *, void *);
private:
+ GConfClientWrapper myClient;
+ GConfKey myMainSettings;
+
osso_context_t *myContext;
+
GtkWidget *myWidget;
GtkWindow *myParent;
NULL
};
-SimpleLauncherApplet::SimpleLauncherApplet(): myContext(NULL), myWidget(NULL), myParent(NULL) {
+SimpleLauncherApplet::SimpleLauncherApplet(): myMainSettings(myClient.getKey(SL_APPLET_GCONF_PATH)), myContext(NULL), myWidget(NULL), myParent(NULL) {
}
bool SimpleLauncherApplet::doInit(void *state_data, int *state_size) {
return false;
}
- gtk_widget_show_all(myWidget);
-
return true;
}
}
}
+// FIXME: this probably should be done somehow differently
static char *configFileName="/home/user/.slarc";
void SimpleLauncherApplet::loadConfig() {
}
addItem(myItems, buffer, (p != NULL && (*p == '1' || *p == 'y' || *p == 'Y')));
-
}
delete buffer;
}
bool SimpleLauncherApplet::initWidget() {
- myWidget = gtk_frame_new(NULL);
+ myWidget = gtk_hbox_new(false, 0);
if (myWidget != NULL) {
- gtk_frame_set_shadow_type(GTK_FRAME(myWidget), GTK_SHADOW_ETCHED_IN);
-
updateWidget();
}
}
void SimpleLauncherApplet::updateWidget() {
- GtkWidget *child = gtk_bin_get_child(GTK_BIN(myWidget));
+ gtk_container_foreach(GTK_CONTAINER(myWidget), (GtkCallback)gtk_widget_destroy, NULL);
- if (child != NULL) {
- gtk_container_remove(GTK_CONTAINER(myWidget), child);
- gtk_widget_destroy(child);
- }
+ GtkSizeGroup *group = gtk_size_group_new(GTK_SIZE_GROUP_BOTH);
int button_no = 0;
- GtkToolbar *toolbar = GTK_TOOLBAR(gtk_toolbar_new());
for (size_t i = 0 ; i < myItems.size() ; ++i) {
LauncherItem *item = myItems[i];
if (item != NULL && item->isEnabled()) {
- GtkToolItem *button = gtk_tool_button_new(gtk_image_new_from_pixbuf(item->getIcon(SL_APPLET_ICON_SIZE)), NULL);
+ GtkWidget *button = gtk_event_box_new();
+
+ 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), false);
+ // gtk_button_set_relief(GTK_BUTTON(button),GTK_RELIEF_NONE);
+
+ gtk_container_add(GTK_CONTAINER(button), gtk_image_new_from_pixbuf(item->getIcon(SL_APPLET_ICON_SIZE)));
gtk_object_set_user_data(GTK_OBJECT(button), item);
- g_signal_connect(button, "clicked", G_CALLBACK(_button_clicked), this);
- gtk_toolbar_insert(toolbar, button, -1);
+ gtk_size_group_add_widget(group, button);
+
+ gtk_box_pack_start(GTK_BOX(myWidget), GTK_WIDGET(button), false, false, 0);
++button_no;
}
}
- 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);
+ g_object_unref(G_OBJECT(group));
+
+ if (button_no == 0) {
+ gtk_widget_set_size_request(myWidget, SL_APPLET_ICON_SIZE, SL_APPLET_ICON_SIZE);
} else {
- gtk_widget_destroy(GTK_WIDGET(toolbar));
+ gtk_widget_set_size_request(myWidget, button_no*SL_APPLET_ICON_SIZE, SL_APPLET_ICON_SIZE);
}
+
+ gtk_widget_show_all(myWidget);
}
-void SimpleLauncherApplet::_button_clicked(GtkToolButton *button, void *self) {
- ((SimpleLauncherApplet *)self)->buttonClicked(button);
+void SimpleLauncherApplet::_button_pressed(GtkWidget *button, GdkEventButton *event, void *self) {
+ ((SimpleLauncherApplet *)self)->buttonPressed(button, event);
}
-void SimpleLauncherApplet::buttonClicked(GtkToolButton *button) {
- if (button != NULL) {
+void SimpleLauncherApplet::buttonPressed(GtkWidget *button, GdkEventButton *event) {
+ if (button != NULL && event->button == 1) {
LaunchableItem *item = (LaunchableItem *)gtk_object_get_user_data(GTK_OBJECT(button));
if (item != NULL) {
}
GtkWidget *SimpleLauncherApplet::settings(GtkWindow *parent) {
- // TODO: in case we want SimpleLauncherApplet to be configurable, this method
- // 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.
myParent = parent; // FIXME: Ugly piece of code :(
GtkWidget *menuItem = gtk_menu_item_new_with_label("Launcher settings...");
}
void SimpleLauncherApplet::runDialog() {
- LauncherItems newItems = myItems;
-
- updateItems(newItems); // User requested 'settings', let's give her the latest stuff :)
+ // We update the items before using them to avoid a small memory leak
+ // FIXME: deal with the situation in a better way (figure it out first :))
+ updateItems(myItems); // 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));
-
- gtk_container_add(GTK_CONTAINER(dialog->vbox), list.getWidget());
-
- gtk_widget_set_size_request(GTK_WIDGET(dialog), 540, 257);
-
- int response = gtk_dialog_run(dialog);
+ LauncherItems newItems = myItems;
- gtk_widget_destroy(GTK_WIDGET(dialog));
+ SettingsDialog dialog(myParent, SL_APPLET_ICON_SIZE, newItems);
- switch (response) {
+ switch (dialog.run()) {
case GTK_RESPONSE_OK:
myItems = newItems;
saveConfig(); // save it immediately!
projects / simple-launcher / blobdiff