[glade] Added search entry next to toolbar
- From: Juan Pablo Ugarte <jpu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glade] Added search entry next to toolbar
- Date: Tue, 12 Mar 2013 22:30:47 +0000 (UTC)
commit 012e5dffefaee2da8a4bf994802df0dad6e95975
Author: Juan Pablo Ugarte <juanpablougarte gmail com>
Date: Sun Mar 10 15:02:18 2013 -0300
Added search entry next to toolbar
src/glade-window.c | 19 ++-
src/glade.glade | 366 ++++++++++++++++++++++++++++------------------------
2 files changed, 212 insertions(+), 173 deletions(-)
---
diff --git a/src/glade-window.c b/src/glade-window.c
index 4f94280..e12acbe 100644
--- a/src/glade-window.c
+++ b/src/glade-window.c
@@ -144,6 +144,7 @@ struct _GladeWindowPrivate
GtkWidget *toolbar; /* Actions are added to the toolbar */
gint actions_start; /* start of action items */
+ GtkEntry *search_entry;
GtkWidget *center_pane;
/* paned windows that tools get docked into/out of */
@@ -1612,6 +1613,7 @@ on_notebook_switch_page (GtkNotebook *notebook,
GladeProject *project;
GtkAction *action;
gchar *action_name;
+ GtkWidget *inspector;
view = GLADE_DESIGN_VIEW (gtk_notebook_get_nth_page (notebook, page_num));
@@ -1628,18 +1630,26 @@ on_notebook_switch_page (GtkNotebook *notebook,
set_sensitivity_according_to_project (window, project);
+ /* unset search entry */
+ inspector = gtk_notebook_get_nth_page (GTK_NOTEBOOK (priv->inspectors_notebook),
+ gtk_notebook_get_current_page (GTK_NOTEBOOK
(priv->inspectors_notebook)));
+ glade_inspector_set_search_entry (GLADE_INSPECTOR (inspector), NULL);
+ gtk_entry_set_text (priv->search_entry, "");
+
/* switch to the project's inspector/palette */
gtk_notebook_set_current_page (GTK_NOTEBOOK
(priv->inspectors_notebook), page_num);
gtk_notebook_set_current_page (GTK_NOTEBOOK
(priv->palettes_notebook), page_num);
+ /* Set search entry */
+ inspector = gtk_notebook_get_nth_page (GTK_NOTEBOOK (priv->inspectors_notebook), page_num);
+ glade_inspector_set_search_entry (GLADE_INSPECTOR (inspector), priv->search_entry);
/* activate the corresponding item in the project menu */
action_name = g_strdup_printf ("Tab_%d", page_num);
- action =
- gtk_action_group_get_action (priv->projects_list_menu_actions,
- action_name);
+ action = gtk_action_group_get_action (priv->projects_list_menu_actions,
+ action_name);
/* sometimes the action doesn't exist yet, and the proper action
* is set active during the documents list menu creation
@@ -3079,6 +3089,7 @@ glade_window_constructed (GObject *object)
glade_editor_hide_class_field (priv->editor);
priv->statusbar = GET_OBJECT (builder, GTK_WIDGET, "statusbar");
priv->toolbar = GET_OBJECT (builder, GTK_WIDGET, "toolbar");
+ priv->search_entry = GET_OBJECT (builder, GTK_ENTRY, "search_entry");
priv->project_menu = GET_OBJECT (builder, GTK_MENU_SHELL, "project_menu");
priv->undo = GET_OBJECT (builder, GTK_TOOL_ITEM, "undo_toolbutton");
@@ -3165,7 +3176,7 @@ glade_window_constructed (GObject *object)
/* Create GladeApp singleton, this will load all catalogs */
priv->app = glade_app_new ();
glade_app_set_window (GTK_WIDGET (window));
-
+
/* Clipboard signals */
g_signal_connect (G_OBJECT (glade_app_get_clipboard ()),
"notify::has-selection",
diff --git a/src/glade.glade b/src/glade.glade
index a4b3606..1f4b120 100644
--- a/src/glade.glade
+++ b/src/glade.glade
@@ -808,189 +808,217 @@ Andreas Nilsson <andreas andreasn se></property>
</packing>
</child>
<child>
- <object class="GtkToolbar" id="toolbar">
+ <object class="GtkBox" id="toolbar_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkToolButton" id="new_toolbutton">
- <property name="related_action">new_action</property>
+ <object class="GtkToolbar" id="toolbar">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="no">toolbutton1</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="open_toolbutton">
- <property name="related_action">open_action</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="no">toolbutton2</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="save_toolbutton">
- <property name="related_action">save_action</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="no">toolbutton3</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkSeparatorToolItem" id="toolbutton1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- <packing>
- <property name="expand">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkMenuToolButton" id="undo_toolbutton">
- <property name="related_action">undo_action</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="no">toolbutton2</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkMenuToolButton" id="redo_toolbutton">
- <property name="related_action">redo_action</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="no">toolbutton3</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkSeparatorToolItem" id="toolbutton4">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- <packing>
- <property name="expand">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="cut_toolbutton">
- <property name="related_action">cut_action</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="no">toolbutton5</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="copy_toolbutton">
- <property name="related_action">copy_action</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="no">toolbutton6</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="paste_toolbutton">
- <property name="related_action">paste_action</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="no">toolbutton7</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkSeparatorToolItem" id="toolbutton2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToggleToolButton" id="selector_button">
- <property name="related_action">selector_radioaction</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="no">radiotoolbutton1</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToggleToolButton" id="drag_resize_button">
- <property name="related_action">drag_resize_radioaction</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="no">radiotoolbutton2</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToggleToolButton" id="margin_edit_button">
- <property name="related_action">margin_edit_radioaction</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="no">radiotoolbutton3</property>
- <property name="use_underline">True</property>
+ <child>
+ <object class="GtkToolButton" id="new_toolbutton">
+ <property name="related_action">new_action</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">toolbutton1</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="open_toolbutton">
+ <property name="related_action">open_action</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">toolbutton2</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="save_toolbutton">
+ <property name="related_action">save_action</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">toolbutton3</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSeparatorToolItem" id="toolbutton1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkMenuToolButton" id="undo_toolbutton">
+ <property name="related_action">undo_action</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">toolbutton2</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkMenuToolButton" id="redo_toolbutton">
+ <property name="related_action">redo_action</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">toolbutton3</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSeparatorToolItem" id="toolbutton4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="cut_toolbutton">
+ <property name="related_action">cut_action</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">toolbutton5</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="copy_toolbutton">
+ <property name="related_action">copy_action</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">toolbutton6</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="paste_toolbutton">
+ <property name="related_action">paste_action</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">toolbutton7</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSeparatorToolItem" id="toolbutton2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToggleToolButton" id="selector_button">
+ <property name="related_action">selector_radioaction</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">radiotoolbutton1</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToggleToolButton" id="drag_resize_button">
+ <property name="related_action">drag_resize_radioaction</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">radiotoolbutton2</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToggleToolButton" id="margin_edit_button">
+ <property name="related_action">margin_edit_radioaction</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">radiotoolbutton3</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToggleToolButton" id="align_edit_button">
+ <property name="related_action">align_edit_radioaction</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">radiotoolbutton4</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkToggleToolButton" id="align_edit_button">
- <property name="related_action">align_edit_radioaction</property>
+ <object class="GtkEntry" id="search_entry">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="no">radiotoolbutton4</property>
- <property name="use_underline">True</property>
+ <property name="can_focus">True</property>
+ <property name="valign">end</property>
+ <property name="invisible_char">●</property>
+ <property name="width_chars">20</property>
+ <property name="placeholder_text">< search widgets ></property>
</object>
<packing>
<property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="fill">True</property>
+ <property name="padding">2</property>
+ <property name="pack_type">end</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
