Commits April 2011

commits@lists.geany.org

4 participants
87 discussions

SF.net SVN: geany:[5694] trunk
by ntrel＠users.sourceforge.net 05 Apr '11

05 Apr '11

Revision: 5694 http://geany.svn.sourceforge.net/geany/?rev=5694&view=rev Author: ntrel Date: 2011-04-05 15:47:31 +0000 (Tue, 05 Apr 2011) Log Message: ----------- Remove TEMPLATES_GET_FILENAME() macro. Modified Paths: -------------- trunk/ChangeLog trunk/src/templates.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-04-04 18:06:09 UTC (rev 5693) +++ trunk/ChangeLog 2011-04-05 15:47:31 UTC (rev 5694) @@ -1,3 +1,9 @@ +2011-04-05 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/templates.c: + Remove TEMPLATES_GET_FILENAME() macro. + + 2011-04-04 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * scintilla/gtk/ScintillaGTK.cxx: Modified: trunk/src/templates.c =================================================================== --- trunk/src/templates.c 2011-04-04 18:06:09 UTC (rev 5693) +++ trunk/src/templates.c 2011-04-05 15:47:31 UTC (rev 5694) @@ -61,12 +61,6 @@ const gchar *file_type, const gchar *func_name); -/* some simple macros to reduce code size and make the code readable */ -#define TEMPLATES_GET_FILENAME(shortname) \ - g_strconcat(app->configdir, \ - G_DIR_SEPARATOR_S GEANY_TEMPLATES_SUBDIR G_DIR_SEPARATOR_S, shortname, NULL) - - static gchar *read_file(const gchar *locale_fname) { gchar *contents; @@ -97,12 +91,13 @@ static void read_template(const gchar *name, gint id) { - gchar *fname = TEMPLATES_GET_FILENAME(name); + gchar *fname = g_build_path(G_DIR_SEPARATOR_S, app->configdir, + GEANY_TEMPLATES_SUBDIR, name, NULL); /* try system if user template doesn't exist */ if (!g_file_test(fname, G_FILE_TEST_EXISTS)) - setptr(fname, g_strconcat(app->datadir, - G_DIR_SEPARATOR_S GEANY_TEMPLATES_SUBDIR G_DIR_SEPARATOR_S, name, NULL)); + setptr(fname, g_build_path(G_DIR_SEPARATOR_S, app->datadir, + GEANY_TEMPLATES_SUBDIR, name, NULL)); templates[id] = read_file(fname); g_free(fname); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5693] trunk
by eht16＠users.sourceforge.net 04 Apr '11

04 Apr '11

Revision: 5693 http://geany.svn.sourceforge.net/geany/?rev=5693&view=rev Author: eht16 Date: 2011-04-04 18:06:09 +0000 (Mon, 04 Apr 2011) Log Message: ----------- Reset cursors when Scintilla widget is realized (Backport from Scintilla HG, original patch by Matthew Brush). Modified Paths: -------------- trunk/ChangeLog trunk/scintilla/gtk/ScintillaGTK.cxx Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-04-04 18:03:35 UTC (rev 5692) +++ trunk/ChangeLog 2011-04-04 18:06:09 UTC (rev 5693) @@ -2,8 +2,10 @@ * scintilla/gtk/ScintillaGTK.cxx: Fix X PRIMARY selection issue when Scintilla widget is - unrealized/re-realized - (Backport from Scintilla HG, original patch by Matthew Brush). + unrealized/re-realized (Backport from Scintilla HG, + original patch by Matthew Brush). + Reset cursors when Scintilla widget is realized (Backport from + Scintilla HG, original patch by Matthew Brush). 2011-04-04 Colomban Wendling <colomban(at)geany(dot)org> Modified: trunk/scintilla/gtk/ScintillaGTK.cxx =================================================================== --- trunk/scintilla/gtk/ScintillaGTK.cxx 2011-04-04 18:03:35 UTC (rev 5692) +++ trunk/scintilla/gtk/ScintillaGTK.cxx 2011-04-04 18:06:09 UTC (rev 5693) @@ -421,6 +421,18 @@ gtk_widget_realize(PWidget(scrollbarv)); gtk_widget_realize(PWidget(scrollbarh)); + cursor = gdk_cursor_new(GDK_XTERM); + gdk_window_set_cursor(PWidget(wText)->window, cursor); + gdk_cursor_unref(cursor); + + cursor = gdk_cursor_new(GDK_LEFT_PTR); + gdk_window_set_cursor(PWidget(scrollbarv)->window, cursor); + gdk_cursor_unref(cursor); + + cursor = gdk_cursor_new(GDK_LEFT_PTR); + gdk_window_set_cursor(PWidget(scrollbarh)->window, cursor); + gdk_cursor_unref(cursor); + gtk_selection_add_targets(widget, GDK_SELECTION_PRIMARY, clipboardCopyTargets, nClipboardCopyTargets); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5692] trunk
by eht16＠users.sourceforge.net 04 Apr '11

04 Apr '11

Revision: 5692 http://geany.svn.sourceforge.net/geany/?rev=5692&view=rev Author: eht16 Date: 2011-04-04 18:03:35 +0000 (Mon, 04 Apr 2011) Log Message: ----------- Fix X PRIMARY selection issue when Scintilla widget is unrealized/re-realized (Backport from Scintilla HG, original patch by Matthew Brush). Modified Paths: -------------- trunk/ChangeLog trunk/scintilla/gtk/ScintillaGTK.cxx Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-04-04 18:01:14 UTC (rev 5691) +++ trunk/ChangeLog 2011-04-04 18:03:35 UTC (rev 5692) @@ -1,3 +1,11 @@ +2011-04-04 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * scintilla/gtk/ScintillaGTK.cxx: + Fix X PRIMARY selection issue when Scintilla widget is + unrealized/re-realized + (Backport from Scintilla HG, original patch by Matthew Brush). + + 2011-04-04 Colomban Wendling <colomban(at)geany(dot)org> * scintilla/gtk/PlatGTK.cxx: Modified: trunk/scintilla/gtk/ScintillaGTK.cxx =================================================================== --- trunk/scintilla/gtk/ScintillaGTK.cxx 2011-04-04 18:01:14 UTC (rev 5691) +++ trunk/scintilla/gtk/ScintillaGTK.cxx 2011-04-04 18:03:35 UTC (rev 5692) @@ -420,6 +420,14 @@ gtk_widget_realize(widtxt); gtk_widget_realize(PWidget(scrollbarv)); gtk_widget_realize(PWidget(scrollbarh)); + + gtk_selection_add_targets(widget, GDK_SELECTION_PRIMARY, + clipboardCopyTargets, nClipboardCopyTargets); + +#ifndef USE_GTK_CLIPBOARD + gtk_selection_add_targets(widget, atomClipboard, + clipboardPasteTargets, nClipboardPasteTargets); +#endif } void ScintillaGTK::Realize(GtkWidget *widget) { @@ -429,6 +437,14 @@ void ScintillaGTK::UnRealizeThis(GtkWidget *widget) { try { + + gtk_selection_clear_targets(widget, GDK_SELECTION_PRIMARY); + +#ifndef USE_GTK_CLIPBOARD + gtk_selection_clear_targets(widget, atomClipboard); +#endif + + if (IS_WIDGET_MAPPED(widget)) { gtk_widget_unmap(widget); } @@ -670,14 +686,6 @@ gtk_widget_grab_focus(PWidget(wMain)); - gtk_selection_add_targets(GTK_WIDGET(PWidget(wMain)), GDK_SELECTION_PRIMARY, - clipboardCopyTargets, nClipboardCopyTargets); - -#ifndef USE_GTK_CLIPBOARD - gtk_selection_add_targets(GTK_WIDGET(PWidget(wMain)), atomClipboard, - clipboardPasteTargets, nClipboardPasteTargets); -#endif - gtk_drag_dest_set(GTK_WIDGET(PWidget(wMain)), GTK_DEST_DEFAULT_ALL, clipboardPasteTargets, nClipboardPasteTargets, static_cast<GdkDragAction>(GDK_ACTION_COPY | GDK_ACTION_MOVE)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5691] trunk/ChangeLog
by colombanw＠users.sourceforge.net 04 Apr '11

04 Apr '11

Revision: 5691 http://geany.svn.sourceforge.net/geany/?rev=5691&view=rev Author: colombanw Date: 2011-04-04 18:01:14 +0000 (Mon, 04 Apr 2011) Log Message: ----------- Update the ChangeLog for last commit (oops) Modified Paths: -------------- trunk/ChangeLog Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-04-04 17:58:07 UTC (rev 5690) +++ trunk/ChangeLog 2011-04-04 18:01:14 UTC (rev 5691) @@ -1,3 +1,9 @@ +2011-04-04 Colomban Wendling <colomban(at)geany(dot)org> + + * scintilla/gtk/PlatGTK.cxx: + Fix font rendering in Scintilla when using Cairo. + + 2011-04-04 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * src/interface.c, geany.glade: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5690] trunk/scintilla/gtk/PlatGTK.cxx
by colombanw＠users.sourceforge.net 04 Apr '11

04 Apr '11

Revision: 5690 http://geany.svn.sourceforge.net/geany/?rev=5690&view=rev Author: colombanw Date: 2011-04-04 17:58:07 +0000 (Mon, 04 Apr 2011) Log Message: ----------- Fix font rendering in the Scintilla when using Cairo Always get the Pango context through GTK+ API rather than creating it from a Cairo context to always get a context set up for the screen. This fixes font size issues when using Cairo rendering. Patch imported from upstream Mercurial (3596/070c7eb483bf). Modified Paths: -------------- trunk/scintilla/gtk/PlatGTK.cxx Modified: trunk/scintilla/gtk/PlatGTK.cxx =================================================================== --- trunk/scintilla/gtk/PlatGTK.cxx 2011-04-04 17:05:44 UTC (rev 5689) +++ trunk/scintilla/gtk/PlatGTK.cxx 2011-04-04 17:58:07 UTC (rev 5690) @@ -894,16 +894,11 @@ context = cairo_create(psurf); } createdGC = true; - pcontext = pango_cairo_create_context(context); - PLATFORM_ASSERT(pcontext); - layout = pango_cairo_create_layout(context); - PLATFORM_ASSERT(layout); -#else +#endif pcontext = gtk_widget_create_pango_context(PWidget(wid)); PLATFORM_ASSERT(pcontext); layout = pango_layout_new(pcontext); PLATFORM_ASSERT(layout); -#endif inited = true; } @@ -916,17 +911,10 @@ context = gdk_cairo_create(drawable_); #else gc = gdk_gc_new(drawable_); + drawable = drawable_; #endif -#ifdef USE_CAIRO - pcontext = pango_cairo_create_context(context); - PLATFORM_ASSERT(pcontext); - layout = pango_cairo_create_layout(context); - PLATFORM_ASSERT(layout); -#else pcontext = gtk_widget_create_pango_context(PWidget(wid)); layout = pango_layout_new(pcontext); - drawable = drawable_; -#endif #ifdef USE_CAIRO cairo_set_line_width(context, 1); #else @@ -948,20 +936,16 @@ PLATFORM_ASSERT(surfImpl->drawable); gc = gdk_gc_new(surfImpl->drawable); #endif -#ifdef USE_CAIRO - pcontext = pango_cairo_create_context(context); + pcontext = gtk_widget_create_pango_context(PWidget(wid)); PLATFORM_ASSERT(pcontext); - layout = pango_cairo_create_layout(context); + layout = pango_layout_new(pcontext); PLATFORM_ASSERT(layout); +#ifdef USE_CAIRO if (height > 0 && width > 0) psurf = gdk_window_create_similar_surface( gtk_widget_get_window(PWidget(wid)), CAIRO_CONTENT_COLOR_ALPHA, width, height); #else - pcontext = gtk_widget_create_pango_context(PWidget(wid)); - PLATFORM_ASSERT(pcontext); - layout = pango_layout_new(pcontext); - PLATFORM_ASSERT(layout); if (height > 0 && width > 0) ppixmap = gdk_pixmap_new(surfImpl->drawable, width, height, -1); drawable = ppixmap; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5689] trunk
by ntrel＠users.sourceforge.net 04 Apr '11

04 Apr '11

Revision: 5689 http://geany.svn.sourceforge.net/geany/?rev=5689&view=rev Author: ntrel Date: 2011-04-04 17:05:44 +0000 (Mon, 04 Apr 2011) Log Message: ----------- Make Project->Properties the last menu item so it's faster to use. Modified Paths: -------------- trunk/ChangeLog trunk/geany.glade trunk/src/interface.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-04-03 17:53:06 UTC (rev 5688) +++ trunk/ChangeLog 2011-04-04 17:05:44 UTC (rev 5689) @@ -1,3 +1,9 @@ +2011-04-04 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/interface.c, geany.glade: + Make Project->Properties the last menu item so it's faster to use. + + 2011-04-03 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * scintilla/*: Modified: trunk/geany.glade =================================================================== --- trunk/geany.glade 2011-04-03 17:53:06 UTC (rev 5688) +++ trunk/geany.glade 2011-04-04 17:05:44 UTC (rev 5689) @@ -67,7 +67,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image4011"> + <widget class="GtkImage" id="image4056"> <property name="visible">True</property> <property name="stock">gtk-new</property> <property name="icon_size">1</property> @@ -144,7 +144,7 @@ <signal name="activate" handler="on_save_all1_activate" last_modification_time="Thu, 02 Jun 2005 14:15:30 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image4012"> + <widget class="GtkImage" id="image4057"> <property name="visible">True</property> <property name="stock">gtk-save</property> <property name="icon_size">1</property> @@ -165,7 +165,7 @@ <signal name="activate" handler="on_toolbutton_reload_clicked" last_modification_time="Mon, 01 Sep 2008 16:57:06 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image4013"> + <widget class="GtkImage" id="image4058"> <property name="visible">True</property> <property name="stock">gtk-revert-to-saved</property> <property name="icon_size">1</property> @@ -185,7 +185,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image4014"> + <widget class="GtkImage" id="image4059"> <property name="visible">True</property> <property name="stock">gtk-revert-to-saved</property> <property name="icon_size">1</property> @@ -272,7 +272,7 @@ <signal name="activate" handler="on_close_other_documents1_activate" last_modification_time="Fri, 27 Jun 2008 15:19:28 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image4015"> + <widget class="GtkImage" id="image4060"> <property name="visible">True</property> <property name="stock">gtk-close</property> <property name="icon_size">1</property> @@ -293,7 +293,7 @@ <signal name="activate" handler="on_close_all1_activate" last_modification_time="Thu, 02 Jun 2005 14:15:30 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image4016"> + <widget class="GtkImage" id="image4061"> <property name="visible">True</property> <property name="stock">gtk-close</property> <property name="icon_size">1</property> @@ -433,7 +433,7 @@ <signal name="activate" handler="on_cut_current_line(s)1_activate" last_modification_time="Mon, 26 Oct 2009 17:34:30 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image4017"> + <widget class="GtkImage" id="image4062"> <property name="visible">True</property> <property name="stock">gtk-cut</property> <property name="icon_size">1</property> @@ -454,7 +454,7 @@ <signal name="activate" handler="on_copy_current_line(s)1_activate" last_modification_time="Mon, 26 Oct 2009 17:34:30 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image4018"> + <widget class="GtkImage" id="image4063"> <property name="visible">True</property> <property name="stock">gtk-copy</property> <property name="icon_size">1</property> @@ -611,7 +611,7 @@ <signal name="activate" handler="on_menu_increase_indent1_activate" last_modification_time="Tue, 01 Aug 2006 10:28:54 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image4019"> + <widget class="GtkImage" id="image4064"> <property name="visible">True</property> <property name="stock">gtk-indent</property> <property name="icon_size">1</property> @@ -632,7 +632,7 @@ <signal name="activate" handler="on_menu_decrease_indent1_activate" last_modification_time="Tue, 01 Aug 2006 10:28:54 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image4020"> + <widget class="GtkImage" id="image4065"> <property name="visible">True</property> <property name="stock">gtk-unindent</property> <property name="icon_size">1</property> @@ -697,7 +697,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image4021"> + <widget class="GtkImage" id="image4066"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -782,7 +782,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image4022"> + <widget class="GtkImage" id="image4067"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -814,7 +814,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image4023"> + <widget class="GtkImage" id="image4068"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -862,7 +862,7 @@ <signal name="activate" handler="on_preferences1_activate" last_modification_time="Wed, 08 Jun 2005 11:35:19 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image4024"> + <widget class="GtkImage" id="image4069"> <property name="visible">True</property> <property name="stock">gtk-preferences</property> <property name="icon_size">1</property> @@ -883,7 +883,7 @@ <signal name="activate" handler="on_plugin_preferences1_activate" last_modification_time="Wed, 28 Oct 2009 17:17:31 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image4025"> + <widget class="GtkImage" id="image4070"> <property name="visible">True</property> <property name="stock">gtk-preferences</property> <property name="icon_size">1</property> @@ -951,7 +951,7 @@ <signal name="activate" handler="on_find_in_files1_activate" last_modification_time="Thu, 06 Jul 2006 11:31:09 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image4026"> + <widget class="GtkImage" id="image4071"> <property name="visible">True</property> <property name="stock">gtk-find</property> <property name="icon_size">1</property> @@ -972,7 +972,7 @@ <signal name="activate" handler="on_replace1_activate" last_modification_time="Sun, 23 Oct 2005 13:22:36 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image4027"> + <widget class="GtkImage" id="image4072"> <property name="visible">True</property> <property name="stock">gtk-find-and-replace</property> <property name="icon_size">1</property> @@ -999,7 +999,7 @@ <signal name="activate" handler="on_next_message1_activate" last_modification_time="Tue, 05 Dec 2006 11:15:02 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image4028"> + <widget class="GtkImage" id="image4073"> <property name="visible">True</property> <property name="stock">gtk-go-down</property> <property name="icon_size">1</property> @@ -1020,7 +1020,7 @@ <signal name="activate" handler="on_previous_message1_activate" last_modification_time="Wed, 25 Jun 2008 12:10:04 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image4029"> + <widget class="GtkImage" id="image4074"> <property name="visible">True</property> <property name="stock">gtk-go-up</property> <property name="icon_size">1</property> @@ -1071,7 +1071,7 @@ <signal name="activate" handler="on_go_to_line_activate" last_modification_time="Sat, 06 Dec 2008 17:41:21 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image4030"> + <widget class="GtkImage" id="image4075"> <property name="visible">True</property> <property name="stock">gtk-jump-to</property> <property name="icon_size">1</property> @@ -1199,7 +1199,7 @@ <signal name="activate" handler="on_change_font1_activate" last_modification_time="Fri, 22 Apr 2005 18:58:45 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image4031"> + <widget class="GtkImage" id="image4076"> <property name="visible">True</property> <property name="stock">gtk-select-font</property> <property name="icon_size">1</property> @@ -1771,7 +1771,7 @@ <signal name="activate" handler="on_project_new1_activate" last_modification_time="Thu, 18 Jan 2007 22:16:24 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image4032"> + <widget class="GtkImage" id="image4077"> <property name="visible">True</property> <property name="stock">gtk-new</property> <property name="icon_size">1</property> @@ -1792,7 +1792,7 @@ <signal name="activate" handler="on_project_open1_activate" last_modification_time="Mon, 15 Jan 2007 17:34:17 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image4033"> + <widget class="GtkImage" id="image4078"> <property name="visible">True</property> <property name="stock">gtk-open</property> <property name="icon_size">1</property> @@ -1821,7 +1821,7 @@ <signal name="activate" handler="on_project_close1_activate" last_modification_time="Mon, 15 Jan 2007 17:34:17 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image4034"> + <widget class="GtkImage" id="image4079"> <property name="visible">True</property> <property name="stock">gtk-close</property> <property name="icon_size">1</property> @@ -1841,11 +1841,12 @@ </child> <child> - <widget class="GtkImageMenuItem" id="project_properties1"> + <widget class="GtkMenuItem" id="reset_indentation1"> <property name="visible">True</property> - <property name="label">gtk-properties</property> - <property name="use_stock">True</property> - <signal name="activate" handler="on_project_properties1_activate" last_modification_time="Mon, 15 Jan 2007 17:34:17 GMT"/> + <property name="tooltip" translatable="yes">Apply the default indentation settings to all documents</property> + <property name="label" translatable="yes">_Apply Default Indentation</property> + <property name="use_underline">True</property> + <signal name="activate" handler="on_reset_indentation1_activate" last_modification_time="Mon, 08 Nov 2010 15:30:43 GMT"/> </widget> </child> @@ -1856,12 +1857,11 @@ </child> <child> - <widget class="GtkMenuItem" id="reset_indentation1"> + <widget class="GtkImageMenuItem" id="project_properties1"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">Apply the default indentation settings to all documents</property> - <property name="label" translatable="yes">_Apply Default Indentation</property> - <property name="use_underline">True</property> - <signal name="activate" handler="on_reset_indentation1_activate" last_modification_time="Mon, 08 Nov 2010 15:30:43 GMT"/> + <property name="label">gtk-properties</property> + <property name="use_stock">True</property> + <signal name="activate" handler="on_project_properties1_activate" last_modification_time="Mon, 15 Jan 2007 17:34:17 GMT"/> </widget> </child> </widget> @@ -1894,7 +1894,7 @@ <signal name="activate" handler="on_menu_reload_configuration1_activate" last_modification_time="Mon, 30 Jun 2008 16:19:40 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image4035"> + <widget class="GtkImage" id="image4080"> <property name="visible">True</property> <property name="stock">gtk-refresh</property> <property name="icon_size">1</property> @@ -1914,7 +1914,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image4036"> + <widget class="GtkImage" id="image4081"> <property name="visible">True</property> <property name="stock">gtk-file</property> <property name="icon_size">1</property> @@ -1941,7 +1941,7 @@ <signal name="activate" handler="on_show_color_chooser1_activate" last_modification_time="Wed, 22 Jun 2005 18:10:21 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image4037"> + <widget class="GtkImage" id="image4082"> <property name="visible">True</property> <property name="stock">gtk-select-color</property> <property name="icon_size">1</property> @@ -1993,7 +1993,7 @@ <signal name="activate" handler="on_help1_activate" last_modification_time="Sun, 24 Jul 2005 15:23:11 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image4038"> + <widget class="GtkImage" id="image4083"> <property name="visible">True</property> <property name="stock">gtk-help</property> <property name="icon_size">1</property> Modified: trunk/src/interface.c =================================================================== --- trunk/src/interface.c 2011-04-03 17:53:06 UTC (rev 5688) +++ trunk/src/interface.c 2011-04-04 17:05:44 UTC (rev 5689) @@ -38,7 +38,7 @@ GtkWidget *file1_menu; GtkWidget *menu_new1; GtkWidget *menu_new_with_template1; - GtkWidget *image4011; + GtkWidget *image4056; GtkWidget *separator12; GtkWidget *menu_open1; GtkWidget *menu_open_selected_file1; @@ -47,11 +47,11 @@ GtkWidget *menu_save1; GtkWidget *menu_save_as1; GtkWidget *menu_save_all1; - GtkWidget *image4012; + GtkWidget *image4057; GtkWidget *menu_reload1; - GtkWidget *image4013; + GtkWidget *image4058; GtkWidget *menu_reload_as1; - GtkWidget *image4014; + GtkWidget *image4059; GtkWidget *menu_reload_as1_menu; GtkWidget *invisible7; GtkWidget *separator21; @@ -62,9 +62,9 @@ GtkWidget *separator14; GtkWidget *menu_close1; GtkWidget *close_other_documents1; - GtkWidget *image4015; + GtkWidget *image4060; GtkWidget *menu_close_all1; - GtkWidget *image4016; + GtkWidget *image4061; GtkWidget *menu_separatormenuitem1; GtkWidget *menu_quit1; GtkWidget *edit1; @@ -82,9 +82,9 @@ GtkWidget *commands2; GtkWidget *commands2_menu; GtkWidget *cut_current_line_s_1; - GtkWidget *image4017; + GtkWidget *image4062; GtkWidget *copy_current_line_s_1; - GtkWidget *image4018; + GtkWidget *image4063; GtkWidget *delete_current_line_s_1; GtkWidget *duplicate_line_or_selection1; GtkWidget *separator49; @@ -103,9 +103,9 @@ GtkWidget *menu_toggle_line_commentation1; GtkWidget *separator29; GtkWidget *menu_increase_indent1; - GtkWidget *image4019; + GtkWidget *image4064; GtkWidget *menu_decrease_indent1; - GtkWidget *image4020; + GtkWidget *image4065; GtkWidget *smart_line_indent1; GtkWidget *separator37; GtkWidget *send_selection_to2; @@ -113,7 +113,7 @@ GtkWidget *invisible13; GtkWidget *separator18; GtkWidget *add_comments1; - GtkWidget *image4021; + GtkWidget *image4066; GtkWidget *add_comments1_menu; GtkWidget *menu_add_changelog_entry1; GtkWidget *insert_function_description2; @@ -123,19 +123,19 @@ GtkWidget *insert_gpl_notice2; GtkWidget *insert_bsd_license_notice2; GtkWidget *insert_date1; - GtkWidget *image4022; + GtkWidget *image4067; GtkWidget *insert_date1_menu; GtkWidget *invisible8; GtkWidget *insert_include2; - GtkWidget *image4023; + GtkWidget *image4068; GtkWidget *insert_include2_menu; GtkWidget *invisible4; GtkWidget *insert_alternative_white_space1; GtkWidget *separator9; GtkWidget *preferences1; - GtkWidget *image4024; + GtkWidget *image4069; GtkWidget *plugin_preferences1; - GtkWidget *image4025; + GtkWidget *image4070; GtkWidget *search1; GtkWidget *search1_menu; GtkWidget *find1; @@ -143,20 +143,20 @@ GtkWidget *find_previous1; GtkWidget *separator54; GtkWidget *find_in_files1; - GtkWidget *image4026; + GtkWidget *image4071; GtkWidget *replace1; - GtkWidget *image4027; + GtkWidget *image4072; GtkWidget *separator35; GtkWidget *next_message1; - GtkWidget *image4028; + GtkWidget *image4073; GtkWidget *previous_message1; - GtkWidget *image4029; + GtkWidget *image4074; GtkWidget *separator51; GtkWidget *go_to_next_marker1; GtkWidget *go_to_previous_marker1; GtkWidget *separator32; GtkWidget *go_to_line1; - GtkWidget *image4030; + GtkWidget *image4075; GtkWidget *more1; GtkWidget *more1_menu; GtkWidget *find_nextsel1; @@ -172,7 +172,7 @@ GtkWidget *menu_view1; GtkWidget *menu_view1_menu; GtkWidget *menu_change_font1; - GtkWidget *image4031; + GtkWidget *image4076; GtkWidget *menu_separator4; GtkWidget *menu_toggle_all_additional_widgets1; GtkWidget *menu_fullscreen1; @@ -241,32 +241,32 @@ GtkWidget *menu_project1; GtkWidget *menu_project1_menu; GtkWidget *project_new1; - GtkWidget *image4032; + GtkWidget *image4077; GtkWidget *project_open1; - GtkWidget *image4033; + GtkWidget *image4078; GtkWidget *recent_projects1; GtkWidget *project_close1; - GtkWidget *image4034; + GtkWidget *image4079; GtkWidget *separator34; + GtkWidget *reset_indentation1; + GtkWidget *separator59; GtkWidget *project_properties1; - GtkWidget *separator59; - GtkWidget *reset_indentation1; GtkWidget *menu_build1; GtkWidget *tools1; GtkWidget *tools1_menu; GtkWidget *menu_reload_configuration1; - GtkWidget *image4035; + GtkWidget *image4080; GtkWidget *configuration_files1; - GtkWidget *image4036; + GtkWidget *image4081; GtkWidget *separator47; GtkWidget *menu_choose_color1; - GtkWidget *image4037; + GtkWidget *image4082; GtkWidget *menu_count_words1; GtkWidget *load_tags1; GtkWidget *menu_help1; GtkWidget *menu_help1_menu; GtkWidget *help1; - GtkWidget *image4038; + GtkWidget *image4083; GtkWidget *website1; GtkWidget *keyboard_shortcuts1; GtkWidget *debug_messages1; @@ -336,9 +336,9 @@ gtk_widget_show (menu_new_with_template1); gtk_container_add (GTK_CONTAINER (file1_menu), menu_new_with_template1); - image4011 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU); - gtk_widget_show (image4011); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_new_with_template1), image4011); + image4056 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU); + gtk_widget_show (image4056); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_new_with_template1), image4056); separator12 = gtk_separator_menu_item_new (); gtk_widget_show (separator12); @@ -374,25 +374,25 @@ gtk_widget_show (menu_save_all1); gtk_container_add (GTK_CONTAINER (file1_menu), menu_save_all1); - image4012 = gtk_image_new_from_stock ("gtk-save", GTK_ICON_SIZE_MENU); - gtk_widget_show (image4012); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_save_all1), image4012); + image4057 = gtk_image_new_from_stock ("gtk-save", GTK_ICON_SIZE_MENU); + gtk_widget_show (image4057); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_save_all1), image4057); menu_reload1 = gtk_image_menu_item_new_with_mnemonic (_("_Reload")); gtk_widget_show (menu_reload1); gtk_container_add (GTK_CONTAINER (file1_menu), menu_reload1); - image4013 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); - gtk_widget_show (image4013); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload1), image4013); + image4058 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); + gtk_widget_show (image4058); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload1), image4058); menu_reload_as1 = gtk_image_menu_item_new_with_mnemonic (_("R_eload As")); gtk_widget_show (menu_reload_as1); gtk_container_add (GTK_CONTAINER (file1_menu), menu_reload_as1); - image4014 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); - gtk_widget_show (image4014); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload_as1), image4014); + image4059 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); + gtk_widget_show (image4059); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload_as1), image4059); menu_reload_as1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_reload_as1), menu_reload_as1_menu); @@ -435,17 +435,17 @@ gtk_widget_show (close_other_documents1); gtk_container_add (GTK_CONTAINER (file1_menu), close_other_documents1); - image4015 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); - gtk_widget_show (image4015); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (close_other_documents1), image4015); + image4060 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); + gtk_widget_show (image4060); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (close_other_documents1), image4060); menu_close_all1 = gtk_image_menu_item_new_with_mnemonic (_("C_lose All")); gtk_widget_show (menu_close_all1); gtk_container_add (GTK_CONTAINER (file1_menu), menu_close_all1); - image4016 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); - gtk_widget_show (image4016); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_close_all1), image4016); + image4061 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); + gtk_widget_show (image4061); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_close_all1), image4061); menu_separatormenuitem1 = gtk_separator_menu_item_new (); gtk_widget_show (menu_separatormenuitem1); @@ -517,17 +517,17 @@ gtk_widget_show (cut_current_line_s_1); gtk_container_add (GTK_CONTAINER (commands2_menu), cut_current_line_s_1); - image4017 = gtk_image_new_from_stock ("gtk-cut", GTK_ICON_SIZE_MENU); - gtk_widget_show (image4017); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (cut_current_line_s_1), image4017); + image4062 = gtk_image_new_from_stock ("gtk-cut", GTK_ICON_SIZE_MENU); + gtk_widget_show (image4062); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (cut_current_line_s_1), image4062); copy_current_line_s_1 = gtk_image_menu_item_new_with_mnemonic (_("_Copy Current Line(s)")); gtk_widget_show (copy_current_line_s_1); gtk_container_add (GTK_CONTAINER (commands2_menu), copy_current_line_s_1); - image4018 = gtk_image_new_from_stock ("gtk-copy", GTK_ICON_SIZE_MENU); - gtk_widget_show (image4018); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (copy_current_line_s_1), image4018); + image4063 = gtk_image_new_from_stock ("gtk-copy", GTK_ICON_SIZE_MENU); + gtk_widget_show (image4063); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (copy_current_line_s_1), image4063); delete_current_line_s_1 = gtk_menu_item_new_with_mnemonic (_("_Delete Current Line(s)")); gtk_widget_show (delete_current_line_s_1); @@ -604,17 +604,17 @@ gtk_widget_show (menu_increase_indent1); gtk_container_add (GTK_CONTAINER (menu_format1_menu), menu_increase_indent1); - image4019 = gtk_image_new_from_stock ("gtk-indent", GTK_ICON_SIZE_MENU); - gtk_widget_show (image4019); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_increase_indent1), image4019); + image4064 = gtk_image_new_from_stock ("gtk-indent", GTK_ICON_SIZE_MENU); + gtk_widget_show (image4064); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_increase_indent1), image4064); menu_decrease_indent1 = gtk_image_menu_item_new_with_mnemonic (_("_Decrease Indent")); gtk_widget_show (menu_decrease_indent1); gtk_container_add (GTK_CONTAINER (menu_format1_menu), menu_decrease_indent1); - image4020 = gtk_image_new_from_stock ("gtk-unindent", GTK_ICON_SIZE_MENU); - gtk_widget_show (image4020); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_decrease_indent1), image4020); + image4065 = gtk_image_new_from_stock ("gtk-unindent", GTK_ICON_SIZE_MENU); + gtk_widget_show (image4065); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_decrease_indent1), image4065); smart_line_indent1 = gtk_menu_item_new_with_mnemonic (_("_Smart Line Indent")); gtk_widget_show (smart_line_indent1); @@ -644,9 +644,9 @@ gtk_widget_show (add_comments1); gtk_container_add (GTK_CONTAINER (edit1_menu), add_comments1); - image4021 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image4021); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_comments1), image4021); + image4066 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image4066); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_comments1), image4066); add_comments1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (add_comments1), add_comments1_menu); @@ -684,9 +684,9 @@ gtk_widget_show (insert_date1); gtk_container_add (GTK_CONTAINER (edit1_menu), insert_date1); - image4022 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image4022); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_date1), image4022); + image4067 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image4067); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_date1), image4067); insert_date1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert_date1), insert_date1_menu); @@ -698,9 +698,9 @@ gtk_widget_show (insert_include2); gtk_container_add (GTK_CONTAINER (edit1_menu), insert_include2); - image4023 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image4023); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include2), image4023); + image4068 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image4068); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include2), image4068); insert_include2_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert_include2), insert_include2_menu); @@ -721,17 +721,17 @@ gtk_widget_show (preferences1); gtk_container_add (GTK_CONTAINER (edit1_menu), preferences1); - image4024 = gtk_image_new_from_stock ("gtk-preferences", GTK_ICON_SIZE_MENU); - gtk_widget_show (image4024); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (preferences1), image4024); + image4069 = gtk_image_new_from_stock ("gtk-preferences", GTK_ICON_SIZE_MENU); + gtk_widget_show (image4069); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (preferences1), image4069); plugin_preferences1 = gtk_image_menu_item_new_with_mnemonic (_("P_lugin Preferences")); gtk_widget_show (plugin_preferences1); gtk_container_add (GTK_CONTAINER (edit1_menu), plugin_preferences1); - image4025 = gtk_image_new_from_stock ("gtk-preferences", GTK_ICON_SIZE_MENU); - gtk_widget_show (image4025); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (plugin_preferences1), image4025); + image4070 = gtk_image_new_from_stock ("gtk-preferences", GTK_ICON_SIZE_MENU); + gtk_widget_show (image4070); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (plugin_preferences1), image4070); search1 = gtk_menu_item_new_with_mnemonic (_("_Search")); gtk_widget_show (search1); @@ -761,17 +761,17 @@ gtk_widget_show (find_in_files1); gtk_container_add (GTK_CONTAINER (search1_menu), find_in_files1); - image4026 = gtk_image_new_from_stock ("gtk-find", GTK_ICON_SIZE_MENU); - gtk_widget_show (image4026); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (find_in_files1), image4026); + image4071 = gtk_image_new_from_stock ("gtk-find", GTK_ICON_SIZE_MENU); + gtk_widget_show (image4071); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (find_in_files1), image4071); replace1 = gtk_image_menu_item_new_with_mnemonic (_("_Replace")); gtk_widget_show (replace1); gtk_container_add (GTK_CONTAINER (search1_menu), replace1); - image4027 = gtk_image_new_from_stock ("gtk-find-and-replace", GTK_ICON_SIZE_MENU); - gtk_widget_show (image4027); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (replace1), image4027); + image4072 = gtk_image_new_from_stock ("gtk-find-and-replace", GTK_ICON_SIZE_MENU); + gtk_widget_show (image4072); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (replace1), image4072); separator35 = gtk_separator_menu_item_new (); gtk_widget_show (separator35); @@ -782,17 +782,17 @@ gtk_widget_show (next_message1); gtk_container_add (GTK_CONTAINER (search1_menu), next_message1); - image4028 = gtk_image_new_from_stock ("gtk-go-down", GTK_ICON_SIZE_MENU); - gtk_widget_show (image4028); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (next_message1), image4028); + image4073 = gtk_image_new_from_stock ("gtk-go-down", GTK_ICON_SIZE_MENU); + gtk_widget_show (image4073); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (next_message1), image4073); previous_message1 = gtk_image_menu_item_new_with_mnemonic (_("Pr_evious Message")); gtk_widget_show (previous_message1); gtk_container_add (GTK_CONTAINER (search1_menu), previous_message1); - image4029 = gtk_image_new_from_stock ("gtk-go-up", GTK_ICON_SIZE_MENU); - gtk_widget_show (image4029); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (previous_message1), image4029); + image4074 = gtk_image_new_from_stock ("gtk-go-up", GTK_ICON_SIZE_MENU); + gtk_widget_show (image4074); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (previous_message1), image4074); separator51 = gtk_separator_menu_item_new (); gtk_widget_show (separator51); @@ -816,9 +816,9 @@ gtk_widget_show (go_to_line1); gtk_container_add (GTK_CONTAINER (search1_menu), go_to_line1); - image4030 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU); - gtk_widget_show (image4030); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line1), image4030); + image4075 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU); + gtk_widget_show (image4075); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line1), image4075); more1 = gtk_menu_item_new_with_mnemonic (_("_More")); gtk_widget_show (more1); @@ -881,9 +881,9 @@ gtk_widget_show (menu_change_font1); gtk_container_add (GTK_CONTAINER (menu_view1_menu), menu_change_font1); - image4031 = gtk_image_new_from_stock ("gtk-select-font", GTK_ICON_SIZE_MENU); - gtk_widget_show (image4031); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_change_font1), image4031); + image4076 = gtk_image_new_from_stock ("gtk-select-font", GTK_ICON_SIZE_MENU); + gtk_widget_show (image4076); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_change_font1), image4076); menu_separator4 = gtk_separator_menu_item_new (); gtk_widget_show (menu_separator4); @@ -1177,17 +1177,17 @@ gtk_widget_show (project_new1); gtk_container_add (GTK_CONTAINER (menu_project1_menu), project_new1); - image4032 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU); - gtk_widget_show (image4032); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_new1), image4032); + image4077 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU); + gtk_widget_show (image4077); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_new1), image4077); project_open1 = gtk_image_menu_item_new_with_mnemonic (_("_Open")); gtk_widget_show (project_open1); gtk_container_add (GTK_CONTAINER (menu_project1_menu), project_open1); - image4033 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_MENU); - gtk_widget_show (image4033); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_open1), image4033); + image4078 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_MENU); + gtk_widget_show (image4078); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_open1), image4078); recent_projects1 = gtk_menu_item_new_with_mnemonic (_("_Recent Projects")); gtk_widget_show (recent_projects1); @@ -1197,28 +1197,28 @@ gtk_widget_show (project_close1); gtk_container_add (GTK_CONTAINER (menu_project1_menu), project_close1); - image4034 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); - gtk_widget_show (image4034); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_close1), image4034); + image4079 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); + gtk_widget_show (image4079); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_close1), image4079); separator34 = gtk_separator_menu_item_new (); gtk_widget_show (separator34); gtk_container_add (GTK_CONTAINER (menu_project1_menu), separator34); gtk_widget_set_sensitive (separator34, FALSE); - project_properties1 = gtk_image_menu_item_new_from_stock ("gtk-properties", accel_group); - gtk_widget_show (project_properties1); - gtk_container_add (GTK_CONTAINER (menu_project1_menu), project_properties1); + reset_indentation1 = gtk_menu_item_new_with_mnemonic (_("_Apply Default Indentation")); + gtk_widget_show (reset_indentation1); + gtk_container_add (GTK_CONTAINER (menu_project1_menu), reset_indentation1); + gtk_tooltips_set_tip (tooltips, reset_indentation1, _("Apply the default indentation settings to all documents"), NULL); separator59 = gtk_separator_menu_item_new (); gtk_widget_show (separator59); gtk_container_add (GTK_CONTAINER (menu_project1_menu), separator59); gtk_widget_set_sensitive (separator59, FALSE); - reset_indentation1 = gtk_menu_item_new_with_mnemonic (_("_Apply Default Indentation")); - gtk_widget_show (reset_indentation1); - gtk_container_add (GTK_CONTAINER (menu_project1_menu), reset_indentation1); - gtk_tooltips_set_tip (tooltips, reset_indentation1, _("Apply the default indentation settings to all documents"), NULL); + project_properties1 = gtk_image_menu_item_new_from_stock ("gtk-properties", accel_group); + gtk_widget_show (project_properties1); + gtk_container_add (GTK_CONTAINER (menu_project1_menu), project_properties1); menu_build1 = gtk_menu_item_new_with_mnemonic (_("_Build")); gtk_widget_show (menu_build1); @@ -1235,17 +1235,17 @@ gtk_widget_show (menu_reload_configuration1); gtk_container_add (GTK_CONTAINER (tools1_menu), menu_reload_configuration1); - image4035 = gtk_image_new_from_stock ("gtk-refresh", GTK_ICON_SIZE_MENU); - gtk_widget_show (image4035); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload_configuration1), image4035); + image4080 = gtk_image_new_from_stock ("gtk-refresh", GTK_ICON_SIZE_MENU); + gtk_widget_show (image4080); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload_configuration1), image4080); configuration_files1 = gtk_image_menu_item_new_with_mnemonic (_("C_onfiguration Files")); gtk_widget_show (configuration_files1); gtk_container_add (GTK_CONTAINER (tools1_menu), configuration_files1); - image4036 = gtk_image_new_from_stock ("gtk-file", GTK_ICON_SIZE_MENU); - gtk_widget_show (image4036); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (configuration_files1), image4036); + image4081 = gtk_image_new_from_stock ("gtk-file", GTK_ICON_SIZE_MENU); + gtk_widget_show (image4081); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (configuration_files1), image4081); separator47 = gtk_separator_menu_item_new (); gtk_widget_show (separator47); @@ -1256,9 +1256,9 @@ gtk_widget_show (menu_choose_color1); gtk_container_add (GTK_CONTAINER (tools1_menu), menu_choose_color1); - image4037 = gtk_image_new_from_stock ("gtk-select-color", GTK_ICON_SIZE_MENU); - gtk_widget_show (image4037); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_choose_color1), image4037); + image4082 = gtk_image_new_from_stock ("gtk-select-color", GTK_ICON_SIZE_MENU); + gtk_widget_show (image4082); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_choose_color1), image4082); menu_count_words1 = gtk_menu_item_new_with_mnemonic (_("_Word Count")); gtk_widget_show (menu_count_words1); @@ -1279,9 +1279,9 @@ gtk_widget_show (help1); gtk_container_add (GTK_CONTAINER (menu_help1_menu), help1); - image4038 = gtk_image_new_from_stock ("gtk-help", GTK_ICON_SIZE_MENU); - gtk_widget_show (image4038); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (help1), image4038); + image4083 = gtk_image_new_from_stock ("gtk-help", GTK_ICON_SIZE_MENU); + gtk_widget_show (image4083); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (help1), image4083); website1 = gtk_menu_item_new_with_mnemonic (_("_Website")); gtk_widget_show (website1); @@ -1764,12 +1764,12 @@ g_signal_connect ((gpointer) project_close1, "activate", G_CALLBACK (on_project_close1_activate), NULL); + g_signal_connect ((gpointer) reset_indentation1, "activate", + G_CALLBACK (on_reset_indentation1_activate), + NULL); g_signal_connect ((gpointer) project_properties1, "activate", G_CALLBACK (on_project_properties1_activate), NULL); - g_signal_connect ((gpointer) reset_indentation1, "activate", - G_CALLBACK (on_reset_indentation1_activate), - NULL); g_signal_connect ((gpointer) menu_reload_configuration1, "activate", G_CALLBACK (on_menu_reload_configuration1_activate), NULL); @@ -1823,7 +1823,7 @@ GLADE_HOOKUP_OBJECT (window1, file1_menu, "file1_menu"); GLADE_HOOKUP_OBJECT (window1, menu_new1, "menu_new1"); GLADE_HOOKUP_OBJECT (window1, menu_new_with_template1, "menu_new_with_template1"); - GLADE_HOOKUP_OBJECT (window1, image4011, "image4011"); + GLADE_HOOKUP_OBJECT (window1, image4056, "image4056"); GLADE_HOOKUP_OBJECT (window1, separator12, "separator12"); GLADE_HOOKUP_OBJECT (window1, menu_open1, "menu_open1"); GLADE_HOOKUP_OBJECT (window1, menu_open_selected_file1, "menu_open_selected_file1"); @@ -1832,11 +1832,11 @@ GLADE_HOOKUP_OBJECT (window1, menu_save1, "menu_save1"); GLADE_HOOKUP_OBJECT (window1, menu_save_as1, "menu_save_as1"); GLADE_HOOKUP_OBJECT (window1, menu_save_all1, "menu_save_all1"); - GLADE_HOOKUP_OBJECT (window1, image4012, "image4012"); + GLADE_HOOKUP_OBJECT (window1, image4057, "image4057"); GLADE_HOOKUP_OBJECT (window1, menu_reload1, "menu_reload1"); - GLADE_HOOKUP_OBJECT (window1, image4013, "image4013"); + GLADE_HOOKUP_OBJECT (window1, image4058, "image4058"); GLADE_HOOKUP_OBJECT (window1, menu_reload_as1, "menu_reload_as1"); - GLADE_HOOKUP_OBJECT (window1, image4014, "image4014"); + GLADE_HOOKUP_OBJECT (window1, image4059, "image4059"); GLADE_HOOKUP_OBJECT (window1, menu_reload_as1_menu, "menu_reload_as1_menu"); GLADE_HOOKUP_OBJECT (window1, invisible7, "invisible7"); GLADE_HOOKUP_OBJECT (window1, separator21, "separator21"); @@ -1847,9 +1847,9 @@ GLADE_HOOKUP_OBJECT (window1, separator14, "separator14"); GLADE_HOOKUP_OBJECT (window1, menu_close1, "menu_close1"); GLADE_HOOKUP_OBJECT (window1, close_other_documents1, "close_other_documents1"); - GLADE_HOOKUP_OBJECT (window1, image4015, "image4015"); + GLADE_HOOKUP_OBJECT (window1, image4060, "image4060"); GLADE_HOOKUP_OBJECT (window1, menu_close_all1, "menu_close_all1"); - GLADE_HOOKUP_OBJECT (window1, image4016, "image4016"); + GLADE_HOOKUP_OBJECT (window1, image4061, "image4061"); GLADE_HOOKUP_OBJECT (window1, menu_separatormenuitem1, "menu_separatormenuitem1"); GLADE_HOOKUP_OBJECT (window1, menu_quit1, "menu_quit1"); GLADE_HOOKUP_OBJECT (window1, edit1, "edit1"); @@ -1867,9 +1867,9 @@ GLADE_HOOKUP_OBJECT (window1, commands2, "commands2"); GLADE_HOOKUP_OBJECT (window1, commands2_menu, "commands2_menu"); GLADE_HOOKUP_OBJECT (window1, cut_current_line_s_1, "cut_current_line_s_1"); - GLADE_HOOKUP_OBJECT (window1, image4017, "image4017"); + GLADE_HOOKUP_OBJECT (window1, image4062, "image4062"); GLADE_HOOKUP_OBJECT (window1, copy_current_line_s_1, "copy_current_line_s_1"); - GLADE_HOOKUP_OBJECT (window1, image4018, "image4018"); + GLADE_HOOKUP_OBJECT (window1, image4063, "image4063"); GLADE_HOOKUP_OBJECT (window1, delete_current_line_s_1, "delete_current_line_s_1"); GLADE_HOOKUP_OBJECT (window1, duplicate_line_or_selection1, "duplicate_line_or_selection1"); GLADE_HOOKUP_OBJECT (window1, separator49, "separator49"); @@ -1888,9 +1888,9 @@ GLADE_HOOKUP_OBJECT (window1, menu_toggle_line_commentation1, "menu_toggle_line_commentation1"); GLADE_HOOKUP_OBJECT (window1, separator29, "separator29"); GLADE_HOOKUP_OBJECT (window1, menu_increase_indent1, "menu_increase_indent1"); - GLADE_HOOKUP_OBJECT (window1, image4019, "image4019"); + GLADE_HOOKUP_OBJECT (window1, image4064, "image4064"); GLADE_HOOKUP_OBJECT (window1, menu_decrease_indent1, "menu_decrease_indent1"); - GLADE_HOOKUP_OBJECT (window1, image4020, "image4020"); + GLADE_HOOKUP_OBJECT (window1, image4065, "image4065"); GLADE_HOOKUP_OBJECT (window1, smart_line_indent1, "smart_line_indent1"); GLADE_HOOKUP_OBJECT (window1, separator37, "separator37"); GLADE_HOOKUP_OBJECT (window1, send_selection_to2, "send_selection_to2"); @@ -1898,7 +1898,7 @@ GLADE_HOOKUP_OBJECT (window1, invisible13, "invisible13"); GLADE_HOOKUP_OBJECT (window1, separator18, "separator18"); GLADE_HOOKUP_OBJECT (window1, add_comments1, "add_comments1"); - GLADE_HOOKUP_OBJECT (window1, image4021, "image4021"); + GLADE_HOOKUP_OBJECT (window1, image4066, "image4066"); GLADE_HOOKUP_OBJECT (window1, add_comments1_menu, "add_comments1_menu"); GLADE_HOOKUP_OBJECT (window1, menu_add_changelog_entry1, "menu_add_changelog_entry1"); GLADE_HOOKUP_OBJECT (window1, insert_function_description2, "insert_function_description2"); @@ -1908,19 +1908,19 @@ GLADE_HOOKUP_OBJECT (window1, insert_gpl_notice2, "insert_gpl_notice2"); GLADE_HOOKUP_OBJECT (window1, insert_bsd_license_notice2, "insert_bsd_license_notice2"); GLADE_HOOKUP_OBJECT (window1, insert_date1, "insert_date1"); - GLADE_HOOKUP_OBJECT (window1, image4022, "image4022"); + GLADE_HOOKUP_OBJECT (window1, image4067, "image4067"); GLADE_HOOKUP_OBJECT (window1, insert_date1_menu, "insert_date1_menu"); GLADE_HOOKUP_OBJECT (window1, invisible8, "invisible8"); GLADE_HOOKUP_OBJECT (window1, insert_include2, "insert_include2"); - GLADE_HOOKUP_OBJECT (window1, image4023, "image4023"); + GLADE_HOOKUP_OBJECT (window1, image4068, "image4068"); GLADE_HOOKUP_OBJECT (window1, insert_include2_menu, "insert_include2_menu"); GLADE_HOOKUP_OBJECT (window1, invisible4, "invisible4"); GLADE_HOOKUP_OBJECT (window1, insert_alternative_white_space1, "insert_alternative_white_space1"); GLADE_HOOKUP_OBJECT (window1, separator9, "separator9"); GLADE_HOOKUP_OBJECT (window1, preferences1, "preferences1"); - GLADE_HOOKUP_OBJECT (window1, image4024, "image4024"); + GLADE_HOOKUP_OBJECT (window1, image4069, "image4069"); GLADE_HOOKUP_OBJECT (window1, plugin_preferences1, "plugin_preferences1"); - GLADE_HOOKUP_OBJECT (window1, image4025, "image4025"); + GLADE_HOOKUP_OBJECT (window1, image4070, "image4070"); GLADE_HOOKUP_OBJECT (window1, search1, "search1"); GLADE_HOOKUP_OBJECT (window1, search1_menu, "search1_menu"); GLADE_HOOKUP_OBJECT (window1, find1, "find1"); @@ -1928,20 +1928,20 @@ GLADE_HOOKUP_OBJECT (window1, find_previous1, "find_previous1"); GLADE_HOOKUP_OBJECT (window1, separator54, "separator54"); GLADE_HOOKUP_OBJECT (window1, find_in_files1, "find_in_files1"); - GLADE_HOOKUP_OBJECT (window1, image4026, "image4026"); + GLADE_HOOKUP_OBJECT (window1, image4071, "image4071"); GLADE_HOOKUP_OBJECT (window1, replace1, "replace1"); - GLADE_HOOKUP_OBJECT (window1, image4027, "image4027"); + GLADE_HOOKUP_OBJECT (window1, image4072, "image4072"); GLADE_HOOKUP_OBJECT (window1, separator35, "separator35"); GLADE_HOOKUP_OBJECT (window1, next_message1, "next_message1"); - GLADE_HOOKUP_OBJECT (window1, image4028, "image4028"); + GLADE_HOOKUP_OBJECT (window1, image4073, "image4073"); GLADE_HOOKUP_OBJECT (window1, previous_message1, "previous_message1"); - GLADE_HOOKUP_OBJECT (window1, image4029, "image4029"); + GLADE_HOOKUP_OBJECT (window1, image4074, "image4074"); GLADE_HOOKUP_OBJECT (window1, separator51, "separator51"); GLADE_HOOKUP_OBJECT (window1, go_to_next_marker1, "go_to_next_marker1"); GLADE_HOOKUP_OBJECT (window1, go_to_previous_marker1, "go_to_previous_marker1"); GLADE_HOOKUP_OBJECT (window1, separator32, "separator32"); GLADE_HOOKUP_OBJECT (window1, go_to_line1, "go_to_line1"); - GLADE_HOOKUP_OBJECT (window1, image4030, "image4030"); + GLADE_HOOKUP_OBJECT (window1, image4075, "image4075"); GLADE_HOOKUP_OBJECT (window1, more1, "more1"); GLADE_HOOKUP_OBJECT (window1, more1_menu, "more1_menu"); GLADE_HOOKUP_OBJECT (window1, find_nextsel1, "find_nextsel1"); @@ -1957,7 +1957,7 @@ GLADE_HOOKUP_OBJECT (window1, menu_view1, "menu_view1"); GLADE_HOOKUP_OBJECT (window1, menu_view1_menu, "menu_view1_menu"); GLADE_HOOKUP_OBJECT (window1, menu_change_font1, "menu_change_font1"); - GLADE_HOOKUP_OBJECT (window1, image4031, "image4031"); + GLADE_HOOKUP_OBJECT (window1, image4076, "image4076"); GLADE_HOOKUP_OBJECT (window1, menu_separator4, "menu_separator4"); GLADE_HOOKUP_OBJECT (window1, menu_toggle_all_additional_widgets1, "menu_toggle_all_additional_widgets1"); GLADE_HOOKUP_OBJECT (window1, menu_fullscreen1, "menu_fullscreen1"); @@ -2023,32 +2023,32 @@ GLADE_HOOKUP_OBJECT (window1, menu_project1, "menu_project1"); GLADE_HOOKUP_OBJECT (window1, menu_project1_menu, "menu_project1_menu"); GLADE_HOOKUP_OBJECT (window1, project_new1, "project_new1"); - GLADE_HOOKUP_OBJECT (window1, image4032, "image4032"); + GLADE_HOOKUP_OBJECT (window1, image4077, "image4077"); GLADE_HOOKUP_OBJECT (window1, project_open1, "project_open1"); - GLADE_HOOKUP_OBJECT (window1, image4033, "image4033"); + GLADE_HOOKUP_OBJECT (window1, image4078, "image4078"); GLADE_HOOKUP_OBJECT (window1, recent_projects1, "recent_projects1"); GLADE_HOOKUP_OBJECT (window1, project_close1, "project_close1"); - GLADE_HOOKUP_OBJECT (window1, image4034, "image4034"); + GLADE_HOOKUP_OBJECT (window1, image4079, "image4079"); GLADE_HOOKUP_OBJECT (window1, separator34, "separator34"); + GLADE_HOOKUP_OBJECT (window1, reset_indentation1, "reset_indentation1"); + GLADE_HOOKUP_OBJECT (window1, separator59, "separator59"); GLADE_HOOKUP_OBJECT (window1, project_properties1, "project_properties1"); - GLADE_HOOKUP_OBJECT (window1, separator59, "separator59"); - GLADE_HOOKUP_OBJECT (window1, reset_indentation1, "reset_indentation1"); GLADE_HOOKUP_OBJECT (window1, menu_build1, "menu_build1"); GLADE_HOOKUP_OBJECT (window1, tools1, "tools1"); GLADE_HOOKUP_OBJECT (window1, tools1_menu, "tools1_menu"); GLADE_HOOKUP_OBJECT (window1, menu_reload_configuration1, "menu_reload_configuration1"); - GLADE_HOOKUP_OBJECT (window1, image4035, "image4035"); + GLADE_HOOKUP_OBJECT (window1, image4080, "image4080"); GLADE_HOOKUP_OBJECT (window1, configuration_files1, "configuration_files1"); - GLADE_HOOKUP_OBJECT (window1, image4036, "image4036"); + GLADE_HOOKUP_OBJECT (window1, image4081, "image4081"); GLADE_HOOKUP_OBJECT (window1, separator47, "separator47"); GLADE_HOOKUP_OBJECT (window1, menu_choose_color1, "menu_choose_color1"); - GLADE_HOOKUP_OBJECT (window1, image4037, "image4037"); + GLADE_HOOKUP_OBJECT (window1, image4082, "image4082"); GLADE_HOOKUP_OBJECT (window1, menu_count_words1, "menu_count_words1"); GLADE_HOOKUP_OBJECT (window1, load_tags1, "load_tags1"); GLADE_HOOKUP_OBJECT (window1, menu_help1, "menu_help1"); GLADE_HOOKUP_OBJECT (window1, menu_help1_menu, "menu_help1_menu"); GLADE_HOOKUP_OBJECT (window1, help1, "help1"); - GLADE_HOOKUP_OBJECT (window1, image4038, "image4038"); + GLADE_HOOKUP_OBJECT (window1, image4083, "image4083"); GLADE_HOOKUP_OBJECT (window1, website1, "website1"); GLADE_HOOKUP_OBJECT (window1, keyboard_shortcuts1, "keyboard_shortcuts1"); GLADE_HOOKUP_OBJECT (window1, debug_messages1, "debug_messages1"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5688] trunk/src/tools.c
by colombanw＠users.sourceforge.net 03 Apr '11

03 Apr '11

Revision: 5688 http://geany.svn.sourceforge.net/geany/?rev=5688&view=rev Author: colombanw Date: 2011-04-03 17:53:06 +0000 (Sun, 03 Apr 2011) Log Message: ----------- Fix a leak and reword an error message Modified Paths: -------------- trunk/src/tools.c Modified: trunk/src/tools.c =================================================================== --- trunk/src/tools.c 2011-04-03 17:52:49 UTC (rev 5687) +++ trunk/src/tools.c 2011-04-03 17:53:06 UTC (rev 5688) @@ -113,13 +113,14 @@ if (argc > 0 && cc_exists_command(argv[0])) stock_id = GTK_STOCK_YES; else - err = g_error_new( G_FILE_ERROR, G_FILE_ERROR_NOENT, _("Command not found")); + err = g_error_new(G_FILE_ERROR, G_FILE_ERROR_NOENT, _("Command not found")); + g_strfreev(argv); } if (err != NULL) { stock_id = GTK_STOCK_NO; - tooltip = g_strdup_printf(_("Command cannot be found/parsed: %s"), err->message); + tooltip = g_strdup_printf(_("Invalid command: %s"), err->message); g_error_free(err); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5687] trunk
by colombanw＠users.sourceforge.net 03 Apr '11

03 Apr '11

Revision: 5687 http://geany.svn.sourceforge.net/geany/?rev=5687&view=rev Author: colombanw Date: 2011-04-03 17:52:49 +0000 (Sun, 03 Apr 2011) Log Message: ----------- Fix ID of newly added commands in the `Set Custom Commands` dialog Modified Paths: -------------- trunk/ChangeLog trunk/src/tools.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-04-03 17:25:27 UTC (rev 5686) +++ trunk/ChangeLog 2011-04-03 17:52:49 UTC (rev 5687) @@ -18,6 +18,8 @@ Fix loading and updating menu accelerators for custom commands. * src/prefs.c: Don't allow editing keybinding column of group rows. + * src/tools.c: + Fix ID of newly added commands in the `Set Custom Commands` dialog. 2011-04-02 Colomban Wendling <colomban(at)geany(dot)org> Modified: trunk/src/tools.c =================================================================== --- trunk/src/tools.c 2011-04-03 17:25:27 UTC (rev 5686) +++ trunk/src/tools.c 2011-04-03 17:52:49 UTC (rev 5687) @@ -65,7 +65,7 @@ /* custom commands code*/ struct cc_dialog { - gint count; + guint count; GtkWidget *view; GtkTreeViewColumn *edit_column; GtkListStore *store; @@ -133,13 +133,14 @@ { GtkTreeIter iter; const gchar *cmd; + guint id = cc->count; cmd = (idx >= 0) ? ui_prefs.custom_commands[idx] : NULL; + cc->count++; gtk_list_store_append(cc->store, &iter); - gtk_list_store_set(cc->store, &iter, CC_COLUMN_ID, cc->count, CC_COLUMN_CMD, cmd, -1); + gtk_list_store_set(cc->store, &iter, CC_COLUMN_ID, id, CC_COLUMN_CMD, cmd, -1); cc_dialog_update_row_status(cc->store, &iter, cmd); - cc->count++; if (start_editing) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5686] trunk
by eht16＠users.sourceforge.net 03 Apr '11

03 Apr '11

Revision: 5686 http://geany.svn.sourceforge.net/geany/?rev=5686&view=rev Author: eht16 Date: 2011-04-03 17:25:27 +0000 (Sun, 03 Apr 2011) Log Message: ----------- Reflect the existence of the entered command in `Set Custom Commands` dialog as well using the yes/no icon. Modified Paths: -------------- trunk/ChangeLog trunk/src/tools.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-04-03 16:38:31 UTC (rev 5685) +++ trunk/ChangeLog 2011-04-03 17:25:27 UTC (rev 5686) @@ -7,6 +7,9 @@ * scintilla/makefile.win32, tagmanager/makefile.win32, makefile.win32: Replace escape character '\' by slash '/' in paths in the Windows Makefiles (patch by Matthew Brush, thanks). + * src/tools.c: + Reflect the existence of the entered command in `Set Custom Commands` + dialog as well using the yes/no icon. 2011-04-03 Colomban Wendling <colomban(at)geany(dot)org> Modified: trunk/src/tools.c =================================================================== --- trunk/src/tools.c 2011-04-03 16:38:31 UTC (rev 5685) +++ trunk/src/tools.c 2011-04-03 17:25:27 UTC (rev 5686) @@ -81,19 +81,45 @@ static GString *cc_buffer; +static gboolean cc_exists_command(const gchar *command) +{ + gchar *path = g_find_program_in_path(command); + + if (path != NULL) + { + g_free(path); + return TRUE; + } + + return FALSE; +} + + /* update STATUS and TOOLTIP columns according to cmd */ static void cc_dialog_update_row_status(GtkListStore *store, GtkTreeIter *iter, const gchar *cmd) { GError *err = NULL; const gchar *stock_id; gchar *tooltip = NULL; + gint argc; + gchar **argv; - if (! NZV(cmd) || g_shell_parse_argv(cmd, NULL, NULL, &err)) + if (! NZV(cmd)) + { stock_id = GTK_STOCK_YES; - else + } + else if (g_shell_parse_argv(cmd, &argc, &argv, &err)) { + if (argc > 0 && cc_exists_command(argv[0])) + stock_id = GTK_STOCK_YES; + else + err = g_error_new( G_FILE_ERROR, G_FILE_ERROR_NOENT, _("Command not found")); + } + + if (err != NULL) + { stock_id = GTK_STOCK_NO; - tooltip = g_strdup_printf(_("Command cannot be parsed: %s"), err->message); + tooltip = g_strdup_printf(_("Command cannot be found/parsed: %s"), err->message); g_error_free(err); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5685] trunk
by eht16＠users.sourceforge.net 03 Apr '11

03 Apr '11

Revision: 5685 http://geany.svn.sourceforge.net/geany/?rev=5685&view=rev Author: eht16 Date: 2011-04-03 16:38:31 +0000 (Sun, 03 Apr 2011) Log Message: ----------- Replace escape character '\' by slash '/' in paths in the Windows Makefiles (patch by Matthew Brush, thanks). Modified Paths: -------------- trunk/ChangeLog trunk/makefile.win32 trunk/scintilla/makefile.win32 trunk/tagmanager/makefile.win32 Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-04-03 16:35:27 UTC (rev 5684) +++ trunk/ChangeLog 2011-04-03 16:38:31 UTC (rev 5685) @@ -4,6 +4,9 @@ Update Scintilla to version 2.25. * version.txt, Makefile.am: Add Scintilla's version.txt file. + * scintilla/makefile.win32, tagmanager/makefile.win32, makefile.win32: + Replace escape character '\' by slash '/' in paths in the + Windows Makefiles (patch by Matthew Brush, thanks). 2011-04-03 Colomban Wendling <colomban(at)geany(dot)org> Modified: trunk/makefile.win32 =================================================================== --- trunk/makefile.win32 2011-04-03 16:35:27 UTC (rev 5684) +++ trunk/makefile.win32 2011-04-03 16:38:31 UTC (rev 5685) @@ -22,7 +22,7 @@ # Note: && is needed after cd because each line is executed in a different # shell. (cd .. is just for clarity). all: check-tools config.h - cd tagmanager\mio && $(MAKE) -f makefile.win32 && cd ..\.. + cd tagmanager/mio && $(MAKE) -f makefile.win32 && cd ../.. cd tagmanager && $(MAKE) -f makefile.win32 && cd .. cd scintilla && $(MAKE) -f makefile.win32 && cd .. cd plugins && $(MAKE) -f makefile.win32 && cd .. @@ -38,14 +38,14 @@ $(CP) $< $@ deps: - -$(RM) tagmanager\mio\deps.mak tagmanager\deps.mak scintilla\deps.mak plugins\deps.mak src\deps.mak + -$(RM) tagmanager/mio/deps.mak tagmanager/deps.mak scintilla/deps.mak plugins/deps.mak src/deps.mak # used by src/makefile.win32 to avoid del ../file which is an error clean-local: -$(RM) geany_private.res geany.exe clean: deps - cd tagmanager\mio && $(MAKE) -f makefile.win32 clean && cd ..\.. + cd tagmanager/mio && $(MAKE) -f makefile.win32 clean && cd ../.. cd tagmanager && $(MAKE) -f makefile.win32 clean && cd .. cd scintilla && $(MAKE) -f makefile.win32 clean && cd .. cd plugins && $(MAKE) -f makefile.win32 clean && cd .. Modified: trunk/scintilla/makefile.win32 =================================================================== --- trunk/scintilla/makefile.win32 2011-04-03 16:35:27 UTC (rev 5684) +++ trunk/scintilla/makefile.win32 2011-04-03 16:38:31 UTC (rev 5685) @@ -138,7 +138,7 @@ $(RANLIB) $@ deps.mak: - $(CC) -MM $(CXXFLAGS) gtk\*.cxx lexers\*.cxx lexlib\*.cxx src\*.cxx >deps.mak + $(CC) -MM $(CXXFLAGS) gtk/*.cxx lexers/*.cxx lexlib/*.cxx src/*.cxx >deps.mak # Generate header dependencies with "make deps.mak" include deps.mak Modified: trunk/tagmanager/makefile.win32 =================================================================== --- trunk/tagmanager/makefile.win32 2011-04-03 16:35:27 UTC (rev 5684) +++ trunk/tagmanager/makefile.win32 2011-04-03 16:38:31 UTC (rev 5685) @@ -3,7 +3,7 @@ CC = gcc AR = ar RANLIB = ranlib -PREFIX = C:\libs +PREFIX = C:/libs RM = del -include ../localwin32.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits April 2011