[gedit] tools, snippets: join toolbar with scrolledwindow
- From: Ignacio Casal Quinteiro <icq src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gedit] tools, snippets: join toolbar with scrolledwindow
- Date: Fri, 29 Jul 2011 10:28:19 +0000 (UTC)
commit 3b877f8bd374142f8f2172b42e7e5faf87f77285
Author: Ignacio Casal Quinteiro <icq gnome org>
Date: Fri Jul 29 12:28:53 2011 +0200
tools, snippets: join toolbar with scrolledwindow
plugins/externaltools/tools/manager.py | 14 ++-
plugins/snippets/snippets/manager.py | 6 +
plugins/snippets/snippets/snippets.ui | 197 ++++++++++++++++----------------
3 files changed, 114 insertions(+), 103 deletions(-)
---
diff --git a/plugins/externaltools/tools/manager.py b/plugins/externaltools/tools/manager.py
index b3bc39b..17b3b5a 100644
--- a/plugins/externaltools/tools/manager.py
+++ b/plugins/externaltools/tools/manager.py
@@ -295,15 +295,21 @@ class Manager:
self.ui.add_from_file(os.path.join(self.datadir, 'ui', 'tools.ui'))
self.ui.connect_signals(callbacks)
self.dialog = self.ui.get_object('tool-manager-dialog')
-
- self.view = self.ui.get_object('view')
-
+
+ self.view = self['view']
+
self.__init_tools_model()
self.__init_tools_view()
+ # join treeview and toolbar
+ context = self['scrolled_window1'].get_style_context()
+ context.set_junction_sides(Gtk.JunctionSides.BOTTOM)
+ context = self['toolbar1'].get_style_context()
+ context.set_junction_sides(Gtk.JunctionSides.TOP)
+
for name in ['input', 'output', 'applicability', 'save-files']:
self.__init_combobox(name)
-
+
self.do_update()
def expand_from_doc(self, doc):
diff --git a/plugins/snippets/snippets/manager.py b/plugins/snippets/snippets/manager.py
index 0ab6772..0736691 100644
--- a/plugins/snippets/snippets/manager.py
+++ b/plugins/snippets/snippets/manager.py
@@ -299,6 +299,12 @@ class Manager(Gtk.Dialog, Gtk.Buildable):
self.build_tree_view()
self.build_model()
+ # join treeview and toolbar
+ context = self['scrolled_window_snippets'].get_style_context()
+ context.set_junction_sides(Gtk.JunctionSides.BOTTOM)
+ context = self['toolbar'].get_style_context()
+ context.set_junction_sides(Gtk.JunctionSides.TOP)
+
source_view = self['source_view_snippet']
manager = get_language_manager()
lang = manager.get_language('snippets')
diff --git a/plugins/snippets/snippets/snippets.ui b/plugins/snippets/snippets/snippets.ui
index ea574c0..bcb1d52 100644
--- a/plugins/snippets/snippets/snippets.ui
+++ b/plugins/snippets/snippets/snippets.ui
@@ -121,29 +121,28 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkBox" id="box1">
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Snippets:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">tree_view_snippets</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="label1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Snippets:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">tree_view_snippets</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
<child>
<object class="GtkScrolledWindow" id="scrolled_window_snippets">
<property name="visible">True</property>
@@ -165,95 +164,95 @@
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolbar" id="toolbar">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="toolbar_style">icons</property>
- <property name="icon-size">1</property>
- <style>
- <class name="inline-toolbar"/>
- </style>
- <child>
- <object class="GtkToolButton" id="add_snippet_button">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip_markup" translatable="yes">Create new snippet</property>
- <property name="tooltip_text" translatable="yes">Create new snippet</property>
- <property name="related_action">add_snippet_action</property>
- <property name="use_action_appearance">False</property>
- <property name="label" translatable="yes">Add Snippet</property>
- <property name="use_underline">True</property>
- <property name="icon_name">list-add-symbolic</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="remove_snippet_button">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip_markup" translatable="yes">Delete selected snippet</property>
- <property name="tooltip_text" translatable="yes">Delete selected snippet</property>
- <property name="related_action">remove_snippet_action</property>
- <property name="use_action_appearance">False</property>
- <property name="label" translatable="yes">Remove Snippet</property>
- <property name="use_underline">True</property>
- <property name="icon_name">list-remove-symbolic</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="import_snippets_button">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip_markup" translatable="yes">Import snippets</property>
- <property name="tooltip_text" translatable="yes">Import snippets</property>
- <property name="related_action">import_snippets_action</property>
- <property name="use_action_appearance">False</property>
- <property name="label" translatable="yes">Import Snippets</property>
- <property name="use_underline">True</property>
- <property name="icon_name">document-open-symbolic</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkToolButton" id="export_snippets_button">
+ <object class="GtkToolbar" id="toolbar">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip_markup" translatable="yes">Export selected snippets</property>
- <property name="tooltip_text" translatable="yes">Export selected snippets</property>
- <property name="related_action">export_snippets_action</property>
- <property name="use_action_appearance">False</property>
- <property name="label" translatable="yes">Export Snippets</property>
- <property name="use_underline">True</property>
- <property name="icon_name">document-save-as-symbolic</property>
+ <property name="toolbar_style">icons</property>
+ <property name="icon_size">1</property>
+ <style>
+ <class name="inline-toolbar"/>
+ </style>
+ <child>
+ <object class="GtkToolButton" id="add_snippet_button">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Create new snippet</property>
+ <property name="tooltip_text" translatable="yes">Create new snippet</property>
+ <property name="related_action">add_snippet_action</property>
+ <property name="use_action_appearance">False</property>
+ <property name="label" translatable="yes">Add Snippet</property>
+ <property name="use_underline">True</property>
+ <property name="icon_name">list-add-symbolic</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="remove_snippet_button">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Delete selected snippet</property>
+ <property name="tooltip_text" translatable="yes">Delete selected snippet</property>
+ <property name="related_action">remove_snippet_action</property>
+ <property name="use_action_appearance">False</property>
+ <property name="label" translatable="yes">Remove Snippet</property>
+ <property name="use_underline">True</property>
+ <property name="icon_name">list-remove-symbolic</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="import_snippets_button">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Import snippets</property>
+ <property name="tooltip_text" translatable="yes">Import snippets</property>
+ <property name="related_action">import_snippets_action</property>
+ <property name="use_action_appearance">False</property>
+ <property name="label" translatable="yes">Import Snippets</property>
+ <property name="use_underline">True</property>
+ <property name="icon_name">document-open-symbolic</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="export_snippets_button">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Export selected snippets</property>
+ <property name="tooltip_text" translatable="yes">Export selected snippets</property>
+ <property name="related_action">export_snippets_action</property>
+ <property name="use_action_appearance">False</property>
+ <property name="label" translatable="yes">Export Snippets</property>
+ <property name="use_underline">True</property>
+ <property name="icon_name">document-save-as-symbolic</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="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]