quick-lounge-applet r259 - in trunk: . data/ui po src
- From: paobac svn gnome org
- To: svn-commits-list gnome org
- Subject: quick-lounge-applet r259 - in trunk: . data/ui po src
- Date: Wed, 4 Feb 2009 12:26:10 +0000 (UTC)
Author: paobac
Date: Wed Feb 4 12:26:10 2009
New Revision: 259
URL: http://svn.gnome.org/viewvc/quick-lounge-applet?rev=259&view=rev
Log:
2009-02-04 Paolo Bacchilega <paobac svn gnome org>
* src/Makefile.am:
* src/quick-desktop-entry-dialog.c:
* src/quick-desktop-entry-dialog.h:
renamed qck-desktop-entry-dialog.c as quick-desktop-entry-dialog.c
* src/dlg-add-from-menu.c:
* src/dlg-add-from-menu.h:
renamed dlg-pick-applications.c as dlg-add-from-menu.c
* src/quick-lounge.c:
* src/quick-button.c:
* src/gtk-utils.h:
* src/gtk-utils.c:
use the default panel launcher icon, if the icon is missing.
* data/ui/properties.ui:
Added:
trunk/data/ui/add-from-menu.ui (props changed)
- copied unchanged from r258, /trunk/data/ui/choose-from-menu.ui
trunk/src/dlg-add-from-menu.c (contents, props changed)
- copied, changed from r258, /trunk/src/dlg-pick-applications.c
trunk/src/dlg-add-from-menu.h (contents, props changed)
- copied, changed from r258, /trunk/src/dlg-pick-applications.h
trunk/src/quick-desktop-entry-dialog.c (contents, props changed)
- copied, changed from r258, /trunk/src/qck-desktop-entry-dialog.c
trunk/src/quick-desktop-entry-dialog.h (contents, props changed)
- copied, changed from r258, /trunk/src/qck-desktop-entry-dialog.h
Removed:
trunk/data/ui/choose-from-menu.ui
trunk/src/dlg-pick-applications.c
trunk/src/dlg-pick-applications.h
trunk/src/qck-desktop-entry-dialog.c
trunk/src/qck-desktop-entry-dialog.h
Modified:
trunk/ChangeLog
trunk/data/ui/Makefile.am
trunk/data/ui/properties.ui
trunk/po/ChangeLog
trunk/po/POTFILES.in
trunk/po/it.po
trunk/src/Makefile.am
trunk/src/dlg-properties.c
trunk/src/gtk-utils.c
trunk/src/gtk-utils.h
trunk/src/quick-button.c
trunk/src/quick-lounge.c
Modified: trunk/data/ui/Makefile.am
==============================================================================
--- trunk/data/ui/Makefile.am (original)
+++ trunk/data/ui/Makefile.am Wed Feb 4 12:26:10 2009
@@ -1,6 +1,6 @@
uidir = $(datadir)/quick-lounge-applet/ui
ui_DATA = \
- choose-from-menu.ui \
+ add-from-menu.ui \
desktop-entry-editor.ui \
properties.ui
Modified: trunk/data/ui/properties.ui
==============================================================================
--- trunk/data/ui/properties.ui (original)
+++ trunk/data/ui/properties.ui Wed Feb 4 12:26:10 2009
@@ -59,23 +59,23 @@
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <object class="GtkButton" id="p_add_launcher_button">
+ <object class="GtkButton" id="p_add_from_menu_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<child>
- <object class="GtkAlignment" id="alignment10">
+ <object class="GtkAlignment" id="alignment11">
<property name="visible">True</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
<child>
- <object class="GtkHBox" id="hbox19">
+ <object class="GtkHBox" id="hbox20">
<property name="visible">True</property>
<property name="spacing">2</property>
<child>
- <object class="GtkImage" id="image15">
+ <object class="GtkImage" id="image16">
<property name="visible">True</property>
- <property name="stock">gtk-new</property>
+ <property name="stock">gtk-index</property>
<property name="icon-size">4</property>
</object>
<packing>
@@ -85,9 +85,9 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="label21">
+ <object class="GtkLabel" id="label22">
<property name="visible">True</property>
- <property name="label" translatable="yes">_New Launcher</property>
+ <property name="label" translatable="yes">Add From M_enu...</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -108,23 +108,23 @@
</packing>
</child>
<child>
- <object class="GtkButton" id="p_add_from_menu_button">
+ <object class="GtkButton" id="p_add_launcher_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<child>
- <object class="GtkAlignment" id="alignment11">
+ <object class="GtkAlignment" id="alignment10">
<property name="visible">True</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
<child>
- <object class="GtkHBox" id="hbox20">
+ <object class="GtkHBox" id="hbox19">
<property name="visible">True</property>
<property name="spacing">2</property>
<child>
- <object class="GtkImage" id="image16">
+ <object class="GtkImage" id="image15">
<property name="visible">True</property>
- <property name="stock">gtk-index</property>
+ <property name="stock">gtk-new</property>
<property name="icon-size">4</property>
</object>
<packing>
@@ -134,9 +134,9 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="label22">
+ <object class="GtkLabel" id="label21">
<property name="visible">True</property>
- <property name="label" translatable="yes">Add From M_enu</property>
+ <property name="label" translatable="yes">_New Launcher</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -185,7 +185,7 @@
<child>
<object class="GtkLabel" id="label23">
<property name="visible">True</property>
- <property name="label" translatable="yes">Add _Space</property>
+ <property name="label" translatable="yes">Add _Separator</property>
<property name="use_underline">True</property>
</object>
<packing>
Modified: trunk/po/POTFILES.in
==============================================================================
--- trunk/po/POTFILES.in (original)
+++ trunk/po/POTFILES.in Wed Feb 4 12:26:10 2009
@@ -4,23 +4,23 @@
data/GNOME_QuickLoungeApplet.xml
data/GNOME_QuickLoungeApplet_Factory.server.in.in
data/quick-lounge.schemas.in
-[type: gettext/glade]data/ui/choose-from-menu.ui
+[type: gettext/glade]data/ui/add-from-menu.ui
[type: gettext/glade]data/ui/desktop-entry-editor.ui
[type: gettext/glade]data/ui/properties.ui
-src/dlg-pick-applications.c
-src/dlg-pick-applications.h
+src/dlg-add-from-menu.c
+src/dlg-add-from-menu.h
src/dlg-properties.c
src/dlg-properties.h
src/file-utils.c
src/file-utils.h
src/gtk-utils.c
src/gtk-utils.h
-src/qck-desktop-entry-dialog.c
-src/qck-desktop-entry-dialog.h
src/quick-box.c
src/quick-box.h
src/quick-button.c
src/quick-button.h
+src/quick-desktop-entry-dialog.c
+src/quick-desktop-entry-dialog.h
src/quick-lounge.c
src/quick-lounge.h
src/quick-separator.c
Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am (original)
+++ trunk/src/Makefile.am Wed Feb 4 12:26:10 2009
@@ -14,20 +14,20 @@
libexec_PROGRAMS = quick-lounge-applet
quick_lounge_applet_SOURCES = \
- dlg-pick-applications.c \
- dlg-pick-applications.h \
+ dlg-add-from-menu.c \
+ dlg-add-from-menu.h \
dlg-properties.c \
dlg-properties.h \
file-utils.c \
file-utils.h \
gtk-utils.c \
gtk-utils.h \
- qck-desktop-entry-dialog.c \
- qck-desktop-entry-dialog.h \
quick-box.c \
quick-box.h \
quick-button.c \
quick-button.h \
+ quick-desktop-entry-dialog.c \
+ quick-desktop-entry-dialog.h \
quick-lounge.c \
quick-lounge.h \
quick-separator.c \
Copied: trunk/src/dlg-add-from-menu.c (from r258, /trunk/src/dlg-pick-applications.c)
==============================================================================
--- /trunk/src/dlg-pick-applications.c (original)
+++ trunk/src/dlg-add-from-menu.c Wed Feb 4 12:26:10 2009
@@ -24,7 +24,7 @@
#include <string.h>
#include <gtk/gtk.h>
#include <gmenu-tree.h>
-#include "dlg-pick-applications.h"
+#include "dlg-add-from-menu.h"
#include "dlg-properties.h"
#include "gtk-utils.h"
#include "file-utils.h"
@@ -161,7 +161,7 @@
int size;
size = _gtk_icon_get_pixel_size (GTK_WIDGET (data->dialog), GTK_ICON_SIZE_BUTTON);
- image = create_pixbuf (data->quick_lounge->icon_theme, icon, size);
+ image = create_pixbuf_or_missing (data->quick_lounge->icon_theme, icon, size);
}
gtk_list_store_append (GTK_LIST_STORE (data->application_model), &iter);
@@ -207,7 +207,7 @@
int size;
size = _gtk_icon_get_pixel_size (GTK_WIDGET (data->dialog), GTK_ICON_SIZE_BUTTON);
- image = create_pixbuf (quick_lounge->icon_theme, icon, size);
+ image = create_pixbuf_or_missing (quick_lounge->icon_theme, icon, size);
}
gtk_tree_store_append (GTK_TREE_STORE (data->directory_model), &iter, tree_iter);
@@ -255,7 +255,7 @@
GMenuTree *menu_tree;
GMenuTreeDirectory *menu_dir;
- menu_tree = gmenu_tree_lookup (menu_file, GMENU_TREE_FLAGS_NONE);
+ menu_tree = gmenu_tree_lookup (menu_file, GMENU_TREE_FLAGS_INCLUDE_EXCLUDED | GMENU_TREE_FLAGS_INCLUDE_NODISPLAY);
if (menu_tree == NULL)
return;
@@ -480,8 +480,8 @@
void
-dlg_pick_applications (QuickLounge *quick_lounge,
- int pos)
+dlg_add_from_menu (QuickLounge *quick_lounge,
+ int pos)
{
DialogData *data;
GtkWidget *btn_ok;
@@ -497,7 +497,7 @@
data->pos = pos;
data->uris = g_hash_table_new_full (g_str_hash, g_str_equal, (GDestroyNotify) g_free, NULL);
- data->builder = _gtk_builder_new_from_file ("choose-from-menu.ui");
+ data->builder = _gtk_builder_new_from_file ("add-from-menu.ui");
/* Get the widgets. */
Copied: trunk/src/dlg-add-from-menu.h (from r258, /trunk/src/dlg-pick-applications.h)
==============================================================================
--- /trunk/src/dlg-pick-applications.h (original)
+++ trunk/src/dlg-add-from-menu.h Wed Feb 4 12:26:10 2009
@@ -25,8 +25,8 @@
#include "quick-lounge.h"
-void dlg_pick_applications (QuickLounge *quick_lounge,
- int pos);
+void dlg_add_from_menu (QuickLounge *quick_lounge,
+ int pos);
#endif /* _APPLICATIONS_MENU_H */
Modified: trunk/src/dlg-properties.c
==============================================================================
--- trunk/src/dlg-properties.c (original)
+++ trunk/src/dlg-properties.c Wed Feb 4 12:26:10 2009
@@ -26,14 +26,14 @@
#include <sys/types.h>
#include <unistd.h>
#include <gtk/gtk.h>
+#include "dlg-properties.h"
+#include "dlg-add-from-menu.h"
#include "file-utils.h"
#include "gtk-utils.h"
#include "quick-lounge.h"
#include "quick-box.h"
#include "quick-button.h"
#include "quick-separator.h"
-#include "dlg-properties.h"
-#include "dlg-pick-applications.h"
#define SEPARATOR_NAME "---" /*_("Space")*/
#define ICON_SIZE 24
@@ -536,7 +536,7 @@
else
pos = get_iter_position (data, &iter);
- dlg_pick_applications (data->quick_lounge, pos);
+ dlg_add_from_menu (data->quick_lounge, pos);
}
Modified: trunk/src/gtk-utils.c
==============================================================================
--- trunk/src/gtk-utils.c (original)
+++ trunk/src/gtk-utils.c Wed Feb 4 12:26:10 2009
@@ -444,6 +444,67 @@
}
+static GdkPixbuf *
+create_internal_missing_pixbuf (int size)
+{
+ int i, j;
+ int rowstride;
+ guchar *pixels;
+ GdkPixbuf *pb;
+
+ pb = gdk_pixbuf_new (GDK_COLORSPACE_RGB,
+ FALSE /* has alpha */,
+ 8 /* bits per sample */,
+ size, size);
+ pixels = gdk_pixbuf_get_pixels (pb);
+ rowstride = gdk_pixbuf_get_rowstride (pb);
+
+ for (i = 0; i < size; i++) {
+ for (j = 0; j < size; j++) {
+ guchar *p = pixels + i * rowstride + 3 * j;
+ if (i == j || size - i == j) {
+ p[0] = 255;
+ p[1] = 0;
+ p[2] = 0;
+ } else {
+ p[0] = 255;
+ p[1] = 255;
+ p[2] = 255;
+ }
+ }
+ }
+
+ return pb;
+}
+
+
+static GdkPixbuf *
+create_missing_pixbuf (GtkIconTheme *theme,
+ int preffered_size)
+{
+ GtkIconInfo *icon_info;
+ const char *filename = NULL;
+ GdkPixbuf *pixbuf;
+
+ icon_info = gtk_icon_theme_lookup_icon (theme,
+ "gnome-panel-launcher", /*"gtk-missing-image",*/
+ preffered_size,
+ 0);
+ if (icon_info != NULL)
+ filename = gtk_icon_info_get_filename (icon_info);
+
+ if (filename != NULL)
+ pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
+ else
+ pixbuf = create_internal_missing_pixbuf (preffered_size);
+
+ if (icon_info != NULL)
+ gtk_icon_info_free (icon_info);
+
+ return pixbuf;
+}
+
+
/* This function from gnome-panel/panel-util.c
* (C) 1997, 1998, 1999, 2000 The Free Software Foundation
* Copyright 2000 Helix Code, Inc.
@@ -473,12 +534,12 @@
if (g_path_is_absolute (icon_name)) {
if (g_file_test (icon_name, G_FILE_TEST_EXISTS)) {
return g_strdup (icon_name);
- } else {
+ }
+ else {
char *basename;
basename = g_path_get_basename (icon_name);
- retval = panel_find_icon (icon_theme, basename,
- size);
+ retval = panel_find_icon (icon_theme, basename, size);
g_free (basename);
return retval;
@@ -492,7 +553,8 @@
if (p &&
(strcmp (p, ".png") == 0 ||
strcmp (p, ".xpm") == 0 ||
- strcmp (p, ".svg") == 0)) {
+ strcmp (p, ".svg") == 0))
+ {
*p = 0;
}
@@ -501,15 +563,15 @@
size,
0);
- g_free (icon_no_extension);
-
- if (icon_info) {
+ if (icon_info != NULL) {
retval = g_strdup (gtk_icon_info_get_filename (icon_info));
gtk_icon_info_free (icon_info);
}
else
retval = NULL;
+ g_free (icon_no_extension);
+
return retval;
}
@@ -560,6 +622,21 @@
}
+GdkPixbuf *
+create_pixbuf_or_missing (GtkIconTheme *icon_theme,
+ const char *icon_name,
+ int icon_size)
+{
+ GdkPixbuf *pixbuf;
+
+ pixbuf = create_pixbuf (icon_theme, icon_name, icon_size);
+ if (pixbuf == NULL)
+ pixbuf = create_missing_pixbuf (icon_theme, icon_size);
+
+ return pixbuf;
+}
+
+
GtkWidget *
create_image (GtkIconTheme *icon_theme,
const char *icon_name,
@@ -568,10 +645,7 @@
GtkWidget *icon = NULL;
GdkPixbuf *pixbuf;
- pixbuf = create_pixbuf (icon_theme, icon_name, icon_size);
-
- if (pixbuf == NULL)
- return NULL;
+ pixbuf = create_pixbuf_or_missing (icon_theme, icon_name, icon_size);
icon = gtk_image_new ();
gtk_image_set_from_pixbuf (GTK_IMAGE (icon), pixbuf);
Modified: trunk/src/gtk-utils.h
==============================================================================
--- trunk/src/gtk-utils.h (original)
+++ trunk/src/gtk-utils.h Wed Feb 4 12:26:10 2009
@@ -63,10 +63,15 @@
char * panel_find_icon (GtkIconTheme *icon_theme,
const char *icon_name,
int size);
+GdkPixbuf * create_missing_pixbuf (GtkIconTheme *theme,
+ int preffered_size);
GdkPixbuf * create_pixbuf (GtkIconTheme *icon_theme,
- const char *icon_path,
- int icon_size);
-
+ const char *icon_name,
+ int icon_size,
+ gboolean with_fallback);
+GdkPixbuf * create_pixbuf_or_missing (GtkIconTheme *theme,
+ const char *icon_name,
+ int preffered_size);
GtkWidget * create_image (GtkIconTheme *icon_theme,
const char *icon_path,
int icon_size);
Modified: trunk/src/quick-button.c
==============================================================================
--- trunk/src/quick-button.c (original)
+++ trunk/src/quick-button.c Wed Feb 4 12:26:10 2009
@@ -227,65 +227,6 @@
}
-GdkPixbuf *
-missing_pixbuf (int size)
-{
- int i, j;
- int rowstride;
- guchar *pixels;
- GdkPixbuf *pb;
-
- pb = gdk_pixbuf_new (GDK_COLORSPACE_RGB,
- FALSE /* has alpha */,
- 8 /* bits per sample */,
- size, size);
- pixels = gdk_pixbuf_get_pixels (pb);
- rowstride = gdk_pixbuf_get_rowstride (pb);
-
- for (i = 0; i < size; i++) {
- for (j = 0; j < size; j++) {
- guchar *p = pixels + i * rowstride + 3 * j;
- if (i == j || size - i == j) {
- p[0] = 255;
- p[1] = 0;
- p[2] = 0;
- } else {
- p[0] = 255;
- p[1] = 255;
- p[2] = 255;
- }
- }
- }
-
- return pb;
-}
-
-
-static GdkPixbuf *
-get_missing (GtkIconTheme *theme,
- int preffered_size)
-{
- GtkIconInfo *icon_info;
- const char *filename = NULL;
- GdkPixbuf *pixbuf;
-
- icon_info = gtk_icon_theme_lookup_icon (theme,
- "gtk-missing-image",
- preffered_size,
- 0);
-
- filename = gtk_icon_info_get_filename (icon_info);
- if (filename != NULL)
- pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
- else
- pixbuf = missing_pixbuf (preffered_size);
-
- gtk_icon_info_free (icon_info);
-
- return pixbuf;
-}
-
-
static void
do_colorshift (GdkPixbuf *dest,
GdkPixbuf *src,
@@ -362,9 +303,7 @@
if (preffered_size <= 0)
preffered_size = DEFAULT_SIZE;
- new_pixbuf = create_pixbuf (button->icon_theme, icon_name, preffered_size);
- if (new_pixbuf == NULL)
- new_pixbuf = get_missing (button->icon_theme, preffered_size);
+ new_pixbuf = create_pixbuf_or_missing (button->icon_theme, icon_name, preffered_size);
/**/
Copied: trunk/src/quick-desktop-entry-dialog.c (from r258, /trunk/src/qck-desktop-entry-dialog.c)
==============================================================================
--- /trunk/src/qck-desktop-entry-dialog.c (original)
+++ trunk/src/quick-desktop-entry-dialog.c Wed Feb 4 12:26:10 2009
@@ -24,7 +24,7 @@
#include <glib/gi18n.h>
#include "file-utils.h"
#include "gtk-utils.h"
-#include "qck-desktop-entry-dialog.h"
+#include "quick-desktop-entry-dialog.h"
#define GET_WIDGET(name) _gtk_builder_get_widget (self->priv->builder, (name))
@@ -39,7 +39,7 @@
static guint signals[LAST_SIGNAL] = { 0 };
-struct _QckDesktopEntryDialogPrivate {
+struct _QuickDesktopEntryDialogPrivate {
GtkBuilder *builder;
GtkWidget *type_combobox;
GKeyFile *original;
@@ -48,11 +48,11 @@
static void
-qck_desktop_entry_dialog_finalize (GObject *object)
+quick_desktop_entry_dialog_finalize (GObject *object)
{
- QckDesktopEntryDialog *dialog;
+ QuickDesktopEntryDialog *dialog;
- dialog = QCK_DESKTOP_ENTRY_DIALOG (object);
+ dialog = QUICK_DESKTOP_ENTRY_DIALOG (object);
if (dialog->priv != NULL) {
g_object_unref (dialog->priv->builder);
@@ -65,21 +65,21 @@
static void
-qck_desktop_entry_dialog_class_init (QckDesktopEntryDialogClass *class)
+quick_desktop_entry_dialog_class_init (QuickDesktopEntryDialogClass *class)
{
GObjectClass *object_class;
parent_class = g_type_class_peek_parent (class);
object_class = (GObjectClass*) class;
- object_class->finalize = qck_desktop_entry_dialog_finalize;
+ object_class->finalize = quick_desktop_entry_dialog_finalize;
/* signals */
signals[CHANGED] = g_signal_new ("changed",
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (QckDesktopEntryDialogClass, changed),
+ G_STRUCT_OFFSET (QuickDesktopEntryDialogClass, changed),
NULL, NULL,
g_cclosure_marshal_VOID__BOOLEAN,
G_TYPE_NONE,
@@ -89,32 +89,32 @@
static void
-qck_desktop_entry_dialog_init (QckDesktopEntryDialog *dialog)
+quick_desktop_entry_dialog_init (QuickDesktopEntryDialog *dialog)
{
- dialog->priv = g_new0 (QckDesktopEntryDialogPrivate, 1);
+ dialog->priv = g_new0 (QuickDesktopEntryDialogPrivate, 1);
}
GType
-qck_desktop_entry_dialog_get_type (void)
+quick_desktop_entry_dialog_get_type (void)
{
static GType type = 0;
if (! type) {
GTypeInfo type_info = {
- sizeof (QckDesktopEntryDialogClass),
+ sizeof (QuickDesktopEntryDialogClass),
NULL,
NULL,
- (GClassInitFunc) qck_desktop_entry_dialog_class_init,
+ (GClassInitFunc) quick_desktop_entry_dialog_class_init,
NULL,
NULL,
- sizeof (QckDesktopEntryDialog),
+ sizeof (QuickDesktopEntryDialog),
0,
- (GInstanceInitFunc) qck_desktop_entry_dialog_init
+ (GInstanceInitFunc) quick_desktop_entry_dialog_init
};
type = g_type_register_static (GTK_TYPE_DIALOG,
- "QckDesktopEntryDialog",
+ "QuickDesktopEntryDialog",
&type_info,
0);
}
@@ -124,27 +124,27 @@
static void
-qck_desktop_entry_dialog_changed (QckDesktopEntryDialog *self)
+quick_desktop_entry_dialog_changed (QuickDesktopEntryDialog *self)
{
g_signal_emit (self, signals[CHANGED], 0, _g_desktop_entry_equal (self->priv->current, self->priv->original));
}
static void
-type_combobox_changed_cb (GtkEditable *editable,
- QckDesktopEntryDialog *self)
+type_combobox_changed_cb (GtkEditable *editable,
+ QuickDesktopEntryDialog *self)
{
g_key_file_set_boolean (self->priv->current,
G_KEY_FILE_DESKTOP_GROUP,
G_KEY_FILE_DESKTOP_KEY_NAME,
gtk_combo_box_get_active (GTK_COMBO_BOX (self->priv->type_combobox)) == 1);
- qck_desktop_entry_dialog_changed (self);
+ quick_desktop_entry_dialog_changed (self);
}
static void
-name_entry_changed_cb (GtkEditable *editable,
- QckDesktopEntryDialog *self)
+name_entry_changed_cb (GtkEditable *editable,
+ QuickDesktopEntryDialog *self)
{
char **languages;
@@ -155,25 +155,25 @@
G_KEY_FILE_DESKTOP_KEY_NAME,
languages[0],
gtk_entry_get_text (GTK_ENTRY (GET_WIDGET ("name_entry"))));
- qck_desktop_entry_dialog_changed (self);
+ quick_desktop_entry_dialog_changed (self);
}
static void
-exec_entry_changed_cb (GtkEditable *editable,
- QckDesktopEntryDialog *self)
+exec_entry_changed_cb (GtkEditable *editable,
+ QuickDesktopEntryDialog *self)
{
g_key_file_set_string (self->priv->current,
G_KEY_FILE_DESKTOP_GROUP,
G_KEY_FILE_DESKTOP_KEY_EXEC,
gtk_entry_get_text (GTK_ENTRY (GET_WIDGET ("exec_entry"))));
- qck_desktop_entry_dialog_changed (self);
+ quick_desktop_entry_dialog_changed (self);
}
static void
-comment_entry_changed_cb (GtkEditable *editable,
- QckDesktopEntryDialog *self)
+comment_entry_changed_cb (GtkEditable *editable,
+ QuickDesktopEntryDialog *self)
{
char **languages;
@@ -184,35 +184,32 @@
G_KEY_FILE_DESKTOP_KEY_COMMENT,
languages[0],
gtk_entry_get_text (GTK_ENTRY (GET_WIDGET ("comment_entry"))));
- qck_desktop_entry_dialog_changed (self);
+ quick_desktop_entry_dialog_changed (self);
}
static void
-qck_desktop_entry_dialog_update_icon (QckDesktopEntryDialog *self,
- GKeyFile *entry)
+quick_desktop_entry_dialog_update_icon (QuickDesktopEntryDialog *self,
+ GKeyFile *entry)
{
char *icon;
- GdkPixbuf *image;
-
+ int size;
+ GdkPixbuf *pixbuf;
+
icon = g_key_file_get_string (entry, G_KEY_FILE_DESKTOP_GROUP, G_KEY_FILE_DESKTOP_KEY_ICON, NULL);
-
- image = create_pixbuf (gtk_icon_theme_get_default (), icon, _gtk_icon_get_pixel_size (GTK_WIDGET (self), GTK_ICON_SIZE_DIALOG));
- if (image != NULL) {
- gtk_image_set_from_pixbuf (GTK_IMAGE (GET_WIDGET ("icon_image")), image);
- g_object_unref (image);
- }
- else
- gtk_image_set_from_stock (GTK_IMAGE (GET_WIDGET ("icon_image")), GTK_STOCK_MISSING_IMAGE , GTK_ICON_SIZE_DIALOG);
-
+ size = _gtk_icon_get_pixel_size (GTK_WIDGET (self), GTK_ICON_SIZE_DIALOG);
+ pixbuf = create_pixbuf_or_missing (gtk_icon_theme_get_default (), icon, size);
+ gtk_image_set_from_pixbuf (GTK_IMAGE (GET_WIDGET ("icon_image")), pixbuf);
+
+ g_object_unref (pixbuf);
g_free (icon);
}
static void
-icon_chooser_response_cb (GtkWidget *widget,
- int response,
- QckDesktopEntryDialog *self)
+icon_chooser_response_cb (GtkWidget *widget,
+ int response,
+ QuickDesktopEntryDialog *self)
{
GtkFileChooser *file_chooser = GTK_FILE_CHOOSER (widget);
char *path;
@@ -227,9 +224,9 @@
return;
g_key_file_set_string (self->priv->current, G_KEY_FILE_DESKTOP_GROUP, G_KEY_FILE_DESKTOP_KEY_ICON, path);
- qck_desktop_entry_dialog_update_icon (self, self->priv->current);
+ quick_desktop_entry_dialog_update_icon (self, self->priv->current);
- qck_desktop_entry_dialog_changed (self);
+ quick_desktop_entry_dialog_changed (self);
g_free (path);
@@ -239,8 +236,8 @@
static void
-icon_button_clicked_cb (GtkButton *button,
- QckDesktopEntryDialog *self)
+icon_button_clicked_cb (GtkButton *button,
+ QuickDesktopEntryDialog *self)
{
GtkWidget *icon_chooser;
char *icon;
@@ -291,9 +288,9 @@
static void
-command_chooser_response_cb (GtkWidget *widget,
- int response,
- QckDesktopEntryDialog *self)
+command_chooser_response_cb (GtkWidget *widget,
+ int response,
+ QuickDesktopEntryDialog *self)
{
GtkFileChooser *file_chooser = GTK_FILE_CHOOSER (widget);
char *command;
@@ -313,7 +310,7 @@
g_key_file_set_string (self->priv->current, G_KEY_FILE_DESKTOP_GROUP, G_KEY_FILE_DESKTOP_KEY_EXEC, command);
gtk_entry_set_text (GTK_ENTRY (GET_WIDGET ("exec_entry")), command);
- qck_desktop_entry_dialog_changed (self);
+ quick_desktop_entry_dialog_changed (self);
gtk_widget_destroy (GTK_WIDGET (file_chooser));
g_free (command);
@@ -321,8 +318,8 @@
static void
-browse_button_clicked_cb (GtkButton *button,
- QckDesktopEntryDialog *self)
+browse_button_clicked_cb (GtkButton *button,
+ QuickDesktopEntryDialog *self)
{
GtkWidget *command_chooser;
char *path;
@@ -369,10 +366,10 @@
static void
-qck_desktop_entry_dialog_construct (QckDesktopEntryDialog *self,
- const char *title,
- GtkWindow *parent,
- GKeyFile *entry)
+quick_desktop_entry_dialog_construct (QuickDesktopEntryDialog *self,
+ const char *title,
+ GtkWindow *parent,
+ GKeyFile *entry)
{
GtkWidget *content;
@@ -396,7 +393,7 @@
gtk_widget_show (self->priv->type_combobox);
gtk_box_pack_start (GTK_BOX (GET_WIDGET ("type_box")), self->priv->type_combobox, TRUE, TRUE, 0);
- qck_desktop_entry_dialog_set_entry (self, entry);
+ quick_desktop_entry_dialog_set_entry (self, entry);
g_signal_connect (self->priv->type_combobox,
"changed",
@@ -426,22 +423,22 @@
GtkWidget *
-qck_desktop_entry_dialog_new (const char *title,
- GtkWindow *parent,
- GKeyFile *entry)
+quick_desktop_entry_dialog_new (const char *title,
+ GtkWindow *parent,
+ GKeyFile *entry)
{
- QckDesktopEntryDialog *self;
+ QuickDesktopEntryDialog *self;
- self = g_object_new (QCK_TYPE_DESKTOP_ENTRY_DIALOG, NULL);
- qck_desktop_entry_dialog_construct (self, title, parent, entry);
+ self = g_object_new (QUICK_TYPE_DESKTOP_ENTRY_DIALOG, NULL);
+ quick_desktop_entry_dialog_construct (self, title, parent, entry);
return (GtkWidget *) self;
}
static void
-qck_desktop_entry_dialog_update (QckDesktopEntryDialog *self,
- GKeyFile *entry)
+quick_desktop_entry_dialog_update (QuickDesktopEntryDialog *self,
+ GKeyFile *entry)
{
gboolean terminal;
char *name;
@@ -462,13 +459,13 @@
g_free (exec);
g_free (name);
- qck_desktop_entry_dialog_update_icon (self, entry);
+ quick_desktop_entry_dialog_update_icon (self, entry);
}
void
-qck_desktop_entry_dialog_set_entry (QckDesktopEntryDialog *self,
- GKeyFile *entry)
+quick_desktop_entry_dialog_set_entry (QuickDesktopEntryDialog *self,
+ GKeyFile *entry)
{
if (self->priv->original != NULL)
g_key_file_free (self->priv->original);
@@ -478,25 +475,25 @@
g_key_file_free (self->priv->current);
self->priv->current = _g_key_file_dup (entry);
- qck_desktop_entry_dialog_update (self, self->priv->current);
+ quick_desktop_entry_dialog_update (self, self->priv->current);
}
GKeyFile *
-qck_desktop_entry_dialog_get_entry (QckDesktopEntryDialog *self,
- GError **error)
+quick_desktop_entry_dialog_get_entry (QuickDesktopEntryDialog *self,
+ GError **error)
{
return _g_key_file_dup (self->priv->current);
}
void
-qck_desktop_entry_dialog_revert (QckDesktopEntryDialog *self)
+quick_desktop_entry_dialog_revert (QuickDesktopEntryDialog *self)
{
if (self->priv->current != NULL)
g_key_file_free (self->priv->current);
self->priv->current = _g_key_file_dup (self->priv->original);
- qck_desktop_entry_dialog_update (self, self->priv->current);
- qck_desktop_entry_dialog_changed (self);
+ quick_desktop_entry_dialog_update (self, self->priv->current);
+ quick_desktop_entry_dialog_changed (self);
}
Copied: trunk/src/quick-desktop-entry-dialog.h (from r258, /trunk/src/qck-desktop-entry-dialog.h)
==============================================================================
--- /trunk/src/qck-desktop-entry-dialog.h (original)
+++ trunk/src/quick-desktop-entry-dialog.h Wed Feb 4 12:26:10 2009
@@ -20,42 +20,42 @@
* Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
*/
-#ifndef QCK_DESKTOP_ENTRY_DIALOG_H
-#define QCK_DESKTOP_ENTRY_DIALOG_H
+#ifndef QUICK_DESKTOP_ENTRY_DIALOG_H
+#define QUICK_DESKTOP_ENTRY_DIALOG_H
#include <gtk/gtk.h>
-#define QCK_TYPE_DESKTOP_ENTRY_DIALOG (qck_desktop_entry_dialog_get_type ())
-#define QCK_DESKTOP_ENTRY_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), QCK_TYPE_DESKTOP_ENTRY_DIALOG, QckDesktopEntryDialog))
-#define QCK_DESKTOP_ENTRY_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), QCK_TYPE_DESKTOP_ENTRY_DIALOG, QckDesktopEntryDialogClass))
-#define QCK_IS_DESKTOP_ENTRY_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), QCK_TYPE_DESKTOP_ENTRY_DIALOG))
-#define QCK_IS_DESKTOP_ENTRY_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), QCK_TYPE_DESKTOP_ENTRY_DIALOG))
-#define QCK_DESKTOP_ENTRY_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), QCK_TYPE_DESKTOP_ENTRY_DIALOG, QckDesktopEntryDialogClass))
-
-typedef struct _QckDesktopEntryDialog QckDesktopEntryDialog;
-typedef struct _QckDesktopEntryDialogClass QckDesktopEntryDialogClass;
-typedef struct _QckDesktopEntryDialogPrivate QckDesktopEntryDialogPrivate;
+#define QUICK_TYPE_DESKTOP_ENTRY_DIALOG (quick_desktop_entry_dialog_get_type ())
+#define QUICK_DESKTOP_ENTRY_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), QUICK_TYPE_DESKTOP_ENTRY_DIALOG, QuickDesktopEntryDialog))
+#define QUICK_DESKTOP_ENTRY_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), QUICK_TYPE_DESKTOP_ENTRY_DIALOG, QuickDesktopEntryDialogClass))
+#define QUICK_IS_DESKTOP_ENTRY_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), QUICK_TYPE_DESKTOP_ENTRY_DIALOG))
+#define QUICK_IS_DESKTOP_ENTRY_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), QUICK_TYPE_DESKTOP_ENTRY_DIALOG))
+#define QUICK_DESKTOP_ENTRY_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), QUICK_TYPE_DESKTOP_ENTRY_DIALOG, QuickDesktopEntryDialogClass))
+
+typedef struct _QuickDesktopEntryDialog QuickDesktopEntryDialog;
+typedef struct _QuickDesktopEntryDialogClass QuickDesktopEntryDialogClass;
+typedef struct _QuickDesktopEntryDialogPrivate QuickDesktopEntryDialogPrivate;
-struct _QckDesktopEntryDialog {
+struct _QuickDesktopEntryDialog {
GtkDialog parent_instance;
- QckDesktopEntryDialogPrivate *priv;
+ QuickDesktopEntryDialogPrivate *priv;
};
-struct _QckDesktopEntryDialogClass {
+struct _QuickDesktopEntryDialogClass {
GtkDialogClass parent_class;
- void (*changed) (QckDesktopEntryDialog *self,
- gboolean reverted);
+ void (*changed) (QuickDesktopEntryDialog *self,
+ gboolean reverted);
};
-GType qck_desktop_entry_dialog_get_type (void);
-GtkWidget * qck_desktop_entry_dialog_new (const char *title,
- GtkWindow *parent,
- GKeyFile *entry);
-void qck_desktop_entry_dialog_set_entry (QckDesktopEntryDialog *self,
- GKeyFile *entry);
-GKeyFile * qck_desktop_entry_dialog_get_entry (QckDesktopEntryDialog *self,
- GError **error);
-void qck_desktop_entry_dialog_revert (QckDesktopEntryDialog *self);
+GType quick_desktop_entry_dialog_get_type (void);
+GtkWidget * quick_desktop_entry_dialog_new (const char *title,
+ GtkWindow *parent,
+ GKeyFile *entry);
+void quick_desktop_entry_dialog_set_entry (QuickDesktopEntryDialog *self,
+ GKeyFile *entry);
+GKeyFile * quick_desktop_entry_dialog_get_entry (QuickDesktopEntryDialog *self,
+ GError **error);
+void quick_desktop_entry_dialog_revert (QuickDesktopEntryDialog *self);
-#endif /* QCK_DESKTOP_ENTRY_DIALOG_H */
+#endif /* QUICK_DESKTOP_ENTRY_DIALOG_H */
Modified: trunk/src/quick-lounge.c
==============================================================================
--- trunk/src/quick-lounge.c (original)
+++ trunk/src/quick-lounge.c Wed Feb 4 12:26:10 2009
@@ -27,12 +27,12 @@
#include <gconf/gconf-client.h>
#include <panel-applet.h>
#include <panel-applet-gconf.h>
-#include "dlg-pick-applications.h"
+#include "dlg-add-from-menu.h"
#include "dlg-properties.h"
#include "file-utils.h"
#include "gtk-utils.h"
-#include "qck-desktop-entry-dialog.h"
#include "quick-box.h"
+#include "quick-desktop-entry-dialog.h"
#include "quick-separator.h"
#include "quick-lounge.h"
@@ -58,7 +58,7 @@
enum {
REVERT_BUTTON,
- QCK_RESPONSE_REVERT
+ QUICK_RESPONSE_REVERT
};
@@ -308,8 +308,8 @@
_gtk_show_help (NULL, "user-guide", "gospanel-52");
break;
- case QCK_RESPONSE_REVERT:
- qck_desktop_entry_dialog_revert (QCK_DESKTOP_ENTRY_DIALOG (dialog));
+ case QUICK_RESPONSE_REVERT:
+ quick_desktop_entry_dialog_revert (QUICK_DESKTOP_ENTRY_DIALOG (dialog));
break;
case GTK_RESPONSE_CLOSE:
@@ -336,9 +336,9 @@
const char *uri;
GFile *file;
- gtk_dialog_set_response_sensitive (dialog, QCK_RESPONSE_REVERT, ! reverted);
+ gtk_dialog_set_response_sensitive (dialog, QUICK_RESPONSE_REVERT, ! reverted);
- desktop_entry = qck_desktop_entry_dialog_get_entry (QCK_DESKTOP_ENTRY_DIALOG (dialog), &error);
+ desktop_entry = quick_desktop_entry_dialog_get_entry (QUICK_DESKTOP_ENTRY_DIALOG (dialog), &error);
if (error != NULL) {
_gtk_error_dialog_from_gerror_run (GTK_WINDOW (dialog), &error);
return;
@@ -384,12 +384,12 @@
desktop_entry = g_object_get_data (G_OBJECT (button), "desktop_entry");
- dialog = qck_desktop_entry_dialog_new (_("Launcher Properties"), NULL, desktop_entry);
+ dialog = quick_desktop_entry_dialog_new (_("Launcher Properties"), NULL, desktop_entry);
gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_HELP, GTK_RESPONSE_HELP);
- gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_REVERT_TO_SAVED, QCK_RESPONSE_REVERT);
+ gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_REVERT_TO_SAVED, QUICK_RESPONSE_REVERT);
gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
- gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), QCK_RESPONSE_REVERT, FALSE);
+ gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), QUICK_RESPONSE_REVERT, FALSE);
g_signal_connect (dialog,
"destroy",
@@ -536,7 +536,7 @@
if (response != GTK_RESPONSE_OK)
return;
- desktop_entry = qck_desktop_entry_dialog_get_entry (QCK_DESKTOP_ENTRY_DIALOG (dialog), &error);
+ desktop_entry = quick_desktop_entry_dialog_get_entry (QUICK_DESKTOP_ENTRY_DIALOG (dialog), &error);
if (error != NULL) {
_gtk_error_dialog_run (NULL,
ERROR_FORMAT,
@@ -595,7 +595,7 @@
data->quick_lounge = quick_lounge;
data->position = position;
- dialog = qck_desktop_entry_dialog_new (_("New Launcher"), NULL, NULL);
+ dialog = quick_desktop_entry_dialog_new (_("New Launcher"), NULL, NULL);
gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_HELP, GTK_RESPONSE_HELP);
gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_OK, GTK_RESPONSE_OK);
@@ -643,7 +643,7 @@
return;
pos = get_child_position (quick_box, button);
- dlg_pick_applications (quick_lounge, pos);
+ dlg_add_from_menu (quick_lounge, pos);
}
@@ -705,7 +705,8 @@
GtkWidget *item;
if (! QUICK_IS_SEPARATOR (button)) {
- item = gtk_image_menu_item_new_from_stock (GTK_STOCK_EXECUTE, NULL);
+ item = gtk_image_menu_item_new_with_mnemonic (_("_Launch"));
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), gtk_image_new_from_stock (GTK_STOCK_EXECUTE, GTK_ICON_SIZE_MENU));
gtk_widget_show_all (item);
gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), item);
g_signal_connect (G_OBJECT (item),
@@ -730,31 +731,31 @@
/**/
- item = gtk_image_menu_item_new_with_mnemonic (_("_New Launcher"));
+ item = gtk_image_menu_item_new_with_mnemonic (_("Add From M_enu..."));
gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), item);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), gtk_image_new_from_stock (GTK_STOCK_NEW, GTK_ICON_SIZE_MENU));
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), gtk_image_new_from_stock (GTK_STOCK_INDEX, GTK_ICON_SIZE_MENU));
gtk_widget_show_all (item);
g_signal_connect_swapped (G_OBJECT (item),
"activate",
- G_CALLBACK (add_launcher_cb),
+ G_CALLBACK (add_from_menu_cb),
button);
-
+
/**/
- item = gtk_image_menu_item_new_with_mnemonic (_("Add From M_enu"));
+ item = gtk_image_menu_item_new_with_mnemonic (_("_New Launcher"));
gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), item);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), gtk_image_new_from_stock (GTK_STOCK_INDEX, GTK_ICON_SIZE_MENU));
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), gtk_image_new_from_stock (GTK_STOCK_NEW, GTK_ICON_SIZE_MENU));
gtk_widget_show_all (item);
g_signal_connect_swapped (G_OBJECT (item),
"activate",
- G_CALLBACK (add_from_menu_cb),
+ G_CALLBACK (add_launcher_cb),
button);
/**/
- item = gtk_image_menu_item_new_with_mnemonic (_("Add _Space"));
+ item = gtk_image_menu_item_new_with_mnemonic (_("Add _Separator"));
gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), item);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), gtk_image_new_from_stock (GTK_STOCK_ADD, GTK_ICON_SIZE_MENU));
gtk_widget_show_all (item);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
