Commits

commits@lists.geany.org

1 participants
11556 discussions

SF.net SVN: geany: [368] trunk
by ntrel＠users.sourceforge.net 26 May '06

26 May '06

Revision: 368 Author: ntrel Date: 2006-05-26 10:11:41 -0700 (Fri, 26 May 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=368&view=rev Log Message: ----------- Fix incremental find and replace of back to back matches Modified Paths: -------------- trunk/ChangeLog trunk/src/document.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-05-26 17:03:32 UTC (rev 367) +++ trunk/ChangeLog 2006-05-26 17:11:41 UTC (rev 368) @@ -4,6 +4,8 @@ Fixed nasty hang when closing a tab and both the next tab and the first tab files have been externally modified. * src/dialogs.c: Add mnemonics to Replace dialog buttons, reorder. + * src/document.c: Fix incremental find and replace of back to back + matches. 2006-05-25 Nick Treleaven <nick.treleaven(a)btinternet.com> Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2006-05-26 17:03:32 UTC (rev 367) +++ trunk/src/document.c 2006-05-26 17:11:41 UTC (rev 368) @@ -671,7 +671,7 @@ selection_end = sci_get_selection_end(doc_list[idx].sci); if (!inc && sci_can_copy(doc_list[idx].sci)) { // there's a selection so go to the end - sci_goto_pos(doc_list[idx].sci, selection_end + 1, TRUE); + sci_goto_pos(doc_list[idx].sci, selection_end, TRUE); } sci_set_search_anchor(doc_list[idx].sci); @@ -711,9 +711,9 @@ if ((selection_end - selection_start) > 0) { // there's a selection so go to the end if (search_backwards) - sci_goto_pos(doc_list[idx].sci, selection_start - 1, TRUE); + sci_goto_pos(doc_list[idx].sci, selection_start, TRUE); else - sci_goto_pos(doc_list[idx].sci, selection_end + 1, TRUE); + sci_goto_pos(doc_list[idx].sci, selection_end, TRUE); } sci_set_search_anchor(doc_list[idx].sci); @@ -749,9 +749,9 @@ if ((selection_end - selection_start) > 0) { // there's a selection so go to the end if (search_backwards) - sci_goto_pos(doc_list[idx].sci, selection_start - 1, TRUE); + sci_goto_pos(doc_list[idx].sci, selection_start, TRUE); else - sci_goto_pos(doc_list[idx].sci, selection_end + 1, TRUE); + sci_goto_pos(doc_list[idx].sci, selection_end, TRUE); } sci_set_search_anchor(doc_list[idx].sci); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [367] trunk/src/dialogs.c
by ntrel＠users.sourceforge.net 26 May '06

26 May '06

Revision: 367 Author: ntrel Date: 2006-05-26 10:03:32 -0700 (Fri, 26 May 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=367&view=rev Log Message: ----------- Set Replace dialog default response Modified Paths: -------------- trunk/src/dialogs.c Modified: trunk/src/dialogs.c =================================================================== --- trunk/src/dialogs.c 2006-05-26 15:51:32 UTC (rev 366) +++ trunk/src/dialogs.c 2006-05-26 17:03:32 UTC (rev 367) @@ -905,7 +905,7 @@ app->replace_dialog = gtk_dialog_new_with_buttons(_("Replace"), GTK_WINDOW(app->window), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, NULL); - button = gtk_button_new_with_mnemonic(_("_In selection")); + button = gtk_button_new_with_mnemonic(_("_In Selection")); gtk_tooltips_set_tip(tooltips, button, _("Replace all matches found in the currently selected text"), NULL); gtk_widget_show(button); @@ -919,6 +919,8 @@ gtk_widget_show(button); gtk_dialog_add_action_widget(GTK_DIALOG(app->replace_dialog), button, GEANY_RESPONSE_REPLACE); + gtk_dialog_set_default_response(GTK_DIALOG(app->replace_dialog), + GEANY_RESPONSE_REPLACE); label_find = gtk_label_new(_("Enter the search text here")); gtk_misc_set_padding(GTK_MISC(label_find), 0, 6); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [366] trunk
by ntrel＠users.sourceforge.net 26 May '06

26 May '06

Revision: 366 Author: ntrel Date: 2006-05-26 08:51:32 -0700 (Fri, 26 May 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=366&view=rev Log Message: ----------- Add mnemonics to Replace dialog buttons, reorder Modified Paths: -------------- trunk/ChangeLog trunk/src/dialogs.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-05-26 12:22:39 UTC (rev 365) +++ trunk/ChangeLog 2006-05-26 15:51:32 UTC (rev 366) @@ -3,6 +3,7 @@ * src/interface.c, src/callbacks.c, src/callbacks.h, geany.glade: Fixed nasty hang when closing a tab and both the next tab and the first tab files have been externally modified. + * src/dialogs.c: Add mnemonics to Replace dialog buttons, reorder. 2006-05-25 Nick Treleaven <nick.treleaven(a)btinternet.com> Modified: trunk/src/dialogs.c =================================================================== --- trunk/src/dialogs.c 2006-05-26 12:22:39 UTC (rev 365) +++ trunk/src/dialogs.c 2006-05-26 15:51:32 UTC (rev 366) @@ -857,7 +857,7 @@ gtk_widget_ref(checkbox4), (GDestroyNotify)gtk_widget_unref); gtk_button_set_focus_on_click(GTK_BUTTON(checkbox4), FALSE); - checkbox5 = gtk_check_button_new_with_mnemonic(_("Match only word _start")); + checkbox5 = gtk_check_button_new_with_mnemonic(_("Match only word s_tart")); g_object_set_data_full(G_OBJECT(app->find_dialog), "check_wordstart", gtk_widget_ref(checkbox5), (GDestroyNotify)gtk_widget_unref); gtk_button_set_focus_on_click(GTK_BUTTON(checkbox5), FALSE); @@ -897,15 +897,28 @@ if (app->replace_dialog == NULL) { - GtkWidget *label_find, *label_replace, *entry_find, *entry_replace, *checkbox1, *checkbox2, *checkbox3, *checkbox5, *checkbox4; + GtkWidget *label_find, *label_replace, *entry_find, *entry_replace; + GtkWidget *checkbox1, *checkbox2, *checkbox3, *checkbox5, *checkbox4; + GtkWidget *button; GtkTooltips *tooltips = GTK_TOOLTIPS(lookup_widget(app->window, "tooltips")); app->replace_dialog = gtk_dialog_new_with_buttons(_("Replace"), GTK_WINDOW(app->window), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, NULL); - gtk_dialog_add_button(GTK_DIALOG(app->replace_dialog), _("Replace"), GEANY_RESPONSE_REPLACE); - gtk_dialog_add_button(GTK_DIALOG(app->replace_dialog), _("Replace All"), GEANY_RESPONSE_REPLACE_ALL); - gtk_dialog_add_button(GTK_DIALOG(app->replace_dialog), _("Replace in selection"), GEANY_RESPONSE_REPLACE_SEL); + button = gtk_button_new_with_mnemonic(_("_In selection")); + gtk_tooltips_set_tip(tooltips, button, + _("Replace all matches found in the currently selected text"), NULL); + gtk_widget_show(button); + gtk_dialog_add_action_widget(GTK_DIALOG(app->replace_dialog), button, + GEANY_RESPONSE_REPLACE_SEL); + button = gtk_button_new_with_mnemonic(_("Replace _All")); + gtk_widget_show(button); + gtk_dialog_add_action_widget(GTK_DIALOG(app->replace_dialog), button, + GEANY_RESPONSE_REPLACE_ALL); + button = gtk_button_new_with_mnemonic(_("_Replace")); + gtk_widget_show(button); + gtk_dialog_add_action_widget(GTK_DIALOG(app->replace_dialog), button, + GEANY_RESPONSE_REPLACE); label_find = gtk_label_new(_("Enter the search text here")); gtk_misc_set_padding(GTK_MISC(label_find), 0, 6); @@ -962,7 +975,7 @@ gtk_widget_ref(checkbox4), (GDestroyNotify)gtk_widget_unref); gtk_button_set_focus_on_click(GTK_BUTTON(checkbox4), FALSE); - checkbox5 = gtk_check_button_new_with_mnemonic(_("Match only word _start")); + checkbox5 = gtk_check_button_new_with_mnemonic(_("Match only word s_tart")); g_object_set_data_full(G_OBJECT(app->replace_dialog), "check_wordstart", gtk_widget_ref(checkbox5), (GDestroyNotify)gtk_widget_unref); gtk_button_set_focus_on_click(GTK_BUTTON(checkbox5), FALSE); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [365] trunk
by ntrel＠users.sourceforge.net 26 May '06

26 May '06

Revision: 365 Author: ntrel Date: 2006-05-26 05:22:39 -0700 (Fri, 26 May 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=365&view=rev Log Message: ----------- Fixed nasty hang when closing a tab and both the next tab and the first tab files have been externally modified Modified Paths: -------------- trunk/ChangeLog trunk/geany.glade trunk/src/callbacks.c trunk/src/callbacks.h trunk/src/interface.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-05-25 15:32:03 UTC (rev 364) +++ trunk/ChangeLog 2006-05-26 12:22:39 UTC (rev 365) @@ -1,3 +1,10 @@ +2006-05-26 Nick Treleaven <nick.treleaven(a)btinternet.com> + + * src/interface.c, src/callbacks.c, src/callbacks.h, geany.glade: + Fixed nasty hang when closing a tab and both the next tab and the + first tab files have been externally modified. + + 2006-05-25 Nick Treleaven <nick.treleaven(a)btinternet.com> * src/document.c: On loading use SCI_SETTEXT instead of SCI_ADDTEXT Modified: trunk/geany.glade =================================================================== --- trunk/geany.glade 2006-05-25 15:32:03 UTC (rev 364) +++ trunk/geany.glade 2006-05-26 12:22:39 UTC (rev 365) @@ -1520,6 +1520,7 @@ <property name="scrollable">True</property> <property name="enable_popup">True</property> <signal name="switch_page" handler="on_notebook1_switch_page" last_modification_time="Sat, 23 Apr 2005 15:17:51 GMT"/> + <signal name="switch_page" handler="on_notebook1_switch_page_after" after="yes" last_modification_time="Fri, 26 May 2006 11:47:25 GMT"/> </widget> <packing> <property name="shrink">True</property> Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2006-05-25 15:32:03 UTC (rev 364) +++ trunk/src/callbacks.c 2006-05-26 12:22:39 UTC (rev 365) @@ -692,7 +692,6 @@ utils_update_statusbar(idx, -1); utils_set_window_title(idx); utils_update_tag_list(idx, FALSE); - utils_check_disk_status(idx); switch_notebook_page = FALSE; } @@ -700,6 +699,29 @@ void +on_notebook1_switch_page_after (GtkNotebook *notebook, + GtkNotebookPage *page, + guint page_num, + gpointer user_data) +{ + gint idx; + + if (closing_all) return; + + // guint == -1 seems useless, but it isn't! + if (page_num == -1 && page != NULL) + idx = document_find_by_sci(SCINTILLA(page)); + else + idx = document_get_n_idx(page_num); + + if (idx >= 0 && app->opening_session_files == FALSE) + { + utils_check_disk_status(idx); + } +} + + +void on_tv_notebook_switch_page (GtkNotebook *notebook, GtkNotebookPage *page, guint page_num, Modified: trunk/src/callbacks.h =================================================================== --- trunk/src/callbacks.h 2006-05-25 15:32:03 UTC (rev 364) +++ trunk/src/callbacks.h 2006-05-26 12:22:39 UTC (rev 365) @@ -570,3 +570,9 @@ void on_go_to_line1_activate (GtkMenuItem *menuitem, gpointer user_data); + +void +on_notebook1_switch_page_after (GtkNotebook *notebook, + GtkNotebookPage *page, + guint page_num, + gpointer user_data); Modified: trunk/src/interface.c =================================================================== --- trunk/src/interface.c 2006-05-25 15:32:03 UTC (rev 364) +++ trunk/src/interface.c 2006-05-26 12:22:39 UTC (rev 365) @@ -1163,6 +1163,9 @@ g_signal_connect ((gpointer) notebook1, "switch_page", G_CALLBACK (on_notebook1_switch_page), NULL); + g_signal_connect_after ((gpointer) notebook1, "switch_page", + G_CALLBACK (on_notebook1_switch_page_after), + NULL); atko = gtk_widget_get_accessible (window1); atk_object_set_name (atko, _("Geany")); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [364] trunk
by ntrel＠users.sourceforge.net 25 May '06

25 May '06

Revision: 364 Author: ntrel Date: 2006-05-25 08:32:03 -0700 (Thu, 25 May 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=364&view=rev Log Message: ----------- Make Replace in selection non-incremental and use single Undo blocks for this and for Replace All Modified Paths: -------------- trunk/ChangeLog trunk/src/callbacks.c trunk/src/document.c trunk/src/document.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-05-25 12:57:12 UTC (rev 363) +++ trunk/ChangeLog 2006-05-25 15:32:03 UTC (rev 364) @@ -2,6 +2,9 @@ * src/document.c: On loading use SCI_SETTEXT instead of SCI_ADDTEXT to avoid Scintilla text changed signal. + * src/callbacks.c, src/document.c, src/document.h: + Make Replace in selection non-incremental and use single Undo + blocks for this and for Replace All. 2006-05-24 Nick Treleaven <nick.treleaven(a)btinternet.com> Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2006-05-25 12:57:12 UTC (rev 363) +++ trunk/src/callbacks.c 2006-05-25 15:32:03 UTC (rev 364) @@ -1804,7 +1804,7 @@ } case GEANY_RESPONSE_REPLACE_SEL: { - document_replace_sel(idx, find, replace, search_flags_re, search_backwards_re); + document_replace_sel(idx, find, replace, search_flags_re); break; } } Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2006-05-25 12:57:12 UTC (rev 363) +++ trunk/src/document.c 2006-05-25 15:32:03 UTC (rev 364) @@ -776,57 +776,51 @@ } -void document_replace_sel(gint idx, const gchar *find_text, const gchar *replace_text, gint flags, gboolean search_backwards) +void document_replace_sel(gint idx, const gchar *find_text, const gchar *replace_text, gint flags) { gint selection_end, selection_start, search_pos; + gint anchor_pos; gint find_text_len = strlen(find_text); gint replace_text_len = strlen(replace_text); if (idx == -1 || ! find_text_len) return; - selection_start = sci_get_selection_start(doc_list[idx].sci); - selection_end = sci_get_selection_end(doc_list[idx].sci); + selection_start = sci_get_selection_start(doc_list[idx].sci); + selection_end = sci_get_selection_end(doc_list[idx].sci); if ((selection_end - selection_start) == 0) { utils_beep(); return; } - if (search_backwards) - sci_goto_pos(doc_list[idx].sci, selection_end, TRUE); - else - sci_goto_pos(doc_list[idx].sci, selection_start, TRUE); - - sci_set_search_anchor(doc_list[idx].sci); - if (search_backwards) - search_pos = sci_search_prev(doc_list[idx].sci, flags, find_text); - else + sci_start_undo_action(doc_list[idx].sci); + anchor_pos = selection_start; + while (TRUE) + { + sci_goto_pos(doc_list[idx].sci, anchor_pos, TRUE); + sci_set_search_anchor(doc_list[idx].sci); search_pos = sci_search_next(doc_list[idx].sci, flags, find_text); - if (search_pos != -1) - { - sci_target_start(doc_list[idx].sci, search_pos); - sci_target_end(doc_list[idx].sci, search_pos + find_text_len); - sci_target_replace(doc_list[idx].sci, replace_text); - sci_scroll_caret(doc_list[idx].sci); - // update selection points, avoiding rematching: - if (search_backwards) - { - selection_end = search_pos; - } + if (search_pos == -1 || + search_pos < selection_start || + search_pos + find_text_len > selection_end) break; else { - selection_start = search_pos + replace_text_len; + sci_target_start(doc_list[idx].sci, search_pos); + sci_target_end(doc_list[idx].sci, search_pos + find_text_len); + sci_target_replace(doc_list[idx].sci, replace_text); + anchor_pos = search_pos + replace_text_len; //avoid rematch + // update selection end point for each replacement selection_end += replace_text_len - find_text_len; } } - else - { - utils_beep(); - } - // set selection again, because it got lost just before + sci_end_undo_action(doc_list[idx].sci); + // set selection again, because it got lost and end may be moved sci_set_selection_start(doc_list[idx].sci, selection_start); sci_set_selection_end(doc_list[idx].sci, selection_end); + + sci_scroll_caret(doc_list[idx].sci); + gtk_widget_hide(app->replace_dialog); } @@ -838,6 +832,7 @@ if (idx == -1 || ! find_text_len) return; + sci_start_undo_action(doc_list[idx].sci); sci_goto_pos(doc_list[idx].sci, 0, FALSE); sci_set_search_anchor(doc_list[idx].sci); @@ -852,6 +847,7 @@ sci_set_search_anchor(doc_list[idx].sci); search_pos = sci_search_next(doc_list[idx].sci, flags, find_text); } + sci_end_undo_action(doc_list[idx].sci); sci_scroll_caret(doc_list[idx].sci); gtk_widget_hide(app->replace_dialog); } Modified: trunk/src/document.h =================================================================== --- trunk/src/document.h 2006-05-25 12:57:12 UTC (rev 363) +++ trunk/src/document.h 2006-05-25 15:32:03 UTC (rev 364) @@ -92,7 +92,7 @@ void document_replace_all(gint, const gchar*, const gchar*, gint); -void document_replace_sel(gint, const gchar*, const gchar*, gint, gboolean); +void document_replace_sel(gint, const gchar*, const gchar*, gint); void document_find_next(gint, const gchar*, gint, gboolean, gboolean); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [363] trunk
by ntrel＠users.sourceforge.net 25 May '06

25 May '06

Revision: 363 Author: ntrel Date: 2006-05-25 05:57:12 -0700 (Thu, 25 May 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=363&view=rev Log Message: ----------- On loading use SCI_SETTEXT instead of SCI_ADDTEXT to avoid Scintilla text changed signal Modified Paths: -------------- trunk/ChangeLog trunk/src/document.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-05-24 16:56:14 UTC (rev 362) +++ trunk/ChangeLog 2006-05-25 12:57:12 UTC (rev 363) @@ -1,3 +1,9 @@ +2006-05-25 Nick Treleaven <nick.treleaven(a)btinternet.com> + + * src/document.c: On loading use SCI_SETTEXT instead of SCI_ADDTEXT + to avoid Scintilla text changed signal. + + 2006-05-24 Nick Treleaven <nick.treleaven(a)btinternet.com> * src/keybindings.c, src/keybindings.h: Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2006-05-24 16:56:14 UTC (rev 362) +++ trunk/src/document.c 2006-05-25 12:57:12 UTC (rev 363) @@ -508,8 +508,8 @@ if (! reload) idx = document_create_new_sci(utf8_filename); - // sets editor mode and add the text to the ScintillaObject - sci_add_text_buffer(doc_list[idx].sci, data, size); + // set editor mode and add the text to the ScintillaObject + sci_set_text(doc_list[idx].sci, data); // NULL terminated data; avoids Unsaved editor_mode = utils_get_line_endings(data, size); sci_set_eol_mode(doc_list[idx].sci, editor_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: [362] trunk
by ntrel＠users.sourceforge.net 24 May '06

24 May '06

Revision: 362 Author: ntrel Date: 2006-05-24 09:56:14 -0700 (Wed, 24 May 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=362&view=rev Log Message: ----------- Set shortcut for Replace and split keybindings_init code Modified Paths: -------------- trunk/ChangeLog trunk/src/keybindings.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-05-24 13:18:42 UTC (rev 361) +++ trunk/ChangeLog 2006-05-24 16:56:14 UTC (rev 362) @@ -2,6 +2,8 @@ * src/keybindings.c, src/keybindings.h: Add shortcuts for Find Previous, Go to line + * src/keybindings.c: + Set shortcut for Replace and split keybindings_init code 2006-05-23 Nick Treleaven <nick.treleaven(a)btinternet.com> Modified: trunk/src/keybindings.c =================================================================== --- trunk/src/keybindings.c 2006-05-24 13:18:42 UTC (rev 361) +++ trunk/src/keybindings.c 2006-05-24 16:56:14 UTC (rev 362) @@ -84,13 +84,8 @@ static void cb_func_edit_macrolist(void); static void cb_func_edit_suppresscompletion(void); +void keybindings_add_accels(); -#define GEANY_ADD_ACCEL(gkey, wid) \ - if (keys[(gkey)]->key != 0) \ - gtk_widget_add_accelerator( \ - lookup_widget(app->window, G_STRINGIFY(wid)), \ - "activate", accel_group, keys[(gkey)]->key, keys[(gkey)]->mods, \ - GTK_ACCEL_VISIBLE); void keybindings_init(void) { @@ -100,7 +95,6 @@ guint key; GdkModifierType mods; GKeyFile *config = g_key_file_new(); - GtkAccelGroup *accel_group = gtk_accel_group_new(); // init all fields of keys with default values keys[GEANY_KEYS_MENU_NEW] = fill(cb_func_menu_new, GDK_n, GDK_CONTROL_MASK, "menu_new"); @@ -160,7 +154,24 @@ } } + g_free(configfile); + g_key_file_free(config); + keybindings_add_accels(); +} + + +#define GEANY_ADD_ACCEL(gkey, wid) \ + if (keys[(gkey)]->key != 0) \ + gtk_widget_add_accelerator( \ + lookup_widget(app->window, G_STRINGIFY(wid)), \ + "activate", accel_group, keys[(gkey)]->key, keys[(gkey)]->mods, \ + GTK_ACCEL_VISIBLE); + +void keybindings_add_accels() +{ + GtkAccelGroup *accel_group = gtk_accel_group_new(); + // apply the settings if (keys[GEANY_KEYS_MENU_SAVEALL]->key != 0) gtk_widget_add_accelerator(lookup_widget(app->window, "menu_save_all1"), "activate", accel_group, @@ -183,6 +194,7 @@ keys[GEANY_KEYS_MENU_FIND_NEXT]->key, keys[GEANY_KEYS_MENU_FIND_NEXT]->mods, GTK_ACCEL_VISIBLE); GEANY_ADD_ACCEL(GEANY_KEYS_MENU_FINDPREVIOUS, find_previous1) + GEANY_ADD_ACCEL(GEANY_KEYS_MENU_REPLACE, replace1) GEANY_ADD_ACCEL(GEANY_KEYS_MENU_GOTOLINE, go_to_line1) if (keys[GEANY_KEYS_MENU_FULLSCREEN]->key != 0) @@ -216,9 +228,6 @@ // the build menu items are set if the build menus are created gtk_window_add_accel_group(GTK_WINDOW(app->window), accel_group); - - g_free(configfile); - g_key_file_free(config); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [361] trunk
by ntrel＠users.sourceforge.net 24 May '06

24 May '06

Revision: 361 Author: ntrel Date: 2006-05-24 06:18:42 -0700 (Wed, 24 May 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=361&view=rev Log Message: ----------- Add shortcuts for Find Previous, Go to line Modified Paths: -------------- trunk/ChangeLog trunk/src/keybindings.c trunk/src/keybindings.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-05-23 20:26:23 UTC (rev 360) +++ trunk/ChangeLog 2006-05-24 13:18:42 UTC (rev 361) @@ -1,3 +1,9 @@ +2006-05-24 Nick Treleaven <nick.treleaven(a)btinternet.com> + + * src/keybindings.c, src/keybindings.h: + Add shortcuts for Find Previous, Go to line + + 2006-05-23 Nick Treleaven <nick.treleaven(a)btinternet.com> * src/utils.c: check if file has been closed in Modified: trunk/src/keybindings.c =================================================================== --- trunk/src/keybindings.c 2006-05-23 20:26:23 UTC (rev 360) +++ trunk/src/keybindings.c 2006-05-24 13:18:42 UTC (rev 361) @@ -51,9 +51,11 @@ static void cb_func_menu_reloadfile(void); static void cb_func_menu_undo(void); static void cb_func_menu_redo(void); +static void cb_func_menu_preferences(void); static void cb_func_menu_findnext(void); +static void cb_func_menu_findprevious(void); static void cb_func_menu_replace(void); -static void cb_func_menu_preferences(void); +static void cb_func_menu_gotoline(void); static void cb_func_menu_opencolorchooser(void); static void cb_func_menu_fullscreen(void); static void cb_func_menu_messagewindow(void); @@ -83,6 +85,13 @@ static void cb_func_edit_suppresscompletion(void); +#define GEANY_ADD_ACCEL(gkey, wid) \ + if (keys[(gkey)]->key != 0) \ + gtk_widget_add_accelerator( \ + lookup_widget(app->window, G_STRINGIFY(wid)), \ + "activate", accel_group, keys[(gkey)]->key, keys[(gkey)]->mods, \ + GTK_ACCEL_VISIBLE); + void keybindings_init(void) { gchar *configfile = g_strconcat(app->configdir, G_DIR_SEPARATOR_S, "keybindings.conf", NULL); @@ -102,9 +111,11 @@ keys[GEANY_KEYS_MENU_RELOADFILE] = fill(cb_func_menu_reloadfile, GDK_r, GDK_CONTROL_MASK, "menu_reloadfile"); keys[GEANY_KEYS_MENU_UNDO] = fill(cb_func_menu_undo, GDK_z, GDK_CONTROL_MASK, "menu_undo"); keys[GEANY_KEYS_MENU_REDO] = fill(cb_func_menu_redo, GDK_y, GDK_CONTROL_MASK, "menu_redo"); + keys[GEANY_KEYS_MENU_PREFERENCES] = fill(cb_func_menu_preferences, GDK_p, GDK_CONTROL_MASK, "menu_preferences"); keys[GEANY_KEYS_MENU_FIND_NEXT] = fill(cb_func_menu_findnext, GDK_F3, 0, "menu_findnext"); + keys[GEANY_KEYS_MENU_FINDPREVIOUS] = fill(cb_func_menu_findprevious, GDK_F3, GDK_SHIFT_MASK, "menu_findprevious"); keys[GEANY_KEYS_MENU_REPLACE] = fill(cb_func_menu_replace, GDK_F3, GDK_CONTROL_MASK, "menu_replace"); - keys[GEANY_KEYS_MENU_PREFERENCES] = fill(cb_func_menu_preferences, GDK_p, GDK_CONTROL_MASK, "menu_preferences"); + keys[GEANY_KEYS_MENU_GOTOLINE] = fill(cb_func_menu_gotoline, GDK_l, GDK_CONTROL_MASK, "menu_gotoline"); keys[GEANY_KEYS_MENU_OPENCOLORCHOOSER] = fill(cb_func_menu_opencolorchooser, 0, 0, "menu_opencolorchooser"); keys[GEANY_KEYS_MENU_FULLSCREEN] = fill(cb_func_menu_fullscreen, GDK_F11, 0, "menu_fullscreen"); keys[GEANY_KEYS_MENU_MESSAGEWINDOW] = fill(cb_func_menu_messagewindow, 0, 0, "menu_messagewindow"); @@ -171,6 +182,9 @@ gtk_widget_add_accelerator(lookup_widget(app->window, "find_next1"), "activate", accel_group, keys[GEANY_KEYS_MENU_FIND_NEXT]->key, keys[GEANY_KEYS_MENU_FIND_NEXT]->mods, GTK_ACCEL_VISIBLE); + GEANY_ADD_ACCEL(GEANY_KEYS_MENU_FINDPREVIOUS, find_previous1) + GEANY_ADD_ACCEL(GEANY_KEYS_MENU_GOTOLINE, go_to_line1) + if (keys[GEANY_KEYS_MENU_FULLSCREEN]->key != 0) gtk_widget_add_accelerator(lookup_widget(app->window, "menu_fullscreen1"), "activate", accel_group, keys[GEANY_KEYS_MENU_FULLSCREEN]->key, keys[GEANY_KEYS_MENU_FULLSCREEN]->mods, GTK_ACCEL_VISIBLE); @@ -338,19 +352,29 @@ on_redo1_activate(NULL, NULL); } +static void cb_func_menu_preferences(void) +{ + dialogs_show_prefs_dialog(); +} + static void cb_func_menu_findnext(void) { on_find_next1_activate(NULL, NULL); } +static void cb_func_menu_findprevious(void) +{ + on_find_previous1_activate(NULL, NULL); +} + static void cb_func_menu_replace(void) { dialogs_show_replace(); } -static void cb_func_menu_preferences(void) +static void cb_func_menu_gotoline(void) { - dialogs_show_prefs_dialog(); + on_go_to_line1_activate(NULL, NULL); } static void cb_func_menu_opencolorchooser(void) Modified: trunk/src/keybindings.h =================================================================== --- trunk/src/keybindings.h 2006-05-23 20:26:23 UTC (rev 360) +++ trunk/src/keybindings.h 2006-05-24 13:18:42 UTC (rev 361) @@ -46,9 +46,11 @@ GEANY_KEYS_MENU_RELOADFILE, GEANY_KEYS_MENU_UNDO, GEANY_KEYS_MENU_REDO, + GEANY_KEYS_MENU_PREFERENCES, GEANY_KEYS_MENU_FIND_NEXT, + GEANY_KEYS_MENU_FINDPREVIOUS, GEANY_KEYS_MENU_REPLACE, - GEANY_KEYS_MENU_PREFERENCES, + GEANY_KEYS_MENU_GOTOLINE, GEANY_KEYS_MENU_OPENCOLORCHOOSER, GEANY_KEYS_MENU_FULLSCREEN, GEANY_KEYS_MENU_MESSAGEWINDOW, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [360] trunk
by ntrel＠users.sourceforge.net 23 May '06

23 May '06

Revision: 360 Author: ntrel Date: 2006-05-23 13:26:23 -0700 (Tue, 23 May 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=360&view=rev Log Message: ----------- remove vte middle click override to allow X paste and update popup preferences item for Terminal tab number Modified Paths: -------------- trunk/ChangeLog trunk/src/vte.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-05-23 19:31:09 UTC (rev 359) +++ trunk/ChangeLog 2006-05-23 20:26:23 UTC (rev 360) @@ -4,7 +4,9 @@ utils_goto_workspace_tag * src/interface.c, src/callbacks.c, src/callbacks.h, geany.glade: created Search menubar item with Find items from Edit menu, added - Find Previous and Go to line commands. + Find Previous and Go to line commands + * src/vte.c: remove vte middle click override to allow X paste and + update popup preferences item for Terminal tab number 2006-05-22 Nick Treleaven <nick.treleaven(a)btinternet.com> Modified: trunk/src/vte.c =================================================================== --- trunk/src/vte.c 2006-05-23 19:31:09 UTC (rev 359) +++ trunk/src/vte.c 2006-05-23 20:26:23 UTC (rev 360) @@ -235,16 +235,8 @@ static gboolean vte_button_pressed(GtkWidget *widget, GdkEventButton *event, gpointer user_data) { - if (event->button == 2) + if (event->button == 3) { - /* this behaviour(pasting at mouse button 2) seems to be default, but don't know - * if it is always the same, so I implement it by myself to be sure and - * return TRUE to prevent the default behaviour */ - vf->vte_terminal_paste_clipboard(VTE_TERMINAL(widget)); - return TRUE; - } - else if (event->button == 3) - { gtk_menu_popup(GTK_MENU(vc->menu), NULL, NULL, NULL, NULL, event->button, event->time); } @@ -335,7 +327,7 @@ case 2: { on_preferences1_activate(menuitem, NULL); - gtk_notebook_set_current_page(GTK_NOTEBOOK(lookup_widget(app->prefs_dialog, "notebook2")), 4); + gtk_notebook_set_current_page(GTK_NOTEBOOK(lookup_widget(app->prefs_dialog, "notebook2")), 5); break; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [359] trunk
by ntrel＠users.sourceforge.net 23 May '06

23 May '06

Revision: 359 Author: ntrel Date: 2006-05-23 12:31:09 -0700 (Tue, 23 May 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=359&view=rev Log Message: ----------- created Search menubar item with Find items from Edit menu, added Find Previous and Go to line commands. Modified Paths: -------------- trunk/ChangeLog trunk/geany.glade trunk/src/callbacks.c trunk/src/callbacks.h trunk/src/interface.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-05-23 14:21:37 UTC (rev 358) +++ trunk/ChangeLog 2006-05-23 19:31:09 UTC (rev 359) @@ -2,6 +2,9 @@ * src/utils.c: check if file has been closed in utils_goto_workspace_tag + * src/interface.c, src/callbacks.c, src/callbacks.h, geany.glade: + created Search menubar item with Find items from Edit menu, added + Find Previous and Go to line commands. 2006-05-22 Nick Treleaven <nick.treleaven(a)btinternet.com> Modified: trunk/geany.glade =================================================================== --- trunk/geany.glade 2006-05-23 14:21:37 UTC (rev 358) +++ trunk/geany.glade 2006-05-23 19:31:09 UTC (rev 359) @@ -57,7 +57,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image602"> + <widget class="GtkImage" id="image618"> <property name="visible">True</property> <property name="stock">gtk-new</property> <property name="icon_size">1</property> @@ -130,7 +130,7 @@ <signal name="activate" handler="on_save_all1_activate" last_modification_time="Thu, 02 Jun 2005 14:15:30 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image603"> + <widget class="GtkImage" id="image619"> <property name="visible">True</property> <property name="stock">gtk-save</property> <property name="icon_size">1</property> @@ -191,7 +191,7 @@ <signal name="activate" handler="on_close_all1_activate" last_modification_time="Thu, 02 Jun 2005 14:15:30 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image604"> + <widget class="GtkImage" id="image620"> <property name="visible">True</property> <property name="stock">gtk-close</property> <property name="icon_size">1</property> @@ -333,7 +333,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image605"> + <widget class="GtkImage" id="image621"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -365,7 +365,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image606"> + <widget class="GtkImage" id="image622"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -487,6 +487,28 @@ </child> <child> + <widget class="GtkImageMenuItem" id="preferences1"> + <property name="visible">True</property> + <property name="label">gtk-preferences</property> + <property name="use_stock">True</property> + <signal name="activate" handler="on_preferences1_activate" last_modification_time="Wed, 08 Jun 2005 11:35:19 GMT"/> + </widget> + </child> + </widget> + </child> + </widget> + </child> + + <child> + <widget class="GtkMenuItem" id="search1"> + <property name="visible">True</property> + <property name="label" translatable="yes">_Search</property> + <property name="use_underline">True</property> + + <child> + <widget class="GtkMenu" id="search1_menu"> + + <child> <widget class="GtkImageMenuItem" id="find1"> <property name="visible">True</property> <property name="label">gtk-find</property> @@ -496,23 +518,20 @@ </child> <child> - <widget class="GtkImageMenuItem" id="find_next1"> + <widget class="GtkMenuItem" id="find_next1"> <property name="visible">True</property> - <property name="label" translatable="yes">Find _next</property> + <property name="label" translatable="yes">Find _Next</property> <property name="use_underline">True</property> <signal name="activate" handler="on_find_next1_activate" last_modification_time="Thu, 16 Jun 2005 18:40:58 GMT"/> + </widget> + </child> - <child internal-child="image"> - <widget class="GtkImage" id="image607"> - <property name="visible">True</property> - <property name="stock">gtk-find</property> - <property name="icon_size">1</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - </child> + <child> + <widget class="GtkMenuItem" id="find_previous1"> + <property name="visible">True</property> + <property name="label" translatable="yes">Find _Previous</property> + <property name="use_underline">True</property> + <signal name="activate" handler="on_find_previous1_activate" last_modification_time="Tue, 23 May 2006 17:10:49 GMT"/> </widget> </child> @@ -524,7 +543,7 @@ <signal name="activate" handler="on_replace1_activate" last_modification_time="Sun, 23 Oct 2005 13:22:36 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image608"> + <widget class="GtkImage" id="image623"> <property name="visible">True</property> <property name="stock">gtk-find-and-replace</property> <property name="icon_size">1</property> @@ -544,11 +563,23 @@ </child> <child> - <widget class="GtkImageMenuItem" id="preferences1"> + <widget class="GtkImageMenuItem" id="go_to_line1"> <property name="visible">True</property> - <property name="label">gtk-preferences</property> - <property name="use_stock">True</property> - <signal name="activate" handler="on_preferences1_activate" last_modification_time="Wed, 08 Jun 2005 11:35:19 GMT"/> + <property name="label" translatable="yes">_Go to line</property> + <property name="use_underline">True</property> + <signal name="activate" handler="on_go_to_line1_activate" last_modification_time="Tue, 23 May 2006 17:10:49 GMT"/> + + <child internal-child="image"> + <widget class="GtkImage" id="image624"> + <property name="visible">True</property> + <property name="stock">gtk-jump-to</property> + <property name="icon_size">1</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + </child> </widget> </child> </widget> @@ -574,7 +605,7 @@ <signal name="activate" handler="on_change_font1_activate" last_modification_time="Fri, 22 Apr 2005 18:58:45 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image609"> + <widget class="GtkImage" id="image625"> <property name="visible">True</property> <property name="stock">gtk-select-font</property> <property name="icon_size">1</property> @@ -596,7 +627,7 @@ <signal name="activate" handler="on_show_color_chooser1_activate" last_modification_time="Wed, 22 Jun 2005 18:10:21 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image610"> + <widget class="GtkImage" id="image626"> <property name="visible">True</property> <property name="stock">gtk-select-color</property> <property name="icon_size">1</property> Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2006-05-23 14:21:37 UTC (rev 358) +++ trunk/src/callbacks.c 2006-05-23 19:31:09 UTC (rev 359) @@ -2304,3 +2304,26 @@ on_build_execute_activate(NULL, NULL); } + +void +on_find_previous1_activate (GtkMenuItem *menuitem, + gpointer user_data) +{ + gint idx = document_get_cur_idx(); + + if (app->search_text) + { + document_find_text(idx, app->search_text, search_flags, + !search_backwards); + } +} + + +void +on_go_to_line1_activate (GtkMenuItem *menuitem, + gpointer user_data) +{ + // this is search menu cb; call popup menu goto cb + on_go_to_line_activate(menuitem, user_data); +} + Modified: trunk/src/callbacks.h =================================================================== --- trunk/src/callbacks.h 2006-05-23 14:21:37 UTC (rev 358) +++ trunk/src/callbacks.h 2006-05-23 19:31:09 UTC (rev 359) @@ -562,3 +562,11 @@ void on_run_button_clicked (GtkToolButton *toolbutton, gpointer user_data); + +void +on_find_previous1_activate (GtkMenuItem *menuitem, + gpointer user_data); + +void +on_go_to_line1_activate (GtkMenuItem *menuitem, + gpointer user_data); Modified: trunk/src/interface.c =================================================================== --- trunk/src/interface.c 2006-05-23 14:21:37 UTC (rev 358) +++ trunk/src/interface.c 2006-05-23 19:31:09 UTC (rev 359) @@ -37,7 +37,7 @@ GtkWidget *menuitem1_menu; GtkWidget *menu_new1; GtkWidget *menu_new_with_template1; - GtkWidget *image602; + GtkWidget *image618; GtkWidget *menu_new_with_template1_menu; GtkWidget *invisible2; GtkWidget *separator12; @@ -46,14 +46,14 @@ GtkWidget *menu_save1; GtkWidget *menu_save_as1; GtkWidget *menu_save_all1; - GtkWidget *image603; + GtkWidget *image619; GtkWidget *revert1; GtkWidget *separator21; GtkWidget *preferences2; GtkWidget *separator14; GtkWidget *menu_close1; GtkWidget *menu_close_all1; - GtkWidget *image604; + GtkWidget *image620; GtkWidget *menu_separatormenuitem1; GtkWidget *recent_files1; GtkWidget *recent_files1_menu; @@ -71,11 +71,11 @@ GtkWidget *menu_delete1; GtkWidget *menu_seperator2; GtkWidget *insert_include2; - GtkWidget *image605; + GtkWidget *image621; GtkWidget *insert_include2_menu; GtkWidget *invisible4; GtkWidget *add_comments1; - GtkWidget *image606; + GtkWidget *image622; GtkWidget *add_comments1_menu; GtkWidget *menu_add_changelog_entry1; GtkWidget *insert_file_header1; @@ -89,19 +89,23 @@ GtkWidget *menu_to_upper_case2; GtkWidget *menu_count_words1; GtkWidget *separator9; + GtkWidget *preferences1; + GtkWidget *search1; + GtkWidget *search1_menu; GtkWidget *find1; GtkWidget *find_next1; - GtkWidget *image607; + GtkWidget *find_previous1; GtkWidget *replace1; - GtkWidget *image608; + GtkWidget *image623; GtkWidget *separator11; - GtkWidget *preferences1; + GtkWidget *go_to_line1; + GtkWidget *image624; GtkWidget *menuitem3; GtkWidget *menuitem3_menu; GtkWidget *menu_change_font1; - GtkWidget *image609; + GtkWidget *image625; GtkWidget *menu_choose_color1; - GtkWidget *image610; + GtkWidget *image626; GtkWidget *menu_separator4; GtkWidget *menu_fullscreen1; GtkWidget *menu_show_messages_window1; @@ -228,9 +232,9 @@ gtk_widget_show (menu_new_with_template1); gtk_container_add (GTK_CONTAINER (menuitem1_menu), menu_new_with_template1); - image602 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU); - gtk_widget_show (image602); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_new_with_template1), image602); + image618 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU); + gtk_widget_show (image618); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_new_with_template1), image618); menu_new_with_template1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_new_with_template1), menu_new_with_template1_menu); @@ -265,9 +269,9 @@ gtk_container_add (GTK_CONTAINER (menuitem1_menu), menu_save_all1); gtk_tooltips_set_tip (tooltips, menu_save_all1, _("Saves all open files"), NULL); - image603 = gtk_image_new_from_stock ("gtk-save", GTK_ICON_SIZE_MENU); - gtk_widget_show (image603); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_save_all1), image603); + image619 = gtk_image_new_from_stock ("gtk-save", GTK_ICON_SIZE_MENU); + gtk_widget_show (image619); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_save_all1), image619); revert1 = gtk_image_menu_item_new_from_stock ("gtk-revert-to-saved", accel_group); gtk_widget_show (revert1); @@ -296,9 +300,9 @@ gtk_container_add (GTK_CONTAINER (menuitem1_menu), menu_close_all1); gtk_tooltips_set_tip (tooltips, menu_close_all1, _("Closes all open files"), NULL); - image604 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); - gtk_widget_show (image604); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_close_all1), image604); + image620 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); + gtk_widget_show (image620); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_close_all1), image620); menu_separatormenuitem1 = gtk_separator_menu_item_new (); gtk_widget_show (menu_separatormenuitem1); @@ -370,9 +374,9 @@ gtk_widget_show (insert_include2); gtk_container_add (GTK_CONTAINER (edit1_menu), insert_include2); - image605 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image605); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include2), image605); + image621 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image621); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include2), image621); insert_include2_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert_include2), insert_include2_menu); @@ -384,9 +388,9 @@ gtk_widget_show (add_comments1); gtk_container_add (GTK_CONTAINER (edit1_menu), add_comments1); - image606 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image606); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_comments1), image606); + image622 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image622); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_comments1), image622); add_comments1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (add_comments1), add_comments1_menu); @@ -446,35 +450,50 @@ gtk_container_add (GTK_CONTAINER (edit1_menu), separator9); gtk_widget_set_sensitive (separator9, FALSE); + preferences1 = gtk_image_menu_item_new_from_stock ("gtk-preferences", accel_group); + gtk_widget_show (preferences1); + gtk_container_add (GTK_CONTAINER (edit1_menu), preferences1); + + search1 = gtk_menu_item_new_with_mnemonic (_("_Search")); + gtk_widget_show (search1); + gtk_container_add (GTK_CONTAINER (menubar1), search1); + + search1_menu = gtk_menu_new (); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (search1), search1_menu); + find1 = gtk_image_menu_item_new_from_stock ("gtk-find", accel_group); gtk_widget_show (find1); - gtk_container_add (GTK_CONTAINER (edit1_menu), find1); + gtk_container_add (GTK_CONTAINER (search1_menu), find1); - find_next1 = gtk_image_menu_item_new_with_mnemonic (_("Find _next")); + find_next1 = gtk_menu_item_new_with_mnemonic (_("Find _Next")); gtk_widget_show (find_next1); - gtk_container_add (GTK_CONTAINER (edit1_menu), find_next1); + gtk_container_add (GTK_CONTAINER (search1_menu), find_next1); - image607 = gtk_image_new_from_stock ("gtk-find", GTK_ICON_SIZE_MENU); - gtk_widget_show (image607); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (find_next1), image607); + find_previous1 = gtk_menu_item_new_with_mnemonic (_("Find _Previous")); + gtk_widget_show (find_previous1); + gtk_container_add (GTK_CONTAINER (search1_menu), find_previous1); replace1 = gtk_image_menu_item_new_with_mnemonic (_("_Replace")); gtk_widget_show (replace1); - gtk_container_add (GTK_CONTAINER (edit1_menu), replace1); + gtk_container_add (GTK_CONTAINER (search1_menu), replace1); - image608 = gtk_image_new_from_stock ("gtk-find-and-replace", GTK_ICON_SIZE_MENU); - gtk_widget_show (image608); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (replace1), image608); + image623 = gtk_image_new_from_stock ("gtk-find-and-replace", GTK_ICON_SIZE_MENU); + gtk_widget_show (image623); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (replace1), image623); separator11 = gtk_separator_menu_item_new (); gtk_widget_show (separator11); - gtk_container_add (GTK_CONTAINER (edit1_menu), separator11); + gtk_container_add (GTK_CONTAINER (search1_menu), separator11); gtk_widget_set_sensitive (separator11, FALSE); - preferences1 = gtk_image_menu_item_new_from_stock ("gtk-preferences", accel_group); - gtk_widget_show (preferences1); - gtk_container_add (GTK_CONTAINER (edit1_menu), preferences1); + go_to_line1 = gtk_image_menu_item_new_with_mnemonic (_("_Go to line")); + gtk_widget_show (go_to_line1); + gtk_container_add (GTK_CONTAINER (search1_menu), go_to_line1); + image624 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU); + gtk_widget_show (image624); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line1), image624); + menuitem3 = gtk_menu_item_new_with_mnemonic (_("_View")); gtk_widget_show (menuitem3); gtk_container_add (GTK_CONTAINER (menubar1), menuitem3); @@ -487,18 +506,18 @@ gtk_container_add (GTK_CONTAINER (menuitem3_menu), menu_change_font1); gtk_tooltips_set_tip (tooltips, menu_change_font1, _("Change the default font"), NULL); - image609 = gtk_image_new_from_stock ("gtk-select-font", GTK_ICON_SIZE_MENU); - gtk_widget_show (image609); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_change_font1), image609); + image625 = gtk_image_new_from_stock ("gtk-select-font", GTK_ICON_SIZE_MENU); + gtk_widget_show (image625); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_change_font1), image625); menu_choose_color1 = gtk_image_menu_item_new_with_mnemonic (_("Show Color Chooser")); gtk_widget_show (menu_choose_color1); gtk_container_add (GTK_CONTAINER (menuitem3_menu), menu_choose_color1); gtk_tooltips_set_tip (tooltips, menu_choose_color1, _("Open a color chooser dialog, to interactively pick colors from a palette."), NULL); - image610 = gtk_image_new_from_stock ("gtk-select-color", GTK_ICON_SIZE_MENU); - gtk_widget_show (image610); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_choose_color1), image610); + image626 = gtk_image_new_from_stock ("gtk-select-color", GTK_ICON_SIZE_MENU); + gtk_widget_show (image626); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_choose_color1), image626); menu_separator4 = gtk_separator_menu_item_new (); gtk_widget_show (menu_separator4); @@ -1000,17 +1019,23 @@ g_signal_connect ((gpointer) menu_count_words1, "activate", G_CALLBACK (on_count_words1_activate), NULL); + g_signal_connect ((gpointer) preferences1, "activate", + G_CALLBACK (on_preferences1_activate), + NULL); g_signal_connect ((gpointer) find1, "activate", G_CALLBACK (on_find1_activate), NULL); g_signal_connect ((gpointer) find_next1, "activate", G_CALLBACK (on_find_next1_activate), NULL); + g_signal_connect ((gpointer) find_previous1, "activate", + G_CALLBACK (on_find_previous1_activate), + NULL); g_signal_connect ((gpointer) replace1, "activate", G_CALLBACK (on_replace1_activate), NULL); - g_signal_connect ((gpointer) preferences1, "activate", - G_CALLBACK (on_preferences1_activate), + g_signal_connect ((gpointer) go_to_line1, "activate", + G_CALLBACK (on_go_to_line1_activate), NULL); g_signal_connect ((gpointer) menu_change_font1, "activate", G_CALLBACK (on_change_font1_activate), @@ -1151,7 +1176,7 @@ GLADE_HOOKUP_OBJECT (window1, menuitem1_menu, "menuitem1_menu"); GLADE_HOOKUP_OBJECT (window1, menu_new1, "menu_new1"); GLADE_HOOKUP_OBJECT (window1, menu_new_with_template1, "menu_new_with_template1"); - GLADE_HOOKUP_OBJECT (window1, image602, "image602"); + GLADE_HOOKUP_OBJECT (window1, image618, "image618"); GLADE_HOOKUP_OBJECT (window1, menu_new_with_template1_menu, "menu_new_with_template1_menu"); GLADE_HOOKUP_OBJECT (window1, invisible2, "invisible2"); GLADE_HOOKUP_OBJECT (window1, separator12, "separator12"); @@ -1160,14 +1185,14 @@ GLADE_HOOKUP_OBJECT (window1, menu_save1, "menu_save1"); GLADE_HOOKUP_OBJECT (window1, menu_save_as1, "menu_save_as1"); GLADE_HOOKUP_OBJECT (window1, menu_save_all1, "menu_save_all1"); - GLADE_HOOKUP_OBJECT (window1, image603, "image603"); + GLADE_HOOKUP_OBJECT (window1, image619, "image619"); GLADE_HOOKUP_OBJECT (window1, revert1, "revert1"); GLADE_HOOKUP_OBJECT (window1, separator21, "separator21"); GLADE_HOOKUP_OBJECT (window1, preferences2, "preferences2"); GLADE_HOOKUP_OBJECT (window1, separator14, "separator14"); GLADE_HOOKUP_OBJECT (window1, menu_close1, "menu_close1"); GLADE_HOOKUP_OBJECT (window1, menu_close_all1, "menu_close_all1"); - GLADE_HOOKUP_OBJECT (window1, image604, "image604"); + GLADE_HOOKUP_OBJECT (window1, image620, "image620"); GLADE_HOOKUP_OBJECT (window1, menu_separatormenuitem1, "menu_separatormenuitem1"); GLADE_HOOKUP_OBJECT (window1, recent_files1, "recent_files1"); GLADE_HOOKUP_OBJECT (window1, recent_files1_menu, "recent_files1_menu"); @@ -1185,11 +1210,11 @@ GLADE_HOOKUP_OBJECT (window1, menu_delete1, "menu_delete1"); GLADE_HOOKUP_OBJECT (window1, menu_seperator2, "menu_seperator2"); GLADE_HOOKUP_OBJECT (window1, insert_include2, "insert_include2"); - GLADE_HOOKUP_OBJECT (window1, image605, "image605"); + GLADE_HOOKUP_OBJECT (window1, image621, "image621"); GLADE_HOOKUP_OBJECT (window1, insert_include2_menu, "insert_include2_menu"); GLADE_HOOKUP_OBJECT (window1, invisible4, "invisible4"); GLADE_HOOKUP_OBJECT (window1, add_comments1, "add_comments1"); - GLADE_HOOKUP_OBJECT (window1, image606, "image606"); + GLADE_HOOKUP_OBJECT (window1, image622, "image622"); GLADE_HOOKUP_OBJECT (window1, add_comments1_menu, "add_comments1_menu"); GLADE_HOOKUP_OBJECT (window1, menu_add_changelog_entry1, "menu_add_changelog_entry1"); GLADE_HOOKUP_OBJECT (window1, insert_file_header1, "insert_file_header1"); @@ -1203,19 +1228,23 @@ GLADE_HOOKUP_OBJECT (window1, menu_to_upper_case2, "menu_to_upper_case2"); GLADE_HOOKUP_OBJECT (window1, menu_count_words1, "menu_count_words1"); GLADE_HOOKUP_OBJECT (window1, separator9, "separator9"); + GLADE_HOOKUP_OBJECT (window1, preferences1, "preferences1"); + GLADE_HOOKUP_OBJECT (window1, search1, "search1"); + GLADE_HOOKUP_OBJECT (window1, search1_menu, "search1_menu"); GLADE_HOOKUP_OBJECT (window1, find1, "find1"); GLADE_HOOKUP_OBJECT (window1, find_next1, "find_next1"); - GLADE_HOOKUP_OBJECT (window1, image607, "image607"); + GLADE_HOOKUP_OBJECT (window1, find_previous1, "find_previous1"); GLADE_HOOKUP_OBJECT (window1, replace1, "replace1"); - GLADE_HOOKUP_OBJECT (window1, image608, "image608"); + GLADE_HOOKUP_OBJECT (window1, image623, "image623"); GLADE_HOOKUP_OBJECT (window1, separator11, "separator11"); - GLADE_HOOKUP_OBJECT (window1, preferences1, "preferences1"); + GLADE_HOOKUP_OBJECT (window1, go_to_line1, "go_to_line1"); + GLADE_HOOKUP_OBJECT (window1, image624, "image624"); GLADE_HOOKUP_OBJECT (window1, menuitem3, "menuitem3"); GLADE_HOOKUP_OBJECT (window1, menuitem3_menu, "menuitem3_menu"); GLADE_HOOKUP_OBJECT (window1, menu_change_font1, "menu_change_font1"); - GLADE_HOOKUP_OBJECT (window1, image609, "image609"); + GLADE_HOOKUP_OBJECT (window1, image625, "image625"); GLADE_HOOKUP_OBJECT (window1, menu_choose_color1, "menu_choose_color1"); - GLADE_HOOKUP_OBJECT (window1, image610, "image610"); + GLADE_HOOKUP_OBJECT (window1, image626, "image626"); GLADE_HOOKUP_OBJECT (window1, menu_separator4, "menu_separator4"); GLADE_HOOKUP_OBJECT (window1, menu_fullscreen1, "menu_fullscreen1"); GLADE_HOOKUP_OBJECT (window1, menu_show_messages_window1, "menu_show_messages_window1"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits