[Xfce4-commits] r29082 - in xfce4-panel/trunk: . icons icons/16x16 icons/22x22 icons/24x24 icons/32x32 icons/48x48 libxfce4panel panel plugins/actions plugins/clock plugins/iconbox plugins/launcher plugins/pager plugins/separator plugins/systray plugins/tasklist plugins/windowlist settings
Nick Schermer
nick at xfce.org
Fri Jan 2 17:25:46 CET 2009
Author: nick
Date: 2009-01-02 16:25:45 +0000 (Fri, 02 Jan 2009)
New Revision: 29082
Added:
xfce4-panel/trunk/icons/16x16/xfce4-panel.png
xfce4-panel/trunk/icons/22x22/
xfce4-panel/trunk/icons/22x22/Makefile.am
xfce4-panel/trunk/icons/22x22/xfce4-panel.png
xfce4-panel/trunk/icons/24x24/
xfce4-panel/trunk/icons/24x24/Makefile.am
xfce4-panel/trunk/icons/24x24/xfce4-panel.png
xfce4-panel/trunk/icons/32x32/
xfce4-panel/trunk/icons/32x32/Makefile.am
xfce4-panel/trunk/icons/32x32/xfce4-panel.png
Modified:
xfce4-panel/trunk/configure.in.in
xfce4-panel/trunk/icons/16x16/Makefile.am
xfce4-panel/trunk/icons/48x48/xfce4-panel.png
xfce4-panel/trunk/icons/Makefile.am
xfce4-panel/trunk/libxfce4panel/xfce-panel-plugin-iface.c
xfce4-panel/trunk/panel/panel-dialogs.c
xfce4-panel/trunk/panel/panel.c
xfce4-panel/trunk/plugins/actions/actions.c
xfce4-panel/trunk/plugins/clock/clock-dialog.c
xfce4-panel/trunk/plugins/iconbox/iconbox.c
xfce4-panel/trunk/plugins/launcher/launcher-dialog.c
xfce4-panel/trunk/plugins/launcher/launcher.h
xfce4-panel/trunk/plugins/pager/pager.c
xfce4-panel/trunk/plugins/separator/separator.c
xfce4-panel/trunk/plugins/systray/systray.desktop.in.in
xfce4-panel/trunk/plugins/systray/xfce-tray-dialogs.c
xfce4-panel/trunk/plugins/tasklist/tasklist-dialogs.c
xfce4-panel/trunk/plugins/windowlist/windowlist-dialog.c
xfce4-panel/trunk/plugins/windowlist/windowlist.h
xfce4-panel/trunk/settings/xfce4-panel-manager.desktop.in
Log:
* Change a lot of strings to mnemonic labels.
* Add some new xfce4-panel icons.
* Lot of small fixes in the properties dialogs.
* String fixes.
* Use a location selector for the launcher dialog.
* String review, case fixes.
* Other stuff...
Modified: xfce4-panel/trunk/configure.in.in
===================================================================
--- xfce4-panel/trunk/configure.in.in 2009-01-02 14:55:30 UTC (rev 29081)
+++ xfce4-panel/trunk/configure.in.in 2009-01-02 16:25:45 UTC (rev 29082)
@@ -250,6 +250,9 @@
config/Makefile
icons/Makefile
icons/16x16/Makefile
+icons/22x22/Makefile
+icons/24x24/Makefile
+icons/32x32/Makefile
icons/48x48/Makefile
libxfce4panel/Makefile
libxfce4panel/libxfce4panel-1.0.pc
Modified: xfce4-panel/trunk/icons/16x16/Makefile.am
===================================================================
--- xfce4-panel/trunk/icons/16x16/Makefile.am 2009-01-02 14:55:30 UTC (rev 29081)
+++ xfce4-panel/trunk/icons/16x16/Makefile.am 2009-01-02 16:25:45 UTC (rev 29082)
@@ -4,7 +4,8 @@
icons_DATA = \
xfce-system-lock.png \
- xfce-system-exit.png
+ xfce-system-exit.png \
+ xfce4-panel.png
EXTRA_DIST = \
$(icons_DATA)
Added: xfce4-panel/trunk/icons/16x16/xfce4-panel.png
===================================================================
(Binary files differ)
Property changes on: xfce4-panel/trunk/icons/16x16/xfce4-panel.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: xfce4-panel/trunk/icons/22x22/Makefile.am
===================================================================
--- xfce4-panel/trunk/icons/22x22/Makefile.am (rev 0)
+++ xfce4-panel/trunk/icons/22x22/Makefile.am 2009-01-02 16:25:45 UTC (rev 29082)
@@ -0,0 +1,11 @@
+# $Id$
+
+iconsdir = $(datadir)/icons/hicolor/22x22/apps
+
+icons_DATA = \
+ xfce4-panel.png
+
+EXTRA_DIST = \
+ $(icons_DATA)
+
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
Property changes on: xfce4-panel/trunk/icons/22x22/Makefile.am
___________________________________________________________________
Added: svn:keywords
+ Id
Added: xfce4-panel/trunk/icons/22x22/xfce4-panel.png
===================================================================
(Binary files differ)
Property changes on: xfce4-panel/trunk/icons/22x22/xfce4-panel.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: xfce4-panel/trunk/icons/24x24/Makefile.am
===================================================================
--- xfce4-panel/trunk/icons/24x24/Makefile.am (rev 0)
+++ xfce4-panel/trunk/icons/24x24/Makefile.am 2009-01-02 16:25:45 UTC (rev 29082)
@@ -0,0 +1,11 @@
+# $Id$
+
+iconsdir = $(datadir)/icons/hicolor/24x24/apps
+
+icons_DATA = \
+ xfce4-panel.png
+
+EXTRA_DIST = \
+ $(icons_DATA)
+
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
Property changes on: xfce4-panel/trunk/icons/24x24/Makefile.am
___________________________________________________________________
Added: svn:keywords
+ Id
Added: xfce4-panel/trunk/icons/24x24/xfce4-panel.png
===================================================================
(Binary files differ)
Property changes on: xfce4-panel/trunk/icons/24x24/xfce4-panel.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: xfce4-panel/trunk/icons/32x32/Makefile.am
===================================================================
--- xfce4-panel/trunk/icons/32x32/Makefile.am (rev 0)
+++ xfce4-panel/trunk/icons/32x32/Makefile.am 2009-01-02 16:25:45 UTC (rev 29082)
@@ -0,0 +1,11 @@
+# $Id$
+
+iconsdir = $(datadir)/icons/hicolor/32x32/apps
+
+icons_DATA = \
+ xfce4-panel.png
+
+EXTRA_DIST = \
+ $(icons_DATA)
+
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
Property changes on: xfce4-panel/trunk/icons/32x32/Makefile.am
___________________________________________________________________
Added: svn:keywords
+ Id
Added: xfce4-panel/trunk/icons/32x32/xfce4-panel.png
===================================================================
(Binary files differ)
Property changes on: xfce4-panel/trunk/icons/32x32/xfce4-panel.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: xfce4-panel/trunk/icons/48x48/xfce4-panel.png
===================================================================
(Binary files differ)
Modified: xfce4-panel/trunk/icons/Makefile.am
===================================================================
--- xfce4-panel/trunk/icons/Makefile.am 2009-01-02 14:55:30 UTC (rev 29081)
+++ xfce4-panel/trunk/icons/Makefile.am 2009-01-02 16:25:45 UTC (rev 29082)
@@ -2,6 +2,9 @@
SUBDIRS = \
16x16 \
+ 22x22 \
+ 24x24 \
+ 32x32 \
48x48
gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
Modified: xfce4-panel/trunk/libxfce4panel/xfce-panel-plugin-iface.c
===================================================================
--- xfce4-panel/trunk/libxfce4panel/xfce-panel-plugin-iface.c 2009-01-02 14:55:30 UTC (rev 29081)
+++ xfce4-panel/trunk/libxfce4panel/xfce-panel-plugin-iface.c 2009-01-02 16:25:45 UTC (rev 29082)
@@ -899,7 +899,7 @@
gtk_widget_show (mi);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
- mi = gtk_image_menu_item_new_with_label (_("Add New Item"));
+ mi = gtk_image_menu_item_new_with_label (_("Add New Items..."));
gtk_widget_show (mi);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
@@ -910,7 +910,7 @@
g_signal_connect_swapped (G_OBJECT (mi), "activate",
G_CALLBACK (_xfce_panel_plugin_customize_items), plugin);
- mi = gtk_image_menu_item_new_with_label (_("Customize Panel"));
+ mi = gtk_image_menu_item_new_with_label (_("Customize Panel..."));
gtk_widget_show (mi);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
Modified: xfce4-panel/trunk/panel/panel-dialogs.c
===================================================================
--- xfce4-panel/trunk/panel/panel-dialogs.c 2009-01-02 14:55:30 UTC (rev 29081)
+++ xfce4-panel/trunk/panel/panel-dialogs.c 2009-01-02 16:25:45 UTC (rev 29082)
@@ -42,7 +42,7 @@
#include "panel-dnd.h"
#include "panel-dialogs.h"
-#define BORDER 8
+#define BORDER 6
typedef struct _PanelItemsDialog PanelItemsDialog;
typedef struct _PanelManagerDialog PanelManagerDialog;
@@ -587,7 +587,6 @@
PanelItemsDialog *pid;
Panel *panel;
GtkWidget *dlg, *vbox, *img, *hbox, *label;
- gchar *markup;
if (items_dialog_widget)
{
@@ -608,13 +607,13 @@
/* main dialog widget */
items_dialog_widget = pid->dlg = dlg =
- xfce_titled_dialog_new_with_buttons (_("Add Items to the Panel"), NULL,
+ xfce_titled_dialog_new_with_buttons (_("Add New Items"), NULL,
GTK_DIALOG_NO_SEPARATOR,
GTK_STOCK_HELP, GTK_RESPONSE_HELP,
GTK_STOCK_CLOSE, GTK_RESPONSE_CANCEL,
GTK_STOCK_ADD, GTK_RESPONSE_OK,
NULL);
- gtk_window_set_icon_name (GTK_WINDOW (dlg), "xfce4-panel");
+ gtk_window_set_icon_name (GTK_WINDOW (dlg), GTK_STOCK_ADD);
g_signal_connect (G_OBJECT (dlg), "response",
G_CALLBACK (item_dialog_response), pid);
@@ -624,46 +623,40 @@
G_CALLBACK (items_dialog_panel_destroyed), pid);
pid->items_box = vbox = gtk_vbox_new (FALSE, BORDER);
- gtk_container_set_border_width (GTK_CONTAINER (vbox), BORDER - 2);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox), BORDER);
gtk_widget_show (vbox);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), vbox, TRUE, TRUE, 0);
/* info */
- hbox = gtk_hbox_new (FALSE, BORDER);
+ hbox = gtk_hbox_new (FALSE, BORDER * 2);
gtk_widget_show (hbox);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 0);
- img = gtk_image_new_from_stock (GTK_STOCK_DIALOG_INFO,
- GTK_ICON_SIZE_LARGE_TOOLBAR);
- gtk_misc_set_alignment (GTK_MISC (img), 0.0f, 0.5f);
+ img = gtk_image_new_from_stock (GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_LARGE_TOOLBAR);
gtk_widget_show (img);
gtk_box_pack_start (GTK_BOX (hbox), img, FALSE, FALSE, 0);
- label = gtk_label_new (_("Drag items from the list to a panel or remove "
+ label = gtk_label_new (_("Drag items from the list to a panel or remove\n"
"them by dragging them back to the list."));
- gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
gtk_misc_set_alignment (GTK_MISC (label), 0.0f, 0.5f);
gtk_widget_show (label);
gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
/* treeview */
- hbox = gtk_hbox_new (FALSE, BORDER);
+ hbox = gtk_hbox_new (FALSE, BORDER * 2);
gtk_widget_show (hbox);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
- label = gtk_label_new (NULL);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 1.0f);
+ label = gtk_label_new_with_mnemonic (_("_Search:"));
+ gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
gtk_widget_show (label);
gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
- markup = g_strdup_printf ("<b>%s</b>", _("Available Items"));
- gtk_label_set_markup (GTK_LABEL (label), markup);
- g_free (markup);
-
/* the list filter entry (FIXME: Add tooltip? Jasper?) */
pid->search_entry = frap_icon_entry_new ();
frap_icon_entry_set_stock_id (FRAP_ICON_ENTRY (pid->search_entry), GTK_STOCK_FIND);
gtk_widget_show (pid->search_entry);
+ gtk_label_set_mnemonic_widget (GTK_LABEL (label), pid->search_entry);
gtk_box_pack_end (GTK_BOX (hbox), pid->search_entry, FALSE, FALSE, 0);
add_item_treeview (pid);
@@ -1012,13 +1005,13 @@
gtk_box_pack_start (GTK_BOX (vbox2), hbox, TRUE, TRUE, 0);
pmd->fixed =
- gtk_radio_button_new_with_label (NULL, _("Fixed Position"));
+ gtk_radio_button_new_with_mnemonic (NULL, _("_Fixed position"));
gtk_widget_show (pmd->fixed);
gtk_box_pack_start (GTK_BOX (hbox), pmd->fixed, FALSE, FALSE, 0);
pmd->floating =
- gtk_radio_button_new_with_label_from_widget (
- GTK_RADIO_BUTTON (pmd->fixed), _("Freely Moveable"));
+ gtk_radio_button_new_with_mnemonic_from_widget (
+ GTK_RADIO_BUTTON (pmd->fixed), _("Freely _moveable"));
gtk_widget_show (pmd->floating);
gtk_box_pack_start (GTK_BOX (hbox), pmd->floating, FALSE, FALSE, 0);
@@ -1415,7 +1408,7 @@
gtk_widget_show (hbox);
gtk_box_pack_start (GTK_BOX (table), hbox, FALSE, FALSE, 0);
- label = gtk_label_new (_("Size (pixels):"));
+ label = gtk_label_new_with_mnemonic (_("_Size (pixels):"));
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
gtk_widget_show (label);
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
@@ -1423,6 +1416,7 @@
pmd->size = gtk_hscale_new_with_range (MIN_SIZE, MAX_SIZE, 2);
gtk_scale_set_value_pos (GTK_SCALE (pmd->size), GTK_POS_LEFT);
+ gtk_label_set_mnemonic_widget (GTK_LABEL (label), pmd->size);
gtk_range_set_update_policy (GTK_RANGE (pmd->size), GTK_UPDATE_DELAYED);
gtk_widget_show (pmd->size);
gtk_box_pack_start (GTK_BOX (hbox), pmd->size, TRUE, TRUE, 0);
@@ -1445,7 +1439,7 @@
gtk_widget_show (hbox);
gtk_box_pack_start (GTK_BOX (table), hbox, FALSE, FALSE, 0);
- label = gtk_label_new (_("Transparency (%):"));
+ label = gtk_label_new_with_mnemonic (_("_Transparency (%):"));
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
gtk_widget_show (label);
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
@@ -1453,6 +1447,7 @@
pmd->transparency = gtk_hscale_new_with_range (0, 100, 5);
gtk_scale_set_value_pos (GTK_SCALE (pmd->transparency), GTK_POS_LEFT);
+ gtk_label_set_mnemonic_widget (GTK_LABEL (label), pmd->transparency);
gtk_range_set_update_policy (GTK_RANGE (pmd->transparency),
GTK_UPDATE_DELAYED);
gtk_widget_show (pmd->transparency);
@@ -1470,8 +1465,7 @@
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
gtk_size_group_add_widget (size_group, label);
- pmd->activetrans =
- gtk_check_button_new_with_label (_("Make active panel opaque"));
+ pmd->activetrans = gtk_check_button_new_with_mnemonic (_("Make active panel _opaque"));
gtk_widget_show (pmd->activetrans);
gtk_box_pack_start (GTK_BOX (hbox), pmd->activetrans, TRUE, TRUE, 0);
@@ -1618,7 +1612,7 @@
gtk_widget_show (img);
gtk_container_add (GTK_CONTAINER (pmd->rm_panel), img);
- gtk_tooltips_set_tip (pmd->tips, pmd->rm_panel, _("Remove Panel"), NULL);
+ gtk_tooltips_set_tip (pmd->tips, pmd->rm_panel, _("Remove the currently selected panel"), NULL);
g_signal_connect (G_OBJECT (pmd->rm_panel), "clicked",
G_CALLBACK (remove_panel), pmd);
@@ -1631,7 +1625,7 @@
gtk_widget_show (img);
gtk_container_add (GTK_CONTAINER (pmd->add_panel), img);
- gtk_tooltips_set_tip (pmd->tips, pmd->add_panel, _("New Panel"), NULL);
+ gtk_tooltips_set_tip (pmd->tips, pmd->add_panel, _("Add a new panel"), NULL);
g_signal_connect (G_OBJECT (pmd->add_panel), "clicked",
G_CALLBACK (add_panel), pmd);
@@ -1672,7 +1666,7 @@
panel_manager_dialog (GPtrArray *panels)
{
PanelManagerDialog *pmd;
- GtkWidget *vbox, *sel;
+ GtkWidget *vbox, *sel, *separator;
Panel *panel;
if (panel_dialog_widget)
@@ -1691,22 +1685,23 @@
/* main dialog widget */
panel_dialog_widget = pmd->dlg =
- xfce_titled_dialog_new_with_buttons (_("Panel Manager"), NULL,
+ xfce_titled_dialog_new_with_buttons (_("Panel"), NULL,
GTK_DIALOG_NO_SEPARATOR,
GTK_STOCK_HELP, GTK_RESPONSE_HELP,
GTK_STOCK_CLOSE, GTK_RESPONSE_OK,
NULL);
gtk_dialog_set_default_response (GTK_DIALOG (pmd->dlg), GTK_RESPONSE_OK);
gtk_window_set_icon_name (GTK_WINDOW (pmd->dlg), "xfce4-panel");
+ xfce_titled_dialog_set_subtitle (XFCE_TITLED_DIALOG (panel_dialog_widget), _("Customize the panel settings"));
pmd->tips = gtk_tooltips_new ();
g_object_ref (G_OBJECT (pmd->tips));
gtk_object_sink (GTK_OBJECT (pmd->tips));
/* main container */
- vbox = gtk_vbox_new (FALSE, 8);
+ vbox = gtk_vbox_new (FALSE, 6);
gtk_widget_show (vbox);
- gtk_container_set_border_width (GTK_CONTAINER (vbox), BORDER - 2);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox), BORDER);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (pmd->dlg)->vbox), vbox,
TRUE, TRUE, 0);
@@ -1716,6 +1711,10 @@
sel = create_panel_selector (pmd);
gtk_widget_show (sel);
gtk_box_pack_start (GTK_BOX (vbox), sel, FALSE, FALSE, 0);
+
+ separator = gtk_hseparator_new ();
+ gtk_box_pack_start (GTK_BOX (vbox), separator, FALSE, FALSE, 0);
+ gtk_widget_show (separator);
/* appearance */
add_appearance_options (GTK_BOX (vbox), pmd);
Modified: xfce4-panel/trunk/panel/panel.c
===================================================================
--- xfce4-panel/trunk/panel/panel.c 2009-01-02 14:55:30 UTC (rev 29081)
+++ xfce4-panel/trunk/panel/panel.c 2009-01-02 16:25:45 UTC (rev 29082)
@@ -592,7 +592,7 @@
if (xfce_allow_panel_customization ())
{
- mi = gtk_image_menu_item_new_with_label (_("Customize Panel"));
+ mi = gtk_image_menu_item_new_with_label (_("Customize Panel..."));
gtk_widget_show (mi);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
@@ -603,7 +603,7 @@
g_signal_connect (mi, "activate", G_CALLBACK (panel_app_customize),
NULL);
- mi = gtk_image_menu_item_new_with_label (_("Add Items"));
+ mi = gtk_image_menu_item_new_with_label (_("Add New Items..."));
gtk_widget_show (mi);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
Modified: xfce4-panel/trunk/plugins/actions/actions.c
===================================================================
--- xfce4-panel/trunk/plugins/actions/actions.c 2009-01-02 14:55:30 UTC (rev 29081)
+++ xfce4-panel/trunk/plugins/actions/actions.c 2009-01-02 16:25:45 UTC (rev 29082)
@@ -414,7 +414,7 @@
xfce_panel_plugin_block_menu (plugin);
- dlg = xfce_titled_dialog_new_with_buttons (_("Panel Actions"), NULL,
+ dlg = xfce_titled_dialog_new_with_buttons (_("Action Buttons"), NULL,
GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR,
GTK_STOCK_CLOSE, GTK_RESPONSE_OK,
NULL);
@@ -425,31 +425,30 @@
g_object_set_data (G_OBJECT (plugin), "dialog", dlg);
gtk_window_set_position (GTK_WINDOW (dlg), GTK_WIN_POS_CENTER);
- gtk_window_set_icon_name (GTK_WINDOW (dlg), "xfce4-settings");
+ gtk_window_set_icon_name (GTK_WINDOW (dlg), GTK_STOCK_PROPERTIES);
g_signal_connect (dlg, "response", G_CALLBACK (actions_dialog_response),
action);
-
- gtk_container_set_border_width (GTK_CONTAINER (dlg), 2);
sg = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
- vbox = gtk_vbox_new (FALSE, 8);
+ vbox = gtk_vbox_new (FALSE, 6);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 6);
gtk_widget_show (vbox);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), vbox,
TRUE, TRUE, 0);
- hbox = gtk_hbox_new (FALSE, 8);
+ hbox = gtk_hbox_new (FALSE, 12);
gtk_widget_show (hbox);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
- label = gtk_label_new (_("Select action type:"));
+ label = gtk_label_new_with_mnemonic (_("_Select action type:"));
gtk_widget_show (label);
gtk_size_group_add_widget (sg, label);
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
box = gtk_combo_box_new_text ();
+ gtk_label_set_mnemonic_widget (GTK_LABEL (label), box);
gtk_widget_show (box);
gtk_box_pack_start (GTK_BOX (hbox), box, TRUE, TRUE, 0);
@@ -462,17 +461,18 @@
g_signal_connect (box, "changed", G_CALLBACK (action_type_changed),
action);
- hbox = gtk_hbox_new (FALSE, 8);
+ hbox = gtk_hbox_new (FALSE, 12);
gtk_widget_show (hbox);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
- label = gtk_label_new (_("Orientation:"));
+ label = gtk_label_new_with_mnemonic (_("_Orientation:"));
gtk_widget_show (label);
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
gtk_size_group_add_widget (sg, label);
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
box2 = action->box = gtk_combo_box_new_text ();
+ gtk_label_set_mnemonic_widget (GTK_LABEL (label), box2);
gtk_widget_show (box2);
gtk_box_pack_start (GTK_BOX (hbox), box2, TRUE, TRUE, 0);
Modified: xfce4-panel/trunk/plugins/clock/clock-dialog.c
===================================================================
--- xfce4-panel/trunk/plugins/clock/clock-dialog.c 2009-01-02 14:55:30 UTC (rev 29081)
+++ xfce4-panel/trunk/plugins/clock/clock-dialog.c 2009-01-02 16:25:45 UTC (rev 29082)
@@ -402,7 +402,7 @@
gtk_container_foreach (GTK_CONTAINER (bin), (GtkCallback) gtk_widget_destroy, NULL);
/* main vbox */
- vbox = gtk_vbox_new (FALSE, 8);
+ vbox = gtk_vbox_new (FALSE, 6);
gtk_container_add (GTK_CONTAINER (bin), vbox);
gtk_widget_show (vbox);
@@ -487,13 +487,13 @@
NULL);
gtk_window_set_screen (GTK_WINDOW (dialog), gtk_widget_get_screen (GTK_WIDGET (plugin->plugin)));
gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER);
- gtk_window_set_icon_name (GTK_WINDOW (dialog), "xfce4-settings");
+ gtk_window_set_icon_name (GTK_WINDOW (dialog), GTK_STOCK_PROPERTIES);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CLOSE);
g_object_set_data (G_OBJECT (plugin->plugin), I_("configure-dialog"), dialog);
g_signal_connect (G_OBJECT (dialog), "response", G_CALLBACK (xfce_clock_dialog_response), plugin);
/* main vbox */
- dialog_vbox = gtk_vbox_new (FALSE, 8);
+ dialog_vbox = gtk_vbox_new (FALSE, 6);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), dialog_vbox, TRUE, TRUE, 0);
gtk_container_set_border_width (GTK_CONTAINER (dialog_vbox), 6);
gtk_widget_show (dialog_vbox);
@@ -503,7 +503,7 @@
gtk_box_pack_start (GTK_BOX (dialog_vbox), frame, FALSE, TRUE, 0);
gtk_widget_show (frame);
- vbox = gtk_vbox_new (FALSE, 8);
+ vbox = gtk_vbox_new (FALSE, 6);
gtk_container_add (GTK_CONTAINER (bin), vbox);
gtk_widget_show (vbox);
@@ -528,7 +528,7 @@
gtk_box_pack_start (GTK_BOX (dialog_vbox), frame, FALSE, TRUE, 0);
gtk_widget_show (frame);
- vbox = gtk_vbox_new (FALSE, 8);
+ vbox = gtk_vbox_new (FALSE, 6);
gtk_container_add (GTK_CONTAINER (bin), vbox);
gtk_widget_show (vbox);
Modified: xfce4-panel/trunk/plugins/iconbox/iconbox.c
===================================================================
--- xfce4-panel/trunk/plugins/iconbox/iconbox.c 2009-01-02 14:55:30 UTC (rev 29081)
+++ xfce4-panel/trunk/plugins/iconbox/iconbox.c 2009-01-02 16:25:45 UTC (rev 29082)
@@ -914,21 +914,19 @@
g_object_set_data (G_OBJECT (plugin), "dialog", dlg);
gtk_window_set_position (GTK_WINDOW (dlg), GTK_WIN_POS_CENTER);
- gtk_window_set_icon_name (GTK_WINDOW (dlg), "xfce4-settings");
+ gtk_window_set_icon_name (GTK_WINDOW (dlg), GTK_STOCK_PROPERTIES);
g_signal_connect (dlg, "response", G_CALLBACK (iconbox_dialog_response),
iconbox);
- gtk_container_set_border_width (GTK_CONTAINER (dlg), 2);
-
- vbox = gtk_vbox_new (FALSE, 8);
+ vbox = gtk_vbox_new (FALSE, 6);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 6);
gtk_widget_show (vbox);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), vbox,
TRUE, TRUE, 0);
cb = gtk_check_button_new_with_mnemonic (
- _("Only show minimized applications"));
+ _("Only show _minimized applications"));
gtk_widget_show (cb);
gtk_box_pack_start (GTK_BOX (vbox), cb, FALSE, FALSE, 0);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (cb),
@@ -937,7 +935,7 @@
iconbox);
cb = gtk_check_button_new_with_mnemonic (
- _("Show applications of all workspaces"));
+ _("Show applications of _all workspaces"));
gtk_widget_show (cb);
gtk_box_pack_start (GTK_BOX (vbox), cb, FALSE, FALSE, 0);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (cb),
@@ -945,7 +943,7 @@
g_signal_connect (cb, "toggled", G_CALLBACK (all_workspaces_toggled),
iconbox);
- cb = gtk_check_button_new_with_mnemonic (_("Use all available space"));
+ cb = gtk_check_button_new_with_mnemonic (_("Use all available _space"));
gtk_widget_show (cb);
gtk_box_pack_start (GTK_BOX (vbox), cb, FALSE, FALSE, 0);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (cb),
Modified: xfce4-panel/trunk/plugins/launcher/launcher-dialog.c
===================================================================
--- xfce4-panel/trunk/plugins/launcher/launcher-dialog.c 2009-01-02 14:55:30 UTC (rev 29081)
+++ xfce4-panel/trunk/plugins/launcher/launcher-dialog.c 2009-01-02 16:25:45 UTC (rev 29082)
@@ -113,7 +113,6 @@
LauncherDialog *ld);
static void launcher_dialog_update_entries (LauncherDialog *ld);
static void launcher_dialog_update_icon (LauncherDialog *ld);
-static void launcher_dialog_folder_chooser (LauncherDialog *ld);
static void launcher_dialog_command_chooser (LauncherDialog *ld);
static void launcher_dialog_icon_chooser (LauncherDialog *ld);
static void launcher_dialog_tree_update_row (LauncherDialog *ld,
@@ -446,42 +445,54 @@
LauncherDialog *ld)
{
const gchar *text;
+ gchar *filename;
/* quit if locked or no active entry set */
if (G_UNLIKELY (ld->updating == TRUE || ld->entry == NULL))
return;
- /* get entry text */
- text = gtk_entry_get_text (GTK_ENTRY (entry));
-
- /* set text to null, if there is no valid text */
- if (G_UNLIKELY (text == NULL || *text == '\0'))
- text = NULL;
-
- /* save new value */
- if (entry == ld->entry_name)
+ /* handle working directory changes */
+ if (entry == ld->entry_path)
{
- g_free (ld->entry->name);
- ld->entry->name = g_strdup (text);
-
- /* update tree, when triggered by widget */
- launcher_dialog_tree_update_row (ld, COLUMN_NAME);
+ filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (ld->entry_path));
+ if (exo_str_is_equal (ld->entry->path, filename) == FALSE)
+ {
+ g_free (ld->entry->path);
+ ld->entry->path = filename;
+ }
+ else
+ {
+ g_free (filename);
+ return;
+ }
}
- else if (entry == ld->entry_comment)
+ else
{
- g_free (ld->entry->comment);
- ld->entry->comment = g_strdup (text);
+ /* set text to null, if there is no valid text */
+ text = gtk_entry_get_text (GTK_ENTRY (entry));
+ if (G_UNLIKELY (text == NULL || *text == '\0'))
+ text = NULL;
+
+ /* save new value */
+ if (entry == ld->entry_name)
+ {
+ g_free (ld->entry->name);
+ ld->entry->name = g_strdup (text);
+
+ /* update tree, when triggered by widget */
+ launcher_dialog_tree_update_row (ld, COLUMN_NAME);
+ }
+ else if (entry == ld->entry_comment)
+ {
+ g_free (ld->entry->comment);
+ ld->entry->comment = g_strdup (text);
+ }
+ else if (entry == ld->entry_exec)
+ {
+ g_free (ld->entry->exec);
+ ld->entry->exec = text ? xfce_expand_variables (text, NULL) : NULL;
+ }
}
- else if (entry == ld->entry_exec)
- {
- g_free (ld->entry->exec);
- ld->entry->exec = text ? xfce_expand_variables (text, NULL) : NULL;
- }
- else if (entry == ld->entry_path)
- {
- g_free (ld->entry->path);
- ld->entry->path = text ? xfce_expand_variables (text, NULL) : NULL;
- }
/* update panel */
launcher_plugin_rebuild (ld->launcher, FALSE);
@@ -521,6 +532,8 @@
static void
launcher_dialog_update_entries (LauncherDialog *ld)
{
+ gchar *dir;
+
/* quit if locked or no active entry set */
if (G_UNLIKELY (ld->updating == TRUE || ld->entry == NULL))
return;
@@ -538,9 +551,16 @@
gtk_entry_set_text (GTK_ENTRY (ld->entry_exec),
(ld->entry->exec != NULL) ? ld->entry->exec : "");
- gtk_entry_set_text (GTK_ENTRY (ld->entry_path),
- (ld->entry->path != NULL) ? ld->entry->path : "");
+ if (ld->entry->path != NULL)
+ dir = ld->entry->path;
+ else
+ dir = g_get_current_dir ();
+ gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (ld->entry_path), dir);
+
+ if (dir != ld->entry->path)
+ g_free (dir);
+
/* set toggle buttons */
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (ld->entry_terminal),
ld->entry->terminal);
@@ -601,48 +621,6 @@
* Icon and command search dialogs
**/
static void
-launcher_dialog_folder_chooser (LauncherDialog *ld)
-{
- GtkWidget *chooser;
- gchar *path;
-
- chooser = gtk_file_chooser_dialog_new (_("Select a Directory"),
- GTK_WINDOW (gtk_widget_get_toplevel (ld->treeview)),
- GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
- NULL);
-
- /* only here */
- gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (chooser), TRUE);
-
- /* use the bindir as default folder */
- gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (chooser), BINDIR);
-
- /* select folder from field */
- if (G_LIKELY (ld->entry->path != NULL))
- {
- if (G_LIKELY (g_path_is_absolute (ld->entry->path)))
- gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (chooser), ld->entry->path);
- }
-
- /* run the chooser dialog */
- if (gtk_dialog_run (GTK_DIALOG (chooser)) == GTK_RESPONSE_ACCEPT)
- {
- path = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (chooser));
-
- /* set the new entry text */
- gtk_entry_set_text (GTK_ENTRY (ld->entry_path), path);
-
- /* cleanup */
- g_free (path);
- }
-
- /* destroy dialog */
- gtk_widget_destroy (chooser);
-}
-
-static void
launcher_dialog_command_chooser (LauncherDialog *ld)
{
GtkFileFilter *filter;
@@ -1139,10 +1117,10 @@
sg = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
/* entry name field */
- hbox = gtk_hbox_new (FALSE, BORDER);
+ hbox = gtk_hbox_new (FALSE, BORDER * 2);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
- label = gtk_label_new_with_mnemonic (_("_Name"));
+ label = gtk_label_new_with_mnemonic (_("_Name:"));
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
@@ -1157,10 +1135,10 @@
G_CALLBACK (launcher_dialog_save_entry), ld);
/* entry comment field */
- hbox = gtk_hbox_new (FALSE, BORDER);
+ hbox = gtk_hbox_new (FALSE, BORDER * 2);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
- label = gtk_label_new_with_mnemonic (_("_Description"));
+ label = gtk_label_new_with_mnemonic (_("_Description:"));
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
@@ -1176,10 +1154,10 @@
G_CALLBACK (launcher_dialog_save_entry), ld);
/* entry icon chooser button */
- hbox = gtk_hbox_new (FALSE, BORDER);
+ hbox = gtk_hbox_new (FALSE, BORDER * 2);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
- label = gtk_label_new_with_mnemonic (_("_Icon"));
+ label = gtk_label_new_with_mnemonic (_("_Icon:"));
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
@@ -1194,10 +1172,10 @@
G_CALLBACK (launcher_dialog_icon_chooser), ld);
/* entry command field and button */
- hbox = gtk_hbox_new (FALSE, BORDER);
+ hbox = gtk_hbox_new (FALSE, BORDER * 2);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
- label = gtk_label_new_with_mnemonic (_("Co_mmand"));
+ label = gtk_label_new_with_mnemonic (_("Co_mmand:"));
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
@@ -1221,34 +1199,29 @@
gtk_container_add (GTK_CONTAINER (button), image);
/* working directory field */
- hbox = gtk_hbox_new (FALSE, BORDER);
+ hbox = gtk_hbox_new (FALSE, BORDER * 2);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
- label = gtk_label_new_with_mnemonic (_("_Working Directory"));
+ label = gtk_label_new_with_mnemonic (_("_Working Directory:"));
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
gtk_size_group_add_widget (sg, label);
- ld->entry_path = gtk_entry_new ();
+ ld->entry_path = gtk_file_chooser_button_new (_("Select a Working Directory"), GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
gtk_box_pack_start (GTK_BOX (hbox), ld->entry_path, TRUE, TRUE, 0);
-
gtk_label_set_mnemonic_widget (GTK_LABEL (label), ld->entry_path);
- g_signal_connect (G_OBJECT (ld->entry_path), "changed",
+#if 0 /* GTK_CHECK_VERSION (2, 12, 0) */
+ g_signal_connect (G_OBJECT (ld->entry_path), "file-set",
G_CALLBACK (launcher_dialog_save_entry), ld);
+#else
+ g_signal_connect (G_OBJECT (ld->entry_path), "selection-changed",
+ G_CALLBACK (launcher_dialog_save_entry), ld);
+#endif
- button = gtk_button_new ();
- gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
-
- g_signal_connect_swapped (G_OBJECT (button), "clicked",
- G_CALLBACK (launcher_dialog_folder_chooser), ld);
-
- image = gtk_image_new_from_stock (GTK_STOCK_OPEN, GTK_ICON_SIZE_MENU);
- gtk_container_add (GTK_CONTAINER (button), image);
-
/* entry terminal toggle button with spacer */
- hbox = gtk_hbox_new (FALSE, BORDER);
+ hbox = gtk_hbox_new (FALSE, BORDER * 2);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
label = gtk_alignment_new (0, 0, 0, 0);
@@ -1264,7 +1237,7 @@
#ifdef HAVE_LIBSTARTUP_NOTIFICATION
/* startup notification */
- hbox = gtk_hbox_new (FALSE, BORDER);
+ hbox = gtk_hbox_new (FALSE, BORDER * 2);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
label = gtk_alignment_new (0, 0, 0, 0);
@@ -1548,7 +1521,7 @@
launcher->move_first = FALSE;
/* create new dialog */
- dialog = xfce_titled_dialog_new_with_buttons (_("Program Launcher"),
+ dialog = xfce_titled_dialog_new_with_buttons (_("Launcher"),
NULL,
GTK_DIALOG_NO_SEPARATOR,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
@@ -1556,7 +1529,7 @@
NULL);
gtk_window_set_screen (GTK_WINDOW (dialog), gtk_widget_get_screen (GTK_WIDGET (launcher->panel_plugin)));
gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER);
- gtk_window_set_icon_name (GTK_WINDOW (dialog), "xfce4-settings");
+ gtk_window_set_icon_name (GTK_WINDOW (dialog), GTK_STOCK_PROPERTIES);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
/* connect dialog to plugin, so we can destroy it when plugin is closed */
@@ -1567,7 +1540,7 @@
/* added the horizontal panes */
paned = gtk_hpaned_new ();
gtk_box_pack_start (GTK_BOX (dialog_vbox), paned, TRUE, TRUE, 0);
- gtk_container_set_border_width (GTK_CONTAINER (paned), BORDER - 2);
+ gtk_container_set_border_width (GTK_CONTAINER (paned), BORDER);
vbox = gtk_vbox_new (FALSE, BORDER);
gtk_paned_pack1 (GTK_PANED (paned), vbox, FALSE, FALSE);
Modified: xfce4-panel/trunk/plugins/launcher/launcher.h
===================================================================
--- xfce4-panel/trunk/plugins/launcher/launcher.h 2009-01-02 14:55:30 UTC (rev 29081)
+++ xfce4-panel/trunk/plugins/launcher/launcher.h 2009-01-02 16:25:45 UTC (rev 29082)
@@ -25,7 +25,7 @@
#include <exo/exo.h>
#include <libxfce4panel/xfce-panel-plugin.h>
-#define BORDER (8)
+#define BORDER (6)
#define LAUNCHER_NEW_TOOLTIP_API (GTK_CHECK_VERSION (2,11,6))
#define LAUNCHER_ARROW_SIZE (16)
#define LAUNCHER_POPUP_DELAY (225)
Modified: xfce4-panel/trunk/plugins/pager/pager.c
===================================================================
--- xfce4-panel/trunk/plugins/pager/pager.c 2009-01-02 14:55:30 UTC (rev 29081)
+++ xfce4-panel/trunk/plugins/pager/pager.c 2009-01-02 16:25:45 UTC (rev 29082)
@@ -376,57 +376,46 @@
g_object_set_data (G_OBJECT (plugin), "dialog", dlg);
gtk_window_set_position (GTK_WINDOW (dlg), GTK_WIN_POS_CENTER);
- gtk_window_set_icon_name (GTK_WINDOW (dlg), "xfce4-settings");
+ gtk_window_set_icon_name (GTK_WINDOW (dlg), GTK_STOCK_PROPERTIES);
g_signal_connect (dlg, "response", G_CALLBACK (pager_dialog_response),
pager);
- gtk_container_set_border_width (GTK_CONTAINER (dlg), 2);
-
- vbox = gtk_vbox_new (FALSE, 8);
+ vbox = gtk_vbox_new (FALSE, 6);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 6);
gtk_widget_show (vbox);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), vbox,
TRUE, TRUE, 0);
- hbox = gtk_hbox_new (FALSE, 8);
+ hbox = gtk_hbox_new (FALSE, 6);
gtk_widget_show (hbox);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
if (xfce_panel_plugin_get_orientation (plugin) ==
GTK_ORIENTATION_HORIZONTAL)
{
- label = gtk_label_new (_("Number of rows:"));
+ label = gtk_label_new_with_mnemonic (_("Number _of rows:"));
}
else
{
- label = gtk_label_new (_("Number of columns:"));
+ label = gtk_label_new_with_mnemonic (_("Number _of columns:"));
}
gtk_widget_show (label);
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
max = wnck_screen_get_workspace_count (pager->screen);
- if (max > 1)
- {
- spin = gtk_spin_button_new_with_range (1, max, 1);
- gtk_widget_show (spin);
- gtk_box_pack_start (GTK_BOX (hbox), spin, FALSE, FALSE, 0);
+ spin = gtk_spin_button_new_with_range (1, max, 1);
+ gtk_widget_show (spin);
+ gtk_box_pack_start (GTK_BOX (hbox), spin, FALSE, FALSE, 0);
+ gtk_label_set_mnemonic_widget (GTK_LABEL (label), spin);
- gtk_spin_button_set_value (GTK_SPIN_BUTTON (spin), pager->rows);
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (spin), pager->rows);
- g_signal_connect (spin, "value-changed", G_CALLBACK (rows_changed),
- pager);
- }
- else
- {
- label = gtk_label_new ("1");
+ g_signal_connect (spin, "value-changed", G_CALLBACK (rows_changed),
+ pager);
- gtk_widget_show (label);
- gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
- }
-
- scrolling = gtk_check_button_new_with_mnemonic (_("Switch workspaces using the mouse wheel"));
+ scrolling = gtk_check_button_new_with_mnemonic (_("Switch workspaces using the mouse _wheel"));
gtk_widget_show (scrolling);
gtk_box_pack_start (GTK_BOX (vbox), scrolling, FALSE, FALSE, 0);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (scrolling), pager->scrolling);
@@ -434,7 +423,7 @@
g_signal_connect (scrolling, "toggled",
G_CALLBACK (workspace_scrolling_toggled), pager);
- show_names = gtk_check_button_new_with_mnemonic (_("Show workspace names"));
+ show_names = gtk_check_button_new_with_mnemonic (_("Show workspace _names"));
gtk_widget_show (show_names);
gtk_box_pack_start (GTK_BOX (vbox), show_names, FALSE, FALSE, 0);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (show_names), pager->show_names);
Modified: xfce4-panel/trunk/plugins/separator/separator.c
===================================================================
--- xfce4-panel/trunk/plugins/separator/separator.c 2009-01-02 14:55:30 UTC (rev 29081)
+++ xfce4-panel/trunk/plugins/separator/separator.c 2009-01-02 16:25:45 UTC (rev 29082)
@@ -417,14 +417,12 @@
g_object_set_data (G_OBJECT (plugin), "dialog", dlg);
gtk_window_set_position (GTK_WINDOW (dlg), GTK_WIN_POS_CENTER);
- gtk_window_set_icon_name (GTK_WINDOW (dlg), "xfce4-settings");
+ gtk_window_set_icon_name (GTK_WINDOW (dlg), GTK_STOCK_PROPERTIES);
g_signal_connect (dlg, "response", G_CALLBACK (separator_dialog_response),
sep);
- gtk_container_set_border_width (GTK_CONTAINER (dlg), 2);
-
- vbox = gtk_vbox_new (FALSE, 4);
+ vbox = gtk_vbox_new (FALSE, 6);
gtk_widget_show (vbox);
frame = xfce_create_framebox_with_content(_("Separator Style"), vbox);
@@ -434,7 +432,7 @@
TRUE, TRUE, 0);
/* space */
- tb = gtk_radio_button_new_with_mnemonic (NULL, _("_Empty Space"));
+ tb = gtk_radio_button_new_with_mnemonic (NULL, _("_Empty space"));
gtk_widget_show (tb);
gtk_box_pack_start (GTK_BOX (vbox), tb, FALSE, FALSE, 0);
if (sep->type == SEP_SPACE)
@@ -443,7 +441,7 @@
/* expand */
tb = gtk_radio_button_new_with_mnemonic_from_widget (
- GTK_RADIO_BUTTON(tb), _("_Expanding Empty Space"));
+ GTK_RADIO_BUTTON(tb), _("E_xpanding empty space"));
gtk_widget_show (tb);
gtk_box_pack_start (GTK_BOX (vbox), tb, FALSE, FALSE, 0);
if (sep->type == SEP_EXPAND)
Modified: xfce4-panel/trunk/plugins/systray/systray.desktop.in.in
===================================================================
--- xfce4-panel/trunk/plugins/systray/systray.desktop.in.in 2009-01-02 14:55:30 UTC (rev 29081)
+++ xfce4-panel/trunk/plugins/systray/systray.desktop.in.in 2009-01-02 16:25:45 UTC (rev 29082)
@@ -1,7 +1,7 @@
[Xfce Panel]
Type=X-XFCE-PanelPlugin
Encoding=UTF-8
-_Name=System Tray
+_Name=Notification Area
_Comment=Show notification icons
Icon=xfce4-systray
X-XFCE-Module=systray
Modified: xfce4-panel/trunk/plugins/systray/xfce-tray-dialogs.c
===================================================================
--- xfce4-panel/trunk/plugins/systray/xfce-tray-dialogs.c 2009-01-02 14:55:30 UTC (rev 29081)
+++ xfce4-panel/trunk/plugins/systray/xfce-tray-dialogs.c 2009-01-02 16:25:45 UTC (rev 29082)
@@ -118,10 +118,11 @@
const gchar *p;
const gchar *fallback[][2] =
{
- /* application name , fallback icon name or path */
- { "xfce-mcs-manager", "input-mouse" },
- { "bluetooth-applet", "stock_bluetooth" },
- { "gdl_box", "/opt/google/desktop/resource/gdl_small.png" }
+ /* application name , fallback icon name or path */
+ { "xfce-mcs-manager", "input-mouse" },
+ { "bluetooth-applet", "stock_bluetooth" },
+ { "gdl_box", "/opt/google/desktop/resource/gdl_small.png" },
+ { "networkmanager applet", "network-wireless" }
};
/* return null on no name */
@@ -330,7 +331,7 @@
xfce_panel_plugin_block_menu (plugin->panel_plugin);
/* create dialog */
- dialog = xfce_titled_dialog_new_with_buttons (_("System Tray"),
+ dialog = xfce_titled_dialog_new_with_buttons (_("Notification Area"),
NULL,
GTK_DIALOG_NO_SEPARATOR,
GTK_STOCK_CLEAR, GTK_RESPONSE_YES,
@@ -338,7 +339,7 @@
NULL);
gtk_window_set_screen (GTK_WINDOW (dialog), gtk_widget_get_screen (GTK_WIDGET (plugin->panel_plugin)));
gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER);
- gtk_window_set_icon_name (GTK_WINDOW (dialog), "xfce4-settings");
+ gtk_window_set_icon_name (GTK_WINDOW (dialog), GTK_STOCK_PROPERTIES);
gtk_window_set_default_size (GTK_WINDOW (dialog), 280, 400);
gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
Modified: xfce4-panel/trunk/plugins/tasklist/tasklist-dialogs.c
===================================================================
--- xfce4-panel/trunk/plugins/tasklist/tasklist-dialogs.c 2009-01-02 14:55:30 UTC (rev 29081)
+++ xfce4-panel/trunk/plugins/tasklist/tasklist-dialogs.c 2009-01-02 16:25:45 UTC (rev 29082)
@@ -150,28 +150,26 @@
g_object_set_data (G_OBJECT (tasklist->panel_plugin), I_("dialog"), dlg);
gtk_window_set_position (GTK_WINDOW (dlg), GTK_WIN_POS_CENTER);
- gtk_window_set_icon_name (GTK_WINDOW (dlg), "xfce4-settings");
+ gtk_window_set_icon_name (GTK_WINDOW (dlg), GTK_STOCK_PROPERTIES);
g_signal_connect (G_OBJECT (dlg), "response",
G_CALLBACK (tasklist_dialog_response), tasklist);
- gtk_container_set_border_width (GTK_CONTAINER (dlg), 2);
-
- mainvbox = gtk_vbox_new (FALSE, 8);
- gtk_container_set_border_width (GTK_CONTAINER (mainvbox), 5);
+ mainvbox = gtk_vbox_new (FALSE, 6);
+ gtk_container_set_border_width (GTK_CONTAINER (mainvbox), 6);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), mainvbox,
TRUE, TRUE, 0);
/* Size */
- vbox = gtk_vbox_new (FALSE, 8);
+ vbox = gtk_vbox_new (FALSE, 6);
frame = xfce_create_framebox_with_content (_("Appearance"), vbox);
gtk_box_pack_start (GTK_BOX (mainvbox), frame, FALSE, FALSE, 0);
- hbox = gtk_hbox_new (FALSE, 8);
+ hbox = gtk_hbox_new (FALSE, 12);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
- label = gtk_label_new (_("Minimum Width:"));
+ label = gtk_label_new_with_mnemonic (_("_Minimum width:"));
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
@@ -179,32 +177,33 @@
spin = gtk_spin_button_new_with_range (100, 4000, 10);
gtk_box_pack_start (GTK_BOX (hbox), spin, FALSE, FALSE, 0);
gtk_spin_button_set_value (GTK_SPIN_BUTTON (spin), tasklist->width);
+ gtk_label_set_mnemonic_widget (GTK_LABEL (label), spin);
g_signal_connect (G_OBJECT (spin), "value-changed",
G_CALLBACK (tasklist_width_changed), tasklist);
if (tasklist_using_xinerama (tasklist->panel_plugin))
{
- cb = gtk_check_button_new_with_mnemonic (_("Use all available space"));
+ cb = gtk_check_button_new_with_mnemonic (_("Use all available _space"));
gtk_box_pack_start (GTK_BOX (vbox), cb, FALSE, FALSE, 0);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (cb), tasklist->expand);
g_signal_connect (G_OBJECT (cb), "toggled",
G_CALLBACK (tasklist_expand_toggled), tasklist);
}
- cb = gtk_check_button_new_with_mnemonic (_("Use flat buttons"));
+ cb = gtk_check_button_new_with_mnemonic (_("Use _flat buttons"));
gtk_box_pack_start (GTK_BOX (vbox), cb, FALSE, FALSE, 0);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (cb), tasklist->flat_buttons);
g_signal_connect (G_OBJECT (cb), "toggled",
G_CALLBACK (tasklist_flat_buttons_toggled), tasklist);
- cb = gtk_check_button_new_with_mnemonic (_("Show handle"));
+ cb = gtk_check_button_new_with_mnemonic (_("Show _handle"));
gtk_box_pack_start (GTK_BOX (vbox), cb, FALSE, FALSE, 0);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (cb), tasklist->show_handles);
g_signal_connect (G_OBJECT (cb), "toggled",
G_CALLBACK (tasklist_show_handle_toggled), tasklist);
/* Tasks */
- vbox = gtk_vbox_new (FALSE, 8);
+ vbox = gtk_vbox_new (FALSE, 6);
frame = xfce_create_framebox_with_content (_("Task List"), vbox);
gtk_box_pack_start (GTK_BOX (mainvbox), frame, FALSE, FALSE, 0);
Modified: xfce4-panel/trunk/plugins/windowlist/windowlist-dialog.c
===================================================================
--- xfce4-panel/trunk/plugins/windowlist/windowlist-dialog.c 2009-01-02 14:55:30 UTC (rev 29081)
+++ xfce4-panel/trunk/plugins/windowlist/windowlist-dialog.c 2009-01-02 16:25:45 UTC (rev 29082)
@@ -127,17 +127,15 @@
gtk_widget_get_screen (GTK_WIDGET (plugin)));
gtk_window_set_position (GTK_WINDOW (dlg), GTK_WIN_POS_CENTER);
- gtk_window_set_icon_name (GTK_WINDOW (dlg), "xfce4-settings");
+ gtk_window_set_icon_name (GTK_WINDOW (dlg), GTK_STOCK_PROPERTIES);
- gtk_container_set_border_width (GTK_CONTAINER (dlg), 2);
-
- vbox = gtk_vbox_new (FALSE, BORDER);
- gtk_container_set_border_width (GTK_CONTAINER (vbox), BORDER - 2);
+ vbox = gtk_vbox_new (FALSE, 6);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox), 6);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), vbox,
TRUE, TRUE, 0);
/* Urgency help */
- hbox = gtk_hbox_new (FALSE, 6);
+ hbox = gtk_hbox_new (FALSE, 12);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 0);
image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_INFO,
@@ -213,7 +211,7 @@
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, TRUE, 0);
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE);
- vbox2 = gtk_vbox_new (FALSE, 4);
+ vbox2 = gtk_vbox_new (FALSE, 6);
gtk_container_add (GTK_CONTAINER (alignment), vbox2);
button = wd->show_all_workspaces =
Modified: xfce4-panel/trunk/plugins/windowlist/windowlist.h
===================================================================
--- xfce4-panel/trunk/plugins/windowlist/windowlist.h 2009-01-02 14:55:30 UTC (rev 29081)
+++ xfce4-panel/trunk/plugins/windowlist/windowlist.h 2009-01-02 16:25:45 UTC (rev 29082)
@@ -23,8 +23,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#define BORDER 8
-
#ifndef _WINDOWLIST_H
#define _WINDOWLIST_H
Modified: xfce4-panel/trunk/settings/xfce4-panel-manager.desktop.in
===================================================================
--- xfce4-panel/trunk/settings/xfce4-panel-manager.desktop.in 2009-01-02 14:55:30 UTC (rev 29081)
+++ xfce4-panel/trunk/settings/xfce4-panel-manager.desktop.in 2009-01-02 16:25:45 UTC (rev 29082)
@@ -1,10 +1,10 @@
[Desktop Entry]
Type=Application
Encoding=UTF-8
-_Name=Xfce 4 Panel Manager
+_Name=Panel
_GenericName=Panel Manager
_X-XfceSettingsName=Panel
-_Comment=Customize Panel
+_Comment=Customize the panel settings
Exec=xfce4-panel -c
Icon=xfce4-panel
Terminal=false
More information about the Xfce4-commits
mailing list