Commits September 2009

commits@lists.geany.org

4 participants
131 discussions

SF.net SVN: geany:[4214] trunk
by ntrel＠users.sourceforge.net 21 Sep '09

21 Sep '09

Revision: 4214 http://geany.svn.sourceforge.net/geany/?rev=4214&view=rev Author: ntrel Date: 2009-09-21 12:34:16 +0000 (Mon, 21 Sep 2009) Log Message: ----------- Speed up sorting in utils_get_file_list(). This reduces the file browser delay on displaying a big directory, e.g. /usr/bin. Modified Paths: -------------- trunk/ChangeLog trunk/src/utils.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-09-20 19:09:24 UTC (rev 4213) +++ trunk/ChangeLog 2009-09-21 12:34:16 UTC (rev 4214) @@ -1,3 +1,10 @@ +2009-09-21 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/utils.c: + Speed up sorting in utils_get_file_list(). This reduces the file + browser delay on displaying a big directory, e.g. /usr/bin. + + 2009-09-20 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * src/filetypes.c, src/filetypes.h, src/symbols.c, Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2009-09-20 19:09:24 UTC (rev 4213) +++ trunk/src/utils.c 2009-09-21 12:34:16 UTC (rev 4214) @@ -1379,10 +1379,12 @@ foreach_dir(filename, dir) { - list = g_slist_insert_sorted(list, g_strdup(filename), (GCompareFunc) utils_str_casecmp); + list = g_slist_append(list, g_strdup(filename)); len++; } g_dir_close(dir); + /* sorting last is quicker than on insertion */ + list = g_slist_sort(list, (GCompareFunc) utils_str_casecmp); if (length) *length = len; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4213] trunk/src/editor.c
by eht16＠users.sourceforge.net 20 Sep '09

20 Sep '09

Revision: 4213 http://geany.svn.sourceforge.net/geany/?rev=4213&view=rev Author: eht16 Date: 2009-09-20 19:09:24 +0000 (Sun, 20 Sep 2009) Log Message: ----------- Fix integer conversion Modified Paths: -------------- trunk/src/editor.c Modified: trunk/src/editor.c =================================================================== --- trunk/src/editor.c 2009-09-20 19:06:48 UTC (rev 4212) +++ trunk/src/editor.c 2009-09-20 19:09:24 UTC (rev 4213) @@ -2176,7 +2176,7 @@ { gint offset; - offset = (gint)g_queue_pop_head(snippet_offsets); + offset = GPOINTER_TO_INT(g_queue_pop_head(snippet_offsets)); if (current_pos > snippet_cursor_insert_pos) snippet_cursor_insert_pos = offset + current_pos; 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:[4212] trunk
by eht16＠users.sourceforge.net 20 Sep '09

20 Sep '09

Revision: 4212 http://geany.svn.sourceforge.net/geany/?rev=4212&view=rev Author: eht16 Date: 2009-09-20 19:06:48 +0000 (Sun, 20 Sep 2009) Log Message: ----------- Merge recent changes from the CTags project to further improve PHP symbol parsing. Modified Paths: -------------- trunk/ChangeLog trunk/tagmanager/php.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-09-20 18:46:56 UTC (rev 4211) +++ trunk/ChangeLog 2009-09-20 19:06:48 UTC (rev 4212) @@ -4,9 +4,12 @@ tagmanager/parsers.h, tagmanager/makefile.win32, tagmanager/abc.c, tagmanager/Makefile.am, data/filetypes.abc, data/filetype_extensions.conf, wscript: + Add new filetype: Abc (patch by Eric Forgeot, thanks). + * tagmanager/php.c: + Merge recent changes from the CTags project to further improve + PHP symbol parsing. - 2009-09-17 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * src/printing.c: Modified: trunk/tagmanager/php.c =================================================================== --- trunk/tagmanager/php.c 2009-09-20 18:46:56 UTC (rev 4211) +++ trunk/tagmanager/php.c 2009-09-20 19:06:48 UTC (rev 4212) @@ -70,18 +70,20 @@ static void installPHPRegex (const langType language) { - addTagRegex(language, "(^|[ \t])class[ \t]+([" ALPHA "_][" ALNUM "_]*)", - "\\2", "c,class,classes", NULL); - addTagRegex(language, "(^|[ \t])interface[ \t]+([" ALPHA "_][" ALNUM "_]*)", - "\\2", "i,interface,interfaces", NULL); - addTagRegex(language, "(^|[ \t])define[ \t]*\\([ \t]*['\"]?([" ALPHA "_][" ALNUM "_]*)", - "\\2", "d,macro,constant definitions", NULL); + addTagRegex(language, "^[ \t]*((final|abstract)[ \t]+)*class[ \t]+([" ALPHA "_][" ALNUM "_]*)", + "\\3", "c,class,classes", NULL); + addTagRegex(language, "^[ \t]*((final|abstract)[ \t]+)*class[ \t]+([" ALPHA "_][" ALNUM "_]*)", + "\\3", "c,class,classes", NULL); + addTagRegex(language, "^[ \t]*interface[ \t]+([" ALPHA "_][" ALNUM "_]*)", + "\\1", "i,interface,interfaces", NULL); + addTagRegex(language, "^[ \t]*define[ \t]*\\([ \t]*['\"]?([" ALPHA "_][" ALNUM "_]*)", + "\\1", "d,define,constant definitions", NULL); addTagRegex(language, "^[ \t]*((public|protected|private|static)[ \t]+)*function[ \t]+&?[ \t]*([" ALPHA "_][" ALNUM "_]*)", "\\3", "f,function,functions", NULL); - addTagRegex(language, "(^|[ \t])(\\$|::\\$|\\$this->)([" ALPHA "_][" ALNUM "_]*)[ \t]*=", + addTagRegex(language, "^[ \t]*(\\$|::\\$|\\$this->)([" ALPHA "_][" ALNUM "_]*)[ \t]*=", + "\\2", "v,variable,variables", NULL); + addTagRegex(language, "^[ \t]*((var|public|protected|private|static)[ \t]+)+\\$([" ALPHA "_][" ALNUM "_]*)[ \t]*[=;]", "\\3", "v,variable,variables", NULL); - addTagRegex(language, "(^|[ \t])(var|public|protected|private|static)[ \t]+\\$([" ALPHA "_][" ALNUM "_]*)[ \t]*[=;]", - "\\3", "v,variable,variables", NULL); /* function regex is covered by PHP regex */ addTagRegex (language, "(^|[ \t])([A-Za-z0-9_]+)[ \t]*[=:][ \t]*function[ \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:[4211] trunk
by eht16＠users.sourceforge.net 20 Sep '09

20 Sep '09

Revision: 4211 http://geany.svn.sourceforge.net/geany/?rev=4211&view=rev Author: eht16 Date: 2009-09-20 18:46:56 +0000 (Sun, 20 Sep 2009) Log Message: ----------- Add new filetype: Abc (patch by Eric Forgeot, thanks). Modified Paths: -------------- trunk/ChangeLog trunk/data/filetype_extensions.conf trunk/src/filetypes.c trunk/src/filetypes.h trunk/src/symbols.c trunk/tagmanager/Makefile.am trunk/tagmanager/makefile.win32 trunk/tagmanager/parsers.h trunk/wscript Added Paths: ----------- trunk/data/filetypes.abc trunk/tagmanager/abc.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-09-17 18:08:21 UTC (rev 4210) +++ trunk/ChangeLog 2009-09-20 18:46:56 UTC (rev 4211) @@ -1,3 +1,12 @@ +2009-09-20 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/filetypes.c, src/filetypes.h, src/symbols.c, + tagmanager/parsers.h, tagmanager/makefile.win32, + tagmanager/abc.c, tagmanager/Makefile.am, data/filetypes.abc, + data/filetype_extensions.conf, wscript: + + + 2009-09-17 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * src/printing.c: Modified: trunk/data/filetype_extensions.conf =================================================================== --- trunk/data/filetype_extensions.conf 2009-09-17 18:08:21 UTC (rev 4210) +++ trunk/data/filetype_extensions.conf 2009-09-20 18:46:56 UTC (rev 4211) @@ -3,6 +3,7 @@ # See Geany's main documentation for details. [Extensions] ASM=*.asm; +Abc=*.abc;*.abp; Ada=*.adb;*.ads; C=*.c;*.h; C++=*.cpp;*.cxx;*.c++;*.cc;*.h;*.hpp;*.hxx;*.h++;*.hh;*.C;*.H; Added: trunk/data/filetypes.abc =================================================================== --- trunk/data/filetypes.abc (rev 0) +++ trunk/data/filetypes.abc 2009-09-20 18:46:56 UTC (rev 4211) @@ -0,0 +1,9 @@ +# For complete documentation of this file, please see Geany's main documentation +[styling] +# no syntax highlighting yet + +[settings] +# default extension used when saving files +extension=abc + + Property changes on: trunk/data/filetypes.abc ___________________________________________________________________ Added: keywords + Author Date Id Revision Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/src/filetypes.c =================================================================== --- trunk/src/filetypes.c 2009-09-17 18:08:21 UTC (rev 4210) +++ trunk/src/filetypes.c 2009-09-20 18:46:56 UTC (rev 4211) @@ -391,6 +391,17 @@ ft->comment_close = NULL; ft->group = GEANY_FILETYPE_GROUP_MISC; +#define ABC + ft = filetypes[GEANY_FILETYPES_ABC]; + ft->lang = 38; + ft->name = g_strdup("Abc"); + filetype_make_title(ft, TITLE_SOURCE_FILE); + ft->extension = g_strdup("abc"); + ft->pattern = utils_strv_new("*.abc", "*.abp", NULL); + ft->comment_open = NULL; + ft->comment_close = NULL; + ft->group = GEANY_FILETYPE_GROUP_MISC; + #define SH ft = filetypes[GEANY_FILETYPES_SH]; ft->lang = 16; Modified: trunk/src/filetypes.h =================================================================== --- trunk/src/filetypes.h 2009-09-17 18:08:21 UTC (rev 4210) +++ trunk/src/filetypes.h 2009-09-20 18:46:56 UTC (rev 4211) @@ -79,6 +79,7 @@ GEANY_FILETYPES_CMAKE, GEANY_FILETYPES_MARKDOWN, GEANY_FILETYPES_TXT2TAGS, + GEANY_FILETYPES_ABC, /* ^ append items here */ GEANY_MAX_BUILT_IN_FILETYPES /* Don't use this, use filetypes_array->len instead */ } Modified: trunk/src/symbols.c =================================================================== --- trunk/src/symbols.c 2009-09-17 18:08:21 UTC (rev 4210) +++ trunk/src/symbols.c 2009-09-20 18:46:56 UTC (rev 4211) @@ -696,6 +696,7 @@ } case GEANY_FILETYPES_REST: case GEANY_FILETYPES_TXT2TAGS: + case GEANY_FILETYPES_ABC: { tag_list_add_groups(tag_store, &(tv_iters.tag_namespace), _("Chapter"), NULL, Modified: trunk/tagmanager/Makefile.am =================================================================== --- trunk/tagmanager/Makefile.am 2009-09-17 18:08:21 UTC (rev 4210) +++ trunk/tagmanager/Makefile.am 2009-09-20 18:46:56 UTC (rev 4211) @@ -34,6 +34,7 @@ strlist.h\ args.c\ args.h\ + abc.c\ basic.c\ c.c\ conf.c\ Added: trunk/tagmanager/abc.c =================================================================== --- trunk/tagmanager/abc.c (rev 0) +++ trunk/tagmanager/abc.c 2009-09-20 18:46:56 UTC (rev 4211) @@ -0,0 +1,127 @@ +/* +* Copyright (c) 2009, Eric Forgeot +* +* Based on work by Jon Strait +* +* This source code is released for free distribution under the terms of the +* GNU General Public License. +* +* This module contains functions for generating tags for Abc files. +*/ + +/* +* INCLUDE FILES +*/ +#include "general.h" /* must always come first */ + +#include <ctype.h> +#include <string.h> + +#include "parse.h" +#include "read.h" +#include "vstring.h" + +/* +* DATA DEFINITIONS +*/ + +static kindOption AbcKinds[] = { + { TRUE, 'm', "member", "sections" }, + { TRUE, 's', "struct", "header1"} +}; + +/* +* FUNCTION DEFINITIONS +*/ + +/* checks if str is all the same character */ +/*static boolean issame(const char *str) +{ + char first = *str; + + while (*(++str)) + { + if (*str && *str != first) + return FALSE; + } + return TRUE; +}*/ + + +static void makeAbcTag (const vString* const name, boolean name_before) +{ + tagEntryInfo e; + initTagEntry (&e, vStringValue(name)); + + if (name_before) + e.lineNumber--; /* we want the line before the underline chars */ + e.kindName = AbcKinds[0].name; + e.kind = AbcKinds[0].letter; + + makeTagEntry(&e); +} + +/*static void makeAbcTag2 (const vString* const name, boolean name_before) +{ + tagEntryInfo e; + initTagEntry (&e, vStringValue(name)); + + if (name_before) + e.lineNumber--; + e.kindName = "struct"; + e.kind = 's'; + + makeTagEntry(&e); +}*/ + +static void findAbcTags (void) +{ + vString *name = vStringNew(); + const unsigned char *line; + + while ((line = fileReadLine()) != NULL) + { + /*int name_len = vStringLength(name);*/ + + /* underlines must be the same length or more */ + /*if (name_len > 0 && (line[0] == '=' || line[0] == '-') && issame((const char*) line)) + { + makeAbcTag(name, TRUE); + }*/ +/* if (line[1] == '%') { + vStringClear(name); + vStringCatS(name, (const char *) line); + vStringTerminate(name); + makeAbcTag(name, FALSE); + }*/ + if (line[0] == 'T') { + /*vStringClear(name);*/ + vStringCatS(name, " / "); + vStringCatS(name, (const char *) line); + vStringTerminate(name); + makeAbcTag(name, FALSE); + } + else { + vStringClear (name); + if (! isspace(*line)) + vStringCatS(name, (const char*) line); + vStringTerminate(name); + } + } + vStringDelete (name); +} + +extern parserDefinition* AbcParser (void) +{ + static const char *const patterns [] = { "*.abc", NULL }; + static const char *const extensions [] = { "abc", NULL }; + parserDefinition* const def = parserNew ("Abc"); + + def->kinds = AbcKinds; + def->kindCount = KIND_COUNT (AbcKinds); + def->patterns = patterns; + def->extensions = extensions; + def->parser = findAbcTags; + return def; +} + Property changes on: trunk/tagmanager/abc.c ___________________________________________________________________ Added: svn:mime-type + text/x-csrc Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/tagmanager/makefile.win32 =================================================================== --- trunk/tagmanager/makefile.win32 2009-09-17 18:08:21 UTC (rev 4210) +++ trunk/tagmanager/makefile.win32 2009-09-20 18:46:56 UTC (rev 4211) @@ -39,7 +39,7 @@ clean: -$(RM) deps.mak *.o $(COMPLIB) -$(COMPLIB): args.o c.o fortran.o make.o conf.o pascal.o perl.o php.o diff.o vhdl.o lua.o js.o \ +$(COMPLIB): abc.o args.o c.o fortran.o make.o conf.o pascal.o perl.o php.o diff.o vhdl.o lua.o js.o \ actionscript.o nsis.o \ haskell.o haxe.o html.o python.o lregex.o rest.o sh.o ctags.o entry.o get.o keyword.o nestlevel.o \ options.o \ Modified: trunk/tagmanager/parsers.h =================================================================== --- trunk/tagmanager/parsers.h 2009-09-17 18:08:21 UTC (rev 4210) +++ trunk/tagmanager/parsers.h 2009-09-20 18:46:56 UTC (rev 4211) @@ -52,7 +52,8 @@ ActionScriptParser, \ NsisParser, \ MarkdownParser, \ - Txt2tagsParser + Txt2tagsParser, \ + AbcParser /* langType of each parser 0 CParser @@ -93,6 +94,7 @@ 35 NsisParser 36 MarkdownParser 37 Txt2tagsParser +38 AbcParser */ #endif /* _PARSERS_H */ Modified: trunk/wscript =================================================================== --- trunk/wscript 2009-09-17 18:08:21 UTC (rev 4210) +++ trunk/wscript 2009-09-20 18:46:56 UTC (rev 4211) @@ -61,7 +61,7 @@ tagmanager_sources = [ - 'tagmanager/args.c', 'tagmanager/actionscript.c', 'tagmanager/asm.c', + 'tagmanager/args.c', 'tagmanager/abc.c', 'tagmanager/actionscript.c', 'tagmanager/asm.c', 'tagmanager/basic.c', 'tagmanager/c.c', 'tagmanager/conf.c', 'tagmanager/css.c', 'tagmanager/ctags.c', 'tagmanager/diff.c', 'tagmanager/docbook.c', 'tagmanager/entry.c', 'tagmanager/fortran.c', 'tagmanager/get.c', This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4210] trunk
by eht16＠users.sourceforge.net 17 Sep '09

17 Sep '09

Revision: 4210 http://geany.svn.sourceforge.net/geany/?rev=4210&view=rev Author: eht16 Date: 2009-09-17 18:08:21 +0000 (Thu, 17 Sep 2009) Log Message: ----------- After clearing a text field using the embedded clear icon, put the input focus into this text field. Modified Paths: -------------- trunk/ChangeLog trunk/src/ui_utils.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-09-17 18:05:36 UTC (rev 4209) +++ trunk/ChangeLog 2009-09-17 18:08:21 UTC (rev 4210) @@ -7,6 +7,9 @@ add_page_header(). * src/keyfile.c: Save an if expression. + * src/ui_utils.c: + After clearing a text field using the embedded clear icon, put the + input focus into this text field. 2009-09-17 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/src/ui_utils.c =================================================================== --- trunk/src/ui_utils.c 2009-09-17 18:05:36 UTC (rev 4209) +++ trunk/src/ui_utils.c 2009-09-17 18:08:21 UTC (rev 4210) @@ -1324,6 +1324,7 @@ if (event->button.button == 1 && icon_pos == 1) { gtk_entry_set_text(entry, ""); + gtk_widget_grab_focus(GTK_WIDGET(entry)); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4209] trunk
by eht16＠users.sourceforge.net 17 Sep '09

17 Sep '09

Revision: 4209 http://geany.svn.sourceforge.net/geany/?rev=4209&view=rev Author: eht16 Date: 2009-09-17 18:05:36 +0000 (Thu, 17 Sep 2009) Log Message: ----------- Save an if expression. Modified Paths: -------------- trunk/ChangeLog trunk/src/keyfile.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-09-17 18:04:21 UTC (rev 4208) +++ trunk/ChangeLog 2009-09-17 18:05:36 UTC (rev 4209) @@ -5,6 +5,8 @@ disabled (closes #2856822). Plug a small memory leak and improve function signature of add_page_header(). + * src/keyfile.c: + Save an if expression. 2009-09-17 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/src/keyfile.c =================================================================== --- trunk/src/keyfile.c 2009-09-17 18:04:21 UTC (rev 4208) +++ trunk/src/keyfile.c 2009-09-17 18:05:36 UTC (rev 4209) @@ -483,10 +483,7 @@ gtk_paned_get_position(GTK_PANED(ui_lookup_widget(main_widgets.window, "hpaned1")))); g_key_file_set_integer(config, PACKAGE, "msgwindow_position", gtk_paned_get_position(GTK_PANED(ui_lookup_widget(main_widgets.window, "vpaned1")))); - } - if (prefs.save_winpos) - { gtk_window_get_position(GTK_WINDOW(main_widgets.window), &ui_prefs.geometry[0], &ui_prefs.geometry[1]); gtk_window_get_size(GTK_WINDOW(main_widgets.window), &ui_prefs.geometry[2], &ui_prefs.geometry[3]); if (gdk_window_get_state(main_widgets.window->window) & GDK_WINDOW_STATE_MAXIMIZED) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4208] trunk/scripts/wafinit.sh
by eht16＠users.sourceforge.net 17 Sep '09

17 Sep '09

Revision: 4208 http://geany.svn.sourceforge.net/geany/?rev=4208&view=rev Author: eht16 Date: 2009-09-17 18:04:21 +0000 (Thu, 17 Sep 2009) Log Message: ----------- Use always the bundled Waf binary which is preferred. Modified Paths: -------------- trunk/scripts/wafinit.sh Modified: trunk/scripts/wafinit.sh =================================================================== --- trunk/scripts/wafinit.sh 2009-09-17 18:03:18 UTC (rev 4207) +++ trunk/scripts/wafinit.sh 2009-09-17 18:04:21 UTC (rev 4208) @@ -3,10 +3,7 @@ # This script creates a "configure" script and a Makefile to imitate autotools # but Waf is actually used to build -WAF="waf" -(waf --version) < /dev/null > /dev/null 2>&1 || { - WAF="./waf" -} +WAF="./waf" # Makefile cat > Makefile << EOF This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4207] trunk
by eht16＠users.sourceforge.net 17 Sep '09

17 Sep '09

Revision: 4207 http://geany.svn.sourceforge.net/geany/?rev=4207&view=rev Author: eht16 Date: 2009-09-17 18:03:18 +0000 (Thu, 17 Sep 2009) Log Message: ----------- Plug a small memory leak and improve function signature of add_page_header(). Modified Paths: -------------- trunk/ChangeLog trunk/src/printing.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-09-17 18:00:06 UTC (rev 4206) +++ trunk/ChangeLog 2009-09-17 18:03:18 UTC (rev 4207) @@ -3,6 +3,8 @@ * src/printing.c: Fix wrong alignment of printed pages when page headers are disabled (closes #2856822). + Plug a small memory leak and improve function signature of + add_page_header(). 2009-09-17 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/src/printing.c =================================================================== --- trunk/src/printing.c 2009-09-17 18:00:06 UTC (rev 4206) +++ trunk/src/printing.c 2009-09-17 18:03:18 UTC (rev 4207) @@ -270,7 +270,7 @@ } -static void add_page_header(PangoLayout *layout, cairo_t *cr, DocInfo *dinfo, gint width, gint page_nr) +static void add_page_header(DocInfo *dinfo, cairo_t *cr, gint width, gint page_nr) { gint ph_height = dinfo->line_height * 3; gchar *data; @@ -279,6 +279,7 @@ dinfo->doc->file_name : GEANY_STRING_UNTITLED; gchar *file_name = (printing_prefs.page_header_basename) ? g_path_get_basename(tmp_file_name) : g_strdup(tmp_file_name); + PangoLayout *layout = dinfo->layout; /* draw the frame */ cairo_set_line_width(cr, 0.3); @@ -526,6 +527,7 @@ gchar *text = g_strdup_printf(_("Page %d of %d"), page_nr, dinfo->n_pages); gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(main_widgets.progressbar), fraction); gtk_progress_bar_set_text(GTK_PROGRESS_BAR(main_widgets.progressbar), text); + g_free(text); } #ifdef GEANY_PRINT_DEBUG @@ -552,7 +554,7 @@ pango_layout_set_justify(dinfo->layout, FALSE); if (printing_prefs.print_page_header) - add_page_header(dinfo->layout, cr, dinfo, width, page_nr); + add_page_header(dinfo, cr, width, page_nr); count = 0; /* the actual line counter for the current page, might be different from * dinfo->cur_line due to possible line breaks */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4206] trunk
by eht16＠users.sourceforge.net 17 Sep '09

17 Sep '09

Revision: 4206 http://geany.svn.sourceforge.net/geany/?rev=4206&view=rev Author: eht16 Date: 2009-09-17 18:00:06 +0000 (Thu, 17 Sep 2009) Log Message: ----------- Fix wrong alignment of printed pages when page headers are disabled (closes #2856822). Modified Paths: -------------- trunk/ChangeLog trunk/src/printing.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-09-17 17:38:53 UTC (rev 4205) +++ trunk/ChangeLog 2009-09-17 18:00:06 UTC (rev 4206) @@ -1,3 +1,10 @@ +2009-09-17 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/printing.c: + Fix wrong alignment of printed pages when page headers are + disabled (closes #2856822). + + 2009-09-17 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * plugins/filebrowser.c: Modified: trunk/src/printing.c =================================================================== --- trunk/src/printing.c 2009-09-17 17:38:53 UTC (rev 4205) +++ trunk/src/printing.c 2009-09-17 18:00:06 UTC (rev 4206) @@ -547,6 +547,9 @@ cairo_move_to(cr, 0, 0); pango_layout_set_width(dinfo->layout, width * PANGO_SCALE); + pango_layout_set_alignment(dinfo->layout, PANGO_ALIGN_LEFT); + pango_layout_set_ellipsize(dinfo->layout, FALSE); + pango_layout_set_justify(dinfo->layout, FALSE); if (printing_prefs.print_page_header) add_page_header(dinfo->layout, cr, dinfo, width, page_nr); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4205] trunk/src/makefile.win32
by ntrel＠users.sourceforge.net 17 Sep '09

17 Sep '09

Revision: 4205 http://geany.svn.sourceforge.net/geany/?rev=4205&view=rev Author: ntrel Date: 2009-09-17 17:38:53 +0000 (Thu, 17 Sep 2009) Log Message: ----------- Remove queue.o. Modified Paths: -------------- trunk/src/makefile.win32 Modified: trunk/src/makefile.win32 =================================================================== --- trunk/src/makefile.win32 2009-09-17 17:37:13 UTC (rev 4204) +++ trunk/src/makefile.win32 2009-09-17 17:38:53 UTC (rev 4205) @@ -65,7 +65,7 @@ interface.o keybindings.o keyfile.o \ log.o main.o msgwindow.o navqueue.o notebook.o plugins.o pluginutils.o \ prefs.o printing.o project.o \ - queue.o sciwrappers.o search.o socket.o stash.o \ + sciwrappers.o search.o socket.o stash.o \ symbols.o templates.o toolbar.o tools.o treeviews.o \ ui_utils.o utils.o win32.o This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
14
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits September 2009