Commits July 2009

commits@lists.geany.org

4 participants
143 discussions

SF.net SVN: geany:[4000] trunk
by ntrel＠users.sourceforge.net 20 Jul '09

20 Jul '09

Revision: 4000 http://geany.svn.sourceforge.net/geany/?rev=4000&view=rev Author: ntrel Date: 2009-07-20 16:12:23 +0000 (Mon, 20 Jul 2009) Log Message: ----------- Fix checking whether to overwrite when using the Rename button in the 'Save As' dialog. Modified Paths: -------------- trunk/ChangeLog trunk/src/dialogs.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-07-20 15:46:35 UTC (rev 3999) +++ trunk/ChangeLog 2009-07-20 16:12:23 UTC (rev 4000) @@ -16,6 +16,9 @@ * src/treeviews.c: Fix showing project name for documents list files with no subdirectory (oops). + * src/dialogs.c: + Fix checking whether to overwrite when using the Rename button in + the 'Save As' dialog. 2009-07-19 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/src/dialogs.c =================================================================== --- trunk/src/dialogs.c 2009-07-20 15:46:35 UTC (rev 3999) +++ trunk/src/dialogs.c 2009-07-20 16:12:23 UTC (rev 4000) @@ -373,37 +373,42 @@ { gboolean rename_file = FALSE; gboolean success = FALSE; + gchar *new_filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(ui_widgets.save_filesel)); switch (response) { case GEANY_RESPONSE_RENAME: + /* rename doesn't check for empty filename or overwriting */ + if (! NZV(new_filename)) + { + utils_beep(); + break; + } + if (g_file_test(new_filename, G_FILE_TEST_EXISTS) && + !dialogs_show_question_full(NULL, NULL, NULL, + _("Overwrite?"), + _("Filename already exists!"))) + break; rename_file = TRUE; /* fall through */ case GTK_RESPONSE_ACCEPT: { - gchar *new_filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(ui_widgets.save_filesel)); gboolean open_new_tab = gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(ui_lookup_widget(ui_widgets.save_filesel, "check_open_new_tab"))); gchar *utf8_filename; - if (! NZV(new_filename)) /* rename doesn't check for empty filename */ - { - utils_beep(); - g_free(new_filename); - return; - } utf8_filename = utils_get_utf8_from_locale(new_filename); - success = handle_save_as(utf8_filename, open_new_tab, rename_file); g_free(utf8_filename); - g_free(new_filename); break; } case GTK_RESPONSE_CANCEL: success = TRUE; break; } + g_free(new_filename); + if (success) gtk_widget_hide(ui_widgets.save_filesel); } @@ -1412,7 +1417,8 @@ /* extra_text can be NULL; otherwise it is displayed below main_text. - * if parent is NULL, main_widgets.window will be used */ + * if parent is NULL, main_widgets.window will be used + * yes_btn, no_btn can be NULL. */ gboolean dialogs_show_question_full(GtkWidget *parent, const gchar *yes_btn, const gchar *no_btn, const gchar *extra_text, const gchar *main_text, ...) { @@ -1420,6 +1426,11 @@ gchar string[512]; va_list args; + if (!yes_btn) + yes_btn = GTK_STOCK_YES; + if (!no_btn) + no_btn = GTK_STOCK_NO; + va_start(args, main_text); g_vsnprintf(string, 511, main_text, args); va_end(args); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3999] trunk
by ntrel＠users.sourceforge.net 20 Jul '09

20 Jul '09

Revision: 3999 http://geany.svn.sourceforge.net/geany/?rev=3999&view=rev Author: ntrel Date: 2009-07-20 15:46:35 +0000 (Mon, 20 Jul 2009) Log Message: ----------- Fix showing project name for documents list files with no subdirectory (oops). Modified Paths: -------------- trunk/ChangeLog trunk/src/treeviews.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-07-20 15:37:02 UTC (rev 3998) +++ trunk/ChangeLog 2009-07-20 15:46:35 UTC (rev 3999) @@ -13,6 +13,9 @@ * src/utils.c, src/utils.h, src/document.c: Remove relative/untidy path elements when opening documents (closes #2823998). + * src/treeviews.c: + Fix showing project name for documents list files with no + subdirectory (oops). 2009-07-19 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/src/treeviews.c =================================================================== --- trunk/src/treeviews.c 2009-07-20 15:37:02 UTC (rev 3998) +++ trunk/src/treeviews.c 2009-07-20 15:46:35 UTC (rev 3999) @@ -325,8 +325,9 @@ gsize len = strlen(project_base_path); const gchar *rest; - /* check whether the dir name uses the project base path */ - setptr(project_base_path, g_strconcat(project_base_path, G_DIR_SEPARATOR_S, NULL)); + /* check whether the dir name matches or uses the project base path */ + if (!utils_str_equal(project_base_path, tmp_dirname)) + setptr(project_base_path, g_strconcat(project_base_path, G_DIR_SEPARATOR_S, NULL)); if (g_str_has_prefix(tmp_dirname, project_base_path)) { rest = tmp_dirname + len; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3998] trunk
by ntrel＠users.sourceforge.net 20 Jul '09

20 Jul '09

Revision: 3998 http://geany.svn.sourceforge.net/geany/?rev=3998&view=rev Author: ntrel Date: 2009-07-20 15:37:02 +0000 (Mon, 20 Jul 2009) Log Message: ----------- Remove relative/untidy path elements when opening documents (closes #2823998). Modified Paths: -------------- trunk/ChangeLog trunk/src/document.c trunk/src/utils.c trunk/src/utils.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-07-20 12:25:24 UTC (rev 3997) +++ trunk/ChangeLog 2009-07-20 15:37:02 UTC (rev 3998) @@ -10,6 +10,9 @@ implementation, as this is more useful potentially than a gpointer* argument, and more straightforward. Add foreach_c_array(), foreach_ptr_array() to API. + * src/utils.c, src/utils.h, src/document.c: + Remove relative/untidy path elements when opening documents (closes + #2823998). 2009-07-19 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2009-07-20 12:25:24 UTC (rev 3997) +++ trunk/src/document.c 2009-07-20 15:37:02 UTC (rev 3998) @@ -1183,6 +1183,9 @@ #else locale_filename = g_strdup(filename); #endif + /* remove relative junk */ + utils_tidy_path(locale_filename); + /* try to get the UTF-8 equivalent for the filename, fallback to filename if error */ utf8_filename = utils_get_utf8_from_locale(locale_filename); Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2009-07-20 12:25:24 UTC (rev 3997) +++ trunk/src/utils.c 2009-07-20 15:37:02 UTC (rev 3998) @@ -1710,3 +1710,49 @@ } +/* Remove all relative and untidy elements from the path of @a filename. + * @param filename must be a valid absolute path. + * @see tm_get_real_path() - also resolves links. */ +void utils_tidy_path(gchar *filename) +{ + GString *str = g_string_new(filename); + const gchar *c, *needle; + gchar *tmp; + gssize pos; + + g_return_if_fail(g_path_is_absolute(filename)); + + /* replace "/./" and "//" */ + utils_string_replace_all(str, G_DIR_SEPARATOR_S "." G_DIR_SEPARATOR_S, G_DIR_SEPARATOR_S); + utils_string_replace_all(str, G_DIR_SEPARATOR_S G_DIR_SEPARATOR_S, G_DIR_SEPARATOR_S); + + /* replace "/.." */ + needle = G_DIR_SEPARATOR_S ".."; + while (1) + { + c = strstr(str->str, needle); + if (c == NULL) + break; + else + { + pos = c - str->str; + if (pos <= 3) + break; /* bad path */ + + g_string_erase(str, pos, strlen(needle)); /* erase "/.." */ + + tmp = g_strndup(str->str, pos); /* path up to "/.." */ + c = g_strrstr(tmp, G_DIR_SEPARATOR_S); + g_return_if_fail(c); + + pos = c - tmp; /* position of previous "/" */ + g_string_erase(str, pos, strlen(c)); + g_free(tmp); + } + } + g_return_if_fail(strlen(str->str) <= strlen(filename)); + strcpy(filename, str->str); + g_string_free(str, TRUE); +} + + Modified: trunk/src/utils.h =================================================================== --- trunk/src/utils.h 2009-07-20 12:25:24 UTC (rev 3997) +++ trunk/src/utils.h 2009-07-20 15:37:02 UTC (rev 3998) @@ -101,6 +101,8 @@ gboolean utils_atob(const gchar *str); +void utils_tidy_path(gchar *filename); + gboolean utils_is_absolute_path(const gchar *path); const gchar *utils_path_skip_root(const gchar *path); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3997] trunk
by ntrel＠users.sourceforge.net 20 Jul '09

20 Jul '09

Revision: 3997 http://geany.svn.sourceforge.net/geany/?rev=3997&view=rev Author: ntrel Date: 2009-07-20 12:25:24 +0000 (Mon, 20 Jul 2009) Log Message: ----------- Make foreach_ptr_array() use an integer argument for its implementation, as this is more useful potentially than a gpointer* argument, and more straightforward. Add foreach_c_array(), foreach_ptr_array() to API. Modified Paths: -------------- trunk/ChangeLog trunk/src/keyfile.c trunk/src/prefs.c trunk/src/symbols.c trunk/src/utils.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-07-20 12:00:06 UTC (rev 3996) +++ trunk/ChangeLog 2009-07-20 12:25:24 UTC (rev 3997) @@ -5,6 +5,11 @@ Add stash_group_add_widget_property() so we can save any widget's read/write properties. Use Stash for ui_prefs.sidebar_page setting. + * src/utils.h, src/prefs.c, src/keyfile.c, src/symbols.c: + Make foreach_ptr_array() use an integer argument for its + implementation, as this is more useful potentially than a gpointer* + argument, and more straightforward. + Add foreach_c_array(), foreach_ptr_array() to API. 2009-07-19 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/src/keyfile.c =================================================================== --- trunk/src/keyfile.c 2009-07-20 12:00:06 UTC (rev 3996) +++ trunk/src/keyfile.c 2009-07-20 12:25:24 UTC (rev 3997) @@ -192,10 +192,10 @@ static void settings_action(GKeyFile *config, SettingAction action) { - gpointer *ptr; + guint i; GeanyPrefGroup *group; - foreach_ptr_array(group, ptr, keyfile_groups) + foreach_ptr_array(group, i, keyfile_groups) { switch (action) { @@ -1139,10 +1139,10 @@ void configuration_finalize(void) { - gpointer *ptr; + guint i; GeanyPrefGroup *group; - foreach_ptr_array(group, ptr, keyfile_groups) + foreach_ptr_array(group, i, keyfile_groups) stash_group_free(group); g_ptr_array_free(keyfile_groups, TRUE); Modified: trunk/src/prefs.c =================================================================== --- trunk/src/prefs.c 2009-07-20 12:00:06 UTC (rev 3996) +++ trunk/src/prefs.c 2009-07-20 12:25:24 UTC (rev 3997) @@ -103,9 +103,9 @@ static void prefs_action(PrefCallbackAction action) { GeanyPrefGroup *group; - gpointer *ptr; + guint i; - foreach_ptr_array(group, ptr, pref_groups) + foreach_ptr_array(group, i, pref_groups) { switch (action) { Modified: trunk/src/symbols.c =================================================================== --- trunk/src/symbols.c 2009-07-20 12:00:06 UTC (rev 3996) +++ trunk/src/symbols.c 2009-07-20 12:25:24 UTC (rev 3997) @@ -1159,10 +1159,10 @@ * is not stable, so the order is already lost. */ static gint compare_top_level_names(const gchar *a, const gchar *b) { - gpointer *ptr; + guint i; const gchar *name; - foreach_ptr_array(name, ptr, top_level_iter_names) + foreach_ptr_array(name, i, top_level_iter_names) { if (utils_str_equal(name, a)) return -1; Modified: trunk/src/utils.h =================================================================== --- trunk/src/utils.h 2009-07-20 12:00:06 UTC (rev 3996) +++ trunk/src/utils.h 2009-07-20 12:25:24 UTC (rev 3997) @@ -57,23 +57,30 @@ #define utils_strdupa(str) \ strcpy(g_alloca(strlen(str) + 1), str) +/** Iterates all the items in @a array using pointers. + * @param item pointer to an item in @a array. + * @param array C array to traverse. + * @param len Length of the array. */ #define foreach_c_array(item, array, len) \ for (item = array; item < &array[len]; item++) -/* @param ptr should be a (gpointer*), needed for implementation. */ -#define foreach_ptr_array(item, ptr, ptr_array) \ - for (ptr = ptr_array->pdata, item = *ptr; \ - ptr < &ptr_array->pdata[ptr_array->len]; ++ptr, item = *ptr) +/** Iterates all the pointers in @a ptr_array. + * @param item pointer in @a ptr_array. + * @param idx @c guint index into @a ptr_array. + * @param ptr_array @c GPtrArray to traverse. */ +#define foreach_ptr_array(item, idx, ptr_array) \ + for (idx = 0, item = g_ptr_array_index(ptr_array, 0); \ + idx < ptr_array->len; ++idx, item = g_ptr_array_index(ptr_array, idx)) /** Iterates all the nodes in @a list. - * @param node should be a (GList*). - * @param list List to traverse. */ + * @param node should be a (@c GList*). + * @param list @c GList to traverse. */ #define foreach_list(node, list) \ for (node = list; node != NULL; node = node->next) /** Iterates all the nodes in @a list. - * @param node should be a (GSList*). - * @param list List to traverse. */ + * @param node should be a (@c GSList*). + * @param list @c GSList to traverse. */ #define foreach_slist(node, list) \ foreach_list(node, list) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3996] trunk
by ntrel＠users.sourceforge.net 20 Jul '09

20 Jul '09

Revision: 3996 http://geany.svn.sourceforge.net/geany/?rev=3996&view=rev Author: ntrel Date: 2009-07-20 12:00:06 +0000 (Mon, 20 Jul 2009) Log Message: ----------- Add stash_group_add_widget_property() so we can save any widget's read/write properties. Use Stash for ui_prefs.sidebar_page setting. Modified Paths: -------------- trunk/ChangeLog trunk/src/callbacks.c trunk/src/keyfile.c trunk/src/stash.c trunk/src/stash.h trunk/src/treeviews.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-07-20 11:21:05 UTC (rev 3995) +++ trunk/ChangeLog 2009-07-20 12:00:06 UTC (rev 3996) @@ -1,3 +1,12 @@ +2009-07-20 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/treeviews.c, src/callbacks.c, src/stash.c, src/stash.h, + src/keyfile.c: + Add stash_group_add_widget_property() so we can save any widget's + read/write properties. + Use Stash for ui_prefs.sidebar_page setting. + + 2009-07-19 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * src/dialogs.c: Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2009-07-20 11:21:05 UTC (rev 3995) +++ trunk/src/callbacks.c 2009-07-20 12:00:06 UTC (rev 3996) @@ -1629,10 +1629,6 @@ if (ignore_callback) return; - if (ui_prefs.sidebar_visible) - ui_prefs.sidebar_page = gtk_notebook_get_current_page( - GTK_NOTEBOOK(main_widgets.sidebar_notebook)); - ui_prefs.sidebar_visible = ! ui_prefs.sidebar_visible; if ((! interface_prefs.sidebar_openfiles_visible && ! interface_prefs.sidebar_symbol_visible)) @@ -1642,8 +1638,6 @@ } ui_sidebar_show_hide(); - gtk_notebook_set_current_page(GTK_NOTEBOOK(main_widgets.sidebar_notebook), - ui_prefs.sidebar_page); } Modified: trunk/src/keyfile.c =================================================================== --- trunk/src/keyfile.c 2009-07-20 11:21:05 UTC (rev 3995) +++ trunk/src/keyfile.c 2009-07-20 12:00:06 UTC (rev 3996) @@ -452,14 +452,7 @@ static void save_ui_prefs(GKeyFile *config) { - /* If the sidebar is visible, retrieve the active page number. Otherwise it was already - * set on hiding the sidebar. */ - if (ui_prefs.sidebar_visible) - ui_prefs.sidebar_page = gtk_notebook_get_current_page( - GTK_NOTEBOOK(main_widgets.sidebar_notebook)); - g_key_file_set_boolean(config, PACKAGE, "sidebar_visible", ui_prefs.sidebar_visible); - g_key_file_set_integer(config, PACKAGE, "sidebar_page", ui_prefs.sidebar_page); g_key_file_set_boolean(config, PACKAGE, "statusbar_visible", interface_prefs.statusbar_visible); g_key_file_set_boolean(config, PACKAGE, "msgwindow_visible", ui_prefs.msgwindow_visible); g_key_file_set_boolean(config, PACKAGE, "fullscreen", ui_prefs.fullscreen); @@ -809,7 +802,6 @@ GError *error = NULL; ui_prefs.sidebar_visible = utils_get_setting_boolean(config, PACKAGE, "sidebar_visible", TRUE); - ui_prefs.sidebar_page = utils_get_setting_integer(config, PACKAGE, "sidebar_page", 0); ui_prefs.msgwindow_visible = utils_get_setting_boolean(config, PACKAGE, "msgwindow_visible", TRUE); ui_prefs.fullscreen = utils_get_setting_boolean(config, PACKAGE, "fullscreen", FALSE); ui_prefs.custom_date_format = utils_get_setting_string(config, PACKAGE, "custom_date_format", ""); Modified: trunk/src/stash.c =================================================================== --- trunk/src/stash.c 2009-07-20 11:21:05 UTC (rev 3995) +++ trunk/src/stash.c 2009-07-20 12:00:06 UTC (rev 3996) @@ -31,8 +31,18 @@ * * Memory Usage * Stash will not duplicate strings if they are normally static arrays, such as - * keyfile group names and key names, string default values or widget_id names. - * String settings and other dynamically allocated settings must be initialized to NULL. + * keyfile group names and key names, string default values, widget_id names, property names. + * + * String Settings + * String settings and other dynamically allocated settings must be initialized to NULL as they + * will be freed before reassigning. + * + * Widget Support + * Widgets very commonly used in configuration dialogs will be supported with their own function. + * Widgets less commonly used such as GtkExpander or widget settings that aren't commonly needed + * to be persistent won't be directly supported, to keep the library lightweight. However, you can + * use stash_group_add_widget_property() to also save these settings for any read/write widget + * property. */ /* Implementation Note @@ -251,8 +261,10 @@ { if (entry->widget_type == GTK_TYPE_RADIO_BUTTON) g_free(entry->fields); + else if (entry->widget_type == G_TYPE_PARAM) + continue; else - g_assert(entry->fields == NULL); + g_assert(entry->fields == NULL); /* to prevent memory leaks, must handle fields above */ } g_array_free(group->entries, TRUE); g_free(group); @@ -407,8 +419,7 @@ /* taken from Glade 2.x generated support.c */ static GtkWidget* -lookup_widget (GtkWidget *widget, - const gchar *widget_name) +lookup_widget(GtkWidget *widget, const gchar *widget_name) { GtkWidget *parent, *found_widget; @@ -495,6 +506,28 @@ } +static void handle_widget_property(GtkWidget *widget, GeanyPrefEntry *entry, + PrefAction action) +{ + GObject *object = G_OBJECT(widget); + const gchar *name = entry->fields; + + switch (action) + { + case PREF_DISPLAY: + g_object_set(object, name, entry->setting, NULL); + break; + case PREF_UPDATE: + if (entry->setting_type == G_TYPE_STRING) + g_free(entry->setting); + /* TODO: Which other types need freeing here? */ + + g_object_get(object, name, entry->setting, NULL); + break; + } +} + + static void pref_action(PrefAction action, GeanyPrefGroup *group, GtkWidget *owner) { GeanyPrefEntry *entry; @@ -503,9 +536,11 @@ { GtkWidget *widget; + /* ignore settings with no widgets */ if (entry->widget_type == G_TYPE_NONE) continue; + /* radio buttons have several widgets */ if (entry->widget_type == GTK_TYPE_RADIO_BUTTON) { handle_radio_buttons(owner, entry->fields, entry->setting, action); @@ -531,6 +566,8 @@ handle_combo_box_entry(widget, entry, action); else if (entry->widget_type == GTK_TYPE_ENTRY) handle_entry(widget, entry, action); + else if (entry->widget_type == G_TYPE_PARAM) + handle_widget_property(widget, entry, action); else g_warning("Unhandled type for %s::%s in %s()!", group->name, entry->key_name, G_STRFUNC); @@ -663,3 +700,33 @@ } +static GType object_get_property_type(GObject *object, const gchar *property_name) +{ + GObjectClass *klass = G_OBJECT_GET_CLASS(object); + GParamSpec *ps; + + ps = g_object_class_find_property(klass, property_name); + return ps->value_type; +} + + +/* Add a widget's read/write property to the stash group. The property will be set when calling + * stash_group_display(), and read when calling stash_group_update(). + * @param setting address of e.g. an integer if using an integer property. + * @param default_value should be cast into a pointer e.g. with @c GINT_TO_POINTER(). + * @param type can be 0 if passing a GtkWidget as the @a widget_id argument to look it up from the + * GObject data. + * @warning Currently only string GValue properties will be freed before setting; patch for + * other types - see handle_widget_property(). */ +void stash_group_add_widget_property(GeanyPrefGroup *group, gpointer setting, + const gchar *key_name, gpointer default_value, gpointer widget_id, + const gchar *property_name, GType type) +{ + if (!type) + type = object_get_property_type(G_OBJECT(widget_id), property_name); + + add_widget_pref(group, type, setting, key_name, default_value, + G_TYPE_PARAM, widget_id)->fields = (gchar*)property_name; +} + + Modified: trunk/src/stash.h =================================================================== --- trunk/src/stash.h 2009-07-20 11:21:05 UTC (rev 3995) +++ trunk/src/stash.h 2009-07-20 12:00:06 UTC (rev 3996) @@ -76,6 +76,10 @@ void stash_group_add_entry(GeanyPrefGroup *group, gchar **setting, const gchar *key_name, const gchar *default_value, gpointer widget_id); +void stash_group_add_widget_property(GeanyPrefGroup *group, gpointer setting, + const gchar *key_name, gpointer default_value, gpointer widget_id, + const gchar *property_name, GType type); + void stash_group_display(GeanyPrefGroup *group, GtkWidget *owner); void stash_group_update(GeanyPrefGroup *group, GtkWidget *owner); Modified: trunk/src/treeviews.c =================================================================== --- trunk/src/treeviews.c 2009-07-20 11:21:05 UTC (rev 3995) +++ trunk/src/treeviews.c 2009-07-20 12:00:06 UTC (rev 3996) @@ -885,24 +885,38 @@ } +GeanyPrefGroup *stash_group = NULL; + static void on_load_settings(void) { tag_window = ui_lookup_widget(main_widgets.window, "scrolledwindow2"); prepare_openfiles(); + /* note: ui_prefs.sidebar_page is reapplied after plugins are loaded */ + stash_group_display(stash_group, NULL); } +static void on_save_settings(void) +{ + stash_group_update(stash_group, NULL); +} + + void treeviews_init(void) { GeanyPrefGroup *group; group = stash_group_new(PACKAGE); stash_group_add_boolean(group, &documents_show_paths, "documents_show_paths", TRUE); + stash_group_add_widget_property(group, &ui_prefs.sidebar_page, "sidebar_page", GINT_TO_POINTER(0), + main_widgets.sidebar_notebook, "page", 0); configuration_add_pref_group(group, FALSE); + stash_group = group; /* delay building documents treeview until sidebar font has been read */ g_signal_connect(geany_object, "load-settings", on_load_settings, NULL); + g_signal_connect(geany_object, "save-settings", on_save_settings, NULL); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3995] trunk/src/utils.c
by ntrel＠users.sourceforge.net 20 Jul '09

20 Jul '09

Revision: 3995 http://geany.svn.sourceforge.net/geany/?rev=3995&view=rev Author: ntrel Date: 2009-07-20 11:21:05 +0000 (Mon, 20 Jul 2009) Log Message: ----------- Add warning about reusing string buffer in utils_build_path(). Modified Paths: -------------- trunk/src/utils.c Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2009-07-20 03:50:53 UTC (rev 3994) +++ trunk/src/utils.c 2009-07-20 11:21:05 UTC (rev 3995) @@ -1602,7 +1602,9 @@ /* Similar to g_build_path() but (re)using a fixed buffer, so never free it. * This assumes a small enough resulting string length to be kept without freeing, - * but this should be the case for filenames. */ + * but this should be the case for filenames. + * @warning As the buffer is reused, you can't call this recursively, e.g. for a + * function argument and within the function called. */ const gchar *utils_build_path(const gchar *first, ...) { static GString *buffer = NULL; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3994] branches/build-system
by elextr＠users.sourceforge.net 19 Jul '09

19 Jul '09

Revision: 3994 http://geany.svn.sourceforge.net/geany/?rev=3994&view=rev Author: elextr Date: 2009-07-20 03:50:53 +0000 (Mon, 20 Jul 2009) Log Message: ----------- Updated Manual to build-system capabilities Modified Paths: -------------- branches/build-system/ChangeLog branches/build-system/doc/geany.html branches/build-system/doc/geany.txt Modified: branches/build-system/ChangeLog =================================================================== --- branches/build-system/ChangeLog 2009-07-19 20:19:09 UTC (rev 3993) +++ branches/build-system/ChangeLog 2009-07-20 03:50:53 UTC (rev 3994) @@ -1,3 +1,9 @@ +2009-07-20 Lex Trotman <elextr(at)gmail(dot)com> + + * doc/geany.txt + Updated manual to match build-menu capability. + + 2009-07-19 Lex Trotman <elextr(at)gmail(dot)com> * src/build.c, src/build.h Modified: branches/build-system/doc/geany.html =================================================================== --- branches/build-system/doc/geany.html 2009-07-19 20:19:09 UTC (rev 3993) +++ branches/build-system/doc/geany.html 2009-07-20 03:50:53 UTC (rev 3994) @@ -6,7 +6,7 @@ <meta name="generator" content="Docutils 0.4: http://docutils.sourceforge.net/" /> <title>Geany</title> <meta name="authors" content="Enrico Tröger Nick Treleaven Frank Lanitz" /> -<meta name="date" content="2009-07-09" /> +<meta name="date" content="2009-07-17" /> <style type="text/css"> /* @@ -139,7 +139,7 @@ <br />Nick Treleaven <br />Frank Lanitz</td></tr> <tr><th class="docinfo-name">Date:</th> -<td>2009-07-09</td></tr> +<td>2009-07-17</td></tr> <tr><th class="docinfo-name">Version:</th> <td>0.18</td></tr> </tbody> @@ -153,175 +153,174 @@ <div class="contents topic"> <p class="topic-title first"><a id="contents" name="contents">Contents</a></p> <ul class="simple"> -<li><a class="reference" href="#introduction" id="id11" name="id11">Introduction</a><ul> -<li><a class="reference" href="#about-geany" id="id12" name="id12">About Geany</a></li> -<li><a class="reference" href="#where-to-get-it" id="id13" name="id13">Where to get it</a></li> -<li><a class="reference" href="#license" id="id14" name="id14">License</a></li> -<li><a class="reference" href="#about-this-document" id="id15" name="id15">About this document</a></li> +<li><a class="reference" href="#introduction" id="id12" name="id12">Introduction</a><ul> +<li><a class="reference" href="#about-geany" id="id13" name="id13">About Geany</a></li> +<li><a class="reference" href="#where-to-get-it" id="id14" name="id14">Where to get it</a></li> +<li><a class="reference" href="#license" id="id15" name="id15">License</a></li> +<li><a class="reference" href="#about-this-document" id="id16" name="id16">About this document</a></li> </ul> </li> -<li><a class="reference" href="#installation" id="id16" name="id16">Installation</a><ul> -<li><a class="reference" href="#requirements" id="id17" name="id17">Requirements</a></li> -<li><a class="reference" href="#binary-packages" id="id18" name="id18">Binary packages</a></li> -<li><a class="reference" href="#source-compilation" id="id19" name="id19">Source compilation</a><ul> -<li><a class="reference" href="#autotools-based-build-system" id="id20" name="id20">Autotools based build system</a></li> -<li><a class="reference" href="#waf-based-build-system" id="id21" name="id21">Waf based build system</a><ul> -<li><a class="reference" href="#waf-cache" id="id22" name="id22">Waf Cache</a><ul> -<li><a class="reference" href="#cleaning-the-cache" id="id23" name="id23">Cleaning the Cache</a></li> +<li><a class="reference" href="#installation" id="id17" name="id17">Installation</a><ul> +<li><a class="reference" href="#requirements" id="id18" name="id18">Requirements</a></li> +<li><a class="reference" href="#binary-packages" id="id19" name="id19">Binary packages</a></li> +<li><a class="reference" href="#source-compilation" id="id20" name="id20">Source compilation</a><ul> +<li><a class="reference" href="#autotools-based-build-system" id="id21" name="id21">Autotools based build system</a></li> +<li><a class="reference" href="#waf-based-build-system" id="id22" name="id22">Waf based build system</a><ul> +<li><a class="reference" href="#waf-cache" id="id23" name="id23">Waf Cache</a><ul> +<li><a class="reference" href="#cleaning-the-cache" id="id24" name="id24">Cleaning the Cache</a></li> </ul> </li> </ul> </li> -<li><a class="reference" href="#custom-installation" id="id24" name="id24">Custom installation</a></li> -<li><a class="reference" href="#dynamic-linking-loader-support" id="id25" name="id25">Dynamic linking loader support</a></li> -<li><a class="reference" href="#build-problems" id="id26" name="id26">Build problems</a></li> +<li><a class="reference" href="#custom-installation" id="id25" name="id25">Custom installation</a></li> +<li><a class="reference" href="#dynamic-linking-loader-support" id="id26" name="id26">Dynamic linking loader support</a></li> +<li><a class="reference" href="#build-problems" id="id27" name="id27">Build problems</a></li> </ul> </li> -<li><a class="reference" href="#installation-prefix" id="id27" name="id27">Installation prefix</a></li> +<li><a class="reference" href="#installation-prefix" id="id28" name="id28">Installation prefix</a></li> </ul> </li> -<li><a class="reference" href="#usage" id="id28" name="id28">Usage</a><ul> -<li><a class="reference" href="#getting-started" id="id29" name="id29">Getting started</a></li> -<li><a class="reference" href="#command-line-options" id="id30" name="id30">Command line options</a></li> -<li><a class="reference" href="#general" id="id31" name="id31">General</a><ul> -<li><a class="reference" href="#startup" id="id32" name="id32">Startup</a></li> -<li><a class="reference" href="#opening-files-from-the-command-line-in-a-running-instance" id="id33" name="id33">Opening files from the command-line in a running instance</a></li> -<li><a class="reference" href="#virtual-terminal-emulator-widget-vte" id="id34" name="id34">Virtual terminal emulator widget (VTE)</a></li> -<li><a class="reference" href="#defining-own-widget-styles-using-gtkrc-2-0" id="id35" name="id35">Defining own widget styles using .gtkrc-2.0</a></li> +<li><a class="reference" href="#usage" id="id29" name="id29">Usage</a><ul> +<li><a class="reference" href="#getting-started" id="id30" name="id30">Getting started</a></li> +<li><a class="reference" href="#command-line-options" id="id31" name="id31">Command line options</a></li> +<li><a class="reference" href="#general" id="id32" name="id32">General</a><ul> +<li><a class="reference" href="#startup" id="id33" name="id33">Startup</a></li> +<li><a class="reference" href="#opening-files-from-the-command-line-in-a-running-instance" id="id34" name="id34">Opening files from the command-line in a running instance</a></li> +<li><a class="reference" href="#virtual-terminal-emulator-widget-vte" id="id35" name="id35">Virtual terminal emulator widget (VTE)</a></li> +<li><a class="reference" href="#defining-own-widget-styles-using-gtkrc-2-0" id="id36" name="id36">Defining own widget styles using .gtkrc-2.0</a></li> </ul> </li> -<li><a class="reference" href="#documents" id="id36" name="id36">Documents</a><ul> -<li><a class="reference" href="#switching-between-documents" id="id37" name="id37">Switching between documents</a></li> +<li><a class="reference" href="#documents" id="id37" name="id37">Documents</a><ul> +<li><a class="reference" href="#switching-between-documents" id="id38" name="id38">Switching between documents</a></li> </ul> </li> -<li><a class="reference" href="#character-sets-and-unicode-byte-order-mark-bom" id="id38" name="id38">Character sets and Unicode Byte-Order-Mark (BOM)</a><ul> -<li><a class="reference" href="#using-character-sets" id="id39" name="id39">Using character sets</a></li> -<li><a class="reference" href="#in-file-encoding-specification" id="id40" name="id40">In-file encoding specification</a></li> -<li><a class="reference" href="#special-encoding-none" id="id41" name="id41">Special encoding "None"</a></li> -<li><a class="reference" href="#unicode-byte-order-mark-bom" id="id42" name="id42">Unicode Byte-Order-Mark (BOM)</a></li> +<li><a class="reference" href="#character-sets-and-unicode-byte-order-mark-bom" id="id39" name="id39">Character sets and Unicode Byte-Order-Mark (BOM)</a><ul> +<li><a class="reference" href="#using-character-sets" id="id40" name="id40">Using character sets</a></li> +<li><a class="reference" href="#in-file-encoding-specification" id="id41" name="id41">In-file encoding specification</a></li> +<li><a class="reference" href="#special-encoding-none" id="id42" name="id42">Special encoding "None"</a></li> +<li><a class="reference" href="#unicode-byte-order-mark-bom" id="id43" name="id43">Unicode Byte-Order-Mark (BOM)</a></li> </ul> </li> -<li><a class="reference" href="#editing" id="id43" name="id43">Editing</a><ul> -<li><a class="reference" href="#folding" id="id44" name="id44">Folding</a></li> -<li><a class="reference" href="#column-mode-editing-rectangular-selections" id="id45" name="id45">Column mode editing (rectangular selections)</a></li> -<li><a class="reference" href="#drag-and-drop-of-text" id="id46" name="id46">Drag and drop of text</a></li> -<li><a class="reference" href="#indentation" id="id47" name="id47">Indentation</a></li> -<li><a class="reference" href="#auto-indentation" id="id48" name="id48">Auto-indentation</a></li> -<li><a class="reference" href="#bookmarks" id="id49" name="id49">Bookmarks</a></li> -<li><a class="reference" href="#code-navigation-history" id="id50" name="id50">Code Navigation History</a></li> -<li><a class="reference" href="#send-text-through-definable-commands" id="id51" name="id51">Send text through definable commands</a></li> -<li><a class="reference" href="#context-actions" id="id52" name="id52">Context actions</a></li> -<li><a class="reference" href="#user-definable-snippets" id="id53" name="id53">User-definable snippets</a></li> -<li><a class="reference" href="#inserting-unicode-characters" id="id54" name="id54">Inserting Unicode characters</a></li> +<li><a class="reference" href="#editing" id="id44" name="id44">Editing</a><ul> +<li><a class="reference" href="#folding" id="id45" name="id45">Folding</a></li> +<li><a class="reference" href="#column-mode-editing-rectangular-selections" id="id46" name="id46">Column mode editing (rectangular selections)</a></li> +<li><a class="reference" href="#drag-and-drop-of-text" id="id47" name="id47">Drag and drop of text</a></li> +<li><a class="reference" href="#indentation" id="id48" name="id48">Indentation</a></li> +<li><a class="reference" href="#auto-indentation" id="id49" name="id49">Auto-indentation</a></li> +<li><a class="reference" href="#bookmarks" id="id50" name="id50">Bookmarks</a></li> +<li><a class="reference" href="#code-navigation-history" id="id51" name="id51">Code Navigation History</a></li> +<li><a class="reference" href="#send-text-through-definable-commands" id="id52" name="id52">Send text through definable commands</a></li> +<li><a class="reference" href="#context-actions" id="id53" name="id53">Context actions</a></li> +<li><a class="reference" href="#user-definable-snippets" id="id54" name="id54">User-definable snippets</a></li> +<li><a class="reference" href="#inserting-unicode-characters" id="id55" name="id55">Inserting Unicode characters</a></li> </ul> </li> -<li><a class="reference" href="#search-replace-and-go-to" id="id55" name="id55">Search, replace and go to</a><ul> -<li><a class="reference" href="#find" id="id56" name="id56">Find</a><ul> -<li><a class="reference" href="#matching-options" id="id57" name="id57">Matching options</a></li> -<li><a class="reference" href="#find-all" id="id58" name="id58">Find all</a></li> -<li><a class="reference" href="#change-font-in-search-dialog-text-fields" id="id59" name="id59">Change font in search dialog text fields</a></li> +<li><a class="reference" href="#search-replace-and-go-to" id="id56" name="id56">Search, replace and go to</a><ul> +<li><a class="reference" href="#find" id="id57" name="id57">Find</a><ul> +<li><a class="reference" href="#matching-options" id="id58" name="id58">Matching options</a></li> +<li><a class="reference" href="#find-all" id="id59" name="id59">Find all</a></li> +<li><a class="reference" href="#change-font-in-search-dialog-text-fields" id="id60" name="id60">Change font in search dialog text fields</a></li> </ul> </li> -<li><a class="reference" href="#find-usage" id="id60" name="id60">Find usage</a></li> -<li><a class="reference" href="#find-in-files" id="id61" name="id61">Find in files</a><ul> -<li><a class="reference" href="#filtering-out-version-control-files" id="id62" name="id62">Filtering out version control files</a></li> +<li><a class="reference" href="#find-usage" id="id61" name="id61">Find usage</a></li> +<li><a class="reference" href="#find-in-files" id="id62" name="id62">Find in files</a><ul> +<li><a class="reference" href="#filtering-out-version-control-files" id="id63" name="id63">Filtering out version control files</a></li> </ul> </li> -<li><a class="reference" href="#replace" id="id63" name="id63">Replace</a><ul> -<li><a class="reference" href="#replace-all" id="id64" name="id64">Replace all</a></li> +<li><a class="reference" href="#replace" id="id64" name="id64">Replace</a><ul> +<li><a class="reference" href="#replace-all" id="id65" name="id65">Replace all</a></li> </ul> </li> -<li><a class="reference" href="#go-to-tag-definition" id="id65" name="id65">Go to tag definition</a></li> -<li><a class="reference" href="#go-to-tag-declaration" id="id66" name="id66">Go to tag declaration</a></li> -<li><a class="reference" href="#go-to-line" id="id67" name="id67">Go to line</a></li> -<li><a class="reference" href="#regular-expressions" id="id68" name="id68">Regular expressions</a></li> +<li><a class="reference" href="#go-to-tag-definition" id="id66" name="id66">Go to tag definition</a></li> +<li><a class="reference" href="#go-to-tag-declaration" id="id67" name="id67">Go to tag declaration</a></li> +<li><a class="reference" href="#go-to-line" id="id68" name="id68">Go to line</a></li> +<li><a class="reference" href="#regular-expressions" id="id69" name="id69">Regular expressions</a></li> </ul> </li> -<li><a class="reference" href="#tags" id="id69" name="id69">Tags</a><ul> -<li><a class="reference" href="#workspace-tags" id="id70" name="id70">Workspace tags</a></li> -<li><a class="reference" href="#global-tags" id="id71" name="id71">Global tags</a><ul> -<li><a class="reference" href="#default-global-tags-files" id="id72" name="id72">Default global tags files</a></li> -<li><a class="reference" href="#global-tags-file-format" id="id73" name="id73">Global tags file format</a></li> -<li><a class="reference" href="#generating-a-global-tags-file" id="id74" name="id74">Generating a global tags file</a></li> +<li><a class="reference" href="#tags" id="id70" name="id70">Tags</a><ul> +<li><a class="reference" href="#workspace-tags" id="id71" name="id71">Workspace tags</a></li> +<li><a class="reference" href="#global-tags" id="id72" name="id72">Global tags</a><ul> +<li><a class="reference" href="#default-global-tags-files" id="id73" name="id73">Default global tags files</a></li> +<li><a class="reference" href="#global-tags-file-format" id="id74" name="id74">Global tags file format</a></li> +<li><a class="reference" href="#generating-a-global-tags-file" id="id75" name="id75">Generating a global tags file</a></li> </ul> </li> -<li><a class="reference" href="#ignore-tags" id="id75" name="id75">Ignore tags</a></li> +<li><a class="reference" href="#ignore-tags" id="id76" name="id76">Ignore tags</a></li> </ul> </li> -<li><a class="reference" href="#preferences" id="id76" name="id76">Preferences</a><ul> -<li><a class="reference" href="#general-startup-tab-in-preferences-dialog" id="id77" name="id77">General Startup tab in preferences dialog</a><ul> -<li><a class="reference" href="#id1" id="id78" name="id78">Startup</a></li> -<li><a class="reference" href="#shutdown" id="id79" name="id79">Shutdown</a></li> -<li><a class="reference" href="#paths" id="id80" name="id80">Paths</a></li> +<li><a class="reference" href="#preferences" id="id77" name="id77">Preferences</a><ul> +<li><a class="reference" href="#general-startup-tab-in-preferences-dialog" id="id78" name="id78">General Startup tab in preferences dialog</a><ul> +<li><a class="reference" href="#id1" id="id79" name="id79">Startup</a></li> +<li><a class="reference" href="#shutdown" id="id80" name="id80">Shutdown</a></li> +<li><a class="reference" href="#paths" id="id81" name="id81">Paths</a></li> </ul> </li> -<li><a class="reference" href="#general-miscellaneous-tab-in-preferences-dialog" id="id81" name="id81">General Miscellaneous tab in preferences dialog</a><ul> -<li><a class="reference" href="#miscellaneous" id="id82" name="id82">Miscellaneous</a></li> +<li><a class="reference" href="#general-miscellaneous-tab-in-preferences-dialog" id="id82" name="id82">General Miscellaneous tab in preferences dialog</a><ul> +<li><a class="reference" href="#miscellaneous" id="id83" name="id83">Miscellaneous</a></li> </ul> </li> -<li><a class="reference" href="#search" id="id83" name="id83">Search</a><ul> -<li><a class="reference" href="#projects" id="id84" name="id84">Projects</a></li> +<li><a class="reference" href="#search" id="id84" name="id84">Search</a><ul> +<li><a class="reference" href="#projects" id="id85" name="id85">Projects</a></li> </ul> </li> -<li><a class="reference" href="#interface-tab-in-preferences-dialog" id="id85" name="id85">Interface tab in preferences dialog</a><ul> -<li><a class="reference" href="#sidebar" id="id86" name="id86">Sidebar</a></li> -<li><a class="reference" href="#fonts" id="id87" name="id87">Fonts</a></li> -<li><a class="reference" href="#editor-tabs" id="id88" name="id88">Editor tabs</a></li> -<li><a class="reference" href="#tab-positions" id="id89" name="id89">Tab positions</a></li> -<li><a class="reference" href="#id2" id="id90" name="id90">Miscellaneous</a></li> +<li><a class="reference" href="#interface-tab-in-preferences-dialog" id="id86" name="id86">Interface tab in preferences dialog</a><ul> +<li><a class="reference" href="#sidebar" id="id87" name="id87">Sidebar</a></li> +<li><a class="reference" href="#fonts" id="id88" name="id88">Fonts</a></li> +<li><a class="reference" href="#editor-tabs" id="id89" name="id89">Editor tabs</a></li> +<li><a class="reference" href="#tab-positions" id="id90" name="id90">Tab positions</a></li> +<li><a class="reference" href="#id2" id="id91" name="id91">Miscellaneous</a></li> </ul> </li> -<li><a class="reference" href="#toolbar-tab-in-preferences-dialog" id="id91" name="id91">Toolbar tab in preferences dialog</a><ul> -<li><a class="reference" href="#toolbar" id="id92" name="id92">Toolbar</a></li> -<li><a class="reference" href="#appearance" id="id93" name="id93">Appearance</a></li> +<li><a class="reference" href="#toolbar-tab-in-preferences-dialog" id="id92" name="id92">Toolbar tab in preferences dialog</a><ul> +<li><a class="reference" href="#toolbar" id="id93" name="id93">Toolbar</a></li> +<li><a class="reference" href="#appearance" id="id94" name="id94">Appearance</a></li> </ul> </li> -<li><a class="reference" href="#editor-features-tab-in-preferences-dialog" id="id94" name="id94">Editor Features tab in preferences dialog</a><ul> -<li><a class="reference" href="#features" id="id95" name="id95">Features</a></li> +<li><a class="reference" href="#editor-features-tab-in-preferences-dialog" id="id95" name="id95">Editor Features tab in preferences dialog</a><ul> +<li><a class="reference" href="#features" id="id96" name="id96">Features</a></li> </ul> </li> -<li><a class="reference" href="#editor-indentation-tab-in-preferences-dialog" id="id96" name="id96">Editor Indentation tab in preferences dialog</a><ul> -<li><a class="reference" href="#indentation-group" id="id97" name="id97">Indentation group</a></li> +<li><a class="reference" href="#editor-indentation-tab-in-preferences-dialog" id="id97" name="id97">Editor Indentation tab in preferences dialog</a><ul> +<li><a class="reference" href="#indentation-group" id="id98" name="id98">Indentation group</a></li> </ul> </li> -<li><a class="reference" href="#editor-completions-tab-in-preferences-dialog" id="id98" name="id98">Editor Completions tab in preferences dialog</a><ul> -<li><a class="reference" href="#completions" id="id99" name="id99">Completions</a></li> -<li><a class="reference" href="#auto-close-quotes-and-brackets" id="id100" name="id100">Auto-close quotes and brackets</a></li> +<li><a class="reference" href="#editor-completions-tab-in-preferences-dialog" id="id99" name="id99">Editor Completions tab in preferences dialog</a><ul> +<li><a class="reference" href="#completions" id="id100" name="id100">Completions</a></li> +<li><a class="reference" href="#auto-close-quotes-and-brackets" id="id101" name="id101">Auto-close quotes and brackets</a></li> </ul> </li> -<li><a class="reference" href="#editor-display-tab-in-preferences-dialog" id="id101" name="id101">Editor Display tab in preferences dialog</a><ul> -<li><a class="reference" href="#display" id="id102" name="id102">Display</a></li> -<li><a class="reference" href="#long-line-marker" id="id103" name="id103">Long line marker</a></li> +<li><a class="reference" href="#editor-display-tab-in-preferences-dialog" id="id102" name="id102">Editor Display tab in preferences dialog</a><ul> +<li><a class="reference" href="#display" id="id103" name="id103">Display</a></li> +<li><a class="reference" href="#long-line-marker" id="id104" name="id104">Long line marker</a></li> </ul> </li> -<li><a class="reference" href="#files-tab-in-preferences-dialog" id="id104" name="id104">Files tab in preferences dialog</a><ul> -<li><a class="reference" href="#new-files" id="id105" name="id105">New files</a></li> -<li><a class="reference" href="#saving-files" id="id106" name="id106">Saving files</a></li> -<li><a class="reference" href="#id3" id="id107" name="id107">Miscellaneous</a></li> +<li><a class="reference" href="#files-tab-in-preferences-dialog" id="id105" name="id105">Files tab in preferences dialog</a><ul> +<li><a class="reference" href="#new-files" id="id106" name="id106">New files</a></li> +<li><a class="reference" href="#saving-files" id="id107" name="id107">Saving files</a></li> +<li><a class="reference" href="#id3" id="id108" name="id108">Miscellaneous</a></li> </ul> </li> -<li><a class="reference" href="#tools-tab-in-preferences-dialog" id="id108" name="id108">Tools tab in preferences dialog</a><ul> -<li><a class="reference" href="#tool-paths" id="id109" name="id109">Tool paths</a></li> -<li><a class="reference" href="#commands" id="id110" name="id110">Commands</a></li> +<li><a class="reference" href="#tools-tab-in-preferences-dialog" id="id109" name="id109">Tools tab in preferences dialog</a><ul> +<li><a class="reference" href="#tool-paths" id="id110" name="id110">Tool paths</a></li> +<li><a class="reference" href="#commands" id="id111" name="id111">Commands</a></li> </ul> </li> -<li><a class="reference" href="#template-tab-in-preferences-dialog" id="id111" name="id111">Template tab in preferences dialog</a><ul> -<li><a class="reference" href="#template-data" id="id112" name="id112">Template data</a></li> +<li><a class="reference" href="#template-tab-in-preferences-dialog" id="id112" name="id112">Template tab in preferences dialog</a><ul> +<li><a class="reference" href="#template-data" id="id113" name="id113">Template data</a></li> </ul> </li> -<li><a class="reference" href="#keybinding-tab-in-preferences-dialog" id="id113" name="id113">Keybinding tab in preferences dialog</a></li> -<li><a class="reference" href="#printing-tab-in-preferences-dialog" id="id114" name="id114">Printing tab in preferences dialog</a></li> -<li><a class="reference" href="#terminal-vte-tab-in-preferences-dialog" id="id115" name="id115">Terminal (VTE) tab in preferences dialog</a><ul> -<li><a class="reference" href="#terminal-widget" id="id116" name="id116">Terminal widget</a></li> +<li><a class="reference" href="#keybinding-tab-in-preferences-dialog" id="id114" name="id114">Keybinding tab in preferences dialog</a></li> +<li><a class="reference" href="#printing-tab-in-preferences-dialog" id="id115" name="id115">Printing tab in preferences dialog</a></li> +<li><a class="reference" href="#terminal-vte-tab-in-preferences-dialog" id="id116" name="id116">Terminal (VTE) tab in preferences dialog</a><ul> +<li><a class="reference" href="#terminal-widget" id="id117" name="id117">Terminal widget</a></li> </ul> </li> </ul> </li> -<li><a class="reference" href="#project-management" id="id117" name="id117">Project Management</a><ul> -<li><a class="reference" href="#new-project" id="id118" name="id118">New Project</a></li> -<li><a class="reference" href="#project-properties" id="id119" name="id119">Project Properties</a><ul> -<li><a class="reference" href="#make-in-base-path" id="id120" name="id120">Make in base path</a></li> -<li><a class="reference" href="#run-command" id="id121" name="id121">Run command</a></li> +<li><a class="reference" href="#project-management" id="id118" name="id118">Project Management</a><ul> +<li><a class="reference" href="#new-project" id="id119" name="id119">New Project</a></li> +<li><a class="reference" href="#project-properties" id="id120" name="id120">Project Properties</a><ul> +<li><a class="reference" href="#set-base-path-button" id="id121" name="id121">Set Base Path Button</a></li> </ul> </li> <li><a class="reference" href="#open-project" id="id122" name="id122">Open Project</a></li> @@ -336,103 +335,119 @@ <li><a class="reference" href="#make" id="id129" name="id129">Make</a></li> <li><a class="reference" href="#make-custom-target" id="id130" name="id130">Make custom target</a></li> <li><a class="reference" href="#make-object" id="id131" name="id131">Make object</a></li> -<li><a class="reference" href="#execute" id="id132" name="id132">Execute</a></li> -<li><a class="reference" href="#stopping-running-processes" id="id133" name="id133">Stopping running processes</a><ul> -<li><a class="reference" href="#terminal-emulators" id="id134" name="id134">Terminal emulators</a></li> +<li><a class="reference" href="#next-error" id="id132" name="id132">Next Error</a></li> +<li><a class="reference" href="#previous-error" id="id133" name="id133">Previous Error</a></li> +<li><a class="reference" href="#execute" id="id134" name="id134">Execute</a></li> +<li><a class="reference" href="#stopping-running-processes" id="id135" name="id135">Stopping running processes</a><ul> +<li><a class="reference" href="#terminal-emulators" id="id136" name="id136">Terminal emulators</a></li> </ul> </li> -<li><a class="reference" href="#set-build-commands" id="id135" name="id135">Set Build Commands</a></li> +<li><a class="reference" href="#set-build-commands" id="id137" name="id137">Set Build Commands</a></li> </ul> </li> -<li><a class="reference" href="#build-menu-configuration" id="id136" name="id136">Build Menu Configuration</a></li> -<li><a class="reference" href="#build-menu-commands-dialog" id="id137" name="id137">Build Menu Commands Dialog</a></li> +<li><a class="reference" href="#build-menu-configuration" id="id138" name="id138">Build Menu Configuration</a></li> +<li><a class="reference" href="#build-menu-commands-dialog" id="id139" name="id139">Build Menu Commands Dialog</a><ul> +<li><a class="reference" href="#substitutions-in-commands-and-working-directories" id="id140" name="id140">Substitutions in Commands and Working Directories</a></li> +<li><a class="reference" href="#build-menu-keyboard-shortcuts" id="id141" name="id141">Build Menu Keyboard Shortcuts</a></li> +<li><a class="reference" href="#configuration-files" id="id142" name="id142">Configuration Files</a></li> </ul> </li> -<li><a class="reference" href="#printing-support" id="id138" name="id138">Printing support</a></li> -<li><a class="reference" href="#plugins" id="id139" name="id139">Plugins</a></li> -<li><a class="reference" href="#keybindings" id="id140" name="id140">Keybindings</a><ul> -<li><a class="reference" href="#switching-documents" id="id141" name="id141">Switching documents</a></li> -<li><a class="reference" href="#configurable-keybindings" id="id142" name="id142">Configurable keybindings</a></li> </ul> </li> +<li><a class="reference" href="#printing-support" id="id143" name="id143">Printing support</a></li> +<li><a class="reference" href="#plugins" id="id144" name="id144">Plugins</a></li> +<li><a class="reference" href="#keybindings" id="id145" name="id145">Keybindings</a><ul> +<li><a class="reference" href="#switching-documents" id="id146" name="id146">Switching documents</a></li> +<li><a class="reference" href="#configurable-keybindings" id="id147" name="id147">Configurable keybindings</a></li> </ul> </li> -<li><a class="reference" href="#configuration-files" id="id143" name="id143">Configuration files</a><ul> -<li><a class="reference" href="#global-configuration-file" id="id144" name="id144">Global configuration file</a></li> -<li><a class="reference" href="#filetype-definition-files" id="id145" name="id145">Filetype definition files</a><ul> -<li><a class="reference" href="#format" id="id146" name="id146">Format</a><ul> -<li><a class="reference" href="#styling-section" id="id147" name="id147">[styling] Section</a><ul> -<li><a class="reference" href="#using-a-named-style" id="id148" name="id148">Using a named style</a></li> </ul> </li> -<li><a class="reference" href="#keywords-section" id="id149" name="id149">[keywords] Section</a></li> -<li><a class="reference" href="#settings-section" id="id150" name="id150">[settings] Section</a></li> -<li><a class="reference" href="#build-settings-section" id="id151" name="id151">[build_settings] Section</a></li> +<li><a class="reference" href="#id4" id="id148" name="id148">Configuration files</a><ul> +<li><a class="reference" href="#global-configuration-file" id="id149" name="id149">Global configuration file</a></li> +<li><a class="reference" href="#filetype-definition-files" id="id150" name="id150">Filetype definition files</a><ul> +<li><a class="reference" href="#format" id="id151" name="id151">Format</a><ul> +<li><a class="reference" href="#styling-section" id="id152" name="id152">[styling] Section</a><ul> +<li><a class="reference" href="#using-a-named-style" id="id153" name="id153">Using a named style</a></li> </ul> </li> -<li><a class="reference" href="#special-file-filetypes-common" id="id152" name="id152">Special file filetypes.common</a><ul> -<li><a class="reference" href="#named-styles-section" id="id153" name="id153">[named_styles] Section</a></li> -<li><a class="reference" href="#id4" id="id154" name="id154">[styling] Section</a></li> -<li><a class="reference" href="#id5" id="id155" name="id155">[settings] Section</a></li> +<li><a class="reference" href="#keywords-section" id="id154" name="id154">[keywords] Section</a></li> +<li><a class="reference" href="#settings-section" id="id155" name="id155">[settings] Section</a></li> +<li><a class="reference" href="#build-settings-section" id="id156" name="id156">[build_settings] Section</a></li> </ul> </li> +<li><a class="reference" href="#special-file-filetypes-common" id="id157" name="id157">Special file filetypes.common</a><ul> +<li><a class="reference" href="#named-styles-section" id="id158" name="id158">[named_styles] Section</a></li> +<li><a class="reference" href="#id5" id="id159" name="id159">[styling] Section</a></li> +<li><a class="reference" href="#id6" id="id160" name="id160">[settings] Section</a></li> </ul> </li> -<li><a class="reference" href="#filetype-extensions" id="id156" name="id156">Filetype extensions</a></li> -<li><a class="reference" href="#templates" id="id157" name="id157">Templates</a><ul> -<li><a class="reference" href="#template-meta-data" id="id158" name="id158">Template meta data</a></li> -<li><a class="reference" href="#file-templates" id="id159" name="id159">File templates</a><ul> -<li><a class="reference" href="#custom-file-templates" id="id160" name="id160">Custom file templates</a></li> -<li><a class="reference" href="#filetype-templates" id="id161" name="id161">Filetype templates</a></li> </ul> </li> -<li><a class="reference" href="#customizing-templates" id="id162" name="id162">Customizing templates</a><ul> -<li><a class="reference" href="#template-wildcards" id="id163" name="id163">Template wildcards</a></li> +<li><a class="reference" href="#filetype-extensions" id="id161" name="id161">Filetype extensions</a></li> +<li><a class="reference" href="#preferences-file-format" id="id162" name="id162">Preferences File Format</a><ul> +<li><a class="reference" href="#hidden-preferences" id="id163" name="id163">Hidden preferences</a></li> +<li><a class="reference" href="#build-menu-section" id="id164" name="id164">[build-menu] Section</a></li> </ul> </li> +<li><a class="reference" href="#project-file-format" id="id165" name="id165">Project File Format</a><ul> +<li><a class="reference" href="#build-menu-additions" id="id166" name="id166">[build-menu] Additions</a></li> </ul> </li> -<li><a class="reference" href="#customizing-the-toolbar" id="id164" name="id164">Customizing the toolbar</a><ul> -<li><a class="reference" href="#manually-editing-of-the-toolbar-layout" id="id165" name="id165">Manually editing of the toolbar layout</a></li> -<li><a class="reference" href="#available-toolbar-elements" id="id166" name="id166">Available toolbar elements</a></li> +<li><a class="reference" href="#templates" id="id167" name="id167">Templates</a><ul> +<li><a class="reference" href="#template-meta-data" id="id168" name="id168">Template meta data</a></li> +<li><a class="reference" href="#file-templates" id="id169" name="id169">File templates</a><ul> +<li><a class="reference" href="#custom-file-templates" id="id170" name="id170">Custom file templates</a></li> +<li><a class="reference" href="#filetype-templates" id="id171" name="id171">Filetype templates</a></li> </ul> </li> +<li><a class="reference" href="#customizing-templates" id="id172" name="id172">Customizing templates</a><ul> +<li><a class="reference" href="#template-wildcards" id="id173" name="id173">Template wildcards</a></li> </ul> </li> -<li><a class="reference" href="#plugin-documentation" id="id167" name="id167">Plugin documentation</a><ul> -<li><a class="reference" href="#instant-save" id="id168" name="id168">Instant Save</a></li> -<li><a class="reference" href="#backup-copy" id="id169" name="id169">Backup Copy</a></li> </ul> </li> -<li><a class="reference" href="#contributing-to-this-document" id="id170" name="id170">Contributing to this document</a></li> -<li><a class="reference" href="#scintilla-keyboard-commands" id="id171" name="id171">Scintilla keyboard commands</a><ul> -<li><a class="reference" href="#keyboard-commands" id="id172" name="id172">Keyboard commands</a></li> +<li><a class="reference" href="#customizing-the-toolbar" id="id174" name="id174">Customizing the toolbar</a><ul> +<li><a class="reference" href="#manually-editing-of-the-toolbar-layout" id="id175" name="id175">Manually editing of the toolbar layout</a></li> +<li><a class="reference" href="#available-toolbar-elements" id="id176" name="id176">Available toolbar elements</a></li> </ul> </li> -<li><a class="reference" href="#tips-and-tricks" id="id173" name="id173">Tips and tricks</a><ul> -<li><a class="reference" href="#document-notebook" id="id174" name="id174">Document notebook</a></li> -<li><a class="reference" href="#editor" id="id175" name="id175">Editor</a></li> -<li><a class="reference" href="#interface" id="id176" name="id176">Interface</a></li> -<li><a class="reference" href="#gtk-related" id="id177" name="id177">GTK-related</a></li> </ul> </li> -<li><a class="reference" href="#hidden-preferences" id="id178" name="id178">Hidden preferences</a></li> -<li><a class="reference" href="#compile-time-options" id="id179" name="id179">Compile-time options</a><ul> -<li><a class="reference" href="#src-geany-h" id="id180" name="id180">src/geany.h</a></li> -<li><a class="reference" href="#project-h" id="id181" name="id181">project.h</a></li> -<li><a class="reference" href="#editor-h" id="id182" name="id182">editor.h</a></li> -<li><a class="reference" href="#keyfile-c" id="id183" name="id183">keyfile.c</a></li> -<li><a class="reference" href="#build-h" id="id184" name="id184">build.h</a></li> +<li><a class="reference" href="#plugin-documentation" id="id177" name="id177">Plugin documentation</a><ul> +<li><a class="reference" href="#instant-save" id="id178" name="id178">Instant Save</a></li> +<li><a class="reference" href="#backup-copy" id="id179" name="id179">Backup Copy</a></li> </ul> </li> -<li><a class="reference" href="#gnu-general-public-license" id="id185" name="id185">GNU General Public License</a></li> -<li><a class="reference" href="#license-for-scintilla-and-scite" id="id186" name="id186">License for Scintilla and SciTE</a></li> +<li><a class="reference" href="#contributing-to-this-document" id="id180" name="id180">Contributing to this document</a></li> +<li><a class="reference" href="#scintilla-keyboard-commands" id="id181" name="id181">Scintilla keyboard commands</a><ul> +<li><a class="reference" href="#keyboard-commands" id="id182" name="id182">Keyboard commands</a></li> </ul> +</li> +<li><a class="reference" href="#tips-and-tricks" id="id183" name="id183">Tips and tricks</a><ul> +<li><a class="reference" href="#document-notebook" id="id184" name="id184">Document notebook</a></li> +<li><a class="reference" href="#editor" id="id185" name="id185">Editor</a></li> +<li><a class="reference" href="#interface" id="id186" name="id186">Interface</a></li> +<li><a class="reference" href="#gtk-related" id="id187" name="id187">GTK-related</a></li> +</ul> +</li> +<li><a class="reference" href="#compile-time-options" id="id188" name="id188">Compile-time options</a><ul> +<li><a class="reference" href="#src-geany-h" id="id189" name="id189">src/geany.h</a></li> +<li><a class="reference" href="#project-h" id="id190" name="id190">project.h</a></li> +<li><a class="reference" href="#editor-h" id="id191" name="id191">editor.h</a></li> +<li><a class="reference" href="#keyfile-c" id="id192" name="id192">keyfile.c</a></li> +<li><a class="reference" href="#build-h" id="id193" name="id193">build.h</a></li> +<li><a class="reference" href="#build-c" id="id194" name="id194">build.c</a></li> +</ul> +</li> +<li><a class="reference" href="#gnu-general-public-license" id="id195" name="id195">GNU General Public License</a></li> +<li><a class="reference" href="#license-for-scintilla-and-scite" id="id196" name="id196">License for Scintilla and SciTE</a></li> +</ul> </div> <div class="section"> -<h1><a class="toc-backref" href="#id11" id="introduction" name="introduction">Introduction</a></h1> +<h1><a class="toc-backref" href="#id12" id="introduction" name="introduction">Introduction</a></h1> <div class="section"> -<h2><a class="toc-backref" href="#id12" id="about-geany" name="about-geany">About Geany</a></h2> +<h2><a class="toc-backref" href="#id13" id="about-geany" name="about-geany">About Geany</a></h2> <p>Geany is a small and lightweight Integrated Development Environment. It was developed to provide a small and fast IDE, which has only a few dependencies from other packages. Another goal was to be as independent @@ -456,13 +471,13 @@ </ul> </div> <div class="section"> -<h2><a class="toc-backref" href="#id13" id="where-to-get-it" name="where-to-get-it">Where to get it</a></h2> +<h2><a class="toc-backref" href="#id14" id="where-to-get-it" name="where-to-get-it">Where to get it</a></h2> <p>You can obtain Geany from <a class="reference" href="http://www.geany.org/">http://www.geany.org/</a> or perhaps also from your distributor. For a list of available packages, please see <a class="reference" href="http://www.geany.org/Download/ThirdPartyPackages">http://www.geany.org/Download/ThirdPartyPackages</a>.</p> </div> <div class="section"> -<h2><a class="toc-backref" href="#id14" id="license" name="license">License</a></h2> +<h2><a class="toc-backref" href="#id15" id="license" name="license">License</a></h2> <p>Geany is distributed under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. A copy of this @@ -473,28 +488,28 @@ <a class="reference" href="#license-for-scintilla-and-scite">License for Scintilla and SciTE</a>.</p> </div> <div class="section"> -<h2><a class="toc-backref" href="#id15" id="about-this-document" name="about-this-document">About this document</a></h2> +<h2><a class="toc-backref" href="#id16" id="about-this-document" name="about-this-document">About this document</a></h2> <p>This documentation is available in HTML and text formats. The latest version can always be found at <a class="reference" href="http://www.geany.org/">http://www.geany.org/</a>.</p> <p>If you want to contribute to it, see <a class="reference" href="#contributing-to-this-document">Contributing to this document</a>.</p> </div> </div> <div class="section"> -<h1><a class="toc-backref" href="#id16" id="installation" name="installation">Installation</a></h1> +<h1><a class="toc-backref" href="#id17" id="installation" name="installation">Installation</a></h1> <div class="section"> -<h2><a class="toc-backref" href="#id17" id="requirements" name="requirements">Requirements</a></h2> +<h2><a class="toc-backref" href="#id18" id="requirements" name="requirements">Requirements</a></h2> <p>You will need the GTK (>= 2.8.0) libraries and their dependencies (Pango, GLib and ATK). Your distro should provide packages for these, usually installed by default. For Windows, you can download an installer which bundles these libraries from the website.</p> </div> <div class="section"> -<h2><a class="toc-backref" href="#id18" id="binary-packages" name="binary-packages">Binary packages</a></h2> +<h2><a class="toc-backref" href="#id19" id="binary-packages" name="binary-packages">Binary packages</a></h2> <p>There are many binary packages available. For an up-to-date but maybe incomplete list see <a class="reference" href="http://www.geany.org/Download/ThirdPartyPackages">http://www.geany.org/Download/ThirdPartyPackages</a>.</p> </div> <div class="section"> -<h2><a class="toc-backref" href="#id19" id="source-compilation" name="source-compilation">Source compilation</a></h2> +<h2><a class="toc-backref" href="#id20" id="source-compilation" name="source-compilation">Source compilation</a></h2> <p>Compiling Geany is quite easy. To do so, you need the GTK (>= 2.8.0) libraries and header files. You also need the Pango, GLib and ATK libraries and header files. @@ -504,7 +519,7 @@ <p>Furthermore you need, of course, a C and C++ compiler. The GNU versions of these tools are recommended.</p> <div class="section"> -<h3><a class="toc-backref" href="#id20" id="autotools-based-build-system" name="autotools-based-build-system">Autotools based build system</a></h3> +<h3><a class="toc-backref" href="#id21" id="autotools-based-build-system" name="autotools-based-build-system">Autotools based build system</a></h3> <p>The Autotools based build system is very mature and has been well tested. To use it, you just need the Make tool, preferably GNU Make.</p> <p>Then run the following commands:</p> @@ -518,7 +533,7 @@ </pre> </div> <div class="section"> -<h3><a class="toc-backref" href="#id21" id="waf-based-build-system" name="waf-based-build-system">Waf based build system</a></h3> +<h3><a class="toc-backref" href="#id22" id="waf-based-build-system" name="waf-based-build-system">Waf based build system</a></h3> <p>The Waf build system is still quite young and under heavy development but already in an usable state. In contrary to the Autotools, Waf needs Python. So before using Waf, you need to install Python on your system. @@ -537,7 +552,7 @@ % ./waf install </pre> <div class="section"> -<h4><a class="toc-backref" href="#id22" id="waf-cache" name="waf-cache">Waf Cache</a></h4> +<h4><a class="toc-backref" href="#id23" id="waf-cache" name="waf-cache">Waf Cache</a></h4> <p>The Waf build system has a nice and interesting feature which can help a lot to avoid unnecessary rebuilding of unchanged code. This often happens when developing new features or trying to debug something. @@ -557,7 +572,7 @@ <p>More information about the Waf cache feature are available at <a class="reference" href="http://code.google.com/p/waf/wiki/CacheObjectFiles">http://code.google.com/p/waf/wiki/CacheObjectFiles</a>.</p> <div class="section"> -<h5><a class="toc-backref" href="#id23" id="cleaning-the-cache" name="cleaning-the-cache">Cleaning the Cache</a></h5> +<h5><a class="toc-backref" href="#id24" id="cleaning-the-cache" name="cleaning-the-cache">Cleaning the Cache</a></h5> <p>You should take care about the size of the cache directory as it may grow rapidly by time. Waf doesn't do any cleaning or other house-keeping of the cache yet so you need to keep it clean by yourself. @@ -572,7 +587,7 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id24" id="custom-installation" name="custom-installation">Custom installation</a></h3> +<h3><a class="toc-backref" href="#id25" id="custom-installation" name="custom-installation">Custom installation</a></h3> <p>The configure script supports several common options, for a detailed list, type:</p> <pre class="literal-block"> @@ -590,14 +605,14 @@ </ul> </div> <div class="section"> -<h3><a class="toc-backref" href="#id25" id="dynamic-linking-loader-support" name="dynamic-linking-loader-support">Dynamic linking loader support</a></h3> +<h3><a class="toc-backref" href="#id26" id="dynamic-linking-loader-support" name="dynamic-linking-loader-support">Dynamic linking loader support</a></h3> <p>In the case that your system lacks dynamic linking loader support, you probably want to pass the option <tt class="docutils literal"><span class="pre">--disable-vte</span></tt> to the <tt class="docutils literal"><span class="pre">configure</span></tt> script. This prevents compiling Geany with dynamic linking loader support to automatically load <tt class="docutils literal"><span class="pre">libvte.so.4</span></tt> if available.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id26" id="build-problems" name="build-problems">Build problems</a></h3> +<h3><a class="toc-backref" href="#id27" id="build-problems" name="build-problems">Build problems</a></h3> <p>If there are any errors during compilation, check your build environment and try to find the error, otherwise contact the mailing list or one the authors. Sometimes you might need to ask for specific @@ -605,7 +620,7 @@ </div> </div> <div class="section"> -<h2><a class="toc-backref" href="#id27" id="installation-prefix" name="installation-prefix">Installation prefix</a></h2> +<h2><a class="toc-backref" href="#id28" id="installation-prefix" name="installation-prefix">Installation prefix</a></h2> <p>If you want to edit any of Geany's system configuration files after installation you will need to know the installation prefix. Usually this is not necessary as you can just use user configuration files.</p> @@ -616,9 +631,9 @@ </div> </div> <div class="section"> -<h1><a class="toc-backref" href="#id28" id="usage" name="usage">Usage</a></h1> +<h1><a class="toc-backref" href="#id29" id="usage" name="usage">Usage</a></h1> <div class="section"> -<h2><a class="toc-backref" href="#id29" id="getting-started" name="getting-started">Getting started</a></h2> +<h2><a class="toc-backref" href="#id30" id="getting-started" name="getting-started">Getting started</a></h2> <p>You can start Geany in the following ways:</p> <ul> <li><p class="first">From the Desktop Environment menu:</p> @@ -635,7 +650,7 @@ </ul> </div> <div class="section"> -<h2><a class="toc-backref" href="#id30" id="command-line-options" name="command-line-options">Command line options</a></h2> +<h2><a class="toc-backref" href="#id31" id="command-line-options" name="command-line-options">Command line options</a></h2> <table border="1" class="docutils"> <colgroup> <col width="13%" /> @@ -767,9 +782,9 @@ help screen.</p> </div> <div class="section"> -<h2><a class="toc-backref" href="#id31" id="general" name="general">General</a></h2> +<h2><a class="toc-backref" href="#id32" id="general" name="general">General</a></h2> <div class="section"> -<h3><a class="toc-backref" href="#id32" id="startup" name="startup">Startup</a></h3> +<h3><a class="toc-backref" href="#id33" id="startup" name="startup">Startup</a></h3> <p>At startup, Geany loads all files from the last time Geany was launched. You can disable this feature in the preferences dialog (see <a class="reference" href="#general-startup-tab-in-preferences-dialog">General Startup tab in preferences dialog</a>). If you specify some @@ -784,7 +799,7 @@ files in a running instance using the appropriate command line option.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id33" id="opening-files-from-the-command-line-in-a-running-instance" name="opening-files-from-the-command-line-in-a-running-instance">Opening files from the command-line in a running instance</a></h3> +<h3><a class="toc-backref" href="#id34" id="opening-files-from-the-command-line-in-a-running-instance" name="opening-files-from-the-command-line-in-a-running-instance">Opening files from the command-line in a running instance</a></h3> <p>Geany detects an already running instance of itself and opens files from the command-line in the already running instance. So, Geany can be used to view and edit files by opening them from other programs @@ -800,7 +815,7 @@ called <a class="reference" href="#command-line-options">Command line options</a>.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id34" id="virtual-terminal-emulator-widget-vte" name="virtual-terminal-emulator-widget-vte">Virtual terminal emulator widget (VTE)</a></h3> +<h3><a class="toc-backref" href="#id35" id="virtual-terminal-emulator-widget-vte" name="virtual-terminal-emulator-widget-vte">Virtual terminal emulator widget (VTE)</a></h3> <p>If you have installed <tt class="docutils literal"><span class="pre">libvte.so</span></tt> in your system, it is loaded automatically by Geany, and you will have a terminal widget in the notebook at the bottom.</p> @@ -844,7 +859,7 @@ ./configure.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id35" id="defining-own-widget-styles-using-gtkrc-2-0" name="defining-own-widget-styles-using-gtkrc-2-0">Defining own widget styles using .gtkrc-2.0</a></h3> +<h3><a class="toc-backref" href="#id36" id="defining-own-widget-styles-using-gtkrc-2-0" name="defining-own-widget-styles-using-gtkrc-2-0">Defining own widget styles using .gtkrc-2.0</a></h3> <p>You can define your widget style for many of Geany's GUI parts. To do this, just edit your <tt class="docutils literal"><span class="pre">.gtkrc-2.0</span></tt> (usually found in your home directory on UNIX-like systems and in the etc subdirectory of your @@ -885,9 +900,9 @@ </div> </div> <div class="section"> -<h2><a class="toc-backref" href="#id36" id="documents" name="documents">Documents</a></h2> +<h2><a class="toc-backref" href="#id37" id="documents" name="documents">Documents</a></h2> <div class="section"> -<h3><a class="toc-backref" href="#id37" id="switching-between-documents" name="switching-between-documents">Switching between documents</a></h3> +<h3><a class="toc-backref" href="#id38" id="switching-between-documents" name="switching-between-documents">Switching between documents</a></h3> <p>The documents list and the editor tabs are two different ways to switch between documents using the mouse. When you hit the key combination to move between tabs, the order is determined by the tab @@ -898,9 +913,9 @@ </div> </div> <div class="section"> -<h2><a class="toc-backref" href="#id38" id="character-sets-and-unicode-byte-order-mark-bom" name="character-sets-and-unicode-byte-order-mark-bom">Character sets and Unicode Byte-Order-Mark (BOM)</a></h2> +<h2><a class="toc-backref" href="#id39" id="character-sets-and-unicode-byte-order-mark-bom" name="character-sets-and-unicode-byte-order-mark-bom">Character sets and Unicode Byte-Order-Mark (BOM)</a></h2> <div class="section"> -<h3><a class="toc-backref" href="#id39" id="using-character-sets" name="using-character-sets">Using character sets</a></h3> +<h3><a class="toc-backref" href="#id40" id="using-character-sets" name="using-character-sets">Using character sets</a></h3> <p>Geany provides support for detecting and converting character sets. So you can open and save files in different character sets and even can convert a file from a character set to another one. To do this, @@ -946,7 +961,7 @@ </ul> </div> <div class="section"> -<h3><a class="toc-backref" href="#id40" id="in-file-encoding-specification" name="in-file-encoding-specification">In-file encoding specification</a></h3> +<h3><a class="toc-backref" href="#id41" id="in-file-encoding-specification" name="in-file-encoding-specification">In-file encoding specification</a></h3> <p>Geany detects meta tags of HTML files which contain charset information like:</p> <pre class="literal-block"> @@ -988,7 +1003,7 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id41" id="special-encoding-none" name="special-encoding-none">Special encoding "None"</a></h3> +<h3><a class="toc-backref" href="#id42" id="special-encoding-none" name="special-encoding-none">Special encoding "None"</a></h3> <p>There is a special encoding "None" which is actually no real encoding. It is useful when you know that Geany cannot auto-detect the encoding of a file and it is not displayed correctly. Especially @@ -998,7 +1013,7 @@ without any character conversion.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id42" id="unicode-byte-order-mark-bom" name="unicode-byte-order-mark-bom">Unicode Byte-Order-Mark (BOM)</a></h3> +<h3><a class="toc-backref" href="#id43" id="unicode-byte-order-mark-bom" name="unicode-byte-order-mark-bom">Unicode Byte-Order-Mark (BOM)</a></h3> <p>Furthermore, Geany detects an Unicode Byte Order Mark (see <a class="reference" href="http://en.wikipedia.org/wiki/Byte_Order_Mark">http://en.wikipedia.org/wiki/Byte_Order_Mark</a> for details). Of course, this feature is only available if the opened file is in an Unicode @@ -1019,9 +1034,9 @@ </div> </div> <div class="section"> -<h2><a class="toc-backref" href="#id43" id="editing" name="editing">Editing</a></h2> +<h2><a class="toc-backref" href="#id44" id="editing" name="editing">Editing</a></h2> <div class="section"> -<h3><a class="toc-backref" href="#id44" id="folding" name="folding">Folding</a></h3> +<h3><a class="toc-backref" href="#id45" id="folding" name="folding">Folding</a></h3> <p>Geany provides basic code folding support. Folding means the ability to show and hide parts of the text in the current file. You can hide unimportant code sections and concentrate on the parts you are working on @@ -1045,7 +1060,7 @@ it for this click and vice versa.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id45" id="column-mode-editing-rectangular-selections" name="column-mode-editing-rectangular-selections">Column mode editing (rectangular selections)</a></h3> +<h3><a class="toc-backref" href="#id46" id="column-mode-editing-rectangular-selections" name="column-mode-editing-rectangular-selections">Column mode editing (rectangular selections)</a></h3> <p>There is basic support for column mode editing. To use it, create a rectangular selection by holding down the Control and Shift keys (or Control and Alt if it doesn't work) while @@ -1056,7 +1071,7 @@ selection.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id46" id="drag-and-drop-of-text" name="drag-and-drop-of-text">Drag and drop of text</a></h3> +<h3><a class="toc-backref" href="#id47" id="drag-and-drop-of-text" name="drag-and-drop-of-text">Drag and drop of text</a></h3> <p>If you drag selected text in the editor widget of Geany the text is moved to the position where the mouse pointer is when releasing the mouse button. Holding Control when releasing the mouse button will @@ -1064,7 +1079,7 @@ before the selected text was copied to the new position.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id47" id="indentation" name="indentation">Indentation</a></h3> +<h3><a class="toc-backref" href="#id48" id="indentation" name="indentation">Indentation</a></h3> <p>Geany allows each document to indent either with a tab character or multiple spaces. The default indent mode is set in the <a class="reference" href="#editor-features-tab-in-preferences-dialog">Editor Features tab in preferences dialog</a> (see the link for more information). But @@ -1085,7 +1100,7 @@ </dl> </div> <div class="section"> -<h3><a class="toc-backref" href="#id48" id="auto-indentation" name="auto-indentation">Auto-indentation</a></h3> +<h3><a class="toc-backref" href="#id49" id="auto-indentation" name="auto-indentation">Auto-indentation</a></h3> <p>When enabled, auto-indentation happens when pressing <em>Enter</em> in the Editor. It adds a certain amount of indentation to the new line so the user doesn't always have to indent each line manually.</p> @@ -1106,7 +1121,7 @@ </dl> </div> <div class="section"> -<h3><a class="toc-backref" href="#id49" id="bookmarks" name="bookmarks">Bookmarks</a></h3> +<h3><a class="toc-backref" href="#id50" id="bookmarks" name="bookmarks">Bookmarks</a></h3> <p>Geany provides a handy bookmarking feature that lets you mark one or more lines in a document, and return the cursor to them using a key combination.</p> @@ -1124,7 +1139,7 @@ navigate around multiple files.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id50" id="code-navigation-history" name="code-navigation-history">Code Navigation History</a></h3> +<h3><a class="toc-backref" href="#id51" id="code-navigation-history" name="code-navigation-history">Code Navigation History</a></h3> <p>To ease navigation in source files and especially between different files, Geany lets you jump between different navigation points. Currently, this works for the following:</p> @@ -1143,7 +1158,7 @@ and between different files.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id51" id="send-text-through-definable-commands" name="send-text-through-definable-commands">Send text through definable commands</a></h3> +<h3><a class="toc-backref" href="#id52" id="send-text-through-definable-commands" name="send-text-through-definable-commands">Send text through definable commands</a></h3> <p>You can define several custom commands in Geany and send the current selection to one of these commands. The output of the command will be used to replace the current selection. So, it is possible to use text @@ -1160,7 +1175,7 @@ entry and press OK. It will be deleted automatically.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id52" id="context-actions" name="context-actions">Context actions</a></h3> +<h3><a class="toc-backref" href="#id53" id="context-actions" name="context-actions">Context actions</a></h3> <p>You can execute a specified command on the current word near the cursor position or an available selection and this word is passed as an argument to this command. It can be used for example to open @@ -1186,7 +1201,7 @@ called firefox) and it will open the address: <a class="reference" href="http://www.php.net/echo">http://www.php.net/echo</a>.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id53" id="user-definable-snippets" name="user-definable-snippets">User-definable snippets</a></h3> +<h3><a class="toc-backref" href="#id54" id="user-definable-snippets" name="user-definable-snippets">User-definable snippets</a></h3> <p>Snippets are small strings or code constructs which can be replaced or completed to a more complex string. So you can save a lot of time by not typing often used strings and letting Geany do the work for you. @@ -1286,7 +1301,7 @@ needs.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id54" id="inserting-unicode-characters" name="inserting-unicode-characters">Inserting Unicode characters</a></h3> +<h3><a class="toc-backref" href="#id55" id="inserting-unicode-characters" name="inserting-unicode-characters">Inserting Unicode characters</a></h3> <p>With GTK 2.10 and above, you can hit Ctrl-Shift-u, then still holding Ctrl-Shift, type some hex digits representing the code point for the character you want, then let go of Ctrl-Shift and hit a key such as @@ -1302,7 +1317,7 @@ </div> </div> <div class="section"> -<h2><a class="toc-backref" href="#id55" id="search-replace-and-go-to" name="search-replace-and-go-to">Search, replace and go to</a></h2> +<h2><a class="toc-backref" href="#id56" id="search-replace-and-go-to" name="search-replace-and-go-to">Search, replace and go to</a></h2> <p>This section describes search-related commands from the Search menu and the editor window's popup menu:</p> <ul class="simple"> @@ -1317,11 +1332,11 @@ <p>* These items are available from the editor window's popup menu, or by using a keyboard shortcut (see the section called <a class="reference" href="#keybindings">Keybindings</a>).</p> <div class="section"> -<h3><a class="toc-backref" href="#id56" id="find" name="find">Find</a></h3> +<h3><a class="toc-backref" href="#id57" id="find" name="find">Find</a></h3> <p>The Find dialog is used for finding text in one or more open documents.</p> <img alt="./images/find_dialog.png" src="./images/find_dialog.png" /> <div class="section"> -<h4><a class="toc-backref" href="#id57" id="matching-options" name="matching-options">Matching options</a></h4> +<h4><a class="toc-backref" href="#id58" id="matching-options" name="matching-options">Matching options</a></h4> <p>The syntax for the Use regular expressions option is shown in <a class="reference" href="#regular-expressions">Regular expressions</a>.</p> <p>The Use escape sequences option will transform any escaped characters @@ -1330,7 +1345,7 @@ (Unicode characters).</p> </div> <div class="section"> -<h4><a class="toc-backref" href="#id58" id="find-all" name="find-all">Find all</a></h4> +<h4><a class="toc-backref" href="#id59" id="find-all" name="find-all">Find all</a></h4> <p>To find all matches, click on the Find All expander. This will reveal several options:</p> <ul class="simple"> @@ -1346,7 +1361,7 @@ Remove Markers command from the Document menu.</p> </div> <div class="section"> -<h4><a class="toc-backref" href="#id59" id="change-font-in-search-dialog-text-fields" name="change-font-in-search-dialog-text-fields">Change font in search dialog text fields</a></h4> +<h4><a class="toc-backref" href="#id60" id="change-font-in-search-dialog-text-fields" name="change-font-in-search-dialog-text-fields">Change font in search dialog text fields</a></h4> <p>All search related dialogs use a Monospace for the text input fields to increase the readability of input text. This is useful when you are typing e.g. regular expressions with spaces, periods and commas which @@ -1368,7 +1383,7 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id60" id="find-usage" name="find-usage">Find usage</a></h3> +<h3><a class="toc-backref" href="#id61" id="find-usage" name="find-usage">Find usage</a></h3> <p>Find usage searches all open files. It is similar to the Find All In Session Find dialog command.</p> <p>If there is a selection, then it is used as the search text; otherwise @@ -1378,7 +1393,7 @@ shown in the Messages tab of the Message Window.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id61" id="find-in-files" name="find-in-files">Find in files</a></h3> +<h3><a class="toc-backref" href="#id62" id="find-in-files" name="find-in-files">Find in files</a></h3> <p>Find in files is a more powerful version of Find usage that searches all files in a certain directory using the Grep tool. The Grep tool must be correctly set in Preferences to the path of the system's Grep @@ -1390,7 +1405,7 @@ The Extra options field is used to pass any additional arguments to the grep tool.</p> <div class="section"> -<h4><a class="toc-backref" href="#id62" id="filtering-out-version-control-files" name="filtering-out-version-control-files">Filtering out version control files</a></h4> +<h4><a class="toc-backref" href="#id63" id="filtering-out-version-control-files" name="filtering-out-version-control-files">Filtering out version control files</a></h4> <p>When using the <em>Recurse in subfolders</em> option with a directory that's under version control, you can set the <em>Extra options</em> field to use grep's <tt class="docutils literal"><span class="pre">--exclude</span></tt> flag to filter out filenames.</p> @@ -1402,7 +1417,7 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id63" id="replace" name="replace">Replace</a></h3> +<h3><a class="toc-backref" href="#id64" id="replace" name="replace">Replace</a></h3> <p>The Replace dialog is used for replacing text in one or more open documents.</p> <img alt="./images/replace_dialog.png" src="./images/replace_dialog.png" /> @@ -1412,7 +1427,7 @@ and to the replacement text; for the latter back references can be used -- see the entry for '\n' in <a class="reference" href="#regular-expressions">Regular expressions</a>.</p> <div class="section"> -<h4><a class="toc-backref" href="#id64" id="replace-all" name="replace-all">Replace all</a></h4> +<h4><a class="toc-backref" href="#id65" id="replace-all" name="replace-all">Replace all</a></h4> <p>To replace several matches, click on the <em>Replace All</em> expander. This will reveal several options:</p> <ul class="simple"> @@ -1427,7 +1442,7 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id65" id="go-to-tag-definition" name="go-to-tag-definition">Go to tag definition</a></h3> +<h3><a class="toc-backref" href="#id66" id="go-to-tag-definition" name="go-to-tag-definition">Go to tag definition</a></h3> <p>If the current word is the name of a tag definition (like a function body) and the file containing the tag definition is open, this command will switch to that file and go to the corresponding line number. The @@ -1436,17 +1451,17 @@ menu is used.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id66" id="go-to-tag-declaration" name="go-to-tag-declaration">Go to tag declaration</a></h3> +<h3><a class="toc-backref" href="#id67" id="go-to-tag-declaration" name="go-to-tag-declaration">Go to tag declaration</a></h3> <p>Like Go to tag definition, but for a forward declaration such as a function prototype or <tt class="docutils literal"><span class="pre">extern</span></tt> declaration instead of a function body.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id67" id="go-to-line" name="go-to-line">Go to line</a></h3> +<h3><a class="toc-backref" href="#id68" id="go-to-line" name="go-to-line">Go to line</a></h3> <p>Go to a particular line number in the current file.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id68" id="regular-expressions" name="regular-expressions">Regular expressions</a></h3> +<h3><a class="toc-backref" href="#id69" id="regular-expressions" name="regular-expressions">Regular expressions</a></h3> <p>You can use regular expressions in the Find and Replace dialogs by selecting the Use regular expressions check box. The syntax is POSIX-like, as described in the table below.</p> @@ -1556,7 +1571,7 @@ </div> </div> <div class="section"> -<h2><a class="toc-backref" href="#id69" id="tags" name="tags">Tags</a></h2> +<h2><a class="toc-backref" href="#id70" id="tags" name="tags">Tags</a></h2> <p>Geany has built-in functionality for generating tag information (aka "workspace tags") for supported filetypes when you open a file. You can also have Geany automatically load external tag files (aka "global @@ -1565,7 +1580,7 @@ (but is incompatible with ctags). You use Geany to generate global tags files, as described below.</p> <div class="section"> -<h3><a class="toc-backref" href="#id70" id="workspace-tags" name="workspace-tags">Workspace tags</a></h3> +<h3><a class="toc-backref" href="#id71" id="workspace-tags" name="workspace-tags">Workspace tags</a></h3> <p>Tags for each document are parsed whenever a file is loaded or saved. These are shown in the Symbol list in the Sidebar. These tags are also used for autocompletion of symbols and calltips for all documents @@ -1574,7 +1589,7 @@ <a class="reference" href="#go-to-tag-definition">Go to tag definition</a>.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id71" id="global-tags" name="global-tags">Global tags</a></h3> +<h3><a class="toc-backref" href="#id72" id="global-tags" name="global-tags">Global tags</a></h3> <p>Global tags are used to provide autocompletion of symbols and calltips without having to open the corresponding source files. This is intended for library APIs, as the tags file only has to be updated when you upgrade @@ -1597,7 +1612,7 @@ with the tags. See the section called <a class="reference" href="#filetype-extensions">Filetype extensions</a> for more information.</p> <div class="section"> -<h4><a class="toc-backref" href="#id72" id="default-global-tags-files" name="default-global-tags-files">Default global tags files</a></h4> +<h4><a class="toc-backref" href="#id73" id="default-global-tags-files" name="default-global-tags-files">Default global tags files</a></h4> <p>For some languages, a list of global tags is loaded when the corresponding filetype is first used. Currently these are for:</p> <ul class="simple"> @@ -1610,7 +1625,7 @@ </ul> </div> <div class="section"> -<h4><a class="toc-backref" href="#id73" id="global-tags-file-format" name="global-tags-file-format">Global tags file format</a></h4> +<h4><a class="toc-backref" href="#id74" id="global-tags-file-format" name="global-tags-file-format">Global tags file format</a></h4> <p>Global tags files can have two different formats:</p> <ul class="simple"> <li>Tagmanager format</li> @@ -1647,7 +1662,7 @@ section <a class="reference" href="#global-tags">Global tags</a>.</p> </div> <div class="section"> -<h4><a class="toc-backref" href="#id74" id="generating-a-global-tags-file" name="generating-a-global-tags-file">Generating a global tags file</a></h4> +<h4><a class="toc-backref" href="#id75" id="generating-a-global-tags-file" name="generating-a-global-tags-file">Generating a global tags file</a></h4> <p>You can generate your own global tags files by parsing a list of source files. The command is:</p> <pre class="literal-block"> @@ -1692,7 +1707,7 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id75" id="ignore-tags" name="ignore-tags">Ignore tags</a></h3> +<h3><a class="toc-backref" href="#id76" id="ignore-tags" name="ignore-tags">Ignore tags</a></h3> <p>You can also ignore certain tags if they would lead to wrong parsing of the code. Simply create a file called "ignore.tags" in your Geany configuration directory (usually <tt class="docutils literal"><span class="pre">~/.config/geany/</span></tt>). Then list all tags @@ -1716,7 +1731,7 @@ </div> </div> <div class="section"> -<h2><a class="toc-backref" href="#id76" id="preferences" name="preferences">Preferences</a></h2> +<h2><a class="toc-backref" href="#id77" id="preferences" name="preferences">Preferences</a></h2> <p>You may adjust Geany's settings using the Edit --> Preferences dialog. Any changes you make there can be applied by hitting either the Apply or the OK button. These settings will persist between Geany @@ -1734,10 +1749,10 @@ comes after the screenshot of that tab.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id77" id="general-startup-tab-in-preferences-dialog" name="general-startup-tab-in-preferences-dialog">General Startup tab in preferences dialog</a></h3> +<h3><a class="toc-backref" href="#id78" id="general-startup-tab-in-preferences-dialog" name="general-startup-tab-in-preferences-dialog">General Startup tab in preferences dialog</a></h3> <img alt="./images/pref_dialog_gen_startup.png" src="./images/pref_dialog_gen_startup.png" /> <div class="section"> -<h4><a class="toc-backref" href="#id78" id="id1" name="id1">Startup</a></h4> +<h4><a class="toc-backref" href="#id79" id="id1" name="id1">Startup</a></h4> <dl class="docutils"> <dt>Load files from the last session</dt> <dd>On startup, load the same files you had open the last time you @@ -1749,7 +1764,7 @@ </dl> </div> <div class="section"> -<h4><a class="toc-backref" href="#id79" id="shutdown" name="shutdown">Shutdown</a></h4> +<h4><a class="toc-backref" href="#id80" id="shutdown" name="shutdown">Shutdown</a></h4> <dl class="docutils"> <dt>Save window position and geometry</dt> <dd>Save the current position and size of the main window so next time @@ -1759,7 +1774,7 @@ </dl> </div> <div class="section"> -<h4><a class="toc-backref" href="#id80" id="paths" name="paths">Paths</a></h4> +<h4><a class="toc-backref" href="#id81" id="paths" name="paths">Paths</a></h4> <dl class="docutils"> <dt>Startup path</dt> <dd>Path to start in when opening or saving files. @@ -1778,10 +1793,10 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id81" id="general-miscellaneous-tab-in-preferences-dialog" name="general-miscellaneous-tab-in-preferences-dialog">General Miscellaneous tab in preferences dialog</a></h3> +<h3><a class="toc-backref" href="#id82" id="general-miscellaneous-tab-in-preferences-dialog" name="general-miscellaneous-tab-in-preferences-dialog">General Miscellaneous tab in preferences dialog</a></h3> <img alt="./images/pref_dialog_gen_misc.png" src="./images/pref_dialog_gen_misc.png" /> <div class="section"> -<h4><a class="toc-backref" href="#id82" id="miscellaneous" name="miscellaneous">Miscellaneous</a></h4> +<h4><a class="toc-backref" href="#id83" id="miscellaneous" name="miscellaneous">Miscellaneous</a></h4> <dl class="docutils"> <dt>Beep on errors when compilation has finished</dt> <dd>Have the computer make a beeping sound when compilation of your program @@ -1800,7 +1815,7 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id83" id="search" name="search">Search</a></h3> +<h3><a class="toc-backref" href="#id84" id="search" name="search">Search</a></h3> <dl class="docutils"> <dt>Always wrap search and hide the Find dialog</dt> <dd>Always wrap search around the document and hide the Find dialog after clicking @@ -1815,7 +1830,7 @@ dialog is used.</dd> </dl> <div class="section"> -<h4><a class="toc-backref" href="#id84" id="projects" name="projects">Projects</a></h4> +<h4><a class="toc-backref" href="#id85" id="projects" name="projects">Projects</a></h4> <dl class="docutils"> <dt>Use project-based session files</dt> <dd>Save your current session when closing projects. You will be able to @@ -1832,10 +1847,10 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id85" id="interface-tab-in-preferences-dialog" name="interface-tab-in-preferences-dialog">Interface tab in preferences dialog</a></h3> +<h3><a class="toc-backref" href="#id86" id="interface-tab-in-preferences-dialog" name="interface-tab-in-preferences-dialog">Interface tab in preferences dialog</a></h3> <img alt="./images/pref_dialog_interface.png" src="./images/pref_dialog_interface.png" /> <div class="section"> -<h4><a class="toc-backref" href="#id86" id="sidebar" name="sidebar">Sidebar</a></h4> +<h4><a class="toc-backref" href="#id87" id="sidebar" name="sidebar">Sidebar</a></h4> <dl class="docutils"> <dt>Show symbol list</dt> <dd>Show the list of functions, variables, and other information in the @@ -1850,7 +1865,7 @@ </dl> </div> <div class="section"> -<h4><a class="toc-backref" href="#id87" id="fonts" name="fonts">Fonts</a></h4> +<h4><a class="toc-backref" href="#id88" id="fonts" name="fonts">Fonts</a></h4> <dl class="docutils"> <dt>Editor</dt> <dd>Change the font used to display documents.</dd> @@ -1861,7 +1876,7 @@ </dl> </div> <div class="section"> -<h4><a class="toc-backref" href="#id88" id="editor-tabs" name="editor-tabs">Editor tabs</a></h4> +<h4><a class="toc-backref" href="#id89" id="editor-tabs" name="editor-tabs">Editor tabs</a></h4> <dl class="docutils"> <dt>Show editor tabs</dt> <dd>Show a notebook tab for all documents so you can switch between them @@ -1878,7 +1893,7 @@ </dl> </div> <div class="section"> -<h4><a class="toc-backref" href="#id89" id="tab-positions" name="tab-positions">Tab positions</a></h4> +<h4><a class="toc-backref" href="#id90" id="tab-positions" name="tab-positions">Tab positions</a></h4> <dl class="docutils"> <dt>Editor</dt> <dd>Set the positioning of the editor's notebook tabs to the right, @@ -1892,7 +1907,7 @@ </dl> </div> <div class="section"> -<h4><a class="toc-backref" href="#id90" id="id2" name="id2">Miscellaneous</a></h4> +<h4><a class="toc-backref" href="#id91" id="id2" name="id2">Miscellaneous</a></h4> <dl class="docutils"> <dt>Show status bar</dt> <dd>Show the status bar at the bottom of the main window. It gives information about @@ -1902,11 +1917,11 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id91" id="toolbar-tab-in-preferences-dialog" name="toolbar-tab-in-preferences-dialog">Toolbar tab in preferences dialog</a></h3> +<h3><a class="toc-backref" href="#id92" id="toolbar-tab-in-preferences-dialog" name="toolbar-tab-in-preferences-dialog">Toolbar tab in preferences dialog</a></h3> <p>Affects the main toolbar underneath the menu bar.</p> <img alt="./images/pref_dialog_toolbar.png" src="./images/pref_dialog_toolbar.png" /> <div class="section"> -<h4><a class="toc-backref" href="#id92" id="toolbar" name="toolbar">Toolbar</a></h4> +<h4><a class="toc-backref" href="#id93" id="toolbar" name="toolbar">Toolbar</a></h4> <dl class="docutils"> <dt>Show Toolbar</dt> <dd>Whether to show the toolbar.</dd> @@ -1916,7 +1931,7 @@ </dl> </div> <div class="section"> -<h4><a class="toc-backref" href="#id93" id="appearance" name="appearance">Appearance</a></h4> +<h4><a class="toc-backref" href="#id94" id="appearance" name="appearance">Appearance</a></h4> <dl class="docutils"> <dt>Icon Style</dt> <dd>Select the toolbar icon style to use - either icons and text, just @@ -1927,10 +1942,10 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id94" id="editor-features-tab-in-preferences-dialog" name="editor-features-tab-in-preferences-dialog">Editor Features tab in preferences dialog</a></h3> +<h3><a class="toc-backref" href="#id95" id="editor-features-tab-in-preferences-dialog" name="editor-features-tab-in-preferences-dialog">Editor Features tab in preferences dialog</a></h3> <img alt="./images/pref_dialog_edit_features.png" src="./images/pref_dialog_edit_features.png" /> <div class="section"> -<h4><a class="toc-backref" href="#id95" id="features" name="features">Features</a></h4> +<h4><a class="toc-backref" href="#id96" id="features" name="features">Features</a></h4> <dl class="docutils"> <dt>Line wrapping</dt> <dd>Show long lines wrapped around to new display lines.</dd> @@ -1962,10 +1977,10 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id96" id="editor-indentation-tab-in-preferences-dialog" name="editor-indentation-tab-in-preferences-dialog">Editor Indentation tab in preferences dialog</a></h3> +<h3><a class="toc-backref" href="#id97" id="editor-indentation-tab-in-preferences-dialog" name="editor-indentation-tab-in-preferences-dialog">Editor Indentation tab in preferences dialog</a></h3> <img alt="./images/pref_dialog_edit_indentation.png" src="./images/pref_dialog_edit_indentation.png" /> <div class="section"> -<h4><a class="toc-backref" href="#id97" id="indentation-group" name="indentation-group">Indentation group</a></h4> +<h4><a class="toc-backref" href="#id98" id="indentation-group" name="indentation-group">Indentation group</a></h4> <p>See <a class="reference" href="#indentation">Indentation</a> for more information.</p> <dl class="docutils"> <dt>Type</dt> @@ -2018,10 +2033,10 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id98" id="editor-completions-tab-in-preferences-dialog" name="editor-completions-tab-in-preferences-dialog">Editor Completions tab in preferences dialog</a></h3> +<h3><a class="toc-backref" href="#id99" id="editor-completions-tab-in-preferences-dialog" name="editor-completions-tab-in-preferences-dialog">Editor Completions tab in preferences dialog</a></h3> <img alt="./images/pref_dialog_edit_completions.png" src="./images/pref_dialog_edit_completions.png" /> <div class="section"> -<h4><a class="toc-backref" href="#id99" id="completions" name="completions">Completions</a></h4> +<h4><a class="toc-backref" href="#id100" id="completions" name="completions">Completions</a></h4> <dl class="docutils"> <dt>Snippet Completion</dt> <dd>Whether to replace special keywords after typing Tab into a @@ -2066,7 +2081,7 @@ </dl> </div> <div class="section"> -<h4><a class="toc-backref" href="#id100" id="auto-close-quotes-and-brackets" name="auto-close-quotes-and-brackets">Auto-close quotes and brackets</a></h4> +<h4><a class="toc-backref" href="#id101" id="auto-close-quotes-and-brackets" name="auto-close-quotes-and-brackets">Auto-close quotes and brackets</a></h4> <p>Geany can automatically insert a closing bracket and quote characters when you open them. For instance, you type a <tt class="docutils literal"><span class="pre">(</span></tt> and Geany will automatically insert <tt class="docutils literal"><span class="pre">)</span></tt>. With the following options, you can define for which @@ -2086,11 +2101,11 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id101" id="editor-display-tab-in-preferences-dialog" name="editor-display-tab-in-preferences-dialog">Editor Display tab in preferences dialog</a></h3> +<h3><a class="toc-backref" href="#id102" id="editor-display-tab-in-preferences-dialog" name="editor-display-tab-in-preferences-dialog">Editor Display tab in preferences dialog</a></h3> <p>This is for visual elements displayed in the editor window.</p> <img alt="./images/pref_dialog_edit_display.png" src="./images/pref_dialog_edit_display.png" /> <div class="section"> -<h4><a class="toc-backref" href="#id102" id="display" name="display">Display</a></h4> +<h4><a class="toc-backref" href="#id103" id="display" name="display">Display</a></h4> <dl class="docutils"> <dt>Invert syntax highlighting colors</dt> <dd><p class="first">Use white text on a black background and invert all colors. @@ -2119,7 +2134,7 @@ </dl> </div> <div class="section"> -<h4><a class="toc-backref" href="#id103" id="long-line-marker" name="long-line-marker">Long line marker</a></h4> +<h4><a class="toc-backref" href="#id104" id="long-line-marker" name="long-line-marker">Long line marker</a></h4> <p>The long line marker helps to indicate overly-long lines, or as a hint to the user for when to break the line.</p> <dl class="docutils"> @@ -2145,10 +2160,10 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id104" id="files-tab-in-preferences-dialog" name="files-tab-in-preferences-dialog">Files tab in preferences dialog</a></h3> +<h3><a class="toc-backref" href="#id105" id="files-tab-in-preferences-dialog" name="files-tab-in-preferences-dialog">Files tab in preferences dialog</a></h3> <img alt="./images/pref_dialog_files.png" src="./images/pref_dialog_files.png" /> <div class="section"> -<h4><a class="toc-backref" href="#id105" id="new-files" name="new-files">New files</a></h4> +<h4><a class="toc-backref" href="#id106" id="new-files" name="new-files">New files</a></h4> <dl class="docutils"> <dt>Open new documents from the command-line</dt> <dd>Whether to create new documents when passing filenames that don't @@ -2168,7 +2183,7 @@ </dl> </div> <div class="section"> -<h4><a class="toc-backref" href="#id106" id="saving-files" name="saving-files">Saving files</a></h4> +<h4><a class="toc-backref" href="#id107" id="saving-files" name="saving-files">Saving files</a></h4> <p>Perform special formatting operations when a document is saved. These can each be undone with the Undo command as usual.</p> <dl class="docutils"> @@ -2187,7 +2202,7 @@ </dl> </div> <div class="section"> -<h4><a class="toc-backref" href="#id107" id="id3" name="id3">Miscellaneous</a></h4> +<h4><a class="toc-backref" href="#id108" id="id3" name="id3">Miscellaneous</a></h4> <dl class="docutils"> <dt>Recent files list length</dt> <dd>The number of files to remember in the recently used files list.</dd> @@ -2206,13 +2221,11 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id108" id="tools-tab-in-preferences-dialog" name="tools-tab-in-preferences-dialog">Tools tab in preferences dialog</a></h3> +<h3><a class="toc-backref" href="#id109" id="tools-tab-in-preferences-dialog" name="tools-tab-in-preferences-dialog">Tools tab in preferences dialog</a></h3> <img alt="./images/pref_dialog_tools.png" src="./images/pref_dialog_tools.png" /> <div class="section"> -<h4><a class="toc-backref" href="#id109" id="tool-paths" name="tool-paths">Tool paths</a></h4> +<h4><a class="toc-backref" href="#id110" id="tool-paths" name="tool-paths">Tool paths</a></h4> <dl class="docutils"> -<dt>Make</dt> -<dd>The location of the make executable.</dd> <dt>Terminal</dt> <dd>The location of your terminal executable.</dd> <dt>Browser</dt> @@ -2229,7 +2242,7 @@ </div> </div> <div class="section"> -<h4><a class="toc-backref" href="#id110" id="commands" name="commands">Commands</a></h4> +<h4><a class="toc-backref" href="#id111" id="commands" name="commands">Commands</a></h4> <dl class="docutils"> <dt>Context action</dt> <dd>Set this to a command to execute on the current word. @@ -2239,7 +2252,7 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id111" id="template-tab-in-preferences-dialog" name="template-tab-in-preferences-dialog">Template tab in preferences dialog</a></h3> +<h3><a class="toc-backref" href="#id112" id="template-tab-in-preferences-dialog" name="template-tab-in-preferences-dialog">Template tab in preferences dialog</a></h3> <p>This data is used as meta data for various template text to insert into a document, such as the file header. You only need to set fields that you want to use in your template files.</p> @@ -2249,7 +2262,7 @@ </div> <img alt="./images/pref_dialog_templ.png" src="./images/pref_dialog_templ.png" /> <div class="section"> -<h4><a class="toc-backref" href="#id112" id="template-data" name="template-data">Template data</a></h4> +<h4><a class="toc-backref" href="#id113" id="template-data" name="template-data">Template data</a></h4> <dl class="docutils"> <dt>Developer</dt> <dd>The name of the developer who will be creating files.</dd> @@ -2282,7 +2295,7 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id113" id="keybinding-tab-in-preferences-dialog" name="keybinding-tab-in-preferences-dialog">Keybinding tab in preferences dialog</a></h3> +<h3><a class="toc-backref" href="#id114" id="keybinding-tab-in-preferences-dialog" name="keybinding-tab-in-preferences-dialog">Keybinding tab in preferences dialog</a></h3> <img alt="./images/pref_dialog_keys.png" src="./images/pref_dialog_keys.png" /> <p>There are some handy commands in here that are not, by default, bound to a key combination, and may not be available as a menu item.</p> @@ -2292,7 +2305,7 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id114" id="printing-tab-in-preferences-dialog" name="printing-tab-in-preferences-dialog">Printing tab in preferences dialog</a></h3> +<h3><a class="toc-backref" href="#id115" id="printing-tab-in-preferences-dialog" name="printing-tab-in-preferences-dialog">Printing tab in preferences dialog</a></h3> <img alt="./images/pref_dialog_printing.png" src="./images/pref_dialog_printing.png" /> <dl class="docutils"> <dt>Use external command for printing</dt> @@ -2314,11 +2327,11 @@ </dl> </div> <div class="section"> -<h3><a class="toc-backref" href="#id115" id="terminal-vte-tab-in-preferences-dialog" name="terminal-vte-tab-in-preferences-dialog">Terminal (VTE) tab in preferences dialog</a></h3> +<h3><a class="toc-backref" href="#id116" id="terminal-vte-tab-in-preferences-dialog" name="terminal-vte-tab-in-preferences-dialog">Terminal (VTE) tab in preferences dialog</a></h3> <p>See also: <a class="reference" href="#virtual-terminal-emulator-widget-vte">Virtual terminal emulator widget (VTE)</a>.</p> <img alt="./images/pref_dialog_vte.png" src="./images/pref_dialog_vte.png" /> <div class="section"> -<h4><a class="toc-backref" href="#id116" id="terminal-widget" name="terminal-widget">Terminal widget</a></h4> +<h4><a class="toc-backref" href="#id117" id="terminal-widget" name="terminal-widget">Terminal widget</a></h4> <dl class="docutils"> <dt>Terminal font</dt> <dd>Select the font that will be used in the terminal emulation control.</dd> @@ -2345,7 +2358,8 @@ current file.</dd> <dt>Execute programs in VTE</dt> <dd>Execute programs in the virtual terminal instead of using the external -terminal tool.</dd> +terminal tool. Note that if you run multiple execute commands at once +the output may become mixed togehter in the VTE.</dd> <dt>Don't use run script</dt> <dd>Don't use the simple run script which is usually used to display the exit status of the executed program. @@ -2356,25 +2370,24 @@ </div> </div> <div class="section"> -<h2><a class="toc-backref" href="#id117" id="project-management" name="project-management">Project Management</a></h2> +<h2><a class="toc-backref" href="#id118" id="project-management" name="project-management">Project Management</a></h2> <p>Project Management is optional in Geany. Currently it can be used for:</p> <ul class="simple"> <li>Storing and opening session files on a project basis.</li> -<li>Running <em>Make</em> from the project's base directory.</li> -<li>Setting a custom <em>Run</em> command specific to the project.</li> +<li>Configuring the Build menu on a project basis.</li> </ul> <p>A list of session files can be stored and opened with the project when the <em>Use project-based session files</em> preference is enabled, in the <em>Project</em> group of the <a class="reference" href="#preferences">Preferences</a> dialog.</p> -<p>As long as a project is open, the Make and Run commands will use -the project's settings, instead of the defaults. These will be used -whichever document is currently displayed.</p> +<p>As long as a project is open, the Build menu will use +the items defined in project's settings, instead of the defaults. +See <cite>Build Menu Configuration</cite> for information on configuring the menu.</p> <p>The current project's settings are saved when it is closed, or when Geany is shutdown. When restarting Geany, the previously opened project file that was in use at the end of the last session will be reopened.</p> -<p>Below are the commands used to create, modify, open and close projects.</p> +<p>The project menu items are detailed below.</p> <div class="section"> -<h3><a class="toc-backref" href="#id118" id="new-project" name="new-project">New Project</a></h3> +<h3><a class="toc-backref" href="#id119" id="new-project" name="new-project">New Project</a></h3> <p>To create a new project, fill in the <em>Name</em> field. By default this will setup a new project file <tt class="docutils literal"><span class="pre">~/projects/name.geany</span></tt>. Usually it's best to store all your project files in the same directory (they are @@ -2384,31 +2397,21 @@ structure contained in it.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id119" id="project-properties" name="project-properties">Project Properties</a></h3> +<h3><a class="toc-backref" href="#id120" id="project-properties" name="project-properties">Project Properties</a></h3> <p>You can set an optional description for the project, but it is not used elsewhere by Geany.</p> -<p>The <em>Base path</em> field is used as the directory to run the Make and Make -custom commands in. It is also used as working directory for the project -specific <em>Run command</em>. -The specified path can be an absolute path or relative to the project's -file name.</p> +<p>The <em>Base path</em> field is used as the directory to run the Build menu commands. +The specified path can be an absolute path or it is considered to be +relative to the project's file name.</p> <div class="section"> -<h4><a class="toc-backref" href="#id120" id="make-in-base-path" name="make-in-base-path">Make in base path</a></h4> -<p>This setting makes the <em>Build->Make</em> command use the project's base -path. Uncheck this if you want to use the current file's directory -instead.</p> +<h4><a class="toc-backref" href="#id121" id="set-base-path-button" name="set-base-path-button">Set Base Path Button</a></h4> +<p>This button is a convenience to set the working directory fields +in the non-filetype Build menu items to %p to use the project base path.</p> +<div class="note"> +<p class="first admonition-title">Note</p> +<p class="last">Pressing the 'set' button will overright any working directories +you have configured for the project.</p> </div> -<div class="section"> -<h4><a class="toc-backref" href="#id121" id="run-command" name="run-command">Run command</a></h4> -<p>The <em>Run command</em> overrides the default run command. You can set this -to the executable or main script file for the project, and append -any command-line arguments.</p> -<p>The following variables can be used:</p> -<ul class="simple"> -<li>%f -- complete filename without path</li> -<li>%e -- filename without path and without extension</li> -</ul> -<p>See <a class="reference" href="#build-settings-section">[build_settings] Section</a> for details.</p> </div> </div> <div class="section"> @@ -2433,7 +2436,9 @@ approach to such operations, and as there are also many language independant software building systems, Geany does not have a built in build system, nor does it limit which system you can use. Instead the build menu provides -a configurable and flexible means of running any external commands required.</p> +a configurable and flexible means of running any external commands.</p> +<p>This section provides a description of the default configuration of the +build menu and then covers how to configure it, and where the defaults fit in.</p> <p>Running the commands from within Geany has two benefits:</p> <ul class="simple"> <li>the current file is automatically saved before the command is run</li> @@ -2443,21 +2448,19 @@ <p>Warnings and errors that can be parsed for line numbers will be shown in red in the Compiler tab and you can click on them to switch to the relevant source file (or open it) and mark the line number. Also lines with -warnings or errors are marked in the source, see Indicators below.</p> -<p>This section provides a description of the default configuration of the -build menu and then of how to configure it and where the defaults fit in.</p> +warnings or errors are marked in the source, see <a class="reference" href="#indicators">Indicators</a> below.</p> <div class="tip"> <p class="first admonition-title">Tip</p> <p class="last">If Geany's default error message parsing does not parse errors for the tool you're using, you can set a custom regex in the Build Commands -Dialog, see ...</p> +Dialog, see <cite>Build Menu Configuration</cite></p> </div> <div class="section"> <h3><a class="toc-backref" href="#id125" id="indicators" name="indicators">Indicators</a></h3> <p>Indicators are red squiggly underlines which are used to highlight errors which occurred while compiling the current file. So you can easily see where your code failed to compile. To remove the indicators, -just click on "Remove all indicators" in the document file menu.</p> +just select "Remove all indicators" in the document file menu.</p> <p>If you do not like this feature, you can disable it in the preferences dialog.</p> </div> @@ -2471,6 +2474,8 @@ <li>Make All</li> <li>Make Custom Target</li> <li>Make Object</li> +<li>Next Error</li> +<li>Previous Error</li> <li>Execute</li> <li>Set Build Menu Commands</li> </ul> @@ -2479,10 +2484,10 @@ <p>The Compile command has different uses for different kinds of files.</p> <p>For compilable languages such as C and C++, the Compile command is setup to compile the current source file into a binary object file.</p> -<p>Java source files will be compiled to class file bytecode. Interpreted -languages such as Perl, Python, Ruby will compile to bytecode if the -language supports it, or will run a syntax check, or failing that -will run the file in its language interpreter.</p> +<p>Java source files will be compiled to class file bytecode.</p> +<p>Interpreted languages such as Perl, Python, Ruby will compile to +bytecode if the language supports it, or will run a syntax check, +or if that is not available will run the file in its language interpreter.</p> </div> <div class="section"> <h4><a class="toc-backref" href="#id128" id="build" name="build">Build</a></h4> @@ -2494,7 +2499,7 @@ </div> <div class="section"> <h4><a class="toc-backref" href="#id129" id="make" name="make">Make</a></h4> -<p>This effectively runs "make" in the same directory as the +<p>This runs "make" in the same directory as the current file.</p> </div> <div class="section"> @@ -2506,33 +2511,43 @@ <div class="section"> <h4><a class="toc-backref" href="#id131" id="make-object" name="make-object">Make object</a></h4> <p>Make object will run "make current_file.o" in the same directory as -the current file, using its prefix for 'current_file'. It is useful -for compiling just the current file without building the whole project.</p> +the current file, using the filename for 'current_file'. It is useful +for building just the current file without building the whole project.</p> </div> <div class="section"> -<h4><a class="toc-backref" href="#id132" id="execute" name="execute">Execute</a></h4> +<h4><a class="toc-backref" href="#id132" id="next-error" name="next-error">Next Error</a></h4> +<p>The next error item will move to the next detected error in the file.</p> +</div> +<div class="section"> +<h4><a class="toc-backref" href="#id133" id="previous-error" name="previous-error">Previous Error</a></h4> +<p>The previous error item will move to the previous detected error in the file.</p> +</div> +<div class="section"> +<h4><a class="toc-backref" href="#id134" id="execute" name="execute">Execute</a></h4> <p>Execute will run the corresponding executable file, shell script or interpreted script in a terminal window. Note that the Terminal tool path must be correctly set in the Tools tab of the Preferences dialog - you can use any terminal program that runs a Bourne compatible shell -and accept the "-e" command line argument to start a command.</p> +and accept the "-e" command line argument to start a command or can be +selected to us the build-in VTE if it is available, see +<a class="reference" href="#virtual-terminal-emulator-widget-vte">Virtual terminal emulator widget (VTE)</a>.</p> <p>After your program or script has finished executing, you will be prompted to press the return key. This allows you to review any text output from the program before the terminal window is closed.</p> <p>The execute command output is not parsed for errors.</p> </div> <div class="section"> -<h4><a class="toc-backref" href="#id133" id="stopping-running-processes" name="stopping-running-processes">Stopping running processes</a></h4> +<h4><a class="toc-backref" href="#id135" id="stopping-running-processes" name="stopping-running-processes">Stopping running processes</a></h4> <p>When there is a running program, the Execute menu item in the menu and the Run button in the toolbar -becomes a stop button and you can stop the current action. This +becomes a stop button and you can stop the current running program. This works by sending a signal to the process (and its child process(es)) -to stop the process. The used signal is SIGQUIT.</p> -<p>Depending on the process you started it might be that the process +to stop the process. The signal used is SIGQUIT.</p> +<p>Depending on the process you started it is possible that the process cannot be stopped. For example this can happen when the process creates more than one child process.</p> <div class="section"> -<h5><a class="toc-backref" href="#id134" id="terminal-emulators" name="terminal-emulators">Terminal emulators</a></h5> +<h5><a class="toc-backref" href="#id136" id="terminal-emulators" name="terminal-emulators">Terminal emulators</a></h5> <p>Xterm is known to work properly. If you are using "Terminal" (the terminal program of Xfce), you should add the command line @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3993] trunk
by eht16＠users.sourceforge.net 19 Jul '09

19 Jul '09

Revision: 3993 http://geany.svn.sourceforge.net/geany/?rev=3993&view=rev Author: eht16 Date: 2009-07-19 20:19:09 +0000 (Sun, 19 Jul 2009) Log Message: ----------- Don't use the main window as parent for dialog boxes if it is not yet realised. Set titles for message dialogs. Modified Paths: -------------- trunk/ChangeLog trunk/src/dialogs.c trunk/src/main.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-07-19 09:20:37 UTC (rev 3992) +++ trunk/ChangeLog 2009-07-19 20:19:09 UTC (rev 3993) @@ -1,3 +1,11 @@ +2009-07-19 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/dialogs.c: + Don't use the main window as parent for dialog boxes if it is not + yet realised. + Set titles for message dialogs. + + 2009-07-18 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * src/toolbar.c: Modified: trunk/src/dialogs.c =================================================================== --- trunk/src/dialogs.c 2009-07-19 09:20:37 UTC (rev 3992) +++ trunk/src/dialogs.c 2009-07-19 20:19:09 UTC (rev 3993) @@ -552,6 +552,40 @@ } +#ifndef G_OS_WIN32 +static void show_msgbox_dialog(GtkWidget *dialog, GtkMessageType type, GtkWindow *parent) +{ + const gchar *title; + switch (type) + { + case GTK_MESSAGE_ERROR: + title = _("Error"); + break; + case GTK_MESSAGE_QUESTION: + title = _("Question"); + break; + case GTK_MESSAGE_WARNING: + title = _("Warning"); + break; + default: + title = _("Information"); + break; + } + gtk_window_set_title(GTK_WINDOW(dialog), title); + if (parent == NULL) + { + GdkPixbuf *pb = ui_new_pixbuf_from_inline(GEANY_IMAGE_LOGO); + gtk_window_set_icon(GTK_WINDOW(dialog), pb); + g_object_unref(pb); + } + gtk_widget_set_name(dialog, "GeanyDialog"); + + gtk_dialog_run(GTK_DIALOG(dialog)); + gtk_widget_destroy(dialog); +} +#endif + + /** * Show a message box of the type @c type with @c text. * On Unix-like systems a GTK message dialog box is shown, on Win32 systems a native Windows @@ -569,38 +603,36 @@ #endif gchar string[512]; va_list args; + GtkWindow *parent = (main_status.main_window_realized) ? GTK_WINDOW(main_widgets.window) : NULL; va_start(args, text); g_vsnprintf(string, 511, text, args); va_end(args); #ifdef G_OS_WIN32 - win32_message_dialog(NULL, type, string); + win32_message_dialog(GTK_WIDGET(parent), type, string); #else - dialog = gtk_message_dialog_new(GTK_WINDOW(main_widgets.window), GTK_DIALOG_DESTROY_WITH_PARENT, + dialog = gtk_message_dialog_new(parent, GTK_DIALOG_DESTROY_WITH_PARENT, type, GTK_BUTTONS_OK, "%s", string); - gtk_widget_set_name(dialog, "GeanyDialog"); - gtk_dialog_run(GTK_DIALOG(dialog)); - gtk_widget_destroy(dialog); + show_msgbox_dialog(dialog, type, parent); #endif } void dialogs_show_msgbox_with_secondary(GtkMessageType type, const gchar *text, const gchar *secondary) { + GtkWindow *parent = (main_status.main_window_realized) ? GTK_WINDOW(main_widgets.window) : NULL; #ifdef G_OS_WIN32 /* put the two strings together because Windows message boxes don't support secondary texts */ gchar *string = g_strconcat(text, "\n", secondary, NULL); - win32_message_dialog(NULL, type, string); + win32_message_dialog(GTK_WIDGET(parent), type, string); g_free(string); #else GtkWidget *dialog; - dialog = gtk_message_dialog_new(GTK_WINDOW(main_widgets.window), GTK_DIALOG_DESTROY_WITH_PARENT, + dialog = gtk_message_dialog_new(parent, GTK_DIALOG_DESTROY_WITH_PARENT, type, GTK_BUTTONS_OK, "%s", text); - gtk_widget_set_name(dialog, "GeanyDialog"); gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), "%s", secondary); - gtk_dialog_run(GTK_DIALOG(dialog)); - gtk_widget_destroy(dialog); + show_msgbox_dialog(dialog, type, parent); #endif } @@ -1321,13 +1353,21 @@ #else GtkWidget *dialog; - if (parent == NULL) + if (parent == NULL && main_status.main_window_realized) parent = main_widgets.window; dialog = gtk_message_dialog_new(GTK_WINDOW(parent), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, "%s", question_text); gtk_widget_set_name(dialog, "GeanyDialog"); + gtk_window_set_title(GTK_WINDOW(dialog), _("Question")); + if (parent == NULL) + { + GdkPixbuf *pb = ui_new_pixbuf_from_inline(GEANY_IMAGE_LOGO); + gtk_window_set_icon(GTK_WINDOW(dialog), pb); + g_object_unref(pb); + } + /* question_text will be in bold if optional extra_text used */ if (extra_text != NULL) gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), @@ -1361,11 +1401,12 @@ gboolean ret = FALSE; gchar string[512]; va_list args; + GtkWidget *parent = (main_status.main_window_realized) ? main_widgets.window : NULL; va_start(args, text); g_vsnprintf(string, 511, text, args); va_end(args); - ret = show_question(main_widgets.window, GTK_STOCK_YES, GTK_STOCK_NO, string, NULL); + ret = show_question(parent, GTK_STOCK_YES, GTK_STOCK_NO, string, NULL); return ret; } Modified: trunk/src/main.c =================================================================== --- trunk/src/main.c 2009-07-19 09:20:37 UTC (rev 3992) +++ trunk/src/main.c 2009-07-19 20:19:09 UTC (rev 3993) @@ -976,9 +976,7 @@ /* set window icon */ { - GdkPixbuf *pb; - - pb = ui_new_pixbuf_from_inline(GEANY_IMAGE_LOGO); + GdkPixbuf *pb = ui_new_pixbuf_from_inline(GEANY_IMAGE_LOGO); gtk_window_set_icon(GTK_WINDOW(main_widgets.window), pb); g_object_unref(pb); /* free our reference */ } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3992] branches/build-system
by elextr＠users.sourceforge.net 19 Jul '09

19 Jul '09

Revision: 3992 http://geany.svn.sourceforge.net/geany/?rev=3992&view=rev Author: elextr Date: 2009-07-19 09:20:37 +0000 (Sun, 19 Jul 2009) Log Message: ----------- Build commands & project dialog improvements Modified Paths: -------------- branches/build-system/ChangeLog branches/build-system/src/build.c branches/build-system/src/build.h branches/build-system/src/project.c Modified: branches/build-system/ChangeLog =================================================================== --- branches/build-system/ChangeLog 2009-07-18 14:45:43 UTC (rev 3991) +++ branches/build-system/ChangeLog 2009-07-19 09:20:37 UTC (rev 3992) @@ -1,3 +1,14 @@ +2009-07-19 Lex Trotman <elextr(at)gmail(dot)com> + + * src/build.c, src/build.h + Added set_build_non_ft_wd_to_proj() for use by project dialog. + Improved interpretation of run_in_base_dir from old [build-settings] + Added spacing to build commands dialog + * src/project.c + Removed run in base path option from project dialog and added button to + set working directories to d the same. + + 2009-07-18 Lex Trotman <elextr(at)gmail(dot)com> * src/build.c Modified: branches/build-system/src/build.c =================================================================== --- branches/build-system/src/build.c 2009-07-18 14:45:43 UTC (rev 3991) +++ branches/build-system/src/build.c 2009-07-19 09:20:37 UTC (rev 3992) @@ -1629,6 +1629,9 @@ #define DC_CLEAR 4 #define DC_N_COL 5 +static const int entry_x_padding = 3; +static const int entry_y_padding = 0; + static RowWidgets *build_add_dialog_row(GeanyDocument *doc, GtkTable *table, gint row, GeanyBuildSource dst, gint grp, gint cmd, gboolean dir) { @@ -1641,7 +1644,8 @@ gint column = 0; label = gtk_label_new(g_strdup_printf("%d:", cmd+1)); - gtk_table_attach(table, label, column, column+1, row, row+1, GTK_FILL, GTK_FILL | GTK_EXPAND, 0, 0); + gtk_table_attach(table, label, column, column+1, row, row+1, GTK_FILL, GTK_FILL | GTK_EXPAND, + entry_x_padding, entry_y_padding); roww = g_new0(RowWidgets, 1); roww->src = BCS_COUNT; roww->grp = grp; @@ -1652,14 +1656,15 @@ column+=1; roww->entries[i] = gtk_entry_new(); gtk_table_attach(table, roww->entries[i], column, column+1, row, row+1, GTK_FILL, - GTK_FILL | GTK_EXPAND, 0, 0); + GTK_FILL | GTK_EXPAND, entry_x_padding, entry_y_padding); } column++; - clearicon = gtk_image_new_from_stock(GTK_STOCK_CLEAR, GTK_ICON_SIZE_SMALL_TOOLBAR); + clearicon = gtk_image_new_from_stock(GTK_STOCK_CLEAR, GTK_ICON_SIZE_MENU); clear = gtk_button_new(); gtk_button_set_image(GTK_BUTTON(clear), clearicon); g_signal_connect((gpointer)clear, "clicked", G_CALLBACK(on_clear_dialog_row), (gpointer)roww); - gtk_table_attach(table, clear, column, column+1, row, row+1, GTK_FILL, GTK_FILL | GTK_EXPAND, 0, 0); + gtk_table_attach(table, clear, column, column+1, row, row+1, GTK_FILL, GTK_FILL | GTK_EXPAND, + entry_x_padding, entry_y_padding); roww->cmdsrc = bc = get_build_cmd(doc, grp, cmd, &src); if (bc!=NULL)roww->src = src; @@ -1678,7 +1683,6 @@ return roww; } - typedef struct TableFields { RowWidgets **rows; GtkWidget *fileregex, *nonfileregex; @@ -1703,10 +1707,11 @@ { label = gtk_label_new(gettext(*ch)); gtk_table_attach(table, label, col, col+1, 0, 1, - GTK_FILL, GTK_FILL | GTK_EXPAND, 0, 0); + GTK_FILL, GTK_FILL | GTK_EXPAND, entry_x_padding, entry_y_padding); } sep = gtk_hseparator_new(); - gtk_table_attach(table, sep, 0, DC_N_COL, 1, 2, GTK_FILL, GTK_FILL | GTK_EXPAND, 0, 0); + gtk_table_attach(table, sep, 0, DC_N_COL, 1, 2, GTK_FILL, GTK_FILL | GTK_EXPAND, + entry_x_padding, entry_y_padding); if (ft!=NULL){ txt = g_strdup_printf(_("%s commands"), ft->title); } else @@ -1714,11 +1719,13 @@ label = gtk_label_new(txt); g_free(txt); gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); - gtk_table_attach(table, label, 0, DC_N_COL, 2, 3, GTK_FILL, GTK_FILL | GTK_EXPAND, 0, 0); + gtk_table_attach(table, label, 0, DC_N_COL, 2, 3, GTK_FILL, GTK_FILL | GTK_EXPAND, + entry_x_padding, entry_y_padding); for (row=3, cmdindex=0, cmd=0; cmd<build_groups_count[GBG_FT]; ++row, ++cmdindex, ++cmd) fields->rows[cmdindex] = build_add_dialog_row(doc, table, row, dst, GBG_FT, cmd, FALSE); label = gtk_label_new(_("Error Regular Expression")); - gtk_table_attach(table, label, 0, DC_ENTRIES+1, row, row+1, GTK_FILL, GTK_FILL | GTK_EXPAND, 0, 0); + gtk_table_attach(table, label, 0, DC_ENTRIES+1, row, row+1, GTK_FILL, GTK_FILL | GTK_EXPAND, + entry_x_padding, entry_y_padding); fields->fileregex = gtk_entry_new(); fields->fileregexstring = get_build_regex(GBG_FT, NULL, &src); sensitivity = ft==NULL?FALSE:TRUE; @@ -1728,26 +1735,30 @@ if (src>dst) sensitivity = FALSE; } gtk_table_attach(table, fields->fileregex, DC_ENTRIES+1, DC_CLEAR, row, row+1, GTK_FILL, - GTK_FILL | GTK_EXPAND, 0, 0); - clearicon = gtk_image_new_from_stock(GTK_STOCK_CLEAR, GTK_ICON_SIZE_SMALL_TOOLBAR); + GTK_FILL | GTK_EXPAND, entry_x_padding, entry_y_padding); + clearicon = gtk_image_new_from_stock(GTK_STOCK_CLEAR, GTK_ICON_SIZE_MENU); clear = gtk_button_new(); gtk_button_set_image(GTK_BUTTON(clear), clearicon); g_signal_connect_swapped((gpointer)clear, "clicked", G_CALLBACK(on_clear_dialog_regex_row), (gpointer)(fields->fileregex)); - gtk_table_attach(table, clear, DC_CLEAR, DC_CLEAR+1, row, row+1, GTK_FILL, GTK_FILL | GTK_EXPAND, 0, 0); + gtk_table_attach(table, clear, DC_CLEAR, DC_CLEAR+1, row, row+1, GTK_FILL, GTK_FILL | GTK_EXPAND, + entry_x_padding, entry_y_padding); gtk_widget_set_sensitive(fields->fileregex, sensitivity); gtk_widget_set_sensitive(clear, sensitivity); ++row; sep = gtk_hseparator_new(); - gtk_table_attach(table, sep, 0, DC_N_COL, row, row+1, GTK_FILL, GTK_FILL | GTK_EXPAND, 0, 0); + gtk_table_attach(table, sep, 0, DC_N_COL, row, row+1, GTK_FILL, GTK_FILL | GTK_EXPAND, + entry_x_padding, entry_y_padding); ++row; label = gtk_label_new(_("Non Filetype Commands")); gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); - gtk_table_attach(table, label, 0, DC_N_COL, row, row+1, GTK_FILL, GTK_FILL | GTK_EXPAND, 0, 0); + gtk_table_attach(table, label, 0, DC_N_COL, row, row+1, GTK_FILL, GTK_FILL | GTK_EXPAND, + entry_x_padding, entry_y_padding); for (++row, cmd=0; cmd<build_groups_count[GBG_NON_FT]; ++row,++cmdindex, ++cmd) fields->rows[cmdindex] = build_add_dialog_row(doc, table, row, dst, GBG_NON_FT, cmd, TRUE); label = gtk_label_new(_("Error Regular Expression")); - gtk_table_attach(table, label, 0, DC_ENTRIES+1, row, row+1, GTK_FILL, GTK_FILL | GTK_EXPAND, 0, 0); + gtk_table_attach(table, label, 0, DC_ENTRIES+1, row, row+1, GTK_FILL, GTK_FILL | GTK_EXPAND, + entry_x_padding, entry_y_padding); fields->nonfileregex = gtk_entry_new(); fields->nonfileregexstring = get_build_regex(GBG_NON_FT, NULL, &src); sensitivity = TRUE; @@ -1757,42 +1768,57 @@ sensitivity = src>dst?FALSE:TRUE; } gtk_table_attach(table, fields->nonfileregex, DC_ENTRIES+1, DC_CLEAR, row, row+1, GTK_FILL, - GTK_FILL | GTK_EXPAND, 0, 0); - clearicon = gtk_image_new_from_stock(GTK_STOCK_CLEAR, GTK_ICON_SIZE_SMALL_TOOLBAR); + GTK_FILL | GTK_EXPAND, entry_x_padding, entry_y_padding); + clearicon = gtk_image_new_from_stock(GTK_STOCK_CLEAR, GTK_ICON_SIZE_MENU); clear = gtk_button_new(); gtk_button_set_image(GTK_BUTTON(clear), clearicon); g_signal_connect_swapped((gpointer)clear, "clicked", G_CALLBACK(on_clear_dialog_regex_row), (gpointer)(fields->nonfileregex)); - gtk_table_attach(table, clear, DC_CLEAR, DC_CLEAR+1, row, row+1, GTK_FILL, GTK_FILL | GTK_EXPAND, 0, 0); + gtk_table_attach(table, clear, DC_CLEAR, DC_CLEAR+1, row, row+1, GTK_FILL, GTK_FILL | GTK_EXPAND, + entry_x_padding, entry_y_padding); gtk_widget_set_sensitive(fields->nonfileregex, sensitivity); gtk_widget_set_sensitive(clear, sensitivity); ++row; sep = gtk_hseparator_new(); - gtk_table_attach(table, sep, 0, DC_N_COL, row, row+1, GTK_FILL, GTK_FILL | GTK_EXPAND, 0, 0); + gtk_table_attach(table, sep, 0, DC_N_COL, row, row+1, GTK_FILL, GTK_FILL | GTK_EXPAND, + entry_x_padding, entry_y_padding); ++row; label = gtk_label_new(_("Execute Commands")); gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); - gtk_table_attach(table, label, 0, DC_N_COL, row, row+1, GTK_FILL, GTK_FILL | GTK_EXPAND, 0, 0); + gtk_table_attach(table, label, 0, DC_N_COL, row, row+1, GTK_FILL, GTK_FILL | GTK_EXPAND, + entry_x_padding, entry_y_padding); for (++row, cmd=0; cmd<build_groups_count[GBG_EXEC]; ++row,++cmdindex, ++cmd) fields->rows[cmdindex] = build_add_dialog_row(doc, table, row, dst, GBG_EXEC, cmd, TRUE); sep = gtk_hseparator_new(); - gtk_table_attach(table, sep, 0, DC_N_COL, row, row+1, GTK_FILL, GTK_FILL | GTK_EXPAND, 0, 0); + gtk_table_attach(table, sep, 0, DC_N_COL, row, row+1, GTK_FILL, GTK_FILL | GTK_EXPAND, + entry_x_padding, entry_y_padding); ++row; sep = gtk_hseparator_new(); - gtk_table_attach(table, sep, 0, DC_N_COL, row, row+1, GTK_FILL, GTK_FILL | GTK_EXPAND, 0, 0); + gtk_table_attach(table, sep, 0, DC_N_COL, row, row+1, GTK_FILL, GTK_FILL | GTK_EXPAND, + entry_x_padding, entry_y_padding); ++row; label = gtk_label_new(_( "Notes:\n" " %d, %e, %f, %p are substituted in Commands and Working dir, see manual for details\n" " Non-filetype menu Item 2 opens a dialog and appends the reponse to the command")); gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); - gtk_table_attach(table, label, 0, DC_N_COL, row, row+1, GTK_FILL, GTK_FILL | GTK_EXPAND, 0, 0); + gtk_table_attach(table, label, 0, DC_N_COL, row, row+1, GTK_FILL, GTK_FILL | GTK_EXPAND, + entry_x_padding, entry_y_padding); /* printf("%d extra rows in dialog\n", row-build_items_count); */ ++row; *table_data = fields; return GTK_WIDGET(table); } +void free_build_fields(TableData table_data) +{ + gint cmdindex; + for (cmdindex=0; cmdindex<build_items_count; ++cmdindex) + g_free(table_data->rows[cmdindex]); + g_free(table_data->rows); + g_free(table_data); +} + /* string compare where null pointers match null or 0 length strings */ static int stcmp(const gchar *a, const gchar *b) { @@ -1802,15 +1828,6 @@ return strcmp(a, b); } -void free_build_fields(TableData table_data) -{ - gint cmdindex; - for (cmdindex=0; cmdindex<build_items_count; ++cmdindex) - g_free(table_data->rows[cmdindex]); - g_free(table_data->rows); - g_free(table_data); -} - static gboolean read_row(BuildDestination *dst, TableData table_data, gint drow, gint grp, gint cmd) { gchar *entries[BC_CMDENTRIES_COUNT]; @@ -1923,7 +1940,7 @@ static void show_build_commands_dialog() { - GtkWidget *dialog, *table; + GtkWidget *dialog, *table, *vbox; GeanyDocument *doc = document_get_current(); GeanyFiletype *ft = NULL; gchar *title = _("Set Build Commands"); @@ -1938,7 +1955,8 @@ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL); table = build_commands_table(doc, BCS_PREF, &table_data, ft); - gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), table, TRUE, TRUE, 0); + vbox = ui_dialog_vbox_new(GTK_DIALOG(dialog)); + gtk_box_pack_start(GTK_BOX(vbox), table, TRUE, TRUE, 0); gtk_widget_show_all(dialog); /* run modally to prevent user changing idx filetype */ response = gtk_dialog_run(GTK_DIALOG(dialog)); @@ -1973,6 +1991,16 @@ return items; } +/* set non_ft working directory entries to %p for project */ +void set_build_non_ft_wd_to_proj(TableData table_data) +{ + gint i, start, end; + start = build_groups_count[GBG_FT]; + end = start + build_groups_count[GBG_NON_FT]; + for (i = start; i<end; ++i) + gtk_entry_set_text(GTK_ENTRY(table_data->rows[i]->entries[BC_WORKING_DIR]), "%p"); +} + /*---------------------------------------------------------- * * Load and store configuration @@ -2107,11 +2135,12 @@ /* set GeanyBuildCommand if it doesn't already exist and there is a command */ #define ASSIGNIF(type, id, string, value) \ - if (value!=NULL && !type[GBO_TO_CMD(id)].exists && (value)!=NULL && strlen(value)>0) { \ + if (value!=NULL && !type[GBO_TO_CMD(id)].exists && strlen(value)>0) { \ type[GBO_TO_CMD(id)].exists = TRUE; \ type[GBO_TO_CMD(id)].entries[BC_LABEL] = g_strdup(_(string)); \ type[GBO_TO_CMD(id)].entries[BC_COMMAND] = (value); \ type[GBO_TO_CMD(id)].entries[BC_WORKING_DIR] = NULL; \ + type[GBO_TO_CMD(id)].old = TRUE; \ } switch(src) @@ -2133,8 +2162,12 @@ if (non_ft_proj==NULL)non_ft_proj = g_new0(GeanyBuildCommand, build_groups_count[GBG_NON_FT]); bvalue = g_key_file_get_boolean(config, "project", "make_in_base_path", NULL); value = bvalue?"%p":"%d"; - for (cmd=0; cmd<build_groups_count[GBG_NON_FT]; ++cmd) - non_ft_proj[cmd].entries[BC_WORKING_DIR] = g_strdup(value); + if (non_ft_pref[GBO_TO_CMD(GBO_MAKE_ALL)].old) + setptr(non_ft_pref[GBO_TO_CMD(GBO_MAKE_ALL)].entries[BC_WORKING_DIR], value ); + if (non_ft_pref[GBO_TO_CMD(GBO_MAKE_CUSTOM)].old) + setptr(non_ft_pref[GBO_TO_CMD(GBO_MAKE_CUSTOM)].entries[BC_WORKING_DIR], value ); + if (non_ft_pref[GBO_TO_CMD(GBO_MAKE_OBJECT)].old) + setptr(non_ft_pref[GBO_TO_CMD(GBO_MAKE_OBJECT)].entries[BC_WORKING_DIR], value ); value = g_key_file_get_string(config, "project", "run_cmd", NULL); if (value !=NULL) { @@ -2284,6 +2317,11 @@ build_items_count = sum; } +gint get_build_group_count(GeanyBuildGroup grp) +{ + return build_groups_count[grp]; +} + static struct { gchar *entries[BC_CMDENTRIES_COUNT]; GeanyBuildCommand **ptr; Modified: branches/build-system/src/build.h =================================================================== --- branches/build-system/src/build.h 2009-07-18 14:45:43 UTC (rev 3991) +++ branches/build-system/src/build.h 2009-07-19 09:20:37 UTC (rev 3992) @@ -104,6 +104,7 @@ gchar *entries[BC_CMDENTRIES_COUNT]; gboolean exists; gboolean changed; + gboolean old; } GeanyBuildCommand; extern GeanyBuildCommand *non_ft_proj, *exec_proj; /* project command array pointers */ @@ -137,6 +138,8 @@ void free_build_data( TableData data ); +void set_build_non_ft_wd_to_proj(TableData table_data); + /* build response decode assistance function */ gboolean build_parse_make_dir(const gchar *string, gchar **prefix); @@ -147,15 +150,17 @@ void build_toolbutton_build_clicked(GtkAction *action, gpointer user_data); -void remove_command( GeanyBuildSource src, GeanyBuildGroup grp, gint cmd ); +void remove_command(GeanyBuildSource src, GeanyBuildGroup grp, gint cmd); /* load and store menu configuration */ -void load_build_menu( GKeyFile *config, GeanyBuildSource dst, gpointer ptr ); +void load_build_menu( GKeyFile *config, GeanyBuildSource dst, gpointer ptr); -void save_build_menu( GKeyFile *config, gpointer ptr, GeanyBuildSource src ); +void save_build_menu( GKeyFile *config, gpointer ptr, GeanyBuildSource src); -void set_build_grp_count( GeanyBuildGroup grp, gint count ); +void set_build_grp_count(GeanyBuildGroup grp, gint count); +gint get_build_group_count(GeanyBuildGroup grp); + gchar **get_build_regex(GeanyBuildGroup grp, GeanyFiletype *ft, gint *from); #endif Modified: branches/build-system/src/project.c =================================================================== --- branches/build-system/src/project.c 2009-07-18 14:45:43 UTC (rev 3991) +++ branches/build-system/src/project.c 2009-07-19 09:20:37 UTC (rev 3992) @@ -386,10 +386,15 @@ update_ui(); } +static void on_set_use_base_path_clicked( GtkWidget *unused1, gpointer user_data ) +{ + TableData td = (TableData)user_data; + set_build_non_ft_wd_to_proj(td); +} static void create_properties_dialog(PropertyDialogElements *e) { - GtkWidget *table, *notebook; + GtkWidget *table, *notebook, *build_table; GtkWidget *image; GtkWidget *button; GtkWidget *bbox; @@ -416,7 +421,7 @@ gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), -1, 0); + gtk_misc_set_alignment(GTK_MISC(label), 0, 0); e->name = gtk_entry_new(); ui_entry_add_clear_icon(e->name); @@ -429,7 +434,7 @@ gtk_table_attach(GTK_TABLE(table), label, 0, 1, 1, 2, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), -1, 0); + gtk_misc_set_alignment(GTK_MISC(label), 0, 0); e->file_name = gtk_entry_new(); ui_entry_add_clear_icon(e->file_name); @@ -442,7 +447,7 @@ gtk_table_attach(GTK_TABLE(table), label, 0, 1, 2, 3, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), -1, 0); + gtk_misc_set_alignment(GTK_MISC(label), 0, 0); e->description = gtk_text_view_new(); gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(e->description), GTK_WRAP_WORD); @@ -459,7 +464,7 @@ gtk_table_attach(GTK_TABLE(table), label, 0, 1, 3, 4, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), -1, 0); + gtk_misc_set_alignment(GTK_MISC(label), 0, 0); e->base_path = gtk_entry_new(); ui_entry_add_clear_icon(e->base_path); @@ -472,34 +477,28 @@ gtk_table_attach(GTK_TABLE(table), bbox, 1, 2, 3, 4, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (0), 0, 0); + + if (doc!=NULL) ft=doc->file_type; + build_table = build_commands_table( doc, BCS_PROJ, &(e->build_properties), ft ); + label = gtk_label_new(_("Build")); + notebook = ui_lookup_widget(e->dialog, "project_notebook"); + gtk_notebook_insert_page(GTK_NOTEBOOK(notebook), build_table, label, 2); - e->make_in_base_path = gtk_check_button_new_with_label(_("Make in base path")); - gtk_table_attach(GTK_TABLE(table), e->make_in_base_path, 0, 3, 4, 5, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - - label = gtk_label_new(_("Run command:")); - gtk_table_attach(GTK_TABLE(table), label, 0, 1, 5, 6, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), -1, 0); - - e->run_cmd = gtk_entry_new(); - ui_entry_add_clear_icon(e->run_cmd); - ui_widget_set_tooltip_text(e->run_cmd, - _("Command-line to run in the project base directory. " - "Options can be appended to the command. " - "Leave blank to use the default run command.")); - button = gtk_button_new(); - g_signal_connect(button, "clicked", G_CALLBACK(on_file_open_button_clicked), e); - image = gtk_image_new_from_stock("gtk-open", GTK_ICON_SIZE_BUTTON); - gtk_container_add(GTK_CONTAINER(button), image); + label = gtk_label_new(_("Set the non-filetype working directories on build tab to use base path:")); + gtk_misc_set_alignment(GTK_MISC(label), 0, 0); + + button = gtk_button_new_with_label(_("Set")); + ui_widget_set_tooltip_text(button, + _("Set the working directories (on the Build tab) " + "for the non-filetype build commands to use the base path")); + gtk_misc_set_alignment(GTK_MISC(label), 0, 0); + g_signal_connect(button, "clicked", G_CALLBACK(on_set_use_base_path_clicked), e->build_properties); bbox = gtk_hbox_new(FALSE, 6); - gtk_box_pack_start_defaults(GTK_BOX(bbox), e->run_cmd); + gtk_box_pack_start(GTK_BOX(bbox), label, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0); - gtk_table_attach(GTK_TABLE(table), bbox, 1, 2, 5, 6, + gtk_table_attach(GTK_TABLE(table), bbox, 0, 2, 4, 5, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), - (GtkAttachOptions) (0), 0, 0); + (GtkAttachOptions) (GTK_FILL), 0, 0); #if 0 label = gtk_label_new(_("File patterns:")); @@ -507,7 +506,7 @@ gtk_table_attach(GTK_TABLE(table), label, 0, 1, 6, 7, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), -1, 0); + gtk_misc_set_alignment(GTK_MISC(label), 0, 0); e->patterns = gtk_text_view_new(); swin = gtk_scrolled_window_new(NULL, NULL); @@ -520,14 +519,9 @@ (GtkAttachOptions) (0), 0, 0); #endif - notebook = ui_lookup_widget(e->dialog, "project_notebook"); label = gtk_label_new(_("Project")); gtk_widget_show(table); /* needed to switch current page */ gtk_notebook_insert_page(GTK_NOTEBOOK(notebook), table, label, 0); - if (doc!=NULL) ft=doc->file_type; - table = build_commands_table( doc, BCS_PROJ, &(e->build_properties), ft ); - label = gtk_label_new(_("Build")); - gtk_notebook_insert_page(GTK_NOTEBOOK(notebook), table, label, 2); gtk_notebook_set_current_page(GTK_NOTEBOOK(notebook), 0); } @@ -578,11 +572,6 @@ gtk_entry_set_text(GTK_ENTRY(e->file_name), p->file_name); gtk_entry_set_text(GTK_ENTRY(e->base_path), p->base_path); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(e->make_in_base_path), - p->make_in_base_path); - if (p->run_cmd != NULL) - gtk_entry_set_text(GTK_ENTRY(e->run_cmd), p->run_cmd); - gtk_widget_show_all(e->dialog); retry: @@ -741,10 +730,6 @@ GeanyBuildCommand *oldvalue; GeanyFiletype *ft=NULL; - p->make_in_base_path = gtk_toggle_button_get_active( - GTK_TOGGLE_BUTTON(e->make_in_base_path)); - setptr(p->run_cmd, g_strdup(gtk_entry_get_text(GTK_ENTRY(e->run_cmd)))); - /* get and set the project description */ buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(e->description)); gtk_text_buffer_get_start_iter(buffer, &start); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3991] trunk
by eht16＠users.sourceforge.net 18 Jul '09

18 Jul '09

Revision: 3991 http://geany.svn.sourceforge.net/geany/?rev=3991&view=rev Author: eht16 Date: 2009-07-18 14:45:43 +0000 (Sat, 18 Jul 2009) Log Message: ----------- Improve inserting of comment templates like File header or licence notices. The comment information are now read from the filetype configuration files. Modified Paths: -------------- trunk/ChangeLog trunk/src/templates.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-07-18 14:45:30 UTC (rev 3990) +++ trunk/ChangeLog 2009-07-18 14:45:43 UTC (rev 3991) @@ -5,6 +5,10 @@ Apply changes in the toolbar editor instantly. Show icons in the toolbar editor. Speed up toolbar editor dialog creation. + * src/templates.c: + Improve inserting of comment templates like File header or licence + notices. The comment information are now read from the filetype + configuration files. 2009-07-16 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/src/templates.c =================================================================== --- trunk/src/templates.c 2009-07-18 14:45:30 UTC (rev 3990) +++ trunk/src/templates.c 2009-07-18 14:45:43 UTC (rev 3991) @@ -591,122 +591,46 @@ * 6 characters are filled with whitespace when the comment characters include " *" */ static gchar *make_comment_block(const gchar *comment_text, gint filetype_idx, guint indent) { - gchar *frame_start = ""; /* to add before comment_text */ - gchar *frame_end = ""; /* to add after comment_text */ - gchar *line_prefix; /* to add before every line in comment_text */ + gchar *frame_start; /* to add before comment_text */ + gchar *frame_end; /* to add after comment_text */ + gchar *line_prefix; /* to add before every line in comment_text */ gchar *result; gchar *tmp; gchar *prefix; gchar **lines; guint i, len; + GeanyFiletype *ft = filetypes_index(filetype_idx); - /* TODO the following switch could be replaced by some intelligent code which reads - * frame_start, frame_end and line_prefix from the filetype definition files */ - switch (filetype_idx) + g_return_val_if_fail(ft != NULL, NULL); + + if (NZV(ft->comment_open)) { - case GEANY_FILETYPES_HTML: - case GEANY_FILETYPES_XML: - case GEANY_FILETYPES_DOCBOOK: + if (NZV(ft->comment_close)) { - frame_start = "\n"; + frame_start = g_strconcat(ft->comment_open, "\n", NULL); + frame_end = g_strconcat(ft->comment_close, "\n", NULL); line_prefix = ""; - break; } - - case GEANY_FILETYPES_PYTHON: - case GEANY_FILETYPES_R: - case GEANY_FILETYPES_RUBY: - case GEANY_FILETYPES_SH: - case GEANY_FILETYPES_MAKE: - case GEANY_FILETYPES_PERL: - case GEANY_FILETYPES_DIFF: - case GEANY_FILETYPES_TCL: - case GEANY_FILETYPES_CONF: - case GEANY_FILETYPES_PO: - case GEANY_FILETYPES_YAML: - case GEANY_FILETYPES_CMAKE: + else { - line_prefix = "#"; - break; + frame_start = NULL; + frame_end = NULL; + line_prefix = ft->comment_open; } + } + else + { /* use C-like multi-line comments as fallback */ + frame_start = g_strdup("/*\n"); + frame_end = g_strdup("*/\n"); + line_prefix = ""; + } - case GEANY_FILETYPES_JS: - case GEANY_FILETYPES_HAXE: - { - line_prefix = "//"; - break; - } - - case GEANY_FILETYPES_LATEX: - case GEANY_FILETYPES_MATLAB: - { - line_prefix = "%"; - break; - } - - case GEANY_FILETYPES_ADA: - case GEANY_FILETYPES_HASKELL: - case GEANY_FILETYPES_VHDL: - case GEANY_FILETYPES_LUA: - { - line_prefix = "--"; - break; - } - - case GEANY_FILETYPES_FORTRAN: - { - line_prefix = "!"; - break; - } - - case GEANY_FILETYPES_F77: - { - line_prefix = "c"; - break; - } - - case GEANY_FILETYPES_ASM: - case GEANY_FILETYPES_NSIS: - { - line_prefix = ";"; - break; - } - - case GEANY_FILETYPES_BASIC: - { - line_prefix = "'"; - break; - } - - case GEANY_FILETYPES_PASCAL: - { - frame_start = "{\n"; - frame_end = "}\n"; - line_prefix = ""; - break; - } - - case GEANY_FILETYPES_CAML: - { - frame_start = "(*\n"; - frame_end = " *)\n"; - line_prefix = " *"; - break; - } - - case GEANY_FILETYPES_NONE: - { - line_prefix = ""; - break; - } - - default: /* assume C-like multi-line comment is appropriate */ - { - frame_start = "/*\n"; - frame_end = " */\n"; - line_prefix = " *"; - } + /* do some magic to nicely format C-like multi-line comments */ + if (NZV(frame_start) && frame_start[1] == '*') + { + /* prefix the string with a space */ + setptr(frame_end, g_strconcat(" ", frame_end, NULL)); + line_prefix = " *"; } /* construct the real prefix with given amount of whitespace */ @@ -715,7 +639,6 @@ prefix = g_strconcat(line_prefix, tmp, NULL); g_free(tmp); - /* add line_prefix to every line of comment_text */ lines = g_strsplit(comment_text, "\n", -1); len = g_strv_length(lines) - 1; @@ -728,10 +651,12 @@ tmp = g_strjoinv("\n", lines); /* add frame_start and frame_end */ - result = g_strconcat(frame_start, tmp, frame_end, NULL); + if (frame_start != NULL) + result = g_strconcat(frame_start, tmp, frame_end, NULL); + else + result = g_strconcat(tmp, frame_end, NULL); - g_free(prefix); - g_free(tmp); + utils_free_pointers(4, prefix, tmp, frame_start, frame_end, NULL); g_strfreev(lines); return result; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
15
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits July 2009