Revision: 2932
http://geany.svn.sourceforge.net/geany/?rev=2932&view=rev
Author: eht16
Date: 2008-09-10 11:28:33 +0000 (Wed, 10 Sep 2008)
Log Message:
-----------
Add missing HTML attribute 'xml:lang'.
Modified Paths:
--------------
trunk/ChangeLog
trunk/data/filetypes.xml
trunk/src/highlighting.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-09-10 11:24:47 UTC (rev 2931)
+++ trunk/ChangeLog 2008-09-10 11:28:33 UTC (rev 2932)
@@ -1,3 +1,9 @@
+2008-09-09 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+
+ * data/filetypes.xml, src/highlighting.c:
+ Add missing HTML attribute 'xml:lang'.
+
+
2008-09-08 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
* scripts/missing-mnemonics.sh, scripts/svn-add.sh:
Modified: trunk/data/filetypes.xml
===================================================================
--- trunk/data/filetypes.xml 2008-09-10 11:24:47 UTC (rev 2931)
+++ trunk/data/filetypes.xml 2008-09-10 11:28:33 UTC (rev 2932)
@@ -71,7 +71,7 @@
# 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
+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 xml:lang
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
vbscript=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
python=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
Modified: trunk/src/highlighting.c
===================================================================
--- trunk/src/highlighting.c 2008-09-10 11:24:47 UTC (rev 2931)
+++ trunk/src/highlighting.c 2008-09-10 11:28:33 UTC (rev 2932)
@@ -1170,7 +1170,7 @@
get_keyfile_hex(config, config_home, "styling", "jscript_stringeol", "0x000000", "0xe0c0e0", "false", &style_sets[GEANY_FILETYPES_XML].styling[54]);
style_sets[GEANY_FILETYPES_XML].keywords = g_new(gchar*, 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", "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 xml:lang");
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 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");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 2930
http://geany.svn.sourceforge.net/geany/?rev=2930&view=rev
Author: eht16
Date: 2008-09-08 14:28:59 +0000 (Mon, 08 Sep 2008)
Log Message:
-----------
Add ui_get_toolbar_insert_position() for plugins to get a position to insert new toolbar items.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/plugindata.h
trunk/src/plugins.c
trunk/src/ui_utils.c
trunk/src/ui_utils.h
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-09-08 14:27:46 UTC (rev 2929)
+++ trunk/ChangeLog 2008-09-08 14:28:59 UTC (rev 2930)
@@ -3,6 +3,9 @@
* scripts/missing-mnemonics.sh, scripts/svn-add.sh:
Remove bashisms.
Add support for passing asterisk wildcards to missing-mnemonics.sh.
+ * src/plugindata.h, src/plugins.c, src/ui_utils.c, src/ui_utils.h:
+ Add ui_get_toolbar_insert_position() for plugins to get a position to
+ insert new toolbar items.
2008-09-07 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
Modified: trunk/src/plugindata.h
===================================================================
--- trunk/src/plugindata.h 2008-09-08 14:27:46 UTC (rev 2929)
+++ trunk/src/plugindata.h 2008-09-08 14:28:59 UTC (rev 2930)
@@ -335,6 +335,7 @@
void (*table_add_row) (GtkTable *table, gint row, ...) G_GNUC_NULL_TERMINATED;
GtkWidget* (*path_box_new) (const gchar *title, GtkFileChooserAction action, GtkEntry *entry);
GtkWidget* (*button_new_with_image) (const gchar *stock_id, const gchar *text);
+ gint (*get_toolbar_insert_position) (void);
}
UIUtilsFuncs;
Modified: trunk/src/plugins.c
===================================================================
--- trunk/src/plugins.c 2008-09-08 14:27:46 UTC (rev 2929)
+++ trunk/src/plugins.c 2008-09-08 14:28:59 UTC (rev 2930)
@@ -173,7 +173,7 @@
&utils_get_setting_integer,
&utils_get_setting_string,
&utils_spawn_sync,
- &utils_spawn_async,
+ &utils_spawn_async
};
static UIUtilsFuncs uiutils_funcs = {
@@ -183,6 +183,7 @@
&ui_table_add_row,
&ui_path_box_new,
&ui_button_new_with_image,
+ &ui_get_toolbar_insert_position
};
static DialogFuncs dialog_funcs = {
Modified: trunk/src/ui_utils.c
===================================================================
--- trunk/src/ui_utils.c 2008-09-08 14:27:46 UTC (rev 2929)
+++ trunk/src/ui_utils.c 2008-09-08 14:28:59 UTC (rev 2930)
@@ -1532,3 +1532,22 @@
}
+/** Returns the position for adding new toolbar items. The returned position can be used
+ * to add new toolbar items with @c gtk_toolbar_insert(). The toolbar object can be accessed
+ * with @a geany->main_widgets->toolbar.
+ * The position is always the last one before the Quit button (if it is shown).
+ *
+ * @return The position for new toolbar items or @c -1 if an error occurred.
+ */
+gint ui_get_toolbar_insert_position(void)
+{
+ GtkWidget *quit = lookup_widget(main_widgets.window, "toolbutton_quit");
+ gint pos = gtk_toolbar_get_item_index(GTK_TOOLBAR(main_widgets.toolbar), GTK_TOOL_ITEM(quit));
+
+ if (pos > 0)
+ pos--; /* use one position before the real position of the quit button to place new
+ * items between the last separator and the quit button */
+
+ return pos;
+}
+
Modified: trunk/src/ui_utils.h
===================================================================
--- trunk/src/ui_utils.h 2008-09-08 14:27:46 UTC (rev 2929)
+++ trunk/src/ui_utils.h 2008-09-08 14:28:59 UTC (rev 2930)
@@ -231,4 +231,6 @@
void ui_statusbar_showhide(gboolean state);
+gint ui_get_toolbar_insert_position(void);
+
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.