SF.net SVN: geany:[5681] trunk

[colombanw at users.sourceforge.net]

Revision: 5681
          http://geany.svn.sourceforge.net/geany/?rev=5681&view=rev
Author:   colombanw
Date:     2011-04-03 15:54:28 +0000 (Sun, 03 Apr 2011)

Log Message:
-----------
Don't allow editing keybinding column of group rows

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/prefs.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2011-04-03 15:54:09 UTC (rev 5680)
+++ trunk/ChangeLog	2011-04-03 15:54:28 UTC (rev 5681)
@@ -2,6 +2,8 @@
 
  * src/main.c, src/prefs.c, src/tools.c:
    Fix loading and updating menu accelerators for custom commands.
+ * src/prefs.c:
+   Don't allow editing keybinding column of group rows.
 
 
 2011-04-02  Colomban Wendling  <colomban(at)geany(dot)org>

Modified: trunk/src/prefs.c
===================================================================
--- trunk/src/prefs.c	2011-04-03 15:54:09 UTC (rev 5680)
+++ trunk/src/prefs.c	2011-04-03 15:54:28 UTC (rev 5681)
@@ -128,7 +128,8 @@
 {
 	KB_TREE_ACTION,
 	KB_TREE_SHORTCUT,
-	KB_TREE_INDEX
+	KB_TREE_INDEX,
+	KB_TREE_EDITABLE
 };
 
 
@@ -266,7 +267,7 @@
 
 	tree = GTK_TREE_VIEW(ui_lookup_widget(ui_widgets.prefs_dialog, "treeview7"));
 
-	store = gtk_tree_store_new(3, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT);
+	store = gtk_tree_store_new(4, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT, G_TYPE_BOOLEAN);
 	gtk_tree_view_set_model(GTK_TREE_VIEW(tree), GTK_TREE_MODEL(store));
 	g_object_unref(store);
 
@@ -275,8 +276,8 @@
 	gtk_tree_view_append_column(GTK_TREE_VIEW(tree), column);
 
 	renderer = gtk_cell_renderer_text_new();
-	g_object_set(renderer, "editable", TRUE, NULL);
-	column = gtk_tree_view_column_new_with_attributes(_("Shortcut"), renderer, "text", KB_TREE_SHORTCUT, NULL);
+	column = gtk_tree_view_column_new_with_attributes(_("Shortcut"), renderer,
+		"text", KB_TREE_SHORTCUT, "editable", KB_TREE_EDITABLE, NULL);
 	gtk_tree_view_append_column(GTK_TREE_VIEW(tree), column);
 
 	/* set policy settings for the scrolled window around the treeview again, because glade
@@ -316,7 +317,7 @@
 			key_string = gtk_accelerator_name(kb->key, kb->mods);
 			gtk_tree_store_append(store, &iter, &parent);
 			gtk_tree_store_set(store, &iter, KB_TREE_ACTION, label,
-				KB_TREE_SHORTCUT, key_string, KB_TREE_INDEX, kb->id, -1);
+				KB_TREE_SHORTCUT, key_string, KB_TREE_EDITABLE, TRUE, KB_TREE_INDEX, kb->id, -1);
 			g_free(key_string);
 			g_free(label);
 		}


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