Devel September 2010

devel@lists.geany.org

21 participants
30 discussions

[Patch] : On closing the last tab create new untitled document.
by Erik de Castro Lopo 02 Oct '10

02 Oct '10

Hi all, Currently, when closing the last tab, I get a geany window without any text area. The attached patch fixes that, by creating a new untitled document when the last tab is closed. I've been running with this patch for over a week. Cheers, Erik -- ---------------------------------------------------------------------- Erik de Castro Lopo http://www.mega-nerd.com/

7 28

Syntax highlighting for Forth
by Thomas Huth 30 Sep '10

30 Sep '10

Hi! My name is Thomas Huth, and I really enjoy using Geany as my favourite text editor. It has exactly the features that I need (lightwight, starting fast, good syntax highlighting, and the "right" editing behaviour/feeling, ...), so I first would like to say "Thank You!" for this great editor! However, there was one thing I was missing: For my work, I often need to edit Forth files, and Geany did not feature syntax highlighting for this programming language yet. So I've spent some time and added syntax highlighting for Forth. Please have a look at the attached patch, I would be very glad if this could be incorporated into the official sources. The Scintilla lexer has been take directly from scintilla.org. Regards, Thomas

2 1

Improved Stash GUI example online
by Nick Treleaven 28 Sep '10

28 Sep '10

Hi, Recently in SVN I improved the Stash GUI example: http://www.geany.org/manual/reference/stash_8h.html#prefs-example Should be clearer now hopefully. Feel free to comment, as always. Regards, Nick

1 0

Geany compiling error (svn ver.5261 [Fedora])
by a.beloborodov＠viscomp.bg 27 Sep '10

27 Sep '10

Steps to reproduce : nask0 geany # svn up nask0 geany # make uninstall && make distclean && ./autogen.sh && make -j 2 && make install Output : ... CXXLD geany /usr/bin/ld: ui_utils.o: undefined reference to symbol 'XFree' /usr/bin/ld: note: 'XFree' is defined in DSO /usr/lib/libX11.so.6 so try adding it to the linker command line /usr/lib/libX11.so.6: could not read symbols: Invalid operation collect2: ld returned 1 exit status make[2]: *** [geany] Error 1 make[2]: Leaving directory `/home/nask0/Sources/Subversion/geany/src' make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory `/home/nask0/Sources/Subversion/geany' make: *** [all] Error 2 I can't be sure is this a Geany or ld bug, so if it is ld problem, please excuse me. Full output log : http://pastebin.com/gzTSH2Pp Info : OS - Fedora release 13 (Goddard) GTK2 - gtk2-2.20.1-1.fc13.i686 Geany - svn ver.5261 ld - GNU ld version 2.20.51.0.2-20.fc13 20091009 If you have any questions, please feel free to ask. -- Regards, Atanas Beloborodov Programmer a.beloborodov(a)viscomp.bg Mobile: +359 896 733 612 Viscomp EOOD *Viscomp EOOD* 92V "Hristo Botev" Blvd 4000 Plovdiv Bulgaria Tel: +359 32 655 175 Fax: +359 32 655 176 www.viscomp.bg <http://www.viscomp.bg>

2 3

[PATCH] Better-looking comments indenting
by Tambet Arak 24 Sep '10

24 Sep '10

Hi, I sent in a patch on April 23rd, but have not received any accept / reject notice, possibly because I didn't tag it with [patch], so here it is again. Resolves feature request #2990915 as illustrated here: http://i.imgur.com/sYCIf.png When comment_use_indent is set to true in per-filetype config, comments are no longer indented on a line-by-line basis, but have the indentation of the least indented line in the block. This looks a lot better. In addition, empty lines are commented out by default. In the original patch, I introduced a new option for it, but Thomas Martitz suggested that this is not preferable. Best regards, Tambet

5 13

Errors
by Lex Trotman 23 Sep '10

23 Sep '10

Hi, This may be of use somewhere, using current SVN I got the attached errors. Unfortunately Geany was covering the terminal so I didn't see when they occurred or I would have investigated a bit more. Files open were search.c, keyfile.c and editor.c. At one point the sidebar was very slow to respond which might or might not be a hint. Goes without saying I can't repeat. :-) Cheers Lex

4 7

stash - Re: save documents automatically before compiling
by Nick Treleaven 22 Sep '10

22 Sep '10

On Wed, 22 Sep 2010 22:13:56 +1000 Lex Trotman <elextr(a)gmail.com> wrote: > > OK, let's keep it simple and just have a global pref. > > Ok, you're gonna have to explain "how to use stash for dummies" then > :-) I don't see how it creates and connects to the widgets. Stash doesn't create widgets. You tell it when to read the widget's data into a variable, and when to set the widget's data from a variable. Regards, Nick

1 0

po/geany.pot is a generated file
by Erik de Castro Lopo 17 Sep '10

17 Sep '10

Hi all, I would like to suggest that the file po/geany.pot be deleted from the repo. This is a generated file (from po/Makefile.in.in): $(GETTEXT_PACKAGE).pot: $(POTFILES) $(GENPOT) In addition, doing "make clean" after a geany build, will cause it to be deleted. Cheers, Erik -- ---------------------------------------------------------------------- Erik de Castro Lopo http://www.mega-nerd.com/

3 2

Search submenu for editor popup menu
by Nick Treleaven 17 Sep '10

17 Sep '10

Hi, I propose we add a new menubar Search submenu which is also shown in the popup editor menu. This would be similar to what we do for the Edit submenu items Format and Commands. Reasoning: 1. We can help new users to find all the various keybinding commands grouped into logical submenus. 2. We keep the popup editor menu smaller (but make it easy for upgrading users to find the old Find Document Usage and Go to Tag Declaration items [which are currently in the Search menubar]). 3. We keep the menubar Search menu smaller than current HEAD. 4. Sharing the submenu means we only need one actual GtkMenu widget (this is already done for the Edit submenus). The new submenu would have both Find Usage items and both Go to Tag items (even though one of each are shown in the toplevel popup menu for speed). Logically, probably the Search->Find Selected items should be moved to the submenu also. There are also Go to Marker commands in the Edit->Commands menu which would fit better in the new submenu, and other 'Go to' keybindings which don't have menu items. Thoughts? Regards, Nick

4 9

Re: [Geany-devel] SF.net SVN: geany:[5223] trunk
by Lex Trotman 15 Sep '10

15 Sep '10

On 14 September 2010 00:39, <ntrel(a)users.sourceforge.net> wrote: > Revision: 5223 > http://geany.svn.sourceforge.net/geany/?rev=5223&view=rev > Author: ntrel > Date: 2010-09-13 14:39:32 +0000 (Mon, 13 Sep 2010) > > Log Message: > ----------- > Remove 3 popup menu items to save space: > Find Document Usage because Find Usage can be used instead. Gives a lot of rubbish I didn't want, but can live with it. > Go to Tag Declaration because Go to Tag Definition is more common. Hi Nick, Dissagree strongly about removing go to tag declaration. Goto tag declaration is very much used in C++ because it gets the whole class declaration, not just the implementation of the specific function. To find the class in the symbols list I have to remember its name which is often not visible at the point of function use. And of course overloaded functions can have several declarations in several classes. I can see the point for C but it is very useful for other languages. I can't find anywhere where this change was discussed with users, but maybe thats just my search fu. Please reconsider. Cheers Lex > Go to Line because the toolbar item can be used instead. > > Modified Paths: > -------------- > trunk/ChangeLog > trunk/geany.glade > trunk/src/interface.c > trunk/src/keybindings.c > trunk/src/ui_utils.c > > Modified: trunk/ChangeLog > =================================================================== > --- trunk/ChangeLog 2010-09-09 17:31:27 UTC (rev 5222) > +++ trunk/ChangeLog 2010-09-13 14:39:32 UTC (rev 5223) > @@ -1,3 +1,12 @@ > +2010-09-13 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> > + > + * src/interface.c, src/keybindings.c, src/ui_utils.c, geany.glade: > + Remove 3 popup menu items to save space: > + Find Document Usage because Find Usage can be used instead. > + Go to Tag Declaration because Go to Tag Definition is more common. > + Go to Line because the toolbar item can be used instead. > + > + > 2010-09-09 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> > > * src/build.c: > @@ -15,7 +24,7 @@ > Mention the filetype wordchars setting can be overridden by the > whitespace_chars filetypes.common setting. > * src/highlighting.c, src/encodings.c, tagmanager/tm_file_entry.c: > - Remove NULL checks when calling g_free() (patch Erik de Castro > + Remove NULL checks when calling g_free() (patch by Erik de Castro > Lopo, thanks). > * src/document.c: > Show Save As when saving if the document filename doesn't have an > > Modified: trunk/geany.glade > =================================================================== > --- trunk/geany.glade 2010-09-09 17:31:27 UTC (rev 5222) > +++ trunk/geany.glade 2010-09-13 14:39:32 UTC (rev 5223) > @@ -2503,11 +2503,23 @@ > </child> > > <child> > - <widget class="GtkMenuItem" id="menu_open_selected_file2"> > + <widget class="GtkImageMenuItem" id="menu_open_selected_file2"> > <property name="visible">True</property> > <property name="label" translatable="yes">Open Selected F_ile</property> > <property name="use_underline">True</property> > <signal name="activate" handler="on_menu_open_selected_file1_activate" last_modification_time="Wed, 24 Jan 2007 18:48:44 GMT"/> > + > + <child internal-child="image"> > + <widget class="GtkImage" id="image3482"> > + <property name="visible">True</property> > + <property name="stock">gtk-open</property> > + <property name="icon_size">1</property> > + <property name="xalign">0.5</property> > + <property name="yalign">0.5</property> > + <property name="xpad">0</property> > + <property name="ypad">0</property> > + </widget> > + </child> > </widget> > </child> > > @@ -2546,7 +2558,7 @@ > <property name="use_underline">True</property> > > <child internal-child="image"> > - <widget class="GtkImage" id="image3411"> > + <widget class="GtkImage" id="image3483"> > <property name="visible">True</property> > <property name="stock">gtk-add</property> > <property name="icon_size">1</property> > @@ -2625,7 +2637,7 @@ > <property name="use_underline">True</property> > > <child internal-child="image"> > - <widget class="GtkImage" id="image3412"> > + <widget class="GtkImage" id="image3484"> > <property name="visible">True</property> > <property name="stock">gtk-add</property> > <property name="icon_size">1</property> > @@ -2657,7 +2669,7 @@ > <property name="use_underline">True</property> > > <child internal-child="image"> > - <widget class="GtkImage" id="image3413"> > + <widget class="GtkImage" id="image3485"> > <property name="visible">True</property> > <property name="stock">gtk-add</property> > <property name="icon_size">1</property> > @@ -2696,7 +2708,7 @@ > <signal name="activate" handler="on_find_usage1_activate" last_modification_time="Fri, 27 May 2005 21:55:12 GMT"/> > > <child internal-child="image"> > - <widget class="GtkImage" id="image3414"> > + <widget class="GtkImage" id="image3486"> > <property name="visible">True</property> > <property name="stock">gtk-find</property> > <property name="icon_size">1</property> > @@ -2710,16 +2722,16 @@ > </child> > > <child> > - <widget class="GtkImageMenuItem" id="find_document_usage1"> > + <widget class="GtkImageMenuItem" id="goto_tag_definition1"> > <property name="visible">True</property> > - <property name="label" translatable="yes">Find _Document Usage</property> > + <property name="label" translatable="yes">Go to _Tag Definition</property> > <property name="use_underline">True</property> > - <signal name="activate" handler="on_find_document_usage1_activate" last_modification_time="Thu, 17 Jul 2008 13:42:25 GMT"/> > + <signal name="activate" handler="on_goto_tag_definition1" last_modification_time="Thu, 09 Sep 2010 11:30:52 GMT"/> > > <child internal-child="image"> > - <widget class="GtkImage" id="image3415"> > + <widget class="GtkImage" id="image3487"> > <property name="visible">True</property> > - <property name="stock">gtk-find</property> > + <property name="stock">gtk-jump-to</property> > <property name="icon_size">1</property> > <property name="xalign">0.5</property> > <property name="yalign">0.5</property> > @@ -2731,24 +2743,6 @@ > </child> > > <child> > - <widget class="GtkMenuItem" id="goto_tag_definition1"> > - <property name="visible">True</property> > - <property name="label" translatable="yes">Go to _Tag Definition</property> > - <property name="use_underline">True</property> > - <signal name="activate" handler="on_goto_tag_definition1" last_modification_time="Thu, 09 Sep 2010 11:30:52 GMT"/> > - </widget> > - </child> > - > - <child> > - <widget class="GtkMenuItem" id="goto_tag_declaration1"> > - <property name="visible">True</property> > - <property name="label" translatable="yes">Go to T_ag Declaration</property> > - <property name="use_underline">True</property> > - <signal name="activate" handler="on_goto_tag_declaration1" last_modification_time="Thu, 09 Sep 2010 11:30:52 GMT"/> > - </widget> > - </child> > - > - <child> > <widget class="GtkMenuItem" id="context_action1"> > <property name="visible">True</property> > <property name="label" translatable="yes">Conte_xt Action</property> > @@ -2756,33 +2750,6 @@ > <signal name="activate" handler="on_context_action1_activate" last_modification_time="Fri, 13 Apr 2007 18:37:55 GMT"/> > </widget> > </child> > - > - <child> > - <widget class="GtkSeparatorMenuItem" id="separator15"> > - <property name="visible">True</property> > - </widget> > - </child> > - > - <child> > - <widget class="GtkImageMenuItem" id="go_to_line"> > - <property name="visible">True</property> > - <property name="label" translatable="yes">_Go to Line</property> > - <property name="use_underline">True</property> > - <signal name="activate" handler="on_go_to_line_activate" last_modification_time="Sat, 16 Jul 2005 11:20:32 GMT"/> > - > - <child internal-child="image"> > - <widget class="GtkImage" id="image3416"> > - <property name="visible">True</property> > - <property name="stock">gtk-jump-to</property> > - <property name="icon_size">1</property> > - <property name="xalign">0.5</property> > - <property name="yalign">0.5</property> > - <property name="xpad">0</property> > - <property name="ypad">0</property> > - </widget> > - </child> > - </widget> > - </child> > </widget> > > <widget class="GtkDialog" id="prefs_dialog"> > > Modified: trunk/src/interface.c > =================================================================== > --- trunk/src/interface.c 2010-09-09 17:31:27 UTC (rev 5222) > +++ trunk/src/interface.c 2010-09-13 14:39:32 UTC (rev 5223) > @@ -2002,12 +2002,13 @@ > GtkWidget *menu_select_all2; > GtkWidget *separator26; > GtkWidget *menu_open_selected_file2; > + GtkWidget *image3482; > GtkWidget *separator36; > GtkWidget *menu_format2; > GtkWidget *commands1; > GtkWidget *separator17; > GtkWidget *comments; > - GtkWidget *image3411; > + GtkWidget *image3483; > GtkWidget *comments_menu; > GtkWidget *add_changelog_entry2; > GtkWidget *insert_file_header2; > @@ -2016,24 +2017,19 @@ > GtkWidget *insert_gpl_notice1; > GtkWidget *insert_bsd_license_notice1; > GtkWidget *insert_date2; > - GtkWidget *image3412; > + GtkWidget *image3484; > GtkWidget *insert_date2_menu; > GtkWidget *invisible10; > GtkWidget *insert_include1; > - GtkWidget *image3413; > + GtkWidget *image3485; > GtkWidget *insert_include1_menu; > GtkWidget *invisible3; > GtkWidget *separator7; > GtkWidget *find_usage1; > - GtkWidget *image3414; > - GtkWidget *find_document_usage1; > - GtkWidget *image3415; > + GtkWidget *image3486; > GtkWidget *goto_tag_definition1; > - GtkWidget *goto_tag_declaration1; > + GtkWidget *image3487; > GtkWidget *context_action1; > - GtkWidget *separator15; > - GtkWidget *go_to_line; > - GtkWidget *image3416; > GtkAccelGroup *accel_group; > > accel_group = gtk_accel_group_new (); > @@ -2083,10 +2079,14 @@ > gtk_container_add (GTK_CONTAINER (edit_menu1), separator26); > gtk_widget_set_sensitive (separator26, FALSE); > > - menu_open_selected_file2 = gtk_menu_item_new_with_mnemonic (_("Open Selected F_ile")); > + menu_open_selected_file2 = gtk_image_menu_item_new_with_mnemonic (_("Open Selected F_ile")); > gtk_widget_show (menu_open_selected_file2); > gtk_container_add (GTK_CONTAINER (edit_menu1), menu_open_selected_file2); > > + image3482 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_MENU); > + gtk_widget_show (image3482); > + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_open_selected_file2), image3482); > + > separator36 = gtk_separator_menu_item_new (); > gtk_widget_show (separator36); > gtk_container_add (GTK_CONTAINER (edit_menu1), separator36); > @@ -2109,9 +2109,9 @@ > gtk_widget_show (comments); > gtk_container_add (GTK_CONTAINER (edit_menu1), comments); > > - image3411 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); > - gtk_widget_show (image3411); > - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (comments), image3411); > + image3483 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); > + gtk_widget_show (image3483); > + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (comments), image3483); > > comments_menu = gtk_menu_new (); > gtk_menu_item_set_submenu (GTK_MENU_ITEM (comments), comments_menu); > @@ -2144,9 +2144,9 @@ > gtk_widget_show (insert_date2); > gtk_container_add (GTK_CONTAINER (edit_menu1), insert_date2); > > - image3412 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); > - gtk_widget_show (image3412); > - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_date2), image3412); > + image3484 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); > + gtk_widget_show (image3484); > + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_date2), image3484); > > insert_date2_menu = gtk_menu_new (); > gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert_date2), insert_date2_menu); > @@ -2158,9 +2158,9 @@ > gtk_widget_show (insert_include1); > gtk_container_add (GTK_CONTAINER (edit_menu1), insert_include1); > > - image3413 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); > - gtk_widget_show (image3413); > - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include1), image3413); > + image3485 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); > + gtk_widget_show (image3485); > + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include1), image3485); > > insert_include1_menu = gtk_menu_new (); > gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert_include1), insert_include1_menu); > @@ -2177,43 +2177,22 @@ > gtk_widget_show (find_usage1); > gtk_container_add (GTK_CONTAINER (edit_menu1), find_usage1); > > - image3414 = gtk_image_new_from_stock ("gtk-find", GTK_ICON_SIZE_MENU); > - gtk_widget_show (image3414); > - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (find_usage1), image3414); > + image3486 = gtk_image_new_from_stock ("gtk-find", GTK_ICON_SIZE_MENU); > + gtk_widget_show (image3486); > + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (find_usage1), image3486); > > - find_document_usage1 = gtk_image_menu_item_new_with_mnemonic (_("Find _Document Usage")); > - gtk_widget_show (find_document_usage1); > - gtk_container_add (GTK_CONTAINER (edit_menu1), find_document_usage1); > - > - image3415 = gtk_image_new_from_stock ("gtk-find", GTK_ICON_SIZE_MENU); > - gtk_widget_show (image3415); > - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (find_document_usage1), image3415); > - > - goto_tag_definition1 = gtk_menu_item_new_with_mnemonic (_("Go to _Tag Definition")); > + goto_tag_definition1 = gtk_image_menu_item_new_with_mnemonic (_("Go to _Tag Definition")); > gtk_widget_show (goto_tag_definition1); > gtk_container_add (GTK_CONTAINER (edit_menu1), goto_tag_definition1); > > - goto_tag_declaration1 = gtk_menu_item_new_with_mnemonic (_("Go to T_ag Declaration")); > - gtk_widget_show (goto_tag_declaration1); > - gtk_container_add (GTK_CONTAINER (edit_menu1), goto_tag_declaration1); > + image3487 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU); > + gtk_widget_show (image3487); > + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (goto_tag_definition1), image3487); > > context_action1 = gtk_menu_item_new_with_mnemonic (_("Conte_xt Action")); > gtk_widget_show (context_action1); > gtk_container_add (GTK_CONTAINER (edit_menu1), context_action1); > > - separator15 = gtk_separator_menu_item_new (); > - gtk_widget_show (separator15); > - gtk_container_add (GTK_CONTAINER (edit_menu1), separator15); > - gtk_widget_set_sensitive (separator15, FALSE); > - > - go_to_line = gtk_image_menu_item_new_with_mnemonic (_("_Go to Line")); > - gtk_widget_show (go_to_line); > - gtk_container_add (GTK_CONTAINER (edit_menu1), go_to_line); > - > - image3416 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU); > - gtk_widget_show (image3416); > - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line), image3416); > - > g_signal_connect ((gpointer) undo1, "activate", > G_CALLBACK (on_undo1_activate), > NULL); > @@ -2259,21 +2238,12 @@ > g_signal_connect ((gpointer) find_usage1, "activate", > G_CALLBACK (on_find_usage1_activate), > NULL); > - g_signal_connect ((gpointer) find_document_usage1, "activate", > - G_CALLBACK (on_find_document_usage1_activate), > - NULL); > g_signal_connect ((gpointer) goto_tag_definition1, "activate", > G_CALLBACK (on_goto_tag_definition1), > NULL); > - g_signal_connect ((gpointer) goto_tag_declaration1, "activate", > - G_CALLBACK (on_goto_tag_declaration1), > - NULL); > g_signal_connect ((gpointer) context_action1, "activate", > G_CALLBACK (on_context_action1_activate), > NULL); > - g_signal_connect ((gpointer) go_to_line, "activate", > - G_CALLBACK (on_go_to_line_activate), > - NULL); > > /* Store pointers to all widgets, for use by lookup_widget(). */ > GLADE_HOOKUP_OBJECT_NO_REF (edit_menu1, edit_menu1, "edit_menu1"); > @@ -2288,12 +2258,13 @@ > GLADE_HOOKUP_OBJECT (edit_menu1, menu_select_all2, "menu_select_all2"); > GLADE_HOOKUP_OBJECT (edit_menu1, separator26, "separator26"); > GLADE_HOOKUP_OBJECT (edit_menu1, menu_open_selected_file2, "menu_open_selected_file2"); > + GLADE_HOOKUP_OBJECT (edit_menu1, image3482, "image3482"); > GLADE_HOOKUP_OBJECT (edit_menu1, separator36, "separator36"); > GLADE_HOOKUP_OBJECT (edit_menu1, menu_format2, "menu_format2"); > GLADE_HOOKUP_OBJECT (edit_menu1, commands1, "commands1"); > GLADE_HOOKUP_OBJECT (edit_menu1, separator17, "separator17"); > GLADE_HOOKUP_OBJECT (edit_menu1, comments, "comments"); > - GLADE_HOOKUP_OBJECT (edit_menu1, image3411, "image3411"); > + GLADE_HOOKUP_OBJECT (edit_menu1, image3483, "image3483"); > GLADE_HOOKUP_OBJECT (edit_menu1, comments_menu, "comments_menu"); > GLADE_HOOKUP_OBJECT (edit_menu1, add_changelog_entry2, "add_changelog_entry2"); > GLADE_HOOKUP_OBJECT (edit_menu1, insert_file_header2, "insert_file_header2"); > @@ -2302,24 +2273,19 @@ > GLADE_HOOKUP_OBJECT (edit_menu1, insert_gpl_notice1, "insert_gpl_notice1"); > GLADE_HOOKUP_OBJECT (edit_menu1, insert_bsd_license_notice1, "insert_bsd_license_notice1"); > GLADE_HOOKUP_OBJECT (edit_menu1, insert_date2, "insert_date2"); > - GLADE_HOOKUP_OBJECT (edit_menu1, image3412, "image3412"); > + GLADE_HOOKUP_OBJECT (edit_menu1, image3484, "image3484"); > GLADE_HOOKUP_OBJECT (edit_menu1, insert_date2_menu, "insert_date2_menu"); > GLADE_HOOKUP_OBJECT (edit_menu1, invisible10, "invisible10"); > GLADE_HOOKUP_OBJECT (edit_menu1, insert_include1, "insert_include1"); > - GLADE_HOOKUP_OBJECT (edit_menu1, image3413, "image3413"); > + GLADE_HOOKUP_OBJECT (edit_menu1, image3485, "image3485"); > GLADE_HOOKUP_OBJECT (edit_menu1, insert_include1_menu, "insert_include1_menu"); > GLADE_HOOKUP_OBJECT (edit_menu1, invisible3, "invisible3"); > GLADE_HOOKUP_OBJECT (edit_menu1, separator7, "separator7"); > GLADE_HOOKUP_OBJECT (edit_menu1, find_usage1, "find_usage1"); > - GLADE_HOOKUP_OBJECT (edit_menu1, image3414, "image3414"); > - GLADE_HOOKUP_OBJECT (edit_menu1, find_document_usage1, "find_document_usage1"); > - GLADE_HOOKUP_OBJECT (edit_menu1, image3415, "image3415"); > + GLADE_HOOKUP_OBJECT (edit_menu1, image3486, "image3486"); > GLADE_HOOKUP_OBJECT (edit_menu1, goto_tag_definition1, "goto_tag_definition1"); > - GLADE_HOOKUP_OBJECT (edit_menu1, goto_tag_declaration1, "goto_tag_declaration1"); > + GLADE_HOOKUP_OBJECT (edit_menu1, image3487, "image3487"); > GLADE_HOOKUP_OBJECT (edit_menu1, context_action1, "context_action1"); > - GLADE_HOOKUP_OBJECT (edit_menu1, separator15, "separator15"); > - GLADE_HOOKUP_OBJECT (edit_menu1, go_to_line, "go_to_line"); > - GLADE_HOOKUP_OBJECT (edit_menu1, image3416, "image3416"); > > gtk_menu_set_accel_group (GTK_MENU (edit_menu1), accel_group); > > > Modified: trunk/src/keybindings.c > =================================================================== > --- trunk/src/keybindings.c 2010-09-09 17:31:27 UTC (rev 5222) > +++ trunk/src/keybindings.c 2010-09-13 14:39:32 UTC (rev 5223) > @@ -727,12 +727,9 @@ > > group = g_ptr_array_index(keybinding_groups, GEANY_KEY_GROUP_SEARCH); > GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_SEARCH_FINDUSAGE, find_usage1); > - GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_SEARCH_FINDDOCUMENTUSAGE, find_document_usage1); > > group = g_ptr_array_index(keybinding_groups, GEANY_KEY_GROUP_GOTO); > - GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_GOTO_LINE, go_to_line); > GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_GOTO_TAGDEFINITION, goto_tag_definition1); > - GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_GOTO_TAGDECLARATION, goto_tag_declaration1); > > /* Format and Commands share the menu bar submenus */ > /* Build menu items are set if the build menus are created */ > > Modified: trunk/src/ui_utils.c > =================================================================== > --- trunk/src/ui_utils.c 2010-09-09 17:31:27 UTC (rev 5222) > +++ trunk/src/ui_utils.c 2010-09-13 14:39:32 UTC (rev 5223) > @@ -68,7 +68,7 @@ > * also be GtkAction objects, so check each pointer before using it */ > GPtrArray *document_buttons; > GtkWidget *menu_insert_include_items[2]; > - GtkWidget *popup_goto_items[4]; > + GtkWidget *popup_goto_items[3]; > GtkWidget *popup_copy_items[3]; > GtkWidget *menu_copy_items[3]; > GtkWidget *redo_items[3]; > @@ -2033,10 +2033,11 @@ > > main_widgets.progressbar = progress_bar_create(); > > + /* current word sensitive items */ > widgets.popup_goto_items[0] = ui_lookup_widget(main_widgets.editor_menu, "goto_tag_definition1"); > - widgets.popup_goto_items[1] = ui_lookup_widget(main_widgets.editor_menu, "goto_tag_declaration1"); > + widgets.popup_goto_items[1] = ui_lookup_widget(main_widgets.editor_menu, "context_action1"); > widgets.popup_goto_items[2] = ui_lookup_widget(main_widgets.editor_menu, "find_usage1"); > - widgets.popup_goto_items[3] = ui_lookup_widget(main_widgets.editor_menu, "find_document_usage1"); > + > widgets.popup_copy_items[0] = ui_lookup_widget(main_widgets.editor_menu, "cut1"); > widgets.popup_copy_items[1] = ui_lookup_widget(main_widgets.editor_menu, "copy1"); > widgets.popup_copy_items[2] = ui_lookup_widget(main_widgets.editor_menu, "delete1"); > > > This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. > _______________________________________________ > Geany-commits mailing list > Geany-commits(a)uvena.de > http://lists.uvena.de/cgi-bin/mailman/listinfo/geany-commits >

3 4

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

Devel September 2010