Commits September 2014

commits@lists.geany.org

1 participants
47 discussions

[geany/geany] d6d836: Don't match regexes on empty strings
by Enrico Tröger 11 Sep '14

11 Sep '14

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Thu, 11 Sep 2014 17:16:24 UTC Commit: d6d836c59fc522fcbb96fab7917311c2c6613ea7 https://github.com/geany/geany/commit/d6d836c59fc522fcbb96fab7917311c2c6613… Log Message: ----------- Don't match regexes on empty strings Save As on an empty document would cause warnings like: sys:1: Warning: g_regex_match_full: assertion 'string != NULL' failed because SCI_GETRANGEPOINTER returns NULL then. On a Ubuntu 12.04 system this warning even crashed Geany at writing the log message. So, simply don't search for anything if the document is empty. Modified Paths: -------------- src/search.c Modified: src/search.c 7 lines changed, 6 insertions(+), 1 deletions(-) =================================================================== @@ -1968,10 +1968,15 @@ static gint find_regex(ScintillaObject *sci, guint pos, GRegex *regex, GeanyMatc { const gchar *text; GMatchInfo *minfo; + guint document_length; gint ret = -1; gint offset = 0; - g_return_val_if_fail(pos <= (guint)sci_get_length(sci), -1); + document_length = (guint)sci_get_length(sci); + if (document_length <= 0) + return -1; /* skip empty documents */ + + g_return_val_if_fail(pos <= document_length, -1); if (g_regex_get_compile_flags(regex) & G_REGEX_MULTILINE) { -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 7d38ff: Merge branch 'scintilla/gtk3-dead-windows'
by Colomban Wendling 10 Sep '14

10 Sep '14

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Wed, 10 Sep 2014 21:23:01 UTC Commit: 7d38ff67ecf18f9f331ed1fad849878a6089097d https://github.com/geany/geany/commit/7d38ff67ecf18f9f331ed1fad849878a60890… Log Message: ----------- Merge branch 'scintilla/gtk3-dead-windows' Backport patches applied upstream to cache auto-completion windows, hopefully avoiding dead popup windows lying around on GTK3 builds in some high stress scenarios. Modified Paths: -------------- scintilla/gtk/PlatGTK.cxx Modified: scintilla/gtk/PlatGTK.cxx 30 lines changed, 25 insertions(+), 5 deletions(-) =================================================================== @@ -1225,9 +1225,21 @@ Surface *Surface::Allocate(int) { Window::~Window() {} void Window::Destroy() { - if (wid) - gtk_widget_destroy(GTK_WIDGET(wid)); - wid = 0; + if (wid) { + if (dynamic_cast<ListBox*>(this)) { + gtk_widget_hide(GTK_WIDGET(wid)); + // clear up window content + GtkWidget *child = gtk_bin_get_child(GTK_BIN(wid)); + if (child) + gtk_widget_destroy(child); + // resize the window to the smallest possible size for it to adapt + // to future content + gtk_window_resize(GTK_WINDOW(wid), 1, 1); + } else { + gtk_widget_destroy(GTK_WIDGET(wid)); + } + wid = 0; + } } bool Window::HasFocus() { @@ -1411,6 +1423,7 @@ enum { }; class ListBoxX : public ListBox { + WindowID widCached; WindowID list; WindowID scroller; void *pixhash; @@ -1423,7 +1436,7 @@ class ListBoxX : public ListBox { CallBackAction doubleClickAction; void *doubleClickActionData; - ListBoxX() : list(0), scroller(0), pixhash(NULL), pixbuf_renderer(0), + ListBoxX() : widCached(0), list(0), scroller(0), pixhash(NULL), pixbuf_renderer(0), desiredVisibleRows(5), maxItemCharacters(0), aveCharWidth(1), doubleClickAction(NULL), doubleClickActionData(NULL) { } @@ -1432,6 +1445,10 @@ class ListBoxX : public ListBox { g_hash_table_foreach((GHashTable *) pixhash, list_image_free, NULL); g_hash_table_destroy((GHashTable *) pixhash); } + if (widCached) { + gtk_widget_destroy(GTK_WIDGET(widCached)); + wid = widCached = 0; + } } virtual void SetFont(Font &font); virtual void Create(Window &parent, int ctrlID, Point location_, int lineHeight_, bool unicodeMode_, int technology_); @@ -1524,7 +1541,10 @@ static void StyleSet(GtkWidget *w, GtkStyle*, void*) { } void ListBoxX::Create(Window &, int, Point, int, bool, int) { - wid = gtk_window_new(GTK_WINDOW_POPUP); + if (widCached == 0) + widCached = gtk_window_new(GTK_WINDOW_POPUP); + + wid = widCached; GtkWidget *frame = gtk_frame_new(NULL); gtk_widget_show(frame); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] e6f854: GTK: cache the completion popup window
by Colomban Wendling 08 Sep '14

08 Sep '14

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Mon, 08 Sep 2014 13:35:28 UTC Commit: e6f8547e3e0d9ad42e7abdd360e4f3b2aac7b534 https://github.com/geany/geany/commit/e6f8547e3e0d9ad42e7abdd360e4f3b2aac7b… Log Message: ----------- GTK: cache the completion popup window This avoids creating and destroying windows quickly under stress, which may lead to XID collisions. See e.g. https://bugzilla.gnome.org/show_bug.cgi?id=581526 and https://bugzilla.gnome.org/show_bug.cgi?id=590690 Closes [scintilla:bugs:1649]. Modified Paths: -------------- scintilla/gtk/PlatGTK.cxx Modified: scintilla/gtk/PlatGTK.cxx 25 lines changed, 22 insertions(+), 3 deletions(-) =================================================================== @@ -1225,9 +1225,19 @@ Surface *Surface::Allocate(int) { Window::~Window() {} void Window::Destroy() { - if (wid) - gtk_widget_destroy(GTK_WIDGET(wid)); - wid = 0; + if (wid) { + ListBox *listbox = dynamic_cast<ListBox*>(this); + if (listbox) { + gtk_widget_hide(GTK_WIDGET(wid)); + listbox->Clear(); + // resize the window to the smallest possible size for it to adapt + // to future content + gtk_window_resize(GTK_WINDOW(wid), 1, 1); + } else { + gtk_widget_destroy(GTK_WIDGET(wid)); + wid = 0; + } + } } bool Window::HasFocus() { @@ -1432,6 +1442,10 @@ class ListBoxX : public ListBox { g_hash_table_foreach((GHashTable *) pixhash, list_image_free, NULL); g_hash_table_destroy((GHashTable *) pixhash); } + if (wid) { + gtk_widget_destroy(GTK_WIDGET(wid)); + wid = 0; + } } virtual void SetFont(Font &font); virtual void Create(Window &parent, int ctrlID, Point location_, int lineHeight_, bool unicodeMode_, int technology_); @@ -1524,6 +1538,11 @@ static void StyleSet(GtkWidget *w, GtkStyle*, void*) { } void ListBoxX::Create(Window &, int, Point, int, bool, int) { + if (wid) { + gtk_widget_realize(PWidget(wid)); + return; + } + wid = gtk_window_new(GTK_WINDOW_POPUP); GtkWidget *frame = gtk_frame_new(NULL); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] df5b2f: GTK: fix cached completion popup window sizing
by Colomban Wendling 08 Sep '14

08 Sep '14

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Mon, 08 Sep 2014 13:35:28 UTC Commit: df5b2fd81065650259a87b8eb901343d36676e59 https://github.com/geany/geany/commit/df5b2fd81065650259a87b8eb901343d36676… Log Message: ----------- GTK: fix cached completion popup window sizing Only cache the popup window itself and not its content, as it seems the window sizing is affected whether the content was just created or not. Modified Paths: -------------- scintilla/gtk/PlatGTK.cxx Modified: scintilla/gtk/PlatGTK.cxx 27 lines changed, 14 insertions(+), 13 deletions(-) =================================================================== @@ -1226,17 +1226,19 @@ Window::~Window() {} void Window::Destroy() { if (wid) { - ListBox *listbox = dynamic_cast<ListBox*>(this); - if (listbox) { + if (dynamic_cast<ListBox*>(this)) { gtk_widget_hide(GTK_WIDGET(wid)); - listbox->Clear(); + // clear up window content + GtkWidget *child = gtk_bin_get_child(GTK_BIN(wid)); + if (child) + gtk_widget_destroy(child); // resize the window to the smallest possible size for it to adapt // to future content gtk_window_resize(GTK_WINDOW(wid), 1, 1); } else { gtk_widget_destroy(GTK_WIDGET(wid)); - wid = 0; } + wid = 0; } } @@ -1421,6 +1423,7 @@ enum { }; class ListBoxX : public ListBox { + WindowID widCached; WindowID list; WindowID scroller; void *pixhash; @@ -1433,7 +1436,7 @@ class ListBoxX : public ListBox { CallBackAction doubleClickAction; void *doubleClickActionData; - ListBoxX() : list(0), scroller(0), pixhash(NULL), pixbuf_renderer(0), + ListBoxX() : widCached(0), list(0), scroller(0), pixhash(NULL), pixbuf_renderer(0), desiredVisibleRows(5), maxItemCharacters(0), aveCharWidth(1), doubleClickAction(NULL), doubleClickActionData(NULL) { } @@ -1442,9 +1445,9 @@ class ListBoxX : public ListBox { g_hash_table_foreach((GHashTable *) pixhash, list_image_free, NULL); g_hash_table_destroy((GHashTable *) pixhash); } - if (wid) { - gtk_widget_destroy(GTK_WIDGET(wid)); - wid = 0; + if (widCached) { + gtk_widget_destroy(GTK_WIDGET(widCached)); + wid = widCached = 0; } } virtual void SetFont(Font &font); @@ -1538,12 +1541,10 @@ static void StyleSet(GtkWidget *w, GtkStyle*, void*) { } void ListBoxX::Create(Window &, int, Point, int, bool, int) { - if (wid) { - gtk_widget_realize(PWidget(wid)); - return; - } + if (widCached == 0) + widCached = gtk_window_new(GTK_WINDOW_POPUP); - wid = gtk_window_new(GTK_WINDOW_POPUP); + wid = widCached; GtkWidget *frame = gtk_frame_new(NULL); gtk_widget_show(frame); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] d6a9a4: Update of German translation
by Frank Lanitz 07 Sep '14

07 Sep '14

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Sun, 07 Sep 2014 17:13:16 UTC Commit: d6a9a44efebacf4eaf9dc4ce5f866402dd7c22ec https://github.com/geany/geany/commit/d6a9a44efebacf4eaf9dc4ce5f866402dd7c2… Log Message: ----------- Update of German translation Modified Paths: -------------- po/de.po Modified: po/de.po 2909 lines changed, 1482 insertions(+), 1427 deletions(-) =================================================================== No diff available, check online -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 22700a: Update of Swedish translation
by Frank Lanitz 07 Sep '14

07 Sep '14

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Sun, 07 Sep 2014 16:55:07 UTC Commit: 22700ab332ac459f4bd4609b0243360881095d5c https://github.com/geany/geany/commit/22700ab332ac459f4bd4609b0243360881095… Log Message: ----------- Update of Swedish translation Modified Paths: -------------- po/sv.po Modified: po/sv.po 128 lines changed, 42 insertions(+), 86 deletions(-) =================================================================== @@ -1,14 +1,14 @@ # Swedish translations for geany package. -# Copyright (C) 2007 - 2011 THE geany'S COPYRIGHT HOLDER +# Copyright (C) 2007 - 2014 THE geany'S COPYRIGHT HOLDER # This file is distributed under the same license as the geany package. # -# Tony Mattsson <superxorn(a)gmail.com>, 2007 - 2013 +# Tony Mattsson <superxorn(a)gmail.com>, 2007 - 2014 msgid "" msgstr "" "Project-Id-Version: Geany 1.24\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-03-30 20:46+0200\n" -"PO-Revision-Date: 2013-06-05 11:06+0100\n" +"PO-Revision-Date: 2014-09-06 09:28+0100\n" "Last-Translator: Tony Mattsson <superxorn(a)gmail.com>\n" "Language-Team: Swedish <geany-i18n(a)uvena.de>\n" "Language: sv\n" @@ -278,17 +278,14 @@ msgid "" msgstr "Ger automatiskt fokus till gränssnittskomponenter under muspekaren." #: ../data/geany.glade.h:53 -#, fuzzy msgid "Use Windows native dialogs" -msgstr "Använd Windows gränssnitt för att öppna / spara filer" +msgstr "Använd Windows gränssnitt" #: ../data/geany.glade.h:54 -#, fuzzy msgid "" "Defines whether to use the Windows native dialogs or whether to use the GTK " "default dialogs" -msgstr "" -"Specificerar om Windows eller GTK skall användas vid öppna / spara filer" +msgstr "Specificerar om Windows eller GTK skall användas" #: ../data/geany.glade.h:55 msgid "Miscellaneous" @@ -1656,46 +1653,39 @@ msgstr "Använd globala inställningar" #: ../data/geany.glade.h:347 msgid "Size:" -msgstr "" +msgstr "Storlek:" #: ../data/geany.glade.h:348 -#, fuzzy msgid "Location:" -msgstr "Plats:" +msgstr "Plats:" #: ../data/geany.glade.h:349 -#, fuzzy msgid "Read-only:" -msgstr ", skrivskyddad" +msgstr "Skrivskyddad:" #: ../data/geany.glade.h:350 -#, fuzzy msgid "Encoding:" msgstr "Teckenkodning:" #: ../data/geany.glade.h:351 -#, fuzzy msgid "Modified:" -msgstr "Modifierad:" +msgstr "Modifierad:" #: ../data/geany.glade.h:352 -#, fuzzy msgid "Changed:" -msgstr "Ändra" +msgstr "Ändrad:" #: ../data/geany.glade.h:353 -#, fuzzy msgid "Accessed:" -msgstr "Skapad:" +msgstr "Senaste åtkomst:" #: ../data/geany.glade.h:354 msgid "(only inside Geany)" msgstr "(endast inom Geany)" #: ../data/geany.glade.h:355 -#, fuzzy msgid "Permissions:" -msgstr "Behörighet:" +msgstr "Behörighet:" #: ../data/geany.glade.h:356 msgid "Read:" @@ -1742,18 +1732,16 @@ msgid "New (with _Template)" msgstr "Ny (med mall)" #: ../data/geany.glade.h:368 -#, fuzzy msgid "_Open..." -msgstr "Öppna" +msgstr "Öppna..." #: ../data/geany.glade.h:369 msgid "Recent _Files" msgstr "Senaste filer" #: ../data/geany.glade.h:370 -#, fuzzy msgid "Save _As..." -msgstr "Spara som" +msgstr "Spara som..." #: ../data/geany.glade.h:371 msgid "Sa_ve All" @@ -1773,9 +1761,8 @@ msgid "Page Set_up" msgstr "Sidinställningar" #: ../data/geany.glade.h:375 -#, fuzzy msgid "_Print..." -msgstr "Skriv ut" +msgstr "Skriv ut..." #: ../data/geany.glade.h:376 ../src/notebook.c:490 msgid "Close Ot_her Documents" @@ -1874,7 +1861,6 @@ msgid "P_lugin Preferences" msgstr "Inställningar för insticksmoduler" #: ../data/geany.glade.h:400 -#, fuzzy msgid "_Find..." msgstr "Sök" @@ -1887,12 +1873,10 @@ msgid "Find _Previous" msgstr "Sök föregående" #: ../data/geany.glade.h:403 ../src/symbols.c:2425 -#, fuzzy msgid "Find in F_iles..." msgstr "Sök i filer" #: ../data/geany.glade.h:404 -#, fuzzy msgid "_Replace..." msgstr "Ersätt" @@ -1913,7 +1897,6 @@ msgid "Go to Pre_vious Marker" msgstr "Gå till föregående markör" #: ../data/geany.glade.h:409 -#, fuzzy msgid "_Go to Line..." msgstr "Gå till rad" @@ -1938,14 +1921,12 @@ msgid "_View" msgstr "Visa" #: ../data/geany.glade.h:415 -#, fuzzy msgid "Change _Font..." msgstr "Byt teckensnitt" #: ../data/geany.glade.h:416 -#, fuzzy msgid "Change _Color Scheme..." -msgstr "Färger" +msgstr "Ändra färgschema" #: ../data/geany.glade.h:417 msgid "Show _Markers Margin" @@ -2096,9 +2077,8 @@ msgid "Replace Tabs with S_paces" msgstr "Ersätt tab med mellanslag" #: ../data/geany.glade.h:454 -#, fuzzy msgid "_Replace Spaces with Tabs..." -msgstr "Ersätt mellanslag med tab" +msgstr "Ersätt mellanslag med tab..." #: ../data/geany.glade.h:455 msgid "_Fold All" @@ -2121,7 +2101,6 @@ msgid "_Project" msgstr "Projekt" #: ../data/geany.glade.h:460 -#, fuzzy msgid "_New..." msgstr "Nytt" @@ -2167,9 +2146,8 @@ msgid "_Word Count" msgstr "Räkna ord" #: ../data/geany.glade.h:471 -#, fuzzy msgid "Load Ta_gs..." -msgstr "Ladda taggar" +msgstr "Ladda taggar..." #: ../data/geany.glade.h:472 msgid "_Help" @@ -2192,14 +2170,12 @@ msgid "Wi_ki" msgstr "Wiki" #: ../data/geany.glade.h:477 -#, fuzzy msgid "Report a _Bug..." -msgstr "Rapportera fel" +msgstr "Rapportera fel..." #: ../data/geany.glade.h:478 -#, fuzzy msgid "_Donate..." -msgstr "Donera" +msgstr "Donera..." #: ../data/geany.glade.h:479 ../src/sidebar.c:124 msgid "Symbols" @@ -2495,9 +2471,8 @@ msgstr "_Exekvera" #. build the code with make custom #: ../src/build.c:2618 ../src/build.c:2809 ../src/build.c:2863 -#, fuzzy msgid "Make Custom _Target..." -msgstr "Kör Make med valbara parametrar" +msgstr "Kör Make med valbara parametrar..." #. build the code with make object #: ../src/build.c:2620 ../src/build.c:2810 ../src/build.c:2871 @@ -2757,9 +2732,9 @@ msgid "unknown" msgstr "okänd" #: ../src/dialogs.c:1214 -#, fuzzy, c-format +#, c-format msgid "%s Properties" -msgstr "Egenskaper" +msgstr "%s Egenskaper" #: ../src/dialogs.c:1247 ../src/ui_utils.c:285 msgid "(with BOM)" @@ -3118,38 +3093,34 @@ msgid "%s file" msgstr "%s fil" #: ../src/filetypes.c:93 -#, fuzzy, c-format +#, c-format msgid "%s script" msgstr "%s skriptfil" #: ../src/filetypes.c:94 -#, fuzzy, c-format +#, c-format msgid "%s document" -msgstr "XML dokument" +msgstr "%s dokument" #: ../src/filetypes.c:164 -#, fuzzy msgid "Shell" -msgstr "Skal:" +msgstr "Skal" #: ../src/filetypes.c:165 msgid "Makefile" msgstr "Makefile" #: ../src/filetypes.c:169 -#, fuzzy msgid "Cascading Stylesheet" msgstr "Cascading StyleSheet" #: ../src/filetypes.c:178 -#, fuzzy msgid "Config" -msgstr "Config-fil" +msgstr "Konfiguration" #: ../src/filetypes.c:179 -#, fuzzy msgid "Gettext translation" -msgstr "Gettext översättningsfil" +msgstr "Gettext översättnings" #: ../src/filetypes.c:414 msgid "_Programming Languages" @@ -4585,12 +4556,11 @@ msgstr "Moduler" #: ../src/symbols.c:786 ../src/symbols.c:817 msgid "Traits" -msgstr "" +msgstr "Egenskaper" #: ../src/symbols.c:787 -#, fuzzy msgid "Implementations" -msgstr "Implementering:" +msgstr "Implementeringar" #: ../src/symbols.c:789 ../src/symbols.c:1033 msgid "Typedefs / Enums" @@ -4721,26 +4691,23 @@ msgstr "Medlemmar" #: ../src/symbols.c:927 ../src/symbols.c:982 msgid "Enums" -msgstr "" +msgstr "Enums" #: ../src/symbols.c:939 msgid "Properties" msgstr "Egenskaper" #: ../src/symbols.c:975 -#, fuzzy msgid "Programs" msgstr "Program" #: ../src/symbols.c:977 -#, fuzzy msgid "Functions / Subroutines" -msgstr "Funktioner / Procedurer" +msgstr "Funktioner / Subrutiner" #: ../src/symbols.c:980 -#, fuzzy msgid "Components" -msgstr "Komplettering" +msgstr "Komponenter" #: ../src/symbols.c:981 msgid "Blocks" @@ -4775,9 +4742,8 @@ msgid "Structs" msgstr "Strukturer" #: ../src/symbols.c:1043 -#, fuzzy msgid "Extern Variables" -msgstr "Variabler" +msgstr "Externa variabler" #: ../src/symbols.c:1803 #, c-format @@ -5096,7 +5062,6 @@ msgid "H_ide Sidebar" msgstr "Göm sidolist" #: ../src/sidebar.c:720 ../plugins/filebrowser.c:630 -#, fuzzy msgid "_Find in Files..." msgstr "Sök i filer" @@ -5361,19 +5326,16 @@ msgid "Create Cla_ss" msgstr "Skapa klass" #: ../plugins/classbuilder.c:1097 -#, fuzzy msgid "_C++ Class..." -msgstr "C++ klass" +msgstr "C++ klass..." #: ../plugins/classbuilder.c:1100 -#, fuzzy msgid "_GTK+ Class..." -msgstr "GTK+ klass" +msgstr "GTK+ klass..." #: ../plugins/classbuilder.c:1103 -#, fuzzy msgid "_PHP Class..." -msgstr "PHP klass" +msgstr "PHP klass..." #: ../plugins/htmlchars.c:40 msgid "HTML Characters" @@ -5451,9 +5413,8 @@ msgid "HTML (name)" msgstr "HTML (namn)" #: ../plugins/htmlchars.c:739 -#, fuzzy msgid "_Insert Special HTML Characters..." -msgstr "Infoga speciella HTML-tecken" +msgstr "Infoga speciella HTML-tecken..." #. Add menuitem for html replacement functions #: ../plugins/htmlchars.c:754 @@ -5531,15 +5492,13 @@ msgstr "Exportera" #. HTML #: ../plugins/export.c:787 -#, fuzzy msgid "As _HTML..." -msgstr "Som HTML" +msgstr "Som HTML..." #. LaTeX #: ../plugins/export.c:793 -#, fuzzy msgid "As _LaTeX..." -msgstr "Som LATEX" +msgstr "Som LATEX..." #: ../plugins/filebrowser.c:45 msgid "File Browser" @@ -5559,7 +5518,6 @@ msgid "Could not execute configured external command '%s' (%s)." msgstr "Kunde inte exekvera konfigurerat externt kommando '%s' (%s)." #: ../plugins/filebrowser.c:615 -#, fuzzy msgid "Open _Externally" msgstr "Öppna externt" @@ -5689,7 +5647,7 @@ msgstr "Spara automatiskt" #: ../plugins/saveactions.c:600 msgid "Enable save when losing _focus" -msgstr "" +msgstr "Spara när fokus förloras" #: ../plugins/saveactions.c:606 ../plugins/saveactions.c:668 #: ../plugins/saveactions.c:709 @@ -5771,12 +5729,10 @@ msgid "_Top and Bottom" msgstr "Topp och botten" #: ../plugins/splitwindow.c:429 -#, fuzzy msgid "Side by Side" msgstr "Sida vid sida" #: ../plugins/splitwindow.c:431 -#, fuzzy msgid "Top and Bottom" msgstr "Topp och botten" -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] a733bf: Merge pull request #327 from ntrel/open-file-exists
by Nick Treleaven 01 Sep '14

01 Sep '14

Branch: refs/heads/master Author: Nick Treleaven <nick.treleaven(a)btinternet.com> Committer: Nick Treleaven <nick.treleaven(a)btinternet.com> Date: Mon, 01 Sep 2014 16:01:41 UTC Commit: a733bf9b2a7e04156a60f43ed2c41b4090b63762 https://github.com/geany/geany/commit/a733bf9b2a7e04156a60f43ed2c41b4090b63… Log Message: ----------- Merge pull request #327 from ntrel/open-file-exists Allow user to edit open dialog filename when file doesn't exist Modified Paths: -------------- src/dialogs.c Modified: src/dialogs.c 23 lines changed, 18 insertions(+), 5 deletions(-) =================================================================== @@ -123,8 +123,10 @@ static void file_chooser_set_filter_idx(GtkFileChooser *chooser, guint idx) } -static void open_file_dialog_handle_response(GtkWidget *dialog, gint response) +static gboolean open_file_dialog_handle_response(GtkWidget *dialog, gint response) { + gboolean ret = TRUE; + if (response == GTK_RESPONSE_ACCEPT || response == GEANY_RESPONSE_VIEW) { GSList *filelist; @@ -150,7 +152,18 @@ static void open_file_dialog_handle_response(GtkWidget *dialog, gint response) filelist = gtk_file_chooser_get_filenames(GTK_FILE_CHOOSER(dialog)); if (filelist != NULL) { - document_open_files(filelist, ro, ft, charset); + const gchar *first = filelist->data; + + // When there's only one filename it may have been typed manually + if (!filelist->next && !g_file_test(first, G_FILE_TEST_EXISTS)) + { + dialogs_show_msgbox(GTK_MESSAGE_ERROR, _("\"%s\" was not found."), first); + ret = FALSE; + } + else + { + document_open_files(filelist, ro, ft, charset); + } g_slist_foreach(filelist, (GFunc) g_free, NULL); /* free filenames */ } g_slist_free(filelist); @@ -158,6 +171,7 @@ static void open_file_dialog_handle_response(GtkWidget *dialog, gint response) if (app->project && !EMPTY(app->project->base_path)) gtk_file_chooser_remove_shortcut_folder(GTK_FILE_CHOOSER(dialog), app->project->base_path, NULL); + return ret; } @@ -456,7 +470,6 @@ void dialogs_show_open_file(void) #endif { GtkWidget *dialog = create_open_file_dialog(); - gint response; open_file_dialog_apply_settings(dialog); @@ -467,8 +480,8 @@ void dialogs_show_open_file(void) gtk_file_chooser_add_shortcut_folder(GTK_FILE_CHOOSER(dialog), app->project->base_path, NULL); - response = gtk_dialog_run(GTK_DIALOG(dialog)); - open_file_dialog_handle_response(dialog, response); + while (!open_file_dialog_handle_response(dialog, + gtk_dialog_run(GTK_DIALOG(dialog)))); gtk_widget_destroy(dialog); } g_free(initdir); -------------- 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 September 2014