[glade/composite-templates-new: 3/7] GladeWindow: Remove references of the moved search entry.
- From: Tristan Van Berkom <tvb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glade/composite-templates-new: 3/7] GladeWindow: Remove references of the moved search entry.
- Date: Sun, 7 Apr 2013 16:40:50 +0000 (UTC)
commit 5ea71916a5112acd67d75d0b873a323e15ead726
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date: Mon Apr 8 01:30:38 2013 +0900
GladeWindow: Remove references of the moved search entry.
src/glade-window.c | 22 +---
src/glade.glade | 366 ++++++++++++++++++++++++----------------------------
2 files changed, 173 insertions(+), 215 deletions(-)
---
diff --git a/src/glade-window.c b/src/glade-window.c
index 280c61a..fb6c4de 100644
--- a/src/glade-window.c
+++ b/src/glade-window.c
@@ -150,7 +150,6 @@ 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 */
@@ -1179,6 +1178,9 @@ do_save (GladeWindow *window, GladeProject *project, const gchar *path)
return FALSE;
}
+ /* Cancel any queued autosave when explicitly saving */
+ project_cancel_autosave (project);
+
g_free (display_path);
return TRUE;
}
@@ -1555,10 +1557,7 @@ do_close (GladeWindow *window, GladeProject *project)
glade_window_notebook_tabs_update (window);
if (!glade_app_get_projects ())
- {
- gtk_widget_hide (priv->center_pane);
- gtk_widget_set_sensitive (GTK_WIDGET (priv->search_entry), FALSE);
- }
+ gtk_widget_hide (priv->center_pane);
}
void
@@ -1703,7 +1702,6 @@ 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));
@@ -1720,20 +1718,10 @@ on_notebook_switch_page (GtkNotebook *notebook,
set_sensitivity_according_to_project (window, project);
- /* unset search entry */
- inspector = gtk_notebook_get_nth_page (priv->inspectors_notebook,
- gtk_notebook_get_current_page (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 (priv->inspectors_notebook, page_num);
gtk_notebook_set_current_page (priv->palettes_notebook, page_num);
- /* Set search entry */
- inspector = gtk_notebook_get_nth_page (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,
@@ -2502,7 +2490,6 @@ add_project (GladeWindow *window, GladeProject *project, gboolean for_file)
gtk_widget_show (priv->center_pane);
gtk_widget_show (GTK_WIDGET (priv->editor));
- gtk_widget_set_sensitive (GTK_WIDGET (priv->search_entry), TRUE);
}
void
@@ -3191,7 +3178,6 @@ glade_window_constructed (GObject *object)
priv->editor = GET_OBJECT (builder, GLADE_EDITOR, "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");
diff --git a/src/glade.glade b/src/glade.glade
index bf337be..6d94a2a 100644
--- a/src/glade.glade
+++ b/src/glade.glade
@@ -829,217 +829,189 @@ Andreas Nilsson <andreas andreasn se></property>
</packing>
</child>
<child>
- <object class="GtkBox" id="toolbar_box">
+ <object class="GtkToolbar" id="toolbar">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkToolbar" id="toolbar">
+ <object class="GtkToolButton" id="new_toolbutton">
+ <property name="related_action">new_action</property>
<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>
- <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>
+ <property name="label">toolbutton1</property>
+ <property name="use_underline">True</property>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
</packing>
</child>
<child>
- <object class="GtkEntry" id="search_entry">
+ <object class="GtkToolButton" id="open_toolbutton">
+ <property name="related_action">open_action</property>
<property name="visible">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>
+ <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="fill">True</property>
- <property name="padding">2</property>
- <property name="pack_type">end</property>
- <property name="position">1</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>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]