Commits October 2014

commits@lists.geany.org

1 participants
67 discussions

[geany/geany] 3e089e: Reading the config directory from the Windows API instead of GLib
by Enrico Tröger 05 Oct '14

05 Oct '14

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sun, 05 Oct 2014 10:55:33 UTC Commit: 3e089e4c2c914a4b8885daa65e784a227bd2d6b0 https://github.com/geany/geany/commit/3e089e4c2c914a4b8885daa65e784a227bd2d… Log Message: ----------- Reading the config directory from the Windows API instead of GLib Before we used g_get_user_config_dir() but GLib changed the returned location in newer versions, so use the Windows API directly to get the old location, at least for now. Also add utils_get_user_config_dir() wrapper. Code is based almost completely on a patch from Matthew. Modified Paths: -------------- src/main.c src/utils.c src/utils.h src/win32.c src/win32.h Modified: src/main.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -608,7 +608,7 @@ static void parse_command_line_options(gint *argc, gchar ***argv) } else { - app->configdir = g_build_filename(g_get_user_config_dir(), "geany", NULL); + app->configdir = utils_get_user_config_dir(); } if (generate_tags) Modified: src/utils.c 10 lines changed, 10 insertions(+), 0 deletions(-) =================================================================== @@ -2078,3 +2078,13 @@ gchar *utils_parse_and_format_build_date(const gchar *input) return g_strdup(input); } + + +gchar *utils_get_user_config_dir(void) +{ +#ifdef G_OS_WIN32 + return win32_get_user_config_dir(); +#else + return g_build_filename(g_get_user_data_dir(), "geany", NULL); +#endif +} Modified: src/utils.h 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -289,6 +289,8 @@ GDate *utils_parse_date(const gchar *input); gchar *utils_parse_and_format_build_date(const gchar *input); +gchar *utils_get_user_config_dir(void); + G_END_DECLS #endif /* GEANY_UTILS_H */ Modified: src/win32.c 27 lines changed, 27 insertions(+), 0 deletions(-) =================================================================== @@ -1497,4 +1497,31 @@ gchar *win32_get_installation_dir(void) } +gchar *win32_get_user_config_dir(void) +{ + HRESULT hr; + wchar_t path[MAX_PATH]; + LPSTR w_title[512]; + + hr = SHGetFolderPathAndSubDirW(NULL, CSIDL_APPDATA | CSIDL_FLAG_CREATE, NULL, SHGFP_TYPE_CURRENT, L"geany", path); + if (SUCCEEDED(hr)) + { + // GLib always uses UTF-8 for filename encoding on Windows + int u8_size = WideCharToMultiByte(CP_UTF8, 0, path, -1, NULL, 0, NULL, NULL); + if (u8_size > 0) + { + gchar *u8_path = g_malloc0(u8_size + 1); + if (u8_path != NULL && + WideCharToMultiByte(CP_UTF8, 0, path, -1, u8_path, u8_size, NULL, NULL)) + { + return u8_path; + } + } + } + + // glib fallback + g_warning("Failed to retrieve Windows config dir, falling back to default"); + return g_build_filename(g_get_user_config_dir(), "geany", NULL); +} + #endif Modified: src/win32.h 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -71,6 +71,8 @@ gchar *win32_get_installation_dir(void); gchar *win32_expand_environment_variables(const gchar *str); +gchar *win32_get_user_config_dir(void); + G_END_DECLS #endif /* G_OS_WIN32 */ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 700e0b: Updated last translator
by Marcelo Camargo 04 Oct '14

04 Oct '14

1 0

[geany/geany] 5e0166: Changed wrong translation of identantion
by Marcelo Camargo 04 Oct '14

04 Oct '14

Branch: refs/heads/master Author: Marcelo Camargo <marcelocamargo(a)linuxmail.org> Committer: Marcelo Camargo <marcelocamargo(a)linuxmail.org> Date: Sat, 04 Oct 2014 02:53:03 UTC Commit: 5e01664777cc4fc3bd7237a8d60d21f2b6c69b12 https://github.com/geany/geany/commit/5e01664777cc4fc3bd7237a8d60d21f2b6c69… Log Message: ----------- Changed wrong translation of identantion In portuguese, there is no "endentação", but "indentação". Modified Paths: -------------- po/pt_BR.po Modified: po/pt_BR.po 32 lines changed, 16 insertions(+), 16 deletions(-) =================================================================== @@ -715,11 +715,11 @@ msgstr "Largura:" #: ../data/geany.glade.h:143 msgid "The width in chars of a single indent" -msgstr "Largura em caracteres de uma única endentação" +msgstr "Largura em caracteres de uma única indentação" #: ../data/geany.glade.h:144 msgid "Auto-indent mode:" -msgstr "Modo de endentação automática:" +msgstr "Modo de indentação automática:" #: ../data/geany.glade.h:145 msgid "Detect type from file" @@ -730,7 +730,7 @@ msgid "" "Whether to detect the indentation type from file contents when a file is " "opened" msgstr "" -"Detectar ou não o tipo de endentação a partir do conteúdo de um arquivo " +"Detectar ou não o tipo de indentação a partir do conteúdo de um arquivo " "quando ele for aberto" #: ../data/geany.glade.h:147 @@ -741,7 +741,7 @@ msgstr "T_abs e espaços" msgid "" "Use spaces if the total indent is less than the tab width, otherwise use both" msgstr "" -"Usar espaços se a endentação total for menor do que a largura da tabulação, " +"Usar espaços se a indentação total for menor do que a largura da tabulação, " "senão usa ambos" #: ../data/geany.glade.h:149 @@ -750,7 +750,7 @@ msgstr "E_spaços" #: ../data/geany.glade.h:150 msgid "Use spaces when inserting indentation" -msgstr "Usar espaços quando inserir endentação" +msgstr "Usar espaços quando inserir indentação" #: ../data/geany.glade.h:151 msgid "_Tabs" @@ -758,7 +758,7 @@ msgstr "_Tabs" #: ../data/geany.glade.h:152 msgid "Use one tab per indent" -msgstr "Usar um tab por endentação" +msgstr "Usar um tab por indentação" #: ../data/geany.glade.h:153 msgid "Detect width from file" @@ -784,7 +784,7 @@ msgstr "Endentações da tecla Tab" msgid "" "Pressing tab/shift-tab indents/unindents instead of inserting a tab character" msgstr "" -"Pressionar tab/shift-tab insere/remove endentação em vez de inserir um " +"Pressionar tab/shift-tab insere/remove indentação em vez de inserir um " "caracter de tabulação" #: ../data/geany.glade.h:158 @@ -958,7 +958,7 @@ msgstr "Exibir guias de indentação" #: ../data/geany.glade.h:194 msgid "Shows small dotted lines to help you to use the right indentation" msgstr "" -"Exibir pequenas linhas pontilhadas para ajudar no uso da endentação correta" +"Exibir pequenas linhas pontilhadas para ajudar no uso da indentação correta" #: ../data/geany.glade.h:195 msgid "Show white space" @@ -2160,11 +2160,11 @@ msgstr "_Fechar" #: ../data/geany.glade.h:463 msgid "Apply the default indentation settings to all documents" -msgstr "Aplicar configuração de endentação padrão a todos os documentos" +msgstr "Aplicar configuração de indentação padrão a todos os documentos" #: ../data/geany.glade.h:464 msgid "_Apply Default Indentation" -msgstr "_Aplicar endentação padrão" +msgstr "_Aplicar indentação padrão" #. build the code #: ../data/geany.glade.h:465 ../src/build.c:2566 ../src/build.c:2843 @@ -2862,12 +2862,12 @@ msgstr "Tabs e Espaços" #: ../src/document.c:1057 #, c-format msgid "Setting %s indentation mode for %s." -msgstr "Definindo %s modo de endentação para %s." +msgstr "Definindo %s modo de indentação para %s." #: ../src/document.c:1068 #, c-format msgid "Setting indentation width to %d for %s." -msgstr "Definindo largura de endentação para %d para %s." +msgstr "Definindo largura de indentação para %d para %s." #: ../src/document.c:1222 #, c-format @@ -3470,11 +3470,11 @@ msgstr "Diminuir indentação" #: ../src/keybindings.c:389 msgid "Increase indent by one space" -msgstr "Aumentar endentação em um espaço" +msgstr "Aumentar indentação em um espaço" #: ../src/keybindings.c:391 msgid "Decrease indent by one space" -msgstr "Diminuir endentação em um espaço" +msgstr "Diminuir indentação em um espaço" #: ../src/keybindings.c:395 msgid "Send to Custom Command 1" @@ -4975,11 +4975,11 @@ msgstr "Diminui o zoom do texto" #: ../src/toolbar.c:73 msgid "Decrease indentation" -msgstr "Diminuir endentação" +msgstr "Diminuir indentação" #: ../src/toolbar.c:74 msgid "Increase indentation" -msgstr "Aumentar endentação" +msgstr "Aumentar indentação" #: ../src/toolbar.c:75 ../src/toolbar.c:380 msgid "Find the entered text in the current file" -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 7a8c09: Reformat g_signal_connect calls
by Nick Treleaven 03 Oct '14

03 Oct '14

1 0

[geany/geany] e566aa: Add project prefs for line breaking column & multiline comments
by Nick Treleaven 03 Oct '14

03 Oct '14

Branch: refs/heads/master Author: Nick Treleaven <nick.treleaven(a)btinternet.com> Committer: Nick Treleaven <nick.treleaven(a)btinternet.com> Date: Fri, 03 Oct 2014 11:25:05 UTC Commit: e566aae6b2218eb1d3689340c3d9eebc0b96cbf4 https://github.com/geany/geany/commit/e566aae6b2218eb1d3689340c3d9eebc0b96c… Log Message: ----------- Add project prefs for line breaking column & multiline comments Modified Paths: -------------- data/geany.glade src/editor.c src/editor.h src/project.c src/projectprivate.h Modified: data/geany.glade 152 lines changed, 135 insertions(+), 17 deletions(-) =================================================================== @@ -8884,6 +8884,140 @@ <property name="border_width">5</property> <property name="spacing">10</property> <child> + <object class="GtkFrame" id="frame11p"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> + <child> + <object class="GtkAlignment" id="alignment8p"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="left_padding">12</property> + <child> + <object class="GtkVBox" id="vbox56p"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkCheckButton" id="check_line_wrapping1"> + <property name="label" translatable="yes">Line wrapping</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">Wrap the line at the window border and continue it on the next line. Note: line wrapping has a high performance cost for large documents so should be disabled on slow machines.</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkHBox" id="hbox11p"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">12</property> + <child> + <object class="GtkLabel" id="label209p"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Line breaking column:</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="spin_line_break1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="primary_icon_activatable">False</property> + <property name="secondary_icon_activatable">False</property> + <property name="primary_icon_sensitive">True</property> + <property name="secondary_icon_sensitive">True</property> + <property name="adjustment">adjustment1</property> + <property name="climb_rate">1</property> + <property name="numeric">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <placeholder/> + </child> + </object> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="label8p"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes"><b>Features</b></property> + <property name="use_markup">True</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkFrame" id="frame3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> + <child> + <object class="GtkAlignment" id="alignment4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="left_padding">12</property> + <child> + <object class="GtkCheckButton" id="check_auto_multiline1"> + <property name="label" translatable="yes">Automatic continuation of multi-line comments</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">Continue automatically multi-line comments in languages like C, C++ and Java when a new line is entered inside such a comment</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + </object> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="label23"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes"><b>Completions</b></property> + <property name="use_markup">True</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> <object class="GtkFrame" id="frame40_project"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -9026,23 +9160,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="check_line_wrapping1"> - <property name="label" translatable="yes">Line wrapping</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">Wrap the line at the window border and continue it on the next line. Note: line wrapping has a high performance cost for large documents so should be disabled on slow machines.</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> + <property name="position">2</property> </packing> </child> </object> Modified: src/editor.c 19 lines changed, 9 insertions(+), 10 deletions(-) =================================================================== @@ -404,11 +404,8 @@ static gint editor_get_long_line_column(void) } -static gboolean editor_get_line_wrapping(void) -{ - return app->project ? app->project->priv->line_wrapping : editor_prefs.line_wrapping; -} - +#define get_project_pref(id)\ + (app->project ? app->project->priv->id : editor_prefs.id) static const GeanyEditorPrefs * get_default_prefs(void) @@ -421,7 +418,9 @@ get_default_prefs(void) eprefs.indentation = (GeanyIndentPrefs*)editor_get_indent_prefs(NULL); eprefs.long_line_type = editor_get_long_line_type(); eprefs.long_line_column = editor_get_long_line_column(); - eprefs.line_wrapping = editor_get_line_wrapping(); + eprefs.line_wrapping = get_project_pref(line_wrapping); + eprefs.line_break_column = get_project_pref(line_break_column); + eprefs.auto_continue_multiline = get_project_pref(auto_continue_multiline); return &eprefs; } @@ -560,11 +559,11 @@ static void check_line_breaking(GeanyEditor *editor, gint pos) lstart = sci_get_position_from_line(sci, line); /* use column instead of position which might be different with multibyte characters */ - if (col < editor_prefs.line_break_column) + if (col < get_project_pref(line_break_column)) return; /* look for the last space before line_break_column */ - pos = MIN(pos, lstart + editor_prefs.line_break_column); + pos = MIN(pos, lstart + get_project_pref(line_break_column)); while (pos > lstart) { @@ -1241,7 +1240,7 @@ static void on_new_line_added(GeanyEditor *editor) insert_indent_after_line(editor, line - 1); } - if (editor_prefs.auto_continue_multiline) + if (get_project_pref(auto_continue_multiline)) { /* " * " auto completion in multiline C/C++/D/Java comments */ auto_multiline(editor, line); } @@ -4850,7 +4849,7 @@ GeanyEditor *editor_create(GeanyDocument *doc) doc->editor = editor; /* needed in case some editor functions/callbacks expect it */ editor->auto_indent = (iprefs->auto_indent_mode != GEANY_AUTOINDENT_NONE); - editor->line_wrapping = editor_get_line_wrapping(); + editor->line_wrapping = get_project_pref(line_wrapping); editor->scroll_percent = -1.0F; editor->line_breaking = FALSE; Modified: src/editor.h 7 lines changed, 2 insertions(+), 5 deletions(-) =================================================================== @@ -112,17 +112,15 @@ GeanyIndentPrefs; /** Default prefs when creating a new editor window. * Some of these can be overridden per document or per project. */ -/* See editor_get_prefs(). */ +/* @warning Use @c editor_get_prefs() instead to include project overrides. */ typedef struct GeanyEditorPrefs { GeanyIndentPrefs *indentation; /* Default indentation prefs. Use editor_get_indent_prefs(). */ gboolean show_white_space; gboolean show_indent_guide; gboolean show_line_endings; - /* 0 - line, 1 - background, 2 - disabled. - * This setting may be overridden when a project is opened. Use @c editor_get_prefs(). */ + /* 0 - line, 1 - background, 2 - disabled. */ gint long_line_type; - /* This setting may be overridden when a project is opened. Use @c editor_get_prefs(). */ gint long_line_column; gchar *long_line_color; gboolean show_markers_margin; /* view menu */ @@ -154,7 +152,6 @@ typedef struct GeanyEditorPrefs gboolean completion_drops_rest_of_word; gchar *color_scheme; gint show_virtual_space; - /* This setting may be overridden when a project is opened. Use @c editor_get_prefs(). */ gboolean long_line_enabled; gint autocompletion_update_freq; } Modified: src/project.c 5 lines changed, 5 insertions(+), 0 deletions(-) =================================================================== @@ -1302,6 +1302,11 @@ static void init_stash_prefs(void) group = stash_group_new("editor"); stash_group_add_toggle_button(group, &priv.line_wrapping, "line_wrapping", editor_prefs.line_wrapping, "check_line_wrapping1"); + stash_group_add_spin_button_integer(group, &priv.line_break_column, + "line_break_column", editor_prefs.line_break_column, "spin_line_break1"); + stash_group_add_toggle_button(group, &priv.auto_continue_multiline, + "auto_continue_multiline", editor_prefs.auto_continue_multiline, + "check_auto_multiline1"); add_stash_group(group, TRUE); } Modified: src/projectprivate.h 14 lines changed, 10 insertions(+), 4 deletions(-) =================================================================== @@ -31,15 +31,21 @@ G_BEGIN_DECLS typedef struct GeanyProjectPrivate { - struct GeanyIndentPrefs *indentation; + // file prefs gboolean final_new_line; gboolean strip_trailing_spaces; gboolean replace_tabs; gboolean ensure_convert_new_lines; + + // editor prefs + struct GeanyIndentPrefs *indentation; + gboolean line_wrapping; + gint line_break_column; + gboolean auto_continue_multiline; + gint long_line_behaviour; /* 0 - disabled, 1 - follow global settings, 2 - enabled (custom) */ + gint long_line_column; /* Long line marker position. */ + GPtrArray *build_filetypes_list; /* Project has custom filetype builds for these. */ - gint long_line_behaviour; /* 0 - disabled, 1 - follow global settings, 2 - enabled (custom) */ - gint long_line_column; /* Long line marker position. */ - gboolean line_wrapping; } GeanyProjectPrivate; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] f262f5: Merge pull request #341 from philippwiesemann/fix-typo-readme
by Matthew Brush 02 Oct '14

02 Oct '14

Branch: refs/heads/master Author: Matthew Brush <mbrush(a)codebrainz.ca> Committer: Matthew Brush <mbrush(a)codebrainz.ca> Date: Thu, 02 Oct 2014 18:48:01 UTC Commit: f262f5986da5e04a1761daa2ef9212e26d68d99b https://github.com/geany/geany/commit/f262f5986da5e04a1761daa2ef9212e26d68d… Log Message: ----------- Merge pull request #341 from philippwiesemann/fix-typo-readme Fix typo in README Modified Paths: -------------- README Modified: README 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -63,7 +63,7 @@ $ geany on a console or use the applications menu from your desktop environment. There a few command line options. See the manual page of Geany or run $ geany --help -for details. Or look into the documention in the doc/ directory. +for details. Or look into the documentation in the doc/ directory. The most important option probably is -c or --config, where you can specify an alternate configuration directory. -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 6d2d2f: Fix typo in README
by Philipp Wiesemann 01 Oct '14

01 Oct '14

Branch: refs/heads/master Author: Philipp Wiesemann <philipp.wiesemann(a)arcor.de> Committer: Philipp Wiesemann <philipp.wiesemann(a)arcor.de> Date: Wed, 01 Oct 2014 21:41:01 UTC Commit: 6d2d2ffee9f128ab9dd47a76dca1474e8b70ead6 https://github.com/geany/geany/commit/6d2d2ffee9f128ab9dd47a76dca1474e8b70e… Log Message: ----------- Fix typo in README Modified Paths: -------------- README Modified: README 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -63,7 +63,7 @@ $ geany on a console or use the applications menu from your desktop environment. There a few command line options. See the manual page of Geany or run $ geany --help -for details. Or look into the documention in the doc/ directory. +for details. Or look into the documentation in the doc/ directory. The most important option probably is -c or --config, where you can specify an alternate configuration directory. -------------- 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 October 2014