Commits May 2007

commits@lists.geany.org

3 participants
94 discussions

SF.net SVN: geany: [1538] trunk
by ntrel＠users.sourceforge.net 16 May '07

16 May '07

Revision: 1538 http://svn.sourceforge.net/geany/?rev=1538&view=rev Author: ntrel Date: 2007-05-16 05:26:53 -0700 (Wed, 16 May 2007) Log Message: ----------- Fix bug when loading custom filetypes.common styles. Modified Paths: -------------- trunk/ChangeLog trunk/src/highlighting.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-05-15 16:04:37 UTC (rev 1537) +++ trunk/ChangeLog 2007-05-16 12:26:53 UTC (rev 1538) @@ -1,3 +1,9 @@ +2007-05-16 Nick Treleaven <nick.treleaven(a)btinternet.com> + + * src/highlighting.c: + Fix bug when loading custom filetypes.common styles. + + 2007-05-15 Nick Treleaven <nick.treleaven(a)btinternet.com> * src/highlighting.c, data/filetypes.common: Modified: trunk/src/highlighting.c =================================================================== --- trunk/src/highlighting.c 2007-05-15 16:04:37 UTC (rev 1537) +++ trunk/src/highlighting.c 2007-05-16 12:26:53 UTC (rev 1538) @@ -355,12 +355,19 @@ } -/* This should only be called from styleset_common(). */ static void styleset_common_init(void) { - GKeyFile *config = g_key_file_new(); - GKeyFile *config_home = g_key_file_new(); + GKeyFile *config; + GKeyFile *config_home; + static gboolean common_style_set_valid = FALSE; + if (common_style_set_valid) + return; + common_style_set_valid = TRUE; // ensure filetypes.common is only loaded once + + config = g_key_file_new(); + config_home = g_key_file_new(); + load_keyfiles(config, config_home, GEANY_FILETYPES_ALL); get_keyfile_hex(config, config_home, "styling", "default", @@ -411,14 +418,8 @@ static void styleset_common(ScintillaObject *sci, gint style_bits, filetype_id ft_id) { - static gboolean common_style_set_valid = FALSE; + styleset_common_init(); - if (! common_style_set_valid) - { - styleset_common_init(); - common_style_set_valid = TRUE; - } - // load global tags file for autocompletion, calltips, etc. if (ft_id < GEANY_FILETYPES_ALL) symbols_global_tags_loaded(ft_id); @@ -1982,10 +1983,13 @@ SSM(sci, SCI_SETLEXER, SCLEX_NULL, 0); - styleset_common(sci, 5, ft_id); + if (style_sets[GEANY_FILETYPES_ALL].styling == NULL) + styleset_common_init(); set_sci_style(sci, STYLE_DEFAULT, GEANY_FILETYPES_ALL, GCS_DEFAULT); + styleset_common(sci, 5, ft_id); + SSM(sci, SCI_SETWORDCHARS, 0, (sptr_t) common_style_set.wordchars); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

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

15 May '07

Revision: 1537 http://svn.sourceforge.net/geany/?rev=1537&view=rev Author: ntrel Date: 2007-05-15 09:04:37 -0700 (Tue, 15 May 2007) Log Message: ----------- Show fold line by default (so it's clearer there are hidden lines). Modified Paths: -------------- trunk/ChangeLog trunk/data/filetypes.common trunk/src/highlighting.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-05-15 15:39:26 UTC (rev 1536) +++ trunk/ChangeLog 2007-05-15 16:04:37 UTC (rev 1537) @@ -1,3 +1,9 @@ +2007-05-15 Nick Treleaven <nick.treleaven(a)btinternet.com> + + * src/highlighting.c, data/filetypes.common: + Show fold line by default (so it's clearer there are hidden lines). + + 2007-05-15 Enrico Tröger <enrico.troeger(a)uvena.de> * scintilla/ScintillaGTK.cxx: Modified: trunk/data/filetypes.common =================================================================== --- trunk/data/filetypes.common 2007-05-15 15:39:26 UTC (rev 1536) +++ trunk/data/filetypes.common 2007-05-15 16:04:37 UTC (rev 1537) @@ -43,7 +43,7 @@ # 0 to disable # 1 to draw the line above folded text # 2 to draw the line below folded text -folding_horiz_line=0;0;false;false +folding_horiz_line=2;0;false;false # only first argument is interpreted, sets whether all defined colours should be inverted invert_all=0;0;false;false Modified: trunk/src/highlighting.c =================================================================== --- trunk/src/highlighting.c 2007-05-15 15:39:26 UTC (rev 1536) +++ trunk/src/highlighting.c 2007-05-15 16:04:37 UTC (rev 1537) @@ -394,7 +394,7 @@ 0, 0, &tmp_style); common_style_set.invert_all = tmp_style.foreground; get_keyfile_int(config, config_home, "styling", "folding_horiz_line", - 0, 0, &tmp_style); + 2, 0, &tmp_style); common_style_set.folding_style.draw_line = tmp_style.foreground; get_keyfile_int(config, config_home, "styling", "caret_width", 1, 0, &tmp_style); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

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

15 May '07

Revision: 1536 http://svn.sourceforge.net/geany/?rev=1536&view=rev Author: eht16 Date: 2007-05-15 08:39:26 -0700 (Tue, 15 May 2007) Log Message: ----------- Applied patch from Michal Kurgan to disable separately use of global white space foreground and background colours (thanks). Modified Paths: -------------- trunk/ChangeLog trunk/data/filetypes.common trunk/doc/geany.docbook trunk/src/highlighting.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-05-15 15:16:16 UTC (rev 1535) +++ trunk/ChangeLog 2007-05-15 15:39:26 UTC (rev 1536) @@ -9,6 +9,9 @@ src/keybindings.c, src/project.c, src/symbols.c, src/tools.c, src/ui_utils.c: Added many widget names to different dialogs for use with custom styles. Menu items still don't work. + * data/filetypes.common, doc/geany.docbook, src/highlighting.c: + Applied patch from Michal Kurgan to disable separately use of global + white space foreground and background colours (thanks). 2007-05-14 Nick Treleaven <nick.treleaven(a)btinternet.com> Modified: trunk/data/filetypes.common =================================================================== --- trunk/data/filetypes.common 2007-05-15 15:16:16 UTC (rev 1535) +++ trunk/data/filetypes.common 2007-05-15 15:39:26 UTC (rev 1536) @@ -30,8 +30,9 @@ # set foreground and background colour of indentation guides indent_guide=0xc0c0c0;0xffffff;false;false -# the third argument defines whether to use these values or use the default values defined by the filetypes -white_space=0xc0c0c0;0xffffff;true;false +# the third argument defines whether to use the foreground colour or use the default value defined by the filetypes +# the fourth argument defines whether to use the background colour or use the default value defined by the filetypes +white_space=0xc0c0c0;0xffffff;true;true # style of folding icons, only first and second arguments are used, valid values are: # first argument: 1 for boxes, 2 for circles Modified: trunk/doc/geany.docbook =================================================================== --- trunk/doc/geany.docbook 2007-05-15 15:16:16 UTC (rev 1535) +++ trunk/doc/geany.docbook 2007-05-15 15:39:26 UTC (rev 1536) @@ -2190,10 +2190,12 @@ <entry>The style for colouring the white space if it is shown. The first both arguments define the foreground and background colours, the third argument sets whether to use - the defined colours or to use the colours defined by each - filetype for the white space. + the defined foreground colour or to use the colour + defined by each filetype for the white space. + The fourth argument defines whether to use the background + colour. </entry> - <entry>white_space=0xc0c0c0;0xffffff;true;false</entry> + <entry>white_space=0xc0c0c0;0xffffff;true;true</entry> </row> <row> <entry>folding_style</entry> Modified: trunk/src/highlighting.c =================================================================== --- trunk/src/highlighting.c 2007-05-15 15:16:16 UTC (rev 1535) +++ trunk/src/highlighting.c 2007-05-15 15:39:26 UTC (rev 1536) @@ -556,7 +556,7 @@ // bold = common whitespace settings enabled SSM(sci, SCI_SETWHITESPACEFORE, common_style_set.styling[GCS_WHITE_SPACE].bold, invert(common_style_set.styling[GCS_WHITE_SPACE].foreground)); - SSM(sci, SCI_SETWHITESPACEBACK, common_style_set.styling[GCS_WHITE_SPACE].bold, + SSM(sci, SCI_SETWHITESPACEBACK, common_style_set.styling[GCS_WHITE_SPACE].italic, invert(common_style_set.styling[GCS_WHITE_SPACE].background)); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

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

15 May '07

Revision: 1535 http://svn.sourceforge.net/geany/?rev=1535&view=rev Author: eht16 Date: 2007-05-15 08:16:16 -0700 (Tue, 15 May 2007) Log Message: ----------- Added many widget names to different dialogs for use with custom styles. Menu items still don't work. Modified Paths: -------------- trunk/ChangeLog trunk/doc/geany.docbook trunk/src/about.c trunk/src/build.c trunk/src/dialogs.c trunk/src/keybindings.c trunk/src/project.c trunk/src/symbols.c trunk/src/tools.c trunk/src/ui_utils.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-05-15 13:02:23 UTC (rev 1534) +++ trunk/ChangeLog 2007-05-15 15:16:16 UTC (rev 1535) @@ -5,6 +5,10 @@ * doc/geany.docbook, src/callbacks.c: Hide notebooks tabs instead of sidebar when toggling additional widgets. + * doc/geany.docbook, src/about.c, src/build.c, src/dialogs.c, + src/keybindings.c, src/project.c, src/symbols.c, src/tools.c, + src/ui_utils.c: Added many widget names to different dialogs for use + with custom styles. Menu items still don't work. 2007-05-14 Nick Treleaven <nick.treleaven(a)btinternet.com> Modified: trunk/doc/geany.docbook =================================================================== --- trunk/doc/geany.docbook 2007-05-15 13:02:23 UTC (rev 1534) +++ trunk/doc/geany.docbook 2007-05-15 15:16:16 UTC (rev 1535) @@ -421,7 +421,7 @@ <para> You can define your widget style for many of <application>Geany</application>'s GUI parts. To do this, just edit your <filename>.gtkrc-2.0</filename> (usually - found in your home directory on UNIX-like systems and in the etc subdirecory + found in your home directory on UNIX-like systems and in the etc subdirectory of your <application>Geany</application> installation on Windows). </para> <para> @@ -447,8 +447,17 @@ <para>GeanyToolbarMenu</para> </listitem> <listitem> - <para>GeanyPrefsDialog</para> + <para>GeanyDialog</para> </listitem> + <listitem> + <para>GeanyDialogPrefs</para> + </listitem> + <listitem> + <para>GeanyDialogProject</para> + </listitem> + <listitem> + <para>GeanyDialogSearch</para> + </listitem> </orderedlist> </para> <para>Example of a simple .gtkrc-2.0: Modified: trunk/src/about.c =================================================================== --- trunk/src/about.c 2007-05-15 13:02:23 UTC (rev 1534) +++ trunk/src/about.c 2007-05-15 15:16:16 UTC (rev 1535) @@ -124,6 +124,7 @@ gtk_window_set_transient_for(GTK_WINDOW(dialog), GTK_WINDOW(app->window)); gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_CENTER_ON_PARENT); gtk_window_set_title(GTK_WINDOW(dialog), _("About Geany")); + gtk_widget_set_name(dialog, "GeanyDialog"); button = gtk_dialog_add_button(GTK_DIALOG(dialog), GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE); gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_CLOSE); gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE); Modified: trunk/src/build.c =================================================================== --- trunk/src/build.c 2007-05-15 13:02:23 UTC (rev 1534) +++ trunk/src/build.c 2007-05-15 15:16:16 UTC (rev 1535) @@ -1302,6 +1302,7 @@ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL); vbox = ui_dialog_vbox_new(GTK_DIALOG(dialog)); + gtk_widget_set_name(dialog, "GeanyDialog"); label = gtk_label_new(_("Set programs and options for compiling and viewing (La)TeX files.")); gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); @@ -1470,6 +1471,7 @@ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL); vbox = ui_dialog_vbox_new(GTK_DIALOG(dialog)); + gtk_widget_set_name(dialog, "GeanyDialog"); label = gtk_label_new(_("Set the commands for building and running programs.")); gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); Modified: trunk/src/dialogs.c =================================================================== --- trunk/src/dialogs.c 2007-05-15 13:02:23 UTC (rev 1534) +++ trunk/src/dialogs.c 2007-05-15 15:16:16 UTC (rev 1535) @@ -84,6 +84,7 @@ gtk_tooltips_set_tip(tooltips, viewbtn, _("Opens the file in read-only mode. If you choose more than one file to open, all files will be opened read-only."), NULL); gtk_widget_show(viewbtn); + gtk_widget_set_name(app->open_filesel, "GeanyDialog"); gtk_dialog_add_action_widget(GTK_DIALOG(app->open_filesel), viewbtn, GTK_RESPONSE_APPLY); gtk_dialog_add_buttons(GTK_DIALOG(app->open_filesel), @@ -274,6 +275,7 @@ gtk_window_set_skip_taskbar_hint(GTK_WINDOW(app->save_filesel), TRUE); gtk_window_set_type_hint(GTK_WINDOW(app->save_filesel), GDK_WINDOW_TYPE_HINT_DIALOG); gtk_dialog_set_default_response(GTK_DIALOG(app->save_filesel), GTK_RESPONSE_ACCEPT); + gtk_widget_set_name(app->save_filesel, "GeanyDialog"); g_signal_connect((gpointer) app->save_filesel, "delete_event", G_CALLBACK(gtk_widget_hide_on_delete), NULL); @@ -334,6 +336,7 @@ #else dialog = gtk_message_dialog_new(GTK_WINDOW(app->window), GTK_DIALOG_DESTROY_WITH_PARENT, type, GTK_BUTTONS_OK, "%s", string); + gtk_widget_set_name(dialog, "GeanyDialog"); gtk_dialog_run(GTK_DIALOG(dialog)); gtk_widget_destroy(dialog); #endif @@ -421,6 +424,7 @@ gtk_window_set_destroy_with_parent(GTK_WINDOW(app->open_fontsel), TRUE); gtk_window_set_skip_taskbar_hint(GTK_WINDOW(app->open_fontsel), TRUE); gtk_window_set_type_hint(GTK_WINDOW(app->open_fontsel), GDK_WINDOW_TYPE_HINT_DIALOG); + gtk_widget_set_name(app->open_fontsel, "GeanyDialog"); gtk_widget_show(GTK_FONT_SELECTION_DIALOG(app->open_fontsel)->apply_button); @@ -457,6 +461,7 @@ GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_CLOSE, GTK_RESPONSE_CANCEL, NULL); vbox = ui_dialog_vbox_new(GTK_DIALOG(dialog)); + gtk_widget_set_name(dialog, "GeanyDialog"); if (sci_can_copy(doc_list[idx].sci)) { @@ -550,6 +555,7 @@ if (app->open_colorsel == NULL) { app->open_colorsel = gtk_color_selection_dialog_new(_("Color Chooser")); + gtk_widget_set_name(app->open_colorsel, "GeanyDialog"); gtk_window_set_transient_for(GTK_WINDOW(app->open_colorsel), GTK_WINDOW(app->window)); g_signal_connect(GTK_COLOR_SELECTION_DIALOG(app->open_colorsel)->cancel_button, "clicked", @@ -589,6 +595,7 @@ GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL); vbox = ui_dialog_vbox_new(GTK_DIALOG(dialog)); + gtk_widget_set_name(dialog, "GeanyDialog"); gtk_box_set_spacing(GTK_BOX(vbox), 6); label = gtk_label_new(label_text); @@ -621,6 +628,7 @@ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL); vbox = ui_dialog_vbox_new(GTK_DIALOG(dialog)); + gtk_widget_set_name(dialog, "GeanyDialog"); label = gtk_label_new(_("Enter the line you want to go to:")); gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); @@ -712,6 +720,7 @@ GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_CLOSE, GTK_RESPONSE_CANCEL, NULL); g_free(title); + gtk_widget_set_name(dialog, "GeanyDialog"); vbox = ui_dialog_vbox_new(GTK_DIALOG(dialog)); g_signal_connect(dialog, "response", G_CALLBACK(gtk_widget_destroy), NULL); @@ -1023,12 +1032,13 @@ dialog = gtk_message_dialog_new(GTK_WINDOW(app->window), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, "%s", question_text); + gtk_widget_set_name(dialog, "GeanyDialog"); // question_text will be in bold if optional extra_text used if (extra_text != NULL) gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), "%s", extra_text); - // For a cancel button, use cancel reponse so user can press escape to cancel + // For a cancel button, use cancel response so user can press escape to cancel gtk_dialog_add_button(GTK_DIALOG(dialog), no_btn, utils_str_equal(no_btn, GTK_STOCK_CANCEL) ? GTK_RESPONSE_CANCEL : GTK_RESPONSE_NO); gtk_dialog_add_button(GTK_DIALOG(dialog), yes_btn, GTK_RESPONSE_YES); Modified: trunk/src/keybindings.c =================================================================== --- trunk/src/keybindings.c 2007-05-15 13:02:23 UTC (rev 1534) +++ trunk/src/keybindings.c 2007-05-15 15:16:16 UTC (rev 1535) @@ -521,6 +521,7 @@ GTK_STOCK_CLOSE, GTK_RESPONSE_CANCEL, NULL); vbox = ui_dialog_vbox_new(GTK_DIALOG(dialog)); gtk_box_set_spacing(GTK_BOX(vbox), 6); + gtk_widget_set_name(dialog, "GeanyDialog"); height = GEANY_WINDOW_MINIMAL_HEIGHT; gtk_window_set_default_size(GTK_WINDOW(dialog), height * 0.8, height); Modified: trunk/src/project.c =================================================================== --- trunk/src/project.c 2007-05-15 13:02:23 UTC (rev 1534) +++ trunk/src/project.c 2007-05-15 15:16:16 UTC (rev 1535) @@ -105,6 +105,7 @@ GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, NULL); + gtk_widget_set_name(e->dialog, "GeanyDialogProject"); bbox = gtk_hbox_new(FALSE, 0); button = gtk_button_new(); image = gtk_image_new_from_stock("gtk-new", GTK_ICON_SIZE_BUTTON); @@ -246,6 +247,7 @@ GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL); + gtk_widget_set_name(dialog, "GeanyDialogProject"); // set default Open, so pressing enter can open multiple files gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT); @@ -317,6 +319,7 @@ GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, NULL); gtk_dialog_add_buttons(GTK_DIALOG(e->dialog), GTK_STOCK_OK, GTK_RESPONSE_OK, NULL); + gtk_widget_set_name(e->dialog, "GeanyDialogProject"); vbox = ui_dialog_vbox_new(GTK_DIALOG(e->dialog)); @@ -672,6 +675,7 @@ GTK_FILE_CHOOSER_ACTION_SAVE, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, NULL); + gtk_widget_set_name(dialog, "GeanyDialogProject"); gtk_window_set_destroy_with_parent(GTK_WINDOW(dialog), TRUE); gtk_window_set_skip_taskbar_hint(GTK_WINDOW(dialog), TRUE); gtk_window_set_type_hint(GTK_WINDOW(dialog), GDK_WINDOW_TYPE_HINT_DIALOG); @@ -700,6 +704,7 @@ GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL); + gtk_widget_set_name(dialog, "GeanyDialog"); gtk_window_set_destroy_with_parent(GTK_WINDOW(dialog), TRUE); gtk_window_set_skip_taskbar_hint(GTK_WINDOW(dialog), TRUE); gtk_window_set_type_hint(GTK_WINDOW(dialog), GDK_WINDOW_TYPE_HINT_DIALOG); Modified: trunk/src/symbols.c =================================================================== --- trunk/src/symbols.c 2007-05-15 13:02:23 UTC (rev 1534) +++ trunk/src/symbols.c 2007-05-15 15:16:16 UTC (rev 1535) @@ -798,6 +798,7 @@ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN, GTK_RESPONSE_OK, NULL); + gtk_widget_set_name(dialog, "GeanyDialog"); filter = gtk_file_filter_new(); gtk_file_filter_set_name(filter, _("Geany tag files (*.tags)")); gtk_file_filter_add_pattern(filter, "*.tags"); Modified: trunk/src/tools.c =================================================================== --- trunk/src/tools.c 2007-05-15 13:02:23 UTC (rev 1534) +++ trunk/src/tools.c 2007-05-15 15:16:16 UTC (rev 1535) @@ -83,6 +83,7 @@ _("_Insert"), GTK_RESPONSE_OK, NULL); vbox = ui_dialog_vbox_new(GTK_DIALOG(sc_dialog)); gtk_box_set_spacing(GTK_BOX(vbox), 6); + gtk_widget_set_name(sc_dialog, "GeanyDialog"); height = GEANY_WINDOW_MINIMAL_HEIGHT; gtk_window_set_default_size(GTK_WINDOW(sc_dialog), height * 0.8, height); @@ -662,6 +663,7 @@ GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL); vbox = ui_dialog_vbox_new(GTK_DIALOG(dialog)); gtk_box_set_spacing(GTK_BOX(vbox), 6); + gtk_widget_set_name(dialog, "GeanyDialog"); label = gtk_label_new(_("You can send the current selection to any of these commands and the output of the command replaces the current selection.")); gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); Modified: trunk/src/ui_utils.c =================================================================== --- trunk/src/ui_utils.c 2007-05-15 13:02:23 UTC (rev 1534) +++ trunk/src/ui_utils.c 2007-05-15 15:16:16 UTC (rev 1535) @@ -1187,6 +1187,7 @@ gchar *locale_path; gchar *ret_path = NULL; + gtk_widget_set_name(dialog, "GeanyDialog"); locale_path = utils_get_locale_from_utf8(utf8_path); if (action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

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

15 May '07

Revision: 1534 http://svn.sourceforge.net/geany/?rev=1534&view=rev Author: eht16 Date: 2007-05-15 06:02:23 -0700 (Tue, 15 May 2007) Log Message: ----------- Hide notebooks tabs instead of sidebar when toggling additional widgets. Modified Paths: -------------- trunk/ChangeLog trunk/doc/geany.docbook trunk/src/callbacks.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-05-15 12:35:21 UTC (rev 1533) +++ trunk/ChangeLog 2007-05-15 13:02:23 UTC (rev 1534) @@ -2,6 +2,9 @@ * scintilla/ScintillaGTK.cxx: Fixed wrong clipboard target (closes #1711483). + * doc/geany.docbook, src/callbacks.c: + Hide notebooks tabs instead of sidebar when toggling additional + widgets. 2007-05-14 Nick Treleaven <nick.treleaven(a)btinternet.com> Modified: trunk/doc/geany.docbook =================================================================== --- trunk/doc/geany.docbook 2007-05-15 12:35:21 UTC (rev 1533) +++ trunk/doc/geany.docbook 2007-05-15 13:02:23 UTC (rev 1534) @@ -1616,8 +1616,8 @@ </row> <row> <entry>Toggle all additional widgets</entry> - <entry>Hide and show all additional widgets like the sidebar, the - toolbar, the messages window and the statusbar.</entry> + <entry>Hide and show all additional widgets like the notebook tabs, + the toolbar, the messages window and the statusbar.</entry> </row> <row> <entry>Zoom In</entry> Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2007-05-15 12:35:21 UTC (rev 1533) +++ trunk/src/callbacks.c 2007-05-15 13:02:23 UTC (rev 1534) @@ -2176,7 +2176,7 @@ if (hide_all == -1) { if (! gtk_check_menu_item_get_active(msgw) && - ! app->sidebar_visible && + ! app->show_notebook_tabs && ! gtk_check_menu_item_get_active(toolbari)) { hide_all = TRUE; @@ -2192,8 +2192,8 @@ if (gtk_check_menu_item_get_active(msgw)) gtk_check_menu_item_set_active(msgw, ! gtk_check_menu_item_get_active(msgw)); - if (app->sidebar_visible) - on_menu_show_sidebar1_toggled(NULL, NULL); + app->show_notebook_tabs = FALSE; + gtk_notebook_set_show_tabs(GTK_NOTEBOOK(app->notebook), app->show_notebook_tabs); ui_statusbar_showhide(FALSE); @@ -2206,8 +2206,8 @@ if (! gtk_check_menu_item_get_active(msgw)) gtk_check_menu_item_set_active(msgw, ! gtk_check_menu_item_get_active(msgw)); - if (! app->sidebar_visible) - on_menu_show_sidebar1_toggled(NULL, NULL); + app->show_notebook_tabs = TRUE; + gtk_notebook_set_show_tabs(GTK_NOTEBOOK(app->notebook), app->show_notebook_tabs); ui_statusbar_showhide(TRUE); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

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

15 May '07

Revision: 1533 http://svn.sourceforge.net/geany/?rev=1533&view=rev Author: eht16 Date: 2007-05-15 05:35:21 -0700 (Tue, 15 May 2007) Log Message: ----------- Fixed wrong clipboard target (closes #1711483). Modified Paths: -------------- trunk/ChangeLog trunk/scintilla/ScintillaGTK.cxx Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-05-14 15:53:23 UTC (rev 1532) +++ trunk/ChangeLog 2007-05-15 12:35:21 UTC (rev 1533) @@ -1,3 +1,9 @@ +2007-05-15 Enrico Tröger <enrico.troeger(a)uvena.de> + + * scintilla/ScintillaGTK.cxx: + Fixed wrong clipboard target (closes #1711483). + + 2007-05-14 Nick Treleaven <nick.treleaven(a)btinternet.com> * src/filetypes.c, src/filetypes.h: Modified: trunk/scintilla/ScintillaGTK.cxx =================================================================== --- trunk/scintilla/ScintillaGTK.cxx 2007-05-14 15:53:23 UTC (rev 1532) +++ trunk/scintilla/ScintillaGTK.cxx 2007-05-15 12:35:21 UTC (rev 1533) @@ -307,12 +307,18 @@ GdkAtom ScintillaGTK::atomUriList = 0; GdkAtom ScintillaGTK::atomDROPFILES_DND = 0; -static const GtkTargetEntry clipboardTargets[] = { +static const GtkTargetEntry clipboardCopyTargets[] = { + { "UTF8_STRING", 0, TARGET_UTF8_STRING }, + { "STRING", 0, TARGET_STRING }, +}; +static const gint nClipboardCopyTargets = sizeof(clipboardCopyTargets) / sizeof(clipboardCopyTargets[0]); + +static const GtkTargetEntry clipboardPasteTargets[] = { { "text/uri-list", 0, TARGET_URI }, { "UTF8_STRING", 0, TARGET_UTF8_STRING }, { "STRING", 0, TARGET_STRING }, }; -static const gint nClipboardTargets = sizeof(clipboardTargets) / sizeof(clipboardTargets[0]); +static const gint nClipboardPasteTargets = sizeof(clipboardPasteTargets) / sizeof(clipboardPasteTargets[0]); static GtkWidget *PWidget(Window &w) { return reinterpret_cast<GtkWidget *>(w.GetID()); @@ -760,15 +766,15 @@ gtk_widget_grab_focus(PWidget(wMain)); gtk_selection_add_targets(GTK_WIDGET(PWidget(wMain)), GDK_SELECTION_PRIMARY, - clipboardTargets, nClipboardTargets); + clipboardPasteTargets, nClipboardPasteTargets); #ifndef USE_GTK_CLIPBOARD gtk_selection_add_targets(GTK_WIDGET(PWidget(wMain)), atomClipboard, - clipboardTargets, nClipboardTargets); + clipboardPasteTargets, nClipboardPasteTargets); #endif gtk_drag_dest_set(GTK_WIDGET(PWidget(wMain)), - GTK_DEST_DEFAULT_ALL, clipboardTargets, nClipboardTargets, + GTK_DEST_DEFAULT_ALL, clipboardPasteTargets, nClipboardPasteTargets, static_cast<GdkDragAction>(GDK_ACTION_COPY | GDK_ACTION_MOVE)); SetTicking(true); @@ -788,12 +794,7 @@ void ScintillaGTK::StartDrag() { dragWasDropped = false; - static const GtkTargetEntry targets[] = { - { "UTF8_STRING", 0, TARGET_UTF8_STRING }, - { "STRING", 0, TARGET_STRING }, - }; - static const gint n_targets = sizeof(targets) / sizeof(targets[0]); - GtkTargetList *tl = gtk_target_list_new(targets, n_targets); + GtkTargetList *tl = gtk_target_list_new(clipboardCopyTargets, nClipboardCopyTargets); gtk_drag_begin(GTK_WIDGET(PWidget(wMain)), tl, static_cast<GdkDragAction>(GDK_ACTION_COPY | GDK_ACTION_MOVE), @@ -1268,7 +1269,7 @@ SelectionText *clipText = new SelectionText(); clipText->Copy(selectedText); - gtk_clipboard_set_with_data(clipBoard, clipboardTargets, nClipboardTargets, + gtk_clipboard_set_with_data(clipBoard, clipboardCopyTargets, nClipboardCopyTargets, ClipboardGetSelection, ClipboardClearSelection, clipText); #endif @@ -1290,7 +1291,7 @@ SelectionText *clipText = new SelectionText(); CopySelectionRange(clipText); - gtk_clipboard_set_with_data(clipBoard, clipboardTargets, nClipboardTargets, + gtk_clipboard_set_with_data(clipBoard, clipboardCopyTargets, nClipboardCopyTargets, ClipboardGetSelection, ClipboardClearSelection, clipText); #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1532] trunk
by ntrel＠users.sourceforge.net 14 May '07

14 May '07

Revision: 1532 http://svn.sourceforge.net/geany/?rev=1532&view=rev Author: ntrel Date: 2007-05-14 08:53:23 -0700 (Mon, 14 May 2007) Log Message: ----------- Hopefully fix #1718532 - 'Crashes when open a special file'; backported from Scintilla 1.73. Modified Paths: -------------- trunk/ChangeLog trunk/scintilla/LexHTML.cxx Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-05-14 13:06:18 UTC (rev 1531) +++ trunk/ChangeLog 2007-05-14 15:53:23 UTC (rev 1532) @@ -5,6 +5,9 @@ Reorder Haskell, O-Matrix, VHDL filetypes. * src/document.c: Fix removing indent spaces after switching back to tab indenting. + * scintilla/LexHTML.cxx: + Hopefully fix #1718532 - 'Crashes when open a special file'; + backported from Scintilla 1.73. 2007-05-12 Nick Treleaven <nick.treleaven(a)btinternet.com> Modified: trunk/scintilla/LexHTML.cxx =================================================================== --- trunk/scintilla/LexHTML.cxx 2007-05-14 13:06:18 UTC (rev 1531) +++ trunk/scintilla/LexHTML.cxx 2007-05-14 15:53:23 UTC (rev 1532) @@ -863,7 +863,9 @@ styler.ColourTo(i - 1, StateToPrint); state = SCE_H_SGML_SIMPLESTRING; } else if ((ch == '-') && (chPrev == '-')) { - styler.ColourTo(i - 2, StateToPrint); + if (static_cast<int>(styler.GetStartSegment()) <= (i - 2)) { + styler.ColourTo(i - 2, StateToPrint); + } state = SCE_H_SGML_COMMENT; } else if (isascii(ch) && isalpha(ch) && (chPrev == '%')) { styler.ColourTo(i - 2, StateToPrint); @@ -1600,8 +1602,9 @@ styler.ColourTo(i - 1, StateToPrint); state = SCE_HPHP_HSTRING_VARIABLE; } else if (styler.Match(i, phpStringDelimiter)) { - if (strlen(phpStringDelimiter) > 1) - i += strlen(phpStringDelimiter) - 1; + const int psdLength = strlen(phpStringDelimiter); + if ((psdLength > 1) && ((i + psdLength) < lengthDoc)) + i += psdLength - 1; styler.ColourTo(i, StateToPrint); state = SCE_HPHP_DEFAULT; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1531] trunk
by ntrel＠users.sourceforge.net 14 May '07

14 May '07

Revision: 1531 http://svn.sourceforge.net/geany/?rev=1531&view=rev Author: ntrel Date: 2007-05-14 06:06:18 -0700 (Mon, 14 May 2007) Log Message: ----------- Fix removing indent spaces after switching back to tab indenting. Modified Paths: -------------- trunk/ChangeLog trunk/src/document.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-05-14 12:55:55 UTC (rev 1530) +++ trunk/ChangeLog 2007-05-14 13:06:18 UTC (rev 1531) @@ -3,6 +3,8 @@ * src/filetypes.c, src/filetypes.h: Add some menu separators to group filetype menu items. Reorder Haskell, O-Matrix, VHDL filetypes. + * src/document.c: + Fix removing indent spaces after switching back to tab indenting. 2007-05-12 Nick Treleaven <nick.treleaven(a)btinternet.com> Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2007-05-14 12:55:55 UTC (rev 1530) +++ trunk/src/document.c 2007-05-14 13:06:18 UTC (rev 1531) @@ -199,8 +199,8 @@ sci_set_tab_width(sci, app->pref_editor_tab_width); sci_set_use_tabs(sci, app->pref_editor_use_tabs); - if (! app->pref_editor_use_tabs) - SSM(sci, SCI_SETBACKSPACEUNINDENTS, TRUE, 0); // remove indent spaces on backspace + // remove indent spaces on backspace, if using spaces to indent + SSM(sci, SCI_SETBACKSPACEUNINDENTS, ! app->pref_editor_use_tabs, 0); sci_set_autoc_max_height(sci, app->autocompletion_max_height); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1530] trunk
by ntrel＠users.sourceforge.net 14 May '07

14 May '07

Revision: 1530 http://svn.sourceforge.net/geany/?rev=1530&view=rev Author: ntrel Date: 2007-05-14 05:55:55 -0700 (Mon, 14 May 2007) Log Message: ----------- Add some menu separators to group filetype menu items. Reorder Haskell, O-Matrix, VHDL filetypes. Modified Paths: -------------- trunk/ChangeLog trunk/src/filetypes.c trunk/src/filetypes.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-05-12 12:25:11 UTC (rev 1529) +++ trunk/ChangeLog 2007-05-14 12:55:55 UTC (rev 1530) @@ -1,3 +1,10 @@ +2007-05-14 Nick Treleaven <nick.treleaven(a)btinternet.com> + + * src/filetypes.c, src/filetypes.h: + Add some menu separators to group filetype menu items. + Reorder Haskell, O-Matrix, VHDL filetypes. + + 2007-05-12 Nick Treleaven <nick.treleaven(a)btinternet.com> * tagmanager/sql.c: Modified: trunk/src/filetypes.c =================================================================== --- trunk/src/filetypes.c 2007-05-12 12:25:11 UTC (rev 1529) +++ trunk/src/filetypes.c 2007-05-14 12:55:55 UTC (rev 1530) @@ -548,6 +548,21 @@ filetype *ft = filetypes[ft_id]; const gchar *title = (ft_id == GEANY_FILETYPES_ALL) ? _("None") : ft->title; + // insert separators for different filetype groups + switch (ft_id) + { + case GEANY_FILETYPES_PERL: // scripts + case GEANY_FILETYPES_XML: // text documents + case GEANY_FILETYPES_ALL: // none + { + GtkWidget *sep = gtk_separator_menu_item_new(); + + gtk_widget_show(sep); + gtk_container_add(GTK_CONTAINER(filetype_menu), sep); + } + default: + break; + } ft->item = NULL; filetypes_create_menu_item(filetype_menu, title, ft); } Modified: trunk/src/filetypes.h =================================================================== --- trunk/src/filetypes.h 2007-05-12 12:25:11 UTC (rev 1529) +++ trunk/src/filetypes.h 2007-05-14 12:55:55 UTC (rev 1530) @@ -35,6 +35,7 @@ typedef enum { + // normally compiled languages GEANY_FILETYPES_C = 0, GEANY_FILETYPES_CPP, GEANY_FILETYPES_D, @@ -43,6 +44,10 @@ GEANY_FILETYPES_ASM, GEANY_FILETYPES_FORTRAN, GEANY_FILETYPES_CAML, + GEANY_FILETYPES_HASKELL, + GEANY_FILETYPES_VHDL, + + // script languages GEANY_FILETYPES_PERL, GEANY_FILETYPES_PHP, GEANY_FILETYPES_JS, @@ -51,20 +56,21 @@ GEANY_FILETYPES_TCL, GEANY_FILETYPES_LUA, GEANY_FILETYPES_FERITE, - GEANY_FILETYPES_HASKELL, GEANY_FILETYPES_SH, GEANY_FILETYPES_MAKE, + GEANY_FILETYPES_OMS, + + // documents and others GEANY_FILETYPES_XML, GEANY_FILETYPES_DOCBOOK, GEANY_FILETYPES_HTML, GEANY_FILETYPES_CSS, GEANY_FILETYPES_SQL, GEANY_FILETYPES_LATEX, - GEANY_FILETYPES_OMS, - GEANY_FILETYPES_VHDL, GEANY_FILETYPES_DIFF, GEANY_FILETYPES_CONF, - GEANY_FILETYPES_ALL, // must be last filetype + + GEANY_FILETYPES_ALL, // must be last filetype, used for 'None' item. GEANY_MAX_FILE_TYPES } filetype_id; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1529] trunk
by ntrel＠users.sourceforge.net 12 May '07

12 May '07

Revision: 1529 http://svn.sourceforge.net/geany/?rev=1529&view=rev Author: ntrel Date: 2007-05-12 05:25:11 -0700 (Sat, 12 May 2007) Log Message: ----------- Fix #1717418, Hang on SQL file load. Modified Paths: -------------- trunk/ChangeLog trunk/tagmanager/sql.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-05-11 17:31:06 UTC (rev 1528) +++ trunk/ChangeLog 2007-05-12 12:25:11 UTC (rev 1529) @@ -1,3 +1,9 @@ +2007-05-12 Nick Treleaven <nick.treleaven(a)btinternet.com> + + * tagmanager/sql.c: + Fix #1717418, Hang on SQL file load. + + 2007-05-11 Nick Treleaven <nick.treleaven(a)btinternet.com> * src/utils.c, src/utils.h, src/search.c: Modified: trunk/tagmanager/sql.c =================================================================== --- trunk/tagmanager/sql.c 2007-05-11 17:31:06 UTC (rev 1528) +++ trunk/tagmanager/sql.c 2007-05-12 12:25:11 UTC (rev 1529) @@ -544,7 +544,7 @@ break; else fileUngetc (c); - } while (c != '\0'); + } while (c != EOF && c != '\0'); goto getNextChar; } break; 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
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits May 2007