Commits March 2015

commits@lists.geany.org

1 participants
71 discussions

[geany/geany] d4f707: Small update of German translation
by Frank Lanitz 31 Mar '15

31 Mar '15

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Tue, 31 Mar 2015 05:10:31 UTC Commit: d4f707bb78d0dff94bf2f64d12dd6ca393dcfbef https://github.com/geany/geany/commit/d4f707bb78d0dff94bf2f64d12dd6ca393dcf… Log Message: ----------- Small update of German translation Modified Paths: -------------- po/de.po Modified: po/de.po 110 lines changed, 61 insertions(+), 49 deletions(-) =================================================================== @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: Geany 1.24\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-03-04 19:03+0100\n" -"PO-Revision-Date: 2015-03-04 19:04+0100\n" +"POT-Creation-Date: 2015-03-31 07:09+0200\n" +"PO-Revision-Date: 2015-03-31 07:10+0200\n" "Last-Translator: Frank Lanitz <frank(a)frank.uvena.de>\n" "Language-Team: German <geany-i18n(a)uvena.de>\n" "Language: de\n" @@ -1641,7 +1641,7 @@ msgstr "" msgid "<b>Terminal</b>" msgstr "<b>Terminal</b>" -#: ../data/geany.glade.h:334 ../src/prefs.c:1619 ../src/vte.c:301 +#: ../data/geany.glade.h:334 ../src/prefs.c:1619 ../src/vte.c:298 msgid "Terminal" msgstr "Terminal" @@ -1684,7 +1684,7 @@ msgid "Sa_ve All" msgstr "A_lle speichern" #: ../data/geany.glade.h:345 ../src/document.c:1558 ../src/document.c:3489 -#: ../src/sidebar.c:710 +#: ../src/sidebar.c:711 msgid "_Reload" msgstr "Neu _laden" @@ -3196,29 +3196,29 @@ msgstr "Schlechter RegEx für Dateityp %s: %s" msgid "untitled" msgstr "unbenannt" -#: ../src/highlighting.c:1218 ../src/main.c:838 ../src/socket.c:171 +#: ../src/highlighting.c:1220 ../src/main.c:838 ../src/socket.c:171 #: ../src/templates.c:233 #, c-format msgid "Could not find file '%s'." msgstr "Konnte die Datei »%s« nicht finden." -#: ../src/highlighting.c:1288 +#: ../src/highlighting.c:1290 msgid "Default" msgstr "Standard" -#: ../src/highlighting.c:1329 +#: ../src/highlighting.c:1331 msgid "The current filetype overrides the default style." msgstr "" "Der aktuelle Dateityp überschreibt die Standardeinstellungen für die " "Darstellung." -#: ../src/highlighting.c:1330 +#: ../src/highlighting.c:1332 msgid "This may cause color schemes to display incorrectly." msgstr "" "Dies kann dazu führen, dass eventuell Farbprofile nicht korrekt angezeigt " "werden." -#: ../src/highlighting.c:1355 +#: ../src/highlighting.c:1357 msgid "Color Schemes" msgstr "Farbschemata" @@ -3263,7 +3263,7 @@ msgstr "Ansicht" msgid "Document" msgstr "Dokument" -#: ../src/keybindings.c:256 ../src/keybindings.c:608 ../src/project.c:511 +#: ../src/keybindings.c:256 ../src/keybindings.c:608 ../src/project.c:512 #: ../src/ui_utils.c:2195 msgid "Build" msgstr "Erstellen" @@ -3740,12 +3740,12 @@ msgstr "Tastenkürzel" msgid "The following keyboard shortcuts are configurable:" msgstr "Die folgenden Tastenkürzel sind frei definierbar:" -#: ../src/keyfile.c:1006 +#: ../src/keyfile.c:1010 msgid "Type here what you want, use it as a notice/scratch board" msgstr "" "Schreiben Sie hier rein, was sie möchten. Sie können es als Notizbuch nutzen." -#: ../src/keyfile.c:1233 +#: ../src/keyfile.c:1237 msgid "Failed to load one or more session files." msgstr "" "Eine oder mehrere Datei(en) aus der letzten Sitzung konnte(n) nicht geladen " @@ -4003,11 +4003,11 @@ msgstr "Tasten festlegen" msgid "Press the combination of the keys you want to use for \"%s\"." msgstr "Welche Tastenkombination soll für »%s« genutzt werden?" -#: ../src/prefs.c:225 ../src/symbols.c:2298 ../src/sidebar.c:744 +#: ../src/prefs.c:225 ../src/symbols.c:2298 ../src/sidebar.c:745 msgid "_Expand All" msgstr "Alle a_usklappen" -#: ../src/prefs.c:230 ../src/symbols.c:2303 ../src/sidebar.c:750 +#: ../src/prefs.c:230 ../src/symbols.c:2303 ../src/sidebar.c:751 msgid "_Collapse All" msgstr "Alle _einklappen" @@ -4172,11 +4172,11 @@ msgstr "" "Der Pfad der Datei repräsentiert das Projekt und beinhaltet dessen " "Einstellungen. Gewöhnlich sollte sie die »%s« Dateiendung besitzen." -#: ../src/project.c:212 ../src/project.c:484 +#: ../src/project.c:212 ../src/project.c:485 msgid "Choose Project Base Path" msgstr "Auswahl des Projektbasisverzeichnisses" -#: ../src/project.c:251 ../src/project.c:621 ../src/project.c:1159 +#: ../src/project.c:251 ../src/project.c:622 ../src/project.c:1160 msgid "Project file could not be written" msgstr "Projektdatei konnte nicht geschrieben werden." @@ -4185,7 +4185,7 @@ msgstr "Projektdatei konnte nicht geschrieben werden." msgid "Project \"%s\" created." msgstr "Projekt »%s« erstellt." -#: ../src/project.c:296 ../src/project.c:328 ../src/project.c:1021 +#: ../src/project.c:296 ../src/project.c:328 ../src/project.c:1022 #, c-format msgid "Project file \"%s\" could not be loaded." msgstr "Die Projektdatei »%s« konnte nicht geladen werden." @@ -4203,67 +4203,67 @@ msgstr "Projektdateien" msgid "Project \"%s\" closed." msgstr "Projekt »%s« geschlossen." -#: ../src/project.c:624 +#: ../src/project.c:625 #, c-format msgid "Project \"%s\" saved." msgstr "Projekt »%s« gespeichert." -#: ../src/project.c:657 +#: ../src/project.c:658 msgid "Do you want to close it before proceeding?" msgstr "Möchten Sie das Projekt schließen bevor Sie fortfahren?" -#: ../src/project.c:658 +#: ../src/project.c:659 #, c-format msgid "The '%s' project is open." msgstr "Das Projekt »%s« ist geöffnet." -#: ../src/project.c:707 +#: ../src/project.c:708 msgid "The specified project name is too short." msgstr "Der eingegebene Projektname ist zu kurz." -#: ../src/project.c:713 +#: ../src/project.c:714 #, c-format msgid "The specified project name is too long (max. %d characters)." msgstr "Der eingegebene Projektname ist zu lang (max. %d Zeichen)." -#: ../src/project.c:725 +#: ../src/project.c:726 msgid "You have specified an invalid project filename." msgstr "Sie haben einen ungültigen Dateinamen angegeben." -#: ../src/project.c:748 +#: ../src/project.c:749 msgid "Create the project's base path directory?" msgstr "Soll das Projektbasisverzeichnis erstellt werden?" -#: ../src/project.c:749 +#: ../src/project.c:750 #, c-format msgid "The path \"%s\" does not exist." msgstr "Der Pfad »%s« existiert nicht." -#: ../src/project.c:758 +#: ../src/project.c:759 #, c-format msgid "Project base directory could not be created (%s)." msgstr "Projektverzeichnis konnte nicht erstellt werden (%s)." -#: ../src/project.c:771 +#: ../src/project.c:772 #, c-format msgid "Project file could not be written (%s)." msgstr "Projektdatei konnte nicht geschrieben werden (%s)." -#: ../src/project.c:777 ../src/search.c:630 +#: ../src/project.c:778 ../src/search.c:630 msgid "_Replace" msgstr "_Ersetzen" -#: ../src/project.c:779 ../plugins/export.c:332 +#: ../src/project.c:780 ../plugins/export.c:332 #, c-format msgid "The file '%s' already exists. Do you want to overwrite it?" msgstr "Die Datei »%s« existiert bereits. Soll sie überschrieben werden?" #. initialise the dialog -#: ../src/project.c:925 ../src/project.c:936 +#: ../src/project.c:926 ../src/project.c:937 msgid "Choose Project Filename" msgstr "Auswahl des Projektdateinamens" -#: ../src/project.c:1011 +#: ../src/project.c:1012 #, c-format msgid "Project \"%s\" opened." msgstr "Projekt »%s« geöffnet." @@ -5150,27 +5150,27 @@ msgstr "Wörter:" msgid "Characters:" msgstr "Buchstaben:" -#: ../src/sidebar.c:177 +#: ../src/sidebar.c:178 msgid "No tags found" msgstr "Keine Symbole gefunden" -#: ../src/sidebar.c:594 +#: ../src/sidebar.c:595 msgid "Show S_ymbol List" msgstr "S_ymbolliste anzeigen" -#: ../src/sidebar.c:606 +#: ../src/sidebar.c:607 msgid "Show _Document List" msgstr "_Dokumentenliste anzeigen" -#: ../src/sidebar.c:618 ../plugins/filebrowser.c:665 +#: ../src/sidebar.c:619 ../plugins/filebrowser.c:665 msgid "H_ide Sidebar" msgstr "Seitenleiste _verstecken" -#: ../src/sidebar.c:723 ../plugins/filebrowser.c:636 +#: ../src/sidebar.c:724 ../plugins/filebrowser.c:636 msgid "_Find in Files..." msgstr "In _Dateien suchen..." -#: ../src/sidebar.c:733 +#: ../src/sidebar.c:734 msgid "Show _Paths" msgstr "_Pfade anzeigen" @@ -5342,24 +5342,36 @@ msgstr "Klassischer Apple (CR)" msgid "Unix (LF)" msgstr "Unix (LF)" -#: ../src/vte.c:440 +#: ../src/utils.c:388 +msgid "CRLF" +msgstr "CRLF" + +#: ../src/utils.c:389 +msgid "CR" +msgstr "CR" + +#: ../src/utils.c:390 +msgid "LF" +msgstr "LF" + +#: ../src/vte.c:437 #, c-format msgid "invalid VTE library \"%s\": missing symbol \"%s\"" msgstr "Ungültige VTE-Bibliothek \"%s\": Es fehlt das Symbol \"%s\"" -#: ../src/vte.c:589 +#: ../src/vte.c:586 msgid "_Set Path From Document" msgstr "Pfad des Dokumentes _übernehmen" -#: ../src/vte.c:594 +#: ../src/vte.c:591 msgid "_Restart Terminal" msgstr "Terminal _neustarten" -#: ../src/vte.c:617 +#: ../src/vte.c:614 msgid "_Input Methods" msgstr "Eingabe_methoden" -#: ../src/vte.c:711 +#: ../src/vte.c:708 msgid "" "Could not change the directory in the VTE because it probably contains a " "command." @@ -5862,28 +5874,28 @@ msgstr "Teilt das Editorfenster in zwei Teilfenster." msgid "Show the current document" msgstr "Zeige das aktuelle Dokument" -#: ../plugins/splitwindow.c:290 ../plugins/splitwindow.c:418 -#: ../plugins/splitwindow.c:433 +#: ../plugins/splitwindow.c:290 ../plugins/splitwindow.c:423 +#: ../plugins/splitwindow.c:438 msgid "_Unsplit" msgstr "Teilung _aufheben" -#: ../plugins/splitwindow.c:400 +#: ../plugins/splitwindow.c:405 msgid "_Split Window" msgstr "Fenster _teilen" -#: ../plugins/splitwindow.c:408 +#: ../plugins/splitwindow.c:413 msgid "_Side by Side" msgstr "_Seite an Seite" -#: ../plugins/splitwindow.c:413 +#: ../plugins/splitwindow.c:418 msgid "_Top and Bottom" msgstr "_Oben und Unten" -#: ../plugins/splitwindow.c:429 +#: ../plugins/splitwindow.c:434 msgid "Side by Side" msgstr "Seite an Seite" -#: ../plugins/splitwindow.c:431 +#: ../plugins/splitwindow.c:436 msgid "Top and Bottom" msgstr "Oben und Unten" -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] ca02c5: Merge pull request #445 from bengtan/erlang-fishman-ctags
by Colomban Wendling 27 Mar '15

27 Mar '15

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Fri, 27 Mar 2015 13:44:55 UTC Commit: ca02c593e732c27c91cbf072abd798246d867d30 https://github.com/geany/geany/commit/ca02c593e732c27c91cbf072abd798246d867… Log Message: ----------- Merge pull request #445 from bengtan/erlang-fishman-ctags Implement Erlang ctags Modified Paths: -------------- src/filetypes.c tagmanager/ctags/Makefile.am tagmanager/ctags/erlang.c tagmanager/ctags/makefile.win32 tagmanager/ctags/parsers.h tagmanager/src/tm_parser.h tests/ctags/Makefile.am tests/ctags/maze.erl.tags tests/ctags/test.erl tests/ctags/test.erl.tags wscript Modified: src/filetypes.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -172,7 +172,7 @@ static void init_builtin_filetypes(void) FT_INIT( VERILOG, VERILOG, "Verilog", NULL, SOURCE_FILE, COMPILED ); FT_INIT( DIFF, DIFF, "Diff", NULL, FILE, MISC ); FT_INIT( LISP, NONE, "Lisp", NULL, SOURCE_FILE, SCRIPT ); - FT_INIT( ERLANG, NONE, "Erlang", NULL, SOURCE_FILE, COMPILED ); + FT_INIT( ERLANG, ERLANG, "Erlang", NULL, SOURCE_FILE, COMPILED ); FT_INIT( CONF, CONF, "Conf", _("Config"), FILE, MISC ); FT_INIT( PO, NONE, "Po", _("Gettext translation"), FILE, MISC ); FT_INIT( HAXE, HAXE, "Haxe", NULL, SOURCE_FILE, COMPILED ); Modified: tagmanager/ctags/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -23,6 +23,7 @@ parsers = \ css.c \ diff.c \ docbook.c \ + erlang.c \ fortran.c \ go.c \ haskell.c \ Modified: tagmanager/ctags/erlang.c 194 lines changed, 194 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,194 @@ +/* +* Copyright (c) 2003, Brent Fulgham <bfulgham(a)debian.org> +* +* 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 Erlang language +* files. Some of the parsing constructs are based on the Emacs 'etags' +* program by Francesco Potori <pot(a)gnu.org> +*/ +/* +* INCLUDE FILES +*/ +#include "general.h" /* must always come first */ + +#include <string.h> + +#include "entry.h" +#include "options.h" +#include "read.h" +// #include "routines.h" +#include "vstring.h" + +/* +* DATA DEFINITIONS +*/ +typedef enum { + K_MACRO, K_FUNCTION, K_MODULE, K_RECORD, K_TYPE +} erlangKind; + +static kindOption ErlangKinds[] = { + {TRUE, 'd', "macro", "macro definitions"}, + {TRUE, 'f', "function", "functions"}, + {TRUE, 'm', "module", "modules"}, + {TRUE, 'r', "struct", "record definitions"}, + {TRUE, 't', "typedef", "type definitions"}, +}; + +/* +* FUNCTION DEFINITIONS +*/ +/* tagEntryInfo and vString should be preinitialized/preallocated but not + * necessary. If successful you will find class name in vString + */ + +static boolean isIdentifierFirstCharacter (int c) +{ + return (boolean) (isalpha (c)); +} + +static boolean isIdentifierCharacter (int c) +{ + return (boolean) (isalnum (c) || c == '_' || c == ':'); +} + +static const unsigned char *skipSpace (const unsigned char *cp) +{ + while (isspace ((int) *cp)) + ++cp; + return cp; +} + +static const unsigned char *parseIdentifier ( + const unsigned char *cp, vString *const identifier) +{ + vStringClear (identifier); + while (isIdentifierCharacter ((int) *cp)) + { + vStringPut (identifier, (int) *cp); + ++cp; + } + vStringTerminate (identifier); + return cp; +} + +static void makeMemberTag ( + vString *const identifier, erlangKind kind, vString *const module) +{ + if (ErlangKinds [kind].enabled && vStringLength (identifier) > 0) + { + tagEntryInfo tag; + initTagEntry (&tag, vStringValue (identifier)); + tag.kindName = ErlangKinds[kind].name; + tag.kind = ErlangKinds[kind].letter; + + if (module != NULL && vStringLength (module) > 0) + { + tag.extensionFields.scope [0] = "module"; + tag.extensionFields.scope [1] = vStringValue (module); + } + makeTagEntry (&tag); + } +} + +static void parseModuleTag (const unsigned char *cp, vString *const module) +{ + vString *const identifier = vStringNew (); + parseIdentifier (cp, identifier); + makeSimpleTag (identifier, ErlangKinds, K_MODULE); + + /* All further entries go in the new module */ + vStringCopy (module, identifier); + vStringDelete (identifier); +} + +static void parseSimpleTag (const unsigned char *cp, erlangKind kind) +{ + vString *const identifier = vStringNew (); + parseIdentifier (cp, identifier); + makeSimpleTag (identifier, ErlangKinds, kind); + vStringDelete (identifier); +} + +static void parseFunctionTag (const unsigned char *cp, vString *const module) +{ + vString *const identifier = vStringNew (); + parseIdentifier (cp, identifier); + makeMemberTag (identifier, K_FUNCTION, module); + vStringDelete (identifier); +} + +/* + * Directives are of the form: + * -module(foo) + * -define(foo, bar) + * -record(graph, {vtab = notable, cyclic = true}). + * -type some_type() :: any(). + * -opaque some_opaque_type() :: any(). + */ +static void parseDirective (const unsigned char *cp, vString *const module) +{ + /* + * A directive will be either a record definition or a directive. + * Record definitions are handled separately + */ + vString *const directive = vStringNew (); + const char *const drtv = vStringValue (directive); + cp = parseIdentifier (cp, directive); + cp = skipSpace (cp); + if (*cp == '(') + ++cp; + + if (strcmp (drtv, "record") == 0) + parseSimpleTag (cp, K_RECORD); + else if (strcmp (drtv, "define") == 0) + parseSimpleTag (cp, K_MACRO); + else if (strcmp (drtv, "type") == 0) + parseSimpleTag (cp, K_TYPE); + else if (strcmp (drtv, "opaque") == 0) + parseSimpleTag (cp, K_TYPE); + else if (strcmp (drtv, "module") == 0) + parseModuleTag (cp, module); + /* Otherwise, it was an import, export, etc. */ + + vStringDelete (directive); +} + +static void findErlangTags (void) +{ + vString *const module = vStringNew (); + const unsigned char *line; + + while ((line = fileReadLine ()) != NULL) + { + const unsigned char *cp = line; + + if (*cp == '%') /* skip initial comment */ + continue; + if (*cp == '"') /* strings sometimes start in column one */ + continue; + + if ( *cp == '-') + { + ++cp; /* Move off of the '-' */ + parseDirective(cp, module); + } + else if (isIdentifierFirstCharacter ((int) *cp)) + parseFunctionTag (cp, module); + } + vStringDelete (module); +} + +extern parserDefinition *ErlangParser (void) +{ + static const char *const extensions[] = { "erl", "ERL", "hrl", "HRL", NULL }; + parserDefinition *def = parserNew ("Erlang"); + def->kinds = ErlangKinds; + def->kindCount = KIND_COUNT (ErlangKinds); + def->extensions = extensions; + def->parser = findErlangTags; + return def; +} + +/* vi:set tabstop=4 shiftwidth=4: */ Modified: tagmanager/ctags/makefile.win32 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -44,7 +44,7 @@ all: $(COMPLIB) clean: -$(RM) deps.mak *.o $(COMPLIB) -$(COMPLIB): abaqus.o abc.o args.o c.o cobol.o fortran.o make.o conf.o pascal.o perl.o php.o diff.o vhdl.o verilog.o lua.o js.o json.o \ +$(COMPLIB): abaqus.o abc.o args.o c.o cobol.o erlang.o fortran.o make.o conf.o pascal.o perl.o php.o diff.o vhdl.o verilog.o lua.o js.o json.o \ actionscript.o nsis.o objc.o \ haskell.o haxe.o html.o python.o lregex.o asciidoc.o rest.o sh.o ctags.o entry.o get.o keyword.o nestlevel.o \ options.o \ Modified: tagmanager/ctags/parsers.h 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -29,6 +29,7 @@ ConfParser, \ SqlParser, \ DocBookParser, \ + ErlangParser, \ CssParser, \ RubyParser, \ TclParser, \ Modified: tagmanager/src/tm_parser.h 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -35,6 +35,7 @@ typedef enum TM_PARSER_CONF, TM_PARSER_SQL, TM_PARSER_DOCBOOK, + TM_PARSER_ERLANG, TM_PARSER_CSS, TM_PARSER_RUBY, TM_PARSER_TCL, Modified: tests/ctags/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -270,6 +270,7 @@ test_sources = \ strings.rb \ structure.f \ tabindent.py \ + test.erl \ test.go \ test.py \ test.vhd \ Modified: tests/ctags/maze.erl.tags 15 lines changed, 10 insertions(+), 5 deletions(-) =================================================================== @@ -1,6 +1,11 @@ # format=tagmanager -Acc�16384�0�a -seed�16�()�0�using random -seed�1024�(S,M,H)�0�random -tot_print�16�(Tot)�0� -uniform�16384�0�pick pick +build�16�maze�0 +generate�16�maze�0 +pick�16�maze�0 +scramble�16�maze�0 +seed�16�maze�0 +tot_get�16�maze�0 +tot_new�16�maze�0 +tot_print�16�maze�0 +tot_print_tuple�16�maze�0 +tot_put�16�maze�0 Modified: tests/ctags/test.erl 16 lines changed, 16 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,16 @@ +-module(test). + +-export([function1/0, function1/2]). + +-type type1() :: binary(). + +-record(record1, {name :: list(), value :: list()}). + +-define(DEFINE_1, function1()). +-define(DEFINE_2(A, B), function2(A, B)). + +function1() -> + ok. + +function1(A, B) -> + A + B. Modified: tests/ctags/test.erl.tags 6 lines changed, 6 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,6 @@ +# format=tagmanager +DEFINE_1�65536�0 +DEFINE_2�65536�0 +function1�16�test�0 +record1�2048�0 +type1�4096�0 Modified: wscript 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -79,6 +79,7 @@ ctags_sources = set([ 'tagmanager/ctags/ctags.c', 'tagmanager/ctags/diff.c', 'tagmanager/ctags/docbook.c', + 'tagmanager/ctags/erlang.c', 'tagmanager/ctags/entry.c', 'tagmanager/ctags/fortran.c', 'tagmanager/ctags/get.c', -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 3e6cea: Update Erlang ctags test.
by Beng Tan 27 Mar '15

27 Mar '15

Branch: refs/heads/master Author: Beng Tan <bengtan(a)users.noreply.github.com> Committer: Beng Tan <bengtan(a)users.noreply.github.com> Date: Fri, 27 Mar 2015 03:03:17 UTC Commit: 3e6cea696a86fa54be9c9b2cc7947b9280147195 https://github.com/geany/geany/commit/3e6cea696a86fa54be9c9b2cc7947b9280147… Log Message: ----------- Update Erlang ctags test. Modified Paths: -------------- tests/ctags/test.erl.tags Modified: tests/ctags/test.erl.tags 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -2,3 +2,5 @@ DEFINE_1�65536�0 DEFINE_2�65536�0 function1�16�test�0 +record1�2048�0 +type1�4096�0 -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 36d1db: Change kind names for Erlang ctags parser
by Beng Tan 27 Mar '15

27 Mar '15

Branch: refs/heads/master Author: Beng Tan <bengtan(a)users.noreply.github.com> Committer: Beng Tan <bengtan(a)users.noreply.github.com> Date: Fri, 27 Mar 2015 02:56:25 UTC Commit: 36d1db4bc761cb666f2594dbf1a8f6380da60d43 https://github.com/geany/geany/commit/36d1db4bc761cb666f2594dbf1a8f6380da60… Log Message: ----------- Change kind names for Erlang ctags parser ... so the tags will appear in Geany. Modified Paths: -------------- tagmanager/ctags/erlang.c Modified: tagmanager/ctags/erlang.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -32,8 +32,8 @@ static kindOption ErlangKinds[] = { {TRUE, 'd', "macro", "macro definitions"}, {TRUE, 'f', "function", "functions"}, {TRUE, 'm', "module", "modules"}, - {TRUE, 'r', "record", "record definitions"}, - {TRUE, 't', "type", "type definitions"}, + {TRUE, 'r', "struct", "record definitions"}, + {TRUE, 't', "typedef", "type definitions"}, }; /* -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 1cea0b: Merge pull request #411 from techee/shadows
by Colomban Wendling 26 Mar '15

26 Mar '15

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Thu, 26 Mar 2015 21:53:29 UTC Commit: 1cea0b6a79c020bc5c44558fa9509affaee956ec https://github.com/geany/geany/commit/1cea0b6a79c020bc5c44558fa9509affaee95… Log Message: ----------- Merge pull request #411 from techee/shadows Use consistent shadows across Geany Modified Paths: -------------- data/geany.glade plugins/htmlchars.c plugins/splitwindow.c src/gb.c src/highlighting.c src/keybindings.c src/log.c src/sidebar.c src/toolbar.c src/vte.c Modified: data/geany.glade 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -8135,7 +8135,6 @@ <property name="can_focus">True</property> <property name="hscrollbar_policy">automatic</property> <property name="vscrollbar_policy">automatic</property> - <property name="shadow_type">in</property> <child> <object class="GtkTreeView" id="treeview2"> <property name="visible">True</property> @@ -8159,7 +8158,6 @@ <object class="GtkScrolledWindow" id="scrolledwindow7"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="shadow_type">in</property> <child> <object class="GtkTreeView" id="treeview6"> <property name="visible">True</property> @@ -8528,10 +8526,12 @@ <property name="can_focus">True</property> <property name="hscrollbar_policy">automatic</property> <property name="vscrollbar_policy">automatic</property> + <property name="shadow_type">in</property> <child> <object class="GtkViewport" id="viewport_project_dialog_description"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="shadow_type">none</property> <child> <object class="GtkTextView" id="textview_project_dialog_description"> <property name="visible">True</property> Modified: plugins/htmlchars.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -525,8 +525,8 @@ static void tools_show_dialog_insert_special_chars(void) swin = gtk_scrolled_window_new(NULL, NULL); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(swin), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - gtk_scrolled_window_add_with_viewport( - GTK_SCROLLED_WINDOW(swin), GTK_WIDGET(sc_tree)); + gtk_container_add(GTK_CONTAINER(swin), GTK_WIDGET(sc_tree)); + gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(swin), GTK_SHADOW_IN); gtk_box_pack_start(GTK_BOX(vbox), swin, TRUE, TRUE, 0); Modified: plugins/splitwindow.c 9 lines changed, 7 insertions(+), 2 deletions(-) =================================================================== @@ -299,7 +299,7 @@ static void split_view(gboolean horizontal) { GtkWidget *notebook = geany_data->main_widgets->notebook; GtkWidget *parent = gtk_widget_get_parent(notebook); - GtkWidget *pane, *toolbar, *box; + GtkWidget *pane, *toolbar, *box, *splitwin_notebook; GeanyDocument *doc = document_get_current(); gint width = gtk_widget_get_allocated_width(notebook) / 2; gint height = gtk_widget_get_allocated_height(notebook) / 2; @@ -321,9 +321,14 @@ static void split_view(gboolean horizontal) box = gtk_vbox_new(FALSE, 0); toolbar = create_toolbar(); gtk_box_pack_start(GTK_BOX(box), toolbar, FALSE, FALSE, 0); - gtk_container_add(GTK_CONTAINER(pane), box); edit_window.vbox = box; + /* used just to make the split window look the same as the main editor */ + splitwin_notebook = gtk_notebook_new(); + gtk_notebook_set_show_tabs(GTK_NOTEBOOK(splitwin_notebook), FALSE); + gtk_notebook_append_page(GTK_NOTEBOOK(splitwin_notebook), box, NULL); + gtk_container_add(GTK_CONTAINER(pane), splitwin_notebook); + set_editor(&edit_window, doc->editor); if (horizontal) Modified: src/gb.c 4 lines changed, 1 insertions(+), 3 deletions(-) =================================================================== @@ -169,15 +169,13 @@ static GtkWidget *create_help_dialog(GtkWindow *parent) scrolledwindow1 = gtk_scrolled_window_new(NULL, NULL); gtk_widget_show(scrolledwindow1); gtk_box_pack_start(GTK_BOX (dialog_vbox1), scrolledwindow1, TRUE, TRUE, 3); - gtk_container_set_border_width(GTK_CONTAINER(scrolledwindow1), 2); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwindow1), GTK_POLICY_NEVER, GTK_POLICY_NEVER); - gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolledwindow1), GTK_SHADOW_OUT); + gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolledwindow1), GTK_SHADOW_IN); textview1 = gtk_text_view_new(); gtk_widget_show(textview1); gtk_container_add(GTK_CONTAINER(scrolledwindow1), textview1); gtk_widget_set_size_request(textview1, 450, -1); - gtk_container_set_border_width(GTK_CONTAINER(textview1), 1); gtk_text_view_set_editable(GTK_TEXT_VIEW(textview1), FALSE); gtk_text_view_set_accepts_tab(GTK_TEXT_VIEW(textview1), FALSE); gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(textview1), GTK_WRAP_WORD); Modified: src/highlighting.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1364,7 +1364,7 @@ void highlighting_show_color_scheme_dialog(void) GEANY_DEFAULT_DIALOG_HEIGHT * 7/4, GEANY_DEFAULT_DIALOG_HEIGHT); swin = gtk_scrolled_window_new(NULL, NULL); - gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(swin), GTK_SHADOW_ETCHED_IN); + gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(swin), GTK_SHADOW_IN); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(swin), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_container_add(GTK_CONTAINER(swin), tree); Modified: src/keybindings.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -912,7 +912,7 @@ static GtkWidget *create_dialog(void) swin = gtk_scrolled_window_new(NULL, NULL); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(swin), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); - gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(swin), GTK_SHADOW_ETCHED_IN); + gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(swin), GTK_SHADOW_IN); gtk_container_add(GTK_CONTAINER(swin), tree); gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 6); Modified: src/log.c 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -202,6 +202,7 @@ void log_show_debug_messages_dialog(void) gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(textview), GTK_WRAP_WORD_CHAR); swin = gtk_scrolled_window_new(NULL, NULL); + gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(swin), GTK_SHADOW_IN); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(swin), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_container_add(GTK_CONTAINER(swin), textview); Modified: src/sidebar.c 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -174,6 +174,7 @@ static void create_default_tag_tree(void) tv.default_tag_tree = gtk_viewport_new( gtk_scrolled_window_get_hadjustment(scrolled_window), gtk_scrolled_window_get_vadjustment(scrolled_window)); + gtk_viewport_set_shadow_type(GTK_VIEWPORT(tv.default_tag_tree), GTK_SHADOW_NONE); label = gtk_label_new(_("No tags found")); gtk_misc_set_alignment(GTK_MISC(label), 0.1f, 0.01f); gtk_container_add(GTK_CONTAINER(tv.default_tag_tree), label); Modified: src/toolbar.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -978,7 +978,7 @@ static TBEditorWidget *tb_editor_create_dialog(GtkWindow *parent) swin_available = gtk_scrolled_window_new(NULL, NULL); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(swin_available), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); - gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(swin_available), GTK_SHADOW_ETCHED_IN); + gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(swin_available), GTK_SHADOW_IN); gtk_container_add(GTK_CONTAINER(swin_available), tree_available); tree_used = gtk_tree_view_new(); @@ -999,7 +999,7 @@ static TBEditorWidget *tb_editor_create_dialog(GtkWindow *parent) swin_used = gtk_scrolled_window_new(NULL, NULL); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(swin_used), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); - gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(swin_used), GTK_SHADOW_ETCHED_IN); + gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(swin_used), GTK_SHADOW_IN); gtk_container_add(GTK_CONTAINER(swin_used), tree_used); /* drag'n'drop */ Modified: src/vte.c 9 lines changed, 3 insertions(+), 6 deletions(-) =================================================================== @@ -259,7 +259,7 @@ static void on_vte_realize(void) static void create_vte(void) { - GtkWidget *vte, *scrollbar, *hbox, *frame; + GtkWidget *vte, *scrollbar, *hbox; vc->vte = vte = vf->vte_terminal_new(); scrollbar = gtk_vscrollbar_new(GTK_ADJUSTMENT(VTE_TERMINAL(vte)->adjustment)); @@ -269,10 +269,7 @@ static void create_vte(void) vc->menu = vte_create_popup_menu(); g_object_ref_sink(vc->menu); - frame = gtk_frame_new(NULL); - hbox = gtk_hbox_new(FALSE, 0); - gtk_container_add(GTK_CONTAINER(frame), hbox); gtk_box_pack_start(GTK_BOX(hbox), vte, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(hbox), scrollbar, FALSE, FALSE, 0); @@ -297,8 +294,8 @@ static void create_vte(void) vte_start(vte); - gtk_widget_show_all(frame); - gtk_notebook_insert_page(GTK_NOTEBOOK(msgwindow.notebook), frame, gtk_label_new(_("Terminal")), MSG_VTE); + gtk_widget_show_all(hbox); + gtk_notebook_insert_page(GTK_NOTEBOOK(msgwindow.notebook), hbox, gtk_label_new(_("Terminal")), MSG_VTE); g_signal_connect_after(vte, "realize", G_CALLBACK(on_vte_realize), NULL); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 1a36ee: Use consistent shadows across Geany
by Jiří Techet 22 Mar '15

22 Mar '15

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Sun, 22 Mar 2015 14:32:54 UTC Commit: 1a36eeaf4d6a5cab39d2cfd2c69a1a2f6e2bce70 https://github.com/geany/geany/commit/1a36eeaf4d6a5cab39d2cfd2c69a1a2f6e2bc… Log Message: ----------- Use consistent shadows across Geany In principle, any scrolled window should have GTK_SHADOW_IN so the scrollbars are not above the surface and there is a frame around the scrolled area. The only exception are the elements of the main window where adding GTK_SHADOW_IN causes there are too many shadows (or lines in 2D themes) around the windows and the result isn't nice. So use GTK_SHADOW_NONE for all main editor scrolled windows. (One additional exception is the Help->Credits page which is gray and the extra frame doesn't look good.) Replace frame around VTE with GtkViewport to avoid the extra line around. Raise the second editor from the splitwindow plugin so it's at the same level as the main editor. Modified Paths: -------------- data/geany.glade plugins/htmlchars.c plugins/splitwindow.c src/gb.c src/highlighting.c src/keybindings.c src/log.c src/sidebar.c src/toolbar.c src/vte.c Modified: data/geany.glade 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -8135,7 +8135,6 @@ <property name="can_focus">True</property> <property name="hscrollbar_policy">automatic</property> <property name="vscrollbar_policy">automatic</property> - <property name="shadow_type">in</property> <child> <object class="GtkTreeView" id="treeview2"> <property name="visible">True</property> @@ -8159,7 +8158,6 @@ <object class="GtkScrolledWindow" id="scrolledwindow7"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="shadow_type">in</property> <child> <object class="GtkTreeView" id="treeview6"> <property name="visible">True</property> @@ -8529,10 +8527,12 @@ <property name="can_focus">True</property> <property name="hscrollbar_policy">automatic</property> <property name="vscrollbar_policy">automatic</property> + <property name="shadow_type">in</property> <child> <object class="GtkViewport" id="viewport_project_dialog_description"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="shadow_type">none</property> <child> <object class="GtkTextView" id="textview_project_dialog_description"> <property name="visible">True</property> Modified: plugins/htmlchars.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -525,8 +525,8 @@ static void tools_show_dialog_insert_special_chars(void) swin = gtk_scrolled_window_new(NULL, NULL); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(swin), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - gtk_scrolled_window_add_with_viewport( - GTK_SCROLLED_WINDOW(swin), GTK_WIDGET(sc_tree)); + gtk_container_add(GTK_CONTAINER(swin), GTK_WIDGET(sc_tree)); + gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(swin), GTK_SHADOW_IN); gtk_box_pack_start(GTK_BOX(vbox), swin, TRUE, TRUE, 0); Modified: plugins/splitwindow.c 9 lines changed, 7 insertions(+), 2 deletions(-) =================================================================== @@ -299,7 +299,7 @@ static void split_view(gboolean horizontal) { GtkWidget *notebook = geany_data->main_widgets->notebook; GtkWidget *parent = gtk_widget_get_parent(notebook); - GtkWidget *pane, *toolbar, *box; + GtkWidget *pane, *toolbar, *box, *splitwin_notebook; GeanyDocument *doc = document_get_current(); gint width = gtk_widget_get_allocated_width(notebook) / 2; gint height = gtk_widget_get_allocated_height(notebook) / 2; @@ -321,9 +321,14 @@ static void split_view(gboolean horizontal) box = gtk_vbox_new(FALSE, 0); toolbar = create_toolbar(); gtk_box_pack_start(GTK_BOX(box), toolbar, FALSE, FALSE, 0); - gtk_container_add(GTK_CONTAINER(pane), box); edit_window.vbox = box; + /* used just to make the split window look the same as the main editor */ + splitwin_notebook = gtk_notebook_new(); + gtk_notebook_set_show_tabs(GTK_NOTEBOOK(splitwin_notebook), FALSE); + gtk_notebook_append_page(GTK_NOTEBOOK(splitwin_notebook), box, NULL); + gtk_container_add(GTK_CONTAINER(pane), splitwin_notebook); + set_editor(&edit_window, doc->editor); if (horizontal) Modified: src/gb.c 4 lines changed, 1 insertions(+), 3 deletions(-) =================================================================== @@ -169,15 +169,13 @@ static GtkWidget *create_help_dialog(GtkWindow *parent) scrolledwindow1 = gtk_scrolled_window_new(NULL, NULL); gtk_widget_show(scrolledwindow1); gtk_box_pack_start(GTK_BOX (dialog_vbox1), scrolledwindow1, TRUE, TRUE, 3); - gtk_container_set_border_width(GTK_CONTAINER(scrolledwindow1), 2); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwindow1), GTK_POLICY_NEVER, GTK_POLICY_NEVER); - gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolledwindow1), GTK_SHADOW_OUT); + gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolledwindow1), GTK_SHADOW_IN); textview1 = gtk_text_view_new(); gtk_widget_show(textview1); gtk_container_add(GTK_CONTAINER(scrolledwindow1), textview1); gtk_widget_set_size_request(textview1, 450, -1); - gtk_container_set_border_width(GTK_CONTAINER(textview1), 1); gtk_text_view_set_editable(GTK_TEXT_VIEW(textview1), FALSE); gtk_text_view_set_accepts_tab(GTK_TEXT_VIEW(textview1), FALSE); gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(textview1), GTK_WRAP_WORD); Modified: src/highlighting.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1362,7 +1362,7 @@ void highlighting_show_color_scheme_dialog(void) GEANY_DEFAULT_DIALOG_HEIGHT * 7/4, GEANY_DEFAULT_DIALOG_HEIGHT); swin = gtk_scrolled_window_new(NULL, NULL); - gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(swin), GTK_SHADOW_ETCHED_IN); + gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(swin), GTK_SHADOW_IN); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(swin), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_container_add(GTK_CONTAINER(swin), tree); Modified: src/keybindings.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -893,7 +893,7 @@ static GtkWidget *create_dialog(void) swin = gtk_scrolled_window_new(NULL, NULL); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(swin), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); - gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(swin), GTK_SHADOW_ETCHED_IN); + gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(swin), GTK_SHADOW_IN); gtk_container_add(GTK_CONTAINER(swin), tree); gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 6); Modified: src/log.c 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -202,6 +202,7 @@ void log_show_debug_messages_dialog(void) gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(textview), GTK_WRAP_WORD_CHAR); swin = gtk_scrolled_window_new(NULL, NULL); + gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(swin), GTK_SHADOW_IN); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(swin), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_container_add(GTK_CONTAINER(swin), textview); Modified: src/sidebar.c 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -173,6 +173,7 @@ static void create_default_tag_tree(void) tv.default_tag_tree = gtk_viewport_new( gtk_scrolled_window_get_hadjustment(scrolled_window), gtk_scrolled_window_get_vadjustment(scrolled_window)); + gtk_viewport_set_shadow_type(GTK_VIEWPORT(tv.default_tag_tree), GTK_SHADOW_NONE); label = gtk_label_new(_("No tags found")); gtk_misc_set_alignment(GTK_MISC(label), 0.1f, 0.01f); gtk_container_add(GTK_CONTAINER(tv.default_tag_tree), label); Modified: src/toolbar.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -978,7 +978,7 @@ static TBEditorWidget *tb_editor_create_dialog(GtkWindow *parent) swin_available = gtk_scrolled_window_new(NULL, NULL); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(swin_available), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); - gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(swin_available), GTK_SHADOW_ETCHED_IN); + gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(swin_available), GTK_SHADOW_IN); gtk_container_add(GTK_CONTAINER(swin_available), tree_available); tree_used = gtk_tree_view_new(); @@ -999,7 +999,7 @@ static TBEditorWidget *tb_editor_create_dialog(GtkWindow *parent) swin_used = gtk_scrolled_window_new(NULL, NULL); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(swin_used), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); - gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(swin_used), GTK_SHADOW_ETCHED_IN); + gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(swin_used), GTK_SHADOW_IN); gtk_container_add(GTK_CONTAINER(swin_used), tree_used); /* drag'n'drop */ Modified: src/vte.c 9 lines changed, 3 insertions(+), 6 deletions(-) =================================================================== @@ -258,7 +258,7 @@ static void on_vte_realize(void) static void create_vte(void) { - GtkWidget *vte, *scrollbar, *hbox, *frame; + GtkWidget *vte, *scrollbar, *hbox; vc->vte = vte = vf->vte_terminal_new(); scrollbar = gtk_vscrollbar_new(GTK_ADJUSTMENT(VTE_TERMINAL(vte)->adjustment)); @@ -268,10 +268,7 @@ static void create_vte(void) vc->menu = vte_create_popup_menu(); g_object_ref_sink(vc->menu); - frame = gtk_frame_new(NULL); - hbox = gtk_hbox_new(FALSE, 0); - gtk_container_add(GTK_CONTAINER(frame), hbox); gtk_box_pack_start(GTK_BOX(hbox), vte, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(hbox), scrollbar, FALSE, FALSE, 0); @@ -296,8 +293,8 @@ static void create_vte(void) vte_start(vte); - gtk_widget_show_all(frame); - gtk_notebook_insert_page(GTK_NOTEBOOK(msgwindow.notebook), frame, gtk_label_new(_("Terminal")), MSG_VTE); + gtk_widget_show_all(hbox); + gtk_notebook_insert_page(GTK_NOTEBOOK(msgwindow.notebook), hbox, gtk_label_new(_("Terminal")), MSG_VTE); g_signal_connect_after(vte, "realize", G_CALLBACK(on_vte_realize), NULL); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/talks] 09fb85: Fix two typos
by Frank Lanitz 20 Mar '15

20 Mar '15

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Fri, 20 Mar 2015 10:27:32 UTC Commit: 09fb85dccddfae0416df8a4411a677636b0a0642 https://github.com/geany/talks/commit/09fb85dccddfae0416df8a4411a677636b0a0… Log Message: ----------- Fix two typos Modified Paths: -------------- de/Effizientes Programmieren mit Geany/index.html Modified: de/Effizientes Programmieren mit Geany/index.html 6 lines changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -200,11 +200,11 @@ <li>Sparen Arbeit beim Tippen von immer gleichen Sachen</li> <li>Viele Beispiele vorhanden: <ul> <li>ChangeLog-Eintrag</li> - <li>Datein-Header</li> + <li>Datei-Header</li> <li>Funktionsbeschreibung</li> <li>Short GPL notice</li> <li>Short BSD notice</li> - <li>Datei templates</li> + <li>Datei Templates</li> </ul></li> <li>Beispiele können für den Nutzer überschrieben werden</li> </ul> @@ -235,7 +235,7 @@ <section> <h3>Snippets</h3> <ul> - <li>Wiederkehrende Textpassage können mit "Abkürzung" versehen werden</li> + <li>Wiederkehrende Textpassagen können mit "Abkürzung" versehen werden</li> <li>Generische Schnipsel sowie Dateityp-spezifische</li> <li>Konfiguration über Konfigurationsdatei</li> <li>Über Werkzeuge-Menü zu erreichen</li> -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/talks] 3b2d85: Fix some typos
by Frank Lanitz 18 Mar '15

18 Mar '15

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Wed, 18 Mar 2015 20:42:57 UTC Commit: 3b2d853ab9ec5420c3d6406fb63b04f36b58cc81 https://github.com/geany/talks/commit/3b2d853ab9ec5420c3d6406fb63b04f36b58c… Log Message: ----------- Fix some typos Modified Paths: -------------- de/Effizientes Programmieren mit Geany/index.html Modified: de/Effizientes Programmieren mit Geany/index.html 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -349,7 +349,7 @@ </ul> </section> <section> - <h3>Projekctorganizer</h3> + <h3>Project Organizer</h3> <ul> <li>Erweitert Geanys Minimalen Projektansatz</li> <li>Konfigurationsmöglichkeit für im Projekt verwendete Parameter wie @@ -389,7 +389,7 @@ </ul> </section> <section> - <h3>SpellChecker (Rechtschreibprüfung</h3> + <h3>SpellChecker (Rechtschreibprüfung)</h3> <ul> <li>Bindet Rechtschreibprüfung ein</li> <li>Unterstützt Aspell-, Myspell-, Hunspell-, ... Wörterbücher</li> -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/talks] 020df0: Adding more slides.
by Frank Lanitz 17 Mar '15

17 Mar '15

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Tue, 17 Mar 2015 21:29:01 UTC Commit: 020df0c6aacd87e9bec599f8de90dc44c3519c9a https://github.com/geany/talks/commit/020df0c6aacd87e9bec599f8de90dc44c3519… Log Message: ----------- Adding more slides. Mostly 'feature complete' Modified Paths: -------------- de/Effizientes Programmieren mit Geany/img/build_configure_commands.png de/Effizientes Programmieren mit Geany/index.html Modified: de/Effizientes Programmieren mit Geany/img/build_configure_commands.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: de/Effizientes Programmieren mit Geany/index.html 116 lines changed, 112 insertions(+), 4 deletions(-) =================================================================== @@ -150,7 +150,7 @@ <section> <h3>Symbolbrowser</h3> <ul> - <li>Listet wichtige Variablen, Funktions auf</li> + <li>Listet wichtige Variablen, Funktionen auf</li> <li>Einfache Navigation mit z.B. Maus</li> <li>Aktualisierung entweder beim Speichern ODER beim Tippen</li> </ul> @@ -177,6 +177,11 @@ <img src="img/build_menu.svg" alt="Das LaTeX-Build-Menü von Geany"> </section> <section> + <h3>Kommandos zum Erstellen konfigurieren</h3> + <img src="img/build_configure_commands.png" alt="Fenster zum Konfigurieren der Build-Kommandos" /> + <p>... oder direkt in der Dateityp-Defintions-Konfigurations-Datei</p> + </section> + <section> <h3>Erweitertes Beispiel: pylint</h3> <ul> <li>Für die Befehle können Filter hinterlegt werden</li> @@ -193,7 +198,7 @@ <h3>Templates</h3> <ul> <li>Sparen Arbeit beim Tippen von immer gleichen Sachen</li> - <li>Viele Platzhalter vorhanden: <ul> + <li>Viele Beispiele vorhanden: <ul> <li>ChangeLog-Eintrag</li> <li>Datein-Header</li> <li>Funktionsbeschreibung</li> @@ -201,6 +206,7 @@ <li>Short BSD notice</li> <li>Datei templates</li> </ul></li> + <li>Beispiele können für den Nutzer überschrieben werden</li> </ul> </section> <section> @@ -213,6 +219,14 @@ <li>GPL: <code>gpl</code></li> </ul> </section> + <section> + <h3>Datei-Templates</h3> + <ul> + <li>Für oft genutzte Standardaufgaben</li> + <li>Geany stellt eine Auswahl bereit</li> + <li>Eigene Templates ablegen unter <code>~/.config/geany/templates/files</code></li> + </ul> + </section> </section> <section> <section> @@ -259,15 +273,40 @@ <li>Im <a href="http://wiki.geany.org/tags/start">Wiki->Tags</a> Liste mit vielen verfügbaren Tag-Dateien</li> </ul> </section> + <section> + <h3>Tag-Dateien selbst erstellen</h3> + <p>Ein Beispiel für die Geany-Header:</p> + <p><code>geany -g -P geany.c.tags /usr/local/include/geany/*.h</code></p> + </section> </section> <section> <section> <h1>Externe Werkzeuge</h1> </section> + <section> + <h3>Externe Werkzeuge</h3> + <ul> + <li>Manches können externe Werkzeuge besser</li> + <li>Verschiedene Möglichkeiten <ul> + <li>Auswahl senden an ... </li> + <li>Kontextaktionen für das aktuelle Wort</li> + </ul></li> + </ul> + </section> </section> <section> <section> - <h1>Sonstige Formatierungshelferlein</h1> + <h1>Sonstige Formatierungs-helferlein</h1> + </section> + <section> + <ul> + <li>Große Zahl vorgefertigter Funktionen <ul> + <li>Automatische Einrückung bei Funktionen</li> + <li>Bearbeiten -> Format</li> + <li>Mit Tastenkürzel zu nutzen</li> + </ul></li> + <li>Rest: -> Externe Werkzeuge</li> + </ul> </section> </section> <section> @@ -279,7 +318,7 @@ <ul> <li>Viele verschiedene Plugins</li> <li>Schnittstelle in C, Python und Lua</li> - <li>Beispiele <ul> + <li>Beispiele: <ul> <li>GeanyVC</li> <li>git-changebar</li> <li>Projekctorganizer</li> @@ -289,6 +328,75 @@ </ul></li> </ul> </section> + <section> + <h3>GeanyVC</h3> + <ul> + <li>Generische Anbindung an z.B. SVN, git, hg, cvs</li> + <li>Unterstützt: <ul> + <li>blame</li> + <li>commit (kein push)</li> + <li>diff (auch mit externen Werkzeug)</li> + <li>Status</li> + <li>rm/add</li> + </ul></li> + </ul> + </section> + <section> + <h3>git-changebar</h3> + <ul> + <li>Neues Plugin (ab 1.25)</li> + <li>Markiert Zeilen, die gegenüber dem git-Stand geändert wurden</li> + </ul> + </section> + <section> + <h3>Projekctorganizer</h3> + <ul> + <li>Erweitert Geanys Minimalen Projektansatz</li> + <li>Konfigurationsmöglichkeit für im Projekt verwendete Parameter wie + <ul> + <li>Einzug</li> + <li>Zeilenumbruch</li> + </ul></li> + <li>Bietet Möglichkeit projektspezifische-Tag-Dateien zu erstellen</li> + </ul> + </section> + <section> + <h3>Addons (Erweiterungen)</h3> + <ul> + <li>Sammlung von kleinen Erweiterungen</li> + <li>Beispiele: <ul> + <li>XMLTagging</li> + <li>Anzeige von Lesezeichen in der Seitenleiste</li> + <li>Liste mit TODO und Fixme</li> + </ul></li> + </ul> + </section> + <section> + <h3>DevHelp</h3> + <ul> + <li>Bindet DevHelp in Geany ein</li> + <li>Einfacher Zugriff auf die Dokumentation</li> + <li>Integriertes Browserfenster zum "stöbern"</li> + </ul> + </section> + <section> + <h3>Webhelper</h3> + <ul> + <li>(einfacher) Webbrowser im Kontext von Geany</li> + <li>Sehr praktisch bei Entwicklung von Webanwendungen (Django, CSS)</li> + <li>Kann gegebene Seite beim Speichern einer Datei neuladen</li> + <li>Basiert auf WebKit</li> + </ul> + </section> + <section> + <h3>SpellChecker (Rechtschreibprüfung</h3> + <ul> + <li>Bindet Rechtschreibprüfung ein</li> + <li>Unterstützt Aspell-, Myspell-, Hunspell-, ... Wörterbücher</li> + <li>Kann Fehler beim Tippen markieren</li> + <li>Korrekturvorschläge im Editor-Menü</li> + </ul> + </section> </section> <section> <h1>Sonst noch Fragen?</h1> -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] f35614: Mark an argument const
by Colomban Wendling 17 Mar '15

17 Mar '15

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 17 Mar 2015 13:09:31 UTC Commit: f35614757ba56cfb53d58fa506dbad1afee17059 https://github.com/geany/geany/commit/f35614757ba56cfb53d58fa506dbad1afee17… Log Message: ----------- Mark an argument const Modified Paths: -------------- src/utils.c src/utils.h Modified: src/utils.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -2160,7 +2160,7 @@ const gchar *utils_resource_dir(GeanyResourceDirType type) } -void utils_start_new_geany_instance(gchar *doc_path) +void utils_start_new_geany_instance(const gchar *doc_path) { gchar **argv; const gchar *command = is_osx_bundle() ? "open" : "geany"; Modified: src/utils.h 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -310,7 +310,7 @@ gchar *utils_get_user_config_dir(void); const gchar *utils_resource_dir(GeanyResourceDirType type); -void utils_start_new_geany_instance(gchar *doc_path); +void utils_start_new_geany_instance(const gchar *doc_path); #endif /* GEANY_PRIVATE */ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits March 2015