Commits July 2018

commits@lists.geany.org

1 participants
3 discussions

[geany/geany] 0c658c: Fix incorrect translation (#1905)

by Salvatore Manfredi

Branch: refs/heads/master Author: Salvatore Manfredi <salvomanfredi(a)gmail.com> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Wed, 25 Jul 2018 19:54:24 UTC Commit: 0c658c6a32fc0643eafd157e6ccfc657b9979ff9 https://github.com/geany/geany/commit/0c658c6a32fc0643eafd157e6ccfc657b9979… Log Message: ----------- Fix incorrect translation (#1905) These two strings have probably been translated with a generic online tool which lacks of contextual translation Modified Paths: -------------- po/it.po Modified: po/it.po 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -1707,7 +1707,7 @@ msgstr "Salva _tutti" #: ../data/geany.glade.h:350 ../src/document.c:1655 ../src/document.c:3630 #: ../src/sidebar.c:718 msgid "_Reload" -msgstr "_Ripristina" +msgstr "_Ricarica" #: ../data/geany.glade.h:351 msgid "R_eload As" @@ -2955,7 +2955,7 @@ msgstr "Chiusura file '%s' fallita: fclose() fallita: %s" #: ../src/document.c:2052 ../src/document.c:3631 msgid "_Overwrite" -msgstr "_Sovrascrivere" +msgstr "_Sovrascrivi" #: ../src/document.c:2054 ../src/document.c:3634 #, c-format -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

5 years, 4 months

[geany/geany-themes] 4598c9: Update the geany-themes README.md file

by Matthew Brush

Branch: refs/heads/master Author: Matthew Brush <matt(a)geany.org> Committer: Matthew Brush <matt(a)geany.org> Date: Tue, 17 Jul 2018 23:52:56 UTC Commit: 4598c9f3b06d1464e58f693a38b97e32ee73babf https://github.com/geany/geany-themes/commit/4598c9f3b06d1464e58f693a38b97e… Log Message: ----------- Update the geany-themes README.md file Remove old/obsolete information, add additional information and generally reorganize it a bit. Modified Paths: -------------- README.md Modified: README.md 114 lines changed, 55 insertions(+), 59 deletions(-) =================================================================== @@ -10,79 +10,75 @@ or ported from color schemes for other editors. These schemes are compatible with Geany 1.22 and greater. Check out the [screenshots][scrn] to get an idea for what each color scheme looks like. -If you're using an older version of Geany, see these links: - -* 0.19 or earlier is not supported -* 0.20 [geany-themes-0.20.zip][020zip] or [geany-themes-0.20.tar.bz2][020tar] -* 0.21 [geany-themes-0.21.1.zip][021zip] or [geany-themes-0.21.1.tar.bz2][021tar] - -**Note:** There are no plans to further update Geany Themes releases before -the one for Geany 1.22. If you send me an udpated and tested -`geany-themes-0.2x.x.zip` or `geany-themes-0.2x.x.tar.bz2` file (or both), -I will check them out and add them as updated download links here in the -[README.md][readme] and in the [Github downloads][ghdl]. +Installation +------------ -Unix-like Installation ----------------------- +**Note:** the following instructions will overwrite any themes with +the same filename you have already installed, so if you have customized +any of them, you will lose your customizations if you don't back them +up first. -Extract the tarball and copy all of the files in the `colorschemes` directory -to your `~/.config/geany/colorschemes/` directory. Create that directory if it -doesn't already exist. +### Unix-like Systems -Windows Installation --------------------- +Extract the zip file, tarball or checkout with Git to a local +directory. In this directory you will find a sub-directory named +`colorschemes` which contains all of the color scheme files. Copy all of +these `*.conf` files into the directory named +`~/.config/geany/colorschemes/`, where `~` means your personal home +directory. Create the `~/.config/geany/colorschemes/` directory if it +does not already exist. -Extract the tarball and copy all of the files in the `colorschemes` directory -to your `C:\Users\YourUserName\AppData\Roaming\geany\colorschemes` directory. -Create this directory if it doesn't already exist. +After copying the files you can choose a new theme by selecting +`Change Color Scheme...` from Geany's `View` menu. -**Note:** The Windows directory paths above are for Windows 7, they might be -different for other Windows versions (see the Geany manual). +### Windows -**Note:** Both of the above instructions will want to over-write your existing -colorschemes which you might have customized. Be sure to backup any files in -those directories that you do not want over-written. +Installing the themes on Windows is the same as with Unix-like systems +with the exception that the target directory will be different. With +Windows 7, the directory should be named +`C:\Users\YourUserName\AppData\Roaming\geany\colorschemes`, but the +exact path may vary depending on your Windows configuration and/or +version. Refer to [the Geany Manual][man-paths] for more information on +configuration file paths. -Docs ----- +Documentation +------------- If you want to add a theme, read the [ADDING-A-THEME.md][add-theme] file. If you are a package maintainer, consult the [MAKING-A-RELEASE.md][make-release] file. For all other cases, consult the official Geany documentation. -Known Bugs ----------- - -## Backwards-compatiblity - -These color schemes are not compatible with older version of Geany, including -its old filetypes files, which you may have customized and are found in -your per-user configuration folder. All bets are off if you mix and match -old filetypes/color schemes and the color schemes here. The best way to -handle it is to simple move your old filetypes out of the way, copy the ones -you want to customize from Geany's system data folder and hand-copy over the -non-`[styling]` groups from the old filetypes file into the new one. - -## Ubuntu Unity - -There is a conflict in Geany's code when you are using Unity's DBUS menu (that -global menu at the top of the screen). The fix for this is available in the -1.22 release of Geany. To work around the problem in older versions, you can -ensure that the environment variable `UBUNTU_MENUPROXY` is set to `0` before -running Geany. This will disable Unity from stealing Geany's main menu and -will leave it within Geany's main window. You should be able to edit your -launchers for Geany to run like this `UBUNTU_MENUPROXY=0 geany`. You can even -make a Bash alias if you wish. +Other Themes +------------ -Geany Themes was created and is maintained by Matthew Brush <matt(a)geany.org>. +You can also also sometimes find bleeding edge themes which have yet to +be fully integrated into the repository by looking at the +[Issues on Github][issues] labelled with the [`new-theme`][new-themes] label. +There may also be some unofficial themes on [the wiki][wiki-themes]. + +Be wary of old-style themes you may find in random places on the +Internet as they may only be compatible with old Geany versions before +1.22 and will likely result in grief. If the file doesn't contain a +section called `[theme_info]` it almost sure to be an incompatible +older theme. See below for more details. + +Compatibility +------------- + +These color schemes are not compatible with older version of Geany +prior to 1.22, including its old filetypes files, which you may have +customized and are found in your per-user configuration folder. All +bets are off if you mix and match old filetypes/color schemes and the +color schemes here. The best way to handle it is to simple move your +old filetypes out of the way, copy the ones you want to customize from +Geany's system data folder and hand-copy over the non-`[styling]` +groups from the old filetypes file into the new one. [geany]: http://www.geany.org -[readme]: https://github.com/codebrainz/geany-themes/blob/master/README.md -[ghdl]: https://github.com/codebrainz/geany-themes/downloads -[scrn]: https://github.com/codebrainz/geany-themes/tree/master/screenshots -[020zip]: https://github.com/downloads/codebrainz/geany-themes/geany-themes-0.20.zip -[020tar]: https://github.com/downloads/codebrainz/geany-themes/geany-themes-0.20.tar.… -[021zip]: https://github.com/downloads/codebrainz/geany-themes/geany-themes-0.21.1.zip -[021tar]: https://github.com/downloads/codebrainz/geany-themes/geany-themes-0.21.1.ta… +[scrn]: https://github.com/geany/geany-themes/tree/master/screenshots +[issues]: https://github.com/geany/geany-themes/issues?q=is%3Aopen +[new-themes]: https://github.com/geany/geany-themes/labels/new-theme +[wiki-themes]: https://wiki.geany.org/themes/start +[man-paths]: https://www.geany.org/manual/current/index.html#configuration-file-paths [add-theme]: https://github.com/geany/geany-themes/blob/master/ADDING-A-THEME.md [make-release]: https://github.com/geany/geany-themes/blob/master/MAKING-A-RELEASE.md -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

5 years, 4 months

[geany/geany] 63eaf2: keybindings: Added missing "Strip Trailing Spaces" (#1806)

by LarsGit223

Branch: refs/heads/master Author: LarsGit223 <LarsGit223(a)users.noreply.github.com> Committer: elextr <elextr(a)gmail.com> Date: Sun, 15 Jul 2018 21:53:01 UTC Commit: 63eaf257ded7120fe06b9d099a5ffc7241a3a281 https://github.com/geany/geany/commit/63eaf257ded7120fe06b9d099a5ffc7241a3a… Log Message: ----------- keybindings: Added missing "Strip Trailing Spaces" (#1806) Fixes #395. Modified Paths: -------------- src/keybindings.c src/keybindings.h src/plugindata.h Modified: src/keybindings.c 5 lines changed, 5 insertions(+), 0 deletions(-) =================================================================== @@ -666,6 +666,8 @@ static void init_default_kb(void) 0, 0, "menu_linebreak", _("Toggle Line breaking"), "line_breaking1"); add_kb(group, GEANY_KEYS_DOCUMENT_CLONE, NULL, 0, 0, "menu_clone", _("_Clone"), "clone1"); + add_kb(group, GEANY_KEYS_DOCUMENT_STRIPTRAILINGSPACES, NULL, + 0, 0, "menu_strip_trailing_spaces", _("_Strip Trailing Spaces"), "strip_trailing_spaces1"); add_kb(group, GEANY_KEYS_DOCUMENT_REPLACETABS, NULL, 0, 0, "menu_replacetabs", _("Replace tabs with space"), "menu_replace_tabs"); add_kb(group, GEANY_KEYS_DOCUMENT_REPLACESPACES, NULL, @@ -2632,6 +2634,9 @@ static gboolean cb_func_document_action(guint key_id) on_remove_markers1_activate(NULL, NULL); on_menu_remove_indicators1_activate(NULL, NULL); break; + case GEANY_KEYS_DOCUMENT_STRIPTRAILINGSPACES: + editor_strip_trailing_spaces(doc->editor, FALSE); + break; } return TRUE; } Modified: src/keybindings.h 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -274,6 +274,8 @@ enum GeanyKeyBindingID GEANY_KEYS_FORMAT_SENDTOCMD8, /**< Keybinding. */ GEANY_KEYS_FORMAT_SENDTOCMD9, /**< Keybinding. */ GEANY_KEYS_EDITOR_DELETELINETOBEGINNING, /**< Keybinding. */ + GEANY_KEYS_DOCUMENT_STRIPTRAILINGSPACES, /**< Keybinding. + * @since 1.34 (API 238) */ GEANY_KEYS_COUNT /* must not be used by plugins */ }; Modified: src/plugindata.h 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -59,7 +59,7 @@ G_BEGIN_DECLS * @warning You should not test for values below 200 as previously * @c GEANY_API_VERSION was defined as an enum value, not a macro. */ -#define GEANY_API_VERSION 237 +#define GEANY_API_VERSION 238 /* hack to have a different ABI when built with GTK3 because loading GTK2-linked plugins * with GTK3-linked Geany leads to crash */ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

5 years, 4 months

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits July 2018