Commits June 2006

commits@lists.geany.org

3 participants
126 discussions

SF.net SVN: geany: [391] trunk
by ntrel＠users.sourceforge.net 02 Jun '06

02 Jun '06

Revision: 391 Author: ntrel Date: 2006-06-02 07:26:34 -0700 (Fri, 02 Jun 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=391&view=rev Log Message: ----------- Fix Go to tag declaration/definition Modified Paths: -------------- trunk/ChangeLog trunk/src/callbacks.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-06-02 14:04:59 UTC (rev 390) +++ trunk/ChangeLog 2006-06-02 14:26:34 UTC (rev 391) @@ -3,9 +3,10 @@ * src/highlighting.c, data/filetypes.css: improved colouring -2006-06-01 Nick Treleaven <nick.treleaven(a)btinternet.com> +2006-06-02 Nick Treleaven <nick.treleaven(a)btinternet.com> * src/dialogs.c: Fix dialog path warnings for command-line files. + * src/callbacks.c: Fix Go to tag declaration/definition. 2006-05-31 Nick Treleaven <nick.treleaven(a)btinternet.com> Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2006-06-02 14:04:59 UTC (rev 390) +++ trunk/src/callbacks.c 2006-06-02 14:26:34 UTC (rev 391) @@ -1288,7 +1288,7 @@ guint i, j; const GPtrArray *tags; - if (utils_strcmp(_("Goto tag definition"), gtk_label_get_text(GTK_LABEL(gtk_bin_get_child(GTK_BIN(menuitem)))))) + if (menuitem == GTK_MENU_ITEM(lookup_widget(app->popup_menu, "goto_tag_definition1"))) type = tm_tag_function_t; else type = tm_tag_prototype_t; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [390] trunk/src/utils.c
by eht16＠users.sourceforge.net 02 Jun '06

02 Jun '06

Revision: 390 Author: eht16 Date: 2006-06-02 07:04:59 -0700 (Fri, 02 Jun 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=390&view=rev Log Message: ----------- added some sanity checks if filetype is NULL Modified Paths: -------------- trunk/src/utils.c Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2006-06-02 12:45:42 UTC (rev 389) +++ trunk/src/utils.c 2006-06-02 14:04:59 UTC (rev 390) @@ -197,7 +197,7 @@ { gboolean enable = FALSE; - if (idx == -1) enable = FALSE; + if (idx == -1 || doc_list[idx].file_type == NULL) enable = FALSE; else if (doc_list[idx].file_type->id == GEANY_FILETYPES_C || doc_list[idx].file_type->id == GEANY_FILETYPES_CPP) { @@ -652,7 +652,7 @@ } // make all inactive, because there is no more tab left, or something strange occured - if (idx == -1 || ! doc_list[idx].file_type->has_tags) + if (idx == -1 || doc_list[idx].file_type == NULL || ! doc_list[idx].file_type->has_tags) { gtk_widget_set_sensitive(app->tagbar, FALSE); gtk_container_add(GTK_CONTAINER(app->tagbar), app->default_tag_tree); @@ -1254,7 +1254,7 @@ gchar *ext = NULL; filetype *ft; - if (idx == -1) + if (idx == -1 || doc_list[idx].file_type == NULL) { gtk_widget_set_sensitive(lookup_widget(app->window, "menu_build1"), FALSE); gtk_widget_set_sensitive(app->compile_button, FALSE); @@ -1972,10 +1972,16 @@ void utils_replace_filename(gint idx) { - gint pos = sci_get_current_position(doc_list[idx].sci); - gchar *filebase = g_strconcat(GEANY_STRING_UNTITLED, ".", (doc_list[idx].file_type)->extension, NULL); - gchar *filename = g_path_get_basename(doc_list[idx].file_name); + gint pos; + gchar *filebase; + gchar *filename; + if (idx == -1 || doc_list[idx].file_type == NULL) return; + + pos = sci_get_current_position(doc_list[idx].sci); + filebase = g_strconcat(GEANY_STRING_UNTITLED, ".", (doc_list[idx].file_type)->extension, NULL); + filename = g_path_get_basename(doc_list[idx].file_name); + sci_set_current_position(doc_list[idx].sci, 0); sci_set_search_anchor(doc_list[idx].sci); // stop if filebase was not found @@ -2283,7 +2289,9 @@ gint idx = document_get_cur_idx(); gint line = -1; - if (string == NULL || !doc_list[app->cur_idx].is_valid) return; + if (string == NULL || ! doc_list[app->cur_idx].is_valid || + doc_list[app->cur_idx].file_type == NULL) + return; // first get the line switch (doc_list[app->cur_idx].file_type->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: [389] trunk
by eht16＠users.sourceforge.net 02 Jun '06

02 Jun '06

Revision: 389 Author: eht16 Date: 2006-06-02 05:45:42 -0700 (Fri, 02 Jun 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=389&view=rev Log Message: ----------- improved colouring Modified Paths: -------------- trunk/ChangeLog trunk/data/filetypes.css trunk/src/highlighting.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-06-02 12:00:33 UTC (rev 388) +++ trunk/ChangeLog 2006-06-02 12:45:42 UTC (rev 389) @@ -1,3 +1,8 @@ +2006-06-02 Enrico Troeger <enrico.troeger(a)uvena.de> + + * src/highlighting.c, data/filetypes.css: improved colouring + + 2006-06-01 Nick Treleaven <nick.treleaven(a)btinternet.com> * src/dialogs.c: Fix dialog path warnings for command-line files. Modified: trunk/data/filetypes.css =================================================================== --- trunk/data/filetypes.css 2006-06-02 12:00:33 UTC (rev 388) +++ trunk/data/filetypes.css 2006-06-02 12:45:42 UTC (rev 389) @@ -1,19 +1,19 @@ # For complete documentation of this file, please see Geany's main documentation [styling] # foreground;background;bold;italic -default=0x000000;0xffffff;false;false +default=0x993300;0xffffff;false;false comment=0x808080;0xffffff;false;false -tag=0x00007F;0xffffff;true;false -class=0x991111;0xffffff;true;false -pseudoclass=0x991111;0xffffff;true;true -unknown_pseudoclass=0x0000ff;0xffffff;false;false -unknown_identifier=0x0000ff;0xffffff;false;false +tag=0xa46621;0xffffff;true;false +class=0x007f00;0xffffff;true;false +pseudoclass=0x100066;0xffffff;true;true +unknown_pseudoclass=0x990000;0xffffff;false;false +unknown_identifier=0x990000;0xffffff;false;false operator=0x101030;0xffffff;false;false -identifier=0x100000;0xffffff;false;false -doublestring=0x1E90FF;0xffffff;false;false -singlestring=0x1E90FF;0xffffff;false;false +identifier=0x990000;0xffffff;true;false +doublestring=0x660033;0xffffff;false;false +singlestring=0x660033;0xffffff;false;false attribute=0x007F00;0xffffff;false;false -value=x7F7F00;0xffffff;false;false +value=0x303030;0xffffff;false;false [keywords] primary=color background-color background-image background-repeat background-attachment background-position background font-family font-style font-variant font-weight font-size font word-spacing letter-spacing text-decoration vertical-align text-transform text-align text-indent line-height margin-top margin-right margin-bottom margin-left margin padding-top padding-right padding-bottom padding-left padding border-top-width border-right-width border-bottom-width border-left-width border-width border-top border-right border-bottom border-left border border-color border-style width height float clear display white-space list-style-type list-style-image list-style-position list-style Modified: trunk/src/highlighting.c =================================================================== --- trunk/src/highlighting.c 2006-06-02 12:00:33 UTC (rev 388) +++ trunk/src/highlighting.c 2006-06-02 12:45:42 UTC (rev 389) @@ -1671,19 +1671,19 @@ g_key_file_load_from_file(config_home, f, G_KEY_FILE_KEEP_COMMENTS, NULL); types[GEANY_FILETYPES_CSS] = g_new(style_set, 1); - styleset_get_hex(config, config_home, "styling", "default", "0x000000", "0xffffff", "false", types[GEANY_FILETYPES_CSS]->styling[0]); + styleset_get_hex(config, config_home, "styling", "default", "0x993300", "0xffffff", "false", types[GEANY_FILETYPES_CSS]->styling[0]); styleset_get_hex(config, config_home, "styling", "comment", "0x808080", "0xffffff", "false", types[GEANY_FILETYPES_CSS]->styling[1]); - styleset_get_hex(config, config_home, "styling", "tag", "0x00007F", "0xffffff", "true", types[GEANY_FILETYPES_CSS]->styling[2]); - styleset_get_hex(config, config_home, "styling", "class", "0x991111", "0xffffff", "true", types[GEANY_FILETYPES_CSS]->styling[3]); - styleset_get_hex(config, config_home, "styling", "pseudoclass", "0x991111", "0xffffff", "true", types[GEANY_FILETYPES_CSS]->styling[4]); - styleset_get_hex(config, config_home, "styling", "unknown_pseudoclass", "0x0000ff", "0xffffff", "false", types[GEANY_FILETYPES_CSS]->styling[5]); - styleset_get_hex(config, config_home, "styling", "unknown_identifier", "0x0000ff", "0xffffff", "false", types[GEANY_FILETYPES_CSS]->styling[6]); + styleset_get_hex(config, config_home, "styling", "tag", "0xa46621", "0xffffff", "true", types[GEANY_FILETYPES_CSS]->styling[2]); + styleset_get_hex(config, config_home, "styling", "class", "0x007f00", "0xffffff", "true", types[GEANY_FILETYPES_CSS]->styling[3]); + styleset_get_hex(config, config_home, "styling", "pseudoclass", "0x100066", "0xffffff", "true", types[GEANY_FILETYPES_CSS]->styling[4]); + styleset_get_hex(config, config_home, "styling", "unknown_pseudoclass", "0x990000", "0xffffff", "false", types[GEANY_FILETYPES_CSS]->styling[5]); + styleset_get_hex(config, config_home, "styling", "unknown_identifier", "0x990000", "0xffffff", "false", types[GEANY_FILETYPES_CSS]->styling[6]); styleset_get_hex(config, config_home, "styling", "operator", "0x101030", "0xffffff", "false", types[GEANY_FILETYPES_CSS]->styling[7]); - styleset_get_hex(config, config_home, "styling", "identifier", "0x100000", "0xffffff", "false", types[GEANY_FILETYPES_CSS]->styling[8]); - styleset_get_hex(config, config_home, "styling", "doublestring", "0x1E90FF", "0xffffff", "false", types[GEANY_FILETYPES_CSS]->styling[9]); - styleset_get_hex(config, config_home, "styling", "singlestring", "0x1E90FF", "0xffffff", "false", types[GEANY_FILETYPES_CSS]->styling[10]); + styleset_get_hex(config, config_home, "styling", "identifier", "0x990000", "0xffffff", "true", types[GEANY_FILETYPES_CSS]->styling[8]); + styleset_get_hex(config, config_home, "styling", "doublestring", "0x660033", "0xffffff", "false", types[GEANY_FILETYPES_CSS]->styling[9]); + styleset_get_hex(config, config_home, "styling", "singlestring", "0x660033", "0xffffff", "false", types[GEANY_FILETYPES_CSS]->styling[10]); styleset_get_hex(config, config_home, "styling", "attribute", "0x007F00", "0xffffff", "false", types[GEANY_FILETYPES_CSS]->styling[11]); - styleset_get_hex(config, config_home, "styling", "value", "0x7F7F00", "0xffffff", "false", types[GEANY_FILETYPES_CSS]->styling[12]); + styleset_get_hex(config, config_home, "styling", "value", "0x303030", "0xffffff", "false", types[GEANY_FILETYPES_CSS]->styling[12]); types[GEANY_FILETYPES_CSS]->keywords = g_new(gchar*, 4); styleset_get_keywords(config, config_home, "keywords", "primary", GEANY_FILETYPES_CSS, 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: [388] trunk
by ntrel＠users.sourceforge.net 02 Jun '06

02 Jun '06

Revision: 388 Author: ntrel Date: 2006-06-02 05:00:33 -0700 (Fri, 02 Jun 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=388&view=rev Log Message: ----------- Fix dialog path warnings for command-line files Modified Paths: -------------- trunk/ChangeLog trunk/src/dialogs.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-06-02 11:32:37 UTC (rev 387) +++ trunk/ChangeLog 2006-06-02 12:00:33 UTC (rev 388) @@ -1,3 +1,8 @@ +2006-06-01 Nick Treleaven <nick.treleaven(a)btinternet.com> + + * src/dialogs.c: Fix dialog path warnings for command-line files. + + 2006-05-31 Nick Treleaven <nick.treleaven(a)btinternet.com> * scintilla/PlatGTK.cxx: Modified: trunk/src/dialogs.c =================================================================== --- trunk/src/dialogs.c 2006-06-02 11:32:37 UTC (rev 387) +++ trunk/src/dialogs.c 2006-06-02 12:00:33 UTC (rev 388) @@ -130,8 +130,9 @@ locale_filename = g_locale_from_utf8(initdir, -1, NULL, NULL, NULL); if (locale_filename == NULL) locale_filename = g_strdup(initdir); - gtk_file_chooser_set_current_folder( - GTK_FILE_CHOOSER(app->open_filesel), locale_filename); + if (g_path_is_absolute(locale_filename)) + gtk_file_chooser_set_current_folder( + GTK_FILE_CHOOSER(app->open_filesel), locale_filename); g_free(initdir); g_free(locale_filename); @@ -180,7 +181,10 @@ gchar *locale_filename = g_locale_from_utf8(doc_list[idx].file_name, -1, NULL, NULL, NULL); if (locale_filename == NULL) locale_filename = g_strdup(doc_list[idx].file_name); - gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(app->save_filesel), locale_filename); + if (g_path_is_absolute(locale_filename)) + gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(app->save_filesel), locale_filename); + else + gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(app->save_filesel), locale_filename); g_free(locale_filename); } else This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [387] trunk/TODO
by eht16＠users.sourceforge.net 02 Jun '06

02 Jun '06

Revision: 387 Author: eht16 Date: 2006-06-02 04:32:37 -0700 (Fri, 02 Jun 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=387&view=rev Log Message: ----------- updated TODO Modified Paths: -------------- trunk/TODO Modified: trunk/TODO =================================================================== --- trunk/TODO 2006-06-01 14:49:16 UTC (rev 386) +++ trunk/TODO 2006-06-02 11:32:37 UTC (rev 387) @@ -5,12 +5,10 @@ Geany 0.7 or later: - o improve scrolling o fix a freeze at switching between filetypes with files in ISO-8859-x encoding (reported by Jörg Sommer) o encoding-bug in utils_convert_to_utf8() o documentation: list and explain filetype modes - o make keyboard shortcuts user-definable o inverting highlighting by selection o src/sci_cb.c: improve auto completion(include local tags) o create filetype specific menus, read templates from filetypes.* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [386] trunk/data/filetypes.perl
by ntrel＠users.sourceforge.net 01 Jun '06

01 Jun '06

Revision: 386 Author: ntrel Date: 2006-06-01 07:49:16 -0700 (Thu, 01 Jun 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=386&view=rev Log Message: ----------- Quote perl filename for compiling Modified Paths: -------------- trunk/data/filetypes.perl Modified: trunk/data/filetypes.perl =================================================================== --- trunk/data/filetypes.perl 2006-06-01 13:55:44 UTC (rev 385) +++ trunk/data/filetypes.perl 2006-06-01 14:49:16 UTC (rev 386) @@ -45,10 +45,10 @@ # (use only one of it at one time) # B - The Perl Bytecode Compiler (requires Perl 5.8 or higher) -compiler=perl -MO=Bytecode,-H,-o%fc %f +compiler=perl -MO=Bytecode,-H,-o"%f"c "%f" # alternatively use perlcc -#compiler=perlcc -o %e %f +#compiler=perlcc -o "%e" "%f" # instead of actual compiling, just run a nice syntax check #compiler=perl -c "%f" 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 June 2006