Commits May 2014

commits@lists.geany.org

1 participants
71 discussions

[geany/geany] 01cf9a: Do not use backward slashes in geany.pc on Windows
by Enrico Tröger 29 May '14

29 May '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, 29 May 2014 15:47:37 UTC Commit: 01cf9a9fdc6795b971cbad59585d33bfcb796b74 https://github.com/geany/geany/commit/01cf9a9fdc6795b971cbad59585d33bfcb796… Log Message: ----------- Do not use backward slashes in geany.pc on Windows And explicitly convert backward slashes in the global prefix to forward slashes as tools like pkg-config or gcc could interpret the backward slashes as escape sequences. Modified Paths: -------------- wscript Modified: wscript 16 lines changed, 11 insertions(+), 5 deletions(-) =================================================================== @@ -457,6 +457,12 @@ def build(bld): appname = 'geany') # geany.pc + if is_win32: + # replace backward slashes by forward slashes as they could be interepreted as escape + # characters + geany_pc_prefix = bld.env['PREFIX'].replace('\\', '/') + else: + geany_pc_prefix = bld.env['PREFIX'] bld( source = 'geany.pc.in', dct = {'VERSION': VERSION, @@ -464,13 +470,13 @@ def build(bld): (bld.env['gtk_package_name'], bld.env['minimum_gtk_version'], MINIMUM_GLIB_VERSION), - 'prefix': bld.env['PREFIX'], + 'prefix': geany_pc_prefix, 'exec_prefix': '${prefix}', - 'libdir': os.path.join('${exec_prefix}', 'lib'), - 'includedir': os.path.join('${prefix}', 'include'), - 'datarootdir': os.path.join('${prefix}', 'share'), + 'libdir': '${exec_prefix}/lib', + 'includedir': '${prefix}/include', + 'datarootdir': '${prefix}/share', 'datadir': '${datarootdir}', - 'localedir': os.path.join('${datarootdir}', 'locale')}) + 'localedir': '${datarootdir/locale'}) if not is_win32: # geany.desktop -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 147167: infobars: Use wrap labels to avoid cropped infobars
by Colomban Wendling 28 May '14

28 May '14

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Wed, 28 May 2014 16:01:23 UTC Commit: 147167cfa5883107fe7592b3ea24728f53bba1a1 https://github.com/geany/geany/commit/147167cfa5883107fe7592b3ea24728f53bba… Log Message: ----------- infobars: Use wrap labels to avoid cropped infobars Since the infobar is backed in a GtkPaned that allows "shrink", if the content is too wide, it's far end will just get cropped. Also, wrap labels are nicer to display possibly long texts as it flows naturally. Modified Paths: -------------- src/document.c Modified: src/document.c 14 lines changed, 6 insertions(+), 8 deletions(-) =================================================================== @@ -38,6 +38,7 @@ #include "filetypesprivate.h" #include "geany.h" /* FIXME: why is this needed for DOC_FILENAME()? should come from documentprivate.h/document.h */ #include "geanyobject.h" +#include "geanywraplabel.h" #include "highlighting.h" #include "main.h" #include "msgwindow.h" @@ -3091,9 +3092,7 @@ static GtkWidget* document_show_message(GeanyDocument *doc, GtkMessageType msgty content_area = gtk_info_bar_get_content_area(GTK_INFO_BAR(info_widget)); - label = gtk_label_new(NULL); - gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); - + label = geany_wrap_label_new(NULL); gtk_label_set_markup(GTK_LABEL(label), markup); g_free(markup); @@ -3101,7 +3100,7 @@ static GtkWidget* document_show_message(GeanyDocument *doc, GtkMessageType msgty g_signal_connect_after(info_widget, "response", G_CALLBACK(gtk_widget_destroy), NULL); hbox = gtk_hbox_new(FALSE, 12); - gtk_container_add(GTK_CONTAINER(content_area), hbox); + gtk_box_pack_start(GTK_BOX(content_area), hbox, TRUE, TRUE, 0); switch (msgtype) { @@ -3128,14 +3127,13 @@ static GtkWidget* document_show_message(GeanyDocument *doc, GtkMessageType msgty if (extra_text) { vbox = gtk_vbox_new(FALSE, 6); - extra_label = gtk_label_new(extra_text); - gtk_misc_set_alignment(GTK_MISC(extra_label), 0.0, 0.5); + extra_label = geany_wrap_label_new(extra_text); gtk_box_pack_start(GTK_BOX(vbox), label, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox), extra_label, TRUE, TRUE, 0); - gtk_container_add(GTK_CONTAINER(hbox), vbox); + gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 0); } else - gtk_container_add(GTK_CONTAINER(hbox), label); + gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0); gtk_box_reorder_child(GTK_BOX(parent), info_widget, 0); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] d6e9e4: Fix a few missing/extra includes
by Colomban Wendling 27 May '14

27 May '14

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 27 May 2014 18:25:04 UTC Commit: d6e9e40ccc7966228aa684e8b00caa7150448378 https://github.com/geany/geany/commit/d6e9e40ccc7966228aa684e8b00caa7150448… Log Message: ----------- Fix a few missing/extra includes Modified Paths: -------------- src/ui_utils.c src/ui_utils.h src/utils.h Modified: src/ui_utils.c 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -54,6 +54,7 @@ #include <string.h> #include <ctype.h> +#include <stdarg.h> #include <gdk/gdkkeysyms.h> Modified: src/ui_utils.h 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -24,7 +24,6 @@ #include "document.h" -#include <stdarg.h> #include "gtkcompat.h" G_BEGIN_DECLS Modified: src/utils.h 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -27,9 +27,11 @@ #ifndef GEANY_UTILS_H #define GEANY_UTILS_H 1 +#include <string.h> +#include <time.h> + #include <glib.h> #include <gdk/gdk.h> /* for GdkColor */ -#include <time.h> G_BEGIN_DECLS -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 7a4b52: Avoid code duplication in document_get_current()
by Colomban Wendling 27 May '14

27 May '14

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 27 May 2014 16:00:56 UTC Commit: 7a4b5246611193cece08161c965c9a81b1e6b04d https://github.com/geany/geany/commit/7a4b5246611193cece08161c965c9a81b1e6b… Log Message: ----------- Avoid code duplication in document_get_current() Modified Paths: -------------- src/document.c Modified: src/document.c 16 lines changed, 2 insertions(+), 14 deletions(-) =================================================================== @@ -304,24 +304,12 @@ GeanyDocument *document_get_from_page(guint page_num) **/ GeanyDocument *document_get_current(void) { - gint cur_page; - GtkWidget *parent; - ScintillaObject *sci; - - cur_page = gtk_notebook_get_current_page(GTK_NOTEBOOK(main_widgets.notebook)); + gint cur_page = gtk_notebook_get_current_page(GTK_NOTEBOOK(main_widgets.notebook)); if (cur_page == -1) return NULL; else - { - parent = gtk_notebook_get_nth_page(GTK_NOTEBOOK(main_widgets.notebook), cur_page); - g_return_val_if_fail(GTK_IS_BOX(parent), NULL); - - sci = locate_sci_in_container(parent); - g_return_val_if_fail(IS_SCINTILLA(sci), NULL); - - return document_find_by_sci(sci); - } + return document_get_from_page((guint) cur_page); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 46f01b: Properly mirror document_get_from_page() in document_get_notebook_page()
by Colomban Wendling 27 May '14

27 May '14

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 27 May 2014 15:55:00 UTC Commit: 46f01bff59073905a01c799219fd0118c041f9c7 https://github.com/geany/geany/commit/46f01bff59073905a01c799219fd0118c041f… Log Message: ----------- Properly mirror document_get_from_page() in document_get_notebook_page() Now document_get_from_page() supports arbitrary nesting inside the notebook page, update document_get_notebook_page() to support it also, by searching up for the direct notebook child rather than assuming it is the ScintillaWidget's direct parent. Modified Paths: -------------- src/document.c Modified: src/document.c 13 lines changed, 10 insertions(+), 3 deletions(-) =================================================================== @@ -222,13 +222,20 @@ GeanyDocument *document_find_by_sci(ScintillaObject *sci) gint document_get_notebook_page(GeanyDocument *doc) { GtkWidget *parent; + GtkWidget *child; g_return_val_if_fail(doc != NULL, -1); - parent = gtk_widget_get_parent(GTK_WIDGET(doc->editor->sci)); - g_return_val_if_fail(GTK_IS_BOX(parent), -1); + child = GTK_WIDGET(doc->editor->sci); + parent = gtk_widget_get_parent(child); + /* search for the direct notebook child, mirroring document_get_from_page() */ + while (parent && ! GTK_IS_NOTEBOOK(parent)) + { + child = parent; + parent = gtk_widget_get_parent(child); + } - return gtk_notebook_page_num(GTK_NOTEBOOK(main_widgets.notebook), parent); + return gtk_notebook_page_num(GTK_NOTEBOOK(main_widgets.notebook), child); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] d39995: Fix an inverted check
by Colomban Wendling 27 May '14

27 May '14

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 27 May 2014 14:02:59 UTC Commit: d399957471fbbde0dcaea3691933e51ad9df973f https://github.com/geany/geany/commit/d399957471fbbde0dcaea3691933e51ad9df9… Log Message: ----------- Fix an inverted check Modified Paths: -------------- src/document.c Modified: src/document.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1543,7 +1543,7 @@ gboolean document_save_file_as(GeanyDocument *doc, const gchar *utf8_fname) g_return_val_if_fail(doc != NULL, FALSE); - new_file = document_need_save_as(doc) || (utf8_fname != NULL && !strcmp(doc->file_name, utf8_fname)); + new_file = document_need_save_as(doc) || (utf8_fname != NULL && strcmp(doc->file_name, utf8_fname) != 0); if (utf8_fname != NULL) SETPTR(doc->file_name, g_strdup(utf8_fname)); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 4adbd5: Remove some empty table rows and columns from the Glade file
by Colomban Wendling 27 May '14

27 May '14

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 27 May 2014 13:53:32 UTC Commit: 4adbd5088060839421eb34adb42dd762d6e5b034 https://github.com/geany/geany/commit/4adbd5088060839421eb34adb42dd762d6e5b… Log Message: ----------- Remove some empty table rows and columns from the Glade file Cleanup some useless placeholders, and replace some one-column tables with vertical boxes. No UI changes. Modified Paths: -------------- data/geany.glade Modified: data/geany.glade 162 lines changed, 52 insertions(+), 110 deletions(-) =================================================================== @@ -2431,9 +2431,6 @@ </packing> </child> <child> - <placeholder/> - </child> - <child> <object class="GtkFrame" id="frame_toolbar_style"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -2535,7 +2532,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> <child> @@ -2641,7 +2638,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">2</property> </packing> </child> </object> @@ -3548,26 +3545,9 @@ <property name="can_focus">False</property> <property name="left_padding">12</property> <child> - <object class="GtkTable" id="table16"> + <object class="GtkVBox" id="vbox10"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="n_rows">5</property> - <property name="n_columns">2</property> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> <child> <object class="GtkCheckButton" id="check_autoclose_parenthesis"> <property name="label" translatable="yes">Parenthesis ( )</property> @@ -3579,59 +3559,57 @@ <property name="draw_indicator">True</property> </object> <packing> - <property name="x_options">GTK_FILL</property> - <property name="y_options"/> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkCheckButton" id="check_autoclose_squote"> - <property name="label" translatable="yes">Single quotes ' '</property> + <object class="GtkCheckButton" id="check_autoclose_cbracket"> + <property name="label" translatable="yes">Curly brackets { }</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">Auto-close single quote when typing an opening one</property> + <property name="tooltip_text" translatable="yes">Auto-close curly bracket when typing an opening one</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> </object> <packing> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"/> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> <child> - <object class="GtkCheckButton" id="check_autoclose_cbracket"> - <property name="label" translatable="yes">Curly brackets { }</property> + <object class="GtkCheckButton" id="check_autoclose_sbracket"> + <property name="label" translatable="yes">Square brackets [ ]</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">Auto-close curly bracket when typing an opening one</property> + <property name="tooltip_text" translatable="yes">Auto-close square-bracket when typing an opening one</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> </object> <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"/> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">2</property> </packing> </child> <child> - <object class="GtkCheckButton" id="check_autoclose_sbracket"> - <property name="label" translatable="yes">Square brackets [ ]</property> + <object class="GtkCheckButton" id="check_autoclose_squote"> + <property name="label" translatable="yes">Single quotes ' '</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">Auto-close square-bracket when typing an opening one</property> + <property name="tooltip_text" translatable="yes">Auto-close single quote when typing an opening one</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> </object> <packing> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"/> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">3</property> </packing> </child> <child> @@ -3645,10 +3623,9 @@ <property name="draw_indicator">True</property> </object> <packing> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"/> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">4</property> </packing> </child> </object> @@ -5959,35 +5936,9 @@ </packing> </child> <child> - <object class="GtkTable" id="table4"> + <object class="GtkVBox" id="vbox16"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="n_rows">8</property> - <property name="n_columns">2</property> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> <child> <object class="GtkCheckButton" id="check_scroll_key"> <property name="label" translatable="yes">Scroll on keystroke</property> @@ -5998,8 +5949,9 @@ <property name="draw_indicator">True</property> </object> <packing> - <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> </packing> </child> <child> @@ -6012,10 +5964,9 @@ <property name="draw_indicator">True</property> </object> <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> <child> @@ -6028,10 +5979,9 @@ <property name="draw_indicator">True</property> </object> <packing> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> </packing> </child> <child> @@ -6044,10 +5994,9 @@ <property name="draw_indicator">True</property> </object> <packing> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> </packing> </child> <child> @@ -6060,10 +6009,9 @@ <property name="draw_indicator">True</property> </object> <packing> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">4</property> </packing> </child> <child> @@ -6076,10 +6024,9 @@ <property name="draw_indicator">True</property> </object> <packing> - <property name="top_attach">5</property> - <property name="bottom_attach">6</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">5</property> </packing> </child> <child> @@ -6092,10 +6039,9 @@ <property name="draw_indicator">True</property> </object> <packing> - <property name="top_attach">6</property> - <property name="bottom_attach">7</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">6</property> </packing> </child> <child> @@ -6109,10 +6055,9 @@ <property name="draw_indicator">True</property> </object> <packing> - <property name="top_attach">7</property> - <property name="bottom_attach">8</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">7</property> </packing> </child> </object> @@ -9197,9 +9142,6 @@ <property name="position">0</property> </packing> </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="position">3</property> -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 62077c: Prompt to overwrite in Windows Save As dialog
by Adam Coyne 26 May '14

26 May '14

Branch: refs/heads/master Author: Adam Coyne <github(a)mail2.coyne.nu> Committer: Adam Coyne <github(a)mail2.coyne.nu> Date: Fri, 22 Feb 2013 05:49:46 UTC Commit: 62077c626c10116bde050d50cb4aef0e167f5eee https://github.com/geany/geany/commit/62077c626c10116bde050d50cb4aef0e167f5… Log Message: ----------- Prompt to overwrite in Windows Save As dialog Add OFN_OVERWRITEPROMPT so the dialog will prompt before overwriting an existing file. Remove the OFN_FILEMUSTEXIST flag, which works only with Open dialogs. Modified Paths: -------------- src/win32.c Modified: src/win32.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -452,7 +452,7 @@ gchar *win32_show_document_save_as_dialog(GtkWindow *parent, const gchar *title, of.lpstrFileTitle = NULL; of.lpstrTitle = w_title; of.lpstrDefExt = L""; - of.Flags = OFN_FILEMUSTEXIST | OFN_EXPLORER; + of.Flags = OFN_OVERWRITEPROMPT | OFN_EXPLORER; retval = GetSaveFileNameW(&of); if (! retval) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 73a158: Remove empty table rows in the Glade file
by Colomban Wendling 26 May '14

26 May '14

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Mon, 26 May 2014 16:11:58 UTC Commit: 73a1589618f71d7cd0aee0913613683c4fbfbb53 https://github.com/geany/geany/commit/73a1589618f71d7cd0aee0913613683c4fbfb… Log Message: ----------- Remove empty table rows in the Glade file This avoids glade from emitting some useless placeholders. No UI changes. Modified Paths: -------------- data/geany.glade Modified: data/geany.glade 60 lines changed, 13 insertions(+), 47 deletions(-) =================================================================== @@ -4667,7 +4667,7 @@ <object class="GtkTable" id="table1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="n_rows">4</property> + <property name="n_rows">3</property> <property name="n_columns">3</property> <property name="column_spacing">6</property> <property name="row_spacing">3</property> @@ -4679,8 +4679,6 @@ <property name="label" translatable="yes">Terminal:</property> </object> <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> <property name="y_options"/> </packing> @@ -4693,8 +4691,8 @@ <property name="label" translatable="yes">Browser:</property> </object> <packing> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> <property name="y_options"/> </packing> @@ -4712,8 +4710,6 @@ <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> <property name="y_options"/> </packing> </child> @@ -4730,8 +4726,8 @@ <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> <property name="y_options"/> </packing> </child> @@ -4751,8 +4747,6 @@ <packing> <property name="left_attach">2</property> <property name="right_attach">3</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> <property name="y_options"/> </packing> @@ -4773,8 +4767,8 @@ <packing> <property name="left_attach">2</property> <property name="right_attach">3</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> <property name="y_options"/> </packing> @@ -4787,8 +4781,8 @@ <property name="label" translatable="yes">Grep:</property> </object> <packing> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> <property name="y_options"/> </packing> @@ -4805,15 +4799,12 @@ <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> <property name="y_options"/> </packing> </child> <child> - <placeholder/> - </child> - <child> <object class="GtkButton" id="button_grep"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -4829,27 +4820,12 @@ <packing> <property name="left_attach">2</property> <property name="right_attach">3</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> <property name="y_options"/> </packing> </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="expand">False</property> @@ -4891,20 +4867,10 @@ <object class="GtkTable" id="table12"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="n_rows">2</property> <property name="n_columns">3</property> <property name="column_spacing">6</property> <property name="row_spacing">3</property> <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> <object class="GtkLabel" id="label189"> <property name="visible">True</property> <property name="can_focus">False</property> -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] e97957: Merge PR#113
by Colomban Wendling 26 May '14

26 May '14

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Mon, 26 May 2014 14:45:25 UTC Commit: e9795732b600895c1e6f0954915ba52bf6417a20 https://github.com/geany/geany/commit/e9795732b600895c1e6f0954915ba52bf6417… Log Message: ----------- Merge PR#113 Modified Paths: -------------- src/win32.c Modified: src/win32.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -464,7 +464,7 @@ gchar *win32_show_document_save_as_dialog(GtkWindow *parent, const gchar *title, of.lpstrFileTitle = NULL; of.lpstrTitle = w_title; of.lpstrDefExt = L""; - of.Flags = OFN_FILEMUSTEXIST | OFN_EXPLORER; + of.Flags = OFN_OVERWRITEPROMPT | OFN_EXPLORER; retval = GetSaveFileNameW(&of); if (! retval) -------------- 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 May 2014