Revision: 1494
http://svn.sourceforge.net/geany/?rev=1494&view=rev
Author: ntrel
Date: 2007-04-30 09:16:49 -0700 (Mon, 30 Apr 2007)
Log Message:
-----------
Disable the Build Includes run command field when there is a project
open with a valid run command set.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/build.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-04-30 16:16:15 UTC (rev 1493)
+++ trunk/ChangeLog 2007-04-30 16:16:49 UTC (rev 1494)
@@ -14,6 +14,11 @@
documents had replacements made.
* src/search.c:
Show number of matches when using Mark command.
+ * src/utils.h:
+ Add NZV() macro for checking a char* points to a non-empty string.
+ * src/build.c:
+ Disable the Build Includes run command field when there is a project
+ open with a valid run command set.
2007-04-29 Nick Treleaven <nick.treleaven(a)btinternet.com>
Modified: trunk/src/build.c
===================================================================
--- trunk/src/build.c 2007-04-30 16:16:15 UTC (rev 1493)
+++ trunk/src/build.c 2007-04-30 16:16:49 UTC (rev 1494)
@@ -1551,6 +1551,10 @@
g_object_set_data_full(G_OBJECT(dialog), "includes_entry3",
gtk_widget_ref(entries[2]), (GDestroyNotify)gtk_widget_unref);
+
+ // disable the run command if there is a valid project run command set
+ if (app->project && NZV(app->project->run_cmd))
+ gtk_widget_set_sensitive(entries[2], FALSE);
}
label = gtk_label_new(_("%f will be replaced by the current filename, e.g. test_file.c\n"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 1493
http://svn.sourceforge.net/geany/?rev=1493&view=rev
Author: ntrel
Date: 2007-04-30 09:16:15 -0700 (Mon, 30 Apr 2007)
Log Message:
-----------
Add NZV() macro for checking a char* points to a non-empty string.
Modified Paths:
--------------
trunk/src/utils.h
Modified: trunk/src/utils.h
===================================================================
--- trunk/src/utils.h 2007-04-30 12:43:22 UTC (rev 1492)
+++ trunk/src/utils.h 2007-04-30 16:16:15 UTC (rev 1493)
@@ -25,7 +25,11 @@
#ifndef GEANY_UTILS_H
#define GEANY_UTILS_H 1
+// Returns: TRUE if ptr points to a non-zero value.
+#define NZV(ptr) \
+ ((ptr) && (ptr)[0])
+
void utils_start_browser(const gchar *uri);
/* taken from anjuta, to determine the EOL mode of the file */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 1492
http://svn.sourceforge.net/geany/?rev=1492&view=rev
Author: ntrel
Date: 2007-04-30 05:43:22 -0700 (Mon, 30 Apr 2007)
Log Message:
-----------
Show number of matches when using Mark command.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/search.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-04-30 12:32:13 UTC (rev 1491)
+++ trunk/ChangeLog 2007-04-30 12:43:22 UTC (rev 1492)
@@ -12,6 +12,8 @@
* src/search.c:
Switch to status window when using Replace In Session to show which
documents had replacements made.
+ * src/search.c:
+ Show number of matches when using Mark command.
2007-04-29 Nick Treleaven <nick.treleaven(a)btinternet.com>
Modified: trunk/src/search.c
===================================================================
--- trunk/src/search.c 2007-04-30 12:32:13 UTC (rev 1491)
+++ trunk/src/search.c 2007-04-30 12:43:22 UTC (rev 1492)
@@ -856,11 +856,17 @@
break;
case GEANY_RESPONSE_MARK:
- {
if (DOC_IDX_VALID(idx))
- search_mark(idx, search_data.text, search_data.flags);
+ {
+ gint count = search_mark(idx, search_data.text, search_data.flags);
+
+ if (count == 0)
+ ui_set_statusbar(_("No matches found for '%s'."), search_data.text);
+ else
+ ui_set_statusbar(_("Found %d matches for '%s'."), count,
+ search_data.text);
+ }
break;
- }
}
if (check_close)
gtk_widget_hide(widgets.find_dialog);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 1491
http://svn.sourceforge.net/geany/?rev=1491&view=rev
Author: ntrel
Date: 2007-04-30 05:32:13 -0700 (Mon, 30 Apr 2007)
Log Message:
-----------
Switch to status window when using Replace In Session to show which
documents had replacements made.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/search.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-04-30 12:24:40 UTC (rev 1490)
+++ trunk/ChangeLog 2007-04-30 12:32:13 UTC (rev 1491)
@@ -9,6 +9,9 @@
Fix reloading of read-only documents.
* src/document.c:
Make replace all commands report no matches for read-only documents.
+ * src/search.c:
+ Switch to status window when using Replace In Session to show which
+ documents had replacements made.
2007-04-29 Nick Treleaven <nick.treleaven(a)btinternet.com>
Modified: trunk/src/search.c
===================================================================
--- trunk/src/search.c 2007-04-30 12:24:40 UTC (rev 1490)
+++ trunk/src/search.c 2007-04-30 12:32:13 UTC (rev 1491)
@@ -976,6 +976,8 @@
search_replace_escape_re)) count++;
}
ui_set_statusbar(_("Replaced text in %u files."), count);
+ // show which docs had replacements:
+ gtk_notebook_set_current_page(GTK_NOTEBOOK(msgwindow.notebook), MSG_STATUS);
ui_save_buttons_toggle(doc_list[idx].changed); // update save all
if (close_window) gtk_widget_hide(widgets.replace_dialog);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 1489
http://svn.sourceforge.net/geany/?rev=1489&view=rev
Author: ntrel
Date: 2007-04-30 05:17:31 -0700 (Mon, 30 Apr 2007)
Log Message:
-----------
Fix reloading of read-only documents.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/document.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-04-30 12:03:46 UTC (rev 1488)
+++ trunk/ChangeLog 2007-04-30 12:17:31 UTC (rev 1489)
@@ -5,6 +5,8 @@
UTF-8 automatically; mark error messages for translation.
* src/search.c:
Allow replacing identical text if case sensitive is not checked.
+ * src/document.c:
+ Fix reloading of read-only documents.
2007-04-29 Nick Treleaven <nick.treleaven(a)btinternet.com>
Modified: trunk/src/document.c
===================================================================
--- trunk/src/document.c 2007-04-30 12:03:46 UTC (rev 1488)
+++ trunk/src/document.c 2007-04-30 12:17:31 UTC (rev 1489)
@@ -776,6 +776,7 @@
sci_empty_undo_buffer(doc_list[idx].sci);
// add the text to the ScintillaObject
+ sci_set_readonly(doc_list[idx].sci, FALSE); // to allow replacing text
sci_set_text(doc_list[idx].sci, filedata.data); // NULL terminated data
// detect & set line endings
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 1488
http://svn.sourceforge.net/geany/?rev=1488&view=rev
Author: ntrel
Date: 2007-04-30 05:03:46 -0700 (Mon, 30 Apr 2007)
Log Message:
-----------
Allow replacing identical text if case sensitive is not checked.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/search.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-04-30 11:56:50 UTC (rev 1487)
+++ trunk/ChangeLog 2007-04-30 12:03:46 UTC (rev 1488)
@@ -3,6 +3,8 @@
* src/symbols.c:
Use g_printerr (if necessary) when generating global tags to convert
UTF-8 automatically; mark error messages for translation.
+ * src/search.c:
+ Allow replacing identical text if case sensitive is not checked.
2007-04-29 Nick Treleaven <nick.treleaven(a)btinternet.com>
Modified: trunk/src/search.c
===================================================================
--- trunk/src/search.c 2007-04-30 11:56:50 UTC (rev 1487)
+++ trunk/src/search.c 2007-04-30 12:03:46 UTC (rev 1488)
@@ -910,7 +910,7 @@
find = g_strdup(gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(entry_find)))));
replace = g_strdup(gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(entry_replace)))));
- if ((response != GEANY_RESPONSE_FIND) && (! fl1) && (strcasecmp(find, replace) == 0))
+ if ((response != GEANY_RESPONSE_FIND) && fl1 && (strcasecmp(find, replace) == 0))
{
utils_beep();
gtk_widget_grab_focus(GTK_WIDGET(GTK_BIN(lookup_widget(widgets.replace_dialog, "entry_find"))->child));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.