SF.net SVN: geany-plugins:[1621] trunk/geany-plugins/treebrowser

[dimitrov-adrian at users.sourceforge.net]

Revision: 1621
          http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1621&view=rev
Author:   dimitrov-adrian
Date:     2010-10-03 18:29:28 +0000 (Sun, 03 Oct 2010)

Log Message:
-----------
Some bugfixes and improvements, mostly in bookmarks support.

Modified Paths:
--------------
    trunk/geany-plugins/treebrowser/ChangeLog
    trunk/geany-plugins/treebrowser/src/treebrowser.c

Modified: trunk/geany-plugins/treebrowser/ChangeLog
===================================================================
--- trunk/geany-plugins/treebrowser/ChangeLog	2010-10-03 18:16:54 UTC (rev 1620)
+++ trunk/geany-plugins/treebrowser/ChangeLog	2010-10-03 18:29:28 UTC (rev 1621)
@@ -47,8 +47,7 @@
 		Fixed showing wrong tooltips in settings dialog
 		Merged show_bars and show_bars_at_top in one combobox
 			(I think that this is more suitable)
-		Changed Right click -> Show bars to Hide/Show toolbar
-			(Now this is temporary hidding/showing and it now saving in the settings)
+		Fixed bug in show/hide toolbar
 		Removed option for change how deep directories will be scanned
 			(I think that this is unusable and in some cases make geany to freezy)
 		Removed option "ON_EXPAND_REFRESH" - This is unnessecary already

Modified: trunk/geany-plugins/treebrowser/src/treebrowser.c
===================================================================
--- trunk/geany-plugins/treebrowser/src/treebrowser.c	2010-10-03 18:16:54 UTC (rev 1620)
+++ trunk/geany-plugins/treebrowser/src/treebrowser.c	2010-10-03 18:29:28 UTC (rev 1621)
@@ -538,11 +538,17 @@
 showbars(gboolean state)
 {
 	if (state)
+	{
 		gtk_widget_show(sidebar_vbox_bars);
+		if (!CONFIG_SHOW_BARS)
+			CONFIG_SHOW_BARS = 1;
+	}
 	else
+	{
 		gtk_widget_hide(sidebar_vbox_bars);
+		CONFIG_SHOW_BARS = 0;
+	}
 
-	CONFIG_SHOW_BARS = state ? (CONFIG_SHOW_BARS ? CONFIG_SHOW_BARS : 1) : 0;
 	save_settings();
 }
 
@@ -1310,15 +1316,15 @@
 	ui_widget_set_tooltip_text(addressbar,
 		_("Addressbar for example '/projects/my-project'"));
 
-	if (CONFIG_SHOW_BARS == 1)
+	if (CONFIG_SHOW_BARS == 2)
 	{
+		gtk_box_pack_start(GTK_BOX(sidebar_vbox), 				scrollwin, 			TRUE,  TRUE,  1);
 		gtk_box_pack_start(GTK_BOX(sidebar_vbox), 				sidebar_vbox_bars, 	FALSE, TRUE,  1);
-		gtk_box_pack_start(GTK_BOX(sidebar_vbox), 				scrollwin, 			TRUE,  TRUE,  1);
 	}
 	else
 	{
+		gtk_box_pack_start(GTK_BOX(sidebar_vbox), 				sidebar_vbox_bars, 	FALSE, TRUE,  1);
 		gtk_box_pack_start(GTK_BOX(sidebar_vbox), 				scrollwin, 			TRUE,  TRUE,  1);
-		gtk_box_pack_start(GTK_BOX(sidebar_vbox), 				sidebar_vbox_bars, 	FALSE, TRUE,  1);
 	}
 
 	g_signal_connect(selection, 		"changed", 				G_CALLBACK(on_treeview_changed), 				NULL);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.