Commits April 2007

commits@lists.geany.org

3 participants
60 discussions

SF.net SVN: geany: [1453] trunk
by eht16＠users.sourceforge.net 15 Apr '07

15 Apr '07

Revision: 1453 http://svn.sourceforge.net/geany/?rev=1453&view=rev Author: eht16 Date: 2007-04-15 11:09:59 -0700 (Sun, 15 Apr 2007) Log Message: ----------- Added context actions to run custom commands on current selection or the current word below cursor. Modified Paths: -------------- trunk/ChangeLog trunk/data/filetypes.asm trunk/data/filetypes.c trunk/data/filetypes.caml trunk/data/filetypes.conf trunk/data/filetypes.cpp trunk/data/filetypes.css trunk/data/filetypes.d trunk/data/filetypes.diff trunk/data/filetypes.docbook trunk/data/filetypes.ferite trunk/data/filetypes.fortran trunk/data/filetypes.html trunk/data/filetypes.java trunk/data/filetypes.javascript trunk/data/filetypes.latex trunk/data/filetypes.lua trunk/data/filetypes.makefile trunk/data/filetypes.oms trunk/data/filetypes.pascal trunk/data/filetypes.perl trunk/data/filetypes.php trunk/data/filetypes.python trunk/data/filetypes.ruby trunk/data/filetypes.sh trunk/data/filetypes.sql trunk/data/filetypes.tcl trunk/data/filetypes.vhdl trunk/data/filetypes.xml trunk/doc/geany.docbook trunk/geany.glade trunk/src/callbacks.c trunk/src/callbacks.h trunk/src/filetypes.c trunk/src/filetypes.h trunk/src/geany.h trunk/src/interface.c trunk/src/keybindings.c trunk/src/keybindings.h trunk/src/keyfile.c trunk/src/main.c trunk/src/prefs.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-04-15 16:13:57 UTC (rev 1452) +++ trunk/ChangeLog 2007-04-15 18:09:59 UTC (rev 1453) @@ -1,3 +1,13 @@ +2007-04-15 Enrico Tröger <enrico.troeger(a)uvena.de> + + * geany.glade, data/filetypes.*, doc/geany.docbook, src/callbacks.c, + src/callbacks.h, src/filetypes.c, src/filetypes.h, src/geany.h, + src/interface.c, src/keybindings.c, src/keybindings.h, src/keyfile.c, + src/main.c, src/prefs.c: + Added context actions to run custom commands on current selection or + the current word below cursor. + + 2007-04-15 Nick Treleaven <nick.treleaven(a)btinternet.com> * src/sci_cb.c: Modified: trunk/data/filetypes.asm =================================================================== --- trunk/data/filetypes.asm 2007-04-15 16:13:57 UTC (rev 1452) +++ trunk/data/filetypes.asm 2007-04-15 18:09:59 UTC (rev 1453) @@ -41,6 +41,9 @@ # This setting works only for single line comments comment_use_indent=true +# context action command (please see Geany's main documentation for details) +context_action_cmd= + [build_settings] # %f will be replaced by the complete filename # %e will be replaced by the filename without extension Modified: trunk/data/filetypes.c =================================================================== --- trunk/data/filetypes.c 2007-04-15 16:13:57 UTC (rev 1452) +++ trunk/data/filetypes.c 2007-04-15 18:09:59 UTC (rev 1453) @@ -51,6 +51,9 @@ # This setting works only for single line comments comment_use_indent=true +# context action command (please see Geany's main documentation for details) +context_action_cmd= + [build_settings] # %f will be replaced by the complete filename # %e will be replaced by the filename without extension Modified: trunk/data/filetypes.caml =================================================================== --- trunk/data/filetypes.caml 2007-04-15 16:13:57 UTC (rev 1452) +++ trunk/data/filetypes.caml 2007-04-15 18:09:59 UTC (rev 1453) @@ -38,6 +38,9 @@ # This setting works only for single line comments comment_use_indent=true +# context action command (please see Geany's main documentation for details) +context_action_cmd= + [build_settings] # %f will be replaced by the complete filename # %e will be replaced by the filename without extension Modified: trunk/data/filetypes.conf =================================================================== --- trunk/data/filetypes.conf 2007-04-15 16:13:57 UTC (rev 1452) +++ trunk/data/filetypes.conf 2007-04-15 18:09:59 UTC (rev 1453) @@ -26,3 +26,6 @@ # command_example(); # This setting works only for single line comments comment_use_indent=true + +# context action command (please see Geany's main documentation for details) +context_action_cmd= Modified: trunk/data/filetypes.cpp =================================================================== --- trunk/data/filetypes.cpp 2007-04-15 16:13:57 UTC (rev 1452) +++ trunk/data/filetypes.cpp 2007-04-15 18:09:59 UTC (rev 1453) @@ -51,6 +51,9 @@ # This setting works only for single line comments comment_use_indent=true +# context action command (please see Geany's main documentation for details) +context_action_cmd= + [build_settings] # %f will be replaced by the complete filename # %e will be replaced by the filename without extension Modified: trunk/data/filetypes.css =================================================================== --- trunk/data/filetypes.css 2007-04-15 16:13:57 UTC (rev 1452) +++ trunk/data/filetypes.css 2007-04-15 18:09:59 UTC (rev 1453) @@ -39,3 +39,6 @@ # command_example(); # This setting works only for single line comments comment_use_indent=true + +# context action command (please see Geany's main documentation for details) +context_action_cmd= Modified: trunk/data/filetypes.d =================================================================== --- trunk/data/filetypes.d 2007-04-15 16:13:57 UTC (rev 1452) +++ trunk/data/filetypes.d 2007-04-15 18:09:59 UTC (rev 1453) @@ -50,6 +50,9 @@ # This setting works only for single line comments comment_use_indent=true +# context action command (please see Geany's main documentation for details) +context_action_cmd= + [build_settings] # %f will be replaced by the complete filename # %e will be replaced by the filename without extension Modified: trunk/data/filetypes.diff =================================================================== --- trunk/data/filetypes.diff 2007-04-15 16:13:57 UTC (rev 1452) +++ trunk/data/filetypes.diff 2007-04-15 18:09:59 UTC (rev 1453) @@ -18,3 +18,6 @@ comment_open= comment_close= +# context action command (please see Geany's main documentation for details) +context_action_cmd= + Modified: trunk/data/filetypes.docbook =================================================================== --- trunk/data/filetypes.docbook 2007-04-15 16:13:57 UTC (rev 1452) +++ trunk/data/filetypes.docbook 2007-04-15 18:09:59 UTC (rev 1453) @@ -52,3 +52,6 @@ # command_example(); # This setting works only for single line comments comment_use_indent=true + +# context action command (please see Geany's main documentation for details) +context_action_cmd= Modified: trunk/data/filetypes.ferite =================================================================== --- trunk/data/filetypes.ferite 2007-04-15 16:13:57 UTC (rev 1452) +++ trunk/data/filetypes.ferite 2007-04-15 18:09:59 UTC (rev 1453) @@ -47,6 +47,9 @@ # This setting works only for single line comments comment_use_indent=true +# context action command (please see Geany's main documentation for details) +context_action_cmd= + [build_settings] # %f will be replaced by the complete filename # %e will be replaced by the filename without extension Modified: trunk/data/filetypes.fortran =================================================================== --- trunk/data/filetypes.fortran 2007-04-15 16:13:57 UTC (rev 1452) +++ trunk/data/filetypes.fortran 2007-04-15 18:09:59 UTC (rev 1453) @@ -42,7 +42,10 @@ # This setting works only for single line comments comment_use_indent=false +# context action command (please see Geany's main documentation for details) +context_action_cmd= + [build_settings] # %f will be replaced by the complete filename # %e will be replaced by the filename without extension Modified: trunk/data/filetypes.html =================================================================== --- trunk/data/filetypes.html 2007-04-15 16:13:57 UTC (rev 1452) +++ trunk/data/filetypes.html 2007-04-15 18:09:59 UTC (rev 1453) @@ -20,6 +20,9 @@ # This setting works only for single line comments comment_use_indent=true +# context action command (please see Geany's main documentation for details) +context_action_cmd= + [build_settings] # %f will be replaced by the complete filename # %e will be replaced by the filename without extension Modified: trunk/data/filetypes.java =================================================================== --- trunk/data/filetypes.java 2007-04-15 16:13:57 UTC (rev 1452) +++ trunk/data/filetypes.java 2007-04-15 18:09:59 UTC (rev 1453) @@ -46,7 +46,10 @@ # This setting works only for single line comments comment_use_indent=true +# context action command (please see Geany's main documentation for details) +context_action_cmd= + [build_settings] # %f will be replaced by the complete filename # %e will be replaced by the filename without extension Modified: trunk/data/filetypes.javascript =================================================================== --- trunk/data/filetypes.javascript 2007-04-15 16:13:57 UTC (rev 1452) +++ trunk/data/filetypes.javascript 2007-04-15 18:09:59 UTC (rev 1453) @@ -42,6 +42,9 @@ # This setting works only for single line comments comment_use_indent=true +# context action command (please see Geany's main documentation for details) +context_action_cmd= + [build_settings] # %f will be replaced by the complete filename # %e will be replaced by the filename without extension Modified: trunk/data/filetypes.latex =================================================================== --- trunk/data/filetypes.latex 2007-04-15 16:13:57 UTC (rev 1452) +++ trunk/data/filetypes.latex 2007-04-15 18:09:59 UTC (rev 1453) @@ -28,6 +28,9 @@ # This setting works only for single line comments comment_use_indent=true +# context action command (please see Geany's main documentation for details) +context_action_cmd= + [build_settings] # %f will be replaced by the complete filename # %e will be replaced by the filename without extension Modified: trunk/data/filetypes.lua =================================================================== --- trunk/data/filetypes.lua 2007-04-15 16:13:57 UTC (rev 1452) +++ trunk/data/filetypes.lua 2007-04-15 18:09:59 UTC (rev 1453) @@ -56,6 +56,9 @@ # This setting works only for single line comments comment_use_indent=true +# context action command (please see Geany's main documentation for details) +context_action_cmd= + [build_settings] # %f will be replaced by the complete filename # %e will be replaced by the filename without extension Modified: trunk/data/filetypes.makefile =================================================================== --- trunk/data/filetypes.makefile 2007-04-15 16:13:57 UTC (rev 1452) +++ trunk/data/filetypes.makefile 2007-04-15 18:09:59 UTC (rev 1453) @@ -27,3 +27,6 @@ # command_example(); # This setting works only for single line comments comment_use_indent=true + +# context action command (please see Geany's main documentation for details) +context_action_cmd= Modified: trunk/data/filetypes.oms =================================================================== --- trunk/data/filetypes.oms 2007-04-15 16:13:57 UTC (rev 1452) +++ trunk/data/filetypes.oms 2007-04-15 18:09:59 UTC (rev 1453) @@ -33,3 +33,6 @@ # command_example(); # This setting works only for single line comments comment_use_indent=true + +# context action command (please see Geany's main documentation for details) +context_action_cmd= Modified: trunk/data/filetypes.pascal =================================================================== --- trunk/data/filetypes.pascal 2007-04-15 16:13:57 UTC (rev 1452) +++ trunk/data/filetypes.pascal 2007-04-15 18:09:59 UTC (rev 1453) @@ -34,6 +34,9 @@ # This setting works only for single line comments comment_use_indent=true +# context action command (please see Geany's main documentation for details) +context_action_cmd= + [build_settings] # %f will be replaced by the complete filename # %e will be replaced by the filename without extension Modified: trunk/data/filetypes.perl =================================================================== --- trunk/data/filetypes.perl 2007-04-15 16:13:57 UTC (rev 1452) +++ trunk/data/filetypes.perl 2007-04-15 18:09:59 UTC (rev 1453) @@ -52,6 +52,9 @@ # This setting works only for single line comments comment_use_indent=true +# context action command (please see Geany's main documentation for details) +context_action_cmd= + [build_settings] # %f will be replaced by the complete filename # %e will be replaced by the filename without extension Modified: trunk/data/filetypes.php =================================================================== --- trunk/data/filetypes.php 2007-04-15 16:13:57 UTC (rev 1452) +++ trunk/data/filetypes.php 2007-04-15 18:09:59 UTC (rev 1453) @@ -20,6 +20,9 @@ # This setting works only for single line comments comment_use_indent=true +# context action command (please see Geany's main documentation for details) +context_action_cmd= + [build_settings] # %f will be replaced by the complete filename # %e will be replaced by the filename without extension Modified: trunk/data/filetypes.python =================================================================== --- trunk/data/filetypes.python 2007-04-15 16:13:57 UTC (rev 1452) +++ trunk/data/filetypes.python 2007-04-15 18:09:59 UTC (rev 1453) @@ -37,6 +37,9 @@ # This setting works only for single line comments comment_use_indent=true +# context action command (please see Geany's main documentation for details) +context_action_cmd= + [build_settings] # %f will be replaced by the complete filename # %e will be replaced by the filename without extension Modified: trunk/data/filetypes.ruby =================================================================== --- trunk/data/filetypes.ruby 2007-04-15 16:13:57 UTC (rev 1452) +++ trunk/data/filetypes.ruby 2007-04-15 18:09:59 UTC (rev 1453) @@ -56,6 +56,9 @@ # This setting works only for single line comments comment_use_indent=true +# context action command (please see Geany's main documentation for details) +context_action_cmd= + [build_settings] # %f will be replaced by the complete filename # %e will be replaced by the filename without extension Modified: trunk/data/filetypes.sh =================================================================== --- trunk/data/filetypes.sh 2007-04-15 16:13:57 UTC (rev 1452) +++ trunk/data/filetypes.sh 2007-04-15 18:09:59 UTC (rev 1453) @@ -33,6 +33,9 @@ # This setting works only for single line comments comment_use_indent=true +# context action command (please see Geany's main documentation for details) +context_action_cmd= + [build_settings] # %f will be replaced by the complete filename # %e will be replaced by the filename without extension Modified: trunk/data/filetypes.sql =================================================================== --- trunk/data/filetypes.sql 2007-04-15 16:13:57 UTC (rev 1452) +++ trunk/data/filetypes.sql 2007-04-15 18:09:59 UTC (rev 1453) @@ -37,3 +37,6 @@ # command_example(); # This setting works only for single line comments comment_use_indent=true + +# context action command (please see Geany's main documentation for details) +context_action_cmd= Modified: trunk/data/filetypes.tcl =================================================================== --- trunk/data/filetypes.tcl 2007-04-15 16:13:57 UTC (rev 1452) +++ trunk/data/filetypes.tcl 2007-04-15 18:09:59 UTC (rev 1453) @@ -44,7 +44,13 @@ # This setting works only for single line comments comment_use_indent=true +# context action command (please see Geany's main documentation for details) +context_action_cmd= +# context action command (please see Geany's main documentation for details) +context_action_cmd= + + [build_settings] # %f will be replaced by the complete filename # %e will be replaced by the filename without extension Modified: trunk/data/filetypes.vhdl =================================================================== --- trunk/data/filetypes.vhdl 2007-04-15 16:13:57 UTC (rev 1452) +++ trunk/data/filetypes.vhdl 2007-04-15 18:09:59 UTC (rev 1453) @@ -43,4 +43,7 @@ # This setting works only for single line comments comment_use_indent=true +# context action command (please see Geany's main documentation for details) +context_action_cmd= + Modified: trunk/data/filetypes.xml =================================================================== --- trunk/data/filetypes.xml 2007-04-15 16:13:57 UTC (rev 1452) +++ trunk/data/filetypes.xml 2007-04-15 18:09:59 UTC (rev 1453) @@ -90,3 +90,5 @@ # This setting works only for single line comments comment_use_indent=true +# context action command (please see Geany's main documentation for details) +context_action_cmd= Modified: trunk/doc/geany.docbook =================================================================== --- trunk/doc/geany.docbook 2007-04-15 16:13:57 UTC (rev 1452) +++ trunk/doc/geany.docbook 2007-04-15 18:09:59 UTC (rev 1453) @@ -5,7 +5,7 @@ <!ENTITY appversion "0.11"> <!ENTITY appurl "http://geany.uvena.de"> <!ENTITY author_mail "enrico.troeger(a)uvena.de"> -<!ENTITY date "March 08, 2007"> +<!ENTITY date "April 15, 2007"> <!ENTITY legal SYSTEM "geany_gpl.docbook"> <!ENTITY scikeybinding SYSTEM "scikeybinding.docbook"> ]> @@ -608,6 +608,37 @@ automatically. </para> </section> + <section id="editing_context_actions"> + <title>Context actions</title> + <para> + You can execute a specified command on the current word near the cursor + position or an available selection and this word is passed as an argument + to this command. It can be used for example to open some API documentation + in a browser window or open any other external program. To do this, + there is an menu entry in the popup menu of the editor widget and also a + keyboard shortcut(see <xref linkend="keybindings"/>). + </para> + <para> + The command can be specified in the preferences dialog and additionally for + each filetype (see "context_action_cmd" in <xref linkend="filetypes_format"/>). + At executing, the filetype specific command is used if available otherwise the + command specified in the preferences dialog is executed. + </para> + <para> + The passed word can be referred with the wildcard "%s" everywhere in the + command, before executing it will be replaced by the current word. + For example, the command to open the PHP API documentation would be: + </para> + <para> + <command>firefox "http://www.php.net/%s"</command> + </para> + <para> + when executing the command, the %s is substituted by the word near the + cursor position or by the current selection. If the cursor is at the word + "echo", a browser window will open(assumed your browser is called firefox) + and it will open the address: http://www.php.net/echo. + </para> + </section> </section> <section id="search_replace"> <title>Search, replace and go to</title> @@ -1649,8 +1680,8 @@ </row> <row> <entry>Find Usage</entry> - <entry>Finds all occurrences of the current word (near the - keyboard cursor) and displays them in the messages window. + <entry>Finds all occurrences of the current word (near the keyboard + cursor) or selection and displays them in the messages window. </entry> </row> <row> @@ -1669,6 +1700,13 @@ will beep and do nothing. See <xref linkend="search_gototag"/>. </entry> </row> + <row> + <entry>Context Action</entry> + <entry>Executes a command and passes the current word (near the + cursor postion) or selection as an argument. See + <xref linkend="editing_context_actions"/>. + </entry> + </row> </tbody> </tgroup> </table> @@ -1803,6 +1841,31 @@ </entry> <entry>comment_use_indent=true</entry> </row> + <row> + <entry>context_action_cmd</entry> + <entry><para> + A command which can be executed on a certain word or + the current selection. Example usage: Open the API + documentation for the current function call at the + cursor position. The command can be set for every + filetype or if not set, a global command will be used. + The command itself can be specified without the full + path, then it is searched in $PATH. But for security + reasons, it is recommended to specify the full path + to the command. The wildcard %s will be replaced + by the current word at the cursor position or by + the current selection. + </para> + <para> + Hint: for PHP files the following could be quite + useful: + <emphasis> + context_action_cmd=firefox "http://www.php.net/%s" + </emphasis> + </para> + </entry> + <entry>context_action_cmd=devhelp -s "%s"</entry> + </row> </tbody> </tgroup> </table> Modified: trunk/geany.glade =================================================================== --- trunk/geany.glade 2007-04-15 16:13:57 UTC (rev 1452) +++ trunk/geany.glade 2007-04-15 18:09:59 UTC (rev 1453) @@ -2569,7 +2569,7 @@ <signal name="activate" handler="on_menu_increase_indent1_activate" last_modification_time="Tue, 01 Aug 2006 10:31:38 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image1669"> + <widget class="GtkImage" id="image1693"> <property name="visible">True</property> <property name="stock">gtk-indent</property> <property name="icon_size">1</property> @@ -2590,7 +2590,7 @@ <signal name="activate" handler="on_menu_decrease_indent1_activate" last_modification_time="Tue, 01 Aug 2006 10:31:38 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image1670"> + <widget class="GtkImage" id="image1694"> <property name="visible">True</property> <property name="stock">gtk-unindent</property> <property name="icon_size">1</property> @@ -2646,7 +2646,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image1671"> + <widget class="GtkImage" id="image1695"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -2678,7 +2678,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image1672"> + <widget class="GtkImage" id="image1696"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -2763,7 +2763,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image1673"> + <widget class="GtkImage" id="image1697"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -2802,7 +2802,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="image1674"> + <widget class="GtkImage" id="image1698"> <property name="visible">True</property> <property name="stock">gtk-find</property> <property name="icon_size">1</property> @@ -2834,6 +2834,15 @@ </child> <child> + <widget class="GtkMenuItem" id="context_action1"> + <property name="visible">True</property> + <property name="label" translatable="yes">Context Action</property> + <property name="use_underline">True</property> + <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> @@ -2848,7 +2857,7 @@ <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="image1675"> + <widget class="GtkImage" id="image1699"> <property name="visible">True</property> <property name="stock">gtk-jump-to</property> <property name="icon_size">1</property> @@ -3204,6 +3213,110 @@ <property name="fill">True</property> </packing> </child> + + <child> + <widget class="GtkFrame" id="frame24"> + <property name="visible">True</property> + <property name="label_xalign">0</property> + <property name="label_yalign">0.5</property> + <property name="shadow_type">GTK_SHADOW_NONE</property> + + <child> + <widget class="GtkAlignment" id="alignment27"> + <property name="visible">True</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xscale">1</property> + <property name="yscale">1</property> + <property name="top_padding">0</property> + <property name="bottom_padding">0</property> + <property name="left_padding">12</property> + <property name="right_padding">0</property> + + <child> + <widget class="GtkHBox" id="hbox8"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">0</property> + + <child> + <widget class="GtkLabel" id="label189"> + <property name="visible">True</property> + <property name="label" translatable="yes">Context Action command:</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkEntry" id="entry_contextaction"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">Context action command. The current selected word can be used with %s. It can be everywhere in the given command and will be replaced before execution.</property> + <property name="can_focus">True</property> + <property name="editable">True</property> + <property name="visibility">True</property> + <property name="max_length">0</property> + <property name="text" translatable="yes"></property> + <property name="has_frame">True</property> + <property name="invisible_char">●</property> + <property name="activates_default">False</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + </child> + </widget> + </child> + + <child> + <widget class="GtkLabel" id="label188"> + <property name="visible">True</property> + <property name="label" translatable="yes"><b>Context Action</b></property> + <property name="use_underline">False</property> + <property name="use_markup">True</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="type">label_item</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + </packing> + </child> </widget> <packing> <property name="tab_expand">False</property> Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2007-04-15 16:13:57 UTC (rev 1452) +++ trunk/src/callbacks.c 2007-04-15 18:09:59 UTC (rev 1453) @@ -2084,3 +2084,52 @@ sci_marker_delete_all(doc_list[idx].sci, 1); // delete user markers } + +void +on_context_action1_activate (GtkMenuItem *menuitem, + gpointer user_data) +{ + gint idx; + gchar *word, *command; + GError *error = NULL; + + idx = document_get_cur_idx(); + if (! DOC_IDX_VALID(idx)) return; + + if (sci_can_copy(doc_list[idx].sci)) + { // take selected text if there is a selection + word = g_malloc(sci_get_selected_text_length(doc_list[idx].sci) + 1); + sci_get_selected_text(doc_list[idx].sci, word); + } + else + { + word = g_strdup(editor_info.current_word); + } + + // use the filetype specific command if available, fallback to global command otherwise + if (doc_list[idx].file_type != NULL && + doc_list[idx].file_type->context_action_cmd != NULL && + *doc_list[idx].file_type->context_action_cmd != '\0') + { + command = g_strdup(doc_list[idx].file_type->context_action_cmd); + } + else + { + command = g_strdup(app->context_action_cmd); + } + + // substitute the wildcard %s and run the command if it is non empty + if (command != NULL && *command != '\0') + { + command = utils_str_replace(command, "%s", word); + + if (! g_spawn_command_line_async(command, &error)) + { + msgwin_status_add("Context action command failed: %s", error->message); + g_error_free(error); + } + } + g_free(word); + g_free(command); +} + Modified: trunk/src/callbacks.h =================================================================== --- trunk/src/callbacks.h 2007-04-15 16:13:57 UTC (rev 1452) +++ trunk/src/callbacks.h 2007-04-15 18:09:59 UTC (rev 1453) @@ -595,3 +595,7 @@ void on_remove_markers1_activate (GtkMenuItem *menuitem, gpointer user_data); + +void +on_context_action1_activate (GtkMenuItem *menuitem, + gpointer user_data); Modified: trunk/src/filetypes.c =================================================================== --- trunk/src/filetypes.c 2007-04-15 16:13:57 UTC (rev 1452) +++ trunk/src/filetypes.c 2007-04-15 18:09:59 UTC (rev 1453) @@ -782,6 +782,7 @@ g_free(filetypes[i]->extension); g_free(filetypes[i]->comment_open); g_free(filetypes[i]->comment_close); + g_free(filetypes[i]->context_action_cmd); g_free(filetypes[i]->programs->compiler); g_free(filetypes[i]->programs->linker); g_free(filetypes[i]->programs->run_cmd); @@ -832,6 +833,14 @@ } else filetypes[ft]->comment_use_indent = tmp; + // read context action + result = g_key_file_get_string(configh, "settings", "context_action_cmd", NULL); + if (result == NULL) result = g_key_file_get_string(config, "settings", "context_action_cmd", NULL); + if (result != NULL) + { + filetypes[ft]->context_action_cmd = result; + } + // read build settings result = g_key_file_get_string(configh, "build_settings", "compiler", NULL); if (result == NULL) result = g_key_file_get_string(config, "build_settings", "compiler", NULL); @@ -951,7 +960,7 @@ gint i; g_return_val_if_fail(ft != NULL, NULL); - + new_filter = gtk_file_filter_new(); gtk_file_filter_set_name(new_filter, ft->title); Modified: trunk/src/filetypes.h =================================================================== --- trunk/src/filetypes.h 2007-04-15 16:13:57 UTC (rev 1452) +++ trunk/src/filetypes.h 2007-04-15 18:09:59 UTC (rev 1453) @@ -100,6 +100,7 @@ gchar *title; // will be shown in the file open dialog gchar *extension; gchar **pattern; + gchar *context_action_cmd; gchar *comment_open; gchar *comment_close; gboolean comment_use_indent; Modified: trunk/src/geany.h =================================================================== --- trunk/src/geany.h 2007-04-15 16:13:57 UTC (rev 1452) +++ trunk/src/geany.h 2007-04-15 18:09:59 UTC (rev 1453) @@ -144,6 +144,7 @@ gint long_line_type; gint long_line_column; gchar *long_line_color; + gchar *context_action_cmd; gchar *pref_template_developer; gchar *pref_template_company; gchar *pref_template_mail; Modified: trunk/src/interface.c =================================================================== --- trunk/src/interface.c 2007-04-15 16:13:57 UTC (rev 1452) +++ trunk/src/interface.c 2007-04-15 18:09:59 UTC (rev 1453) @@ -1893,20 +1893,20 @@ GtkWidget *menu_duplicate_line2; GtkWidget *separator31; GtkWidget *menu_increase_indent2; - GtkWidget *image1669; + GtkWidget *image1693; GtkWidget *menu_decrease_indent2; - GtkWidget *image1670; + GtkWidget *image1694; GtkWidget *separator38; GtkWidget *send_selection_to1; GtkWidget *send_selection_to1_menu; GtkWidget *invisible12; GtkWidget *separator17; GtkWidget *insert_include1; - GtkWidget *image1671; + GtkWidget *image1695; GtkWidget *insert_include1_menu; GtkWidget *invisible3; GtkWidget *comments; - GtkWidget *image1672; + GtkWidget *image1696; GtkWidget *comments_menu; GtkWidget *add_changelog_entry2; GtkWidget *insert_file_header2; @@ -1915,17 +1915,18 @@ GtkWidget *insert_gpl_notice1; GtkWidget *insert_bsd_license_notice1; GtkWidget *insert_date2; - GtkWidget *image1673; + GtkWidget *image1697; GtkWidget *insert_date2_menu; GtkWidget *invisible10; GtkWidget *separator7; GtkWidget *find_usage1; - GtkWidget *image1674; + GtkWidget *image1698; GtkWidget *goto_tag_definition1; GtkWidget *goto_tag_declaration1; + GtkWidget *context_action1; GtkWidget *separator15; GtkWidget *go_to_line; - GtkWidget *image1675; + GtkWidget *image1699; GtkAccelGroup *accel_group; GtkTooltips *tooltips; @@ -2032,17 +2033,17 @@ gtk_widget_show (menu_increase_indent2); gtk_container_add (GTK_CONTAINER (menu_format2_menu), menu_increase_indent2); - image1669 = gtk_image_new_from_stock ("gtk-indent", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1669); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_increase_indent2), image1669); + image1693 = gtk_image_new_from_stock ("gtk-indent", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1693); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_increase_indent2), image1693); menu_decrease_indent2 = gtk_image_menu_item_new_with_mnemonic (_("_Decrease Indent")); gtk_widget_show (menu_decrease_indent2); gtk_container_add (GTK_CONTAINER (menu_format2_menu), menu_decrease_indent2); - image1670 = gtk_image_new_from_stock ("gtk-unindent", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1670); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_decrease_indent2), image1670); + image1694 = gtk_image_new_from_stock ("gtk-unindent", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1694); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_decrease_indent2), image1694); separator38 = gtk_separator_menu_item_new (); gtk_widget_show (separator38); @@ -2068,9 +2069,9 @@ gtk_widget_show (insert_include1); gtk_container_add (GTK_CONTAINER (edit_menu1), insert_include1); - image1671 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1671); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include1), image1671); + image1695 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1695); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include1), image1695); insert_include1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert_include1), insert_include1_menu); @@ -2082,9 +2083,9 @@ gtk_widget_show (comments); gtk_container_add (GTK_CONTAINER (edit_menu1), comments); - image1672 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1672); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (comments), image1672); + image1696 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1696); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (comments), image1696); comments_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (comments), comments_menu); @@ -2123,9 +2124,9 @@ gtk_widget_show (insert_date2); gtk_container_add (GTK_CONTAINER (edit_menu1), insert_date2); - image1673 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1673); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_date2), image1673); + image1697 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1697); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_date2), image1697); insert_date2_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert_date2), insert_date2_menu); @@ -2142,9 +2143,9 @@ gtk_widget_show (find_usage1); gtk_container_add (GTK_CONTAINER (edit_menu1), find_usage1); - image1674 = gtk_image_new_from_stock ("gtk-find", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1674); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (find_usage1), image1674); + image1698 = gtk_image_new_from_stock ("gtk-find", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1698); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (find_usage1), image1698); goto_tag_definition1 = gtk_menu_item_new_with_mnemonic (_("Go to Tag Definition")); gtk_widget_show (goto_tag_definition1); @@ -2154,6 +2155,10 @@ gtk_widget_show (goto_tag_declaration1); gtk_container_add (GTK_CONTAINER (edit_menu1), goto_tag_declaration1); + context_action1 = gtk_menu_item_new_with_mnemonic (_("Context 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); @@ -2164,9 +2169,9 @@ gtk_container_add (GTK_CONTAINER (edit_menu1), go_to_line); gtk_tooltips_set_tip (tooltips, go_to_line, _("Goto to the entered line"), NULL); - image1675 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1675); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line), image1675); + image1699 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1699); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line), image1699); g_signal_connect ((gpointer) undo1, "activate", G_CALLBACK (on_undo1_activate), @@ -2243,6 +2248,9 @@ g_signal_connect ((gpointer) goto_tag_declaration1, "activate", G_CALLBACK (on_goto_tag_activate), 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); @@ -2272,20 +2280,20 @@ GLADE_HOOKUP_OBJECT (edit_menu1, menu_duplicate_line2, "menu_duplicate_line2"); GLADE_HOOKUP_OBJECT (edit_menu1, separator31, "separator31"); GLADE_HOOKUP_OBJECT (edit_menu1, menu_increase_indent2, "menu_increase_indent2"); - GLADE_HOOKUP_OBJECT (edit_menu1, image1669, "image1669"); + GLADE_HOOKUP_OBJECT (edit_menu1, image1693, "image1693"); GLADE_HOOKUP_OBJECT (edit_menu1, menu_decrease_indent2, "menu_decrease_indent2"); - GLADE_HOOKUP_OBJECT (edit_menu1, image1670, "image1670"); + GLADE_HOOKUP_OBJECT (edit_menu1, image1694, "image1694"); GLADE_HOOKUP_OBJECT (edit_menu1, separator38, "separator38"); GLADE_HOOKUP_OBJECT (edit_menu1, send_selection_to1, "send_selection_to1"); GLADE_HOOKUP_OBJECT (edit_menu1, send_selection_to1_menu, "send_selection_to1_menu"); GLADE_HOOKUP_OBJECT (edit_menu1, invisible12, "invisible12"); GLADE_HOOKUP_OBJECT (edit_menu1, separator17, "separator17"); GLADE_HOOKUP_OBJECT (edit_menu1, insert_include1, "insert_include1"); - GLADE_HOOKUP_OBJECT (edit_menu1, image1671, "image1671"); + GLADE_HOOKUP_OBJECT (edit_menu1, image1695, "image1695"); GLADE_HOOKUP_OBJECT (edit_menu1, insert_include1_menu, "insert_include1_menu"); GLADE_HOOKUP_OBJECT (edit_menu1, invisible3, "invisible3"); GLADE_HOOKUP_OBJECT (edit_menu1, comments, "comments"); - GLADE_HOOKUP_OBJECT (edit_menu1, image1672, "image1672"); + GLADE_HOOKUP_OBJECT (edit_menu1, image1696, "image1696"); 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"); @@ -2294,17 +2302,18 @@ 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, image1673, "image1673"); + GLADE_HOOKUP_OBJECT (edit_menu1, image1697, "image1697"); GLADE_HOOKUP_OBJECT (edit_menu1, insert_date2_menu, "insert_date2_menu"); GLADE_HOOKUP_OBJECT (edit_menu1, invisible10, "invisible10"); GLADE_HOOKUP_OBJECT (edit_menu1, separator7, "separator7"); GLADE_HOOKUP_OBJECT (edit_menu1, find_usage1, "find_usage1"); - GLADE_HOOKUP_OBJECT (edit_menu1, image1674, "image1674"); + GLADE_HOOKUP_OBJECT (edit_menu1, image1698, "image1698"); 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, 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, image1675, "image1675"); + GLADE_HOOKUP_OBJECT (edit_menu1, image1699, "image1699"); GLADE_HOOKUP_OBJECT_NO_REF (edit_menu1, tooltips, "tooltips"); gtk_menu_set_accel_group (GTK_MENU (edit_menu1), accel_group); @@ -2334,6 +2343,12 @@ GtkWidget *check_switch_pages; GtkWidget *check_ask_suppress_search_dialogs; GtkWidget *label178; + GtkWidget *frame24; + GtkWidget *alignment27; + GtkWidget *hbox8; + GtkWidget *label189; + GtkWidget *entry_contextaction; + GtkWidget *label188; GtkWidget *label94; GtkWidget *vbox14; GtkWidget *frame7; @@ -2649,6 +2664,35 @@ gtk_frame_set_label_widget (GTK_FRAME (frame19), label178); gtk_label_set_use_markup (GTK_LABEL (label178), TRUE); + frame24 = gtk_frame_new (NULL); + gtk_widget_show (frame24); + gtk_box_pack_start (GTK_BOX (vbox20), frame24, FALSE, TRUE, 0); + gtk_frame_set_shadow_type (GTK_FRAME (frame24), GTK_SHADOW_NONE); + + alignment27 = gtk_alignment_new (0.5, 0.5, 1, 1); + gtk_widget_show (alignment27); + gtk_container_add (GTK_CONTAINER (frame24), alignment27); + gtk_alignment_set_padding (GTK_ALIGNMENT (alignment27), 0, 0, 12, 0); + + hbox8 = gtk_hbox_new (FALSE, 0); + gtk_widget_show (hbox8); + gtk_container_add (GTK_CONTAINER (alignment27), hbox8); + + label189 = gtk_label_new (_("Context Action command:")); + gtk_widget_show (label189); + gtk_box_pack_start (GTK_BOX (hbox8), label189, FALSE, FALSE, 0); + + entry_contextaction = gtk_entry_new (); + gtk_widget_show (entry_contextaction); + gtk_box_pack_start (GTK_BOX (hbox8), entry_contextaction, TRUE, TRUE, 0); + gtk_tooltips_set_tip (tooltips, entry_contextaction, _("Context action command. The current selected word can be used with %s. It can be everywhere in the given command and will be replaced before execution."), NULL); + gtk_entry_set_invisible_char (GTK_ENTRY (entry_contextaction), 9679); + + label188 = gtk_label_new (_("<b>Context Action</b>")); + gtk_widget_show (label188); + gtk_frame_set_label_widget (GTK_FRAME (frame24), label188); + gtk_label_set_use_markup (GTK_LABEL (label188), TRUE); + label94 = gtk_label_new (_("General")); gtk_widget_show (label94); gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook2), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook2), 0), label94); @@ -3836,6 +3880,12 @@ GLADE_HOOKUP_OBJECT (prefs_dialog, check_switch_pages, "check_switch_pages"); GLADE_HOOKUP_OBJECT (prefs_dialog, check_ask_suppress_search_dialogs, "check_ask_suppress_search_dialogs"); GLADE_HOOKUP_OBJECT (prefs_dialog, label178, "label178"); + GLADE_HOOKUP_OBJECT (prefs_dialog, frame24, "frame24"); + GLADE_HOOKUP_OBJECT (prefs_dialog, alignment27, "alignment27"); + GLADE_HOOKUP_OBJECT (prefs_dialog, hbox8, "hbox8"); + GLADE_HOOKUP_OBJECT (prefs_dialog, label189, "label189"); + GLADE_HOOKUP_OBJECT (prefs_dialog, entry_contextaction, "entry_contextaction"); + GLADE_HOOKUP_OBJECT (prefs_dialog, label188, "label188"); GLADE_HOOKUP_OBJECT (prefs_dialog, label94, "label94"); GLADE_HOOKUP_OBJECT (prefs_dialog, vbox14, "vbox14"); GLADE_HOOKUP_OBJECT (prefs_dialog, frame7, "frame7"); Modified: trunk/src/keybindings.c =================================================================== --- trunk/src/keybindings.c 2007-04-15 16:13:57 UTC (rev 1452) +++ trunk/src/keybindings.c 2007-04-15 18:09:59 UTC (rev 1453) @@ -274,6 +274,8 @@ 0, 0, "popup_gototagdefinition", _("Go to tag definition")); keys[GEANY_KEYS_POPUP_GOTOTAGDECLARATION] = fill(cb_func_current_word, 0, 0, "popup_gototagdeclaration", _("Go to tag declaration")); + keys[GEANY_KEYS_POPUP_CONTEXTACTION] = fill(cb_func_current_word, + 0, 0, "popup_contextaction", _("Context Action")); // now load user defined keys if (g_key_file_load_from_file(config, configfile, G_KEY_FILE_KEEP_COMMENTS, NULL)) @@ -363,6 +365,7 @@ GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_POPUP_FINDUSAGE, find_usage1); GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_POPUP_GOTOTAGDEFINITION, goto_tag_definition1); GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_POPUP_GOTOTAGDECLARATION, goto_tag_declaration1); + GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_POPUP_CONTEXTACTION, context_action1); GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_MENU_GOTOLINE, go_to_line); GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_EDIT_TOLOWERCASE, to_lower_case1); GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_EDIT_TOUPPERCASE, to_upper_case1); @@ -746,7 +749,6 @@ on_find_nextsel1_activate(NULL, NULL); } - static void cb_func_menu_replace(G_GNUC_UNUSED guint key_id) { on_replace1_activate(NULL, NULL); @@ -905,6 +907,10 @@ on_goto_tag_activate(GTK_MENU_ITEM(lookup_widget(app->popup_menu, "goto_tag_declaration1")), NULL); break; + case GEANY_KEYS_POPUP_CONTEXTACTION: + on_context_action1_activate(GTK_MENU_ITEM(lookup_widget(app->popup_menu, + "context_action1")), NULL); + break; } } Modified: trunk/src/keybindings.h =================================================================== --- trunk/src/keybindings.h 2007-04-15 16:13:57 UTC (rev 1452) +++ trunk/src/keybindings.h 2007-04-15 18:09:59 UTC (rev 1453) @@ -72,6 +72,7 @@ GEANY_KEYS_POPUP_FINDUSAGE, GEANY_KEYS_POPUP_GOTOTAGDEFINITION, GEANY_KEYS_POPUP_GOTOTAGDECLARATION, + GEANY_KEYS_POPUP_CONTEXTACTION, GEANY_KEYS_MENU_FULLSCREEN, GEANY_KEYS_MENU_MESSAGEWINDOW, Modified: trunk/src/keyfile.c =================================================================== --- trunk/src/keyfile.c 2007-04-15 16:13:57 UTC (rev 1452) +++ trunk/src/keyfile.c 2007-04-15 18:09:59 UTC (rev 1453) @@ -153,6 +153,7 @@ } #endif g_key_file_set_string(config, PACKAGE, "custom_date_format", app->custom_date_format); + g_key_file_set_string(config, PACKAGE, "context_action_cmd", app->context_action_cmd); if (app->custom_commands != NULL) { g_key_file_set_string_list(config, PACKAGE, "custom_commands", @@ -348,6 +349,7 @@ app->brace_match_ltgt = utils_get_setting_boolean(config, PACKAGE, "brace_match_ltgt", FALSE); app->switch_msgwin_pages = utils_get_setting_boolean(config, PACKAGE, "switch_msgwin_pages", FALSE); app->custom_date_format = utils_get_setting_string(config, PACKAGE, "custom_date_format", ""); + app->context_action_cmd = utils_get_setting_string(config, PACKAGE, "context_action_cmd", ""); app->custom_commands = g_key_file_get_string_list(config, PACKAGE, "custom_commands", NULL, NULL); app->editor_font = utils_get_setting_string(config, PACKAGE, "editor_font", GEANY_DEFAULT_FONT_EDITOR); app->tagbar_font = utils_get_setting_string(config, PACKAGE, "tagbar_font", GEANY_DEFAULT_FONT_SYMBOL_LIST); Modified: trunk/src/main.c =================================================================== --- trunk/src/main.c 2007-04-15 16:13:57 UTC (rev 1452) +++ trunk/src/main.c 2007-04-15 18:09:59 UTC (rev 1453) @@ -755,6 +755,7 @@ g_free(app->tagbar_font); g_free(app->msgwin_font); g_free(app->long_line_color); + g_free(app->context_action_cmd); g_free(app->pref_template_developer); g_free(app->pref_template_company); g_free(app->pref_template_mail); Modified: trunk/src/prefs.c =================================================================== --- trunk/src/prefs.c 2007-04-15 16:13:57 UTC (rev 1452) +++ trunk/src/prefs.c 2007-04-15 18:09:59 UTC (rev 1453) @@ -112,7 +112,10 @@ widget = lookup_widget(app->prefs_dialog, "radio_tab_left"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), TRUE); + widget = lookup_widget(app->prefs_dialog, "entry_contextaction"); + gtk_entry_set_text(GTK_ENTRY(widget), app->context_action_cmd); + // Interface settings widget = lookup_widget(app->prefs_dialog, "check_list_symbol"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), app->sidebar_symbol_visible); @@ -439,7 +442,11 @@ widget = lookup_widget(app->prefs_dialog, "check_show_notebook_tabs"); app->show_notebook_tabs = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); + widget = lookup_widget(app->prefs_dialog, "entry_contextaction"); + g_free(app->context_action_cmd); + app->context_action_cmd = g_strdup(gtk_entry_get_text(GTK_ENTRY(widget))); + // Interface settings widget = lookup_widget(app->prefs_dialog, "check_list_symbol"); app->sidebar_symbol_visible = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1452] trunk
by ntrel＠users.sourceforge.net 15 Apr '07

15 Apr '07

Revision: 1452 http://svn.sourceforge.net/geany/?rev=1452&view=rev Author: ntrel Date: 2007-04-15 09:13:57 -0700 (Sun, 15 Apr 2007) Log Message: ----------- Move 'Recurse in subfolders option' FIF option below the others. Add tooltip for extra options entry. Modified Paths: -------------- trunk/ChangeLog trunk/src/search.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-04-15 15:59:57 UTC (rev 1451) +++ trunk/ChangeLog 2007-04-15 16:13:57 UTC (rev 1452) @@ -9,6 +9,9 @@ methods (and D functions) get parsed. * src/keyfile.c, src/search.c, src/search.h: Save FIF extra options string in the keyfile. + * src/search.c: + Move 'Recurse in subfolders' FIF option below the others. + Add tooltip for extra options entry. 2007-04-13 Enrico Tröger <enrico.troeger(a)uvena.de> Modified: trunk/src/search.c =================================================================== --- trunk/src/search.c 2007-04-15 15:59:57 UTC (rev 1451) +++ trunk/src/search.c 2007-04-15 16:13:57 UTC (rev 1452) @@ -661,10 +661,10 @@ _("Invert the sense of matching, to select non-matching lines."), NULL); cbox = gtk_vbox_new(FALSE, 0); - gtk_container_add(GTK_CONTAINER(cbox), check_recursive); gtk_container_add(GTK_CONTAINER(cbox), checkbox1); gtk_container_add(GTK_CONTAINER(cbox), check_wholeword); gtk_container_add(GTK_CONTAINER(cbox), checkbox2); + gtk_container_add(GTK_CONTAINER(cbox), check_recursive); hbox = gtk_hbox_new(FALSE, 6); gtk_container_add(GTK_CONTAINER(hbox), rbox); @@ -686,6 +686,8 @@ gtk_widget_ref(entry_extra), (GDestroyNotify)gtk_widget_unref); g_signal_connect(G_OBJECT(entry_extra), "key-press-event", G_CALLBACK(on_entry_extra_key_press), check_extra); + gtk_tooltips_set_tip(tooltips, entry_extra, + _("Other options to pass to Grep"), NULL); hbox = gtk_hbox_new(FALSE, 6); gtk_box_pack_start(GTK_BOX(hbox), check_extra, FALSE, FALSE, 0); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1451] trunk
by ntrel＠users.sourceforge.net 15 Apr '07

15 Apr '07

Revision: 1451 http://svn.sourceforge.net/geany/?rev=1451&view=rev Author: ntrel Date: 2007-04-15 08:59:57 -0700 (Sun, 15 Apr 2007) Log Message: ----------- Save FIF extra options string in the keyfile. Modified Paths: -------------- trunk/ChangeLog trunk/src/keyfile.c trunk/src/search.c trunk/src/search.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-04-15 12:41:59 UTC (rev 1450) +++ trunk/ChangeLog 2007-04-15 15:59:57 UTC (rev 1451) @@ -7,6 +7,8 @@ * tagmanager/tm_workspace.c: Add tm_tag_function_t tags in global tags files, so that inline C++ methods (and D functions) get parsed. + * src/keyfile.c, src/search.c, src/search.h: + Save FIF extra options string in the keyfile. 2007-04-13 Enrico Tröger <enrico.troeger(a)uvena.de> Modified: trunk/src/keyfile.c =================================================================== --- trunk/src/keyfile.c 2007-04-15 12:41:59 UTC (rev 1450) +++ trunk/src/keyfile.c 2007-04-15 15:59:57 UTC (rev 1451) @@ -46,6 +46,7 @@ #include "vte.h" #include "main.h" #include "msgwindow.h" +#include "search.h" static gchar *scribble_text = NULL; @@ -201,8 +202,10 @@ g_key_file_set_string(config, "tools", "term_cmd", app->tools_term_cmd ? app->tools_term_cmd : ""); g_key_file_set_string(config, "tools", "browser_cmd", app->tools_browser_cmd ? app->tools_browser_cmd : ""); g_key_file_set_string(config, "tools", "print_cmd", app->tools_print_cmd ? app->tools_print_cmd : ""); - g_key_file_set_string(config, "tools", "grep_cmd", app->tools_grep_cmd? app->tools_grep_cmd: ""); + g_key_file_set_string(config, "tools", "grep_cmd", app->tools_grep_cmd ? app->tools_grep_cmd : ""); + g_key_file_set_string(config, "search", "fif_extra_options", search_prefs.fif_extra_options ? search_prefs.fif_extra_options : ""); + for (i = 0; i < app->mru_length; i++) { if (! g_queue_is_empty(app->recent_queue)) @@ -474,6 +477,8 @@ app->tools_grep_cmd = utils_get_setting_string(config, "tools", "grep_cmd", tmp_string); g_free(tmp_string); + search_prefs.fif_extra_options = utils_get_setting_string(config, "search", "fif_extra_options", ""); + recent_files = g_key_file_get_string_list(config, "files", "recent_files", &len, NULL); if (recent_files != NULL) { Modified: trunk/src/search.c =================================================================== --- trunk/src/search.c 2007-04-15 12:41:59 UTC (rev 1450) +++ trunk/src/search.c 2007-04-15 15:59:57 UTC (rev 1451) @@ -63,6 +63,8 @@ GeanySearchData search_data; +SearchPrefs search_prefs = {NULL}; + static struct { GtkWidget *find_dialog; @@ -678,6 +680,8 @@ gtk_button_set_focus_on_click(GTK_BUTTON(check_extra), FALSE); entry_extra = gtk_entry_new(); + if (search_prefs.fif_extra_options) + gtk_entry_set_text(GTK_ENTRY(entry_extra), search_prefs.fif_extra_options); g_object_set_data_full(G_OBJECT(widgets.find_in_files_dialog), "entry_extra", gtk_widget_ref(entry_extra), (GDestroyNotify)gtk_widget_unref); g_signal_connect(G_OBJECT(entry_extra), "key-press-event", @@ -1106,6 +1110,11 @@ const gchar *utf8_dir = gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(dir_combo)))); + // update extra options pref + g_free(search_prefs.fif_extra_options); + search_prefs.fif_extra_options = g_strdup(gtk_entry_get_text(GTK_ENTRY( + lookup_widget(widgets.find_in_files_dialog, "entry_extra")))); + if (utf8_dir == NULL || utils_str_equal(utf8_dir, "")) ui_set_statusbar(_("Invalid directory for find in files.")); else if (search_text && *search_text) Modified: trunk/src/search.h =================================================================== --- trunk/src/search.h 2007-04-15 12:41:59 UTC (rev 1450) +++ trunk/src/search.h 2007-04-15 15:59:57 UTC (rev 1451) @@ -36,6 +36,14 @@ extern GeanySearchData search_data; +typedef struct +{ + gchar *fif_extra_options; +} SearchPrefs; + +extern SearchPrefs search_prefs; + + void search_init(); void search_finalize(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1450] trunk
by ntrel＠users.sourceforge.net 15 Apr '07

15 Apr '07

Revision: 1450 http://svn.sourceforge.net/geany/?rev=1450&view=rev Author: ntrel Date: 2007-04-15 05:41:59 -0700 (Sun, 15 Apr 2007) Log Message: ----------- Add tm_tag_function_t tags in global tags files, so that inline C++ methods (and D functions) get parsed. Modified Paths: -------------- trunk/ChangeLog trunk/tagmanager/tm_workspace.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-04-15 12:14:33 UTC (rev 1449) +++ trunk/ChangeLog 2007-04-15 12:41:59 UTC (rev 1450) @@ -4,6 +4,9 @@ Prevent D module tag lookup for D constructor calltips. * tagmanager/tm_workspace.c: Allow overloaded argument lists in global tag files. + * tagmanager/tm_workspace.c: + Add tm_tag_function_t tags in global tags files, so that inline C++ + methods (and D functions) get parsed. 2007-04-13 Enrico Tröger <enrico.troeger(a)uvena.de> Modified: trunk/tagmanager/tm_workspace.c =================================================================== --- trunk/tagmanager/tm_workspace.c 2007-04-15 12:14:33 UTC (rev 1449) +++ trunk/tagmanager/tm_workspace.c 2007-04-15 12:41:59 UTC (rev 1450) @@ -326,7 +326,8 @@ return FALSE; } tags_array = tm_tags_extract(source_file->tags_array, tm_tag_class_t | - tm_tag_typedef_t | tm_tag_prototype_t | tm_tag_enum_t | tm_tag_enumerator_t | + tm_tag_typedef_t | tm_tag_enum_t | tm_tag_enumerator_t | + tm_tag_prototype_t | tm_tag_function_t | tm_tag_method_t | // for inline functions tm_tag_macro_t | tm_tag_macro_with_arg_t); if ((NULL == tags_array) || (0 == tags_array->len)) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1449] trunk
by ntrel＠users.sourceforge.net 15 Apr '07

15 Apr '07

Revision: 1449 http://svn.sourceforge.net/geany/?rev=1449&view=rev Author: ntrel Date: 2007-04-15 05:14:33 -0700 (Sun, 15 Apr 2007) Log Message: ----------- Allow overloaded argument lists in global tag files. Modified Paths: -------------- trunk/ChangeLog trunk/tagmanager/tm_workspace.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-04-15 11:46:25 UTC (rev 1448) +++ trunk/ChangeLog 2007-04-15 12:14:33 UTC (rev 1449) @@ -2,6 +2,8 @@ * src/sci_cb.c: Prevent D module tag lookup for D constructor calltips. + * tagmanager/tm_workspace.c: + Allow overloaded argument lists in global tag files. 2007-04-13 Enrico Tröger <enrico.troeger(a)uvena.de> Modified: trunk/tagmanager/tm_workspace.c =================================================================== --- trunk/tagmanager/tm_workspace.c 2007-04-15 11:46:25 UTC (rev 1448) +++ trunk/tagmanager/tm_workspace.c 2007-04-15 12:14:33 UTC (rev 1449) @@ -207,7 +207,7 @@ #endif TMTagAttrType sort_attrs[] = { tm_tag_attr_name_t, tm_tag_attr_scope_t, - tm_tag_attr_type_t, 0 + tm_tag_attr_type_t, tm_tag_attr_arglist_t, 0 }; if (NULL == (fp = fopen(temp_file, "w"))) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1448] trunk
by ntrel＠users.sourceforge.net 15 Apr '07

15 Apr '07

Revision: 1448 http://svn.sourceforge.net/geany/?rev=1448&view=rev Author: ntrel Date: 2007-04-15 04:46:25 -0700 (Sun, 15 Apr 2007) Log Message: ----------- Prevent D module tag lookup for D constructor calltips. Modified Paths: -------------- trunk/ChangeLog trunk/src/sci_cb.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-04-13 16:51:48 UTC (rev 1447) +++ trunk/ChangeLog 2007-04-15 11:46:25 UTC (rev 1448) @@ -1,3 +1,9 @@ +2007-04-15 Nick Treleaven <nick.treleaven(a)btinternet.com> + + * src/sci_cb.c: + Prevent D module tag lookup for D constructor calltips. + + 2007-04-13 Enrico Tröger <enrico.troeger(a)uvena.de> * src/sci_cb.c: Fixed missing calltip display when using a space after Modified: trunk/src/sci_cb.c =================================================================== --- trunk/src/sci_cb.c 2007-04-13 16:51:48 UTC (rev 1447) +++ trunk/src/sci_cb.c 2007-04-15 11:46:25 UTC (rev 1448) @@ -697,6 +697,8 @@ static gchar *find_calltip(const gchar *word, filetype *ft) { const GPtrArray *tags; + const gint arg_types = tm_tag_function_t | tm_tag_prototype_t | + tm_tag_method_t | tm_tag_macro_with_arg_t; TMTagAttrType *attrs = NULL; TMTag *tag; GString *str = NULL; @@ -704,7 +706,7 @@ g_return_val_if_fail(ft && word && *word, NULL); - tags = tm_workspace_find(word, tm_tag_max_t, attrs, FALSE, ft->lang); + tags = tm_workspace_find(word, arg_types | tm_tag_class_t, attrs, FALSE, ft->lang); if (tags->len == 0) return NULL; @@ -714,7 +716,7 @@ { // user typed e.g. 'new Classname(' so lookup D constructor Classname::this() tags = tm_workspace_find_scoped("this", tag->name, - tm_tag_function_t | tm_tag_prototype_t, attrs, FALSE, ft->lang, TRUE); + arg_types, attrs, FALSE, ft->lang, TRUE); if (tags->len == 0) return NULL; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1447] trunk
by eht16＠users.sourceforge.net 13 Apr '07

13 Apr '07

Revision: 1447 http://svn.sourceforge.net/geany/?rev=1447&view=rev Author: eht16 Date: 2007-04-13 09:51:48 -0700 (Fri, 13 Apr 2007) Log Message: ----------- Fixed missing calltip display when using a space after a symbol name (thanks to Anh Ph?\225?\186?\161m for reporting). Modified Paths: -------------- trunk/ChangeLog trunk/src/sci_cb.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-04-13 11:42:25 UTC (rev 1446) +++ trunk/ChangeLog 2007-04-13 16:51:48 UTC (rev 1447) @@ -1,3 +1,9 @@ +2007-04-13 Enrico Tröger <enrico.troeger(a)uvena.de> + + * src/sci_cb.c: Fixed missing calltip display when using a space after + a symbol name (thanks to Anh Phạm for reporting). + + 2007-04-13 Nick Treleaven <nick.treleaven(a)btinternet.com> * src/sci_cb.c, tagmanager/tm_tag.c, tagmanager/tm_workspace.c: Modified: trunk/src/sci_cb.c =================================================================== --- trunk/src/sci_cb.c 2007-04-13 11:42:25 UTC (rev 1446) +++ trunk/src/sci_cb.c 2007-04-13 16:51:48 UTC (rev 1447) @@ -203,7 +203,7 @@ } case '(': { // show calltips - sci_cb_show_calltip(idx, pos); + sci_cb_show_calltip(idx, --pos); break; } case ')': @@ -223,7 +223,7 @@ if (sci_get_lexer(sci) == SCLEX_LATEX) { auto_close_bracket(sci, pos, nt->ch); // Tex auto-closing - sci_cb_show_calltip(idx, pos); + sci_cb_show_calltip(idx, --pos); } break; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1446] trunk
by ntrel＠users.sourceforge.net 13 Apr '07

13 Apr '07

Revision: 1446 http://svn.sourceforge.net/geany/?rev=1446&view=rev Author: ntrel Date: 2007-04-13 04:42:25 -0700 (Fri, 13 Apr 2007) Log Message: ----------- Show up and down arrows when there are multiple calltip matches. Modified Paths: -------------- trunk/ChangeLog trunk/src/sci_cb.c trunk/tagmanager/tm_tag.c trunk/tagmanager/tm_workspace.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-04-10 17:14:12 UTC (rev 1445) +++ trunk/ChangeLog 2007-04-13 11:42:25 UTC (rev 1446) @@ -1,3 +1,9 @@ +2007-04-13 Nick Treleaven <nick.treleaven(a)btinternet.com> + + * src/sci_cb.c, tagmanager/tm_tag.c, tagmanager/tm_workspace.c: + Show up and down arrows when there are multiple calltip matches. + + 2007-04-10 Enrico Tröger <enrico.troeger(a)uvena.de> * geany.glade, src/document.c, src/geany.h, src/interface.c, Modified: trunk/src/sci_cb.c =================================================================== --- trunk/src/sci_cb.c 2007-04-10 17:14:12 UTC (rev 1445) +++ trunk/src/sci_cb.c 2007-04-13 11:42:25 UTC (rev 1446) @@ -50,7 +50,9 @@ { gchar *text; gboolean set; -} calltip = {NULL, FALSE}; + gchar *last_word; + guint tag_index; +} calltip = {NULL, FALSE, NULL, 0}; static gchar indent[100]; @@ -336,6 +338,23 @@ } break; } + case SCN_CALLTIPCLICK: + { + if (nt->position > 0) + { + switch (nt->position) + { + case 1: // up arrow + if (calltip.tag_index > 0) + calltip.tag_index--; + break; + + case 2: calltip.tag_index++; break; // down arrow + } + sci_cb_show_calltip(idx, -1); + } + break; + } } } @@ -645,15 +664,10 @@ } -static gchar *tag_to_calltip(const TMTag *tag, filetype_id ft_id) +static gboolean append_calltip(GString *str, const TMTag *tag, filetype_id ft_id) { - GString *str; - gchar *result; + if (! tag->atts.entry.arglist) return FALSE; - if (! tag->atts.entry.arglist) return NULL; - - str = g_string_new(NULL); - if (tag->atts.entry.var_type) { guint i; @@ -676,47 +690,87 @@ g_string_append_c(str, ' '); g_string_append(str, tag->atts.entry.arglist); - result = str->str; - g_string_free(str, FALSE); - return result; + return TRUE; } static gchar *find_calltip(const gchar *word, filetype *ft) { + const GPtrArray *tags; + TMTagAttrType *attrs = NULL; TMTag *tag; - const GPtrArray *tags; + GString *str = NULL; + guint i; g_return_val_if_fail(ft && word && *word, NULL); - tags = tm_workspace_find(word, tm_tag_max_t, NULL, FALSE, ft->lang); - + tags = tm_workspace_find(word, tm_tag_max_t, attrs, FALSE, ft->lang); if (tags->len == 0) return NULL; tag = TM_TAG(tags->pdata[0]); - if (tag->atts.entry.arglist) + + if (tag->type == tm_tag_class_t && FILETYPE_ID(ft) == GEANY_FILETYPES_D) { - return tag_to_calltip(tag, FILETYPE_ID(ft)); + // user typed e.g. 'new Classname(' so lookup D constructor Classname::this() + tags = tm_workspace_find_scoped("this", tag->name, + tm_tag_function_t | tm_tag_prototype_t, attrs, FALSE, ft->lang, TRUE); + if (tags->len == 0) + return NULL; } - else if (tag->type == tm_tag_class_t && FILETYPE_ID(ft) == GEANY_FILETYPES_D) + + // remove tags with no argument list + for (i = 0; i < tags->len; i++) { - TMTagAttrType attrs[] = { tm_tag_attr_name_t, 0 }; + tag = TM_TAG(tags->pdata[i]); - // user typed e.g. 'new Classname(' so lookup D constructor Classname::this() - tags = tm_workspace_find_scoped("this", tag->name, tm_tag_function_t | tm_tag_prototype_t, - attrs, FALSE, ft->lang, TRUE); - if (tags->len != 0) + if (! tag->atts.entry.arglist) + tags->pdata[i] = NULL; + } + tm_tags_prune((GPtrArray *) tags); + if (tags->len == 0) + return NULL; + + // if the current word has changed since last time, start with the first tag match + if (! utils_str_equal(word, calltip.last_word)) + calltip.tag_index = 0; + // cache the current word for next time + g_free(calltip.last_word); + calltip.last_word = g_strdup(word); + calltip.tag_index = MIN(calltip.tag_index, tags->len - 1); // ensure tag_index is in range + + for (i = calltip.tag_index; i < tags->len; i++) + { + tag = TM_TAG(tags->pdata[i]); + + if (str == NULL) { - tag = TM_TAG(tags->pdata[0]); - if (tag->atts.entry.arglist) - return tag_to_calltip(tag, FILETYPE_ID(ft)); + str = g_string_new(NULL); + if (calltip.tag_index > 0) + g_string_prepend(str, "\001 "); // up arrow + append_calltip(str, tag, FILETYPE_ID(ft)); } + else // add a down arrow + { + if (calltip.tag_index > 0) // already have an up arrow + g_string_insert_c(str, 1, '\002'); + else + g_string_prepend(str, "\002 "); + break; + } } + if (str) + { + gchar *result = str->str; + + g_string_free(str, FALSE); + return result; + } return NULL; } +// use pos = -1 to search for the previous unmatched open bracket. gboolean sci_cb_show_calltip(gint idx, gint pos) { gint orig_pos = pos; // the position for the calltip Modified: trunk/tagmanager/tm_tag.c =================================================================== --- trunk/tagmanager/tm_tag.c 2007-04-10 17:14:12 UTC (rev 1445) +++ trunk/tagmanager/tm_tag.c 2007-04-13 11:42:25 UTC (rev 1446) @@ -474,6 +474,14 @@ if (0 != (returnval = strcmp(NVL(t1->atts.entry.scope, ""), NVL(t2->atts.entry.scope, "")))) return returnval; break; + case tm_tag_attr_arglist_t: + if (0 != (returnval = strcmp(NVL(t1->atts.entry.arglist, ""), NVL(t2->atts.entry.arglist, "")))) + { + int line_diff = (t1->atts.entry.line - t2->atts.entry.line); + + return line_diff ? line_diff : returnval; + } + break; case tm_tag_attr_vartype_t: if (0 != (returnval = strcmp(NVL(t1->atts.entry.var_type, ""), NVL(t2->atts.entry.var_type, "")))) return returnval; Modified: trunk/tagmanager/tm_workspace.c =================================================================== --- trunk/tagmanager/tm_workspace.c 2007-04-10 17:14:12 UTC (rev 1445) +++ trunk/tagmanager/tm_workspace.c 2007-04-13 11:42:25 UTC (rev 1446) @@ -382,7 +382,7 @@ guint i, j; TMWorkObject *w; TMTagAttrType sort_attrs[] = { tm_tag_attr_name_t, tm_tag_attr_file_t - , tm_tag_attr_scope_t, tm_tag_attr_type_t, 0}; + , tm_tag_attr_scope_t, tm_tag_attr_type_t, tm_tag_attr_arglist_t, 0}; #ifdef TM_DEBUG g_message("Recreating workspace tags array"); @@ -551,7 +551,8 @@ } } - tm_tags_sort(tags, attrs, TRUE); + if (attrs) + tm_tags_sort(tags, attrs, TRUE); return tags; } @@ -559,7 +560,7 @@ /* scope can be NULL. * lang can be -1 */ static int -fill_find_tags_array (GPtrArray * dst, const GPtrArray * src, +fill_find_tags_array (GPtrArray *dst, const GPtrArray *src, const char *name, const char *scope, int type, gboolean partial, gint lang, gboolean first) { @@ -607,12 +608,12 @@ tags = g_ptr_array_new (); fill_find_tags_array (tags, theWorkspace->work_object.tags_array, - name, scope, type, partial, lang, TRUE); + name, scope, type, partial, lang, FALSE); if (global_search) { // for a scoped tag, I think we always want the same language fill_find_tags_array (tags, theWorkspace->global_tags, - name, scope, type, partial, lang, TRUE); + name, scope, type, partial, lang, FALSE); } if (attrs) tm_tags_sort (tags, attrs, TRUE); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1445] trunk/src/keyfile.c
by eht16＠users.sourceforge.net 10 Apr '07

10 Apr '07

Revision: 1445 http://svn.sourceforge.net/geany/?rev=1445&view=rev Author: eht16 Date: 2007-04-10 10:14:12 -0700 (Tue, 10 Apr 2007) Log Message: ----------- Fixed wrong default value. Modified Paths: -------------- trunk/src/keyfile.c Modified: trunk/src/keyfile.c =================================================================== --- trunk/src/keyfile.c 2007-04-10 17:06:57 UTC (rev 1444) +++ trunk/src/keyfile.c 2007-04-10 17:14:12 UTC (rev 1445) @@ -336,7 +336,7 @@ app->pref_editor_auto_complete_symbols = utils_get_setting_boolean(config, PACKAGE, "auto_complete_symbols", TRUE); app->pref_editor_folding = utils_get_setting_boolean(config, PACKAGE, "use_folding", TRUE); app->pref_editor_unfold_all_children = utils_get_setting_boolean(config, PACKAGE, "unfold_all_children", FALSE); - app->pref_editor_show_scrollbars = utils_get_setting_boolean(config, PACKAGE, "show_editor_scrollbars", FALSE); + app->pref_editor_show_scrollbars = utils_get_setting_boolean(config, PACKAGE, "show_editor_scrollbars", TRUE); app->show_markers_margin = utils_get_setting_boolean(config, PACKAGE, "show_markers_margin", TRUE); app->show_linenumber_margin = utils_get_setting_boolean(config, PACKAGE, "show_linenumber_margin", TRUE); app->fullscreen = utils_get_setting_boolean(config, PACKAGE, "fullscreen", FALSE); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1444] trunk
by eht16＠users.sourceforge.net 10 Apr '07

10 Apr '07

Revision: 1444 http://svn.sourceforge.net/geany/?rev=1444&view=rev Author: eht16 Date: 2007-04-10 10:06:57 -0700 (Tue, 10 Apr 2007) Log Message: ----------- Added options to show or hide the statusbar as well as the editor scrollbars. Added sci_set_scrollbar_mode() to easily show or hide the scrollbars. Modified Paths: -------------- trunk/ChangeLog trunk/geany.glade trunk/src/document.c trunk/src/geany.h trunk/src/interface.c trunk/src/keyfile.c trunk/src/main.c trunk/src/prefs.c trunk/src/sciwrappers.c trunk/src/sciwrappers.h trunk/src/ui_utils.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-04-08 16:38:46 UTC (rev 1443) +++ trunk/ChangeLog 2007-04-10 17:06:57 UTC (rev 1444) @@ -1,3 +1,13 @@ +2007-04-10 Enrico Tröger <enrico.troeger(a)uvena.de> + + * geany.glade, src/document.c, src/geany.h, src/interface.c, + src/keyfile.c, src/main.c, src/prefs.c, src/ui_utils.c: + Added options to show or hide the statusbar as well as the editor + scrollbars. + * src/sciwrappers.c, src/sciwrappers.h: + Added sci_set_scrollbar_mode() to easily show or hide the scrollbars. + + 2007-04-08 Enrico Tröger <enrico.troeger(a)uvena.de> * configure.in, Makefile.am, doc/Makefile.am, scintilla/Makefile.am, Modified: trunk/geany.glade =================================================================== --- trunk/geany.glade 2007-04-08 16:38:46 UTC (rev 1443) +++ trunk/geany.glade 2007-04-10 17:06:57 UTC (rev 1444) @@ -3777,6 +3777,93 @@ <property name="fill">True</property> </packing> </child> + + <child> + <widget class="GtkFrame" id="frame23"> + <property name="visible">True</property> + <property name="label_xalign">0</property> + <property name="label_yalign">0.5</property> + <property name="shadow_type">GTK_SHADOW_NONE</property> + + <child> + <widget class="GtkAlignment" id="alignment26"> + <property name="visible">True</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xscale">1</property> + <property name="yscale">1</property> + <property name="top_padding">0</property> + <property name="bottom_padding">0</property> + <property name="left_padding">12</property> + <property name="right_padding">0</property> + + <child> + <widget class="GtkVBox" id="vbox22"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">0</property> + + <child> + <widget class="GtkCheckButton" id="check_statusbar_visible"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">Whether to show the status bar at the bottom of the main window.</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Show statusbar</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <placeholder/> + </child> + + <child> + <placeholder/> + </child> + </widget> + </child> + </widget> + </child> + + <child> + <widget class="GtkLabel" id="label187"> + <property name="visible">True</property> + <property name="label" translatable="yes"><b>Miscellaneous</b></property> + <property name="use_underline">False</property> + <property name="use_markup">True</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="type">label_item</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> </widget> <packing> <property name="tab_expand">False</property> Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2007-04-08 16:38:46 UTC (rev 1443) +++ trunk/src/document.c 2007-04-10 17:06:57 UTC (rev 1444) @@ -300,6 +300,7 @@ sci_set_symbol_margin(sci, app->show_markers_margin); sci_set_line_numbers(sci, app->show_linenumber_margin, 0); sci_set_lines_wrapped(sci, app->pref_editor_line_breaking); + sci_set_scrollbar_mode(sci, app->pref_editor_show_scrollbars); // signal for insert-key(works without too, but to update the right status bar) //g_signal_connect((GtkWidget*) sci, "key-press-event", Modified: trunk/src/geany.h =================================================================== --- trunk/src/geany.h 2007-04-08 16:38:46 UTC (rev 1443) +++ trunk/src/geany.h 2007-04-10 17:06:57 UTC (rev 1444) @@ -91,6 +91,7 @@ gboolean sidebar_symbol_visible; gboolean sidebar_openfiles_visible; gboolean sidebar_visible; + gboolean statusbar_visible; gboolean msgwindow_visible; gboolean fullscreen; gboolean beep_on_errors; @@ -115,6 +116,7 @@ gboolean pref_editor_auto_complete_constructs; gboolean pref_editor_folding; gboolean pref_editor_unfold_all_children; + gboolean pref_editor_show_scrollbars; gint pref_editor_tab_width; gboolean pref_editor_use_tabs; gint pref_editor_default_encoding; Modified: trunk/src/interface.c =================================================================== --- trunk/src/interface.c 2007-04-08 16:38:46 UTC (rev 1443) +++ trunk/src/interface.c 2007-04-10 17:06:57 UTC (rev 1444) @@ -2363,6 +2363,11 @@ GtkWidget *combo_tab_sidebar; GtkWidget *combo_tab_editor; GtkWidget *label158; + GtkWidget *frame23; + GtkWidget *alignment26; + GtkWidget *vbox22; + GtkWidget *check_statusbar_visible; + GtkWidget *label187; GtkWidget *label157; GtkWidget *vbox15; GtkWidget *frame12; @@ -2826,6 +2831,30 @@ gtk_frame_set_label_widget (GTK_FRAME (frame9), label158); gtk_label_set_use_markup (GTK_LABEL (label158), TRUE); + frame23 = gtk_frame_new (NULL); + gtk_widget_show (frame23); + gtk_box_pack_start (GTK_BOX (vbox14), frame23, TRUE, TRUE, 0); + gtk_frame_set_shadow_type (GTK_FRAME (frame23), GTK_SHADOW_NONE); + + alignment26 = gtk_alignment_new (0.5, 0.5, 1, 1); + gtk_widget_show (alignment26); + gtk_container_add (GTK_CONTAINER (frame23), alignment26); + gtk_alignment_set_padding (GTK_ALIGNMENT (alignment26), 0, 0, 12, 0); + + vbox22 = gtk_vbox_new (FALSE, 0); + gtk_widget_show (vbox22); + gtk_container_add (GTK_CONTAINER (alignment26), vbox22); + + check_statusbar_visible = gtk_check_button_new_with_mnemonic (_("Show statusbar")); + gtk_widget_show (check_statusbar_visible); + gtk_box_pack_start (GTK_BOX (vbox22), check_statusbar_visible, FALSE, FALSE, 0); + gtk_tooltips_set_tip (tooltips, check_statusbar_visible, _("Whether to show the status bar at the bottom of the main window."), NULL); + + label187 = gtk_label_new (_("<b>Miscellaneous</b>")); + gtk_widget_show (label187); + gtk_frame_set_label_widget (GTK_FRAME (frame23), label187); + gtk_label_set_use_markup (GTK_LABEL (label187), TRUE); + label157 = gtk_label_new (_("Interface")); gtk_widget_show (label157); gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook2), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook2), 1), label157); @@ -3836,6 +3865,11 @@ GLADE_HOOKUP_OBJECT (prefs_dialog, combo_tab_sidebar, "combo_tab_sidebar"); GLADE_HOOKUP_OBJECT (prefs_dialog, combo_tab_editor, "combo_tab_editor"); GLADE_HOOKUP_OBJECT (prefs_dialog, label158, "label158"); + GLADE_HOOKUP_OBJECT (prefs_dialog, frame23, "frame23"); + GLADE_HOOKUP_OBJECT (prefs_dialog, alignment26, "alignment26"); + GLADE_HOOKUP_OBJECT (prefs_dialog, vbox22, "vbox22"); + GLADE_HOOKUP_OBJECT (prefs_dialog, check_statusbar_visible, "check_statusbar_visible"); + GLADE_HOOKUP_OBJECT (prefs_dialog, label187, "label187"); GLADE_HOOKUP_OBJECT (prefs_dialog, label157, "label157"); GLADE_HOOKUP_OBJECT (prefs_dialog, vbox15, "vbox15"); GLADE_HOOKUP_OBJECT (prefs_dialog, frame12, "frame12"); Modified: trunk/src/keyfile.c =================================================================== --- trunk/src/keyfile.c 2007-04-08 16:38:46 UTC (rev 1443) +++ trunk/src/keyfile.c 2007-04-10 17:06:57 UTC (rev 1444) @@ -103,9 +103,11 @@ g_key_file_set_boolean(config, PACKAGE, "sidebar_symbol_visible", app->sidebar_symbol_visible); g_key_file_set_boolean(config, PACKAGE, "sidebar_openfiles_visible", app->sidebar_openfiles_visible); g_key_file_set_boolean(config, PACKAGE, "sidebar_visible", app->sidebar_visible); + g_key_file_set_boolean(config, PACKAGE, "statusbar_visible", app->statusbar_visible); g_key_file_set_boolean(config, PACKAGE, "msgwindow_visible", app->msgwindow_visible); g_key_file_set_boolean(config, PACKAGE, "use_folding", app->pref_editor_folding); g_key_file_set_boolean(config, PACKAGE, "unfold_all_children", app->pref_editor_unfold_all_children); + g_key_file_set_boolean(config, PACKAGE, "show_editor_scrollbars", app->pref_editor_show_scrollbars); g_key_file_set_integer(config, PACKAGE, "indention_mode", app->pref_editor_indention_mode); g_key_file_set_boolean(config, PACKAGE, "use_tab_to_indent", app->use_tab_to_indent); g_key_file_set_boolean(config, PACKAGE, "use_indicators", app->pref_editor_use_indicators); @@ -320,6 +322,7 @@ app->sidebar_symbol_visible = utils_get_setting_boolean(config, PACKAGE, "sidebar_symbol_visible", TRUE); app->sidebar_openfiles_visible = utils_get_setting_boolean(config, PACKAGE, "sidebar_openfiles_visible", TRUE); app->sidebar_visible = utils_get_setting_boolean(config, PACKAGE, "sidebar_visible", TRUE); + app->statusbar_visible = utils_get_setting_boolean(config, PACKAGE, "statusbar_visible", TRUE); app->msgwindow_visible = utils_get_setting_boolean(config, PACKAGE, "msgwindow_visible", TRUE); app->pref_editor_line_breaking = utils_get_setting_boolean(config, PACKAGE, "line_breaking", FALSE); //default is off for better performance app->pref_editor_indention_mode = utils_get_setting_integer(config, PACKAGE, "indention_mode", INDENT_ADVANCED); @@ -333,6 +336,7 @@ app->pref_editor_auto_complete_symbols = utils_get_setting_boolean(config, PACKAGE, "auto_complete_symbols", TRUE); app->pref_editor_folding = utils_get_setting_boolean(config, PACKAGE, "use_folding", TRUE); app->pref_editor_unfold_all_children = utils_get_setting_boolean(config, PACKAGE, "unfold_all_children", FALSE); + app->pref_editor_show_scrollbars = utils_get_setting_boolean(config, PACKAGE, "show_editor_scrollbars", FALSE); app->show_markers_margin = utils_get_setting_boolean(config, PACKAGE, "show_markers_margin", TRUE); app->show_linenumber_margin = utils_get_setting_boolean(config, PACKAGE, "show_linenumber_margin", TRUE); app->fullscreen = utils_get_setting_boolean(config, PACKAGE, "fullscreen", FALSE); Modified: trunk/src/main.c =================================================================== --- trunk/src/main.c 2007-04-08 16:38:46 UTC (rev 1443) +++ trunk/src/main.c 2007-04-10 17:06:57 UTC (rev 1444) @@ -207,6 +207,12 @@ gtk_window_set_default_size(GTK_WINDOW(app->window), app->geometry[2], app->geometry[3]); } + // hide statusbar if desired + if (! app->statusbar_visible) + { + gtk_widget_hide(app->statusbar); + } + app->ignore_callback = TRUE; gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM( lookup_widget(app->window, "menu_line_breaking1")), app->pref_editor_line_breaking); Modified: trunk/src/prefs.c =================================================================== --- trunk/src/prefs.c 2007-04-08 16:38:46 UTC (rev 1443) +++ trunk/src/prefs.c 2007-04-10 17:06:57 UTC (rev 1444) @@ -155,7 +155,10 @@ widget = lookup_widget(app->prefs_dialog, "combo_tab_sidebar"); gtk_combo_box_set_active(GTK_COMBO_BOX(widget), app->tab_pos_sidebar); + widget = lookup_widget(app->prefs_dialog, "check_statusbar_visible"); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), app->statusbar_visible); + // Toolbar settings widget = lookup_widget(app->prefs_dialog, "check_toolbar_show"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), app->toolbar_visible); @@ -466,7 +469,10 @@ widget = lookup_widget(app->prefs_dialog, "combo_tab_sidebar"); app->tab_pos_sidebar = gtk_combo_box_get_active(GTK_COMBO_BOX(widget)); + widget = lookup_widget(app->prefs_dialog, "check_statusbar_visible"); + app->statusbar_visible = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); + // Toolbar settings widget = lookup_widget(app->prefs_dialog, "check_toolbar_show"); app->toolbar_visible = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); @@ -668,6 +674,14 @@ gtk_toolbar_set_style(GTK_TOOLBAR(app->toolbar), app->toolbar_icon_style); ui_treeviews_show_hide(FALSE); gtk_notebook_set_show_tabs(GTK_NOTEBOOK(app->notebook), app->show_notebook_tabs); + // handle statusbar visibility + if (app->statusbar_visible) + { + gtk_widget_show(app->statusbar); + ui_update_statusbar(-1, -1); + } + else + gtk_widget_hide(app->statusbar); gtk_notebook_set_tab_pos(GTK_NOTEBOOK(app->notebook), app->tab_pos_editor); gtk_notebook_set_tab_pos(GTK_NOTEBOOK(msgwindow.notebook), app->tab_pos_msgwin); Modified: trunk/src/sciwrappers.c =================================================================== --- trunk/src/sciwrappers.c 2007-04-08 16:38:46 UTC (rev 1443) +++ trunk/src/sciwrappers.c 2007-04-10 17:06:57 UTC (rev 1444) @@ -935,3 +935,9 @@ SSM(sci, SCI_SETSELECTIONMODE, mode, 0); } +void sci_set_scrollbar_mode(ScintillaObject *sci, gboolean visible) +{ + SSM(sci, SCI_SETHSCROLLBAR, visible, 0); + SSM(sci, SCI_SETVSCROLLBAR, visible, 0); +} + Modified: trunk/src/sciwrappers.h =================================================================== --- trunk/src/sciwrappers.h 2007-04-08 16:38:46 UTC (rev 1443) +++ trunk/src/sciwrappers.h 2007-04-10 17:06:57 UTC (rev 1444) @@ -174,4 +174,6 @@ void sci_set_tab_indents (ScintillaObject * sci, gboolean set); void sci_set_use_tabs (ScintillaObject * sci, gboolean set); +void sci_set_scrollbar_mode (ScintillaObject * sci, gboolean visible); + #endif Modified: trunk/src/ui_utils.c =================================================================== --- trunk/src/ui_utils.c 2007-04-08 16:38:46 UTC (rev 1443) +++ trunk/src/ui_utils.c 2007-04-10 17:06:57 UTC (rev 1444) @@ -81,6 +81,9 @@ gchar string[512]; va_list args; + if (! app->statusbar_visible) + return; // just do nothing if statusbar is not visible + va_start(args, format); g_vsnprintf(string, 512, format, args); va_end(args); @@ -96,9 +99,12 @@ const gchar *cur_tag; guint line, col; + if (! app->statusbar_visible) + return; // just do nothing if statusbar is not visible + if (idx == -1) idx = document_get_cur_idx(); - if (idx >= 0 && doc_list[idx].is_valid) + if (DOC_IDX_VALID(idx)) { utils_get_current_function(idx, &cur_tag); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits April 2007