Branch: refs/heads/master
Author: Matthew Brush <matt(a)geany.org>
Committer: Matthew Brush <matt(a)geany.org>
Date: Sat, 11 Oct 2014 01:02:29 UTC
Commit: bae420a768975aa1d4818121eec80098d9e0064a
https://github.com/geany/geany/commit/bae420a768975aa1d4818121eec80098d9e00…
Log Message:
-----------
Merge branch 'rpalli/replace1'
Closes #189
Modified Paths:
--------------
doc/geany.txt
src/keyfile.c
src/search.c
src/search.h
Modified: doc/geany.txt
5 lines changed, 5 insertions(+), 0 deletions(-)
===================================================================
@@ -2651,6 +2651,11 @@ extract_filetype_regex Regex to extract filetype name from file S
via capture group one.
**Search related**
find_selection_type See `Find selection`_. 0 immediately
+**Replace related**
+replace_and_find_by_default Set ``Replace & Find`` button as default so false immediately
+ it will be activated when the Enter key is
+ pressed while one of the text fields has
+ focus.
**Build Menu related**
number_ft_menu_items The maximum number of menu items in the 2 on restart
filetype section of the Build menu.
Modified: src/keyfile.c
2 lines changed, 2 insertions(+), 0 deletions(-)
===================================================================
@@ -231,6 +231,8 @@ static void init_pref_groups(void)
"find_selection_type", GEANY_FIND_SEL_CURRENT_WORD);
stash_group_add_string(group, &file_prefs.extract_filetype_regex,
"extract_filetype_regex", GEANY_DEFAULT_FILETYPE_REGEX);
+ stash_group_add_boolean(group, &search_prefs.replace_and_find_by_default,
+ "replace_and_find_by_default", FALSE);
/* Note: Interface-related various prefs are in ui_init_prefs() */
Modified: src/search.c
4 lines changed, 3 insertions(+), 1 deletions(-)
===================================================================
@@ -1390,7 +1390,9 @@ on_replace_find_entry_activate(GtkEntry *entry, gpointer user_data)
static void
on_replace_entry_activate(GtkEntry *entry, gpointer user_data)
{
- on_replace_dialog_response(NULL, GEANY_RESPONSE_REPLACE, NULL);
+ on_replace_dialog_response(NULL,
+ search_prefs.replace_and_find_by_default ? GEANY_RESPONSE_REPLACE_AND_FIND : GEANY_RESPONSE_REPLACE,
+ NULL);
}
Modified: src/search.h
1 lines changed, 1 insertions(+), 0 deletions(-)
===================================================================
@@ -78,6 +78,7 @@ typedef struct GeanySearchPrefs
gboolean use_current_word; /**< Use current word for default search text */
gboolean use_current_file_dir; /* find in files directory to use on showing dialog */
gboolean hide_find_dialog; /* hide the find dialog on next or previous */
+ gboolean replace_and_find_by_default; /* enter in replace window performs Replace & Find instead of Replace */
enum GeanyFindSelOptions find_selection_type;
}
GeanySearchPrefs;
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Colomban Wendling <ban(a)herbesfolles.org>
Committer: Colomban Wendling <ban(a)herbesfolles.org>
Date: Fri, 10 Oct 2014 23:40:10 UTC
Commit: f1da4b99146d261ec2e640bfb64ef5eee548f035
https://github.com/geany/geany/commit/f1da4b99146d261ec2e640bfb64ef5eee548f…
Log Message:
-----------
Don't rebuild TagManager workspace tags when quitting
Updating the workspace is useless as the application will be shut down,
and not doing it can save a lot of time (almost 50% speedup quitting an
instance with all Geany source from `src/` open).
Modified Paths:
--------------
src/document.c
Modified: src/document.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -714,7 +714,7 @@ static gboolean remove_page(guint page_num)
g_free(doc->priv->saved_encoding.encoding);
g_free(doc->file_name);
g_free(doc->real_path);
- tm_workspace_remove_object(doc->tm_file, TRUE, TRUE);
+ tm_workspace_remove_object(doc->tm_file, TRUE, !main_status.quitting);
if (doc->priv->tag_tree)
gtk_widget_destroy(doc->priv->tag_tree);
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Nick Treleaven <nick.treleaven(a)btinternet.com>
Committer: Nick Treleaven <nick.treleaven(a)btinternet.com>
Date: Fri, 10 Oct 2014 15:41:01 UTC
Commit: 0362a2281b1d558b42992a82a988f09a9d631425
https://github.com/geany/geany/commit/0362a2281b1d558b42992a82a988f09a9d631…
Log Message:
-----------
Define _WIN32_IE for SHGFP_TYPE
Modified Paths:
--------------
win32-config.h
Modified: win32-config.h
5 lines changed, 4 insertions(+), 1 deletions(-)
===================================================================
@@ -318,5 +318,8 @@
/* Define if you want to detect a running instance */
#define HAVE_SOCKET 1
-// Require at least XP for Windows API
+// Need Windows XP for SHGetFolderPathAndSubDirW
#define WINVER 0x0501
+
+// Needed for SHGFP_TYPE
+#define _WIN32_IE 0x0500
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Roland Pallai <rpallai(a)magex.hu>
Committer: Roland Pallai <rpallai(a)magex.hu>
Date: Thu, 09 Oct 2014 22:26:25 UTC
Commit: 3df962a37152d697b1258aae7267c2a8b845f1b9
https://github.com/geany/geany/commit/3df962a37152d697b1258aae7267c2a8b845f…
Log Message:
-----------
A small styling of the documentation
Modified Paths:
--------------
doc/geany.txt
Modified: doc/geany.txt
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -2610,10 +2610,10 @@ extract_filetype_regex Regex to extract filetype name from file S
**Search related**
find_selection_type See `Find selection`_. 0 immediately
**Replace related**
-replace_and_find_by_default Set ``Replace & Find`` button as default so
+replace_and_find_by_default Set ``Replace & Find`` button as default so false immediately
it will be activated when the Enter key is
pressed while one of the text fields has
- focus. false immediately
+ focus.
**Build Menu related**
number_ft_menu_items The maximum number of menu items in the 2 on restart
filetype section of the Build menu.
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Roland Pallai <rpallai(a)magex.hu>
Committer: Roland Pallai <rpallai(a)magex.hu>
Date: Thu, 09 Oct 2014 22:04:38 UTC
Commit: 9b2ccb9965266f1dcda93e3fa17c64389201ad59
https://github.com/geany/geany/commit/9b2ccb9965266f1dcda93e3fa17c64389201a…
Log Message:
-----------
Turn "replace and find by default" boolean pref into a "various" preference.
Modified Paths:
--------------
data/geany.glade
doc/geany.txt
src/keyfile.c
src/search.c
src/search.h
Modified: data/geany.glade
17 lines changed, 0 insertions(+), 17 deletions(-)
===================================================================
@@ -1405,23 +1405,6 @@
<property name="position">3</property>
</packing>
</child>
- <child>
- <object class="GtkCheckButton" id="check_replace_entry_activates_replace_and_find">
- <property name="label" translatable="yes">Enter in replace window activates Replace & Find</property>
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="tooltip_text" translatable="yes">Enter in replace window activates Replace & Find instead of Replace</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">4</property>
- </packing>
- </child>
</object>
</child>
</object>
Modified: doc/geany.txt
8 lines changed, 5 insertions(+), 3 deletions(-)
===================================================================
@@ -1891,9 +1891,6 @@ Use the current file's directory for Find in Files
active file. When this option is disabled, the directory of the last use of the Find in Files
dialog is used. See `Find in Files`_ for details.
-Enter in replace window performs Replace & Find instead of Replace
- Select Replace & Find as default action when pressing enter in Replace dialog.
-
Projects
````````
@@ -2612,6 +2609,11 @@ extract_filetype_regex Regex to extract filetype name from file S
via capture group one.
**Search related**
find_selection_type See `Find selection`_. 0 immediately
+**Replace related**
+replace_and_find_by_default Set ``Replace & Find`` button as default so
+ it will be activated when the Enter key is
+ pressed while one of the text fields has
+ focus. false immediately
**Build Menu related**
number_ft_menu_items The maximum number of menu items in the 2 on restart
filetype section of the Build menu.
Modified: src/keyfile.c
2 lines changed, 2 insertions(+), 0 deletions(-)
===================================================================
@@ -227,6 +227,8 @@ static void init_pref_groups(void)
"find_selection_type", GEANY_FIND_SEL_CURRENT_WORD);
stash_group_add_string(group, &file_prefs.extract_filetype_regex,
"extract_filetype_regex", GEANY_DEFAULT_FILETYPE_REGEX);
+ stash_group_add_boolean(group, &search_prefs.replace_and_find_by_default,
+ "replace_and_find_by_default", FALSE);
/* Note: Interface-related various prefs are in ui_init_prefs() */
Modified: src/search.c
5 lines changed, 1 insertions(+), 4 deletions(-)
===================================================================
@@ -192,9 +192,6 @@ static void init_prefs(void)
"pref_search_always_wrap", FALSE, "check_hide_find_dialog");
stash_group_add_toggle_button(group, &search_prefs.use_current_file_dir,
"pref_search_current_file_dir", TRUE, "check_fif_current_dir");
- stash_group_add_toggle_button(group, &search_prefs.replace_entry_activates_replace_and_find,
- "pref_search_replace_entry_activates_replace_and_find", FALSE,
- "check_replace_entry_activates_replace_and_find");
stash_group_add_boolean(group, &find_dlg.all_expanded, "find_all_expanded", FALSE);
stash_group_add_boolean(group, &replace_dlg.all_expanded, "replace_all_expanded", FALSE);
/* dialog positions */
@@ -1376,7 +1373,7 @@ static void
on_replace_entry_activate(GtkEntry *entry, gpointer user_data)
{
on_replace_dialog_response(NULL,
- search_prefs.replace_entry_activates_replace_and_find ? GEANY_RESPONSE_REPLACE_AND_FIND : GEANY_RESPONSE_REPLACE,
+ search_prefs.replace_and_find_by_default ? GEANY_RESPONSE_REPLACE_AND_FIND : GEANY_RESPONSE_REPLACE,
NULL);
}
Modified: src/search.h
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -61,7 +61,7 @@ typedef struct GeanySearchPrefs
gboolean use_current_word; /**< Use current word for default search text */
gboolean use_current_file_dir; /* find in files directory to use on showing dialog */
gboolean hide_find_dialog; /* hide the find dialog on next or previous */
- gboolean replace_entry_activates_replace_and_find; /* enter in replace entry does Replace & Find */
+ gboolean replace_and_find_by_default; /* enter in replace window performs Replace & Find instead of Replace */
enum GeanyFindSelOptions find_selection_type;
}
GeanySearchPrefs;
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Roland Pallai <rpallai(a)magex.hu>
Committer: Roland Pallai <rpallai(a)magex.hu>
Date: Thu, 09 Oct 2014 00:07:58 UTC
Commit: 985829afe06a9b07832669a7be4f7a06d96008f6
https://github.com/geany/geany/commit/985829afe06a9b07832669a7be4f7a06d9600…
Log Message:
-----------
Documentation change for the "Replace&Find by default" behaviour.
Modified Paths:
--------------
doc/geany.txt
Modified: doc/geany.txt
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -1891,7 +1891,7 @@ Use the current file's directory for Find in Files
active file. When this option is disabled, the directory of the last use of the Find in Files
dialog is used. See `Find in Files`_ for details.
-Enter in replace entry does Replace & Find instead of Replace
+Enter in replace window performs Replace & Find instead of Replace
Select Replace & Find as default action when pressing enter in Replace dialog.
Projects
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).