SF.net SVN: geany: [1647] trunk

[eht16 at users.sourceforge.net]

Revision: 1647
          http://svn.sourceforge.net/geany/?rev=1647&view=rev
Author:   eht16
Date:     2007-06-27 11:43:23 -0700 (Wed, 27 Jun 2007)

Log Message:
-----------
Add palette to Colour Chooser Dialog.
Fix picking colours starting with '#'.      

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/callbacks.c
    trunk/src/dialogs.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-06-27 16:07:03 UTC (rev 1646)
+++ trunk/ChangeLog	2007-06-27 18:43:23 UTC (rev 1647)
@@ -1,3 +1,10 @@
+2007-06-27  Enrico Tröger  <enrico.troeger at uvena.de>
+
+ * src/callbacks.c, src/dialogs.c:
+   Add palette to Colour Chooser Dialog.
+   Fix picking colours starting with '#'.
+
+
 2007-06-27  Nick Treleaven  <nick.treleaven at btinternet.com>
 
  * plugins/demoplugin.c, src/plugindata.h, src/plugins.c:

Modified: trunk/src/callbacks.c
===================================================================
--- trunk/src/callbacks.c	2007-06-27 16:07:03 UTC (rev 1646)
+++ trunk/src/callbacks.c	2007-06-27 18:43:23 UTC (rev 1647)
@@ -1292,7 +1292,7 @@
 	if (idx == -1 || ! doc_list[idx].is_valid)
 		return;
 
-	editor_find_current_word(doc_list[idx].sci, pos, colour, sizeof colour, NULL);
+	editor_find_current_word(doc_list[idx].sci, pos, colour, sizeof colour, GEANY_WORDCHARS"#");
 	dialogs_show_color(colour);
 }
 

Modified: trunk/src/dialogs.c
===================================================================
--- trunk/src/dialogs.c	2007-06-27 16:07:03 UTC (rev 1646)
+++ trunk/src/dialogs.c	2007-06-27 18:43:23 UTC (rev 1647)
@@ -595,6 +595,8 @@
 		app->open_colorsel = gtk_color_selection_dialog_new(_("Color Chooser"));
 		gtk_widget_set_name(app->open_colorsel, "GeanyDialog");
 		gtk_window_set_transient_for(GTK_WINDOW(app->open_colorsel), GTK_WINDOW(app->window));
+		gtk_color_selection_set_has_palette(
+			GTK_COLOR_SELECTION(GTK_COLOR_SELECTION_DIALOG(app->open_colorsel)->colorsel), TRUE);
 
 		g_signal_connect(GTK_COLOR_SELECTION_DIALOG(app->open_colorsel)->cancel_button, "clicked",
 						G_CALLBACK(on_color_cancel_button_clicked), NULL);


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