Commits May 2008

commits@lists.geany.org

3 participants
88 discussions

SF.net SVN: geany: [2570] trunk
by eht16＠users.sourceforge.net 12 May '08

12 May '08

Revision: 2570 http://geany.svn.sourceforge.net/geany/?rev=2570&view=rev Author: eht16 Date: 2008-05-12 05:20:49 -0700 (Mon, 12 May 2008) Log Message: ----------- Use Javascript styles for any VBScript and ASP code embedded in a HTML file. Use Python styles for embedded Python code. Modified Paths: -------------- trunk/ChangeLog trunk/data/filetypes.xml trunk/src/highlighting.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-05-10 08:32:30 UTC (rev 2569) +++ trunk/ChangeLog 2008-05-12 12:20:49 UTC (rev 2570) @@ -1,3 +1,11 @@ +2008-05-12 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/highlighting.c, data/filetypes.xml: + Use Javascript styles for any VBScript and ASP code embedded in a + HTML file. + Use Python styles for embedded Python code. + + 2008-05-10 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * src/dialogs.c, src/prefs.c: Modified: trunk/data/filetypes.xml =================================================================== --- trunk/data/filetypes.xml 2008-05-10 08:32:30 UTC (rev 2569) +++ trunk/data/filetypes.xml 2008-05-12 12:20:49 UTC (rev 2570) @@ -52,6 +52,7 @@ php_hstring_variable=0x101060;0xffffff;false;false php_complex_variable=0x105010;0xffffff;false;false +# used for JavaScript, ASP Javascript, VBScript jscript_start=0x008080;0xffffff;false;false jscript_default=0x000000;0xffffff;false;false jscript_comment=0xd00000;0xffffff;false;false @@ -66,6 +67,9 @@ jscript_symbols=0x301010;0xffffff;false;false jscript_stringeol=0x000000;0xe0c0e0;false;false +# for embedded Python script (<script language="python">...</script>), Python styles from +# filetypes.python are used + [keywords] html=a abbr acronym address applet area b base basefont bdo big blockquote body br button caption center cite code col colgroup dd del dfn dir div dl dt em embed fieldset font form frame frameset h1 h2 h3 h4 h5 h6 head hr html i iframe img input ins isindex kbd label legend li link map menu meta noframes noscript object ol optgroup option p param pre q quality s samp script select small span strike strong style sub sup table tbody td textarea tfoot th thead title tr tt u ul var xmlns leftmargin topmargin abbr accept-charset accept accesskey action align alink alt archive axis background bgcolor border cellpadding cellspacing char charoff charset checked cite class classid clear codebase codetype color cols colspan compact content coords data datafld dataformatas datapagesize datasrc datetime declare defer dir disabled enctype face for frame frameborder selected headers height href hreflang hspace http-equiv id ismap label lang language link longdesc marginwidth marginheight maxlength media framespacing method multiple name nohref noresize noshade nowrap object onblur onchange onclick ondblclick onfocus onkeydown onkeypress onkeyup onload onmousedown onmousemove onmouseover onmouseout onmouseup onreset onselect onsubmit onunload profile prompt pluginspage readonly rel rev rows rowspan rules scheme scope scrolling shape size span src standby start style summary tabindex target text title type usemap valign value valuetype version vlink vspace width text password checkbox radio submit reset file hidden image public doctype xml javascript=abs abstract acos anchor asin atan atan2 big bold boolean break byte case catch ceil char charAt charCodeAt class concat const continue cos Date debugger default delete do double else enum escape eval exp export extends false final finally fixed float floor fontcolor fontsize for fromCharCode function goto if implements import in indexOf Infinity instanceof int interface isFinite isNaN italics join lastIndexOf length link log long Math max MAX_VALUE min MIN_VALUE NaN native NEGATIVE_INFINITY new null Number package parseFloat parseInt pop POSITIVE_INFINITY pow private protected public push random return reverse round shift short sin slice small sort splice split sqrt static strike string String sub substr substring sup super switch synchronized tan this throw throws toLowerCase toString toUpperCase transient true try typeof undefined unescape unshift valueOf var void volatile while with Modified: trunk/src/highlighting.c =================================================================== --- trunk/src/highlighting.c 2008-05-10 08:32:30 UTC (rev 2569) +++ trunk/src/highlighting.c 2008-05-12 12:20:49 UTC (rev 2570) @@ -1098,7 +1098,7 @@ get_keyfile_keywords(config, config_home, "keywords", "html", GEANY_FILETYPES_XML, 0, "a abbr acronym address applet area b base basefont bdo big blockquote body br button caption center cite code col colgroup dd del dfn dir div dl dt em embed fieldset font form frame frameset h1 h2 h3 h4 h5 h6 head hr html i iframe img input ins isindex kbd label legend li link map menu meta noframes noscript object ol optgroup option p param pre q quality s samp script select small span strike strong style sub sup table tbody td textarea tfoot th thead title tr tt u ul var xmlns leftmargin topmargin abbr accept-charset accept accesskey action align alink alt archive axis background bgcolor border cellpadding cellspacing char charoff charset checked cite class classid clear codebase codetype color cols colspan compact content coords data datafld dataformatas datapagesize datasrc datetime declare defer dir disabled enctype face for frame frameborder selected headers height href hreflang hspace http-equiv id ismap label lang language link longdesc marginwidth marginheight maxlength media framespacing method multiple name nohref noresize noshade nowrap object onblur onchange onclick ondblclick onfocus onkeydown onkeypress onkeyup onload onmousedown onmousemove onmouseover onmouseout onmouseup onreset onselect onsubmit onunload profile prompt pluginspage readonly rel rev rows rowspan rules scheme scope scrolling shape size span src standby start style summary tabindex target text title type usemap valign value valuetype version vlink vspace width text password checkbox radio submit reset file hidden image public doctype xml"); get_keyfile_keywords(config, config_home, "keywords", "javascript", GEANY_FILETYPES_XML, 1, "abs abstract acos anchor asin atan atan2 big bold boolean break byte case catch ceil char charAt charCodeAt class concat const continue cos Date debugger default delete do double else enum escape eval exp export extends false final finally fixed float floor fontcolor fontsize for fromCharCode function goto if implements import in indexOf Infinity instanceof int interface isFinite isNaN italics join lastIndexOf length link log long Math max MAX_VALUE min MIN_VALUE NaN native NEGATIVE_INFINITY new null Number package parseFloat parseInt pop POSITIVE_INFINITY pow private protected public push random return reverse round shift short sin slice small sort splice split sqrt static strike string String sub substr substring sup super switch synchronized tan this throw throws toLowerCase toString toUpperCase transient true try typeof undefined unescape unshift valueOf var void volatile while with"); get_keyfile_keywords(config, config_home, "keywords", "vbscript", GEANY_FILETYPES_XML, 2, "and as byref byval case call const continue dim do each else elseif end error exit false for function global goto if in loop me new next not nothing on optional or private public redim rem resume select set sub then to true type while with boolean byte currency date double integer long object single string type variant"); - get_keyfile_keywords(config, config_home, "keywords", "python", GEANY_FILETYPES_XML, 3, "and assert break class continue complex def del elif else except exec finally for from global if import in inherit is int lambda not or pass print raise return tuple try unicode while yield long float str list"); + get_keyfile_keywords(config, config_home, "keywords", "python", GEANY_FILETYPES_XML, 3, "and as assert break class continue def del elif else except exec finally for from global if import in is lambda not or pass print raise return try while with yield False None True"); get_keyfile_keywords(config, config_home, "keywords", "php", GEANY_FILETYPES_XML, 4, "abstract and array as bool boolean break case catch cfunction __class__ class clone const continue declare default die directory do double echo else elseif empty enddeclare endfor endforeach endif endswitch endwhile eval exception exit extends false __file__ final float for foreach __function__ function global if implements include include_once int integer interface isset __line__ list __method__ new null object old_function or parent php_user_filter print private protected public real require require_once resource return __sleep static stdclass string switch this throw true try unset use var __wakeup while xor"); get_keyfile_keywords(config, config_home, "keywords", "sgml", GEANY_FILETYPES_XML, 5, "ELEMENT DOCTYPE ATTLIST ENTITY NOTATION"); style_sets[GEANY_FILETYPES_XML].keywords[6] = NULL; @@ -1114,6 +1114,9 @@ if (style_sets[GEANY_FILETYPES_XML].styling == NULL) filetypes_load_config(GEANY_FILETYPES_XML); + /* manually initialise filetype Python for use with embedded Python */ + filetypes_load_config(GEANY_FILETYPES_PYTHON); + /* don't set keywords for plain XML */ if (set_keywords) { @@ -1169,55 +1172,7 @@ set_sci_style(sci, SCE_H_SGML_1ST_PARAM_COMMENT, GEANY_FILETYPES_XML, 30); set_sci_style(sci, SCE_H_SGML_ERROR, GEANY_FILETYPES_XML, 31); - SSM(sci, SCI_STYLESETFORE, SCE_HB_DEFAULT, invert(0x000000)); - SSM(sci, SCI_STYLESETBACK, SCE_HB_DEFAULT, invert(0xffffff)); - - SSM(sci, SCI_STYLESETFORE, SCE_HB_COMMENTLINE, invert(0x808080)); - SSM(sci, SCI_STYLESETBACK, SCE_HB_COMMENTLINE, invert(0xffffff)); - - SSM(sci, SCI_STYLESETFORE, SCE_HB_NUMBER, invert(0x008080)); - SSM(sci, SCI_STYLESETBACK, SCE_HB_NUMBER, invert(0xffffff)); - - SSM(sci, SCI_STYLESETFORE, SCE_HB_WORD, invert(0x008080)); - SSM(sci, SCI_STYLESETBACK, SCE_HB_WORD, invert(0xffffff)); - SSM(sci, SCI_STYLESETBOLD, SCE_HB_WORD, 1); - - SSM(sci, SCI_STYLESETFORE, SCE_HB_STRING, invert(0x008000)); - SSM(sci, SCI_STYLESETBACK, SCE_HB_STRING, invert(0x008000)); - - SSM(sci, SCI_STYLESETFORE, SCE_HB_IDENTIFIER, invert(0x103000)); - SSM(sci, SCI_STYLESETBACK, SCE_HB_IDENTIFIER, invert(0xffffff)); - - /* Show the whole section of VBScript */ -/* - for (bstyle=SCE_HB_DEFAULT; bstyle<=SCE_HB_STRINGEOL; bstyle++) - { - SSM(sci, SCI_STYLESETBACK, bstyle, 0xf5f5f5); - // This call extends the backround colour of the last style on the line to the edge of the window - SSM(sci, SCI_STYLESETEOLFILLED, bstyle, 1); - } -*/ - SSM(sci,SCI_STYLESETBACK, SCE_HB_STRINGEOL, invert(0x7F7FFF)); - - SSM(sci, SCI_STYLESETFORE, SCE_HBA_DEFAULT, invert(0x000000)); - SSM(sci, SCI_STYLESETBACK, SCE_HBA_DEFAULT, invert(0xffffff)); - - SSM(sci, SCI_STYLESETFORE, SCE_HBA_COMMENTLINE, invert(0x808080)); - SSM(sci, SCI_STYLESETBACK, SCE_HBA_COMMENTLINE, invert(0xffffff)); - - SSM(sci, SCI_STYLESETFORE, SCE_HBA_NUMBER, invert(0x008080)); - SSM(sci, SCI_STYLESETBACK, SCE_HBA_NUMBER, invert(0xffffff)); - - SSM(sci, SCI_STYLESETFORE, SCE_HBA_WORD, invert(0x008080)); - SSM(sci, SCI_STYLESETBACK, SCE_HBA_WORD, invert(0xffffff)); - SSM(sci, SCI_STYLESETBOLD, SCE_HBA_WORD, 1); - - SSM(sci, SCI_STYLESETFORE, SCE_HBA_STRING, invert(0x008000)); - SSM(sci, SCI_STYLESETBACK, SCE_HBA_STRING, invert(0xffffff)); - - SSM(sci, SCI_STYLESETFORE, SCE_HBA_IDENTIFIER, invert(0x103000)); - SSM(sci, SCI_STYLESETBACK, SCE_HBA_IDENTIFIER, invert(0xffffff)); - + /* embedded JavaScript */ set_sci_style(sci, SCE_HJ_START, GEANY_FILETYPES_XML, 43); set_sci_style(sci, SCE_HJ_DEFAULT, GEANY_FILETYPES_XML, 44); set_sci_style(sci, SCE_HJ_COMMENT, GEANY_FILETYPES_XML, 45); @@ -1231,92 +1186,71 @@ set_sci_style(sci, SCE_HJ_SYMBOLS, GEANY_FILETYPES_XML, 53); set_sci_style(sci, SCE_HJ_STRINGEOL, GEANY_FILETYPES_XML, 54); + /* for HB, VBScript?, use the same styles as for JavaScript */ + set_sci_style(sci, SCE_HB_START, GEANY_FILETYPES_XML, 43); + set_sci_style(sci, SCE_HB_DEFAULT, GEANY_FILETYPES_XML, 44); + set_sci_style(sci, SCE_HB_COMMENTLINE, GEANY_FILETYPES_XML, 46); + set_sci_style(sci, SCE_HB_NUMBER, GEANY_FILETYPES_XML, 48); + set_sci_style(sci, SCE_HB_WORD, GEANY_FILETYPES_XML, 49); + set_sci_style(sci, SCE_HB_STRING, GEANY_FILETYPES_XML, 51); + set_sci_style(sci, SCE_HB_IDENTIFIER, GEANY_FILETYPES_XML, 53); + set_sci_style(sci, SCE_HB_STRINGEOL, GEANY_FILETYPES_XML, 54); - SSM(sci, SCI_STYLESETFORE, SCE_HP_START, invert(0x808000)); - SSM(sci, SCI_STYLESETBACK, SCE_HP_START, invert(0xf0f0f0)); - SSM(sci, SCI_STYLESETEOLFILLED, SCE_HP_START, 1); + /* for HBA, VBScript?, use the same styles as for JavaScript */ + set_sci_style(sci, SCE_HBA_START, GEANY_FILETYPES_XML, 43); + set_sci_style(sci, SCE_HBA_DEFAULT, GEANY_FILETYPES_XML, 44); + set_sci_style(sci, SCE_HBA_COMMENTLINE, GEANY_FILETYPES_XML, 46); + set_sci_style(sci, SCE_HBA_NUMBER, GEANY_FILETYPES_XML, 48); + set_sci_style(sci, SCE_HBA_WORD, GEANY_FILETYPES_XML, 49); + set_sci_style(sci, SCE_HBA_STRING, GEANY_FILETYPES_XML, 51); + set_sci_style(sci, SCE_HBA_IDENTIFIER, GEANY_FILETYPES_XML, 53); + set_sci_style(sci, SCE_HBA_STRINGEOL, GEANY_FILETYPES_XML, 54); - SSM(sci, SCI_STYLESETFORE, SCE_HP_DEFAULT, invert(0x000000)); - SSM(sci, SCI_STYLESETBACK, SCE_HP_DEFAULT, invert(0xffffff)); + /* for HJA, ASP Javascript, use the same styles as for JavaScript */ + set_sci_style(sci, SCE_HJA_START, GEANY_FILETYPES_XML, 43); + set_sci_style(sci, SCE_HJA_DEFAULT, GEANY_FILETYPES_XML, 44); + set_sci_style(sci, SCE_HJA_COMMENT, GEANY_FILETYPES_XML, 45); + set_sci_style(sci, SCE_HJA_COMMENTLINE, GEANY_FILETYPES_XML, 46); + set_sci_style(sci, SCE_HJA_COMMENTDOC, GEANY_FILETYPES_XML, 47); + set_sci_style(sci, SCE_HJA_NUMBER, GEANY_FILETYPES_XML, 48); + set_sci_style(sci, SCE_HJA_WORD, GEANY_FILETYPES_XML, 49); + set_sci_style(sci, SCE_HJA_KEYWORD, GEANY_FILETYPES_XML, 50); + set_sci_style(sci, SCE_HJA_DOUBLESTRING, GEANY_FILETYPES_XML, 51); + set_sci_style(sci, SCE_HJA_SINGLESTRING, GEANY_FILETYPES_XML, 52); + set_sci_style(sci, SCE_HJA_SYMBOLS, GEANY_FILETYPES_XML, 53); + set_sci_style(sci, SCE_HJA_STRINGEOL, GEANY_FILETYPES_XML, 54); - SSM(sci, SCI_STYLESETFORE, SCE_HP_COMMENTLINE, invert(0x808080)); - SSM(sci, SCI_STYLESETBACK, SCE_HP_COMMENTLINE, invert(0xffffff)); + /* for embedded Python we use the Python styles */ + set_sci_style(sci, SCE_HP_START, GEANY_FILETYPES_XML, 43); + set_sci_style(sci, SCE_HP_DEFAULT, GEANY_FILETYPES_PYTHON, 0); + set_sci_style(sci, SCE_HP_COMMENTLINE, GEANY_FILETYPES_PYTHON, 1); + set_sci_style(sci, SCE_HP_NUMBER, GEANY_FILETYPES_PYTHON, 2); + set_sci_style(sci, SCE_HP_STRING, GEANY_FILETYPES_PYTHON, 3); + set_sci_style(sci, SCE_HP_CHARACTER, GEANY_FILETYPES_PYTHON, 4); + set_sci_style(sci, SCE_HP_WORD, GEANY_FILETYPES_PYTHON, 5); + set_sci_style(sci, SCE_HP_TRIPLE, GEANY_FILETYPES_PYTHON, 6); + set_sci_style(sci, SCE_HP_TRIPLEDOUBLE, GEANY_FILETYPES_PYTHON, 7); + set_sci_style(sci, SCE_HP_CLASSNAME, GEANY_FILETYPES_PYTHON, 8); + set_sci_style(sci, SCE_HP_DEFNAME, GEANY_FILETYPES_PYTHON, 9); + set_sci_style(sci, SCE_HP_OPERATOR, GEANY_FILETYPES_PYTHON, 10); + set_sci_style(sci, SCE_HP_IDENTIFIER, GEANY_FILETYPES_PYTHON, 11); - SSM(sci, SCI_STYLESETFORE, SCE_HP_NUMBER, invert(0x008080)); - SSM(sci, SCI_STYLESETBACK, SCE_HP_NUMBER, invert(0xffffff)); + /* for embedded HPA (what is this?) we use the Python styles */ + set_sci_style(sci, SCE_HPA_START, GEANY_FILETYPES_XML, 43); + set_sci_style(sci, SCE_HPA_DEFAULT, GEANY_FILETYPES_PYTHON, 0); + set_sci_style(sci, SCE_HPA_COMMENTLINE, GEANY_FILETYPES_PYTHON, 1); + set_sci_style(sci, SCE_HPA_NUMBER, GEANY_FILETYPES_PYTHON, 2); + set_sci_style(sci, SCE_HPA_STRING, GEANY_FILETYPES_PYTHON, 3); + set_sci_style(sci, SCE_HPA_CHARACTER, GEANY_FILETYPES_PYTHON, 4); + set_sci_style(sci, SCE_HPA_WORD, GEANY_FILETYPES_PYTHON, 5); + set_sci_style(sci, SCE_HPA_TRIPLE, GEANY_FILETYPES_PYTHON, 6); + set_sci_style(sci, SCE_HPA_TRIPLEDOUBLE, GEANY_FILETYPES_PYTHON, 7); + set_sci_style(sci, SCE_HPA_CLASSNAME, GEANY_FILETYPES_PYTHON, 8); + set_sci_style(sci, SCE_HPA_DEFNAME, GEANY_FILETYPES_PYTHON, 9); + set_sci_style(sci, SCE_HPA_OPERATOR, GEANY_FILETYPES_PYTHON, 10); + set_sci_style(sci, SCE_HPA_IDENTIFIER, GEANY_FILETYPES_PYTHON, 11); - SSM(sci, SCI_STYLESETFORE, SCE_HP_WORD, invert(0x990000)); - SSM(sci, SCI_STYLESETBACK, SCE_HP_WORD, invert(0xffffff)); - - SSM(sci, SCI_STYLESETFORE, SCE_HP_STRING, invert(0x008000)); - SSM(sci, SCI_STYLESETBACK, SCE_HP_STRING, invert(0xffffff)); - - SSM(sci, SCI_STYLESETFORE, SCE_HP_CHARACTER, invert(0x006060)); - SSM(sci, SCI_STYLESETBACK, SCE_HP_CHARACTER, invert(0xffffff)); - - SSM(sci, SCI_STYLESETFORE, SCE_HP_TRIPLE, invert(0x002060)); - SSM(sci, SCI_STYLESETBACK, SCE_HP_TRIPLE, invert(0xffffff)); - - SSM(sci, SCI_STYLESETFORE, SCE_HP_TRIPLEDOUBLE, invert(0x002060)); - SSM(sci, SCI_STYLESETBACK, SCE_HP_TRIPLEDOUBLE, invert(0xffffff)); - - SSM(sci, SCI_STYLESETFORE, SCE_HP_CLASSNAME, invert(0x202010)); - SSM(sci, SCI_STYLESETBACK, SCE_HP_CLASSNAME, invert(0xffffff)); - - SSM(sci, SCI_STYLESETFORE, SCE_HP_CLASSNAME, invert(0x102020)); - SSM(sci, SCI_STYLESETBACK, SCE_HP_CLASSNAME, invert(0xffffff)); - - SSM(sci, SCI_STYLESETFORE, SCE_HP_OPERATOR, invert(0x602020)); - SSM(sci, SCI_STYLESETBACK, SCE_HP_OPERATOR, invert(0xffffff)); - - SSM(sci, SCI_STYLESETFORE, SCE_HP_IDENTIFIER, invert(0x001060)); - SSM(sci, SCI_STYLESETBACK, SCE_HP_IDENTIFIER, invert(0xffffff)); - - SSM(sci, SCI_STYLESETFORE, SCE_HPA_START, invert(0x808000)); - SSM(sci, SCI_STYLESETBACK, SCE_HPA_START, invert(0xffffff)); - - SSM(sci, SCI_STYLESETFORE, SCE_HPA_DEFAULT, invert(0x000000)); - SSM(sci, SCI_STYLESETBACK, SCE_HPA_DEFAULT, invert(0xffffff)); - - SSM(sci, SCI_STYLESETFORE, SCE_HPA_COMMENTLINE, invert(0x808080)); - SSM(sci, SCI_STYLESETBACK, SCE_HPA_COMMENTLINE, invert(0xffffff)); - - SSM(sci, SCI_STYLESETFORE, SCE_HPA_NUMBER, invert(0x408000)); - SSM(sci, SCI_STYLESETBACK, SCE_HPA_NUMBER, invert(0xffffff)); - - SSM(sci, SCI_STYLESETFORE, SCE_HPA_STRING, invert(0x008080)); - SSM(sci, SCI_STYLESETBACK, SCE_HPA_STRING, invert(0xffffff)); - - SSM(sci, SCI_STYLESETFORE, SCE_HPA_CHARACTER, invert(0x505080)); - SSM(sci, SCI_STYLESETBACK, SCE_HPA_CHARACTER, invert(0xffffff)); - - SSM(sci, SCI_STYLESETFORE, SCE_HPA_WORD, invert(0x990000)); - SSM(sci, SCI_STYLESETBACK, SCE_HPA_WORD, invert(0xffffff)); - - SSM(sci, SCI_STYLESETFORE, SCE_HPA_TRIPLE, invert(0x002060)); - SSM(sci, SCI_STYLESETBACK, SCE_HPA_TRIPLE, invert(0xffffff)); - - SSM(sci, SCI_STYLESETFORE, SCE_HPA_TRIPLEDOUBLE, invert(0x002060)); - SSM(sci, SCI_STYLESETBACK, SCE_HPA_TRIPLEDOUBLE, invert(0xffffff)); - - SSM(sci, SCI_STYLESETFORE, SCE_HPA_CLASSNAME, invert(0x202010)); - SSM(sci, SCI_STYLESETBACK, SCE_HPA_CLASSNAME, invert(0xffffff)); - - SSM(sci, SCI_STYLESETFORE, SCE_HPA_DEFNAME, invert(0x102020)); - SSM(sci, SCI_STYLESETBACK, SCE_HPA_DEFNAME, invert(0xffffff)); - - SSM(sci, SCI_STYLESETFORE, SCE_HPA_OPERATOR, invert(0x601010)); - SSM(sci, SCI_STYLESETBACK, SCE_HPA_OPERATOR, invert(0xffffff)); - - SSM(sci, SCI_STYLESETFORE, SCE_HPA_IDENTIFIER, invert(0x105010)); - SSM(sci, SCI_STYLESETBACK, SCE_HPA_IDENTIFIER, invert(0xffffff)); - - SSM(sci, SCI_STYLESETFORE, SCE_HP_COMMENTLINE, invert(0x808080)); - SSM(sci, SCI_STYLESETBACK, SCE_HP_COMMENTLINE, invert(0xffffff)); - - SSM(sci, SCI_STYLESETFORE, SCE_HP_NUMBER, invert(0x408000)); - SSM(sci, SCI_STYLESETBACK, SCE_HP_NUMBER, invert(0xffffff)); - + /* PHP */ set_sci_style(sci, SCE_HPHP_DEFAULT, GEANY_FILETYPES_XML, 32); set_sci_style(sci, SCE_HPHP_SIMPLESTRING, GEANY_FILETYPES_XML, 33); set_sci_style(sci, SCE_HPHP_HSTRING, GEANY_FILETYPES_XML, 34); @@ -2949,7 +2883,7 @@ switch (filetype_idx) { - init_styleset_case(GEANY_FILETYPES_NONE, common); + init_styleset_case(GEANY_FILETYPES_NONE, common); init_styleset_case(GEANY_FILETYPES_ASM, asm); init_styleset_case(GEANY_FILETYPES_BASIC, basic); init_styleset_case(GEANY_FILETYPES_C, c); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2569] trunk
by eht16＠users.sourceforge.net 10 May '08

10 May '08

Revision: 2569 http://geany.svn.sourceforge.net/geany/?rev=2569&view=rev Author: eht16 Date: 2008-05-10 01:32:30 -0700 (Sat, 10 May 2008) Log Message: ----------- Use gtk_window_present() instead of gtk_widget_show() for Open File and Preferences dialog. Modified Paths: -------------- trunk/ChangeLog trunk/src/dialogs.c trunk/src/prefs.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-05-09 17:14:35 UTC (rev 2568) +++ trunk/ChangeLog 2008-05-10 08:32:30 UTC (rev 2569) @@ -1,3 +1,10 @@ +2008-05-10 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/dialogs.c, src/prefs.c: + Use gtk_window_present() instead of gtk_widget_show() for Open File + and Preferences dialog. + + 2008-05-09 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * src/interface.c, src/prefs.c, src/callbacks.c, src/callbacks.h, Modified: trunk/src/dialogs.c =================================================================== --- trunk/src/dialogs.c 2008-05-09 17:14:35 UTC (rev 2568) +++ trunk/src/dialogs.c 2008-05-10 08:32:30 UTC (rev 2569) @@ -272,7 +272,7 @@ } gtk_file_chooser_unselect_all(GTK_FILE_CHOOSER(ui_widgets.open_filesel)); - gtk_widget_show(ui_widgets.open_filesel); + gtk_window_present(GTK_WINDOW(ui_widgets.open_filesel)); #endif g_free(initdir); } Modified: trunk/src/prefs.c =================================================================== --- trunk/src/prefs.c 2008-05-09 17:14:35 UTC (rev 2568) +++ trunk/src/prefs.c 2008-05-10 08:32:30 UTC (rev 2569) @@ -1483,7 +1483,7 @@ } prefs_init_dialog(); - gtk_widget_show(ui_widgets.prefs_dialog); + gtk_window_present(GTK_WINDOW(ui_widgets.prefs_dialog)); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2568] trunk
by ntrel＠users.sourceforge.net 09 May '08

09 May '08

Revision: 2568 http://geany.svn.sourceforge.net/geany/?rev=2568&view=rev Author: ntrel Date: 2008-05-09 10:14:35 -0700 (Fri, 09 May 2008) Log Message: ----------- Add source_only argument for filetypes_find_source() and rename. Modified Paths: -------------- trunk/ChangeLog trunk/src/filetypes.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-05-09 17:07:20 UTC (rev 2567) +++ trunk/ChangeLog 2008-05-09 17:14:35 UTC (rev 2568) @@ -20,6 +20,8 @@ Update api_version for new line breaking struct fields. * src/filetypes.c: Set filetype::id automatically in filetype_add(). + * src/filetypes.c: + Add source_only argument for filetypes_find_source() and rename. 2008-05-08 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/src/filetypes.c =================================================================== --- trunk/src/filetypes.c 2008-05-09 17:07:20 UTC (rev 2567) +++ trunk/src/filetypes.c 2008-05-09 17:14:35 UTC (rev 2568) @@ -504,9 +504,9 @@ typedef gboolean FileTypesPredicate(filetype *ft, gpointer user_data); -/* Find a filetype that predicate returns TRUE for, otherwise return NULL. - * Only search source file filetypes. */ -static filetype *filetypes_find_source(FileTypesPredicate predicate, gpointer user_data) +/* Find a filetype that predicate returns TRUE for, otherwise return NULL. */ +static filetype *filetypes_find(gboolean source_only, + FileTypesPredicate predicate, gpointer user_data) { guint i; @@ -514,7 +514,7 @@ { filetype *ft = filetypes[i]; - if (i == GEANY_FILETYPES_NONE) + if (source_only && i == GEANY_FILETYPES_NONE) continue; /* None is not for source files */ if (predicate(ft, user_data)) @@ -560,7 +560,7 @@ setptr(base_filename, g_utf8_strdown(base_filename, -1)); #endif - ft = filetypes_find_source(match_basename, base_filename); + ft = filetypes_find(TRUE, match_basename, base_filename); if (ft == NULL) ft = filetypes[GEANY_FILETYPES_NONE]; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2567] trunk
by ntrel＠users.sourceforge.net 09 May '08

09 May '08

Revision: 2567 http://geany.svn.sourceforge.net/geany/?rev=2567&view=rev Author: ntrel Date: 2008-05-09 10:07:20 -0700 (Fri, 09 May 2008) Log Message: ----------- Set filetype::id automatically in filetype_add(). Modified Paths: -------------- trunk/ChangeLog trunk/src/filetypes.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-05-09 15:03:24 UTC (rev 2566) +++ trunk/ChangeLog 2008-05-09 17:07:20 UTC (rev 2567) @@ -18,6 +18,8 @@ Document 'Disk check timeout' pref. * src/plugindata.h: Update api_version for new line breaking struct fields. + * src/filetypes.c: + Set filetype::id automatically in filetype_add(). 2008-05-08 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/src/filetypes.c =================================================================== --- trunk/src/filetypes.c 2008-05-09 15:03:24 UTC (rev 2566) +++ trunk/src/filetypes.c 2008-05-09 17:07:20 UTC (rev 2567) @@ -62,7 +62,6 @@ static void init_builtin_filetypes(void) { #define C /* these macros are only to ease navigation */ - filetypes[GEANY_FILETYPES_C]->id = GEANY_FILETYPES_C; filetypes[GEANY_FILETYPES_C]->lang = 0; filetypes[GEANY_FILETYPES_C]->name = g_strdup("C"); filetypes[GEANY_FILETYPES_C]->title = g_strdup_printf(_("%s source file"), "C"); @@ -72,7 +71,6 @@ filetypes[GEANY_FILETYPES_C]->comment_close = g_strdup("*/"); #define CPP - filetypes[GEANY_FILETYPES_CPP]->id = GEANY_FILETYPES_CPP; filetypes[GEANY_FILETYPES_CPP]->lang = 1; filetypes[GEANY_FILETYPES_CPP]->name = g_strdup("C++"); filetypes[GEANY_FILETYPES_CPP]->title = g_strdup_printf(_("%s source file"), "C++"); @@ -83,7 +81,6 @@ filetypes[GEANY_FILETYPES_CPP]->comment_close = NULL; #define CS - filetypes[GEANY_FILETYPES_CS]->id = GEANY_FILETYPES_CS; filetypes[GEANY_FILETYPES_CS]->lang = 25; filetypes[GEANY_FILETYPES_CS]->name = g_strdup("C#"); filetypes[GEANY_FILETYPES_CS]->title = g_strdup_printf(_("%s source file"), "C#"); @@ -93,7 +90,6 @@ filetypes[GEANY_FILETYPES_CS]->comment_close = NULL; #define D - filetypes[GEANY_FILETYPES_D]->id = GEANY_FILETYPES_D; filetypes[GEANY_FILETYPES_D]->lang = 17; filetypes[GEANY_FILETYPES_D]->name = g_strdup("D"); filetypes[GEANY_FILETYPES_D]->title = g_strdup_printf(_("%s source file"), "D"); @@ -103,7 +99,6 @@ filetypes[GEANY_FILETYPES_D]->comment_close = NULL; #define JAVA - filetypes[GEANY_FILETYPES_JAVA]->id = GEANY_FILETYPES_JAVA; filetypes[GEANY_FILETYPES_JAVA]->name = g_strdup("Java"); filetypes[GEANY_FILETYPES_JAVA]->lang = 2; filetypes[GEANY_FILETYPES_JAVA]->title = g_strdup_printf(_("%s source file"), "Java"); @@ -113,7 +108,6 @@ filetypes[GEANY_FILETYPES_JAVA]->comment_close = g_strdup("*/"); #define PAS /* to avoid warnings when building under Windows, the symbol PASCAL is there defined */ - filetypes[GEANY_FILETYPES_PASCAL]->id = GEANY_FILETYPES_PASCAL; filetypes[GEANY_FILETYPES_PASCAL]->lang = 4; filetypes[GEANY_FILETYPES_PASCAL]->name = g_strdup("Pascal"); filetypes[GEANY_FILETYPES_PASCAL]->title = g_strdup_printf(_("%s source file"), "Pascal"); @@ -124,7 +118,6 @@ filetypes[GEANY_FILETYPES_PASCAL]->comment_close = g_strdup("}"); #define ASM - filetypes[GEANY_FILETYPES_ASM]->id = GEANY_FILETYPES_ASM; filetypes[GEANY_FILETYPES_ASM]->lang = 9; filetypes[GEANY_FILETYPES_ASM]->name = g_strdup("ASM"); filetypes[GEANY_FILETYPES_ASM]->title = g_strdup_printf(_("%s source file"), "Assembler"); @@ -134,7 +127,6 @@ filetypes[GEANY_FILETYPES_ASM]->comment_close = NULL; #define BASIC - filetypes[GEANY_FILETYPES_BASIC]->id = GEANY_FILETYPES_BASIC; filetypes[GEANY_FILETYPES_BASIC]->lang = 26; filetypes[GEANY_FILETYPES_BASIC]->name = g_strdup("FreeBasic"); filetypes[GEANY_FILETYPES_BASIC]->title = g_strdup_printf(_("%s source file"), "FreeBasic"); @@ -144,7 +136,6 @@ filetypes[GEANY_FILETYPES_BASIC]->comment_close = NULL; #define FORTRAN - filetypes[GEANY_FILETYPES_FORTRAN]->id = GEANY_FILETYPES_FORTRAN; filetypes[GEANY_FILETYPES_FORTRAN]->lang = 18; filetypes[GEANY_FILETYPES_FORTRAN]->name = g_strdup("Fortran"); filetypes[GEANY_FILETYPES_FORTRAN]->title = g_strdup_printf(_("%s source file"), "Fortran (F77)"); @@ -155,7 +146,6 @@ filetypes[GEANY_FILETYPES_FORTRAN]->comment_close = NULL; #define CAML - filetypes[GEANY_FILETYPES_CAML]->id = GEANY_FILETYPES_CAML; filetypes[GEANY_FILETYPES_CAML]->lang = -2; filetypes[GEANY_FILETYPES_CAML]->name = g_strdup("CAML"); filetypes[GEANY_FILETYPES_CAML]->title = g_strdup_printf(_("%s source file"), "(O)Caml"); @@ -165,7 +155,6 @@ filetypes[GEANY_FILETYPES_CAML]->comment_close = g_strdup("*)"); #define PERL - filetypes[GEANY_FILETYPES_PERL]->id = GEANY_FILETYPES_PERL; filetypes[GEANY_FILETYPES_PERL]->lang = 5; filetypes[GEANY_FILETYPES_PERL]->name = g_strdup("Perl"); filetypes[GEANY_FILETYPES_PERL]->title = g_strdup_printf(_("%s source file"), "Perl"); @@ -176,7 +165,6 @@ filetypes[GEANY_FILETYPES_PERL]->comment_close = NULL; #define PHP - filetypes[GEANY_FILETYPES_PHP]->id = GEANY_FILETYPES_PHP; filetypes[GEANY_FILETYPES_PHP]->lang = 6; filetypes[GEANY_FILETYPES_PHP]->name = g_strdup("PHP"); filetypes[GEANY_FILETYPES_PHP]->title = g_strdup_printf(_("%s source file"), "PHP"); @@ -187,7 +175,6 @@ filetypes[GEANY_FILETYPES_PHP]->comment_close = NULL; #define JAVASCRIPT - filetypes[GEANY_FILETYPES_JS]->id = GEANY_FILETYPES_JS; filetypes[GEANY_FILETYPES_JS]->lang = 23; filetypes[GEANY_FILETYPES_JS]->name = g_strdup("Javascript"); filetypes[GEANY_FILETYPES_JS]->title = g_strdup_printf(_("%s source file"), "Javascript"); @@ -197,7 +184,6 @@ filetypes[GEANY_FILETYPES_JS]->comment_close = NULL; #define PYTHON - filetypes[GEANY_FILETYPES_PYTHON]->id = GEANY_FILETYPES_PYTHON; filetypes[GEANY_FILETYPES_PYTHON]->lang = 7; filetypes[GEANY_FILETYPES_PYTHON]->name = g_strdup("Python"); filetypes[GEANY_FILETYPES_PYTHON]->title = g_strdup_printf(_("%s source file"), "Python"); @@ -207,7 +193,6 @@ filetypes[GEANY_FILETYPES_PYTHON]->comment_close = NULL; #define RUBY - filetypes[GEANY_FILETYPES_RUBY]->id = GEANY_FILETYPES_RUBY; filetypes[GEANY_FILETYPES_RUBY]->lang = 14; filetypes[GEANY_FILETYPES_RUBY]->name = g_strdup("Ruby"); filetypes[GEANY_FILETYPES_RUBY]->title = g_strdup_printf(_("%s source file"), "Ruby"); @@ -217,7 +202,6 @@ filetypes[GEANY_FILETYPES_RUBY]->comment_close = NULL; #define TCL - filetypes[GEANY_FILETYPES_TCL]->id = GEANY_FILETYPES_TCL; filetypes[GEANY_FILETYPES_TCL]->lang = 15; filetypes[GEANY_FILETYPES_TCL]->name = g_strdup("Tcl"); filetypes[GEANY_FILETYPES_TCL]->title = g_strdup_printf(_("%s source file"), "Tcl"); @@ -227,7 +211,6 @@ filetypes[GEANY_FILETYPES_TCL]->comment_close = NULL; #define LUA - filetypes[GEANY_FILETYPES_LUA]->id = GEANY_FILETYPES_LUA; filetypes[GEANY_FILETYPES_LUA]->lang = 22; filetypes[GEANY_FILETYPES_LUA]->name = g_strdup("Lua"); filetypes[GEANY_FILETYPES_LUA]->title = g_strdup_printf(_("%s source file"), "Lua"); @@ -237,7 +220,6 @@ filetypes[GEANY_FILETYPES_LUA]->comment_close = NULL; #define FERITE - filetypes[GEANY_FILETYPES_FERITE]->id = GEANY_FILETYPES_FERITE; filetypes[GEANY_FILETYPES_FERITE]->lang = 19; filetypes[GEANY_FILETYPES_FERITE]->name = g_strdup("Ferite"); filetypes[GEANY_FILETYPES_FERITE]->title = g_strdup_printf(_("%s source file"), "Ferite"); @@ -247,7 +229,6 @@ filetypes[GEANY_FILETYPES_FERITE]->comment_close = g_strdup("*/"); #define HASKELL - filetypes[GEANY_FILETYPES_HASKELL]->id = GEANY_FILETYPES_HASKELL; filetypes[GEANY_FILETYPES_HASKELL]->lang = 24; filetypes[GEANY_FILETYPES_HASKELL]->name = g_strdup("Haskell"); filetypes[GEANY_FILETYPES_HASKELL]->title = g_strdup_printf(_("%s source file"), "Haskell"); @@ -257,7 +238,6 @@ filetypes[GEANY_FILETYPES_HASKELL]->comment_close = NULL; #define SH - filetypes[GEANY_FILETYPES_SH]->id = GEANY_FILETYPES_SH; filetypes[GEANY_FILETYPES_SH]->lang = 16; filetypes[GEANY_FILETYPES_SH]->name = g_strdup("Sh"); filetypes[GEANY_FILETYPES_SH]->title = g_strdup(_("Shell script file")); @@ -268,7 +248,6 @@ filetypes[GEANY_FILETYPES_SH]->comment_close = NULL; #define MAKE - filetypes[GEANY_FILETYPES_MAKE]->id = GEANY_FILETYPES_MAKE; filetypes[GEANY_FILETYPES_MAKE]->lang = 3; filetypes[GEANY_FILETYPES_MAKE]->name = g_strdup("Make"); filetypes[GEANY_FILETYPES_MAKE]->title = g_strdup(_("Makefile")); @@ -279,7 +258,6 @@ filetypes[GEANY_FILETYPES_MAKE]->comment_close = NULL; #define XML - filetypes[GEANY_FILETYPES_XML]->id = GEANY_FILETYPES_XML; filetypes[GEANY_FILETYPES_XML]->lang = -2; filetypes[GEANY_FILETYPES_XML]->name = g_strdup("XML"); filetypes[GEANY_FILETYPES_XML]->title = g_strdup(_("XML document")); @@ -290,7 +268,6 @@ filetypes[GEANY_FILETYPES_XML]->comment_close = g_strdup("-->"); #define DOCBOOK - filetypes[GEANY_FILETYPES_DOCBOOK]->id = GEANY_FILETYPES_DOCBOOK; filetypes[GEANY_FILETYPES_DOCBOOK]->lang = 12; filetypes[GEANY_FILETYPES_DOCBOOK]->name = g_strdup("Docbook"); filetypes[GEANY_FILETYPES_DOCBOOK]->title = g_strdup_printf(_("%s source file"), "Docbook"); @@ -300,7 +277,6 @@ filetypes[GEANY_FILETYPES_DOCBOOK]->comment_close = g_strdup("-->"); #define HTML - filetypes[GEANY_FILETYPES_HTML]->id = GEANY_FILETYPES_HTML; filetypes[GEANY_FILETYPES_HTML]->lang = 29; filetypes[GEANY_FILETYPES_HTML]->name = g_strdup("HTML"); filetypes[GEANY_FILETYPES_HTML]->title = g_strdup_printf(_("%s source file"), "HTML"); @@ -311,7 +287,6 @@ filetypes[GEANY_FILETYPES_HTML]->comment_close = g_strdup("-->"); #define CSS - filetypes[GEANY_FILETYPES_CSS]->id = GEANY_FILETYPES_CSS; filetypes[GEANY_FILETYPES_CSS]->lang = 13; filetypes[GEANY_FILETYPES_CSS]->name = g_strdup("CSS"); filetypes[GEANY_FILETYPES_CSS]->title = g_strdup(_("Cascading StyleSheet")); @@ -321,7 +296,6 @@ filetypes[GEANY_FILETYPES_CSS]->comment_close = g_strdup("*/"); #define SQL - filetypes[GEANY_FILETYPES_SQL]->id = GEANY_FILETYPES_SQL; filetypes[GEANY_FILETYPES_SQL]->lang = 11; filetypes[GEANY_FILETYPES_SQL]->name = g_strdup("SQL"); filetypes[GEANY_FILETYPES_SQL]->title = g_strdup(_("SQL Dump file")); @@ -331,7 +305,6 @@ filetypes[GEANY_FILETYPES_SQL]->comment_close = g_strdup("*/"); #define LATEX - filetypes[GEANY_FILETYPES_LATEX]->id = GEANY_FILETYPES_LATEX; filetypes[GEANY_FILETYPES_LATEX]->lang = 8; filetypes[GEANY_FILETYPES_LATEX]->name = g_strdup("LaTeX"); filetypes[GEANY_FILETYPES_LATEX]->title = g_strdup_printf(_("%s source file"), "LaTeX"); @@ -341,7 +314,6 @@ filetypes[GEANY_FILETYPES_LATEX]->comment_close = NULL; #define OMS - filetypes[GEANY_FILETYPES_OMS]->id = GEANY_FILETYPES_OMS; filetypes[GEANY_FILETYPES_OMS]->lang = -2; filetypes[GEANY_FILETYPES_OMS]->name = g_strdup("O-Matrix"); filetypes[GEANY_FILETYPES_OMS]->title = g_strdup_printf(_("%s source file"), "O-Matrix"); @@ -351,7 +323,6 @@ filetypes[GEANY_FILETYPES_OMS]->comment_close = NULL; #define VHDL - filetypes[GEANY_FILETYPES_VHDL]->id = GEANY_FILETYPES_VHDL; filetypes[GEANY_FILETYPES_VHDL]->lang = 21; filetypes[GEANY_FILETYPES_VHDL]->name = g_strdup("VHDL"); filetypes[GEANY_FILETYPES_VHDL]->title = g_strdup_printf(_("%s source file"), "VHDL"); @@ -361,7 +332,6 @@ filetypes[GEANY_FILETYPES_VHDL]->comment_close = NULL; #define DIFF - filetypes[GEANY_FILETYPES_DIFF]->id = GEANY_FILETYPES_DIFF; filetypes[GEANY_FILETYPES_DIFF]->lang = 20; filetypes[GEANY_FILETYPES_DIFF]->name = g_strdup("Diff"); filetypes[GEANY_FILETYPES_DIFF]->title = g_strdup(_("Diff file")); @@ -371,7 +341,6 @@ filetypes[GEANY_FILETYPES_DIFF]->comment_close = NULL; #define CONF - filetypes[GEANY_FILETYPES_CONF]->id = GEANY_FILETYPES_CONF; filetypes[GEANY_FILETYPES_CONF]->lang = 10; filetypes[GEANY_FILETYPES_CONF]->name = g_strdup("Conf"); filetypes[GEANY_FILETYPES_CONF]->title = g_strdup(_("Config file")); @@ -382,7 +351,6 @@ filetypes[GEANY_FILETYPES_CONF]->comment_close = NULL; #define HAXE - filetypes[GEANY_FILETYPES_HAXE]->id = GEANY_FILETYPES_HAXE; filetypes[GEANY_FILETYPES_HAXE]->lang = 27; filetypes[GEANY_FILETYPES_HAXE]->name = g_strdup("Haxe"); filetypes[GEANY_FILETYPES_HAXE]->title = g_strdup_printf(_("%s source file"), "Haxe"); @@ -392,7 +360,6 @@ filetypes[GEANY_FILETYPES_HAXE]->comment_close = NULL; #define REST - filetypes[GEANY_FILETYPES_REST]->id = GEANY_FILETYPES_REST; filetypes[GEANY_FILETYPES_REST]->lang = 28; filetypes[GEANY_FILETYPES_REST]->name = g_strdup("reStructuredText"); filetypes[GEANY_FILETYPES_REST]->title = g_strdup(_("reStructuredText file")); @@ -403,7 +370,6 @@ filetypes[GEANY_FILETYPES_REST]->comment_close = NULL; #define ALL - filetypes[GEANY_FILETYPES_NONE]->id = GEANY_FILETYPES_NONE; filetypes[GEANY_FILETYPES_NONE]->name = g_strdup("None"); filetypes[GEANY_FILETYPES_NONE]->lang = -2; filetypes[GEANY_FILETYPES_NONE]->title = g_strdup(_("All files")); @@ -420,9 +386,6 @@ FullFileType *fft = g_new0(FullFileType, 1); filetype *ft = (filetype*) fft; -/* - ft->id = GEANY_FILETYPES_OTHER; -*/ ft->lang = -2; /* assume no tagmanager parser */ ft->programs = g_new0(struct build_programs, 1); ft->actions = g_new0(struct build_actions, 1); @@ -430,12 +393,14 @@ } -/* Add a filetype pointer to the list of available filetypes. */ +/* Add a filetype pointer to the list of available filetypes, + * and set the filetype::id field. */ static void filetype_add(filetype *ft) { g_return_if_fail(ft); g_return_if_fail(ft->name); + ft->id = filetypes_array->len; /* len will be the index for filetype_array */ g_ptr_array_add(filetypes_array, ft); g_hash_table_insert(filetypes_hash, ft->name, ft); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2566] trunk
by ntrel＠users.sourceforge.net 09 May '08

09 May '08

Revision: 2566 http://geany.svn.sourceforge.net/geany/?rev=2566&view=rev Author: ntrel Date: 2008-05-09 08:03:24 -0700 (Fri, 09 May 2008) Log Message: ----------- Update api_version for new line breaking struct fields. Modified Paths: -------------- trunk/ChangeLog trunk/src/plugindata.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-05-09 14:37:30 UTC (rev 2565) +++ trunk/ChangeLog 2008-05-09 15:03:24 UTC (rev 2566) @@ -16,6 +16,8 @@ Update Code Navigation section for build errors and message items. Correct Load Tags menu item being in the Tools menu now. Document 'Disk check timeout' pref. + * src/plugindata.h: + Update api_version for new line breaking struct fields. 2008-05-08 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/src/plugindata.h =================================================================== --- trunk/src/plugindata.h 2008-05-09 14:37:30 UTC (rev 2565) +++ trunk/src/plugindata.h 2008-05-09 15:03:24 UTC (rev 2566) @@ -35,7 +35,7 @@ /* The API version should be incremented whenever any plugin data types below are * modified or appended to. */ -static const gint api_version = 56; +static const gint api_version = 57; /* The ABI version should be incremented whenever existing fields in the plugin * data types below have to be changed or reordered. It should stay the same if fields This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2565] trunk
by ntrel＠users.sourceforge.net 09 May '08

09 May '08

Revision: 2565 http://geany.svn.sourceforge.net/geany/?rev=2565&view=rev Author: ntrel Date: 2008-05-09 07:37:30 -0700 (Fri, 09 May 2008) Log Message: ----------- Update Code Navigation section for build errors and message items. Correct Load Tags menu item being in the Tools menu now. Document 'Disk check timeout' pref. Modified Paths: -------------- trunk/ChangeLog trunk/doc/geany.html trunk/doc/geany.txt Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-05-09 14:19:01 UTC (rev 2564) +++ trunk/ChangeLog 2008-05-09 14:37:30 UTC (rev 2565) @@ -12,6 +12,10 @@ src/main.c, src/ui_utils.c, geany.glade: Rename old uses of line breaking -> line wrapping. This includes the keyfile pref, so any users with this enabled will have to reset it. + * doc/geany.txt, doc/geany.html: + Update Code Navigation section for build errors and message items. + Correct Load Tags menu item being in the Tools menu now. + Document 'Disk check timeout' pref. 2008-05-08 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/doc/geany.html =================================================================== --- trunk/doc/geany.html 2008-05-09 14:19:01 UTC (rev 2564) +++ trunk/doc/geany.html 2008-05-09 14:37:30 UTC (rev 2565) @@ -6,7 +6,7 @@ <meta name="generator" content="Docutils 0.4: http://docutils.sourceforge.net/" /> <title>Geany</title> <meta name="authors" content="Enrico Tröger Nick Treleaven Frank Lanitz" /> -<meta name="date" content="2008-05-06" /> +<meta name="date" content="2008-05-09" /> <style type="text/css"> /* @@ -133,7 +133,7 @@ <br />Nick Treleaven <br />Frank Lanitz</td></tr> <tr><th class="docinfo-name">Date:</th> -<td>2008-05-06</td></tr> +<td>2008-05-09</td></tr> <tr><th class="docinfo-name">Version:</th> <td>0.15</td></tr> </tbody> @@ -939,9 +939,14 @@ <h3><a class="toc-backref" href="#id36" id="code-navigation-history" name="code-navigation-history">Code Navigation History</a></h3> <p>To ease navigation in source files and especially between different files, Geany lets you jump between different navigation -points. Currently, this works when using the <a class="reference" href="#go-to-tag-declaration">Go to tag declaration</a>, -<a class="reference" href="#go-to-tag-definition">Go to tag definition</a> commands and when clicking on symbol list -items.</p> +points. Currently, this works for the following:</p> +<ul class="simple"> +<li><a class="reference" href="#go-to-tag-declaration">Go to tag declaration</a></li> +<li><a class="reference" href="#go-to-tag-definition">Go to tag definition</a></li> +<li>Symbol list items</li> +<li>Build errors</li> +<li>Message items</li> +</ul> <p>When using one of these actions, Geany remembers your current position and jumps to the new one. If you decide to go back to your previous position in the file, just use "Navigate back a location". To @@ -1323,7 +1328,7 @@ "workspace tags") for supported filetypes when you open a file. You can also have Geany automatically load external tag files (aka "global tags files") from its <tt class="docutils literal"><span class="pre">~/.geany/tags</span></tt> directory upon startup, or -manually using <em>File --> Load Tags</em>.</p> +manually using <em>Tools --> Load Tags</em>.</p> <p>Geany uses its own tag file format, similar to what <tt class="docutils literal"><span class="pre">ctags</span></tt> uses (but is incompatible with ctags). You use Geany to generate global tags files, as described below.</p> @@ -1344,7 +1349,7 @@ the library.</p> <p>You can load a custom global tags file in two ways:</p> <ul class="simple"> -<li>Using the <em>Load Tags</em> command in the File menu.</li> +<li>Using the <em>Load Tags</em> command in the Tools menu.</li> <li>By creating a directory <tt class="docutils literal"><span class="pre">~/.geany/tags</span></tt>, and moving or symlinking the tags files there before starting Geany.</li> </ul> @@ -1788,6 +1793,9 @@ <dl class="docutils"> <dt>Recent files list length</dt> <dd>The number of files to remember in the recently used files list.</dd> +<dt>Disk check timeout</dt> +<dd>The number of seconds to periodically check the current document's +file on disk in case it has changed.</dd> </dl> </div> </div> @@ -4059,7 +4067,7 @@ <div class="footer"> <hr class="footer" /> <a class="reference" href="geany.txt">View document source</a>. -Generated on: 2008-05-09 12:12 UTC. +Generated on: 2008-05-09 14:39 UTC. Generated by <a class="reference" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source. </div> Modified: trunk/doc/geany.txt =================================================================== --- trunk/doc/geany.txt 2008-05-09 14:19:01 UTC (rev 2564) +++ trunk/doc/geany.txt 2008-05-09 14:37:30 UTC (rev 2565) @@ -637,10 +637,14 @@ To ease navigation in source files and especially between different files, Geany lets you jump between different navigation -points. Currently, this works when using the `Go to tag declaration`_, -`Go to tag definition`_ commands and when clicking on symbol list -items. +points. Currently, this works for the following: +* `Go to tag declaration`_ +* `Go to tag definition`_ +* Symbol list items +* Build errors +* Message items + When using one of these actions, Geany remembers your current position and jumps to the new one. If you decide to go back to your previous position in the file, just use "Navigate back a location". To @@ -1059,7 +1063,7 @@ "workspace tags") for supported filetypes when you open a file. You can also have Geany automatically load external tag files (aka "global tags files") from its ``~/.geany/tags`` directory upon startup, or -manually using *File --> Load Tags*. +manually using *Tools --> Load Tags*. Geany uses its own tag file format, similar to what ``ctags`` uses (but is incompatible with ctags). You use Geany to generate global @@ -1088,7 +1092,7 @@ You can load a custom global tags file in two ways: -* Using the *Load Tags* command in the File menu. +* Using the *Load Tags* command in the Tools menu. * By creating a directory ``~/.geany/tags``, and moving or symlinking the tags files there before starting Geany. @@ -1585,7 +1589,11 @@ Recent files list length The number of files to remember in the recently used files list. +Disk check timeout + The number of seconds to periodically check the current document's + file on disk in case it has changed. + Tools tab in preferences dialog ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2564] trunk
by ntrel＠users.sourceforge.net 09 May '08

09 May '08

Revision: 2564 http://geany.svn.sourceforge.net/geany/?rev=2564&view=rev Author: ntrel Date: 2008-05-09 07:19:01 -0700 (Fri, 09 May 2008) Log Message: ----------- Rename old uses of line breaking -> line wrapping. This includes the keyfile pref, so any users with this enabled will have to reset it. Modified Paths: -------------- trunk/ChangeLog trunk/geany.glade Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-05-09 14:17:25 UTC (rev 2563) +++ trunk/ChangeLog 2008-05-09 14:19:01 UTC (rev 2564) @@ -8,6 +8,10 @@ only works when typing characters past the line breaking column number. Add 'Line breaking column' editor pref. + * src/callbacks.c, src/callbacks.h, src/interface.c, src/keyfile.c, + src/main.c, src/ui_utils.c, geany.glade: + Rename old uses of line breaking -> line wrapping. This includes the + keyfile pref, so any users with this enabled will have to reset it. 2008-05-08 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/geany.glade =================================================================== --- trunk/geany.glade 2008-05-09 14:17:25 UTC (rev 2563) +++ trunk/geany.glade 2008-05-09 14:19:01 UTC (rev 2564) @@ -1008,13 +1008,13 @@ <widget class="GtkMenu" id="menu_document1_menu"> <child> - <widget class="GtkCheckMenuItem" id="menu_line_breaking1"> + <widget class="GtkCheckMenuItem" id="menu_line_wrapping1"> <property name="visible">True</property> <property name="tooltip" translatable="yes">Wrap the line at the window border and continue it on the next line. Note: line wrapping has a high performance cost for large documents so should be disabled on slow machines.</property> <property name="label" translatable="yes">_Line Wrapping</property> <property name="use_underline">True</property> <property name="active">True</property> - <signal name="toggled" handler="on_line_breaking1_toggled" last_modification_time="Sun, 04 Sep 2005 11:12:08 GMT"/> + <signal name="toggled" handler="on_line_wrapping1_toggled" last_modification_time="Sun, 04 Sep 2005 11:12:08 GMT"/> </widget> </child> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2563] trunk/src
by ntrel＠users.sourceforge.net 09 May '08

09 May '08

Revision: 2563 http://geany.svn.sourceforge.net/geany/?rev=2563&view=rev Author: ntrel Date: 2008-05-09 07:17:25 -0700 (Fri, 09 May 2008) Log Message: ----------- Rename old uses of line breaking -> line wrapping. This includes the keyfile pref, so any users with this enabled will have to reset it. Modified Paths: -------------- trunk/src/callbacks.c trunk/src/callbacks.h trunk/src/interface.c trunk/src/keyfile.c trunk/src/main.c trunk/src/ui_utils.c Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2008-05-09 12:13:29 UTC (rev 2562) +++ trunk/src/callbacks.c 2008-05-09 14:17:25 UTC (rev 2563) @@ -964,7 +964,7 @@ void -on_line_breaking1_toggled (GtkCheckMenuItem *checkmenuitem, +on_line_wrapping1_toggled (GtkCheckMenuItem *checkmenuitem, gpointer user_data) { if (! app->ignore_callback) Modified: trunk/src/callbacks.h =================================================================== --- trunk/src/callbacks.h 2008-05-09 12:13:29 UTC (rev 2562) +++ trunk/src/callbacks.h 2008-05-09 14:17:25 UTC (rev 2563) @@ -316,7 +316,7 @@ gpointer user_data); void -on_line_breaking1_toggled (GtkCheckMenuItem *checkmenuitem, +on_line_wrapping1_toggled (GtkCheckMenuItem *checkmenuitem, gpointer user_data); void Modified: trunk/src/interface.c =================================================================== --- trunk/src/interface.c 2008-05-09 12:13:29 UTC (rev 2562) +++ trunk/src/interface.c 2008-05-09 14:17:25 UTC (rev 2563) @@ -149,7 +149,7 @@ GtkWidget *normal_size1; GtkWidget *menu_document1; GtkWidget *menu_document1_menu; - GtkWidget *menu_line_breaking1; + GtkWidget *menu_line_wrapping1; GtkWidget *line_breaking1; GtkWidget *menu_use_auto_indentation1; GtkWidget *indent_type1; @@ -777,11 +777,11 @@ menu_document1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_document1), menu_document1_menu); - menu_line_breaking1 = gtk_check_menu_item_new_with_mnemonic (_("_Line Wrapping")); - gtk_widget_show (menu_line_breaking1); - gtk_container_add (GTK_CONTAINER (menu_document1_menu), menu_line_breaking1); - gtk_tooltips_set_tip (tooltips, menu_line_breaking1, _("Wrap the line at the window border and continue it on the next line. Note: line wrapping has a high performance cost for large documents so should be disabled on slow machines."), NULL); - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_line_breaking1), TRUE); + menu_line_wrapping1 = gtk_check_menu_item_new_with_mnemonic (_("_Line Wrapping")); + gtk_widget_show (menu_line_wrapping1); + gtk_container_add (GTK_CONTAINER (menu_document1_menu), menu_line_wrapping1); + gtk_tooltips_set_tip (tooltips, menu_line_wrapping1, _("Wrap the line at the window border and continue it on the next line. Note: line wrapping has a high performance cost for large documents so should be disabled on slow machines."), NULL); + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_line_wrapping1), TRUE); line_breaking1 = gtk_check_menu_item_new_with_mnemonic (_("Line _Breaking")); gtk_widget_show (line_breaking1); @@ -1500,8 +1500,8 @@ g_signal_connect ((gpointer) normal_size1, "activate", G_CALLBACK (on_normal_size1_activate), NULL); - g_signal_connect ((gpointer) menu_line_breaking1, "toggled", - G_CALLBACK (on_line_breaking1_toggled), + g_signal_connect ((gpointer) menu_line_wrapping1, "toggled", + G_CALLBACK (on_line_wrapping1_toggled), NULL); g_signal_connect ((gpointer) line_breaking1, "toggled", G_CALLBACK (on_line_breaking1_activate), @@ -1799,7 +1799,7 @@ GLADE_HOOKUP_OBJECT (window1, normal_size1, "normal_size1"); GLADE_HOOKUP_OBJECT (window1, menu_document1, "menu_document1"); GLADE_HOOKUP_OBJECT (window1, menu_document1_menu, "menu_document1_menu"); - GLADE_HOOKUP_OBJECT (window1, menu_line_breaking1, "menu_line_breaking1"); + GLADE_HOOKUP_OBJECT (window1, menu_line_wrapping1, "menu_line_wrapping1"); GLADE_HOOKUP_OBJECT (window1, line_breaking1, "line_breaking1"); GLADE_HOOKUP_OBJECT (window1, menu_use_auto_indentation1, "menu_use_auto_indentation1"); GLADE_HOOKUP_OBJECT (window1, indent_type1, "indent_type1"); Modified: trunk/src/keyfile.c =================================================================== --- trunk/src/keyfile.c 2008-05-09 12:13:29 UTC (rev 2562) +++ trunk/src/keyfile.c 2008-05-09 14:17:25 UTC (rev 2563) @@ -231,7 +231,7 @@ g_key_file_set_integer(config, PACKAGE, "indent_mode", editor_prefs.indent_mode); g_key_file_set_integer(config, PACKAGE, "check_detect_indent", editor_prefs.detect_tab_mode); g_key_file_set_boolean(config, PACKAGE, "use_indicators", editor_prefs.use_indicators); - g_key_file_set_boolean(config, PACKAGE, "line_breaking", editor_prefs.line_wrapping); + g_key_file_set_boolean(config, PACKAGE, "line_wrapping", editor_prefs.line_wrapping); g_key_file_set_boolean(config, PACKAGE, "auto_close_xml_tags", editor_prefs.auto_close_xml_tags); g_key_file_set_boolean(config, PACKAGE, "complete_snippets", editor_prefs.complete_snippets); g_key_file_set_boolean(config, PACKAGE, "auto_complete_symbols", editor_prefs.auto_complete_symbols); @@ -522,7 +522,7 @@ editor_prefs.long_line_column = utils_get_setting_integer(config, PACKAGE, "long_line_column", 72); editor_prefs.symbolcompletion_min_chars = utils_get_setting_integer(config, PACKAGE, "symbolcompletion_min_chars", GEANY_MIN_SYMBOLLIST_CHARS); editor_prefs.symbolcompletion_max_height = utils_get_setting_integer(config, PACKAGE, "symbolcompletion_max_height", GEANY_MAX_SYMBOLLIST_HEIGHT); - editor_prefs.line_wrapping = utils_get_setting_boolean(config, PACKAGE, "line_breaking", FALSE); /* default is off for better performance */ + editor_prefs.line_wrapping = utils_get_setting_boolean(config, PACKAGE, "line_wrapping", FALSE); /* default is off for better performance */ editor_prefs.indent_mode = utils_get_setting_integer(config, PACKAGE, "indent_mode", INDENT_CURRENTCHARS); editor_prefs.detect_tab_mode = utils_get_setting_integer(config, PACKAGE, "check_detect_indent", FALSE); editor_prefs.use_tab_to_indent = utils_get_setting_boolean(config, PACKAGE, "use_tab_to_indent", FALSE); Modified: trunk/src/main.c =================================================================== --- trunk/src/main.c 2008-05-09 12:13:29 UTC (rev 2562) +++ trunk/src/main.c 2008-05-09 14:17:25 UTC (rev 2563) @@ -251,7 +251,7 @@ app->ignore_callback = TRUE; gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM( - lookup_widget(app->window, "menu_line_breaking1")), editor_prefs.line_wrapping); + lookup_widget(app->window, "menu_line_wrapping1")), editor_prefs.line_wrapping); gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM( lookup_widget(app->window, "menu_use_auto_indentation1")), (editor_prefs.indent_mode != INDENT_NONE)); Modified: trunk/src/ui_utils.c =================================================================== --- trunk/src/ui_utils.c 2008-05-09 12:13:29 UTC (rev 2562) +++ trunk/src/ui_utils.c 2008-05-09 14:17:25 UTC (rev 2563) @@ -677,7 +677,7 @@ app->ignore_callback = TRUE; gtk_check_menu_item_set_active( - GTK_CHECK_MENU_ITEM(lookup_widget(app->window, "menu_line_breaking1")), + GTK_CHECK_MENU_ITEM(lookup_widget(app->window, "menu_line_wrapping1")), doc_list[idx].line_wrapping); gtk_check_menu_item_set_active( This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2562] trunk
by ntrel＠users.sourceforge.net 09 May '08

09 May '08

Revision: 2562 http://geany.svn.sourceforge.net/geany/?rev=2562&view=rev Author: ntrel Date: 2008-05-09 05:13:29 -0700 (Fri, 09 May 2008) Log Message: ----------- Add basic Line Breaking option in the Document menu. Line breaking only works when typing characters past the line breaking column number. Add 'Line breaking column' editor pref. Modified Paths: -------------- trunk/ChangeLog trunk/TODO trunk/doc/geany.html trunk/doc/geany.txt trunk/geany.glade trunk/src/callbacks.c trunk/src/callbacks.h trunk/src/document.c trunk/src/document.h trunk/src/editor.c trunk/src/editor.h trunk/src/interface.c trunk/src/keyfile.c trunk/src/prefs.c trunk/src/ui_utils.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-05-08 14:16:35 UTC (rev 2561) +++ trunk/ChangeLog 2008-05-09 12:13:29 UTC (rev 2562) @@ -1,3 +1,15 @@ +2008-05-09 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/interface.c, src/prefs.c, src/callbacks.c, src/callbacks.h, + src/keyfile.c, src/document.c, src/document.h, src/editor.c, + src/editor.h, src/ui_utils.c, geany.glade, TODO, doc/geany.txt, + doc/geany.html: + Add basic Line Breaking option in the Document menu. Line breaking + only works when typing characters past the line breaking column + number. + Add 'Line breaking column' editor pref. + + 2008-05-08 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * src/filetypes.c: Modified: trunk/TODO =================================================================== --- trunk/TODO 2008-05-08 14:16:35 UTC (rev 2561) +++ trunk/TODO 2008-05-09 12:13:29 UTC (rev 2562) @@ -19,7 +19,6 @@ o project indentation settings support o improve Compile toolbar button for Make (drop down radio list?) o (selectable menu of arguments to use for Make, from Make Custom) - o (line breaking mode to limit words on a line for e.g. XML content) o (DBUS) o (indent wrapped lines - Scintilla issue) o (folder tree in the sidebar) Modified: trunk/doc/geany.html =================================================================== --- trunk/doc/geany.html 2008-05-08 14:16:35 UTC (rev 2561) +++ trunk/doc/geany.html 2008-05-09 12:13:29 UTC (rev 2562) @@ -3,10 +3,10 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> -<meta name="generator" content="Docutils 0.4.1: http://docutils.sourceforge.net/" /> +<meta name="generator" content="Docutils 0.4: http://docutils.sourceforge.net/" /> <title>Geany</title> <meta name="authors" content="Enrico Tröger Nick Treleaven Frank Lanitz" /> -<meta name="date" content="2008-04-23" /> +<meta name="date" content="2008-05-06" /> <style type="text/css"> /* @@ -133,7 +133,7 @@ <br />Nick Treleaven <br />Frank Lanitz</td></tr> <tr><th class="docinfo-name">Date:</th> -<td>2008-04-23</td></tr> +<td>2008-05-06</td></tr> <tr><th class="docinfo-name">Version:</th> <td>0.15</td></tr> </tbody> @@ -1650,7 +1650,7 @@ <div class="section"> <h4><a class="toc-backref" href="#id80" id="long-line-marker" name="long-line-marker">Long line marker</a></h4> <p>The long line marker helps to indicate overly-long lines, or as a hint -for when to break the line.</p> +to the user for when to break the line.</p> <dl class="docutils"> <dt>Type</dt> <dd><dl class="first last docutils"> @@ -1705,13 +1705,7 @@ <h4><a class="toc-backref" href="#id83" id="features" name="features">Features</a></h4> <dl class="docutils"> <dt>Line wrapping</dt> -<dd><p class="first">Show long lines wrapped around to new display lines.</p> -<div class="last note"> -<p class="first admonition-title">Note</p> -<p class="last">Currently, there is no setting to have Geany automatically insert -newlines into your document while you type.</p> -</div> -</dd> +<dd>Show long lines wrapped around to new display lines.</dd> <dt>Enable "smart" home key</dt> <dd>Whether to move the cursor to the first non-whitespace character on the line when you hit the home key on your keyboard. Pressing it @@ -1730,6 +1724,9 @@ <dt>Newline strip trailing spaces</dt> <dd>Remove any white space at the end of the line when you hit the Enter/Return key.</dd> +<dt>Line breaking column</dt> +<dd>The editor column number to insert a newline at when Line Breaking +is enabled for the current document.</dd> </dl> </div> <div class="section"> @@ -4062,7 +4059,7 @@ <div class="footer"> <hr class="footer" /> <a class="reference" href="geany.txt">View document source</a>. -Generated on: 2008-05-06 12:42 UTC. +Generated on: 2008-05-09 12:12 UTC. Generated by <a class="reference" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source. </div> Modified: trunk/doc/geany.txt =================================================================== --- trunk/doc/geany.txt 2008-05-08 14:16:35 UTC (rev 2561) +++ trunk/doc/geany.txt 2008-05-09 12:13:29 UTC (rev 2562) @@ -1436,7 +1436,7 @@ ```````````````` The long line marker helps to indicate overly-long lines, or as a hint -for when to break the line. +to the user for when to break the line. Type Line @@ -1492,10 +1492,6 @@ Line wrapping Show long lines wrapped around to new display lines. - .. note:: - Currently, there is no setting to have Geany automatically insert - newlines into your document while you type. - Enable "smart" home key Whether to move the cursor to the first non-whitespace character on the line when you hit the home key on your keyboard. Pressing it @@ -1520,6 +1516,10 @@ Remove any white space at the end of the line when you hit the Enter/Return key. +Line breaking column + The editor column number to insert a newline at when Line Breaking + is enabled for the current document. + Completions ``````````` Modified: trunk/geany.glade =================================================================== --- trunk/geany.glade 2008-05-08 14:16:35 UTC (rev 2561) +++ trunk/geany.glade 2008-05-09 12:13:29 UTC (rev 2562) @@ -58,7 +58,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image2333"> + <widget class="GtkImage" id="image2350"> <property name="visible">True</property> <property name="stock">gtk-new</property> <property name="icon_size">1</property> @@ -148,7 +148,7 @@ <signal name="activate" handler="on_save_all1_activate" last_modification_time="Thu, 02 Jun 2005 14:15:30 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image2334"> + <widget class="GtkImage" id="image2351"> <property name="visible">True</property> <property name="stock">gtk-save</property> <property name="icon_size">1</property> @@ -169,7 +169,7 @@ <signal name="activate" handler="on_toolbutton23_clicked" last_modification_time="Mon, 24 Jul 2006 19:26:04 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image2335"> + <widget class="GtkImage" id="image2352"> <property name="visible">True</property> <property name="stock">gtk-revert-to-saved</property> <property name="icon_size">1</property> @@ -189,7 +189,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image2336"> + <widget class="GtkImage" id="image2353"> <property name="visible">True</property> <property name="stock">gtk-revert-to-saved</property> <property name="icon_size">1</property> @@ -278,7 +278,7 @@ <signal name="activate" handler="on_close_all1_activate" last_modification_time="Thu, 02 Jun 2005 14:15:30 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image2337"> + <widget class="GtkImage" id="image2354"> <property name="visible">True</property> <property name="stock">gtk-close</property> <property name="icon_size">1</property> @@ -477,7 +477,7 @@ <signal name="activate" handler="on_menu_increase_indent1_activate" last_modification_time="Tue, 01 Aug 2006 10:28:54 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image2338"> + <widget class="GtkImage" id="image2355"> <property name="visible">True</property> <property name="stock">gtk-indent</property> <property name="icon_size">1</property> @@ -498,7 +498,7 @@ <signal name="activate" handler="on_menu_decrease_indent1_activate" last_modification_time="Tue, 01 Aug 2006 10:28:54 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image2339"> + <widget class="GtkImage" id="image2356"> <property name="visible">True</property> <property name="stock">gtk-unindent</property> <property name="icon_size">1</property> @@ -554,7 +554,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image2340"> + <widget class="GtkImage" id="image2357"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -639,7 +639,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image2341"> + <widget class="GtkImage" id="image2358"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -671,7 +671,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image2342"> + <widget class="GtkImage" id="image2359"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -768,7 +768,7 @@ <signal name="activate" handler="on_replace1_activate" last_modification_time="Sun, 23 Oct 2005 13:22:36 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image2343"> + <widget class="GtkImage" id="image2360"> <property name="visible">True</property> <property name="stock">gtk-find-and-replace</property> <property name="icon_size">1</property> @@ -834,7 +834,7 @@ <signal name="activate" handler="on_go_to_line1_activate" last_modification_time="Tue, 23 May 2006 17:10:49 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image2344"> + <widget class="GtkImage" id="image2361"> <property name="visible">True</property> <property name="stock">gtk-jump-to</property> <property name="icon_size">1</property> @@ -869,7 +869,7 @@ <signal name="activate" handler="on_change_font1_activate" last_modification_time="Fri, 22 Apr 2005 18:58:45 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image2345"> + <widget class="GtkImage" id="image2362"> <property name="visible">True</property> <property name="stock">gtk-select-font</property> <property name="icon_size">1</property> @@ -1019,6 +1019,16 @@ </child> <child> + <widget class="GtkCheckMenuItem" id="line_breaking1"> + <property name="visible">True</property> + <property name="label" translatable="yes">Line _Breaking</property> + <property name="use_underline">True</property> + <property name="active">False</property> + <signal name="toggled" handler="on_line_breaking1_activate" last_modification_time="Thu, 08 May 2008 16:46:17 GMT"/> + </widget> + </child> + + <child> <widget class="GtkCheckMenuItem" id="menu_use_auto_indentation1"> <property name="visible">True</property> <property name="label" translatable="yes">_Auto-indentation</property> @@ -1278,7 +1288,7 @@ <signal name="activate" handler="on_project_new1_activate" last_modification_time="Thu, 18 Jan 2007 22:16:24 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image2346"> + <widget class="GtkImage" id="image2363"> <property name="visible">True</property> <property name="stock">gtk-new</property> <property name="icon_size">1</property> @@ -1299,7 +1309,7 @@ <signal name="activate" handler="on_project_open1_activate" last_modification_time="Mon, 15 Jan 2007 17:34:17 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image2347"> + <widget class="GtkImage" id="image2364"> <property name="visible">True</property> <property name="stock">gtk-open</property> <property name="icon_size">1</property> @@ -1320,7 +1330,7 @@ <signal name="activate" handler="on_project_close1_activate" last_modification_time="Mon, 15 Jan 2007 17:34:17 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image2348"> + <widget class="GtkImage" id="image2365"> <property name="visible">True</property> <property name="stock">gtk-close</property> <property name="icon_size">1</property> @@ -1379,7 +1389,7 @@ <signal name="activate" handler="on_show_color_chooser1_activate" last_modification_time="Wed, 22 Jun 2005 18:10:21 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image2349"> + <widget class="GtkImage" id="image2366"> <property name="visible">True</property> <property name="stock">gtk-select-color</property> <property name="icon_size">1</property> @@ -1433,7 +1443,7 @@ <signal name="activate" handler="on_help1_activate" last_modification_time="Sun, 24 Jul 2005 15:23:11 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image2350"> + <widget class="GtkImage" id="image2367"> <property name="visible">True</property> <property name="stock">gtk-help</property> <property name="icon_size">1</property> @@ -6143,6 +6153,63 @@ <property name="fill">False</property> </packing> </child> + + <child> + <widget class="GtkHBox" id="hbox11"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">12</property> + + <child> + <widget class="GtkLabel" id="label209"> + <property name="visible">True</property> + <property name="label" translatable="yes">Line breaking column:</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="GtkSpinButton" id="spin_line_break"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="climb_rate">1</property> + <property name="digits">0</property> + <property name="numeric">True</property> + <property name="update_policy">GTK_UPDATE_ALWAYS</property> + <property name="snap_to_ticks">False</property> + <property name="wrap">False</property> + <property name="adjustment">72 3 1000 1 10 10</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> </widget> </child> </widget> Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2008-05-08 14:16:35 UTC (rev 2561) +++ trunk/src/callbacks.c 2008-05-09 12:13:29 UTC (rev 2562) @@ -2105,3 +2105,19 @@ } return FALSE; } + + +void +on_line_breaking1_activate (GtkMenuItem *menuitem, + gpointer user_data) +{ + document *doc; + + if (app->ignore_callback) + return; + + doc = document_get_current(); + g_return_if_fail(doc); + + doc->line_breaking = !doc->line_breaking; +} Modified: trunk/src/callbacks.h =================================================================== --- trunk/src/callbacks.h 2008-05-08 14:16:35 UTC (rev 2561) +++ trunk/src/callbacks.h 2008-05-09 12:13:29 UTC (rev 2562) @@ -593,3 +593,8 @@ on_escape_key_press_event (GtkWidget *widget, GdkEventKey *event, gpointer user_data); + +void +on_line_breaking1_activate (GtkMenuItem *menuitem, + gpointer user_data); + Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2008-05-08 14:16:35 UTC (rev 2561) +++ trunk/src/document.c 2008-05-09 12:13:29 UTC (rev 2562) @@ -351,6 +351,7 @@ new_doc->undo_actions = NULL; new_doc->redo_actions = NULL; new_doc->scroll_percent = -1.0F; + new_doc->line_breaking = FALSE; } Modified: trunk/src/document.h =================================================================== --- trunk/src/document.h 2008-05-08 14:16:35 UTC (rev 2561) +++ trunk/src/document.h 2008-05-09 12:13:29 UTC (rev 2562) @@ -100,6 +100,7 @@ FileEncoding saved_encoding; /** %Document-specific tab setting. */ gboolean use_tabs; + gboolean line_breaking; /**< Whether to split long lines as you type. */ } document; Modified: trunk/src/editor.c =================================================================== --- trunk/src/editor.c 2008-05-08 14:16:35 UTC (rev 2561) +++ trunk/src/editor.c 2008-05-09 12:13:29 UTC (rev 2562) @@ -31,6 +31,8 @@ #include <ctype.h> #include <string.h> +#include <gdk/gdkkeysyms.h> + #include "SciLexer.h" #include "geany.h" @@ -206,6 +208,48 @@ } +static void check_line_breaking(gint idx, gint pos, gchar c) +{ + document *doc = &doc_list[idx]; + ScintillaObject *sci = doc->sci; + gint line, lstart; + + if (!doc->line_breaking) + return; + + if (c == GDK_space) + pos--; /* Use previous space, not new one */ + else + if (strchr(GEANY_WORDCHARS, c) == NULL) + return; + + line = sci_get_current_line(sci); + lstart = sci_get_position_from_line(sci, line); + + if (pos - lstart < editor_prefs.line_break_column) + return; + + /* look for the last space before editor_prefs.line_break_column */ + pos = MIN(pos, lstart + editor_prefs.line_break_column); + + while (pos > lstart) + { + c = sci_get_char_at(sci, --pos); + if (c == GDK_space) + { + gint indent_size = sci_get_line_indentation(sci, line); + + /* break the line after the space */ + sci_insert_text(sci, pos + 1, utils_get_eol_char(idx)); + + if (doc->auto_indent) + sci_set_line_indentation(sci, line + 1, indent_size); + return; + } + } +} + + static void on_char_added(gint idx, SCNotification *nt) { ScintillaObject *sci = doc_list[idx].sci; @@ -264,6 +308,7 @@ } default: editor_start_auto_complete(idx, pos, FALSE); } + check_line_breaking(idx, pos, nt->ch); } Modified: trunk/src/editor.h =================================================================== --- trunk/src/editor.h 2008-05-08 14:16:35 UTC (rev 2561) +++ trunk/src/editor.h 2008-05-09 12:13:29 UTC (rev 2562) @@ -83,6 +83,7 @@ gboolean use_gtk_word_boundaries; /* hidden pref */ gboolean complete_snippets_whilst_editing; /* hidden pref */ gboolean detect_tab_mode; + gint line_break_column; } EditorPrefs; extern EditorPrefs editor_prefs; Modified: trunk/src/interface.c =================================================================== --- trunk/src/interface.c 2008-05-08 14:16:35 UTC (rev 2561) +++ trunk/src/interface.c 2008-05-09 12:13:29 UTC (rev 2562) @@ -37,7 +37,7 @@ GtkWidget *file1_menu; GtkWidget *menu_new1; GtkWidget *menu_new_with_template1; - GtkWidget *image2333; + GtkWidget *image2350; GtkWidget *menu_new_with_template1_menu; GtkWidget *invisible2; GtkWidget *separator12; @@ -48,11 +48,11 @@ GtkWidget *menu_save1; GtkWidget *menu_save_as1; GtkWidget *menu_save_all1; - GtkWidget *image2334; + GtkWidget *image2351; GtkWidget *menu_reload1; - GtkWidget *image2335; + GtkWidget *image2352; GtkWidget *menu_reload_as1; - GtkWidget *image2336; + GtkWidget *image2353; GtkWidget *menu_reload_as1_menu; GtkWidget *invisible7; GtkWidget *separator21; @@ -63,7 +63,7 @@ GtkWidget *separator14; GtkWidget *menu_close1; GtkWidget *menu_close_all1; - GtkWidget *image2337; + GtkWidget *image2354; GtkWidget *menu_separatormenuitem1; GtkWidget *menu_quit1; GtkWidget *edit1; @@ -88,16 +88,16 @@ GtkWidget *menu_duplicate_line1; GtkWidget *separator29; GtkWidget *menu_increase_indent1; - GtkWidget *image2338; + GtkWidget *image2355; GtkWidget *menu_decrease_indent1; - GtkWidget *image2339; + GtkWidget *image2356; GtkWidget *separator37; GtkWidget *send_selection_to2; GtkWidget *send_selection_to2_menu; GtkWidget *invisible13; GtkWidget *separator18; GtkWidget *add_comments1; - GtkWidget *image2340; + GtkWidget *image2357; GtkWidget *add_comments1_menu; GtkWidget *menu_add_changelog_entry1; GtkWidget *insert_file_header1; @@ -106,11 +106,11 @@ GtkWidget *insert_gpl_notice2; GtkWidget *insert_bsd_license_notice2; GtkWidget *insert_date1; - GtkWidget *image2341; + GtkWidget *image2358; GtkWidget *insert_date1_menu; GtkWidget *invisible8; GtkWidget *insert_include2; - GtkWidget *image2342; + GtkWidget *image2359; GtkWidget *insert_include2_menu; GtkWidget *invisible4; GtkWidget *separator9; @@ -122,7 +122,7 @@ GtkWidget *find_previous1; GtkWidget *find_in_files1; GtkWidget *replace1; - GtkWidget *image2343; + GtkWidget *image2360; GtkWidget *separator33; GtkWidget *find_nextsel1; GtkWidget *find_prevsel1; @@ -130,11 +130,11 @@ GtkWidget *next_message1; GtkWidget *separator32; GtkWidget *go_to_line1; - GtkWidget *image2344; + GtkWidget *image2361; GtkWidget *menu_view1; GtkWidget *menu_view1_menu; GtkWidget *menu_change_font1; - GtkWidget *image2345; + GtkWidget *image2362; GtkWidget *menu_separator4; GtkWidget *menu_toggle_all_additional_widgets1; GtkWidget *menu_fullscreen1; @@ -150,6 +150,7 @@ GtkWidget *menu_document1; GtkWidget *menu_document1_menu; GtkWidget *menu_line_breaking1; + GtkWidget *line_breaking1; GtkWidget *menu_use_auto_indentation1; GtkWidget *indent_type1; GtkWidget *indent_type1_menu; @@ -184,24 +185,24 @@ GtkWidget *menu_project1; GtkWidget *menu_project1_menu; GtkWidget *project_new1; - GtkWidget *image2346; + GtkWidget *image2363; GtkWidget *project_open1; - GtkWidget *image2347; + GtkWidget *image2364; GtkWidget *project_close1; - GtkWidget *image2348; + GtkWidget *image2365; GtkWidget *separator34; GtkWidget *project_properties1; GtkWidget *menu_build1; GtkWidget *tools1; GtkWidget *tools1_menu; GtkWidget *menu_choose_color1; - GtkWidget *image2349; + GtkWidget *image2366; GtkWidget *menu_count_words1; GtkWidget *load_tags1; GtkWidget *menu_help1; GtkWidget *menu_help1_menu; GtkWidget *help1; - GtkWidget *image2350; + GtkWidget *image2367; GtkWidget *keyboard_shortcuts1; GtkWidget *website1; GtkWidget *separator16; @@ -304,9 +305,9 @@ gtk_widget_show (menu_new_with_template1); gtk_container_add (GTK_CONTAINER (file1_menu), menu_new_with_template1); - image2333 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2333); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_new_with_template1), image2333); + image2350 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU); + gtk_widget_show (image2350); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_new_with_template1), image2350); menu_new_with_template1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_new_with_template1), menu_new_with_template1_menu); @@ -349,25 +350,25 @@ gtk_container_add (GTK_CONTAINER (file1_menu), menu_save_all1); gtk_tooltips_set_tip (tooltips, menu_save_all1, _("Saves all open files"), NULL); - image2334 = gtk_image_new_from_stock ("gtk-save", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2334); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_save_all1), image2334); + image2351 = gtk_image_new_from_stock ("gtk-save", GTK_ICON_SIZE_MENU); + gtk_widget_show (image2351); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_save_all1), image2351); menu_reload1 = gtk_image_menu_item_new_with_mnemonic (_("_Reload")); gtk_widget_show (menu_reload1); gtk_container_add (GTK_CONTAINER (file1_menu), menu_reload1); - image2335 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2335); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload1), image2335); + image2352 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); + gtk_widget_show (image2352); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload1), image2352); menu_reload_as1 = gtk_image_menu_item_new_with_mnemonic (_("R_eload As")); gtk_widget_show (menu_reload_as1); gtk_container_add (GTK_CONTAINER (file1_menu), menu_reload_as1); - image2336 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2336); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload_as1), image2336); + image2353 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); + gtk_widget_show (image2353); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload_as1), image2353); menu_reload_as1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_reload_as1), menu_reload_as1_menu); @@ -412,9 +413,9 @@ gtk_container_add (GTK_CONTAINER (file1_menu), menu_close_all1); gtk_tooltips_set_tip (tooltips, menu_close_all1, _("Closes all open files"), NULL); - image2337 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2337); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_close_all1), image2337); + image2354 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); + gtk_widget_show (image2354); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_close_all1), image2354); menu_separatormenuitem1 = gtk_separator_menu_item_new (); gtk_widget_show (menu_separatormenuitem1); @@ -518,17 +519,17 @@ gtk_widget_show (menu_increase_indent1); gtk_container_add (GTK_CONTAINER (menu_format1_menu), menu_increase_indent1); - image2338 = gtk_image_new_from_stock ("gtk-indent", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2338); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_increase_indent1), image2338); + image2355 = gtk_image_new_from_stock ("gtk-indent", GTK_ICON_SIZE_MENU); + gtk_widget_show (image2355); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_increase_indent1), image2355); menu_decrease_indent1 = gtk_image_menu_item_new_with_mnemonic (_("_Decrease Indent")); gtk_widget_show (menu_decrease_indent1); gtk_container_add (GTK_CONTAINER (menu_format1_menu), menu_decrease_indent1); - image2339 = gtk_image_new_from_stock ("gtk-unindent", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2339); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_decrease_indent1), image2339); + image2356 = gtk_image_new_from_stock ("gtk-unindent", GTK_ICON_SIZE_MENU); + gtk_widget_show (image2356); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_decrease_indent1), image2356); separator37 = gtk_separator_menu_item_new (); gtk_widget_show (separator37); @@ -554,9 +555,9 @@ gtk_widget_show (add_comments1); gtk_container_add (GTK_CONTAINER (edit1_menu), add_comments1); - image2340 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2340); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_comments1), image2340); + image2357 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image2357); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_comments1), image2357); add_comments1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (add_comments1), add_comments1_menu); @@ -595,9 +596,9 @@ gtk_widget_show (insert_date1); gtk_container_add (GTK_CONTAINER (edit1_menu), insert_date1); - image2341 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2341); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_date1), image2341); + image2358 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image2358); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_date1), image2358); insert_date1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert_date1), insert_date1_menu); @@ -609,9 +610,9 @@ gtk_widget_show (insert_include2); gtk_container_add (GTK_CONTAINER (edit1_menu), insert_include2); - image2342 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2342); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include2), image2342); + image2359 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image2359); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include2), image2359); insert_include2_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert_include2), insert_include2_menu); @@ -655,9 +656,9 @@ gtk_widget_show (replace1); gtk_container_add (GTK_CONTAINER (search1_menu), replace1); - image2343 = gtk_image_new_from_stock ("gtk-find-and-replace", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2343); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (replace1), image2343); + image2360 = gtk_image_new_from_stock ("gtk-find-and-replace", GTK_ICON_SIZE_MENU); + gtk_widget_show (image2360); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (replace1), image2360); separator33 = gtk_separator_menu_item_new (); gtk_widget_show (separator33); @@ -690,9 +691,9 @@ gtk_widget_show (go_to_line1); gtk_container_add (GTK_CONTAINER (search1_menu), go_to_line1); - image2344 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2344); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line1), image2344); + image2361 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU); + gtk_widget_show (image2361); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line1), image2361); menu_view1 = gtk_menu_item_new_with_mnemonic (_("_View")); gtk_widget_show (menu_view1); @@ -706,9 +707,9 @@ gtk_container_add (GTK_CONTAINER (menu_view1_menu), menu_change_font1); gtk_tooltips_set_tip (tooltips, menu_change_font1, _("Change the default font"), NULL); - image2345 = gtk_image_new_from_stock ("gtk-select-font", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2345); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_change_font1), image2345); + image2362 = gtk_image_new_from_stock ("gtk-select-font", GTK_ICON_SIZE_MENU); + gtk_widget_show (image2362); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_change_font1), image2362); menu_separator4 = gtk_separator_menu_item_new (); gtk_widget_show (menu_separator4); @@ -782,6 +783,10 @@ gtk_tooltips_set_tip (tooltips, menu_line_breaking1, _("Wrap the line at the window border and continue it on the next line. Note: line wrapping has a high performance cost for large documents so should be disabled on slow machines."), NULL); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_line_breaking1), TRUE); + line_breaking1 = gtk_check_menu_item_new_with_mnemonic (_("Line _Breaking")); + gtk_widget_show (line_breaking1); + gtk_container_add (GTK_CONTAINER (menu_document1_menu), line_breaking1); + menu_use_auto_indentation1 = gtk_check_menu_item_new_with_mnemonic (_("_Auto-indentation")); gtk_widget_show (menu_use_auto_indentation1); gtk_container_add (GTK_CONTAINER (menu_document1_menu), menu_use_auto_indentation1); @@ -924,25 +929,25 @@ gtk_widget_show (project_new1); gtk_container_add (GTK_CONTAINER (menu_project1_menu), project_new1); - image2346 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2346); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_new1), image2346); + image2363 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU); + gtk_widget_show (image2363); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_new1), image2363); project_open1 = gtk_image_menu_item_new_with_mnemonic (_("_Open")); gtk_widget_show (project_open1); gtk_container_add (GTK_CONTAINER (menu_project1_menu), project_open1); - image2347 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2347); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_open1), image2347); + image2364 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_MENU); + gtk_widget_show (image2364); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_open1), image2364); project_close1 = gtk_image_menu_item_new_with_mnemonic (_("_Close")); gtk_widget_show (project_close1); gtk_container_add (GTK_CONTAINER (menu_project1_menu), project_close1); - image2348 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2348); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_close1), image2348); + image2365 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); + gtk_widget_show (image2365); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_close1), image2365); separator34 = gtk_separator_menu_item_new (); gtk_widget_show (separator34); @@ -969,9 +974,9 @@ gtk_container_add (GTK_CONTAINER (tools1_menu), menu_choose_color1); gtk_tooltips_set_tip (tooltips, menu_choose_color1, _("Open a color chooser dialog, to interactively pick colors from a palette."), NULL); - image2349 = gtk_image_new_from_stock ("gtk-select-color", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2349); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_choose_color1), image2349); + image2366 = gtk_image_new_from_stock ("gtk-select-color", GTK_ICON_SIZE_MENU); + gtk_widget_show (image2366); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_choose_color1), image2366); menu_count_words1 = gtk_menu_item_new_with_mnemonic (_("_Word Count")); gtk_widget_show (menu_count_words1); @@ -994,9 +999,9 @@ gtk_widget_show (help1); gtk_container_add (GTK_CONTAINER (menu_help1_menu), help1); - image2350 = gtk_image_new_from_stock ("gtk-help", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2350); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (help1), image2350); + image2367 = gtk_image_new_from_stock ("gtk-help", GTK_ICON_SIZE_MENU); + gtk_widget_show (image2367); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (help1), image2367); keyboard_shortcuts1 = gtk_menu_item_new_with_mnemonic (_("_Keyboard Shortcuts")); gtk_widget_show (keyboard_shortcuts1); @@ -1498,6 +1503,9 @@ g_signal_connect ((gpointer) menu_line_breaking1, "toggled", G_CALLBACK (on_line_breaking1_toggled), NULL); + g_signal_connect ((gpointer) line_breaking1, "toggled", + G_CALLBACK (on_line_breaking1_activate), + NULL); g_signal_connect ((gpointer) menu_use_auto_indentation1, "toggled", G_CALLBACK (on_use_auto_indentation1_toggled), NULL); @@ -1679,7 +1687,7 @@ GLADE_HOOKUP_OBJECT (window1, file1_menu, "file1_menu"); GLADE_HOOKUP_OBJECT (window1, menu_new1, "menu_new1"); GLADE_HOOKUP_OBJECT (window1, menu_new_with_template1, "menu_new_with_template1"); - GLADE_HOOKUP_OBJECT (window1, image2333, "image2333"); + GLADE_HOOKUP_OBJECT (window1, image2350, "image2350"); GLADE_HOOKUP_OBJECT (window1, menu_new_with_template1_menu, "menu_new_with_template1_menu"); GLADE_HOOKUP_OBJECT (window1, invisible2, "invisible2"); GLADE_HOOKUP_OBJECT (window1, separator12, "separator12"); @@ -1690,11 +1698,11 @@ GLADE_HOOKUP_OBJECT (window1, menu_save1, "menu_save1"); GLADE_HOOKUP_OBJECT (window1, menu_save_as1, "menu_save_as1"); GLADE_HOOKUP_OBJECT (window1, menu_save_all1, "menu_save_all1"); - GLADE_HOOKUP_OBJECT (window1, image2334, "image2334"); + GLADE_HOOKUP_OBJECT (window1, image2351, "image2351"); GLADE_HOOKUP_OBJECT (window1, menu_reload1, "menu_reload1"); - GLADE_HOOKUP_OBJECT (window1, image2335, "image2335"); + GLADE_HOOKUP_OBJECT (window1, image2352, "image2352"); GLADE_HOOKUP_OBJECT (window1, menu_reload_as1, "menu_reload_as1"); - GLADE_HOOKUP_OBJECT (window1, image2336, "image2336"); + GLADE_HOOKUP_OBJECT (window1, image2353, "image2353"); GLADE_HOOKUP_OBJECT (window1, menu_reload_as1_menu, "menu_reload_as1_menu"); GLADE_HOOKUP_OBJECT (window1, invisible7, "invisible7"); GLADE_HOOKUP_OBJECT (window1, separator21, "separator21"); @@ -1705,7 +1713,7 @@ GLADE_HOOKUP_OBJECT (window1, separator14, "separator14"); GLADE_HOOKUP_OBJECT (window1, menu_close1, "menu_close1"); GLADE_HOOKUP_OBJECT (window1, menu_close_all1, "menu_close_all1"); - GLADE_HOOKUP_OBJECT (window1, image2337, "image2337"); + GLADE_HOOKUP_OBJECT (window1, image2354, "image2354"); GLADE_HOOKUP_OBJECT (window1, menu_separatormenuitem1, "menu_separatormenuitem1"); GLADE_HOOKUP_OBJECT (window1, menu_quit1, "menu_quit1"); GLADE_HOOKUP_OBJECT (window1, edit1, "edit1"); @@ -1730,16 +1738,16 @@ GLADE_HOOKUP_OBJECT (window1, menu_duplicate_line1, "menu_duplicate_line1"); GLADE_HOOKUP_OBJECT (window1, separator29, "separator29"); GLADE_HOOKUP_OBJECT (window1, menu_increase_indent1, "menu_increase_indent1"); - GLADE_HOOKUP_OBJECT (window1, image2338, "image2338"); + GLADE_HOOKUP_OBJECT (window1, image2355, "image2355"); GLADE_HOOKUP_OBJECT (window1, menu_decrease_indent1, "menu_decrease_indent1"); - GLADE_HOOKUP_OBJECT (window1, image2339, "image2339"); + GLADE_HOOKUP_OBJECT (window1, image2356, "image2356"); GLADE_HOOKUP_OBJECT (window1, separator37, "separator37"); GLADE_HOOKUP_OBJECT (window1, send_selection_to2, "send_selection_to2"); GLADE_HOOKUP_OBJECT (window1, send_selection_to2_menu, "send_selection_to2_menu"); GLADE_HOOKUP_OBJECT (window1, invisible13, "invisible13"); GLADE_HOOKUP_OBJECT (window1, separator18, "separator18"); GLADE_HOOKUP_OBJECT (window1, add_comments1, "add_comments1"); - GLADE_HOOKUP_OBJECT (window1, image2340, "image2340"); + GLADE_HOOKUP_OBJECT (window1, image2357, "image2357"); GLADE_HOOKUP_OBJECT (window1, add_comments1_menu, "add_comments1_menu"); GLADE_HOOKUP_OBJECT (window1, menu_add_changelog_entry1, "menu_add_changelog_entry1"); GLADE_HOOKUP_OBJECT (window1, insert_file_header1, "insert_file_header1"); @@ -1748,11 +1756,11 @@ GLADE_HOOKUP_OBJECT (window1, insert_gpl_notice2, "insert_gpl_notice2"); GLADE_HOOKUP_OBJECT (window1, insert_bsd_license_notice2, "insert_bsd_license_notice2"); GLADE_HOOKUP_OBJECT (window1, insert_date1, "insert_date1"); - GLADE_HOOKUP_OBJECT (window1, image2341, "image2341"); + GLADE_HOOKUP_OBJECT (window1, image2358, "image2358"); GLADE_HOOKUP_OBJECT (window1, insert_date1_menu, "insert_date1_menu"); GLADE_HOOKUP_OBJECT (window1, invisible8, "invisible8"); GLADE_HOOKUP_OBJECT (window1, insert_include2, "insert_include2"); - GLADE_HOOKUP_OBJECT (window1, image2342, "image2342"); + GLADE_HOOKUP_OBJECT (window1, image2359, "image2359"); GLADE_HOOKUP_OBJECT (window1, insert_include2_menu, "insert_include2_menu"); GLADE_HOOKUP_OBJECT (window1, invisible4, "invisible4"); GLADE_HOOKUP_OBJECT (window1, separator9, "separator9"); @@ -1764,7 +1772,7 @@ GLADE_HOOKUP_OBJECT (window1, find_previous1, "find_previous1"); GLADE_HOOKUP_OBJECT (window1, find_in_files1, "find_in_files1"); GLADE_HOOKUP_OBJECT (window1, replace1, "replace1"); - GLADE_HOOKUP_OBJECT (window1, image2343, "image2343"); + GLADE_HOOKUP_OBJECT (window1, image2360, "image2360"); GLADE_HOOKUP_OBJECT (window1, separator33, "separator33"); GLADE_HOOKUP_OBJECT (window1, find_nextsel1, "find_nextsel1"); GLADE_HOOKUP_OBJECT (window1, find_prevsel1, "find_prevsel1"); @@ -1772,11 +1780,11 @@ GLADE_HOOKUP_OBJECT (window1, next_message1, "next_message1"); GLADE_HOOKUP_OBJECT (window1, separator32, "separator32"); GLADE_HOOKUP_OBJECT (window1, go_to_line1, "go_to_line1"); - GLADE_HOOKUP_OBJECT (window1, image2344, "image2344"); + GLADE_HOOKUP_OBJECT (window1, image2361, "image2361"); GLADE_HOOKUP_OBJECT (window1, menu_view1, "menu_view1"); GLADE_HOOKUP_OBJECT (window1, menu_view1_menu, "menu_view1_menu"); GLADE_HOOKUP_OBJECT (window1, menu_change_font1, "menu_change_font1"); - GLADE_HOOKUP_OBJECT (window1, image2345, "image2345"); + GLADE_HOOKUP_OBJECT (window1, image2362, "image2362"); GLADE_HOOKUP_OBJECT (window1, menu_separator4, "menu_separator4"); GLADE_HOOKUP_OBJECT (window1, menu_toggle_all_additional_widgets1, "menu_toggle_all_additional_widgets1"); GLADE_HOOKUP_OBJECT (window1, menu_fullscreen1, "menu_fullscreen1"); @@ -1792,6 +1800,7 @@ GLADE_HOOKUP_OBJECT (window1, menu_document1, "menu_document1"); GLADE_HOOKUP_OBJECT (window1, menu_document1_menu, "menu_document1_menu"); GLADE_HOOKUP_OBJECT (window1, menu_line_breaking1, "menu_line_breaking1"); + GLADE_HOOKUP_OBJECT (window1, line_breaking1, "line_breaking1"); GLADE_HOOKUP_OBJECT (window1, menu_use_auto_indentation1, "menu_use_auto_indentation1"); GLADE_HOOKUP_OBJECT (window1, indent_type1, "indent_type1"); GLADE_HOOKUP_OBJECT (window1, indent_type1_menu, "indent_type1_menu"); @@ -1824,24 +1833,24 @@ GLADE_HOOKUP_OBJECT (window1, menu_project1, "menu_project1"); GLADE_HOOKUP_OBJECT (window1, menu_project1_menu, "menu_project1_menu"); GLADE_HOOKUP_OBJECT (window1, project_new1, "project_new1"); - GLADE_HOOKUP_OBJECT (window1, image2346, "image2346"); + GLADE_HOOKUP_OBJECT (window1, image2363, "image2363"); GLADE_HOOKUP_OBJECT (window1, project_open1, "project_open1"); - GLADE_HOOKUP_OBJECT (window1, image2347, "image2347"); + GLADE_HOOKUP_OBJECT (window1, image2364, "image2364"); GLADE_HOOKUP_OBJECT (window1, project_close1, "project_close1"); - GLADE_HOOKUP_OBJECT (window1, image2348, "image2348"); + GLADE_HOOKUP_OBJECT (window1, image2365, "image2365"); GLADE_HOOKUP_OBJECT (window1, separator34, "separator34"); GLADE_HOOKUP_OBJECT (window1, project_properties1, "project_properties1"); GLADE_HOOKUP_OBJECT (window1, menu_build1, "menu_build1"); GLADE_HOOKUP_OBJECT (window1, tools1, "tools1"); GLADE_HOOKUP_OBJECT (window1, tools1_menu, "tools1_menu"); GLADE_HOOKUP_OBJECT (window1, menu_choose_color1, "menu_choose_color1"); - GLADE_HOOKUP_OBJECT (window1, image2349, "image2349"); + GLADE_HOOKUP_OBJECT (window1, image2366, "image2366"); GLADE_HOOKUP_OBJECT (window1, menu_count_words1, "menu_count_words1"); GLADE_HOOKUP_OBJECT (window1, load_tags1, "load_tags1"); GLADE_HOOKUP_OBJECT (window1, menu_help1, "menu_help1"); GLADE_HOOKUP_OBJECT (window1, menu_help1_menu, "menu_help1_menu"); GLADE_HOOKUP_OBJECT (window1, help1, "help1"); - GLADE_HOOKUP_OBJECT (window1, image2350, "image2350"); + GLADE_HOOKUP_OBJECT (window1, image2367, "image2367"); GLADE_HOOKUP_OBJECT (window1, keyboard_shortcuts1, "keyboard_shortcuts1"); GLADE_HOOKUP_OBJECT (window1, website1, "website1"); GLADE_HOOKUP_OBJECT (window1, separator16, "separator16"); @@ -2638,6 +2647,10 @@ GtkWidget *check_unfold_children; GtkWidget *check_indicators; GtkWidget *check_newline_strip; + GtkWidget *hbox11; + GtkWidget *label209; + GtkObject *spin_line_break_adj; + GtkWidget *spin_line_break; GtkWidget *label172; GtkWidget *frame18; GtkWidget *alignment21; @@ -3761,6 +3774,20 @@ gtk_tooltips_set_tip (tooltips, check_newline_strip, _("Enable newline to strip the trailing spaces on the previous line."), NULL); gtk_button_set_focus_on_click (GTK_BUTTON (check_newline_strip), FALSE); + hbox11 = gtk_hbox_new (FALSE, 12); + gtk_widget_show (hbox11); + gtk_box_pack_start (GTK_BOX (vbox17), hbox11, TRUE, TRUE, 0); + + label209 = gtk_label_new (_("Line breaking column:")); + gtk_widget_show (label209); + gtk_box_pack_start (GTK_BOX (hbox11), label209, FALSE, FALSE, 0); + + spin_line_break_adj = gtk_adjustment_new (72, 3, 1000, 1, 10, 10); + spin_line_break = gtk_spin_button_new (GTK_ADJUSTMENT (spin_line_break_adj), 1, 0); + gtk_widget_show (spin_line_break); + gtk_box_pack_start (GTK_BOX (hbox11), spin_line_break, FALSE, TRUE, 0); + gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spin_line_break), TRUE); + label172 = gtk_label_new (_("<b>Features</b>")); gtk_widget_show (label172); gtk_frame_set_label_widget (GTK_FRAME (frame14), label172); @@ -4652,6 +4679,9 @@ GLADE_HOOKUP_OBJECT (prefs_dialog, check_unfold_children, "check_unfold_children"); GLADE_HOOKUP_OBJECT (prefs_dialog, check_indicators, "check_indicators"); GLADE_HOOKUP_OBJECT (prefs_dialog, check_newline_strip, "check_newline_strip"); + GLADE_HOOKUP_OBJECT (prefs_dialog, hbox11, "hbox11"); + GLADE_HOOKUP_OBJECT (prefs_dialog, label209, "label209"); + GLADE_HOOKUP_OBJECT (prefs_dialog, spin_line_break, "spin_line_break"); GLADE_HOOKUP_OBJECT (prefs_dialog, label172, "label172"); GLADE_HOOKUP_OBJECT (prefs_dialog, frame18, "frame18"); GLADE_HOOKUP_OBJECT (prefs_dialog, alignment21, "alignment21"); Modified: trunk/src/keyfile.c =================================================================== --- trunk/src/keyfile.c 2008-05-08 14:16:35 UTC (rev 2561) +++ trunk/src/keyfile.c 2008-05-09 12:13:29 UTC (rev 2562) @@ -240,6 +240,7 @@ g_key_file_set_boolean(config, PACKAGE, "pref_editor_disable_dnd", editor_prefs.disable_dnd); g_key_file_set_boolean(config, PACKAGE, "pref_editor_smart_home_key", editor_prefs.smart_home_key); g_key_file_set_boolean(config, PACKAGE, "pref_editor_newline_strip", editor_prefs.newline_strip); + g_key_file_set_integer(config, PACKAGE, "line_break_column", editor_prefs.line_break_column); /* files */ g_key_file_set_string(config, PACKAGE, "pref_editor_default_new_encoding", encodings[prefs.default_new_encoding].charset); @@ -546,6 +547,7 @@ editor_prefs.use_gtk_word_boundaries = utils_get_setting_boolean(config, PACKAGE, "use_gtk_word_boundaries", TRUE); editor_prefs.complete_snippets_whilst_editing = utils_get_setting_boolean(config, PACKAGE, "complete_snippets_whilst_editing", FALSE); editor_prefs.scroll_stop_at_last_line = utils_get_setting_boolean(config, PACKAGE, "scroll_stop_at_last_line", FALSE); + editor_prefs.line_break_column = utils_get_setting_integer(config, PACKAGE, "line_break_column", 72); /* Files * use current locale encoding as default for new files (should be UTF-8 in most cases) */ Modified: trunk/src/prefs.c =================================================================== --- trunk/src/prefs.c 2008-05-08 14:16:35 UTC (rev 2561) +++ trunk/src/prefs.c 2008-05-09 12:13:29 UTC (rev 2562) @@ -427,7 +427,10 @@ widget = lookup_widget(ui_widgets.prefs_dialog, "spin_symbol_complete_chars"); gtk_spin_button_set_value(GTK_SPIN_BUTTON(widget), editor_prefs.symbolcompletion_min_chars); + widget = lookup_widget(ui_widgets.prefs_dialog, "spin_line_break"); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(widget), editor_prefs.line_break_column); + /* Tools Settings */ if (prefs.tools_make_cmd) gtk_entry_set_text(GTK_ENTRY(lookup_widget(ui_widgets.prefs_dialog, "entry_com_make")), prefs.tools_make_cmd); @@ -822,7 +825,10 @@ widget = lookup_widget(ui_widgets.prefs_dialog, "spin_symbollistheight"); editor_prefs.symbolcompletion_max_height = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget)); + widget = lookup_widget(ui_widgets.prefs_dialog, "spin_line_break"); + editor_prefs.line_break_column = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget)); + /* Tools Settings */ widget = lookup_widget(ui_widgets.prefs_dialog, "entry_com_make"); g_free(prefs.tools_make_cmd); Modified: trunk/src/ui_utils.c =================================================================== --- trunk/src/ui_utils.c 2008-05-08 14:16:35 UTC (rev 2561) +++ trunk/src/ui_utils.c 2008-05-09 12:13:29 UTC (rev 2562) @@ -680,6 +680,10 @@ GTK_CHECK_MENU_ITEM(lookup_widget(app->window, "menu_line_breaking1")), doc_list[idx].line_wrapping); + gtk_check_menu_item_set_active( + GTK_CHECK_MENU_ITEM(lookup_widget(app->window, "line_breaking1")), + doc_list[idx].line_breaking); + item = lookup_widget(app->window, "menu_use_auto_indentation1"); gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), doc_list[idx].auto_indent); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2561] trunk
by ntrel＠users.sourceforge.net 08 May '08

08 May '08

Revision: 2561 http://geany.svn.sourceforge.net/geany/?rev=2561&view=rev Author: ntrel Date: 2008-05-08 07:16:35 -0700 (Thu, 08 May 2008) Log Message: ----------- Fix C headers getting detected as C++ files (iterate through filetypes_array, not filetypes_hash as the order is not consistent with the filetype_id enum). Add static function filetypes_find_source(). Modified Paths: -------------- trunk/ChangeLog trunk/src/filetypes.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-05-07 16:32:23 UTC (rev 2560) +++ trunk/ChangeLog 2008-05-08 14:16:35 UTC (rev 2561) @@ -1,3 +1,12 @@ +2008-05-08 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/filetypes.c: + Fix C headers getting detected as C++ files (iterate through + filetypes_array, not filetypes_hash as the order is not consistent + with the filetype_id enum). + Add static function filetypes_find_source(). + + 2008-05-07 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * src/templates.c, src/build.c, src/utils.c, src/win32.c, Modified: trunk/src/filetypes.c =================================================================== --- trunk/src/filetypes.c 2008-05-07 16:32:23 UTC (rev 2560) +++ trunk/src/filetypes.c 2008-05-08 14:16:35 UTC (rev 2561) @@ -537,17 +537,34 @@ } -static gboolean match_basename(G_GNUC_UNUSED gpointer key, gpointer value, gpointer user_data) +typedef gboolean FileTypesPredicate(filetype *ft, gpointer user_data); + +/* Find a filetype that predicate returns TRUE for, otherwise return NULL. + * Only search source file filetypes. */ +static filetype *filetypes_find_source(FileTypesPredicate predicate, gpointer user_data) { - filetype *ft = value; + guint i; + + for (i = 0; i < filetypes_array->len; i++) + { + filetype *ft = filetypes[i]; + + if (i == GEANY_FILETYPES_NONE) + continue; /* None is not for source files */ + + if (predicate(ft, user_data)) + return ft; + } + return NULL; +} + + +static gboolean match_basename(filetype *ft, gpointer user_data) +{ const gchar *base_filename = user_data; gint j; gboolean ret = FALSE; - /* Don't match '*' because it comes before any custom filetypes */ - if (ft->id == GEANY_FILETYPES_NONE) - return FALSE; - for (j = 0; ft->pattern[j] != NULL; j++) { GPatternSpec *pattern = g_pattern_spec_new(ft->pattern[j]); @@ -578,7 +595,7 @@ setptr(base_filename, g_utf8_strdown(base_filename, -1)); #endif - ft = g_hash_table_find(filetypes_hash, match_basename, base_filename); + ft = filetypes_find_source(match_basename, base_filename); if (ft == NULL) ft = filetypes[GEANY_FILETYPES_NONE]; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits May 2008