Author: olivier
Date: 2008-10-20 08:12:47 +0000 (Mon, 20 Oct 2008)
New Revision: 28314
Modified:
xfce4-settings/trunk/ChangeLog
xfce4-settings/trunk/dialogs/keyboard-settings/xfce-keyboard-settings.c
xfce4-settings/trunk/po/xfce4-settings.pot
Log:
Add a dialog box to warn user that the session needs to be restarted when
selecting system defaults.
Modified: xfce4-settings/trunk/ChangeLog
===================================================================
--- xfce4-settings/trunk/ChangeLog 2008-10-19 21:46:10 UTC (rev 28313)
+++ xfce4-settings/trunk/ChangeLog 2008-10-20 08:12:47 UTC (rev 28314)
@@ -1,3 +1,9 @@
+2008-10-20 olivier
+
+ * dialogs/keyboard-settings/xfce-keyboard-settings.c,
+ po/xfce4-settings.pot: Add a dialog box to warn user that the session
+ needs to be restarted when selecting system defaults.
+
2008-10-18 olivier
* dialogs/keyboard-settings/xfce-keyboard-settings.c,
Modified:
xfce4-settings/trunk/dialogs/keyboard-settings/xfce-keyboard-settings.c
===================================================================
--- xfce4-settings/trunk/dialogs/keyboard-settings/xfce-keyboard-settings.c
2008-10-19 21:46:10 UTC (rev 28313)
+++ xfce4-settings/trunk/dialogs/keyboard-settings/xfce-keyboard-settings.c
2008-10-20 08:12:47 UTC (rev 28314)
@@ -392,12 +392,12 @@
/* USe system defaults, ie disable options */
xkb_use_system_default_checkbutton = glade_xml_get_widget
(settings->priv->glade_xml, "xkb_use_system_default_checkbutton");
+ xfconf_g_property_bind (settings->priv->keyboard_layout_channel,
"/Default/XkbDisable", G_TYPE_BOOLEAN,
+ (GObject *) xkb_use_system_default_checkbutton,
"active");
g_signal_connect (G_OBJECT (xkb_use_system_default_checkbutton),
"toggled",
G_CALLBACK (xfce_keyboard_settings_system_default_cb),
settings);
- xfconf_g_property_bind (settings->priv->keyboard_layout_channel,
"/Default/XkbDisable", G_TYPE_BOOLEAN,
- (GObject *) xkb_use_system_default_checkbutton,
"active");
/* Keyboard model combo */
xkb_model_combo = glade_xml_get_widget (settings->priv->glade_xml,
"xkb_model_combo");
@@ -1070,6 +1070,20 @@
gtk_widget_set_sensitive (xkb_model_frame, !use_system_defaults);
gtk_widget_set_sensitive (xkb_layout_frame, !use_system_defaults);
+ if (use_system_defaults)
+ {
+ GtkWidget *warning_dialog;
+
+ warning_dialog = gtk_message_dialog_new (NULL, 0,
+ GTK_MESSAGE_WARNING,
+ GTK_BUTTONS_OK,
+ _("The system defaults will be\n"
+ "restored next time you log in."));
+
+ gtk_window_set_title (GTK_WINDOW (warning_dialog), _("Warning"));
+ gtk_dialog_run (GTK_DIALOG (warning_dialog));
+ gtk_widget_destroy (warning_dialog);
+ }
}
Modified: xfce4-settings/trunk/po/xfce4-settings.pot
===================================================================
--- xfce4-settings/trunk/po/xfce4-settings.pot 2008-10-19 21:46:10 UTC (rev
28313)
+++ xfce4-settings/trunk/po/xfce4-settings.pot 2008-10-20 08:12:47 UTC (rev
28314)
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-19 02:45+0200\n"
+"POT-Creation-Date: 2008-10-20 09:09+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <[EMAIL PROTECTED]>\n"
"Language-Team: LANGUAGE <[EMAIL PROTECTED]>\n"
@@ -731,6 +731,16 @@
msgid "Shortcut command may not be empty."
msgstr ""
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1080
+msgid ""
+"The system defaults will be\n"
+"restored next time you log in."
+msgstr ""
+
+#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1083
+msgid "Warning"
+msgstr ""
+
#: ../dialogs/keyboard-settings/xfce-keyboard-settings.desktop.in.h:4
msgid "Xfce 4 Keyboard Settings"
msgstr ""
@@ -984,8 +994,8 @@
msgid "Value"
msgstr ""
-#: ../xfce4-settings-editor/main_window.c:300
-#: ../xfce4-settings-editor/main_window.c:366
+#: ../xfce4-settings-editor/main_window.c:298
+#: ../xfce4-settings-editor/main_window.c:363
msgid "Empty"
msgstr ""
@@ -1070,26 +1080,26 @@
msgid "Workspace %d"
msgstr ""
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:139
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:147
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:518
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:536
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:137
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:145
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:527
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:545
msgid "Xfce Settings Manager"
msgstr ""
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:140
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:146
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:138
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:144
msgid "Customize your Xfce desktop"
msgstr ""
#. Notify the user that there has been a problem
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:517
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:535
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:526
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:544
#, c-format
msgid "Unable to start \"%s\""
msgstr ""
-#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:582
+#: ../xfce4-settings-manager/xfce-settings-manager-dialog.c:591
#, c-format
msgid "Failed to open the documentation. Reason: %s"
msgstr ""
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
