SF.net SVN: geany: [2097] trunk
eht16 at users.sourceforge.net
eht16 at xxxxx
Wed Dec 12 16:34:03 UTC 2007
Revision: 2097
http://geany.svn.sourceforge.net/geany/?rev=2097&view=rev
Author: eht16
Date: 2007-12-12 08:34:02 -0800 (Wed, 12 Dec 2007)
Log Message:
-----------
Set treeview rules hint for several treeviews and remove manual setting the background colour of odd rows of the status and message treeviews (closes #1848901).
Modified Paths:
--------------
trunk/geany.glade
trunk/src/interface.c
trunk/src/msgwindow.c
trunk/src/plugins.c
Modified: trunk/geany.glade
===================================================================
--- trunk/geany.glade 2007-12-09 16:59:21 UTC (rev 2096)
+++ trunk/geany.glade 2007-12-12 16:34:02 UTC (rev 2097)
@@ -2089,7 +2089,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="headers_visible">True</property>
- <property name="rules_hint">False</property>
+ <property name="rules_hint">True</property>
<property name="reorderable">False</property>
<property name="enable_search">True</property>
<property name="fixed_height_mode">False</property>
@@ -2195,7 +2195,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="headers_visible">False</property>
- <property name="rules_hint">False</property>
+ <property name="rules_hint">True</property>
<property name="reorderable">False</property>
<property name="enable_search">True</property>
<property name="fixed_height_mode">False</property>
@@ -2299,7 +2299,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="headers_visible">False</property>
- <property name="rules_hint">False</property>
+ <property name="rules_hint">True</property>
<property name="reorderable">False</property>
<property name="enable_search">True</property>
<property name="fixed_height_mode">False</property>
@@ -7747,7 +7747,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="headers_visible">True</property>
- <property name="rules_hint">False</property>
+ <property name="rules_hint">True</property>
<property name="reorderable">False</property>
<property name="enable_search">False</property>
<property name="fixed_height_mode">False</property>
Modified: trunk/src/interface.c
===================================================================
--- trunk/src/interface.c 2007-12-09 16:59:21 UTC (rev 2096)
+++ trunk/src/interface.c 2007-12-12 16:34:02 UTC (rev 2097)
@@ -1223,6 +1223,7 @@
treeview6 = gtk_tree_view_new ();
gtk_widget_show (treeview6);
gtk_container_add (GTK_CONTAINER (scrolledwindow7), treeview6);
+ gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (treeview6), TRUE);
label136 = gtk_label_new (_("Documents"));
gtk_widget_show (label136);
@@ -1258,6 +1259,7 @@
gtk_widget_show (treeview3);
gtk_container_add (GTK_CONTAINER (scrolledwindow4), treeview3);
gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (treeview3), FALSE);
+ gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (treeview3), TRUE);
notebook_info_label_status = gtk_label_new (_("Status"));
gtk_widget_show (notebook_info_label_status);
@@ -1286,6 +1288,7 @@
gtk_widget_show (treeview4);
gtk_container_add (GTK_CONTAINER (scrolledwindow5), treeview4);
gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (treeview4), FALSE);
+ gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (treeview4), TRUE);
notebook_info_label_msg = gtk_label_new (_("Messages"));
gtk_widget_show (notebook_info_label_msg);
@@ -4229,6 +4232,7 @@
treeview7 = gtk_tree_view_new ();
gtk_widget_show (treeview7);
gtk_container_add (GTK_CONTAINER (scrolledwindow8), treeview7);
+ gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (treeview7), TRUE);
gtk_tree_view_set_enable_search (GTK_TREE_VIEW (treeview7), FALSE);
alignment10 = gtk_alignment_new (0.5, 0.5, 0.3, 1);
Modified: trunk/src/msgwindow.c
===================================================================
--- trunk/src/msgwindow.c 2007-12-09 16:59:21 UTC (rev 2096)
+++ trunk/src/msgwindow.c 2007-12-12 16:34:02 UTC (rev 2097)
@@ -58,9 +58,6 @@
gint file_idx; // idx of the field where the filename is or -1
} ParseData;
-static const GdkColor dark = {0, 58832, 58832, 58832};
-static const GdkColor white = {0, 65535, 65535, 65535};
-
MessageWindow msgwindow;
@@ -109,11 +106,11 @@
GtkTreeViewColumn *column;
PangoFontDescription *pfd;
- msgwindow.store_status = gtk_list_store_new(2, GDK_TYPE_COLOR, G_TYPE_STRING);
+ msgwindow.store_status = gtk_list_store_new(1, G_TYPE_STRING);
gtk_tree_view_set_model(GTK_TREE_VIEW(msgwindow.tree_status), GTK_TREE_MODEL(msgwindow.store_status));
renderer = gtk_cell_renderer_text_new();
- column = gtk_tree_view_column_new_with_attributes(_("Status messages"), renderer, "background-gdk", 0, "text", 1, NULL);
+ column = gtk_tree_view_column_new_with_attributes(_("Status messages"), renderer, "text", 0, NULL);
gtk_tree_view_append_column(GTK_TREE_VIEW(msgwindow.tree_status), column);
gtk_tree_view_set_enable_search(GTK_TREE_VIEW(msgwindow.tree_status), FALSE);
@@ -137,13 +134,13 @@
PangoFontDescription *pfd;
// doc idx, line, bg, fg, str
- msgwindow.store_msg = gtk_list_store_new(5, G_TYPE_INT, G_TYPE_INT,
- GDK_TYPE_COLOR, GDK_TYPE_COLOR, G_TYPE_STRING);
+ msgwindow.store_msg = gtk_list_store_new(4, G_TYPE_INT, G_TYPE_INT,
+ GDK_TYPE_COLOR, G_TYPE_STRING);
gtk_tree_view_set_model(GTK_TREE_VIEW(msgwindow.tree_msg), GTK_TREE_MODEL(msgwindow.store_msg));
renderer = gtk_cell_renderer_text_new();
column = gtk_tree_view_column_new_with_attributes(NULL, renderer,
- "background-gdk", 2, "foreground-gdk", 3, "text", 4, NULL);
+ "foreground-gdk", 2, "text", 3, NULL);
gtk_tree_view_append_column(GTK_TREE_VIEW(msgwindow.tree_msg), column);
gtk_tree_view_set_enable_search(GTK_TREE_VIEW(msgwindow.tree_msg), FALSE);
@@ -277,14 +274,12 @@
void msgwin_msg_add(gint msg_color, gint line, gint idx, const gchar *string)
{
GtkTreeIter iter;
- static gint state = 0;
const GdkColor *color = get_color(msg_color);
if (! ui_prefs.msgwindow_visible) msgwin_show_hide(TRUE);
gtk_list_store_append(msgwindow.store_msg, &iter);
- gtk_list_store_set(msgwindow.store_msg, &iter, 0, line, 1, idx, 2,
- ((state++ % 2) == 0) ? &white : &dark, 3, color, 4, string, -1);
+ gtk_list_store_set(msgwindow.store_msg, &iter, 0, line, 1, idx, 2, color, 3, string, -1);
gtk_widget_set_sensitive(lookup_widget(app->window, "next_message1"), TRUE);
}
@@ -295,7 +290,6 @@
void msgwin_status_add(const gchar *format, ...)
{
GtkTreeIter iter;
- static gint state = 0;
gchar string[512];
gchar *statusmsg, *time_str;
va_list args;
@@ -314,8 +308,7 @@
// add message to Status window
gtk_list_store_append(msgwindow.store_status, &iter);
- gtk_list_store_set(msgwindow.store_status, &iter, 0,
- ((state++ % 2) == 0) ? &white : &dark, 1, statusmsg, -1);
+ gtk_list_store_set(msgwindow.store_status, &iter, 0, statusmsg, -1);
g_free(statusmsg);
if (main_status.main_window_realized)
Modified: trunk/src/plugins.c
===================================================================
--- trunk/src/plugins.c 2007-12-09 16:59:21 UTC (rev 2096)
+++ trunk/src/plugins.c 2007-12-12 16:34:02 UTC (rev 2097)
@@ -757,6 +757,7 @@
_("File"), text_renderer, "text", PLUGIN_COLUMN_FILE, NULL);
gtk_tree_view_append_column(GTK_TREE_VIEW(tree), column);
+ gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(tree), TRUE);
gtk_tree_view_set_enable_search(GTK_TREE_VIEW(tree), FALSE);
gtk_tree_sortable_set_sort_column_id(
GTK_TREE_SORTABLE(store), PLUGIN_COLUMN_NAME, GTK_SORT_ASCENDING);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Commits
mailing list