X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=simple-launcher.cc;h=c2a08ded86d70d9725c00c8107f7aec74cb4310f;hb=06e56b1c6f1a45dd900df22486f8255d74002f79;hp=d60f195a1fa1ec30f3db4698c56c630c8a84fb79;hpb=e40e9445369a1f06c2b93b30124541c41c5fa680;p=simple-launcher diff --git a/simple-launcher.cc b/simple-launcher.cc index d60f195..c2a08de 100644 --- a/simple-launcher.cc +++ b/simple-launcher.cc @@ -1,3 +1,19 @@ +// This file is a part of Simple Launcher +// +// Copyright (C) 2006, Mikhail Sobolev +// +// Simple Launcher is free software; you can redistribute it and/or modify it +// under the terms of the GNU General Public License as published by the Free +// Software Foundation; either version 2 of the License. +// +// This program is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +// more details. +// +// You should have received a copy of the GNU General Public License along with +// this program; if not, write to the Free Software Foundation, Inc., 51 +// Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include #include @@ -9,17 +25,11 @@ #include "launcher-item.h" -extern "C" { - void *hildon_home_applet_lib_initialize (void *state_data, int *state_size, GtkWidget **widget); - void hildon_home_applet_lib_deinitialize (void *applet_data); - void hildon_home_applet_lib_background (void *applet_data); - void hildon_home_applet_lib_foreground(void *applet_data); - int hildon_home_applet_lib_save_state(void *applet_data, void **state_data, int *state_size); - GtkWidget *hildon_home_applet_lib_settings(void *applet_data, GtkWindow *parent); -}; - #define SLA_APPLET_DBUS_NAME "simple-launcher" #define SLA_APPLET_VERSION "0.0" +#define SLA_APPLET_ICON_SIZE 26 +#define SLA_APPLET_BORDER_SIZE 14 +#define SLA_APPLET_CANVAS_SIZE (SLA_APPLET_BORDER_SIZE+SLA_APPLET_BORDER_SIZE) class SimpleLauncherApplet { public: @@ -35,16 +45,19 @@ public: GtkWidget *getWidget() { return myWidget; } - static void _button_clicked(GtkToolButton *, void *); - private: bool initWidget(); void buttonClicked(GtkToolButton *); + void runDialog(); + + static void _button_clicked(GtkToolButton *, void *); + static void _run_dialog(GtkMenuItem *, void *); private: osso_context_t *myContext; GtkWidget *myWidget; + GtkWindow *myParent; std::vector myItems; @@ -94,19 +107,19 @@ int hildon_home_applet_lib_save_state (void *applet_data, void **state_data, int char *SimpleLauncherApplet::ourFiles[] = { "/usr/share/applications/hildon/FBReader.desktop", + "/usr/share/applications/hildon/mp_ui.desktop", + "/usr/share/applications/hildon/osso-xterm.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", + "/usr/share/applications/hildon/hildon-control-panel.desktop", 0 }; -SimpleLauncherApplet::SimpleLauncherApplet(): myContext(0), myWidget(0) { +SimpleLauncherApplet::SimpleLauncherApplet(): myContext(0), myWidget(0), myParent(0) { } bool SimpleLauncherApplet::doInit(void *state_data, int *state_size) { - if ((myContext = osso_initialize(SLA_APPLET_DBUS_NAME, SLA_APPLET_VERSION, FALSE, NULL)) == 0) { + if ((myContext = osso_initialize(SLA_APPLET_DBUS_NAME, SLA_APPLET_VERSION, FALSE, 0)) == 0) { g_debug("sla-applet: failed to initialize the osso layer"); return false; } @@ -152,27 +165,31 @@ SimpleLauncherApplet::~SimpleLauncherApplet() { } bool SimpleLauncherApplet::initWidget() { - bool have_buttons = false; + int button_no = 0; - myWidget = gtk_toolbar_new(); + GtkToolbar *toolbar = GTK_TOOLBAR(gtk_toolbar_new()); for (std::vector::const_iterator it = myItems.begin(); it != myItems.end(); ++it) { - GtkToolItem *button = gtk_tool_button_new(gtk_image_new_from_pixbuf((*it)->getIcon(26)), 0); + GtkToolItem *button = gtk_tool_button_new(gtk_image_new_from_pixbuf((*it)->getIcon(SLA_APPLET_ICON_SIZE)), 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); + gtk_toolbar_insert(toolbar, button, -1); - have_buttons = true; + ++button_no; } - if (!have_buttons) { - gtk_widget_destroy(myWidget); - myWidget = 0; + if (button_no) { + myWidget = gtk_frame_new(0); + gtk_frame_set_shadow_type(GTK_FRAME(myWidget), GTK_SHADOW_ETCHED_IN); + gtk_widget_set_size_request(myWidget, button_no*(SLA_APPLET_ICON_SIZE+SLA_APPLET_CANVAS_SIZE), SLA_APPLET_ICON_SIZE+SLA_APPLET_CANVAS_SIZE); + gtk_container_add(GTK_CONTAINER(myWidget), GTK_WIDGET(toolbar)); + } else { + gtk_widget_destroy(GTK_WIDGET(toolbar)); } - return true; + return myWidget != 0; } void SimpleLauncherApplet::_button_clicked(GtkToolButton *button, void *self) { @@ -206,5 +223,36 @@ GtkWidget *SimpleLauncherApplet::settings(GtkWindow *parent) { // 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. - return 0; + myParent = parent; // FIXME: Ugly piece of code :( + + GtkWidget *menuItem = gtk_menu_item_new_with_label("Launcher Settings..."); + + g_signal_connect(menuItem, "activate", G_CALLBACK(_run_dialog), this); + + return menuItem; +} + +void SimpleLauncherApplet::_run_dialog(GtkMenuItem *, void *self) { + ((SimpleLauncherApplet *)self)->runDialog(); } + +void SimpleLauncherApplet::runDialog() { + 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, 0)); + + int response = gtk_dialog_run(dialog); + + gtk_widget_destroy(GTK_WIDGET(dialog)); + + switch (response) { + case GTK_RESPONSE_OK: + break; + + case GTK_RESPONSE_CANCEL: + break; + + default: + ; // FIXME: do I want to do anything in here? + } +} + +// vim:ts=2:sw=2:et