Revision: 1870
http://geany.svn.sourceforge.net/geany/?rev=1870&view=rev
Author: eht16
Date: 2007-09-11 11:18:09 -0700 (Tue, 11 Sep 2007)
Log Message:
-----------
HTML manual is called Manual.html on Windows, so open this file.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/callbacks.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-09-11 16:05:03 UTC (rev 1869)
+++ trunk/ChangeLog 2007-09-11 18:18:09 UTC (rev 1870)
@@ -1,3 +1,9 @@
+2007-09-11 Enrico Tröger <enrico.troeger(a)uvena.de>
+
+ * src/callbacks.c: HTML manual is called Manual.html on Windows, so
+ open this file.
+
+
2007-09-11 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
* plugins/export.c, plugins/classbuilder.c, src/utils.c, src/win32.c,
Modified: trunk/src/callbacks.c
===================================================================
--- trunk/src/callbacks.c 2007-09-11 16:05:03 UTC (rev 1869)
+++ trunk/src/callbacks.c 2007-09-11 18:18:09 UTC (rev 1870)
@@ -1270,7 +1270,7 @@
#ifdef G_OS_WIN32
skip = 8;
- uri = g_strconcat("file:///", app->docdir, "/index.html", NULL);
+ uri = g_strconcat("file:///", app->docdir, "/Manual.html", NULL);
g_strdelimit(uri, "\\", '/'); // replace '\\' by '/'
#else
skip = 7;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 1869
http://geany.svn.sourceforge.net/geany/?rev=1869&view=rev
Author: ntrel
Date: 2007-09-11 09:05:03 -0700 (Tue, 11 Sep 2007)
Log Message:
-----------
Add reload_file() document function to the plugin API.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/document.c
trunk/src/document.h
trunk/src/plugindata.h
trunk/src/plugins.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-09-11 15:21:11 UTC (rev 1868)
+++ trunk/ChangeLog 2007-09-11 16:05:03 UTC (rev 1869)
@@ -9,6 +9,8 @@
without the idx for reloading or pos arguments.
Replace str_replace() with string_replace_all() in the plugin API.
Add utils_string_replace_all(), taking a GString argument.
+ * src/plugindata.h, src/document.c, src/plugins.c, src/document.h:
+ Add reload_file() document function to the plugin API.
2007-09-10 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
Modified: trunk/src/document.c
===================================================================
--- trunk/src/document.c 2007-09-11 15:21:11 UTC (rev 1868)
+++ trunk/src/document.c 2007-09-11 16:05:03 UTC (rev 1869)
@@ -825,6 +825,7 @@
/* To open a new file, set idx to -1; filename should be locale encoded.
* To reload a file, set the idx for the document to be reloaded; filename should be NULL.
* pos is the cursor position, which can be overridden by --line and --column.
+ * forced_enc can be NULL to detect the file encoding.
* Returns: idx of the opened file or -1 if an error occurred.
*
* When opening more than one file, either:
@@ -1022,17 +1023,21 @@
}
-gint document_reload_file(gint idx, const gchar *forced_enc)
+/* Reload document with index idx.
+ * forced_enc can be NULL to detect the file encoding.
+ * Returns: TRUE if successful. */
+gboolean document_reload_file(gint idx, const gchar *forced_enc)
{
gint pos = 0;
if (! DOC_IDX_VALID(idx))
- return -1;
+ return FALSE;
// try to set the cursor to the position before reloading
pos = sci_get_current_position(doc_list[idx].sci);
- return document_open_file_full(idx, NULL, pos, doc_list[idx].readonly,
+ idx = document_open_file_full(idx, NULL, pos, doc_list[idx].readonly,
doc_list[idx].file_type, forced_enc);
+ return (idx != -1);
}
Modified: trunk/src/document.h
===================================================================
--- trunk/src/document.h 2007-09-11 15:21:11 UTC (rev 1868)
+++ trunk/src/document.h 2007-09-11 16:05:03 UTC (rev 1869)
@@ -143,7 +143,7 @@
const gchar *forced_enc);
-gint document_reload_file(gint idx, const gchar *forced_enc);
+gboolean document_reload_file(gint idx, const gchar *forced_enc);
/* This saves the file.
Modified: trunk/src/plugindata.h
===================================================================
--- trunk/src/plugindata.h 2007-09-11 15:21:11 UTC (rev 1868)
+++ trunk/src/plugindata.h 2007-09-11 16:05:03 UTC (rev 1869)
@@ -71,7 +71,7 @@
/* The API version should be incremented whenever any plugin data types below are
* modified. */
-static const gint api_version = 17;
+static const gint api_version = 18;
/* The ABI version should be incremented whenever existing fields in the plugin
* data types below have to be changed or reordered. It should stay the same if fields
@@ -179,6 +179,7 @@
void (*open_files)(const GSList *filenames, gboolean readonly, struct filetype *ft,
const gchar *forced_enc);
gboolean (*remove)(guint page_num);
+ gboolean (*reload_file)(gint idx, const gchar *forced_enc);
}
DocumentFuncs;
Modified: trunk/src/plugins.c
===================================================================
--- trunk/src/plugins.c 2007-09-11 15:21:11 UTC (rev 1868)
+++ trunk/src/plugins.c 2007-09-11 16:05:03 UTC (rev 1869)
@@ -79,7 +79,8 @@
&document_save_file,
&document_open_file,
&document_open_files,
- &document_remove
+ &document_remove,
+ &document_reload_file
};
static ScintillaFuncs sci_funcs = {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 1864
http://geany.svn.sourceforge.net/geany/?rev=1864&view=rev
Author: eht16
Date: 2007-09-09 09:43:54 -0700 (Sun, 09 Sep 2007)
Log Message:
-----------
Add notice about code navigation history.
Modified Paths:
--------------
trunk/ChangeLog
trunk/doc/geany.txt
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-09-09 16:13:30 UTC (rev 1863)
+++ trunk/ChangeLog 2007-09-09 16:43:54 UTC (rev 1864)
@@ -2,6 +2,7 @@
* src/build.c, src/callbacks.c: Change quotes in some error messages to
be more consistent (thanks Frank).
+ * doc/geany.txt: Add notice about code navigation history.
2007-09-07 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
Modified: trunk/doc/geany.txt
===================================================================
--- trunk/doc/geany.txt 2007-09-09 16:13:30 UTC (rev 1863)
+++ trunk/doc/geany.txt 2007-09-09 16:43:54 UTC (rev 1864)
@@ -488,6 +488,21 @@
navigate around multiple files.
+Code Navigation History
+^^^^^^^^^^^^^^^^^^^^^^^
+
+To ease navigation in source files and especially between different files, Geany
+let you jump between different navigation points. Currently, this works when using
+the `Go to tag declaration`_, `Go to tag definition`_ commands and when clicking
+on symbol list items.
+
+When using one of these actions, Geany remembers your current position and jumps
+to the new one. If you decide to go back to your previous position in the file,
+just use "Navigate back a location". To get back to the new position again, just
+use "Navigate forward a location". This makes it easier to navigate in e.g.
+foreign code and between different files.
+
+
Send text through definable commands
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1526,10 +1541,12 @@
Switch to last used document Switches to the previously selected open document.
Navigate forward a location Switches to the next location in the navigation
- history.
+ history. See the section called `Code Navigation
+ History`_.
Navigate back a location Switches to the previous location in the
- navigation history.
+ navigation history. See the section called
+ `Code Navigation History`_.
**Editing operations**
@@ -1640,7 +1657,7 @@
the keyboard cursor). If the declaration cannot be
found (e.g. the relevant file is not open) Geany
will beep and do nothing. See the section called
- `Go to tag definition`_.
+ `Go to tag declaration`_.
Context Action Executes a command and passes the current word
(near the cursor postion) or selection as an
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 1863
http://geany.svn.sourceforge.net/geany/?rev=1863&view=rev
Author: eht16
Date: 2007-09-09 09:13:30 -0700 (Sun, 09 Sep 2007)
Log Message:
-----------
Change quotes in some error messages to be more consistent (thanks Frank).
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/build.c
trunk/src/callbacks.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-09-09 16:09:28 UTC (rev 1862)
+++ trunk/ChangeLog 2007-09-09 16:13:30 UTC (rev 1863)
@@ -1,8 +1,14 @@
+2007-09-09 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+
+ * src/build.c, src/callbacks.c: Change quotes in some error messages to
+ be more consistent (thanks Frank).
+
+
2007-09-07 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
* geany.glade, doc/geany.txt, src/callbacks.c, src/callbacks.h,
- src/interface.c, src/keybindings.c, src/keybindings.h, src/utils.c,
- src/utils.h, src/ui_utils.h:
+ src/interface.c, src/keybindings.c, src/keybindings.h, src/main.c,
+ src/utils.c, src/utils.h, src/ui_utils.h:
Remove convert to lower-/upper-case keybindings.
Add toggle case keybinding and change shortcut to Ctrl-Alt-U.
* src/about.c: Improved error message if license text could not be
Modified: trunk/src/build.c
===================================================================
--- trunk/src/build.c 2007-09-09 16:09:28 UTC (rev 1862)
+++ trunk/src/build.c 2007-09-09 16:13:30 UTC (rev 1863)
@@ -206,7 +206,7 @@
if (term_argv[0] == NULL)
{
msgwin_status_add(
- _("Could not find terminal '%s' "
+ _("Could not find terminal \"%s\" "
"(check path for Terminal tool setting in Preferences)"), prefs.tools_term_cmd);
utils_free_pointers(executable, view_file, locale_filename, cmd_string, locale_cmd_string,
@@ -588,7 +588,7 @@
{
gchar *utf8_check_executable = utils_get_utf8_from_locale(check_executable);
- msgwin_status_add(_("Failed to execute %s (make sure it is already built)"),
+ msgwin_status_add(_("Failed to execute \"%s\" (make sure it is already built)"),
utf8_check_executable);
g_free(utf8_check_executable);
g_free(check_executable);
@@ -642,7 +642,7 @@
gchar *utf8_working_dir =
utils_get_utf8_from_locale(working_dir);
- msgwin_status_add(_("Failed to change the working directory to %s"), utf8_working_dir);
+ msgwin_status_add(_("Failed to change the working directory to \"%s\""), utf8_working_dir);
g_free(utf8_working_dir);
g_free(working_dir);
g_free(executable);
@@ -743,7 +743,7 @@
if (term_argv[0] == NULL)
{
msgwin_status_add(
- _("Could not find terminal '%s' "
+ _("Could not find terminal \"%s\" "
"(check path for Terminal tool setting in Preferences)"), prefs.tools_term_cmd);
run_info.pid = (GPid) 1;
goto free_strings;
@@ -1486,7 +1486,8 @@
if (ft->actions->can_compile || ft->actions->can_link || ft->actions->can_exec)
{
GtkWidget *align, *frame;
- gchar *frame_title = g_strconcat(ft->title, _(" commands"), NULL);
+ // in-dialog heading for the "Set Includes and Arguments" dialog
+ gchar *frame_title = g_strdup_printf(_("%s commands"), ft->title);
frame = ui_frame_new_with_alignment(frame_title, &align);
gtk_container_add(GTK_CONTAINER(vbox), frame);
Modified: trunk/src/callbacks.c
===================================================================
--- trunk/src/callbacks.c 2007-09-09 16:09:28 UTC (rev 1862)
+++ trunk/src/callbacks.c 2007-09-09 16:13:30 UTC (rev 1863)
@@ -1480,7 +1480,7 @@
}
dialogs_show_input(_("Custom Date Format"),
- _("Enter here a custom date and time format. You can use any conversion specifiers which can be used with the ANSI C strftime function. See \"man strftime\" for more information."),
+ _("Enter here a custom date and time format. You can use any conversion specifiers which can be used with the ANSI C strftime function."),
ui_prefs.custom_date_format,
G_CALLBACK(on_custom_date_dialog_response),
G_CALLBACK(on_custom_date_entry_activate));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 1861
http://geany.svn.sourceforge.net/geany/?rev=1861&view=rev
Author: eht16
Date: 2007-09-07 12:17:02 -0700 (Fri, 07 Sep 2007)
Log Message:
-----------
Improved error message if license text could not be found (thanks Frank).
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/about.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-09-07 19:01:55 UTC (rev 1860)
+++ trunk/ChangeLog 2007-09-07 19:17:02 UTC (rev 1861)
@@ -5,6 +5,8 @@
src/utils.h, src/ui_utils.h:
Remove convert to lower-/upper-case keybindings.
Add toggle case keybinding and change shortcut to Ctrl-Alt-U.
+ * src/about.c: Improved error message if license text could not be
+ found (thanks Frank).
2007-09-07 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
Modified: trunk/src/about.c
===================================================================
--- trunk/src/about.c 2007-09-07 19:01:55 UTC (rev 1860)
+++ trunk/src/about.c 2007-09-07 19:17:02 UTC (rev 1861)
@@ -329,7 +329,7 @@
if (license_text == NULL)
{
license_text = g_strdup(
- _("License text could not be found, please search the web for GPLv2"));
+ _("License text could not be found, please visit http://www.gnu.org/licenses/gpl-2.0.txt to view it online."));
}
tb = gtk_text_view_get_buffer(GTK_TEXT_VIEW(license_textview));
gtk_text_buffer_set_text(tb, license_text, strlen(license_text));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.