Commits March 2007

commits@lists.geany.org

3 participants
87 discussions

SF.net SVN: geany: [1383] trunk
by ntrel＠users.sourceforge.net 12 Mar '07

12 Mar '07

Revision: 1383 http://svn.sourceforge.net/geany/?rev=1383&view=rev Author: ntrel Date: 2007-03-12 05:13:45 -0700 (Mon, 12 Mar 2007) Log Message: ----------- Switch to Compiler window when using Next Error command. Modified Paths: -------------- trunk/ChangeLog trunk/src/build.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-03-10 17:26:03 UTC (rev 1382) +++ trunk/ChangeLog 2007-03-12 12:13:45 UTC (rev 1383) @@ -1,3 +1,9 @@ +2007-03-12 Nick Treleaven <nick.treleaven(a)btinternet.com> + + * src/build.c: + Switch to Compiler window when using Next Error command. + + 2007-03-10 Nick Treleaven <nick.treleaven(a)btinternet.com> * src/project.c: Modified: trunk/src/build.c =================================================================== --- trunk/src/build.c 2007-03-10 17:26:03 UTC (rev 1382) +++ trunk/src/build.c 2007-03-12 12:13:45 UTC (rev 1383) @@ -1590,8 +1590,12 @@ on_build_next_error (GtkMenuItem *menuitem, gpointer user_data) { - if (! ui_tree_view_find_next(GTK_TREE_VIEW(msgwindow.tree_compiler), + if (ui_tree_view_find_next(GTK_TREE_VIEW(msgwindow.tree_compiler), msgwin_goto_compiler_file_line)) + { + gtk_notebook_set_current_page(GTK_NOTEBOOK(msgwindow.notebook), MSG_COMPILER); + } + else ui_set_statusbar(_("No more build errors.")); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1382] trunk
by ntrel＠users.sourceforge.net 10 Mar '07

10 Mar '07

Revision: 1382 http://svn.sourceforge.net/geany/?rev=1382&view=rev Author: ntrel Date: 2007-03-10 09:26:03 -0800 (Sat, 10 Mar 2007) Log Message: ----------- Make New Project dialog create parent directories of the chosen base path if necessary. Prevent warnings when setting open dialog directory to a path whose parent directory doesn't exist. Add create_parent_dirs argument for utils_mkdir(). Modified Paths: -------------- trunk/ChangeLog trunk/src/project.c trunk/src/utils.c trunk/src/utils.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-03-10 12:27:55 UTC (rev 1381) +++ trunk/ChangeLog 2007-03-10 17:26:03 UTC (rev 1382) @@ -4,6 +4,12 @@ Separate New Project dialog from Project Properties dialog. Make Properties Filename field read-only, below Name field. Capitalize dialog titles. + * src/utils.c, src/utils.h, src/project.c: + Make New Project dialog create parent directories of the chosen base + path if necessary. + Prevent warnings when setting open dialog directory to a path whose + parent directory doesn't exist. + Add create_parent_dirs argument for utils_mkdir(). 2007-03-09 Enrico Tröger <enrico.troeger(a)uvena.de> Modified: trunk/src/project.c =================================================================== --- trunk/src/project.c 2007-03-10 12:27:55 UTC (rev 1381) +++ trunk/src/project.c 2007-03-10 17:26:03 UTC (rev 1382) @@ -500,7 +500,7 @@ if (dialogs_show_question( _("The specified project base path does not exist. Should it be created?"))) { - utils_mkdir(locale_path); + utils_mkdir(locale_path, TRUE); } else { @@ -581,10 +581,15 @@ gchar *locale_filename = utils_get_locale_from_utf8(utf8_filename); if (g_path_is_absolute(locale_filename)) - gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog), utf8_filename); + { + if (g_file_test(locale_filename, G_FILE_TEST_EXISTS)) + gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog), utf8_filename); + } else if (gtk_file_chooser_get_action(GTK_FILE_CHOOSER(dialog)) != GTK_FILE_CHOOSER_ACTION_OPEN) + { gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(dialog), utf8_filename); + } g_free(locale_filename); // run it Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2007-03-10 12:27:55 UTC (rev 1381) +++ trunk/src/utils.c 2007-03-10 17:26:03 UTC (rev 1382) @@ -43,6 +43,8 @@ # include <sys/types.h> #endif +#include <glib/gstdio.h> + #include "support.h" #include "document.h" #include "sciwrappers.h" @@ -782,7 +784,7 @@ if (! g_file_test(dir, G_FILE_TEST_EXISTS)) { geany_debug("creating config directory %s", dir); - error_nr = utils_mkdir(dir); + error_nr = utils_mkdir(dir, FALSE); } if (error_nr == 0 && ! g_file_test(conf_file, G_FILE_TEST_EXISTS)) @@ -804,7 +806,7 @@ if (! g_file_test(filedefs_dir, G_FILE_TEST_EXISTS)) { - error_nr = utils_mkdir(filedefs_dir); + error_nr = utils_mkdir(filedefs_dir, FALSE); } if (error_nr == 0 && ! g_file_test(filedefs_readme, G_FILE_TEST_EXISTS)) { @@ -826,7 +828,7 @@ if (! g_file_test(templates_dir, G_FILE_TEST_EXISTS)) { - error_nr = utils_mkdir(templates_dir); + error_nr = utils_mkdir(templates_dir, FALSE); } if (error_nr == 0 && ! g_file_test(templates_readme, G_FILE_TEST_EXISTS)) { @@ -1512,15 +1514,94 @@ } -gint utils_mkdir(const gchar *path) +#if ! GLIB_CHECK_VERSION(2, 8, 0) +// Taken from GLib SVN, 2007-03-10 +/** + * g_mkdir_with_parents: + * @pathname: a pathname in the GLib file name encoding + * @mode: permissions to use for newly created directories + * + * Create a directory if it doesn't already exist. Create intermediate + * parent directories as needed, too. + * + * Returns: 0 if the directory already exists, or was successfully + * created. Returns -1 if an error occurred, with errno set. + * + * Since: 2.8 + */ +int +g_mkdir_with_parents (const gchar *pathname, + int mode) { + gchar *fn, *p; + + if (pathname == NULL || *pathname == '\0') + { + errno = EINVAL; + return -1; + } + + fn = g_strdup (pathname); + + if (g_path_is_absolute (fn)) + p = (gchar *) g_path_skip_root (fn); + else + p = fn; + + do + { + while (*p && !G_IS_DIR_SEPARATOR (*p)) + p++; + + if (!*p) + p = NULL; + else + *p = '\0'; + + if (!g_file_test (fn, G_FILE_TEST_EXISTS)) + { + if (g_mkdir (fn, mode) == -1) + { + int errno_save = errno; + g_free (fn); + errno = errno_save; + return -1; + } + } + else if (!g_file_test (fn, G_FILE_TEST_IS_DIR)) + { + g_free (fn); + errno = ENOTDIR; + return -1; + } + if (p) + { + *p++ = G_DIR_SEPARATOR; + while (*p && G_IS_DIR_SEPARATOR (*p)) + p++; + } + } + while (p); + + g_free (fn); + + return 0; +} +#endif + + +gint utils_mkdir(const gchar *path, gboolean create_parent_dirs) +{ + gint mode = 0700; + gint result; + if (path == NULL || strlen(path) == 0) return EFAULT; -#ifdef G_OS_WIN32 - if (mkdir(path) != 0) return errno; -#else - if (mkdir(path, 0700) != 0) return errno; -#endif + result = (create_parent_dirs) ? g_mkdir_with_parents(path, mode) : g_mkdir(path, mode); + if (result != 0) + return errno; return 0; } + + Modified: trunk/src/utils.h =================================================================== --- trunk/src/utils.h 2007-03-10 12:27:55 UTC (rev 1381) +++ trunk/src/utils.h 2007-03-10 17:26:03 UTC (rev 1382) @@ -161,6 +161,6 @@ * if first is NULL, NULL is returned. */ gchar **utils_strv_new(gchar *first, ...); -gint utils_mkdir(const gchar *path); +gint utils_mkdir(const gchar *path, gboolean create_parent_dirs); #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1381] trunk
by ntrel＠users.sourceforge.net 10 Mar '07

10 Mar '07

Revision: 1381 http://svn.sourceforge.net/geany/?rev=1381&view=rev Author: ntrel Date: 2007-03-10 04:27:55 -0800 (Sat, 10 Mar 2007) Log Message: ----------- Separate New Project dialog from Project Properties dialog. Make Properties Filename field read-only, below Name field. Capitalize dialog titles. Modified Paths: -------------- trunk/ChangeLog trunk/src/project.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-03-09 18:14:34 UTC (rev 1380) +++ trunk/ChangeLog 2007-03-10 12:27:55 UTC (rev 1381) @@ -1,3 +1,11 @@ +2007-03-10 Nick Treleaven <nick.treleaven(a)btinternet.com> + + * src/project.c: + Separate New Project dialog from Project Properties dialog. + Make Properties Filename field read-only, below Name field. + Capitalize dialog titles. + + 2007-03-09 Enrico Tröger <enrico.troeger(a)uvena.de> * src/callbacks.c, src/encodings.c, src/encodings.h, highlighting.c, Modified: trunk/src/project.c =================================================================== --- trunk/src/project.c 2007-03-09 18:14:34 UTC (rev 1380) +++ trunk/src/project.c 2007-03-10 12:27:55 UTC (rev 1381) @@ -81,9 +81,104 @@ void project_new() { + GtkWidget *vbox; + GtkWidget *table; + GtkWidget *image; + GtkWidget *button; + GtkWidget *bbox; + GtkWidget *label; + PropertyDialogElements *e; + if (! close_open_project()) return; - project_properties(); + g_return_if_fail(app->project == NULL); + + e = g_new0(PropertyDialogElements, 1); + e->dialog = gtk_dialog_new_with_buttons(_("New Project"), GTK_WINDOW(app->window), + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, NULL); + + bbox = gtk_hbox_new(FALSE, 0); + button = gtk_button_new(); + image = gtk_image_new_from_stock("gtk-new", GTK_ICON_SIZE_BUTTON); + label = gtk_label_new_with_mnemonic(_("C_reate")); + gtk_box_pack_start(GTK_BOX(bbox), image, FALSE, FALSE, 3); + gtk_box_pack_start(GTK_BOX(bbox), label, FALSE, FALSE, 3); + gtk_container_add(GTK_CONTAINER(button), bbox); + gtk_dialog_add_action_widget(GTK_DIALOG(e->dialog), button, GTK_RESPONSE_OK); + + vbox = ui_dialog_vbox_new(GTK_DIALOG(e->dialog)); + + entries_modified = FALSE; + + table = gtk_table_new(3, 2, FALSE); + gtk_table_set_row_spacings(GTK_TABLE(table), 5); + gtk_table_set_col_spacings(GTK_TABLE(table), 10); + + label = gtk_label_new(_("Name:")); + 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); + + e->name = gtk_entry_new(); + gtk_entry_set_max_length(GTK_ENTRY(e->name), MAX_NAME_LEN); + gtk_table_attach(GTK_TABLE(table), e->name, 1, 2, 0, 1, + (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + + label = gtk_label_new(_("Filename:")); + 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); + + e->file_name = gtk_entry_new(); + gtk_entry_set_width_chars(GTK_ENTRY(e->file_name), 30); + button = gtk_button_new(); + g_signal_connect((gpointer) button, "clicked", + G_CALLBACK(on_file_save_button_clicked), e->file_name); + image = gtk_image_new_from_stock("gtk-open", GTK_ICON_SIZE_BUTTON); + gtk_container_add(GTK_CONTAINER(button), image); + bbox = gtk_hbox_new(FALSE, 6); + gtk_box_pack_start_defaults(GTK_BOX(bbox), e->file_name); + gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0); + gtk_table_attach(GTK_TABLE(table), bbox, 1, 2, 1, 2, + (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + + label = gtk_label_new(_("Base path:")); + gtk_table_attach(GTK_TABLE(table), label, 0, 1, 2, 3, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_misc_set_alignment(GTK_MISC(label), 1, 0); + + e->base_path = gtk_entry_new(); + button = gtk_button_new(); + g_signal_connect((gpointer) button, "clicked", + G_CALLBACK(on_folder_open_button_clicked), e->base_path); + image = gtk_image_new_from_stock("gtk-open", GTK_ICON_SIZE_BUTTON); + gtk_container_add(GTK_CONTAINER(button), image); + bbox = gtk_hbox_new(FALSE, 6); + gtk_box_pack_start_defaults(GTK_BOX(bbox), e->base_path); + gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0); + gtk_table_attach(GTK_TABLE(table), bbox, 1, 2, 2, 3, + (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + + gtk_container_add(GTK_CONTAINER(vbox), table); + + // signals + g_signal_connect((gpointer) e->name, "changed", G_CALLBACK(on_name_entry_changed), e); + // run the callback manually to initialise the base_path and file_name fields + on_name_entry_changed(GTK_EDITABLE(e->name), e); + + g_signal_connect((gpointer) e->file_name, "changed", G_CALLBACK(on_entries_changed), e); + g_signal_connect((gpointer) e->base_path, "changed", G_CALLBACK(on_entries_changed), e); + g_signal_connect((gpointer) e->dialog, "response", + G_CALLBACK(on_properties_dialog_response), e); + + gtk_widget_show_all(e->dialog); } @@ -99,7 +194,7 @@ if (! close_open_project()) return; #ifdef G_OS_WIN32 - file = win32_show_project_open_dialog(_("Open project"), dir, FALSE); + file = win32_show_project_open_dialog(_("Open Project"), dir, FALSE); if (file != NULL) { load_config(file); @@ -107,7 +202,7 @@ } #else - dialog = gtk_file_chooser_dialog_new(_("Open project"), GTK_WINDOW(app->window), + dialog = gtk_file_chooser_dialog_new(_("Open Project"), GTK_WINDOW(app->window), GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL); @@ -173,27 +268,15 @@ GtkWidget *swin; GtkTooltips *tooltips = GTK_TOOLTIPS(lookup_widget(app->window, "tooltips")); PropertyDialogElements *e = g_new(PropertyDialogElements, 1); + GeanyProject *p = app->project; - e->dialog = gtk_dialog_new_with_buttons(_("Project properties"), GTK_WINDOW(app->window), + g_return_if_fail(app->project != NULL); + + e->dialog = gtk_dialog_new_with_buttons(_("Project Properties"), GTK_WINDOW(app->window), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, NULL); + gtk_dialog_add_buttons(GTK_DIALOG(e->dialog), GTK_STOCK_OK, GTK_RESPONSE_OK, NULL); - if (app->project == NULL) - { - bbox = gtk_hbox_new(FALSE, 0); - button = gtk_button_new(); - image = gtk_image_new_from_stock("gtk-new", GTK_ICON_SIZE_BUTTON); - label = gtk_label_new_with_mnemonic(_("C_reate")); - gtk_box_pack_start(GTK_BOX(bbox), image, FALSE, FALSE, 3); - gtk_box_pack_start(GTK_BOX(bbox), label, FALSE, FALSE, 3); - gtk_container_add(GTK_CONTAINER(button), bbox); - gtk_dialog_add_action_widget(GTK_DIALOG(e->dialog), button, GTK_RESPONSE_OK); - } - else - { - gtk_dialog_add_buttons(GTK_DIALOG(e->dialog), GTK_STOCK_OK, GTK_RESPONSE_OK, NULL); - } - vbox = ui_dialog_vbox_new(GTK_DIALOG(e->dialog)); entries_modified = FALSE; @@ -214,9 +297,21 @@ (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (0), 0, 0); - label = gtk_label_new(_("Description:")); + label = gtk_label_new(_("Filename:")); 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); + + e->file_name = gtk_entry_new(); + gtk_editable_set_editable(GTK_EDITABLE(e->file_name), FALSE); // read-only + gtk_table_attach(GTK_TABLE(table), e->file_name, 1, 2, 1, 2, + (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + + label = gtk_label_new(_("Description:")); + 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); @@ -227,29 +322,10 @@ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(swin), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(swin), GTK_WIDGET(e->description)); - gtk_table_attach(GTK_TABLE(table), swin, 1, 2, 1, 2, + gtk_table_attach(GTK_TABLE(table), swin, 1, 2, 2, 3, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (0), 0, 0); - label = gtk_label_new(_("Filename:")); - gtk_table_attach(GTK_TABLE(table), label, 0, 1, 2, 3, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 1, 0); - - e->file_name = gtk_entry_new(); - button = gtk_button_new(); - g_signal_connect((gpointer) button, "clicked", - G_CALLBACK(on_file_save_button_clicked), e->file_name); - image = gtk_image_new_from_stock("gtk-open", GTK_ICON_SIZE_BUTTON); - gtk_container_add(GTK_CONTAINER(button), image); - bbox = gtk_hbox_new(FALSE, 6); - gtk_box_pack_start_defaults(GTK_BOX(bbox), e->file_name); - gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0); - gtk_table_attach(GTK_TABLE(table), bbox, 1, 2, 2, 3, - (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - label = gtk_label_new(_("Base path:")); gtk_table_attach(GTK_TABLE(table), label, 0, 1, 3, 4, (GtkAttachOptions) (GTK_FILL), @@ -309,61 +385,44 @@ (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (0), 0, 0); - - gtk_container_add(GTK_CONTAINER(vbox), table); - // signals - if (app->project == NULL) - { // this should only be done when we are about to create a new project - g_signal_connect((gpointer) e->name, "changed", G_CALLBACK(on_name_entry_changed), e); - // run the callback manually to initialise the base_path and file_name fields - on_name_entry_changed(GTK_EDITABLE(e->name), e); - - g_signal_connect((gpointer) e->file_name, "changed", G_CALLBACK(on_entries_changed), e); - g_signal_connect((gpointer) e->base_path, "changed", G_CALLBACK(on_entries_changed), e); - } g_signal_connect((gpointer) e->dialog, "response", G_CALLBACK(on_properties_dialog_response), e); - // if we have an already open project, fill the elements with the appropriate data - if (app->project != NULL) - { - GeanyProject *p = app->project; + // fill the elements with the appropriate data + gtk_entry_set_text(GTK_ENTRY(e->name), p->name); - gtk_entry_set_text(GTK_ENTRY(e->name), p->name); + if (p->description != NULL) + { // set text + GtkTextBuffer *buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(e->description)); + gtk_text_buffer_set_text(buffer, p->description, -1); + } - if (p->description != NULL) - { // set text - GtkTextBuffer *buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(e->description)); - gtk_text_buffer_set_text(buffer, p->description, -1); - } + if (p->file_patterns != NULL) + { // set the file patterns + gint i; + gint len = g_strv_length(p->file_patterns); + GtkTextBuffer *buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(e->patterns)); + GString *str = g_string_sized_new(len * 4); - if (p->file_patterns != NULL) - { // set the file patterns - gint i; - gint len = g_strv_length(p->file_patterns); - GtkTextBuffer *buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(e->patterns)); - GString *str = g_string_sized_new(len * 4); - - for (i = 0; i < len; i++) + for (i = 0; i < len; i++) + { + if (p->file_patterns[i] != NULL) { - if (p->file_patterns[i] != NULL) - { - g_string_append(str, p->file_patterns[i]); - g_string_append_c(str, '\n'); - } + g_string_append(str, p->file_patterns[i]); + g_string_append_c(str, '\n'); } - gtk_text_buffer_set_text(buffer, str->str, -1); - g_string_free(str, TRUE); } - - gtk_entry_set_text(GTK_ENTRY(e->file_name), p->file_name); - gtk_entry_set_text(GTK_ENTRY(e->base_path), p->base_path); - if (p->run_cmd != NULL) - gtk_entry_set_text(GTK_ENTRY(e->run_cmd), p->run_cmd); + gtk_text_buffer_set_text(buffer, str->str, -1); + g_string_free(str, TRUE); } + gtk_entry_set_text(GTK_ENTRY(e->file_name), p->file_name); + gtk_entry_set_text(GTK_ENTRY(e->base_path), p->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); } @@ -392,6 +451,7 @@ } +/* Also used for New Project dialog response. */ static void on_properties_dialog_response(GtkDialog *dialog, gint response, PropertyDialogElements *e) { @@ -469,28 +529,33 @@ if (p->name != NULL) g_free(p->name); p->name = g_strdup(name); - { // get and set the project description - GtkTextBuffer *buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(e->description)); - GtkTextIter start, end; - gtk_text_buffer_get_start_iter(buffer, &start); - gtk_text_buffer_get_end_iter(buffer, &end); - p->description = gtk_text_buffer_get_text(buffer, &start, &end, FALSE); - } + if (p->file_name != NULL) g_free(p->file_name); p->file_name = g_strdup(file_name); if (p->base_path != NULL) g_free(p->base_path); p->base_path = g_strdup(base_path); - if (p->run_cmd != NULL) g_free(p->run_cmd); - p->run_cmd = g_strdup(gtk_entry_get_text(GTK_ENTRY(e->run_cmd))); - - { // get and set the project file patterns - GtkTextBuffer *buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(e->patterns)); + if (! new_project) // save properties specific fields + { GtkTextIter start, end; gchar *tmp; + GtkTextBuffer *buffer; + + if (p->run_cmd != NULL) g_free(p->run_cmd); + 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); gtk_text_buffer_get_end_iter(buffer, &end); + g_free(p->description); + p->description = gtk_text_buffer_get_text(buffer, &start, &end, FALSE); + + // get and set the project file patterns + buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(e->patterns)); + gtk_text_buffer_get_start_iter(buffer, &start); + gtk_text_buffer_get_end_iter(buffer, &end); tmp = gtk_text_buffer_get_text(buffer, &start, &end, FALSE); g_strfreev(p->file_patterns); p->file_patterns = g_strsplit(tmp, "\n", -1); @@ -541,7 +606,7 @@ static void on_file_save_button_clicked(GtkButton *button, GtkWidget *entry) { #ifdef G_OS_WIN32 - gchar *path = win32_show_project_open_dialog(_("Choose project filename"), + gchar *path = win32_show_project_open_dialog(_("Choose Project Filename"), gtk_entry_get_text(GTK_ENTRY(entry)), TRUE); if (path != NULL) { @@ -552,7 +617,7 @@ GtkWidget *dialog; // initialise the dialog - dialog = gtk_file_chooser_dialog_new(_("Choose project filename"), NULL, + dialog = gtk_file_chooser_dialog_new(_("Choose Project Filename"), NULL, GTK_FILE_CHOOSER_ACTION_SAVE, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, NULL); @@ -569,7 +634,7 @@ static void on_folder_open_button_clicked(GtkButton *button, GtkWidget *entry) { #ifdef G_OS_WIN32 - gchar *path = win32_show_project_folder_dialog(_("Choose project base path"), + gchar *path = win32_show_project_folder_dialog(_("Choose Project Base Path"), gtk_entry_get_text(GTK_ENTRY(entry))); if (path != NULL) { @@ -580,7 +645,7 @@ GtkWidget *dialog; // initialise the dialog - dialog = gtk_file_chooser_dialog_new(_("Choose project base path"), NULL, + dialog = gtk_file_chooser_dialog_new(_("Choose Project Base Path"), NULL, GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL); @@ -597,7 +662,7 @@ static void on_file_open_button_clicked(GtkButton *button, GtkWidget *entry) { #ifdef G_OS_WIN32 - gchar *path = win32_show_project_open_dialog(_("Choose project run command"), + gchar *path = win32_show_project_open_dialog(_("Choose Project Run Command"), gtk_entry_get_text(GTK_ENTRY(entry)), FALSE); if (path != NULL) { @@ -608,7 +673,7 @@ GtkWidget *dialog; // initialise the dialog - dialog = gtk_file_chooser_dialog_new(_("Choose project run command"), NULL, + dialog = gtk_file_chooser_dialog_new(_("Choose Project Run Command"), NULL, GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL); @@ -746,12 +811,16 @@ g_key_file_load_from_file(config, filename, G_KEY_FILE_KEEP_COMMENTS, NULL); g_key_file_set_string(config, "project", "name", p->name); - g_key_file_set_string(config, "project", "description", p->description); g_key_file_set_string(config, "project", "base_path", p->base_path); - g_key_file_set_string(config, "project", "run_cmd", p->run_cmd); - g_key_file_set_string_list(config, "project", "file_patterns", - (const gchar**) p->file_patterns, g_strv_length(p->file_patterns)); + if (p->description) + g_key_file_set_string(config, "project", "description", p->description); + if (p->run_cmd) + g_key_file_set_string(config, "project", "run_cmd", p->run_cmd); + if (p->file_patterns) + g_key_file_set_string_list(config, "project", "file_patterns", + (const gchar**) p->file_patterns, g_strv_length(p->file_patterns)); + // write the file data = g_key_file_to_data(config, NULL, NULL); ret = (utils_write_file(filename, data) == 0); @@ -772,3 +841,4 @@ return 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: [1380] trunk
by eht16＠users.sourceforge.net 09 Mar '07

09 Mar '07

Revision: 1380 http://svn.sourceforge.net/geany/?rev=1380&view=rev Author: eht16 Date: 2007-03-09 10:14:34 -0800 (Fri, 09 Mar 2007) Log Message: ----------- Added style "default" to filetypes.common to be able to change the default style for files without a filetype set. Modified Paths: -------------- trunk/ChangeLog trunk/data/filetypes.common trunk/doc/geany.docbook trunk/src/highlighting.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-03-09 16:40:22 UTC (rev 1379) +++ trunk/ChangeLog 2007-03-09 18:14:34 UTC (rev 1380) @@ -11,6 +11,9 @@ Set default highlighting style for filetype None to get it also inverted if invert_all is set. Reset all previously defined styles when switching filetype to None. + * data/filetypes.common, doc/geany.docbook, src/highlighting.c: + Added style "default" to filetypes.common to be able to change the + default style for files without a filetype set. Modified: trunk/data/filetypes.common =================================================================== --- trunk/data/filetypes.common 2007-03-09 16:40:22 UTC (rev 1379) +++ trunk/data/filetypes.common 2007-03-09 18:14:34 UTC (rev 1380) @@ -1,5 +1,8 @@ # For complete documentation of this file, please see Geany's main documentation [styling] +# foreground;background;bold;italic - used for filetype All/None +default=0x000000;0xffffff;false;false + # 3rd selection argument is true to override default foreground # 4th selection argument is true to override default background selection=0xc0c0c0;0x7f0000;false;false Modified: trunk/doc/geany.docbook =================================================================== --- trunk/doc/geany.docbook 2007-03-09 16:40:22 UTC (rev 1379) +++ trunk/doc/geany.docbook 2007-03-09 18:14:34 UTC (rev 1380) @@ -1720,6 +1720,13 @@ </thead> <tbody> <row> + <entry>default</entry> + <entry>This is the default style. It is used for styling files + without a filetype set. + </entry> + <entry>default=0x000000;0xffffff;false;false</entry> + </row> + <row> <entry>selection</entry> <entry> The style for colouring selected text. Modified: trunk/src/highlighting.c =================================================================== --- trunk/src/highlighting.c 2007-03-09 16:40:22 UTC (rev 1379) +++ trunk/src/highlighting.c 2007-03-09 18:14:34 UTC (rev 1380) @@ -60,6 +60,7 @@ enum // Geany common styling { + GCS_DEFAULT, GCS_SELECTION, GCS_BRACE_GOOD, GCS_BRACE_BAD, @@ -376,6 +377,8 @@ load_keyfiles(config, config_home, GEANY_FILETYPES_ALL); + get_keyfile_hex(config, config_home, "styling", "default", + "0x000000", "0xffffff", "false", &common_style_set.styling[GCS_DEFAULT]); get_keyfile_hex(config, config_home, "styling", "selection", "0xc0c0c0", "0x7f0000", "false", &common_style_set.styling[GCS_SELECTION]); get_keyfile_hex(config, config_home, "styling", "brace_good", @@ -1973,12 +1976,12 @@ void styleset_none(ScintillaObject *sci) { styleset_common(sci, 5); + SSM (sci, SCI_SETLEXER, SCLEX_NULL, 0); SSM(sci, SCI_SETWORDCHARS, 0, (sptr_t) common_style_set.wordchars); - SSM(sci, SCI_STYLESETFORE, STYLE_DEFAULT, invert(0x000000)); - SSM(sci, SCI_STYLESETBACK, STYLE_DEFAULT, invert(0xffffff)); + set_sci_style(sci, STYLE_DEFAULT, GEANY_FILETYPES_ALL, GCS_DEFAULT); SSM(sci, SCI_STYLECLEARALL, 0, 0); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1379] trunk/src/tools.c
by ntrel＠users.sourceforge.net 09 Mar '07

09 Mar '07

Revision: 1379 http://svn.sourceforge.net/geany/?rev=1379&view=rev Author: ntrel Date: 2007-03-09 08:40:22 -0800 (Fri, 09 Mar 2007) Log Message: ----------- Correct typo. Modified Paths: -------------- trunk/src/tools.c Modified: trunk/src/tools.c =================================================================== --- trunk/src/tools.c 2007-03-09 15:38:31 UTC (rev 1378) +++ trunk/src/tools.c 2007-03-09 16:40:22 UTC (rev 1379) @@ -512,7 +512,7 @@ label = gtk_label_new(str); entry = gtk_entry_new(); - if (index >= 0) + if (idx >= 0) gtk_entry_set_text(GTK_ENTRY(entry), app->custom_commands[idx]); gtk_entry_set_max_length(GTK_ENTRY(entry), 255); gtk_entry_set_width_chars(GTK_ENTRY(entry), 30); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1378] trunk
by eht16＠users.sourceforge.net 09 Mar '07

09 Mar '07

Revision: 1378 http://svn.sourceforge.net/geany/?rev=1378&view=rev Author: eht16 Date: 2007-03-09 07:38:31 -0800 (Fri, 09 Mar 2007) Log Message: ----------- Set default highlighting style for filetype None to get it also inverted if invert_all is set. Reset all previously defined styles when switching filetype to None. Modified Paths: -------------- trunk/ChangeLog trunk/src/highlighting.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-03-09 14:06:20 UTC (rev 1377) +++ trunk/ChangeLog 2007-03-09 15:38:31 UTC (rev 1378) @@ -7,8 +7,13 @@ and unreachable code). * src/sci_cb.c: Auto completion of multi line comments is now (again) configurable with the auto complete constructs option. + * src/highlighting.c: + Set default highlighting style for filetype None to get it also + inverted if invert_all is set. + Reset all previously defined styles when switching filetype to None. + 2007-03-09 Nick Treleaven <nick.treleaven(a)btinternet.com> * src/interface.c, doc/geany.docbook, data/filetypes.*, geany.glade: Modified: trunk/src/highlighting.c =================================================================== --- trunk/src/highlighting.c 2007-03-09 14:06:20 UTC (rev 1377) +++ trunk/src/highlighting.c 2007-03-09 15:38:31 UTC (rev 1378) @@ -1976,6 +1976,11 @@ SSM (sci, SCI_SETLEXER, SCLEX_NULL, 0); SSM(sci, SCI_SETWORDCHARS, 0, (sptr_t) common_style_set.wordchars); + + SSM(sci, SCI_STYLESETFORE, STYLE_DEFAULT, invert(0x000000)); + SSM(sci, SCI_STYLESETBACK, STYLE_DEFAULT, invert(0xffffff)); + + SSM(sci, SCI_STYLECLEARALL, 0, 0); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1377] trunk
by eht16＠users.sourceforge.net 09 Mar '07

09 Mar '07

Revision: 1377 http://svn.sourceforge.net/geany/?rev=1377&view=rev Author: eht16 Date: 2007-03-09 06:06:20 -0800 (Fri, 09 Mar 2007) Log Message: ----------- Auto completion of multi line comments is now (again) configurable with the auto complete constructs option. Modified Paths: -------------- trunk/ChangeLog trunk/src/sci_cb.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-03-09 13:52:26 UTC (rev 1376) +++ trunk/ChangeLog 2007-03-09 14:06:20 UTC (rev 1377) @@ -5,6 +5,8 @@ src/search.c, src/tools.c, src/ui_utils.c, src/utils.c: Fixed several compiler warnings (mainly shadowing local variables and unreachable code). + * src/sci_cb.c: Auto completion of multi line comments is now (again) + configurable with the auto complete constructs option. 2007-03-09 Nick Treleaven <nick.treleaven(a)btinternet.com> Modified: trunk/src/sci_cb.c =================================================================== --- trunk/src/sci_cb.c 2007-03-09 13:52:26 UTC (rev 1376) +++ trunk/src/sci_cb.c 2007-03-09 14:06:20 UTC (rev 1377) @@ -349,15 +349,16 @@ sci_add_text(sci, text); g_free(text); } - - /// TODO on which option should auto_multiline() depend? indention vs. auto completion - // " * " auto completion in multiline C/C++/D/Java comments - auto_multiline(sci, pos); } } if (app->pref_editor_auto_complete_constructs) + { + // " * " auto completion in multiline C/C++/D/Java comments + auto_multiline(sci, pos); + sci_cb_auto_latex(idx, pos); + } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1376] trunk
by eht16＠users.sourceforge.net 09 Mar '07

09 Mar '07

Revision: 1376 http://svn.sourceforge.net/geany/?rev=1376&view=rev Author: eht16 Date: 2007-03-09 05:52:26 -0800 (Fri, 09 Mar 2007) Log Message: ----------- Fixed several compiler warnings (mainly shadowing local variables and unreachable code). Modified Paths: -------------- trunk/ChangeLog trunk/src/callbacks.c trunk/src/encodings.c trunk/src/encodings.h trunk/src/highlighting.c trunk/src/msgwindow.c trunk/src/notebook.c trunk/src/project.c trunk/src/sci_cb.c trunk/src/search.c trunk/src/tools.c trunk/src/ui_utils.c trunk/src/utils.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-03-09 12:26:55 UTC (rev 1375) +++ trunk/ChangeLog 2007-03-09 13:52:26 UTC (rev 1376) @@ -1,3 +1,12 @@ +2007-03-09 Enrico Tröger <enrico.troeger(a)uvena.de> + + * src/callbacks.c, src/encodings.c, src/encodings.h, highlighting.c, + src/msgwindow.c, src/notebook.c, src/project.c, src/sci_cb.c, + src/search.c, src/tools.c, src/ui_utils.c, src/utils.c: + Fixed several compiler warnings (mainly shadowing local variables + and unreachable code). + + 2007-03-09 Nick Treleaven <nick.treleaven(a)btinternet.com> * src/interface.c, doc/geany.docbook, data/filetypes.*, geany.glade: Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2007-03-09 12:26:55 UTC (rev 1375) +++ trunk/src/callbacks.c 2007-03-09 13:52:26 UTC (rev 1376) @@ -1028,17 +1028,17 @@ { if (event->button == 3) { - GtkWidget *widget; + GtkWidget *w; ignore_toolbar_toggle = TRUE; switch (app->toolbar_icon_style) { - case 0: widget = lookup_widget(app->toolbar_menu, "images_only2"); break; - case 1: widget = lookup_widget(app->toolbar_menu, "text_only2"); break; - default: widget = lookup_widget(app->toolbar_menu, "images_and_text2"); break; + case 0: w = lookup_widget(app->toolbar_menu, "images_only2"); break; + case 1: w = lookup_widget(app->toolbar_menu, "text_only2"); break; + default: w = lookup_widget(app->toolbar_menu, "images_and_text2"); break; } - gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(widget), TRUE); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(w), TRUE); switch (app->toolbar_icon_size) { @@ -1046,7 +1046,7 @@ widget = lookup_widget(app->toolbar_menu, "large_icons1"); break; default: widget = lookup_widget(app->toolbar_menu, "small_icons1"); break; } - gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(widget), TRUE); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(w), TRUE); ignore_toolbar_toggle = FALSE; Modified: trunk/src/encodings.c =================================================================== --- trunk/src/encodings.c 2007-03-09 12:26:55 UTC (rev 1375) +++ trunk/src/encodings.c 2007-03-09 13:52:26 UTC (rev 1376) @@ -142,12 +142,12 @@ } -const GeanyEncoding *encodings_get_from_index(gint index) +const GeanyEncoding *encodings_get_from_index(gint idx) { - g_return_val_if_fail(index >= 0, NULL); - g_return_val_if_fail(index < GEANY_ENCODINGS_MAX, NULL); + g_return_val_if_fail(idx >= 0, NULL); + g_return_val_if_fail(idx < GEANY_ENCODINGS_MAX, NULL); - return &encodings[index]; + return &encodings[idx]; } Modified: trunk/src/encodings.h =================================================================== --- trunk/src/encodings.h 2007-03-09 12:26:55 UTC (rev 1375) +++ trunk/src/encodings.h 2007-03-09 13:52:26 UTC (rev 1376) @@ -59,7 +59,7 @@ const GeanyEncoding* encodings_get_from_charset(const gchar *charset); -const GeanyEncoding* encodings_get_from_index(gint index); +const GeanyEncoding* encodings_get_from_index(gint idx); gchar* encodings_to_string(const GeanyEncoding* enc); const gchar* encodings_get_charset(const GeanyEncoding* enc); Modified: trunk/src/highlighting.c =================================================================== --- trunk/src/highlighting.c 2007-03-09 12:26:55 UTC (rev 1375) +++ trunk/src/highlighting.c 2007-03-09 13:52:26 UTC (rev 1376) @@ -306,14 +306,14 @@ } -static void set_sci_style(ScintillaObject *sci, gint style, gint filetype, gint styling_index) +static void set_sci_style(ScintillaObject *sci, gint style, gint ft, gint styling_index) { Style *style_ptr; - if (filetype == GEANY_FILETYPES_ALL) + if (ft == GEANY_FILETYPES_ALL) style_ptr = &common_style_set.styling[styling_index]; else - style_ptr = &style_sets[filetype].styling[styling_index]; + style_ptr = &style_sets[ft].styling[styling_index]; SSM(sci, SCI_STYLESETFORE, style, invert(style_ptr->foreground)); SSM(sci, SCI_STYLESETBACK, style, invert(style_ptr->background)); @@ -571,15 +571,15 @@ static void assign_global_and_user_keywords(ScintillaObject *sci, const gchar *user_words) { GString *s; - + s = get_global_typenames(); if (s == NULL) s = g_string_sized_new(200); else g_string_append_c(s, ' '); // append a space as delimiter to the existing list of words - + g_string_append(s, user_words); - + SSM(sci, SCI_SETKEYWORDS, 1, (sptr_t) s->str); g_string_free(s, TRUE); } @@ -716,7 +716,7 @@ // assign global types, merge them with user defined keywords and set them assign_global_and_user_keywords(sci, style_sets[GEANY_FILETYPES_C].keywords[1]); - + styleset_c_like(sci, GEANY_FILETYPES_C); if (style_sets[GEANY_FILETYPES_C].styling[20].foreground == 1) Modified: trunk/src/msgwindow.c =================================================================== --- trunk/src/msgwindow.c 2007-03-09 12:26:55 UTC (rev 1375) +++ trunk/src/msgwindow.c 2007-03-09 13:52:26 UTC (rev 1376) @@ -129,7 +129,7 @@ { GtkCellRenderer *renderer; GtkTreeViewColumn *column; - GtkTreeSelection *select; + GtkTreeSelection *selection; PangoFontDescription *pfd; msgwindow.store_msg = gtk_list_store_new(4, G_TYPE_INT, G_TYPE_INT, GDK_TYPE_COLOR, G_TYPE_STRING); @@ -150,9 +150,9 @@ G_CALLBACK(on_msgwin_button_press_event), GINT_TO_POINTER(MSG_MESSAGE)); // selection handling - select = gtk_tree_view_get_selection(GTK_TREE_VIEW(msgwindow.tree_msg)); - gtk_tree_selection_set_mode(select, GTK_SELECTION_SINGLE); - //g_signal_connect(G_OBJECT(select), "changed", G_CALLBACK(on_msg_tree_selection_changed), NULL); + selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(msgwindow.tree_msg)); + gtk_tree_selection_set_mode(selection, GTK_SELECTION_SINGLE); + //g_signal_connect(G_OBJECT(selection), "changed", G_CALLBACK(on_msg_tree_selection_changed), NULL); } @@ -161,7 +161,7 @@ { GtkCellRenderer *renderer; GtkTreeViewColumn *column; - GtkTreeSelection *select; + GtkTreeSelection *selection; PangoFontDescription *pfd; msgwindow.store_compiler = gtk_list_store_new(2, GDK_TYPE_COLOR, G_TYPE_STRING); @@ -182,9 +182,9 @@ G_CALLBACK(on_msgwin_button_press_event), GINT_TO_POINTER(MSG_COMPILER)); // selection handling - select = gtk_tree_view_get_selection(GTK_TREE_VIEW(msgwindow.tree_compiler)); - gtk_tree_selection_set_mode(select, GTK_SELECTION_SINGLE); - //g_signal_connect(G_OBJECT(select), "changed", G_CALLBACK(on_msg_tree_selection_changed), NULL); + selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(msgwindow.tree_compiler)); + gtk_tree_selection_set_mode(selection, GTK_SELECTION_SINGLE); + //g_signal_connect(G_OBJECT(selection), "changed", G_CALLBACK(on_msg_tree_selection_changed), NULL); } Modified: trunk/src/notebook.c =================================================================== --- trunk/src/notebook.c 2007-03-09 12:26:55 UTC (rev 1375) +++ trunk/src/notebook.c 2007-03-09 13:52:26 UTC (rev 1376) @@ -49,7 +49,7 @@ static gboolean notebook_drag_motion_cb(GtkWidget *widget, GdkDragContext *dc, - gint x, gint y, guint time, gpointer user_data); + gint x, gint y, guint event_time, gpointer user_data); static void notebook_page_reordered_cb(GtkNotebook *notebook, GtkWidget *child, guint page_num, @@ -64,7 +64,7 @@ static void on_window_drag_data_received(GtkWidget *widget, GdkDragContext *drag_context, gint x, gint y, GtkSelectionData *data, guint info, - guint time, gpointer user_data); + guint event_time, gpointer user_data); static gint notebook_find_tab_num_at_pos(GtkNotebook *notebook, gint x, gint y); @@ -188,15 +188,14 @@ static gboolean notebook_drag_motion_cb(GtkWidget *widget, GdkDragContext *dc, - gint x, gint y, guint time, gpointer user_data) + gint x, gint y, guint event_time, gpointer user_data) { - GtkNotebook *notebook = GTK_NOTEBOOK(widget); static gint oldx, oldy; // for determining direction of mouse drag + GtkNotebook *notebook = GTK_NOTEBOOK(widget); gint ndest = notebook_find_tab_num_at_pos(notebook, x, y); gint ncurr = gtk_notebook_get_current_page(notebook); - if (ndest >= 0) - if (ndest != ncurr) + if (ndest >= 0 && ndest != ncurr) { gboolean ok = FALSE; // prevent oscillation between non-homogeneous sized tabs @@ -379,7 +378,7 @@ static void on_window_drag_data_received(GtkWidget *widget, GdkDragContext *drag_context, gint x, gint y, GtkSelectionData *data, guint target_type, - guint time, gpointer user_data) + guint event_time, gpointer user_data) { gboolean success = FALSE; @@ -394,7 +393,7 @@ success = TRUE; } - gtk_drag_finish(drag_context, success, FALSE, time); + gtk_drag_finish(drag_context, success, FALSE, event_time); } Modified: trunk/src/project.c =================================================================== --- trunk/src/project.c 2007-03-09 12:26:55 UTC (rev 1375) +++ trunk/src/project.c 2007-03-09 13:52:26 UTC (rev 1376) @@ -526,11 +526,11 @@ if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) { gchar *filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog)); - gchar *utf8_filename = utils_get_utf8_from_locale(filename); + gchar *tmp_utf8_filename = utils_get_utf8_from_locale(filename); - gtk_entry_set_text(GTK_ENTRY(entry), utf8_filename); + gtk_entry_set_text(GTK_ENTRY(entry), tmp_utf8_filename); - g_free(utf8_filename); + g_free(tmp_utf8_filename); g_free(filename); } gtk_widget_destroy(dialog); Modified: trunk/src/sci_cb.c =================================================================== --- trunk/src/sci_cb.c 2007-03-09 12:26:55 UTC (rev 1375) +++ trunk/src/sci_cb.c 2007-03-09 13:52:26 UTC (rev 1376) @@ -389,8 +389,8 @@ } else { // insert as many spaces as a tabulator would take - gint i; - for (i = 0; i < app->pref_editor_tab_width; i++) + gint k; + for (k = 0; k < app->pref_editor_tab_width; k++) indent[j++] = ' '; } @@ -1635,11 +1635,8 @@ if (single_line) { gint a = (first_line_was_comment) ? - co_len : co_len; - gint line_start; // don't modify sel_start when the selection starts within indentation - line_start = sci_get_position_from_line(doc_list[idx].sci, - sci_get_line_from_position(doc_list[idx].sci, sel_start)); get_indent(doc_list[idx].sci, sel_start, TRUE); if ((sel_start - line_start) <= (gint) strlen(indent)) a = 0; Modified: trunk/src/search.c =================================================================== --- trunk/src/search.c 2007-03-09 12:26:55 UTC (rev 1375) +++ trunk/src/search.c 2007-03-09 13:52:26 UTC (rev 1376) @@ -875,8 +875,6 @@ case GEANY_RESPONSE_MARK: { - gint idx = document_get_cur_idx(); - if (DOC_IDX_VALID(idx)) search_mark(idx, search_data.text, search_data.flags); break; @@ -990,11 +988,11 @@ // replace in all documents following notebook tab order for (n = 0; (gint) n < gtk_notebook_get_n_pages(GTK_NOTEBOOK(app->notebook)); n++) { - gint idx = document_get_n_idx(n); + gint ix = document_get_n_idx(n); - if (! doc_list[idx].is_valid) continue; + if (! doc_list[ix].is_valid) continue; - if (document_replace_all(idx, find, replace, search_flags_re, + if (document_replace_all(ix, find, replace, search_flags_re, search_replace_escape_re)) count++; } ui_set_statusbar(_("Replaced text in %u files."), count); Modified: trunk/src/tools.c =================================================================== --- trunk/src/tools.c 2007-03-09 12:26:55 UTC (rev 1375) +++ trunk/src/tools.c 2007-03-09 13:52:26 UTC (rev 1376) @@ -502,7 +502,7 @@ }; -static void cc_add_command(struct cc_dialog *cc, gint index) +static void cc_add_command(struct cc_dialog *cc, gint idx) { GtkWidget *label, *entry, *hbox; gchar str[6]; @@ -513,7 +513,7 @@ entry = gtk_entry_new(); if (index >= 0) - gtk_entry_set_text(GTK_ENTRY(entry), app->custom_commands[index]); + gtk_entry_set_text(GTK_ENTRY(entry), app->custom_commands[idx]); gtk_entry_set_max_length(GTK_ENTRY(entry), 255); gtk_entry_set_width_chars(GTK_ENTRY(entry), 30); gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); @@ -537,7 +537,7 @@ gint idx = GPOINTER_TO_INT(data); gchar *msg = NULL; GString *str = g_string_sized_new(256); - GIOStatus rv; + GIOStatus rv; GError *err = NULL; do @@ -555,8 +555,8 @@ err = NULL; } } while (rv == G_IO_STATUS_NORMAL || rv == G_IO_STATUS_AGAIN); - - if (rv == G_IO_STATUS_EOF) + + if (rv == G_IO_STATUS_EOF) { // Command completed successfully sci_replace_sel(doc_list[idx].sci, str->str); } @@ -701,7 +701,7 @@ GList *children = gtk_container_get_children(GTK_CONTAINER(cc.box)); GList *tmp; GSList *result_list = NULL; - gint i = 0; + gint j = 0; gint len = 0; gchar **result = NULL; const gchar *text; @@ -730,10 +730,10 @@ result = g_new(gchar*, len + 1); while (result_list != NULL) { - result[i] = (gchar*) result_list->data; + result[j] = (gchar*) result_list->data; result_list = result_list->next; - i++; + j++; } result[len] = NULL; // null-terminate the array } Modified: trunk/src/ui_utils.c =================================================================== --- trunk/src/ui_utils.c 2007-03-09 12:26:55 UTC (rev 1375) +++ trunk/src/ui_utils.c 2007-03-09 13:52:26 UTC (rev 1376) @@ -136,25 +136,25 @@ /* This sets the window title according to the current filename. */ -void ui_set_window_title(gint index) +void ui_set_window_title(gint idx) { gchar *title; - if (index >= 0) + if (idx >= 0) { - if (doc_list[index].file_name == NULL) + if (doc_list[idx].file_name == NULL) { title = g_strdup_printf("%s%s - Geany", - doc_list[index].changed ? "*" : "", - DOC_FILENAME(index)); + doc_list[idx].changed ? "*" : "", + DOC_FILENAME(idx)); } else { - gchar *basename = g_path_get_basename(DOC_FILENAME(index)); - gchar *dirname = g_path_get_dirname(DOC_FILENAME(index)); + gchar *basename = g_path_get_basename(DOC_FILENAME(idx)); + gchar *dirname = g_path_get_dirname(DOC_FILENAME(idx)); title = g_strdup_printf("%s%s - %s - Geany", - doc_list[index].changed ? "*" : "", + doc_list[idx].changed ? "*" : "", basename, dirname ? dirname : ""); g_free(basename); g_free(dirname); @@ -215,20 +215,20 @@ } -void ui_update_popup_reundo_items(gint index) +void ui_update_popup_reundo_items(gint idx) { gboolean enable_undo; gboolean enable_redo; - if (index == -1) + if (idx == -1) { enable_undo = FALSE; enable_redo = FALSE; } else { - enable_undo = document_can_undo(index); - enable_redo = document_can_redo(index); + enable_undo = document_can_undo(idx); + enable_redo = document_can_redo(idx); } // index 0 is the popup menu, 1 is the menubar, 2 is the toolbar @@ -242,13 +242,13 @@ } -void ui_update_popup_copy_items(gint index) +void ui_update_popup_copy_items(gint idx) { gboolean enable; guint i; - if (index == -1) enable = FALSE; - else enable = sci_can_copy(doc_list[index].sci); + if (idx == -1) enable = FALSE; + else enable = sci_can_copy(doc_list[idx].sci); for(i = 0; i < (sizeof(app->popup_items)/sizeof(GtkWidget*)); i++) gtk_widget_set_sensitive(app->popup_items[i], enable); Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2007-03-09 12:26:55 UTC (rev 1375) +++ trunk/src/utils.c 2007-03-09 13:52:26 UTC (rev 1376) @@ -161,8 +161,6 @@ case ']': return TRUE; default: return FALSE; } - - return FALSE; } @@ -179,8 +177,6 @@ case '[': return TRUE; default: return FALSE; } - - return FALSE; } @@ -524,7 +520,7 @@ // if the document has no changes, get the previous function name from TM if(! doc_list[idx].changed && tm_file != NULL && tm_file->tags_array != NULL) { - TMTag *tag = TM_TAG(tm_get_current_function(tm_file->tags_array, line)); + const TMTag *tag = (const TMTag*) tm_get_current_function(tm_file->tags_array, line); if (tag != 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: [1375] trunk
by ntrel＠users.sourceforge.net 09 Mar '07

09 Mar '07

Revision: 1375 http://svn.sourceforge.net/geany/?rev=1375&view=rev Author: ntrel Date: 2007-03-09 04:26:55 -0800 (Fri, 09 Mar 2007) Log Message: ----------- Fix indentation spelling ;-) Modified Paths: -------------- trunk/ChangeLog trunk/data/filetypes.asm trunk/data/filetypes.c trunk/data/filetypes.caml trunk/data/filetypes.conf trunk/data/filetypes.cpp trunk/data/filetypes.css trunk/data/filetypes.d trunk/data/filetypes.docbook trunk/data/filetypes.ferite trunk/data/filetypes.fortran trunk/data/filetypes.html trunk/data/filetypes.java trunk/data/filetypes.javascript trunk/data/filetypes.latex trunk/data/filetypes.lua trunk/data/filetypes.makefile trunk/data/filetypes.oms trunk/data/filetypes.pascal trunk/data/filetypes.perl trunk/data/filetypes.php trunk/data/filetypes.python trunk/data/filetypes.ruby trunk/data/filetypes.sh trunk/data/filetypes.sql trunk/data/filetypes.tcl trunk/data/filetypes.vhdl trunk/data/filetypes.xml trunk/doc/geany.docbook trunk/geany.glade trunk/src/interface.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-03-09 12:18:42 UTC (rev 1374) +++ trunk/ChangeLog 2007-03-09 12:26:55 UTC (rev 1375) @@ -1,3 +1,9 @@ +2007-03-09 Nick Treleaven <nick.treleaven(a)btinternet.com> + + * src/interface.c, doc/geany.docbook, data/filetypes.*, geany.glade: + Fix indentation spelling. + + 2007-03-08 Nick Treleaven <nick.treleaven(a)btinternet.com> * src/document.c: Modified: trunk/data/filetypes.asm =================================================================== --- trunk/data/filetypes.asm 2007-03-09 12:18:42 UTC (rev 1374) +++ trunk/data/filetypes.asm 2007-03-09 12:26:55 UTC (rev 1375) @@ -34,7 +34,7 @@ comment_close= # set to false if a comment character/string should start at column 0 of a line, true uses any -# indention of the line, e.g. setting to true causes the following on pressing CTRL+d +# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d #command_example(); # setting to false would generate this # command_example(); Modified: trunk/data/filetypes.c =================================================================== --- trunk/data/filetypes.c 2007-03-09 12:18:42 UTC (rev 1374) +++ trunk/data/filetypes.c 2007-03-09 12:26:55 UTC (rev 1375) @@ -44,7 +44,7 @@ #comment_close=*/ # set to false if a comment character/string should start at column 0 of a line, true uses any -# indention of the line, e.g. setting to true causes the following on pressing CTRL+d +# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d #command_example(); # setting to false would generate this # command_example(); Modified: trunk/data/filetypes.caml =================================================================== --- trunk/data/filetypes.caml 2007-03-09 12:18:42 UTC (rev 1374) +++ trunk/data/filetypes.caml 2007-03-09 12:26:55 UTC (rev 1375) @@ -31,7 +31,7 @@ comment_close=*) # set to false if a comment character/string should start at column 0 of a line, true uses any -# indention of the line, e.g. setting to true causes the following on pressing CTRL+d +# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d #command_example(); # setting to false would generate this # command_example(); Modified: trunk/data/filetypes.conf =================================================================== --- trunk/data/filetypes.conf 2007-03-09 12:18:42 UTC (rev 1374) +++ trunk/data/filetypes.conf 2007-03-09 12:26:55 UTC (rev 1375) @@ -20,7 +20,7 @@ comment_close= # set to false if a comment character/string should start at column 0 of a line, true uses any -# indention of the line, e.g. setting to true causes the following on pressing CTRL+d +# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d #command_example(); # setting to false would generate this # command_example(); Modified: trunk/data/filetypes.cpp =================================================================== --- trunk/data/filetypes.cpp 2007-03-09 12:18:42 UTC (rev 1374) +++ trunk/data/filetypes.cpp 2007-03-09 12:26:55 UTC (rev 1375) @@ -44,7 +44,7 @@ #comment_close=*/ # set to false if a comment character/string should start at column 0 of a line, true uses any -# indention of the line, e.g. setting to true causes the following on pressing CTRL+d +# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d #command_example(); # setting to false would generate this # command_example(); Modified: trunk/data/filetypes.css =================================================================== --- trunk/data/filetypes.css 2007-03-09 12:18:42 UTC (rev 1374) +++ trunk/data/filetypes.css 2007-03-09 12:26:55 UTC (rev 1375) @@ -33,7 +33,7 @@ comment_close=*/ # set to false if a comment character/string should start at column 0 of a line, true uses any -# indention of the line, e.g. setting to true causes the following on pressing CTRL+d +# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d #command_example(); # setting to false would generate this # command_example(); Modified: trunk/data/filetypes.d =================================================================== --- trunk/data/filetypes.d 2007-03-09 12:18:42 UTC (rev 1374) +++ trunk/data/filetypes.d 2007-03-09 12:26:55 UTC (rev 1375) @@ -43,7 +43,7 @@ #comment_close=+/ # set to false if a comment character/string should start at column 0 of a line, true uses any -# indention of the line, e.g. setting to true causes the following on pressing CTRL+d +# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d #command_example(); # setting to false would generate this # command_example(); Modified: trunk/data/filetypes.docbook =================================================================== --- trunk/data/filetypes.docbook 2007-03-09 12:18:42 UTC (rev 1374) +++ trunk/data/filetypes.docbook 2007-03-09 12:26:55 UTC (rev 1375) @@ -46,7 +46,7 @@ comment_close=--> # set to false if a comment character/string should start at column 0 of a line, true uses any -# indention of the line, e.g. setting to true causes the following on pressing CTRL+d +# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d #command_example(); # setting to false would generate this # command_example(); Modified: trunk/data/filetypes.ferite =================================================================== --- trunk/data/filetypes.ferite 2007-03-09 12:18:42 UTC (rev 1374) +++ trunk/data/filetypes.ferite 2007-03-09 12:26:55 UTC (rev 1375) @@ -40,7 +40,7 @@ #comment_close=*/ # set to false if a comment character/string should start at column 0 of a line, true uses any -# indention of the line, e.g. setting to true causes the following on pressing CTRL+d +# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d #command_example(); # setting to false would generate this # command_example(); Modified: trunk/data/filetypes.fortran =================================================================== --- trunk/data/filetypes.fortran 2007-03-09 12:18:42 UTC (rev 1374) +++ trunk/data/filetypes.fortran 2007-03-09 12:26:55 UTC (rev 1375) @@ -35,7 +35,7 @@ comment_close= # set to false if a comment character/string should start at column 0 of a line, true uses any -# indention of the line, e.g. setting to true causes the following on pressing CTRL+d +# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d #command_example(); # setting to false would generate this # command_example(); Modified: trunk/data/filetypes.html =================================================================== --- trunk/data/filetypes.html 2007-03-09 12:18:42 UTC (rev 1374) +++ trunk/data/filetypes.html 2007-03-09 12:26:55 UTC (rev 1375) @@ -13,7 +13,7 @@ comment_close=--> # set to false if a comment character/string should start at column 0 of a line, true uses any -# indention of the line, e.g. setting to true causes the following on pressing CTRL+d +# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d #command_example(); # setting to false would generate this # command_example(); Modified: trunk/data/filetypes.java =================================================================== --- trunk/data/filetypes.java 2007-03-09 12:18:42 UTC (rev 1374) +++ trunk/data/filetypes.java 2007-03-09 12:26:55 UTC (rev 1375) @@ -39,7 +39,7 @@ comment_close=*/ # set to false if a comment character/string should start at column 0 of a line, true uses any -# indention of the line, e.g. setting to true causes the following on pressing CTRL+d +# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d #command_example(); # setting to false would generate this # command_example(); Modified: trunk/data/filetypes.javascript =================================================================== --- trunk/data/filetypes.javascript 2007-03-09 12:18:42 UTC (rev 1374) +++ trunk/data/filetypes.javascript 2007-03-09 12:26:55 UTC (rev 1375) @@ -35,7 +35,7 @@ comment_close= # set to false if a comment character/string should start at column 0 of a line, true uses any -# indention of the line, e.g. setting to true causes the following on pressing CTRL+d +# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d #command_example(); # setting to false would generate this # command_example(); Modified: trunk/data/filetypes.latex =================================================================== --- trunk/data/filetypes.latex 2007-03-09 12:18:42 UTC (rev 1374) +++ trunk/data/filetypes.latex 2007-03-09 12:26:55 UTC (rev 1375) @@ -21,7 +21,7 @@ comment_close= # set to false if a comment character/string should start at column 0 of a line, true uses any -# indention of the line, e.g. setting to true causes the following on pressing CTRL+d +# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d #command_example(); # setting to false would generate this # command_example(); Modified: trunk/data/filetypes.lua =================================================================== --- trunk/data/filetypes.lua 2007-03-09 12:18:42 UTC (rev 1374) +++ trunk/data/filetypes.lua 2007-03-09 12:26:55 UTC (rev 1375) @@ -49,7 +49,7 @@ #comment_close=]]-- # set to false if a comment character/string should start at column 0 of a line, true uses any -# indention of the line, e.g. setting to true causes the following on pressing CTRL+d +# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d #command_example(); # setting to false would generate this # command_example(); Modified: trunk/data/filetypes.makefile =================================================================== --- trunk/data/filetypes.makefile 2007-03-09 12:18:42 UTC (rev 1374) +++ trunk/data/filetypes.makefile 2007-03-09 12:26:55 UTC (rev 1375) @@ -21,7 +21,7 @@ comment_close= # set to false if a comment character/string should start at column 0 of a line, true uses any -# indention of the line, e.g. setting to true causes the following on pressing CTRL+d +# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d #command_example(); # setting to false would generate this # command_example(); Modified: trunk/data/filetypes.oms =================================================================== --- trunk/data/filetypes.oms 2007-03-09 12:18:42 UTC (rev 1374) +++ trunk/data/filetypes.oms 2007-03-09 12:26:55 UTC (rev 1375) @@ -27,7 +27,7 @@ comment_close= # set to false if a comment character/string should start at column 0 of a line, true uses any -# indention of the line, e.g. setting to true causes the following on pressing CTRL+d +# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d #command_example(); # setting to false would generate this # command_example(); Modified: trunk/data/filetypes.pascal =================================================================== --- trunk/data/filetypes.pascal 2007-03-09 12:18:42 UTC (rev 1374) +++ trunk/data/filetypes.pascal 2007-03-09 12:26:55 UTC (rev 1375) @@ -27,7 +27,7 @@ comment_close=} # set to false if a comment character/string should start at column 0 of a line, true uses any -# indention of the line, e.g. setting to true causes the following on pressing CTRL+d +# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d #command_example(); # setting to false would generate this # command_example(); Modified: trunk/data/filetypes.perl =================================================================== --- trunk/data/filetypes.perl 2007-03-09 12:18:42 UTC (rev 1374) +++ trunk/data/filetypes.perl 2007-03-09 12:26:55 UTC (rev 1375) @@ -45,7 +45,7 @@ comment_close= # set to false if a comment character/string should start at column 0 of a line, true uses any -# indention of the line, e.g. setting to true causes the following on pressing CTRL+d +# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d #command_example(); # setting to false would generate this # command_example(); Modified: trunk/data/filetypes.php =================================================================== --- trunk/data/filetypes.php 2007-03-09 12:18:42 UTC (rev 1374) +++ trunk/data/filetypes.php 2007-03-09 12:26:55 UTC (rev 1375) @@ -13,7 +13,7 @@ comment_close=*/ # set to false if a comment character/string should start at column 0 of a line, true uses any -# indention of the line, e.g. setting to true causes the following on pressing CTRL+d +# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d #command_example(); # setting to false would generate this # command_example(); Modified: trunk/data/filetypes.python =================================================================== --- trunk/data/filetypes.python 2007-03-09 12:18:42 UTC (rev 1374) +++ trunk/data/filetypes.python 2007-03-09 12:26:55 UTC (rev 1375) @@ -30,7 +30,7 @@ comment_close= # set to false if a comment character/string should start at column 0 of a line, true uses any -# indention of the line, e.g. setting to true causes the following on pressing CTRL+d +# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d #command_example(); # setting to false would generate this # command_example(); Modified: trunk/data/filetypes.ruby =================================================================== --- trunk/data/filetypes.ruby 2007-03-09 12:18:42 UTC (rev 1374) +++ trunk/data/filetypes.ruby 2007-03-09 12:26:55 UTC (rev 1375) @@ -49,7 +49,7 @@ comment_close= # set to false if a comment character/string should start at column 0 of a line, true uses any -# indention of the line, e.g. setting to true causes the following on pressing CTRL+d +# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d #command_example(); # setting to false would generate this # command_example(); Modified: trunk/data/filetypes.sh =================================================================== --- trunk/data/filetypes.sh 2007-03-09 12:18:42 UTC (rev 1374) +++ trunk/data/filetypes.sh 2007-03-09 12:26:55 UTC (rev 1375) @@ -26,7 +26,7 @@ comment_close= # set to false if a comment character/string should start a column 0 of a line, true uses any -# indention of the line, e.g. setting to true causes the following on pressing CTRL+d +# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d #command_example(); # setting to false would generate this # command_example(); Modified: trunk/data/filetypes.sql =================================================================== --- trunk/data/filetypes.sql 2007-03-09 12:18:42 UTC (rev 1374) +++ trunk/data/filetypes.sql 2007-03-09 12:26:55 UTC (rev 1375) @@ -31,7 +31,7 @@ comment_close=*/ # set to false if a comment character/string should start at column 0 of a line, true uses any -# indention of the line, e.g. setting to true causes the following on pressing CTRL+d +# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d #command_example(); # setting to false would generate this # command_example(); Modified: trunk/data/filetypes.tcl =================================================================== --- trunk/data/filetypes.tcl 2007-03-09 12:18:42 UTC (rev 1374) +++ trunk/data/filetypes.tcl 2007-03-09 12:26:55 UTC (rev 1375) @@ -37,7 +37,7 @@ comment_close= # set to false if a comment character/string should start at column 0 of a line, true uses any -# indention of the line, e.g. setting to true causes the following on pressing CTRL+d +# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d #command_example(); # setting to false would generate this # command_example(); Modified: trunk/data/filetypes.vhdl =================================================================== --- trunk/data/filetypes.vhdl 2007-03-09 12:18:42 UTC (rev 1374) +++ trunk/data/filetypes.vhdl 2007-03-09 12:26:55 UTC (rev 1375) @@ -36,7 +36,7 @@ comment_close= # set to false if a comment character/string should start at column 0 of a line, true uses any -# indention of the line, e.g. setting to true causes the following on pressing CTRL+d +# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d #command_example(); # setting to false would generate this # command_example(); Modified: trunk/data/filetypes.xml =================================================================== --- trunk/data/filetypes.xml 2007-03-09 12:18:42 UTC (rev 1374) +++ trunk/data/filetypes.xml 2007-03-09 12:26:55 UTC (rev 1375) @@ -83,7 +83,7 @@ comment_close=--> # set to false if a comment character/string should start at column 0 of a line, true uses any -# indention of the line, e.g. setting to true causes the following on pressing CTRL+d +# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d #command_example(); # setting to false would generate this # command_example(); Modified: trunk/doc/geany.docbook =================================================================== --- trunk/doc/geany.docbook 2007-03-09 12:18:42 UTC (rev 1374) +++ trunk/doc/geany.docbook 2007-03-09 12:26:55 UTC (rev 1375) @@ -380,16 +380,16 @@ was copied to the new position. </para> </section> - <section id="general_indention"> - <title>Auto indention</title> + <section id="general_indentation"> + <title>Auto indentation</title> <para> - <application>Geany</application> knows three types of auto indention: + <application>Geany</application> knows three types of auto indentation: None, Basic and Advanced. - <variablelist><title>Auto indention types</title> + <variablelist><title>Auto indentation types</title> <varlistentry><term>None</term> <listitem> <para> - Disables auto indention completely. + Disables auto indentation completely. </para> </listitem> </varlistentry> Modified: trunk/geany.glade =================================================================== --- trunk/geany.glade 2007-03-09 12:18:42 UTC (rev 1374) +++ trunk/geany.glade 2007-03-09 12:26:55 UTC (rev 1375) @@ -5319,7 +5319,7 @@ <child> <widget class="GtkLabel" id="label183"> <property name="visible">True</property> - <property name="label" translatable="yes">Auto indention mode:</property> + <property name="label" translatable="yes">Auto indentation mode:</property> <property name="use_underline">False</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_LEFT</property> @@ -5344,7 +5344,7 @@ <child> <widget class="GtkEventBox" id="eventbox2"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">Selects the indention mode. Use None to disable auto indention completely. Basic indents new lines with the same indention as the previous line. Advanced does the same and indents also curly brackets.</property> + <property name="tooltip" translatable="yes">Selects the indentation mode. Use None to disable auto indentation completely. Basic indents new lines with the same indentation as the previous line. Advanced does the same and indents also curly brackets.</property> <property name="visible_window">True</property> <property name="above_child">False</property> Modified: trunk/src/interface.c =================================================================== --- trunk/src/interface.c 2007-03-09 12:18:42 UTC (rev 1374) +++ trunk/src/interface.c 2007-03-09 12:26:55 UTC (rev 1375) @@ -3334,14 +3334,14 @@ gtk_widget_show (hbox7); gtk_box_pack_start (GTK_BOX (vbox17), hbox7, FALSE, FALSE, 0); - label183 = gtk_label_new (_("Auto indention mode:")); + label183 = gtk_label_new (_("Auto indentation mode:")); gtk_widget_show (label183); gtk_box_pack_start (GTK_BOX (hbox7), label183, FALSE, FALSE, 0); eventbox2 = gtk_event_box_new (); gtk_widget_show (eventbox2); gtk_box_pack_start (GTK_BOX (hbox7), eventbox2, FALSE, TRUE, 5); - gtk_tooltips_set_tip (tooltips, eventbox2, _("Selects the indention mode. Use None to disable auto indention completely. Basic indents new lines with the same indention as the previous line. Advanced does the same and indents also curly brackets."), NULL); + gtk_tooltips_set_tip (tooltips, eventbox2, _("Selects the indentation mode. Use None to disable auto indentation completely. Basic indents new lines with the same indentation as the previous line. Advanced does the same and indents also curly brackets."), NULL); combo_auto_indent_mode = gtk_combo_box_new_text (); gtk_widget_show (combo_auto_indent_mode); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1374] trunk/src
by ntrel＠users.sourceforge.net 09 Mar '07

09 Mar '07

Revision: 1374 http://svn.sourceforge.net/geany/?rev=1374&view=rev Author: ntrel Date: 2007-03-09 04:18:42 -0800 (Fri, 09 Mar 2007) Log Message: ----------- Fix sign comparison warnings. Modified Paths: -------------- trunk/src/prefs.c trunk/src/sci_cb.c Modified: trunk/src/prefs.c =================================================================== --- trunk/src/prefs.c 2007-03-08 18:02:08 UTC (rev 1373) +++ trunk/src/prefs.c 2007-03-09 12:18:42 UTC (rev 1374) @@ -676,7 +676,7 @@ // re-colourise all open documents, if tab width or long line settings have changed for (i = 0; i < doc_array->len; i++) { - if (DOC_IDX_VALID(i)) + if (doc_list[i].is_valid) { document_apply_update_prefs(i); if (! app->pref_editor_folding) Modified: trunk/src/sci_cb.c =================================================================== --- trunk/src/sci_cb.c 2007-03-08 18:02:08 UTC (rev 1373) +++ trunk/src/sci_cb.c 2007-03-09 12:18:42 UTC (rev 1374) @@ -364,7 +364,8 @@ static void get_indent(ScintillaObject *sci, gint pos, gboolean use_this_line) { // very simple indentation algorithm - gint i, prev_line, len, j = 0; + guint i, len, j = 0; + gint prev_line; gchar *linebuf; prev_line = sci_get_line_from_position(sci, pos); @@ -414,8 +415,8 @@ } else { // insert as many spaces as a tabulator would take - gint i; - for (i = 0; i < app->pref_editor_tab_width; i++) + gint n; + for (n = 0; n < app->pref_editor_tab_width; n++) indent[j++] = ' '; } } 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
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits March 2007