[anjuta/gsettings-migration] search: Simply removed preferences and as such gconf is gone
- From: Johannes Schmid <jhs src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [anjuta/gsettings-migration] search: Simply removed preferences and as such gconf is gone
- Date: Sat, 2 Oct 2010 13:26:29 +0000 (UTC)
commit 694fab63047138d3a5b9cc651e2ec689f954337c
Author: Johannes Schmid <jhs gnome org>
Date: Sat Oct 2 15:26:08 2010 +0200
search: Simply removed preferences and as such gconf is gone
The preferences weren't really useful, I doubt somebody used them
plugins/search/Makefile.am | 4 +-
plugins/search/anjuta-search.ui | 337 +++++----------------
plugins/search/search-replace.c | 30 +--
plugins/search/search-replace.h | 5 -
plugins/search/search_preferences.c | 587 -----------------------------------
plugins/search/search_preferences.h | 27 --
6 files changed, 77 insertions(+), 913 deletions(-)
---
diff --git a/plugins/search/Makefile.am b/plugins/search/Makefile.am
index ae5482e..056376e 100644
--- a/plugins/search/Makefile.am
+++ b/plugins/search/Makefile.am
@@ -38,9 +38,7 @@ libanjuta_search_la_SOURCES= \
search-replace.c \
search-replace.h \
search-replace_backend.c \
- search-replace_backend.h \
- search_preferences.c \
- search_preferences.h
+ search-replace_backend.h
EXTRA_DIST = \
$(plugin_in_files) \
diff --git a/plugins/search/anjuta-search.ui b/plugins/search/anjuta-search.ui
index 4966efa..d3d6a1e 100644
--- a/plugins/search/anjuta-search.ui
+++ b/plugins/search/anjuta-search.ui
@@ -1,71 +1,11 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk+" version="2.16"/>
<!-- interface-naming-policy toplevel-contextual -->
- <object class="GtkAdjustment" id="adjustment1">
- <property name="value">100</property>
- <property name="lower">1</property>
- <property name="upper">400</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
- <object class="GtkListStore" id="model1">
- <columns>
- <!-- column-name gchararray -->
- <column type="gchararray"/>
- </columns>
- <data>
- <row>
- <col id="0">$(module.source.files) $(module.include.files)</col>
- </row>
- </data>
- </object>
- <object class="GtkListStore" id="model2">
- <columns>
- <!-- column-name gchararray -->
- <column type="gchararray"/>
- </columns>
- <data>
- <row>
- <col id="0">CVS</col>
- </row>
- <row>
- <col id="0">CVS intl po </col>
- </row>
- </data>
- </object>
- <object class="GtkListStore" id="model3">
- <columns>
- <!-- column-name gchararray -->
- <column type="gchararray"/>
- </columns>
- <data>
- <row>
- <col id="0">*.so *.o *.a *.la</col>
- </row>
- </data>
- </object>
- <object class="GtkListStore" id="model4">
- <columns>
- <!-- column-name gchararray -->
- <column type="gchararray"/>
- </columns>
- <data>
- <row>
- <col id="0">*\.*</col>
- </row>
- <row>
- <col id="0">*.c *.cpp *.cxx *.cc *.C *.h *.H *.hh *.hxx *.hpp</col>
- </row>
- <row>
- <col id="0">*.cpp *.cxx *.cc *.C *.h *.H *.hh *.hxx *.hpp Makefile.am configure.* README AUTHORS ChangeLog *.m4</col>
- </row>
- </data>
- </object>
<object class="GtkWindow" id="dialog.search.replace">
<property name="title" translatable="yes">Find & Replace</property>
- <signal name="key_press_event" handler="on_search_dialog_key_press_event" object="dialog.search.replace" after="yes"/>
- <signal name="delete_event" handler="on_search_replace_delete_event"/>
+ <signal name="key-press-event" handler="on_search_dialog_key_press_event" object="dialog.search.replace" after="yes" swapped="yes"/>
+ <signal name="delete-event" handler="on_search_replace_delete_event" swapped="no"/>
<child>
<object class="GtkFrame" id="frame9">
<property name="visible">True</property>
@@ -213,7 +153,7 @@
<property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_search_full_buffer_toggled"/>
+ <signal name="toggled" handler="on_search_full_buffer_toggled" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -230,7 +170,7 @@
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
<property name="group">search.full_buffer</property>
- <signal name="toggled" handler="on_search_forward_toggled"/>
+ <signal name="toggled" handler="on_search_forward_toggled" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -247,7 +187,7 @@
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
<property name="group">search.full_buffer</property>
- <signal name="toggled" handler="on_search_backward_toggled"/>
+ <signal name="toggled" handler="on_search_backward_toggled" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -292,7 +232,7 @@
<property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_search_match_word_start_toggled"/>
+ <signal name="toggled" handler="on_search_match_word_start_toggled" swapped="no"/>
</object>
<packing>
<property name="left_attach">1</property>
@@ -312,7 +252,7 @@
<property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_search_match_whole_line_toggled"/>
+ <signal name="toggled" handler="on_search_match_whole_line_toggled" swapped="no"/>
</object>
<packing>
<property name="left_attach">1</property>
@@ -349,7 +289,7 @@
<property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_search_match_whole_word_toggled"/>
+ <signal name="toggled" handler="on_search_match_whole_word_toggled" swapped="no"/>
</object>
<packing>
<property name="top_attach">2</property>
@@ -384,7 +324,7 @@
<property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_search_regex_toggled"/>
+ <signal name="toggled" handler="on_search_regex_toggled" swapped="no"/>
</object>
<packing>
<property name="x_options">GTK_FILL</property>
@@ -550,7 +490,7 @@
<property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
- <signal name="clicked" handler="on_actions_no_limit_clicked"/>
+ <signal name="clicked" handler="on_actions_no_limit_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -892,193 +832,6 @@
<property name="tab_fill">False</property>
</packing>
</child>
- <child>
- <object class="GtkFrame" id="frame.setting">
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
- <child>
- <object class="GtkVBox" id="vbox1124">
- <property name="visible">True</property>
- <property name="border_width">5</property>
- <child>
- <object class="GtkFrame" id="frame54">
- <property name="visible">True</property>
- <property name="border_width">3</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
- <child>
- <object class="GtkCheckButton" id="search.basic">
- <property name="label" translatable="yes">Basic Search & Replace</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_setting_basic_search_toggled"/>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkFrame" id="frame55">
- <property name="visible">True</property>
- <property name="border_width">3</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
- <child>
- <object class="GtkVBox" id="vbox1126">
- <property name="visible">True</property>
- <child>
- <object class="GtkHBox" id="hbox1126">
- <property name="visible">True</property>
- <property name="border_width">3</property>
- <property name="spacing">3</property>
- <child>
- <object class="GtkScrolledWindow" id="scrolledwindow27">
- <property name="height_request">100</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
- <property name="shadow_type">in</property>
- <child>
- <object class="GtkTreeView" id="setting.pref.treeview">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkVBox" id="vbox1125">
- <property name="visible">True</property>
- <child>
- <object class="GtkLabel" id="label12343">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="label" translatable="yes">New Name:</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="padding">5</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="setting.pref.entry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox1129">
- <property name="visible">True</property>
- <property name="border_width">3</property>
- <property name="spacing">10</property>
- <property name="homogeneous">True</property>
- <child>
- <object class="GtkButton" id="setting.pref.add">
- <property name="label">gtk-add</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_stock">True</property>
- <signal name="clicked" handler="on_setting_pref_add_clicked"/>
- </object>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="setting.pref.remove">
- <property name="label">gtk-remove</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_stock">True</property>
- <signal name="clicked" handler="on_setting_pref_remove_clicked"/>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="setting.pref.modify">
- <property name="label" translatable="yes">Modify</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <signal name="clicked" handler="on_setting_pref_modify_clicked"/>
- </object>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- <child type="tab">
- <object class="GtkLabel" id="label12342">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Setting</property>
- </object>
- <packing>
- <property name="position">2</property>
- <property name="tab_fill">False</property>
- </packing>
- </child>
</object>
</child>
</object>
@@ -1100,7 +853,7 @@
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- <signal name="clicked" handler="on_search_button_close_clicked"/>
+ <signal name="clicked" handler="on_search_button_close_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -1116,7 +869,7 @@
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- <signal name="clicked" handler="on_search_button_stop_clicked"/>
+ <signal name="clicked" handler="on_search_button_stop_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -1132,7 +885,7 @@
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- <signal name="clicked" handler="on_search_button_next_clicked"/>
+ <signal name="clicked" handler="on_search_button_next_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -1148,7 +901,7 @@
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- <signal name="clicked" handler="on_search_button_jump_clicked"/>
+ <signal name="clicked" handler="on_search_button_jump_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -1166,4 +919,64 @@
</object>
</child>
</object>
+ <object class="GtkListStore" id="model4">
+ <columns>
+ <!-- column-name gchararray -->
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0">*\.*</col>
+ </row>
+ <row>
+ <col id="0">*.c *.cpp *.cxx *.cc *.C *.h *.H *.hh *.hxx *.hpp</col>
+ </row>
+ <row>
+ <col id="0">*.cpp *.cxx *.cc *.C *.h *.H *.hh *.hxx *.hpp Makefile.am configure.* README AUTHORS ChangeLog *.m4</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkListStore" id="model3">
+ <columns>
+ <!-- column-name gchararray -->
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0">*.so *.o *.a *.la</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkListStore" id="model2">
+ <columns>
+ <!-- column-name gchararray -->
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0">CVS</col>
+ </row>
+ <row>
+ <col id="0">CVS intl po </col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkListStore" id="model1">
+ <columns>
+ <!-- column-name gchararray -->
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0">$(module.source.files) $(module.include.files)</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkAdjustment" id="adjustment1">
+ <property name="lower">1</property>
+ <property name="upper">400</property>
+ <property name="value">100</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
</interface>
diff --git a/plugins/search/search-replace.c b/plugins/search/search-replace.c
index 91fa836..0907e05 100644
--- a/plugins/search/search-replace.c
+++ b/plugins/search/search-replace.c
@@ -36,7 +36,6 @@
#include "search-replace_backend.h"
#include "search-replace.h"
-#include "search_preferences.h"
#include <libanjuta/interfaces/ianjuta-project-manager.h>
#include <glib/gi18n.h>
@@ -163,8 +162,6 @@ static GladeWidget glade_widgets[] = {
{GE_COMBO_ENTRY, "replace.string.combo", NULL, NULL},
/* ACTIONS_MAX */
{GE_TEXT, "actions.max", NULL, NULL},
- /* SETTING_PREF_ENTRY */
- {GE_TEXT, "setting.pref.entry", NULL, NULL},
/* SEARCH_REGEX */
{GE_BOOLEAN, "search.regex", NULL, NULL},
/* GREEDY */
@@ -195,8 +192,6 @@ static GladeWidget glade_widgets[] = {
{GE_BOOLEAN, "search.forward", NULL, NULL},
/* SEARCH_BACKWARD */
{GE_BOOLEAN, "search.backward", NULL, NULL},
- /* SEARCH_BASIC */
- {GE_BOOLEAN, "search.basic", NULL, NULL},
/* SEARCH_STRING_COMBO */
{GE_COMBO, "search.string.combo", NULL, NULL},
/* SEARCH_TARGET_COMBO */
@@ -217,8 +212,6 @@ static GladeWidget glade_widgets[] = {
{GE_COMBO, "replace.string.combo", NULL, NULL},
/* SEARCH_DIRECTION_COMBO */
{GE_COMBO, "search.direction.combo", search_direction_strings, NULL},
- /* SETTING_PREF_TREEVIEW */
- {GE_NONE, "setting.pref.treeview", NULL, NULL},
{GE_NONE, NULL, NULL, NULL}
};
@@ -255,7 +248,7 @@ static void search_set_toggle_direction(SearchDirection dir);
static void search_disconnect_set_toggle_connect(GladeWidgetId id,
GCallback function, gboolean active);
static void search_replace_next_previous(SearchDirection dir);
-static void basic_search_toggled(void);
+
static SearchReplaceGUI *sg = NULL;
@@ -1213,8 +1206,6 @@ search_replace_populate(void)
populate_value(SEARCH_TARGET_COMBO, &(sr->search.range.type));
populate_value(SEARCH_DIRECTION_COMBO, &(sr->search.range.direction));
populate_value(ACTIONS_NO_LIMIT, &(sr->search.expr.no_limit));
-
- populate_value(SEARCH_BASIC, &(sr->search.basic_search));
if (sr->search.expr.no_limit)
sr->search.expr.actions_max = G_MAXINT;
@@ -1348,9 +1339,6 @@ create_dialog(void)
g_signal_connect (widget, "changed", G_CALLBACK (on_search_target_changed), NULL);
- search_preferences_initialize_setting_treeview(sg->dialog);
- search_preferences_init();
-
gtk_builder_connect_signals (sg->bxml, NULL);
return TRUE;
}
@@ -1509,14 +1497,9 @@ search_update_dialog(void)
widget = sr_get_gladewidget(SEARCH_TARGET_COMBO)->widget;
search_select_item (GTK_COMBO_BOX(widget), s->range.type);
-
- widget = sr_get_gladewidget(SEARCH_BASIC)->widget;
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), s->basic_search);
widget = sr_get_gladewidget(STOP_BUTTON)->widget;
gtk_widget_set_sensitive (widget, FALSE);
-
- basic_search_toggled();
}
/* -------------- Callbacks --------------------- */
@@ -1987,17 +1970,6 @@ on_setting_basic_search_toggled (GtkToggleButton *togglebutton,
gtk_widget_hide(frame_basic);
}
-
-static void
-basic_search_toggled(void)
-{
- GtkToggleButton *togglebutton;
-
- togglebutton = GTK_TOGGLE_BUTTON(sr_get_gladewidget(SEARCH_BASIC)->widget);
-
- on_setting_basic_search_toggled (togglebutton, NULL);
-}
-
/***********************************************************************/
#define MAX_LENGTH_SEARCH 64
diff --git a/plugins/search/search-replace.h b/plugins/search/search-replace.h
index afe19da..ae40696 100644
--- a/plugins/search/search-replace.h
+++ b/plugins/search/search-replace.h
@@ -57,7 +57,6 @@ typedef enum _GladeWidgetId
UNMATCH_DIRS,
REPLACE_STRING,
ACTIONS_MAX,
- SETTING_PREF_ENTRY,
/* Checkboxes */
SEARCH_REGEX,
@@ -75,7 +74,6 @@ typedef enum _GladeWidgetId
SEARCH_FULL_BUFFER,
SEARCH_FORWARD,
SEARCH_BACKWARD,
- SEARCH_BASIC,
/* Combo boxes */
SEARCH_STRING_COMBO,
@@ -88,9 +86,6 @@ typedef enum _GladeWidgetId
UNMATCH_DIRS_COMBO,
REPLACE_STRING_COMBO,
SEARCH_DIRECTION_COMBO,
-
- /* Treeview */
- SETTING_PREF_TREEVIEW
} GladeWidgetId;
void search_and_replace_init (IAnjutaDocumentManager* dm);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
