Merge lp:~pivanov/xpad/devel into lp:xpad

[Paul Ivanov]

[Paul Ivanov (pivanov)]

I've added a --toggle option

[Michael Terry (mterry)]

Hey, thanks for the code! It looks good in theory, but I haven't yet had time to sit down and look at the patch. Sorry for the late response. I'll try to get to it soon.

[Michael Terry (mterry)]

Looks great! Thanks so much. I've made a minor change to xpad_pad_toggle to not require loading and saving the pad's info extra times:

 void
 xpad_pad_toggle(XpadPad *pad)
 {
- gboolean show = TRUE;
- load_info (pad, &show);
- if (show)
+ if (GTK_WIDGET_VISIBLE (pad))
         xpad_pad_close (pad);
     else
         gtk_widget_show (GTK_WIDGET (pad));
- xpad_pad_save_info (pad);
 }

It's merged now!

review: Approve

=== modified file 'NEWS'
--- NEWS	2009-01-11 16:36:47 +0000
+++ NEWS	2009-04-24 07:22:14 +0000
@@ -1,3 +1,5 @@
+* Added --toggle (between --hide and --show). Patch by Paul Ivanov.
+
 Version 3.1
 * Updated Danish, French, Russian, Spanish, and Swedish translations
 * New Czech, Japanese, and Latvian translations

=== modified file 'doc/xpad.1'
--- doc/xpad.1	2008-09-20 22:56:50 +0000
+++ doc/xpad.1	2009-04-24 07:22:14 +0000
@@ -24,6 +24,9 @@
 .B \-s, \-\-show
 Shows existing pads on startup.
 .TP
+.B \-t, \-\-toggle
+Toggle between showing and hiding each of the existing pads on startup.
+.TP
 .B \-n, \-\-new
 Open a new pad.
 .TP

=== modified file 'src/xpad-app.c'
--- src/xpad-app.c	2008-09-21 00:03:40 +0000
+++ src/xpad-app.c	2009-04-24 07:22:14 +0000
@@ -64,6 +64,7 @@
 static gboolean option_new;
 static gboolean option_hide;
 static gboolean option_show;
+static gboolean option_toggle;
 static gboolean option_version;
 static gboolean option_quit;
 static gchar **option_files;
@@ -772,6 +773,7 @@
 	{"new", 'n', 0, G_OPTION_ARG_NONE, &option_new, N_("Create a new pad on startup even if pads already exist"), NULL},
 	{"hide", 'h', 0, G_OPTION_ARG_NONE, &option_hide, N_("Hide all pads"), NULL},
 	{"show", 's', 0, G_OPTION_ARG_NONE, &option_show, N_("Show all pads"), NULL},
+	{"toggle", 't', 0, G_OPTION_ARG_NONE, &option_toggle, N_("Toggle between show and hide all pads"), NULL},
 	{"new-from-file", 'f', 0, G_OPTION_ARG_FILENAME_ARRAY, &option_files, N_("Create a new pad with the contents of a file"), N_("FILE")},
 	{"quit", 'q', 0, G_OPTION_ARG_NONE, &option_quit, N_("Close all pads"), NULL},
 	{"sm-client-id", 0, G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_STRING, &option_smid, NULL, NULL},
@@ -833,6 +835,7 @@
 	option_smid = NULL;
 	option_hide = FALSE;
 	option_show = FALSE;
+	option_toggle = FALSE;
 	
 	context = g_option_context_new (NULL);
 	g_option_context_set_ignore_unknown_options (context, TRUE);
@@ -855,6 +858,9 @@
 		if (have_gtk && option_hide)
 		  xpad_pad_group_close_all (pad_group);
 		
+		if (have_gtk && option_toggle)
+          xpad_pad_group_toggle_hide (pad_group);
+
 		if (have_gtk && option_files)
 		{
 			int i;
@@ -884,5 +890,5 @@
 	g_option_context_free (context);
 	
 	return(option_new || option_quit || option_smid || option_files ||
-	       option_hide || option_show);
+	       option_hide || option_show || option_toggle);
 }

=== modified file 'src/xpad-pad-group.c'
--- src/xpad-pad-group.c	2008-09-21 00:03:40 +0000
+++ src/xpad-pad-group.c	2009-04-24 07:22:14 +0000
@@ -175,3 +175,11 @@
 		g_slist_foreach (group->priv->pads, (GFunc) gtk_widget_show, NULL);
 }
 
+
+void
+xpad_pad_group_toggle_hide(XpadPadGroup *group)
+{
+	if (group)
+		g_slist_foreach (group->priv->pads, (GFunc) xpad_pad_toggle, NULL);
+}
+

=== modified file 'src/xpad-pad.c'
--- src/xpad-pad.c	2008-09-21 00:03:40 +0000
+++ src/xpad-pad.c	2009-04-24 07:22:14 +0000
@@ -615,6 +615,18 @@
 	g_signal_emit (pad, signals[CLOSED], 0);
 }
 
+void
+xpad_pad_toggle(XpadPad *pad)
+{
+    gboolean show = TRUE;
+    load_info (pad, &show);
+    if (show) 
+        xpad_pad_close (pad);
+    else
+        gtk_widget_show (GTK_WIDGET (pad));
+    xpad_pad_save_info (pad);
+}
+
 static gboolean
 should_confirm_delete (XpadPad *pad)
 {

=== modified file 'src/xpad-pad.h'
--- src/xpad-pad.h	2008-09-21 00:03:40 +0000
+++ src/xpad-pad.h	2009-04-24 07:22:14 +0000
@@ -57,6 +57,7 @@
 GtkWidget *xpad_pad_new_with_info (XpadPadGroup *group, const gchar *info_filename, gboolean *show);
 GtkWidget *xpad_pad_new_from_file (XpadPadGroup *group, const gchar *filename);
 void xpad_pad_close (XpadPad *pad);
+void xpad_pad_toggle (XpadPad *pad);
 void xpad_pad_save_info (XpadPad *pad);
 
 G_END_DECLS