[Goodies-commits] r6423 - in xfce4-clipman-plugin/trunk: . panel-plugin
Mike Massonnet
mmassonnet at xfce.org
Fri Jan 9 14:34:29 CET 2009
Author: mmassonnet
Date: 2009-01-09 13:34:29 +0000 (Fri, 09 Jan 2009)
New Revision: 6423
Modified:
xfce4-clipman-plugin/trunk/ChangeLog
xfce4-clipman-plugin/trunk/panel-plugin/clipman-dialogs.c
Log:
- Move everything to the General tab
Modified: xfce4-clipman-plugin/trunk/ChangeLog
===================================================================
--- xfce4-clipman-plugin/trunk/ChangeLog 2009-01-09 13:25:15 UTC (rev 6422)
+++ xfce4-clipman-plugin/trunk/ChangeLog 2009-01-09 13:34:29 UTC (rev 6423)
@@ -1,5 +1,11 @@
2008-01-09 Mike Massonnet <mmassonnet at xfce.org>
+Update the settings dialog.
+
+ - Move everything to the General tab
+
+2008-01-09 Mike Massonnet <mmassonnet at xfce.org>
+
A quick review over the changes.
- Fix g_free(clip) against panel_slice_free(clip)
Modified: xfce4-clipman-plugin/trunk/panel-plugin/clipman-dialogs.c
===================================================================
--- xfce4-clipman-plugin/trunk/panel-plugin/clipman-dialogs.c 2009-01-09 13:25:15 UTC (rev 6422)
+++ xfce4-clipman-plugin/trunk/panel-plugin/clipman-dialogs.c 2009-01-09 13:34:29 UTC (rev 6423)
@@ -2,6 +2,7 @@
*
* Copyright (c) 2006-2007 Nick Schermer <nick at xfce.org>
* Copyright (c) 2008 David Collins <david.8.collins at gmail.com>
+ * Copyright (c) 2009 Mike Massonnet <mmassonnet at xfce.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -60,7 +61,7 @@
result = g_spawn_command_line_async ("exo-open --launch WebBrowser " PLUGIN_WEBSITE, NULL);
if (G_UNLIKELY (result == FALSE))
- g_warning (_("Unable to open the following url: %s"), PLUGIN_WEBSITE);
+ xfce_warn (_("Unable to open the following url: %s"), PLUGIN_WEBSITE);
return;
}
@@ -173,38 +174,13 @@
g_signal_connect (G_OBJECT (button), "toggled",
G_CALLBACK (toggle_button), options);
- button = options->AddSelection = gtk_check_button_new_with_mnemonic (_("_Add selections"));
+ button = options->AddSelection = gtk_check_button_new_with_mnemonic (_("A_dd selections to the history"));
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), clipman->AddSelect);
g_signal_connect (G_OBJECT (button), "toggled",
G_CALLBACK (toggle_button), options);
- label = gtk_label_new (_("<b>General</b>"));
- gtk_frame_set_label_widget (GTK_FRAME (frame), label);
- gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
- gtk_misc_set_padding (GTK_MISC (label), 2, 0);
-
- /**
- * Notebook label
- **/
- label = gtk_label_new (_("General"));
- gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), 0), label);
-
- notebook_vbox = gtk_vbox_new (FALSE, 2);
- gtk_container_add (GTK_CONTAINER (notebook), notebook_vbox);
-
- /**
- * Menu appearance frame
- **/
- frame = gtk_frame_new (NULL);
- gtk_box_pack_start (GTK_BOX (notebook_vbox), frame, FALSE, TRUE, 0);
- gtk_container_set_border_width (GTK_CONTAINER (frame), BORDER-3);
-
- vbox = gtk_vbox_new (FALSE, 2);
- gtk_container_add (GTK_CONTAINER (frame), vbox);
- gtk_container_set_border_width (GTK_CONTAINER (vbox), BORDER);
-
button = options->ItemNumbers = gtk_check_button_new_with_mnemonic (_("_Show item numbers"));
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), clipman->ItemNumbers);
@@ -212,18 +188,12 @@
g_signal_connect (G_OBJECT (button), "toggled",
G_CALLBACK (toggle_button), options);
- label = gtk_label_new (_("<b>Menu Appearance</b>"));
+ label = gtk_label_new (_("<b>General</b>"));
gtk_frame_set_label_widget (GTK_FRAME (frame), label);
gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
gtk_misc_set_padding (GTK_MISC (label), 2, 0);
/**
- * Call some functions
- **/
-
- toggle_button (options->AddSelection, options);
-
- /**
* Numbers frame
**/
frame = gtk_frame_new (NULL);
@@ -285,9 +255,18 @@
gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
gtk_misc_set_padding (GTK_MISC (label), 4, 0);
- label = gtk_label_new (_("Appearance"));
- gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), 1), label);
+ /**
+ * Notebook label
+ **/
+ label = gtk_label_new (_("General"));
+ gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), 0), label);
+ /**
+ * Call some functions
+ **/
+
+ toggle_button (options->AddSelection, options);
+
g_signal_connect(dialog, "response",
G_CALLBACK(clipman_configure_response), options);
More information about the Goodies-commits
mailing list