Group search related code

git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@698 ea778897-0a13-0410-b9d1-a72fbfd435f5

ChangeLog

+2006-08-11  Nick Treleaven  <nick.treleaven@btinternet.com>
+
+ * src/keybindings.c, src/geany.h, src/callbacks.c, src/callbacks.h,
+   src/search.c, src/search.h, src/dialogs.c, src/main.c,
+   src/dialogs.h: Group search related code.
+
+
 2006-08-11  Enrico Tröger  <enrico.troeger@uvena.de>
 
  * src/document.c:

src/callbacks.h

@@ -20,14 +20,6 @@
  * $Id$
  */
 
-enum {
-	GEANY_RESPONSE_REPLACE = 1,
-	GEANY_RESPONSE_REPLACE_ALL,
-	GEANY_RESPONSE_REPLACE_SEL,
-	GEANY_RESPONSE_FIND
-};
-
-
 extern gchar current_word[]; //needed for popup menu keybindings access
 
 void
@@ -386,36 +378,14 @@ void
 on_find_previous1_activate             (GtkMenuItem     *menuitem,
                                         gpointer         user_data);
 
-void on_find_replace_checkbutton_toggled (GtkToggleButton *togglebutton,
-										  gpointer user_data);
-
-void
-on_find_dialog_response                (GtkDialog *dialog,
-                                        gint response,
-                                        gpointer user_data);
-
-void
-on_find_entry_activate                 (GtkEntry        *entry,
-                                        gpointer         user_data);
-
 void
-on_replace_dialog_response                (GtkDialog *dialog,
-                                        gint response,
-                                        gpointer user_data);
-
-void
-on_replace_entry_activate                 (GtkEntry        *entry,
+on_replace1_activate                   (GtkMenuItem     *menuitem,
                                         gpointer         user_data);
 
 void
 on_find_in_files1_activate             (GtkMenuItem     *menuitem,
                                         gpointer         user_data);
 
-void
-on_find_in_files_dialog_response       (GtkDialog *dialog,
-                                        gint response,
-                                        gpointer user_data);
-
 void
 on_new_with_template                   (GtkMenuItem     *menuitem,
                                         gpointer         user_data);
@@ -521,10 +491,6 @@ void
 on_file_open_check_hidden_toggled      (GtkToggleButton *togglebutton,
                                         gpointer         user_data);
 
-void
-on_replace1_activate                   (GtkMenuItem     *menuitem,
-                                        gpointer         user_data);
-
 void
 on_tv_notebook_switch_page             (GtkNotebook     *notebook,
                                         GtkNotebookPage *page,

src/dialogs.h

@@ -49,12 +49,6 @@ GtkWidget *dialogs_create_build_menu_tex(gint idx);
 
 void dialogs_show_make_target(void);
 
-void dialogs_show_find(void);
-
-void dialogs_show_replace(void);
-
-void dialogs_show_find_in_files(void);
-
 void dialogs_show_goto_line(void);
 
 void dialogs_show_includes_arguments_gen(void);

src/geany.h

@@ -189,7 +189,6 @@ typedef struct MyApp
 	gchar				*configdir;
 	gchar				*datadir;
 	gchar				*docdir;
-	gchar				*search_text;
 	gchar				 build_make_custopt[256];
 	gchar				*tools_browser_cmd;
 	gchar				*tools_make_cmd;
@@ -222,9 +221,6 @@ typedef struct MyApp
 	GtkWidget			*open_filesel;
 	GtkWidget			*save_filesel;
 	GtkWidget			*prefs_dialog;
-	GtkWidget			*find_dialog;
-	GtkWidget			*replace_dialog;
-	GtkWidget			*find_in_files_dialog;
 	GtkWidget			*default_tag_tree;
 	const TMWorkspace	*tm_workspace;
 	GQueue				*recent_queue;

src/keybindings.c

@@ -29,7 +29,6 @@
 #include "utils.h"
 #include "document.h"
 #include "callbacks.h"
-#include "dialogs.h"
 #include "prefs.h"
 #include "msgwindow.h"
 #include "sci_cb.h"
@@ -411,7 +410,7 @@ static void cb_func_menu_new(void)
 
 static void cb_func_menu_open(void)
 {
-	dialogs_show_open_file();
+	on_open1_activate(NULL, NULL);
 }
 
 static void cb_func_menu_save(void)
@@ -456,7 +455,7 @@ static void cb_func_menu_selectall(void)
 
 static void cb_func_menu_preferences(void)
 {
-	dialogs_show_prefs_dialog();
+	on_preferences1_activate(NULL, NULL);
 }
 
 static void cb_func_menu_findnext(void)
@@ -471,12 +470,12 @@ static void cb_func_menu_findprevious(void)
 
 static void cb_func_menu_replace(void)
 {
-	dialogs_show_replace();
+	on_replace1_activate(NULL, NULL);
 }
 
 static void cb_func_menu_findinfiles(void)
 {
-	dialogs_show_find_in_files();
+	on_find_in_files1_activate(NULL, NULL);
 }
 
 static void cb_func_menu_gotoline(void)

src/main.c

@@ -49,6 +49,7 @@
 #include "notebook.h"
 #include "keybindings.h"
 #include "sci_cb.h"
+#include "search.h"
 
 #ifdef HAVE_VTE
 # include "vte.h"
@@ -222,15 +223,11 @@ static void main_init(void)
 	else
 		app->configdir = g_strconcat(GEANY_HOME_DIR, G_DIR_SEPARATOR_S, ".", PACKAGE, NULL);
 	app->window				= NULL;
-	app->search_text		= NULL;
 	app->open_fontsel		= NULL;
 	app->open_colorsel		= NULL;
 	app->open_filesel		= NULL;
 	app->save_filesel		= NULL;
 	app->prefs_dialog		= NULL;
-	app->find_dialog		= NULL;
-	app->replace_dialog		= NULL;
-	app->find_in_files_dialog = NULL;
 	app->default_tag_tree	= NULL;
 	app->main_window_realized= FALSE;
 	app->tab_order_ltr		= FALSE;
@@ -323,6 +320,8 @@ static void main_init(void)
 	msgwindow.tree_status = lookup_widget(app->window, "treeview3");
 	msgwindow.tree_msg = lookup_widget(app->window, "treeview4");
 	msgwindow.tree_compiler = lookup_widget(app->window, "treeview5");
+
+	search_init();
 }
 
 

src/search.h

@@ -28,6 +28,26 @@ typedef enum
 	FIF_INVERT_MATCH	= 1 << 2
 } fif_options;
 
+// the flags given in the search dialog(stored statically for "find next" and "replace")
+typedef struct
+{
+	gchar		*text;
+	gint		flags;
+	gboolean	backwards;
+} GeanySearchData;
+
+extern GeanySearchData search_data;
+
+
+void search_init();
+
+void search_finalise();
+
+void search_show_find_dialog();
+
+void search_show_replace_dialog();
+
+void search_show_find_in_files_dialog();
 
 gboolean search_find_in_files(const gchar *search_text, const gchar *dir, fif_options opts);