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

[dimitrov-adrian at users.sourceforge.net]

Revision: 1203
          http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1203&view=rev
Author:   dimitrov-adrian
Date:     2010-03-26 21:04:44 +0000 (Fri, 26 Mar 2010)

Log Message:
-----------
Treebrowser, fixed bug with 'On expand, refresh.'

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-03-23 11:33:11 UTC (rev 1202)
+++ trunk/geany-plugins/treebrowser/ChangeLog	2010-03-26 21:04:44 UTC (rev 1203)
@@ -1,6 +1,13 @@
 Development release ChangeLog
 -----------------------------
 
+26-03-2010 	Adrian Dimitrov 		<dimitrov.adrian at gmail.com>
+
+	* src/treebrowser.c
+		fixed bug with 'On expand, refresh.'
+		now right click not select item from list
+
+
 23-03-2010 	Adrian Dimitrov 		<dimitrov.adrian at gmail.com>
 
 	* src/treebrowser.c

Modified: trunk/geany-plugins/treebrowser/src/treebrowser.c
===================================================================
--- trunk/geany-plugins/treebrowser/src/treebrowser.c	2010-03-23 11:33:11 UTC (rev 1202)
+++ trunk/geany-plugins/treebrowser/src/treebrowser.c	2010-03-26 21:04:44 UTC (rev 1203)
@@ -28,7 +28,13 @@
 static GtkTreeViewColumn 	*treeview_column_icon, *treeview_column_text;
 static GtkCellRenderer 		*render_icon, *render_text;
 
+/* ------------------
+ * FLAGS
+ * ------------------ */
 
+static gboolean 			flag_on_expand_refresh 		= FALSE;
+
+
 /* ------------------
  *  CONFIG VARS
  * ------------------ */
@@ -243,16 +249,16 @@
 			if (treebrowser_search(uri, &iter))
 				return TRUE;
 		}
+		else
+			if (utils_str_equal(uri, uri_current) == TRUE)
+			{
+				path = gtk_tree_model_get_path(GTK_TREE_MODEL(treestore), &iter);
+				gtk_tree_view_expand_to_path(GTK_TREE_VIEW(treeview), path);
+				gtk_tree_view_scroll_to_cell(GTK_TREE_VIEW(treeview), path, TREEBROWSER_COLUMN_ICON, FALSE, 0, 0);
+				gtk_tree_view_set_cursor(GTK_TREE_VIEW(treeview), path, treeview_column_text, FALSE);
+				return TRUE;
+			}
 
-		if (utils_str_equal(uri,uri_current) == TRUE)
-		{
-			path = gtk_tree_model_get_path(GTK_TREE_MODEL(treestore), &iter);
-			gtk_tree_view_expand_to_path(GTK_TREE_VIEW(treeview), path);
-			gtk_tree_view_scroll_to_cell(GTK_TREE_VIEW(treeview), path, TREEBROWSER_COLUMN_ICON, FALSE, 0, 0);
-			gtk_tree_view_set_cursor(GTK_TREE_VIEW(treeview), path, treeview_column_text, FALSE);
-			return TRUE;
-		}
-
 	} while(gtk_tree_model_iter_next(GTK_TREE_MODEL(treestore), &iter));
 
 	return FALSE;
@@ -310,6 +316,7 @@
 gtk_tree_store_iter_clear_nodes(gpointer iter, gboolean delete_root)
 {
 	GtkTreeIter 	i;
+
 	while (gtk_tree_model_iter_children(GTK_TREE_MODEL(treestore), &i, iter))
 	{
 		if (gtk_tree_model_iter_has_child(GTK_TREE_MODEL(treestore), &i))
@@ -319,6 +326,7 @@
 
 	if (delete_root)
 		gtk_tree_store_remove(GTK_TREE_STORE(treestore), iter);
+
 }
 
 static gboolean
@@ -712,6 +720,7 @@
 		if (popup_menu == NULL)
 			popup_menu = create_popup_menu(user_data);
 		gtk_menu_popup(GTK_MENU(popup_menu), NULL, NULL, NULL, NULL, event->button, event->time);
+		return TRUE;
 	}
 	return FALSE;
 }
@@ -779,15 +788,18 @@
 {
 	gchar *uri;
 
-	gtk_tree_model_get_iter(GTK_TREE_MODEL(treestore), iter, path);
-	gtk_tree_model_get(GTK_TREE_MODEL(treestore), iter,
+	if (flag_on_expand_refresh == FALSE && CONFIG_ON_EXPAND_REFRESH == TRUE)
+	{
+		flag_on_expand_refresh = TRUE;
+		gtk_tree_model_get(GTK_TREE_MODEL(treestore), iter,
 							TREEBROWSER_COLUMN_URI, &uri,
 							-1);
-
-	if (CONFIG_ON_EXPAND_REFRESH)
 		treebrowser_browse(uri, iter, CONFIG_INITIAL_DIR_DEEP);
+		gtk_tree_view_expand_row(GTK_TREE_VIEW(treeview), path, FALSE);
+		flag_on_expand_refresh = FALSE;
+	}
+	gtk_tree_store_set(treestore, iter, TREEBROWSER_COLUMN_ICON, GTK_STOCK_OPEN, -1);
 
-	gtk_tree_store_set(treestore, iter, TREEBROWSER_COLUMN_ICON, GTK_STOCK_OPEN, -1);
 }
 
 static void
@@ -797,7 +809,7 @@
 }
 
 static void
-on_treeview_renamed(GtkCellRenderer *renderer, const gchar *path_string, const gchar *name_new, gpointer data)
+on_treeview_renamed(GtkCellRenderer *renderer, const gchar *path_string, const gchar *name_new, gpointer user_data)
 {
 
 	GtkTreeViewColumn 	*column;
@@ -1124,8 +1136,13 @@
 	CONFIG_FILE = g_strconcat(geany->app->configdir, G_DIR_SEPARATOR_S, "plugins", G_DIR_SEPARATOR_S,
 		"treebrowser", G_DIR_SEPARATOR_S, "treebrowser.conf", NULL);
 
+	flag_on_expand_refresh = FALSE;
+
 	load_settings();
 
+	if (CONFIG_SHOW_BARS)
+		dialogs_show_msgbox(GTK_MESSAGE_INFO, "wasaaaaa");
+
 	treeview = create_view_and_model();
 	create_sidebar();
 	treebrowser_chroot(get_default_dir());


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