[Goodies-commits] r6540 - sion/trunk/src
Enrico Troeger
enrico at xfce.org
Sun Jan 25 13:25:44 CET 2009
Author: enrico
Date: 2009-01-25 12:25:43 +0000 (Sun, 25 Jan 2009)
New Revision: 6540
Modified:
sion/trunk/src/preferencesdialog.c
sion/trunk/src/settings.c
sion/trunk/src/window.c
Log:
Rename 'tray' into 'systray'.
Modified: sion/trunk/src/preferencesdialog.c
===================================================================
--- sion/trunk/src/preferencesdialog.c 2009-01-25 11:33:12 UTC (rev 6539)
+++ sion/trunk/src/preferencesdialog.c 2009-01-25 12:25:43 UTC (rev 6540)
@@ -435,7 +435,7 @@
gtk_widget_set_tooltip_text(checkbox, _("Saves the window position and geometry and restores it at the start"));
gtk_box_pack_start(GTK_BOX(frame_vbox), checkbox, FALSE, FALSE, 0);
- checkbox = add_check_button(settings, "show-trayicon", _("Show tray _icon"));
+ checkbox = add_check_button(settings, "show-in-systray", _("Show status _icon in the Notification Area"));
gtk_box_pack_start(GTK_BOX(frame_vbox), checkbox, FALSE, FALSE, 0);
hbox = gtk_hbox_new(FALSE, 6);
Modified: sion/trunk/src/settings.c
===================================================================
--- sion/trunk/src/settings.c 2009-01-25 11:33:12 UTC (rev 6539)
+++ sion/trunk/src/settings.c 2009-01-25 12:25:43 UTC (rev 6540)
@@ -40,7 +40,7 @@
gchar *bookmarks_filename;
gboolean save_geometry;
- gboolean show_trayicon;
+ gboolean show_in_systray;
gboolean show_toolbar;
gint toolbar_style;
gint toolbar_orientation;
@@ -76,7 +76,7 @@
PROP_AUTOCONNECT_INTERVAL,
PROP_SAVE_GEOMETRY,
- PROP_SHOW_TRAYICON,
+ PROP_SHOW_IN_SYSTRAY,
PROP_SHOW_TOOLBAR,
PROP_TOOLBAR_STYLE,
PROP_TOOLBAR_ORIENTATION,
@@ -119,8 +119,8 @@
case PROP_SAVE_GEOMETRY:
priv->save_geometry = g_value_get_boolean(value);
break;
- case PROP_SHOW_TRAYICON:
- priv->show_trayicon = g_value_get_boolean(value);
+ case PROP_SHOW_IN_SYSTRAY:
+ priv->show_in_systray = g_value_get_boolean(value);
break;
case PROP_SHOW_TOOLBAR:
priv->show_toolbar = g_value_get_boolean(value);
@@ -157,8 +157,8 @@
case PROP_SAVE_GEOMETRY:
g_value_set_boolean(value, priv->save_geometry);
break;
- case PROP_SHOW_TRAYICON:
- g_value_set_boolean(value, priv->show_trayicon);
+ case PROP_SHOW_IN_SYSTRAY:
+ g_value_set_boolean(value, priv->show_in_systray);
break;
case PROP_SHOW_TOOLBAR:
g_value_set_boolean(value, priv->show_toolbar);
@@ -206,11 +206,11 @@
TRUE,
G_PARAM_READWRITE));
g_object_class_install_property(gobject_class,
- PROP_SHOW_TRAYICON,
+ PROP_SHOW_IN_SYSTRAY,
g_param_spec_boolean(
- "show-trayicon",
- "show-trayicon",
- "Whether to show the trayicon",
+ "show-in-systray",
+ "show-in-systray",
+ "Whether to show an icon in the notification area",
TRUE,
G_PARAM_READWRITE));
g_object_class_install_property(gobject_class,
@@ -379,7 +379,7 @@
if (priv->geometry != NULL)
g_key_file_set_integer_list(k, SECTION_UI, "geometry", priv->geometry, 5);
g_key_file_set_boolean(k, SECTION_UI, "save_geometry", priv->save_geometry);
- g_key_file_set_boolean(k, SECTION_UI, "show_trayicon", priv->show_trayicon);
+ g_key_file_set_boolean(k, SECTION_UI, "show_in_systray", priv->show_in_systray);
g_key_file_set_boolean(k, SECTION_UI, "show_toolbar", priv->show_toolbar);
g_key_file_set_integer(k, SECTION_UI, "toolbar_style", priv->toolbar_style);
g_key_file_set_integer(k, SECTION_UI, "toolbar_orientation", priv->toolbar_orientation);
@@ -479,7 +479,7 @@
DEFAULT_AUTOCONNECT_INTERVAL);
priv->save_geometry = get_setting_boolean(k, SECTION_UI, "save_geometry", TRUE);
- priv->show_trayicon = get_setting_boolean(k, SECTION_UI, "show_trayicon", TRUE);
+ priv->show_in_systray = get_setting_boolean(k, SECTION_UI, "show_in_systray", TRUE);
priv->show_toolbar = get_setting_boolean(k, SECTION_UI, "show_toolbar", TRUE);
priv->toolbar_style = get_setting_int(k, SECTION_UI, "toolbar_style", -1);
priv->toolbar_orientation = get_setting_int(k, SECTION_UI, "toolbar_orientation", 0);
Modified: sion/trunk/src/window.c
===================================================================
--- sion/trunk/src/window.c 2009-01-25 11:33:12 UTC (rev 6539)
+++ sion/trunk/src/window.c 2009-01-25 12:25:43 UTC (rev 6540)
@@ -72,8 +72,8 @@
GtkActionGroup *action_group;
GtkWidget *toolbar;
- GtkStatusIcon *trayicon;
- GtkWidget *trayicon_popup_menu;
+ GtkStatusIcon *systray_icon;
+ GtkWidget *systray_icon_popup_menu;
guint autoconnect_timeout_id;
};
@@ -128,9 +128,9 @@
static gboolean sion_window_state_event(GtkWidget *widget, GdkEventWindowState *event)
{
SionWindowPrivate *priv = SION_WINDOW_GET_PRIVATE(widget);
- gboolean show_trayicon = sion_settings_get_boolean(priv->settings, "show-trayicon");
+ gboolean show_systray_icon = sion_settings_get_boolean(priv->settings, "show-in-systray");
- if (show_trayicon)
+ if (show_systray_icon)
{
gboolean window_hidden = FALSE;
if (event->changed_mask & GDK_WINDOW_STATE_ICONIFIED)
@@ -148,7 +148,7 @@
window_hidden = FALSE;
}
- if (window_hidden && show_trayicon)
+ if (window_hidden && show_systray_icon)
{
gtk_window_set_skip_taskbar_hint(GTK_WINDOW(widget), TRUE);
}
@@ -192,13 +192,13 @@
sion_settings_set_geometry(priv->settings, geo, 5);
}
gtk_widget_destroy(priv->tree_popup_menu);
- gtk_widget_destroy(priv->trayicon_popup_menu);
+ gtk_widget_destroy(priv->systray_icon_popup_menu);
gtk_widget_destroy(priv->swin_treeview);
gtk_widget_destroy(priv->swin_iconview);
gtk_widget_destroy(priv->toolbar);
g_object_unref(priv->action_group);
- g_object_unref(priv->trayicon);
- g_object_unref(priv->trayicon_popup_menu);
+ g_object_unref(priv->systray_icon);
+ g_object_unref(priv->systray_icon_popup_menu);
g_object_unref(priv->backend_gvfs);
return FALSE;
@@ -227,7 +227,7 @@
}
-static void trayicon_activate_cb(G_GNUC_UNUSED GtkStatusIcon *status_icon, GtkWindow *window)
+static void systray_icon_activate_cb(G_GNUC_UNUSED GtkStatusIcon *status_icon, GtkWindow *window)
{
if (gtk_window_is_active(window))
gtk_widget_hide(GTK_WIDGET(window));
@@ -239,13 +239,13 @@
}
-static void trayicon_popup_menu_cb(G_GNUC_UNUSED GtkStatusIcon *status_icon, guint button,
+static void systray_icon_popup_menu_cb(G_GNUC_UNUSED GtkStatusIcon *status_icon, guint button,
guint activate_time, SionWindow *window)
{
SionWindowPrivate *priv = SION_WINDOW_GET_PRIVATE(window);
if (button == 3)
- gtk_menu_popup(GTK_MENU(priv->trayicon_popup_menu), NULL, NULL, NULL, NULL,
+ gtk_menu_popup(GTK_MENU(priv->systray_icon_popup_menu), NULL, NULL, NULL, NULL,
button, activate_time);
}
@@ -895,11 +895,11 @@
}
-static void sion_window_show_trayicon(SionWindow *window, gboolean show)
+static void sion_window_show_systray_icon(SionWindow *window, gboolean show)
{
SionWindowPrivate *priv = SION_WINDOW_GET_PRIVATE(window);
- gtk_status_icon_set_visible(priv->trayicon, show);
+ gtk_status_icon_set_visible(priv->systray_icon, show);
}
@@ -981,8 +981,8 @@
if (name == g_intern_string("show-toolbar"))
sion_window_show_toolbar(window, g_value_get_boolean(value));
- else if (name == g_intern_string("show-trayicon"))
- sion_window_show_trayicon(window, g_value_get_boolean(value));
+ else if (name == g_intern_string("show-in-systray"))
+ sion_window_show_systray_icon(window, g_value_get_boolean(value));
else if (name == g_intern_string("toolbar-style"))
sion_window_set_toolbar_style(window, g_value_get_int(value));
else if (name == g_intern_string("toolbar-orientation"))
@@ -1024,7 +1024,7 @@
"</menu>"
"</menubar>"
- "<popup name='traymenu'>"
+ "<popup name='systraymenu'>"
"<menuitem action='Connect'/>"
"<menuitem action='Bookmarks'/>"
"<separator/>"
@@ -1245,10 +1245,10 @@
create_ui_elements(window, ui_manager);
menubar = gtk_ui_manager_get_widget(ui_manager, "/menubar");
priv->toolbar = gtk_ui_manager_get_widget(ui_manager, "/toolbar");
- priv->trayicon_popup_menu = gtk_ui_manager_get_widget(ui_manager, "/traymenu");
+ priv->systray_icon_popup_menu = gtk_ui_manager_get_widget(ui_manager, "/systraymenu");
priv->tree_popup_menu = gtk_ui_manager_get_widget(ui_manager, "/treemenu");
/* increase refcount to keep the widgets after the ui manager is destroyed */
- g_object_ref(priv->trayicon_popup_menu);
+ g_object_ref(priv->systray_icon_popup_menu);
g_object_ref(priv->tree_popup_menu);
g_object_ref(priv->toolbar);
g_object_ref(priv->swin_treeview);
@@ -1285,10 +1285,10 @@
gtk_widget_show_all(priv->swin_treeview);
/* Status icon */
- priv->trayicon = gtk_status_icon_new_from_icon_name(sion_window_get_icon_name());
- sion_status_icon_set_tooltip_text(priv->trayicon, _("Sion"));
- g_signal_connect(priv->trayicon, "activate", G_CALLBACK(trayicon_activate_cb), window);
- g_signal_connect(priv->trayicon, "popup-menu", G_CALLBACK(trayicon_popup_menu_cb), window);
+ priv->systray_icon = gtk_status_icon_new_from_icon_name(sion_window_get_icon_name());
+ sion_status_icon_set_tooltip_text(priv->systray_icon, _("Sion"));
+ g_signal_connect(priv->systray_icon, "activate", G_CALLBACK(systray_icon_activate_cb), window);
+ g_signal_connect(priv->systray_icon, "popup-menu", G_CALLBACK(systray_icon_popup_menu_cb), window);
g_object_unref(ui_manager);
}
@@ -1308,7 +1308,7 @@
g_object_set(priv->action_bookmarks, "settings", settings, NULL);
- sion_window_show_trayicon(SION_WINDOW(window), sion_settings_get_boolean(settings, "show-trayicon"));
+ sion_window_show_systray_icon(SION_WINDOW(window), sion_settings_get_boolean(settings, "show-in-systray"));
sion_window_show_toolbar(SION_WINDOW(window), sion_settings_get_boolean(settings, "show-toolbar"));
sion_window_set_toolbar_style(SION_WINDOW(window), sion_settings_get_integer(settings, "toolbar-style"));
sion_window_set_toolbar_orientation(SION_WINDOW(window),
More information about the Goodies-commits
mailing list