Commits July 2008

commits@lists.geany.org

3 participants
105 discussions

SF.net SVN: geany:[2824] trunk/wscript
by eht16＠users.sourceforge.net 27 Jul '08

27 Jul '08

Revision: 2824 http://geany.svn.sourceforge.net/geany/?rev=2824&view=rev Author: eht16 Date: 2008-07-27 18:38:46 +0000 (Sun, 27 Jul 2008) Log Message: ----------- Fix typo. Modified Paths: -------------- trunk/wscript Modified: trunk/wscript =================================================================== --- trunk/wscript 2008-07-27 18:38:21 UTC (rev 2823) +++ trunk/wscript 2008-07-27 18:38:46 UTC (rev 2824) @@ -119,7 +119,7 @@ return value.strip() except: pass - else + else: pass return '-1' This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[2823] trunk
by eht16＠users.sourceforge.net 27 Jul '08

27 Jul '08

Revision: 2823 http://geany.svn.sourceforge.net/geany/?rev=2823&view=rev Author: eht16 Date: 2008-07-27 18:38:21 +0000 (Sun, 27 Jul 2008) Log Message: ----------- Add support for retrieving the SVN revision number also when using a git-svn. Modified Paths: -------------- trunk/ChangeLog trunk/configure.in trunk/wscript Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-07-25 15:10:53 UTC (rev 2822) +++ trunk/ChangeLog 2008-07-27 18:38:21 UTC (rev 2823) @@ -1,3 +1,10 @@ +2008-07-27 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * configure.in, wscript: + Add support for retrieving the SVN revision number also + when using a git-svn. + + 2008-07-25 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * src/interface.c, src/ui_utils.c, geany.glade: Modified: trunk/configure.in =================================================================== --- trunk/configure.in 2008-07-25 15:10:53 UTC (rev 2822) +++ trunk/configure.in 2008-07-27 18:38:21 UTC (rev 2823) @@ -46,11 +46,25 @@ # autoscan end -# get svn revision -SVN=`which svn 2>/dev/null` -if test -d ".svn" -a "x${SVN}" != "x" -a -x "${SVN}" +# get svn revision (try GIT first, then check for SVN) +REVISION="r0" +GIT=`which git 2>/dev/null` +if test -d ".git" -a "x${GIT}" != "x" -a -x "${GIT}" then - REVISION=r`$SVN info|grep 'Last Changed Rev'|cut -d' ' -f4` + REVISION=r`git svn find-rev origin/trunk 2>/dev/null || + git svn find-rev trunk 2>/dev/null || git svn find-rev HEAD 2>/dev/null || + git svn find-rev master 2>/dev/null || echo 0` +fi +if test "x${REVISION}" = "xr0" +then + SVN=`which svn 2>/dev/null` + if test -d ".svn" -a "x${SVN}" != "x" -a -x "${SVN}" + then + REVISION=r`$SVN info|grep 'Last Changed Rev'|cut -d' ' -f4` + fi +fi +if test "x${REVISION}" != "xr0" +then # force debug mode for a SVN working copy CFLAGS="-g -DGEANY_DEBUG $CFLAGS" else Modified: trunk/wscript =================================================================== --- trunk/wscript 2008-07-25 15:10:53 UTC (rev 2822) +++ trunk/wscript 2008-07-27 18:38:21 UTC (rev 2823) @@ -95,20 +95,33 @@ def configure(conf): def conf_get_svn_rev(): - try: - p = subprocess.Popen(['svn', 'info', '--non-interactive'], stdout=subprocess.PIPE, \ - stderr=subprocess.STDOUT, close_fds=False, env={'LANG' : 'C'}) - stdout = p.communicate()[0] - - if p.returncode == 0: + # try GIT + if os.path.exists('.git'): + cmds = [ 'git svn find-rev HEAD 2>/dev/null', + 'git svn find-rev origin/trunk 2>/dev/null', + 'git svn find-rev trunk 2>/dev/null', + 'git svn find-rev master 2>/dev/null' ] + for c in cmds: + try: + stdout = Utils.cmd_output(c) + if stdout: + return stdout.strip() + except: + pass + # try SVN + elif os.path.exists('.svn'): + try: + stdout = Utils.cmd_output('svn info --non-interactive', {'LANG' : 'C'}) lines = stdout.splitlines(True) for line in lines: if line.startswith('Last Changed Rev'): key, value = line.split(': ', 1) return value.strip() - return '-1' - except: - return '-1' + except: + pass + else + pass + return '-1' def conf_get_pkg_ver(pkgname): ret = os.popen('PKG_CONFIG_PATH=$PKG_CONFIG_PATH pkg-config --modversion %s' % pkgname).read().strip() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[2822] branches/custom-tab-width
by ntrel＠users.sourceforge.net 25 Jul '08

25 Jul '08

Revision: 2822 http://geany.svn.sourceforge.net/geany/?rev=2822&view=rev Author: ntrel Date: 2008-07-25 15:10:53 +0000 (Fri, 25 Jul 2008) Log Message: ----------- Add separate Width indent pref. Add 'Custom tab width' checkbox pref. Modified Paths: -------------- branches/custom-tab-width/ChangeLog branches/custom-tab-width/geany.glade branches/custom-tab-width/src/interface.c Modified: branches/custom-tab-width/ChangeLog =================================================================== --- branches/custom-tab-width/ChangeLog 2008-07-25 15:05:27 UTC (rev 2821) +++ branches/custom-tab-width/ChangeLog 2008-07-25 15:10:53 UTC (rev 2822) @@ -5,6 +5,9 @@ Add GeanyIndentPrefs struct from some GeanyEditorPrefs fields (maybe this struct will get used elsewhere too). Add editor_init(). + * src/interface.c, geany.glade: + Add separate Width indent pref. + Add 'Custom tab width' checkbox pref. 2008-07-25 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: branches/custom-tab-width/geany.glade =================================================================== --- branches/custom-tab-width/geany.glade 2008-07-25 15:05:27 UTC (rev 2821) +++ branches/custom-tab-width/geany.glade 2008-07-25 15:10:53 UTC (rev 2822) @@ -5354,7 +5354,7 @@ <child> <widget class="GtkTable" id="table13"> <property name="visible">True</property> - <property name="n_rows">4</property> + <property name="n_rows">5</property> <property name="n_columns">2</property> <property name="homogeneous">False</property> <property name="row_spacing">3</property> @@ -5381,8 +5381,8 @@ <packing> <property name="left_attach">0</property> <property name="right_attach">1</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> <property name="x_options">fill</property> <property name="y_options"></property> </packing> @@ -5401,65 +5401,14 @@ <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> <property name="x_options">fill</property> <property name="y_options">fill</property> </packing> </child> <child> - <widget class="GtkSpinButton" id="spin_tab_width"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes">The width in chars, which one tab character will take</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_IF_VALID</property> - <property name="snap_to_ticks">False</property> - <property name="wrap">True</property> - <property name="adjustment">1 1 99 1 10 10</property> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label116"> - <property name="visible">True</property> - <property name="label" translatable="yes">Tab width:</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</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="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> <widget class="GtkHBox" id="hbox8"> <property name="visible">True</property> <property name="homogeneous">False</property> @@ -5565,6 +5514,101 @@ <property name="y_options"></property> </packing> </child> + + <child> + <widget class="GtkLabel" id="label220"> + <property name="visible">True</property> + <property name="label" translatable="yes">Width:</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</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="left_attach">0</property> + <property name="right_attach">1</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkSpinButton" id="spin_indent_width"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">The width in chars of a single indent</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_IF_VALID</property> + <property name="snap_to_ticks">False</property> + <property name="wrap">True</property> + <property name="adjustment">1 1 99 1 10 10</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkCheckButton" id="check_custom_tab_width"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">Make tabs have a different size from the indent width</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Custom tab width:</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + </widget> + <packing> + <property name="left_attach">0</property> + <property name="right_attach">1</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkSpinButton" id="spin_tab_width"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">The width in chars, which one tab character will take</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_IF_VALID</property> + <property name="snap_to_ticks">False</property> + <property name="wrap">True</property> + <property name="adjustment">1 1 99 1 10 10</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> + <property name="y_options"></property> + </packing> + </child> </widget> <packing> <property name="padding">0</property> Modified: branches/custom-tab-width/src/interface.c =================================================================== --- branches/custom-tab-width/src/interface.c 2008-07-25 15:05:27 UTC (rev 2821) +++ branches/custom-tab-width/src/interface.c 2008-07-25 15:10:53 UTC (rev 2822) @@ -2669,15 +2669,18 @@ GtkWidget *table13; GtkWidget *label183; GtkWidget *combo_auto_indent_mode; - GtkObject *spin_tab_width_adj; - GtkWidget *spin_tab_width; - GtkWidget *label116; GtkWidget *hbox8; GtkWidget *radio_indent_tabs; GSList *radio_indent_tabs_group = NULL; GtkWidget *radio_indent_spaces; GtkWidget *label200; GtkWidget *check_detect_indent; + GtkWidget *label220; + GtkObject *spin_indent_width_adj; + GtkWidget *spin_indent_width; + GtkWidget *check_custom_tab_width; + GtkObject *spin_tab_width_adj; + GtkWidget *spin_tab_width; GtkWidget *label195; GtkWidget *frame14; GtkWidget *alignment17; @@ -3588,7 +3591,7 @@ gtk_widget_show (vbox25); gtk_container_add (GTK_CONTAINER (alignment30), vbox25); - table13 = gtk_table_new (4, 2, FALSE); + table13 = gtk_table_new (5, 2, FALSE); gtk_widget_show (table13); gtk_box_pack_start (GTK_BOX (vbox25), table13, FALSE, TRUE, 0); gtk_table_set_row_spacings (GTK_TABLE (table13), 3); @@ -3596,13 +3599,13 @@ label183 = gtk_label_new (_("Auto-indent mode:")); gtk_widget_show (label183); - gtk_table_attach (GTK_TABLE (table13), label183, 0, 1, 3, 4, + gtk_table_attach (GTK_TABLE (table13), label183, 0, 1, 4, 5, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); combo_auto_indent_mode = gtk_combo_box_new_text (); gtk_widget_show (combo_auto_indent_mode); - gtk_table_attach (GTK_TABLE (table13), combo_auto_indent_mode, 1, 2, 3, 4, + gtk_table_attach (GTK_TABLE (table13), combo_auto_indent_mode, 1, 2, 4, 5, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); gtk_combo_box_append_text (GTK_COMBO_BOX (combo_auto_indent_mode), _("None")); @@ -3610,24 +3613,6 @@ gtk_combo_box_append_text (GTK_COMBO_BOX (combo_auto_indent_mode), _("Current chars")); gtk_combo_box_append_text (GTK_COMBO_BOX (combo_auto_indent_mode), _("Match braces")); - spin_tab_width_adj = gtk_adjustment_new (1, 1, 99, 1, 10, 10); - spin_tab_width = gtk_spin_button_new (GTK_ADJUSTMENT (spin_tab_width_adj), 1, 0); - gtk_widget_show (spin_tab_width); - gtk_table_attach (GTK_TABLE (table13), spin_tab_width, 1, 2, 2, 3, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_tooltips_set_tip (tooltips, spin_tab_width, _("The width in chars, which one tab character will take"), NULL); - gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spin_tab_width), TRUE); - gtk_spin_button_set_update_policy (GTK_SPIN_BUTTON (spin_tab_width), GTK_UPDATE_IF_VALID); - gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (spin_tab_width), TRUE); - - label116 = gtk_label_new (_("Tab width:")); - gtk_widget_show (label116); - gtk_table_attach (GTK_TABLE (table13), label116, 0, 1, 2, 3, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment (GTK_MISC (label116), 0, 0.5); - hbox8 = gtk_hbox_new (FALSE, 12); gtk_widget_show (hbox8); gtk_table_attach (GTK_TABLE (table13), hbox8, 1, 2, 0, 1, @@ -3662,6 +3647,42 @@ (GtkAttachOptions) (0), 0, 0); gtk_tooltips_set_tip (tooltips, check_detect_indent, _("Whether to detect the indentation type from file contents when a file is opened."), NULL); + label220 = gtk_label_new (_("Width:")); + gtk_widget_show (label220); + gtk_table_attach (GTK_TABLE (table13), label220, 0, 1, 2, 3, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_misc_set_alignment (GTK_MISC (label220), 0, 0.5); + + spin_indent_width_adj = gtk_adjustment_new (1, 1, 99, 1, 10, 10); + spin_indent_width = gtk_spin_button_new (GTK_ADJUSTMENT (spin_indent_width_adj), 1, 0); + gtk_widget_show (spin_indent_width); + gtk_table_attach (GTK_TABLE (table13), spin_indent_width, 1, 2, 2, 3, + (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_tooltips_set_tip (tooltips, spin_indent_width, _("The width in chars of a single indent"), NULL); + gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spin_indent_width), TRUE); + gtk_spin_button_set_update_policy (GTK_SPIN_BUTTON (spin_indent_width), GTK_UPDATE_IF_VALID); + gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (spin_indent_width), TRUE); + + check_custom_tab_width = gtk_check_button_new_with_mnemonic (_("Custom tab width:")); + gtk_widget_show (check_custom_tab_width); + gtk_table_attach (GTK_TABLE (table13), check_custom_tab_width, 0, 1, 3, 4, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_tooltips_set_tip (tooltips, check_custom_tab_width, _("Make tabs have a different size from the indent width"), NULL); + + spin_tab_width_adj = gtk_adjustment_new (1, 1, 99, 1, 10, 10); + spin_tab_width = gtk_spin_button_new (GTK_ADJUSTMENT (spin_tab_width_adj), 1, 0); + gtk_widget_show (spin_tab_width); + gtk_table_attach (GTK_TABLE (table13), spin_tab_width, 1, 2, 3, 4, + (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_tooltips_set_tip (tooltips, spin_tab_width, _("The width in chars, which one tab character will take"), NULL); + gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spin_tab_width), TRUE); + gtk_spin_button_set_update_policy (GTK_SPIN_BUTTON (spin_tab_width), GTK_UPDATE_IF_VALID); + gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (spin_tab_width), TRUE); + label195 = gtk_label_new (_("<b>Indentation</b>")); gtk_widget_show (label195); gtk_frame_set_label_widget (GTK_FRAME (frame27), label195); @@ -4865,13 +4886,15 @@ GLADE_HOOKUP_OBJECT (prefs_dialog, table13, "table13"); GLADE_HOOKUP_OBJECT (prefs_dialog, label183, "label183"); GLADE_HOOKUP_OBJECT (prefs_dialog, combo_auto_indent_mode, "combo_auto_indent_mode"); - GLADE_HOOKUP_OBJECT (prefs_dialog, spin_tab_width, "spin_tab_width"); - GLADE_HOOKUP_OBJECT (prefs_dialog, label116, "label116"); GLADE_HOOKUP_OBJECT (prefs_dialog, hbox8, "hbox8"); GLADE_HOOKUP_OBJECT (prefs_dialog, radio_indent_tabs, "radio_indent_tabs"); GLADE_HOOKUP_OBJECT (prefs_dialog, radio_indent_spaces, "radio_indent_spaces"); GLADE_HOOKUP_OBJECT (prefs_dialog, label200, "label200"); GLADE_HOOKUP_OBJECT (prefs_dialog, check_detect_indent, "check_detect_indent"); + GLADE_HOOKUP_OBJECT (prefs_dialog, label220, "label220"); + GLADE_HOOKUP_OBJECT (prefs_dialog, spin_indent_width, "spin_indent_width"); + GLADE_HOOKUP_OBJECT (prefs_dialog, check_custom_tab_width, "check_custom_tab_width"); + GLADE_HOOKUP_OBJECT (prefs_dialog, spin_tab_width, "spin_tab_width"); GLADE_HOOKUP_OBJECT (prefs_dialog, label195, "label195"); GLADE_HOOKUP_OBJECT (prefs_dialog, frame14, "frame14"); GLADE_HOOKUP_OBJECT (prefs_dialog, alignment17, "alignment17"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[2821] branches/custom-tab-width
by ntrel＠users.sourceforge.net 25 Jul '08

25 Jul '08

Revision: 2821 http://geany.svn.sourceforge.net/geany/?rev=2821&view=rev Author: ntrel Date: 2008-07-25 15:05:27 +0000 (Fri, 25 Jul 2008) Log Message: ----------- Note: this breaks the plugin API for indentation editor_prefs. Add GeanyIndentPrefs struct from some GeanyEditorPrefs fields (maybe this struct will get used elsewhere too). Add editor_init(). Modified Paths: -------------- branches/custom-tab-width/ChangeLog branches/custom-tab-width/src/editor.c branches/custom-tab-width/src/editor.h branches/custom-tab-width/src/main.c branches/custom-tab-width/src/plugindata.h Modified: branches/custom-tab-width/ChangeLog =================================================================== --- branches/custom-tab-width/ChangeLog 2008-07-25 14:59:16 UTC (rev 2820) +++ branches/custom-tab-width/ChangeLog 2008-07-25 15:05:27 UTC (rev 2821) @@ -1,5 +1,14 @@ 2008-07-25 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * src/plugindata.h, src/main.c, src/editor.c, src/editor.h: + Note: this breaks the plugin API for indentation editor_prefs. + Add GeanyIndentPrefs struct from some GeanyEditorPrefs fields (maybe + this struct will get used elsewhere too). + Add editor_init(). + + +2008-07-25 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * src/interface.c, src/ui_utils.c, geany.glade: Revert editor popup menu Current Word submenu changes. See http://lists.uvena.de/geany-devel/2008-July/000101.html. Modified: branches/custom-tab-width/src/editor.c =================================================================== --- branches/custom-tab-width/src/editor.c 2008-07-25 14:59:16 UTC (rev 2820) +++ branches/custom-tab-width/src/editor.c 2008-07-25 15:05:27 UTC (rev 2821) @@ -3662,3 +3662,13 @@ return editor; } + +void editor_init(void) +{ + static GeanyIndentPrefs indent_prefs; + + memset(&editor_prefs, 0, sizeof(GeanyEditorPrefs)); + memset(&indent_prefs, 0, sizeof GeanyIndentPrefs); + editor_prefs->indentation = &indent_prefs; +} + Modified: branches/custom-tab-width/src/editor.h =================================================================== --- branches/custom-tab-width/src/editor.h 2008-07-25 14:59:16 UTC (rev 2820) +++ branches/custom-tab-width/src/editor.h 2008-07-25 15:05:27 UTC (rev 2821) @@ -51,14 +51,25 @@ INDENT_BASIC, INDENT_CURRENTCHARS, INDENT_MATCHBRACES -} IndentMode; +} GeanyIndentMode; -/* These are the default prefs when creating a new editor window. - * Some of these can be overridden per document. - * Remember to increment abi_version in plugindata.h when changing items. */ +typedef struct GeanyIndentPrefs +{ + gint width; /**< Indent width. */ + gint tab_width; /**< Width of a tab, if @c custom_tab_width is set. */ + gboolean custom_tab_width; /**< Whether a tab is a different size from an indent. */ + gboolean use_tabs; /**< Whether to (mainly) use tabs or spaces to indent. */ + gboolean use_tab_to_indent; /* hidden pref */ + GeanyIndentMode mode; +} +GeanyIndentPrefs; + + +/** Default prefs when creating a new editor window. + * Some of these can be overridden per document. */ typedef struct GeanyEditorPrefs { - /* display */ + GeanyIndentPrefs *indentation; /**< Indentation prefs. */ gboolean show_white_space; gboolean show_indent_guide; gboolean show_line_endings; @@ -69,16 +80,10 @@ gboolean show_linenumber_margin; /* view menu */ gboolean show_scrollbars; /* hidden pref */ gboolean scroll_stop_at_last_line; /* hidden pref */ - - /* behaviour */ gboolean line_wrapping; gboolean use_indicators; gboolean folding; gboolean unfold_all_children; - gint tab_width; - gboolean use_tabs; - gboolean use_tab_to_indent; /* hidden pref */ - IndentMode indent_mode; gboolean disable_dnd; gboolean smart_home_key; gboolean newline_strip; @@ -125,6 +130,8 @@ +void editor_init(void); + GeanyEditor *editor_create(GeanyDocument *doc); void on_editor_notification(GtkWidget* editor, gint scn, gpointer lscn, gpointer user_data); Modified: branches/custom-tab-width/src/main.c =================================================================== --- branches/custom-tab-width/src/main.c 2008-07-25 14:59:16 UTC (rev 2820) +++ branches/custom-tab-width/src/main.c 2008-07-25 15:05:27 UTC (rev 2821) @@ -740,7 +740,6 @@ memset(&prefs, 0, sizeof(GeanyPrefs)); memset(&interface_prefs, 0, sizeof(GeanyInterfacePrefs)); memset(&toolbar_prefs, 0, sizeof(GeanyToolbarPrefs)); - memset(&editor_prefs, 0, sizeof(GeanyEditorPrefs)); memset(&file_prefs, 0, sizeof(GeanyFilePrefs)); memset(&search_prefs, 0, sizeof(GeanySearchPrefs)); memset(&tool_prefs, 0, sizeof(GeanyToolPrefs)); @@ -800,6 +799,7 @@ load_settings(); msgwin_init(); + editor_init(); build_init(); search_init(); ui_create_insert_menu_items(); Modified: branches/custom-tab-width/src/plugindata.h =================================================================== --- branches/custom-tab-width/src/plugindata.h 2008-07-25 14:59:16 UTC (rev 2820) +++ branches/custom-tab-width/src/plugindata.h 2008-07-25 15:05:27 UTC (rev 2821) @@ -36,12 +36,12 @@ /* The API version should be incremented whenever any plugin data types below are * modified or appended to. */ -static const gint api_version = 82; +static const gint api_version = 83; /* 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 * are only appended, as this doesn't affect existing fields. */ -static const gint abi_version = 43; +static const gint abi_version = 44; /** Check the plugin can be loaded by Geany. * This performs runtime checks that try to ensure: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[2820] branches/custom-tab-width/
by ntrel＠users.sourceforge.net 25 Jul '08

25 Jul '08

Revision: 2820 http://geany.svn.sourceforge.net/geany/?rev=2820&view=rev Author: ntrel Date: 2008-07-25 14:59:16 +0000 (Fri, 25 Jul 2008) Log Message: ----------- Branch to differentiate between indent width and tab width. Added Paths: ----------- branches/custom-tab-width/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[2819] trunk
by ntrel＠users.sourceforge.net 25 Jul '08

25 Jul '08

Revision: 2819 http://geany.svn.sourceforge.net/geany/?rev=2819&view=rev Author: ntrel Date: 2008-07-25 14:18:49 +0000 (Fri, 25 Jul 2008) Log Message: ----------- Add dox for ScintillaFuncs. Modified Paths: -------------- trunk/ChangeLog trunk/src/plugindata.h trunk/src/sciwrappers.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-07-25 11:28:30 UTC (rev 2818) +++ trunk/ChangeLog 2008-07-25 14:18:49 UTC (rev 2819) @@ -3,6 +3,8 @@ * src/interface.c, src/ui_utils.c, geany.glade: Revert editor popup menu Current Word submenu changes. See http://lists.uvena.de/geany-devel/2008-July/000101.html. + * src/sciwrappers.c, src/plugindata.h: + Add dox for ScintillaFuncs. 2008-07-25 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/src/plugindata.h =================================================================== --- trunk/src/plugindata.h 2008-07-25 11:28:30 UTC (rev 2818) +++ trunk/src/plugindata.h 2008-07-25 14:18:49 UTC (rev 2819) @@ -225,9 +225,11 @@ struct _ScintillaObject; -/* See sciwrappers.h */ +/** See sciwrappers.h. */ typedef struct ScintillaFuncs { + /** Send Scintilla a message. + * @see http://scintilla.org for the documentation. */ long int (*send_message) (struct _ScintillaObject* sci, unsigned int iMessage, long unsigned int wParam, long int lParam); void (*send_command) (struct _ScintillaObject* sci, gint cmd); Modified: trunk/src/sciwrappers.c =================================================================== --- trunk/src/sciwrappers.c 2008-07-25 11:28:30 UTC (rev 2818) +++ trunk/src/sciwrappers.c 2008-07-25 14:18:49 UTC (rev 2819) @@ -20,9 +20,12 @@ * $Id$ */ -/* - * Wrappers for the SCI_* Scintilla messages. - * Originally from the cssed project (http://cssed.sf.net). +/** @file sciwrappers.h + * Wrapper functions for the Scintilla editor widget @c SCI_* messages. + * You should also check the http://scintilla.org documentation, as it is more detailed. + * @note These functions were originally from the cssed project + * (http://cssed.sf.net, thanks). + * @see ScintillaFuncs::send_message(). */ #include <string.h> @@ -35,9 +38,6 @@ #define SSM(s, m, w, l) scintilla_send_message(s, m, w, l) -/* stolen from cssed (http://cssed.sf.net), thanks */ - - /* line numbers visibility */ void sci_set_line_numbers(ScintillaObject * sci, gboolean set, gint extra_width) { @@ -196,6 +196,7 @@ } } +/** Set all text. */ void sci_set_text(ScintillaObject* sci, const gchar* text) { if( text != NULL ){ /* if null text is passed to scintilla will segfault */ @@ -247,12 +248,18 @@ } +/** Begin grouping a set of edits together as one Undo action. + * You must call sci_end_undo_action() after making your edits. + * @param sci Scintilla @c GtkWidget. */ void sci_start_undo_action( ScintillaObject* sci ) { SSM( sci,SCI_BEGINUNDOACTION,0,0 ); } +/** End grouping a set of edits together as one Undo action. + * @param sci Scintilla @c GtkWidget. + * @see sci_start_undo_action(). */ void sci_end_undo_action( ScintillaObject* sci ) { SSM( sci, SCI_ENDUNDOACTION,0,0); @@ -362,30 +369,35 @@ } +/** Get line number from character index. */ gint sci_get_line_from_position(ScintillaObject* sci, gint position ) { return SSM(sci, SCI_LINEFROMPOSITION, position, 0); } +/** Get column number relative to the start of the line that @a position is on. */ gint sci_get_col_from_position(ScintillaObject* sci, gint position ) { return SSM(sci, SCI_GETCOLUMN, position, 0); } +/** Get character index for the start of @a line. */ gint sci_get_position_from_line(ScintillaObject* sci, gint line ) { return SSM(sci, SCI_POSITIONFROMLINE, line, 0); } +/** Get cursor position. */ gint sci_get_current_position(ScintillaObject* sci ) { return SSM(sci, SCI_GETCURRENTPOS, 0, 0); } +/** Set the cursor position. */ void sci_set_current_position(ScintillaObject* sci, gint position, gboolean scroll_to_caret) { if (scroll_to_caret) @@ -408,18 +420,21 @@ } +/** Get total number of lines. */ gint sci_get_line_count( ScintillaObject* sci ) { return SSM(sci, SCI_GETLINECOUNT, 0, 0); } +/** Set selection start position. */ void sci_set_selection_start(ScintillaObject* sci, gint position) { SSM(sci, SCI_SETSELECTIONSTART, position, 0); } +/** Set selection end position. */ void sci_set_selection_end(ScintillaObject* sci, gint position) { SSM(sci, SCI_SETSELECTIONEND, position, 0); @@ -456,24 +471,28 @@ } +/** Get position of selection start. */ gint sci_get_selection_start(ScintillaObject* sci) { return SSM(sci, SCI_GETSELECTIONSTART,0,0); } +/** Get position of selection end. */ gint sci_get_selection_end(ScintillaObject* sci) { return SSM(sci, SCI_GETSELECTIONEND,0,0); } +/** Replace selection. */ void sci_replace_sel(ScintillaObject* sci, const gchar* text) { SSM(sci, SCI_REPLACESEL,0, (sptr_t) text); } +/** Get length of all text. */ gint sci_get_length(ScintillaObject* sci) { return SSM(sci,SCI_GETLENGTH,0,0); @@ -486,13 +505,14 @@ } +/** Get line length. */ gint sci_get_line_length(ScintillaObject* sci,gint line) { return SSM(sci,SCI_LINELENGTH, line,0); } -/* Returns: a NULL-terminated copy of the line text */ +/** Returns: a NULL-terminated copy of the line text. */ gchar *sci_get_line(ScintillaObject* sci, gint line_num) { gint len = sci_get_line_length(sci, line_num); @@ -504,14 +524,15 @@ } -/* the last char will be null terminated */ +/** The last char will be null terminated, so ensure @a text has been allocated @a len + 1 + * bytes. */ void sci_get_text(ScintillaObject* sci, gint len, gchar* text) { SSM( sci, SCI_GETTEXT, len, (sptr_t) text ); } -/* Text must be allocated sci_get_selected_text_length() + 1, because +/** Text must be allocated sci_get_selected_text_length() + 1, because * the selection will be NULL-terminated. */ void sci_get_selected_text(ScintillaObject* sci, gchar* text) { @@ -519,6 +540,7 @@ } +/** Get selected text length. */ gint sci_get_selected_text_length(ScintillaObject* sci) { return SSM( sci, SCI_GETSELTEXT, 0, 0); @@ -539,13 +561,14 @@ } -/* folding */ +/** Returns: whether @a line should be drawn on the screen (folding may have hidden it). */ gboolean sci_get_line_is_visible(ScintillaObject* sci, gint line) { return SSM(sci,SCI_GETLINEVISIBLE, line,0); } +/** Make the @a line visible (folding may have hidden it). */ void sci_ensure_line_is_visible(ScintillaObject* sci, gint line) { SSM(sci,SCI_ENSUREVISIBLE,line,0); @@ -620,6 +643,7 @@ } +/** Get character. */ gchar sci_get_char_at(ScintillaObject *sci, gint pos) { return (gchar) SSM(sci, SCI_GETCHARAT, pos, 0); @@ -644,7 +668,7 @@ } -/* you can also call this has_selection */ +/** You can also call this has_selection. */ gboolean sci_can_copy(ScintillaObject *sci) { if (SSM(sci, SCI_GETSELECTIONEND,0,0) - SSM(sci, SCI_GETSELECTIONSTART,0,0)) @@ -673,6 +697,7 @@ } +/** Scroll the cursor in view. */ void sci_scroll_caret(ScintillaObject *sci) { SSM(sci, SCI_SCROLLCARET, 0, 0); @@ -723,6 +748,7 @@ } +/** Get style number for @a position. */ gint sci_get_style_at(ScintillaObject *sci, gint position) { return SSM(sci, SCI_GETSTYLEAT, position, 0); @@ -747,7 +773,7 @@ } -/* text will be zero terminated and must be allocated (end - start + 1) bytes */ +/** Text will be zero terminated and must be allocated (end - start + 1) bytes. */ void sci_get_text_range(ScintillaObject *sci, gint start, gint end, gchar *text) { struct TextRange tr; @@ -770,6 +796,7 @@ } +/** Insert text. */ void sci_insert_text(ScintillaObject *sci, gint pos, const gchar *text) { SSM(sci, SCI_INSERTTEXT, pos, (sptr_t) text); @@ -827,13 +854,17 @@ return SSM(sci, SCI_GETREADONLY, 0, 0); } -/* a simple convenience function to not have SSM() in the outside of this file */ - void sci_cmd(ScintillaObject * sci, gint cmd) +/** A simple convenience function for sending Scintilla commands without any parameters. + * @param sci The Scintilla @c GtkWidget. + * @param cmd @c SCI_COMMAND. + * @see http://scintilla.org for the documentation. */ +void sci_cmd(ScintillaObject * sci, gint cmd) { SSM(sci, cmd, 0, 0); } +/** Get current line number. */ gint sci_get_current_line(ScintillaObject *sci) { return SSM(sci, SCI_LINEFROMPOSITION, SSM(sci, SCI_GETCURRENTPOS, 0, 0), 0); @@ -886,6 +917,7 @@ SSM(sci, SCI_AUTOCSETMAXHEIGHT, val, 0); } +/** Find a matching brace at @a pos. */ gint sci_find_bracematch(ScintillaObject *sci, gint pos) { return SSM(sci, SCI_BRACEMATCH, pos, 0); @@ -916,11 +948,13 @@ return SSM(sci, SCI_GETLINESELENDPOSITION, line, 0); } +/** Get selection mode. */ gint sci_get_selection_mode(ScintillaObject *sci) { return SSM(sci, SCI_GETSELECTIONMODE, 0, 0); } +/** Set selection mode. */ void sci_set_selection_mode(ScintillaObject *sci, gint mode) { SSM(sci, SCI_SETSELECTIONMODE, mode, 0); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[2818] trunk/src/keybindings.c
by ntrel＠users.sourceforge.net 25 Jul '08

25 Jul '08

Revision: 2818 http://geany.svn.sourceforge.net/geany/?rev=2818&view=rev Author: ntrel Date: 2008-07-25 11:28:30 +0000 (Fri, 25 Jul 2008) Log Message: ----------- Remove commented out old code. Modified Paths: -------------- trunk/src/keybindings.c Modified: trunk/src/keybindings.c =================================================================== --- trunk/src/keybindings.c 2008-07-25 11:23:52 UTC (rev 2817) +++ trunk/src/keybindings.c 2008-07-25 11:28:30 UTC (rev 2818) @@ -532,8 +532,6 @@ gtk_accelerator_parse(val, &key, &mods); kb->key = key; kb->mods = mods; - - /* apply_kb_accel(kb); */ } g_free(val); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[2817] trunk
by ntrel＠users.sourceforge.net 25 Jul '08

25 Jul '08

Revision: 2817 http://geany.svn.sourceforge.net/geany/?rev=2817&view=rev Author: ntrel Date: 2008-07-25 11:23:52 +0000 (Fri, 25 Jul 2008) Log Message: ----------- Revert editor popup menu Current Word submenu changes. See http://lists.uvena.de/geany-devel/2008-July/000101.html. Modified Paths: -------------- trunk/ChangeLog trunk/geany.glade trunk/src/interface.c trunk/src/ui_utils.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-07-25 09:51:08 UTC (rev 2816) +++ trunk/ChangeLog 2008-07-25 11:23:52 UTC (rev 2817) @@ -1,3 +1,10 @@ +2008-07-25 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/interface.c, src/ui_utils.c, geany.glade: + Revert editor popup menu Current Word submenu changes. See + http://lists.uvena.de/geany-devel/2008-July/000101.html. + + 2008-07-25 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * data/filetypes.sh, src/highlighting.c: Modified: trunk/geany.glade =================================================================== --- trunk/geany.glade 2008-07-25 09:51:08 UTC (rev 2816) +++ trunk/geany.glade 2008-07-25 11:23:52 UTC (rev 2817) @@ -2814,7 +2814,7 @@ <signal name="activate" handler="on_menu_increase_indent1_activate" last_modification_time="Tue, 01 Aug 2006 10:31:38 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image2589"> + <widget class="GtkImage" id="image2568"> <property name="visible">True</property> <property name="stock">gtk-indent</property> <property name="icon_size">1</property> @@ -2835,7 +2835,7 @@ <signal name="activate" handler="on_menu_decrease_indent1_activate" last_modification_time="Tue, 01 Aug 2006 10:31:38 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image2590"> + <widget class="GtkImage" id="image2569"> <property name="visible">True</property> <property name="stock">gtk-unindent</property> <property name="icon_size">1</property> @@ -2891,7 +2891,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image2591"> + <widget class="GtkImage" id="image2570"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -2976,7 +2976,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image2592"> + <widget class="GtkImage" id="image2571"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -3008,7 +3008,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image2593"> + <widget class="GtkImage" id="image2572"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -3040,96 +3040,71 @@ </child> <child> - <widget class="GtkMenuItem" id="current_word1"> + <widget class="GtkImageMenuItem" id="find_usage1"> <property name="visible">True</property> - <property name="label" translatable="yes">Current _Word</property> + <property name="label" translatable="yes">Find _Usage</property> <property name="use_underline">True</property> + <signal name="activate" handler="on_find_usage1_activate" last_modification_time="Fri, 27 May 2005 21:55:12 GMT"/> - <child> - <widget class="GtkMenu" id="current_word1_menu"> + <child internal-child="image"> + <widget class="GtkImage" id="image2573"> + <property name="visible">True</property> + <property name="stock">gtk-find</property> + <property name="icon_size">1</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + </child> + </widget> + </child> - <child> - <widget class="GtkImageMenuItem" id="find_usage1"> - <property name="visible">True</property> - <property name="label" translatable="yes">Find _Usage</property> - <property name="use_underline">True</property> - <signal name="activate" handler="on_find_usage1_activate" last_modification_time="Fri, 27 May 2005 21:55:12 GMT"/> + <child> + <widget class="GtkImageMenuItem" id="find_document_usage1"> + <property name="visible">True</property> + <property name="label" translatable="yes">Find _Document Usage</property> + <property name="use_underline">True</property> + <signal name="activate" handler="on_find_document_usage1_activate" last_modification_time="Thu, 17 Jul 2008 13:42:25 GMT"/> - <child internal-child="image"> - <widget class="GtkImage" id="image2594"> - <property name="visible">True</property> - <property name="stock">gtk-find</property> - <property name="icon_size">1</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - </child> - </widget> - </child> + <child internal-child="image"> + <widget class="GtkImage" id="image2574"> + <property name="visible">True</property> + <property name="stock">gtk-find</property> + <property name="icon_size">1</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + </child> + </widget> + </child> - <child> - <widget class="GtkImageMenuItem" id="find_document_usage1"> - <property name="visible">True</property> - <property name="label" translatable="yes">Find _Document Usage</property> - <property name="use_underline">True</property> - <signal name="activate" handler="on_find_document_usage1_activate" last_modification_time="Thu, 17 Jul 2008 13:42:25 GMT"/> + <child> + <widget class="GtkMenuItem" id="goto_tag_definition1"> + <property name="visible">True</property> + <property name="label" translatable="yes">Go to _Tag Definition</property> + <property name="use_underline">True</property> + <signal name="activate" handler="on_goto_tag_activate" last_modification_time="Sun, 29 May 2005 22:08:28 GMT"/> + </widget> + </child> - <child internal-child="image"> - <widget class="GtkImage" id="image2595"> - <property name="visible">True</property> - <property name="stock">gtk-find</property> - <property name="icon_size">1</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - </child> - </widget> - </child> + <child> + <widget class="GtkMenuItem" id="goto_tag_declaration1"> + <property name="visible">True</property> + <property name="label" translatable="yes">Go to T_ag Declaration</property> + <property name="use_underline">True</property> + <signal name="activate" handler="on_goto_tag_activate" last_modification_time="Sun, 29 May 2005 22:08:28 GMT"/> + </widget> + </child> - <child> - <widget class="GtkSeparatorMenuItem" id="separator47"> - <property name="visible">True</property> - </widget> - </child> - - <child> - <widget class="GtkMenuItem" id="goto_tag_definition1"> - <property name="visible">True</property> - <property name="label" translatable="yes">Go to _Tag Definition</property> - <property name="use_underline">True</property> - <signal name="activate" handler="on_goto_tag_activate" last_modification_time="Sun, 29 May 2005 22:08:28 GMT"/> - </widget> - </child> - - <child> - <widget class="GtkMenuItem" id="goto_tag_declaration1"> - <property name="visible">True</property> - <property name="label" translatable="yes">Go to T_ag Declaration</property> - <property name="use_underline">True</property> - <signal name="activate" handler="on_goto_tag_activate" last_modification_time="Sun, 29 May 2005 22:08:28 GMT"/> - </widget> - </child> - - <child> - <widget class="GtkSeparatorMenuItem" id="separator48"> - <property name="visible">True</property> - </widget> - </child> - - <child> - <widget class="GtkMenuItem" id="context_action1"> - <property name="visible">True</property> - <property name="label" translatable="yes">Conte_xt Action</property> - <property name="use_underline">True</property> - <signal name="activate" handler="on_context_action1_activate" last_modification_time="Fri, 13 Apr 2007 18:37:55 GMT"/> - </widget> - </child> - </widget> - </child> + <child> + <widget class="GtkMenuItem" id="context_action1"> + <property name="visible">True</property> + <property name="label" translatable="yes">Conte_xt Action</property> + <property name="use_underline">True</property> + <signal name="activate" handler="on_context_action1_activate" last_modification_time="Fri, 13 Apr 2007 18:37:55 GMT"/> </widget> </child> @@ -3148,7 +3123,7 @@ <signal name="activate" handler="on_go_to_line_activate" last_modification_time="Sat, 16 Jul 2005 11:20:32 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image2596"> + <widget class="GtkImage" id="image2575"> <property name="visible">True</property> <property name="stock">gtk-jump-to</property> <property name="icon_size">1</property> Modified: trunk/src/interface.c =================================================================== --- trunk/src/interface.c 2008-07-25 09:51:08 UTC (rev 2816) +++ trunk/src/interface.c 2008-07-25 11:23:52 UTC (rev 2817) @@ -2102,16 +2102,16 @@ GtkWidget *menu_duplicate_line2; GtkWidget *separator31; GtkWidget *menu_increase_indent2; - GtkWidget *image2589; + GtkWidget *image2568; GtkWidget *menu_decrease_indent2; - GtkWidget *image2590; + GtkWidget *image2569; GtkWidget *separator38; GtkWidget *send_selection_to1; GtkWidget *send_selection_to1_menu; GtkWidget *invisible12; GtkWidget *separator17; GtkWidget *comments; - GtkWidget *image2591; + GtkWidget *image2570; GtkWidget *comments_menu; GtkWidget *add_changelog_entry2; GtkWidget *insert_file_header2; @@ -2120,28 +2120,24 @@ GtkWidget *insert_gpl_notice1; GtkWidget *insert_bsd_license_notice1; GtkWidget *insert_date2; - GtkWidget *image2592; + GtkWidget *image2571; GtkWidget *insert_date2_menu; GtkWidget *invisible10; GtkWidget *insert_include1; - GtkWidget *image2593; + GtkWidget *image2572; GtkWidget *insert_include1_menu; GtkWidget *invisible3; GtkWidget *separator7; - GtkWidget *current_word1; - GtkWidget *current_word1_menu; GtkWidget *find_usage1; - GtkWidget *image2594; + GtkWidget *image2573; GtkWidget *find_document_usage1; - GtkWidget *image2595; - GtkWidget *separator47; + GtkWidget *image2574; GtkWidget *goto_tag_definition1; GtkWidget *goto_tag_declaration1; - GtkWidget *separator48; GtkWidget *context_action1; GtkWidget *separator15; GtkWidget *go_to_line; - GtkWidget *image2596; + GtkWidget *image2575; GtkAccelGroup *accel_group; GtkTooltips *tooltips; @@ -2244,17 +2240,17 @@ gtk_widget_show (menu_increase_indent2); gtk_container_add (GTK_CONTAINER (menu_format2_menu), menu_increase_indent2); - image2589 = gtk_image_new_from_stock ("gtk-indent", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2589); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_increase_indent2), image2589); + image2568 = gtk_image_new_from_stock ("gtk-indent", GTK_ICON_SIZE_MENU); + gtk_widget_show (image2568); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_increase_indent2), image2568); menu_decrease_indent2 = gtk_image_menu_item_new_with_mnemonic (_("_Decrease Indent")); gtk_widget_show (menu_decrease_indent2); gtk_container_add (GTK_CONTAINER (menu_format2_menu), menu_decrease_indent2); - image2590 = gtk_image_new_from_stock ("gtk-unindent", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2590); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_decrease_indent2), image2590); + image2569 = gtk_image_new_from_stock ("gtk-unindent", GTK_ICON_SIZE_MENU); + gtk_widget_show (image2569); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_decrease_indent2), image2569); separator38 = gtk_separator_menu_item_new (); gtk_widget_show (separator38); @@ -2280,9 +2276,9 @@ gtk_widget_show (comments); gtk_container_add (GTK_CONTAINER (edit_menu1), comments); - image2591 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2591); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (comments), image2591); + image2570 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image2570); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (comments), image2570); comments_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (comments), comments_menu); @@ -2321,9 +2317,9 @@ gtk_widget_show (insert_date2); gtk_container_add (GTK_CONTAINER (edit_menu1), insert_date2); - image2592 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2592); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_date2), image2592); + image2571 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image2571); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_date2), image2571); insert_date2_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert_date2), insert_date2_menu); @@ -2335,9 +2331,9 @@ gtk_widget_show (insert_include1); gtk_container_add (GTK_CONTAINER (edit_menu1), insert_include1); - image2593 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2593); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include1), image2593); + image2572 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image2572); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include1), image2572); insert_include1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert_include1), insert_include1_menu); @@ -2350,50 +2346,33 @@ gtk_container_add (GTK_CONTAINER (edit_menu1), separator7); gtk_widget_set_sensitive (separator7, FALSE); - current_word1 = gtk_menu_item_new_with_mnemonic (_("Current _Word")); - gtk_widget_show (current_word1); - gtk_container_add (GTK_CONTAINER (edit_menu1), current_word1); - - current_word1_menu = gtk_menu_new (); - gtk_menu_item_set_submenu (GTK_MENU_ITEM (current_word1), current_word1_menu); - find_usage1 = gtk_image_menu_item_new_with_mnemonic (_("Find _Usage")); gtk_widget_show (find_usage1); - gtk_container_add (GTK_CONTAINER (current_word1_menu), find_usage1); + gtk_container_add (GTK_CONTAINER (edit_menu1), find_usage1); - image2594 = gtk_image_new_from_stock ("gtk-find", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2594); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (find_usage1), image2594); + image2573 = gtk_image_new_from_stock ("gtk-find", GTK_ICON_SIZE_MENU); + gtk_widget_show (image2573); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (find_usage1), image2573); find_document_usage1 = gtk_image_menu_item_new_with_mnemonic (_("Find _Document Usage")); gtk_widget_show (find_document_usage1); - gtk_container_add (GTK_CONTAINER (current_word1_menu), find_document_usage1); + gtk_container_add (GTK_CONTAINER (edit_menu1), find_document_usage1); - image2595 = gtk_image_new_from_stock ("gtk-find", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2595); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (find_document_usage1), image2595); + image2574 = gtk_image_new_from_stock ("gtk-find", GTK_ICON_SIZE_MENU); + gtk_widget_show (image2574); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (find_document_usage1), image2574); - separator47 = gtk_separator_menu_item_new (); - gtk_widget_show (separator47); - gtk_container_add (GTK_CONTAINER (current_word1_menu), separator47); - gtk_widget_set_sensitive (separator47, FALSE); - goto_tag_definition1 = gtk_menu_item_new_with_mnemonic (_("Go to _Tag Definition")); gtk_widget_show (goto_tag_definition1); - gtk_container_add (GTK_CONTAINER (current_word1_menu), goto_tag_definition1); + gtk_container_add (GTK_CONTAINER (edit_menu1), goto_tag_definition1); goto_tag_declaration1 = gtk_menu_item_new_with_mnemonic (_("Go to T_ag Declaration")); gtk_widget_show (goto_tag_declaration1); - gtk_container_add (GTK_CONTAINER (current_word1_menu), goto_tag_declaration1); + gtk_container_add (GTK_CONTAINER (edit_menu1), goto_tag_declaration1); - separator48 = gtk_separator_menu_item_new (); - gtk_widget_show (separator48); - gtk_container_add (GTK_CONTAINER (current_word1_menu), separator48); - gtk_widget_set_sensitive (separator48, FALSE); - context_action1 = gtk_menu_item_new_with_mnemonic (_("Conte_xt Action")); gtk_widget_show (context_action1); - gtk_container_add (GTK_CONTAINER (current_word1_menu), context_action1); + gtk_container_add (GTK_CONTAINER (edit_menu1), context_action1); separator15 = gtk_separator_menu_item_new (); gtk_widget_show (separator15); @@ -2405,9 +2384,9 @@ gtk_container_add (GTK_CONTAINER (edit_menu1), go_to_line); gtk_tooltips_set_tip (tooltips, go_to_line, _("Go to the entered line"), NULL); - image2596 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2596); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line), image2596); + image2575 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU); + gtk_widget_show (image2575); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line), image2575); g_signal_connect ((gpointer) undo1, "activate", G_CALLBACK (on_undo1_activate), @@ -2515,16 +2494,16 @@ GLADE_HOOKUP_OBJECT (edit_menu1, menu_duplicate_line2, "menu_duplicate_line2"); GLADE_HOOKUP_OBJECT (edit_menu1, separator31, "separator31"); GLADE_HOOKUP_OBJECT (edit_menu1, menu_increase_indent2, "menu_increase_indent2"); - GLADE_HOOKUP_OBJECT (edit_menu1, image2589, "image2589"); + GLADE_HOOKUP_OBJECT (edit_menu1, image2568, "image2568"); GLADE_HOOKUP_OBJECT (edit_menu1, menu_decrease_indent2, "menu_decrease_indent2"); - GLADE_HOOKUP_OBJECT (edit_menu1, image2590, "image2590"); + GLADE_HOOKUP_OBJECT (edit_menu1, image2569, "image2569"); GLADE_HOOKUP_OBJECT (edit_menu1, separator38, "separator38"); GLADE_HOOKUP_OBJECT (edit_menu1, send_selection_to1, "send_selection_to1"); GLADE_HOOKUP_OBJECT (edit_menu1, send_selection_to1_menu, "send_selection_to1_menu"); GLADE_HOOKUP_OBJECT (edit_menu1, invisible12, "invisible12"); GLADE_HOOKUP_OBJECT (edit_menu1, separator17, "separator17"); GLADE_HOOKUP_OBJECT (edit_menu1, comments, "comments"); - GLADE_HOOKUP_OBJECT (edit_menu1, image2591, "image2591"); + GLADE_HOOKUP_OBJECT (edit_menu1, image2570, "image2570"); GLADE_HOOKUP_OBJECT (edit_menu1, comments_menu, "comments_menu"); GLADE_HOOKUP_OBJECT (edit_menu1, add_changelog_entry2, "add_changelog_entry2"); GLADE_HOOKUP_OBJECT (edit_menu1, insert_file_header2, "insert_file_header2"); @@ -2533,28 +2512,24 @@ GLADE_HOOKUP_OBJECT (edit_menu1, insert_gpl_notice1, "insert_gpl_notice1"); GLADE_HOOKUP_OBJECT (edit_menu1, insert_bsd_license_notice1, "insert_bsd_license_notice1"); GLADE_HOOKUP_OBJECT (edit_menu1, insert_date2, "insert_date2"); - GLADE_HOOKUP_OBJECT (edit_menu1, image2592, "image2592"); + GLADE_HOOKUP_OBJECT (edit_menu1, image2571, "image2571"); GLADE_HOOKUP_OBJECT (edit_menu1, insert_date2_menu, "insert_date2_menu"); GLADE_HOOKUP_OBJECT (edit_menu1, invisible10, "invisible10"); GLADE_HOOKUP_OBJECT (edit_menu1, insert_include1, "insert_include1"); - GLADE_HOOKUP_OBJECT (edit_menu1, image2593, "image2593"); + GLADE_HOOKUP_OBJECT (edit_menu1, image2572, "image2572"); GLADE_HOOKUP_OBJECT (edit_menu1, insert_include1_menu, "insert_include1_menu"); GLADE_HOOKUP_OBJECT (edit_menu1, invisible3, "invisible3"); GLADE_HOOKUP_OBJECT (edit_menu1, separator7, "separator7"); - GLADE_HOOKUP_OBJECT (edit_menu1, current_word1, "current_word1"); - GLADE_HOOKUP_OBJECT (edit_menu1, current_word1_menu, "current_word1_menu"); GLADE_HOOKUP_OBJECT (edit_menu1, find_usage1, "find_usage1"); - GLADE_HOOKUP_OBJECT (edit_menu1, image2594, "image2594"); + GLADE_HOOKUP_OBJECT (edit_menu1, image2573, "image2573"); GLADE_HOOKUP_OBJECT (edit_menu1, find_document_usage1, "find_document_usage1"); - GLADE_HOOKUP_OBJECT (edit_menu1, image2595, "image2595"); - GLADE_HOOKUP_OBJECT (edit_menu1, separator47, "separator47"); + GLADE_HOOKUP_OBJECT (edit_menu1, image2574, "image2574"); GLADE_HOOKUP_OBJECT (edit_menu1, goto_tag_definition1, "goto_tag_definition1"); GLADE_HOOKUP_OBJECT (edit_menu1, goto_tag_declaration1, "goto_tag_declaration1"); - GLADE_HOOKUP_OBJECT (edit_menu1, separator48, "separator48"); GLADE_HOOKUP_OBJECT (edit_menu1, context_action1, "context_action1"); GLADE_HOOKUP_OBJECT (edit_menu1, separator15, "separator15"); GLADE_HOOKUP_OBJECT (edit_menu1, go_to_line, "go_to_line"); - GLADE_HOOKUP_OBJECT (edit_menu1, image2596, "image2596"); + GLADE_HOOKUP_OBJECT (edit_menu1, image2575, "image2575"); GLADE_HOOKUP_OBJECT_NO_REF (edit_menu1, tooltips, "tooltips"); gtk_menu_set_accel_group (GTK_MENU (edit_menu1), accel_group); Modified: trunk/src/ui_utils.c =================================================================== --- trunk/src/ui_utils.c 2008-07-25 09:51:08 UTC (rev 2816) +++ trunk/src/ui_utils.c 2008-07-25 11:23:52 UTC (rev 2817) @@ -61,7 +61,7 @@ /* pointers to widgets only sensitive when there is at least one document */ GPtrArray *document_buttons; GtkWidget *menu_insert_include_items[2]; - GtkWidget *current_word_item; + GtkWidget *popup_goto_items[4]; GtkWidget *popup_copy_items[3]; GtkWidget *menu_copy_items[3]; GtkWidget *redo_items[3]; @@ -338,7 +338,10 @@ void ui_update_popup_goto_items(gboolean enable) { - gtk_widget_set_sensitive(widgets.current_word_item, enable); + gtk_widget_set_sensitive(widgets.popup_goto_items[0], enable); + gtk_widget_set_sensitive(widgets.popup_goto_items[1], enable); + gtk_widget_set_sensitive(widgets.popup_goto_items[2], enable); + gtk_widget_set_sensitive(widgets.popup_goto_items[3], enable); } @@ -1477,7 +1480,10 @@ ui_widgets.statusbar = lookup_widget(main_widgets.window, "statusbar"); ui_widgets.print_page_setup = lookup_widget(main_widgets.window, "page_setup1"); - widgets.current_word_item = lookup_widget(main_widgets.editor_menu, "current_word1"); + widgets.popup_goto_items[0] = lookup_widget(main_widgets.editor_menu, "goto_tag_definition1"); + widgets.popup_goto_items[1] = lookup_widget(main_widgets.editor_menu, "goto_tag_declaration1"); + widgets.popup_goto_items[2] = lookup_widget(main_widgets.editor_menu, "find_usage1"); + widgets.popup_goto_items[3] = lookup_widget(main_widgets.editor_menu, "find_document_usage1"); widgets.popup_copy_items[0] = lookup_widget(main_widgets.editor_menu, "cut1"); widgets.popup_copy_items[1] = lookup_widget(main_widgets.editor_menu, "copy1"); widgets.popup_copy_items[2] = lookup_widget(main_widgets.editor_menu, "delete1"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[2816] trunk
by eht16＠users.sourceforge.net 25 Jul '08

25 Jul '08

Revision: 2816 http://geany.svn.sourceforge.net/geany/?rev=2816&view=rev Author: eht16 Date: 2008-07-25 09:51:08 +0000 (Fri, 25 Jul 2008) Log Message: ----------- Fix wrong checks when determining whether a style is a PHP style (style SCE_HPHP_COMPLEX_VARIABLE was ignored, closes #2027235). Modified Paths: -------------- trunk/ChangeLog trunk/src/editor.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-07-25 09:49:54 UTC (rev 2815) +++ trunk/ChangeLog 2008-07-25 09:51:08 UTC (rev 2816) @@ -7,6 +7,9 @@ Update waf to its latest SVN rev and exclude some unused modules which makes it another 20 KB smaller. Update waf script to reflect waf API changes(module Install removed). + * src/editor.c: + Fix wrong checks when determining whether a style is a PHP style + (style SCE_HPHP_COMPLEX_VARIABLE was ignored, closes #2027235). 2008-07-24 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/src/editor.c =================================================================== --- trunk/src/editor.c 2008-07-25 09:49:54 UTC (rev 2815) +++ trunk/src/editor.c 2008-07-25 09:51:08 UTC (rev 2816) @@ -215,6 +215,18 @@ } +static gboolean is_style_php(gint style) +{ + if ((style >= SCE_HPHP_DEFAULT && style <= SCE_HPHP_OPERATOR) || + style == SCE_HPHP_COMPLEX_VARIABLE) + { + return TRUE; + } + + return FALSE; +} + + typedef struct SCNotification SCNotification; static void fold_symbol_click(ScintillaObject *sci, SCNotification *nt) @@ -1319,7 +1331,7 @@ if (ft_id == GEANY_FILETYPES_PHP) { /* use entity completion when style is outside of PHP styles */ - if (style < SCE_HPHP_DEFAULT || style > SCE_HPHP_OPERATOR) + if (! is_style_php(style)) return TRUE; } @@ -1738,8 +1750,7 @@ if (editor->document->file_type->id == GEANY_FILETYPES_PHP) { gint style = sci_get_style_at(sci, pos); - if (style != SCE_HPHP_SIMPLESTRING && style != SCE_HPHP_HSTRING && - style <= SCE_HPHP_OPERATOR && style >= SCE_HPHP_DEFAULT) + if (is_style_php(style) && style != SCE_HPHP_SIMPLESTRING && style != SCE_HPHP_HSTRING) return FALSE; } @@ -1889,7 +1900,6 @@ g_free(linebuf); } - /* set toggle to TRUE if the caller is the toggle function, FALSE otherwise * returns the amount of uncommented single comment lines, in case of multi line uncomment * it returns just 1 */ @@ -1930,8 +1940,7 @@ line_start = sci_get_position_from_line(doc->editor->sci, first_line); if (ft->id == GEANY_FILETYPES_PHP) { - if (sci_get_style_at(doc->editor->sci, line_start) < 118 || - sci_get_style_at(doc->editor->sci, line_start) > 127) + if (! is_style_php(sci_get_style_at(doc->editor->sci, line_start))) ft = filetypes[GEANY_FILETYPES_XML]; } @@ -2002,8 +2011,7 @@ case SCLEX_XML: case SCLEX_HTML: { - if (sci_get_style_at(doc->editor->sci, line_start) >= 118 && - sci_get_style_at(doc->editor->sci, line_start) <= 127) + if (is_style_php(sci_get_style_at(doc->editor->sci, line_start))) style_comment = SCE_HPHP_COMMENT; else style_comment = SCE_H_COMMENT; break; @@ -2081,8 +2089,7 @@ first_line_start = sci_get_position_from_line(doc->editor->sci, first_line); if (ft->id == GEANY_FILETYPES_PHP) { - if (sci_get_style_at(doc->editor->sci, first_line_start) < 118 || - sci_get_style_at(doc->editor->sci, first_line_start) > 127) + if (! is_style_php(sci_get_style_at(doc->editor->sci, first_line_start))) ft = filetypes[GEANY_FILETYPES_XML]; } @@ -2150,8 +2157,7 @@ case SCLEX_XML: case SCLEX_HTML: { - if (sci_get_style_at(doc->editor->sci, line_start) >= 118 && - sci_get_style_at(doc->editor->sci, line_start) <= 127) + if (is_style_php(sci_get_style_at(doc->editor->sci, line_start))) style_comment = SCE_HPHP_COMMENT; else style_comment = SCE_H_COMMENT; break; @@ -2259,8 +2265,7 @@ line_start = sci_get_position_from_line(doc->editor->sci, first_line); if (ft->id == GEANY_FILETYPES_PHP) { - if (sci_get_style_at(doc->editor->sci, line_start) < 118 || - sci_get_style_at(doc->editor->sci, line_start) > 127) + if (! is_style_php(sci_get_style_at(doc->editor->sci, line_start))) ft = filetypes[GEANY_FILETYPES_XML]; } @@ -2324,8 +2329,7 @@ case SCLEX_XML: case SCLEX_HTML: { - if (sci_get_style_at(doc->editor->sci, line_start) >= 118 && - sci_get_style_at(doc->editor->sci, line_start) <= 127) + if (is_style_php(sci_get_style_at(doc->editor->sci, line_start))) style_comment = SCE_HPHP_COMMENT; else style_comment = SCE_H_COMMENT; break; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[2815] trunk
by eht16＠users.sourceforge.net 25 Jul '08

25 Jul '08

Revision: 2815 http://geany.svn.sourceforge.net/geany/?rev=2815&view=rev Author: eht16 Date: 2008-07-25 09:49:54 +0000 (Fri, 25 Jul 2008) Log Message: ----------- Update waf to its latest SVN rev and exclude some unused modules which makes it another 20 KB smaller. Update waf script to reflect waf API changes(module Install removed). Modified Paths: -------------- trunk/ChangeLog trunk/waf trunk/wscript Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-07-25 09:48:55 UTC (rev 2814) +++ trunk/ChangeLog 2008-07-25 09:49:54 UTC (rev 2815) @@ -3,6 +3,10 @@ * data/filetypes.sh, src/highlighting.c: Add missing "error" and heredoc styles to filetype Shellscript (related to #2026853). + * waf, wscript: + Update waf to its latest SVN rev and exclude some unused modules + which makes it another 20 KB smaller. + Update waf script to reflect waf API changes(module Install removed). 2008-07-24 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/waf =================================================================== --- trunk/waf 2008-07-25 09:48:55 UTC (rev 2814) +++ trunk/waf 2008-07-25 09:49:54 UTC (rev 2815) @@ -38,10 +38,10 @@ except:pass VERSION="1.4.9" -REVISION="da1834aaaf9820ce647a325c2c66d6b8" +REVISION="a0bd5c68d38276581a60c2cc516dbf26" INSTALL=sys.platform=='win32' and 'c:/temp' or '/usr/local' -C1='#/' -C2='#-' +C1='#-' +C2='#%' cwd = os.getcwd() join = os.path.join @@ -127,5 +127,5 @@ Scripting.prepare(t, cwd, VERSION, wafdir) #==> @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits July 2008