[epiphany-extensions] manager: use GtkBuilder files directly



commit c83271da14a36eaa0320b64ab4750b28dc5652e3
Author: Diego Escalante Urrelo <descalante igalia com>
Date:   Sat Jan 30 20:47:47 2010 -0500

    manager: use GtkBuilder files directly

 extensions/extensions-manager-ui/Makefile.am       |   15 +--
 .../extensions-manager-ui/extensions-manager-ui.c  |    2 +-
 .../extensions-manager-ui.glade                    |  156 --------------------
 .../extensions-manager-ui/extensions-manager-ui.ui |  115 ++++++++++++++
 4 files changed, 121 insertions(+), 167 deletions(-)
---
diff --git a/extensions/extensions-manager-ui/Makefile.am b/extensions/extensions-manager-ui/Makefile.am
index 83c75cf..1e63c45 100644
--- a/extensions/extensions-manager-ui/Makefile.am
+++ b/extensions/extensions-manager-ui/Makefile.am
@@ -9,7 +9,7 @@ libextensionsmanageruiextension_la_SOURCES = \
 	extension.c
 
 libextensionsmanageruiextension_la_CPPFLAGS = \
-        -I$(top_srcdir)/include				\
+	-I$(top_srcdir)/include				\
 	-DSHARE_DIR=\"$(pkgdatadir)\"			\
 	-DEPHY_EXTENSIONS_LOCALEDIR=\"$(datadir)/locale\"  \
 	$(AM_CPPFLAGS)
@@ -23,13 +23,8 @@ libextensionsmanageruiextension_la_LDFLAGS = \
 	-export-symbols $(top_srcdir)/ephy-extension.symbols \
 	$(AM_LDFLAGS)
 
-gladedir = $(pkgdatadir)/glade
-glade_in_files = extensions-manager-ui.glade
-
-%.ui: %.glade
-	$(GTK_BUILDER_CONVERT) $< $@
-
-glade_DATA = $(glade_in_files:.glade=.ui)
+uidir = $(pkgdatadir)/ui
+ui_DATA = extensions-manager-ui.ui
 
 extensioninidir = $(extensiondir)
 extensionini_in_files = extensions-manager-ui.ephy-extension.in.in
@@ -42,7 +37,7 @@ extensionini_DATA = $(extensionini_in_files:.ephy-extension.in.in=.ephy-extensio
 
 @EPIPHANY_EXTENSION_RULE@
 
-CLEANFILES = $(extensionini_DATA) $(glade_DATA)
+CLEANFILES = $(extensionini_DATA)
 DISTCLEANFILES = $(extensionini_DATA)
 
-EXTRA_DIST = $(glade_in_files) $(extensionini_in_files)
+EXTRA_DIST = $(ui_DATA) $(extensionini_in_files)
diff --git a/extensions/extensions-manager-ui/extensions-manager-ui.c b/extensions/extensions-manager-ui/extensions-manager-ui.c
index f421bf9..7c2b9e5 100644
--- a/extensions/extensions-manager-ui/extensions-manager-ui.c
+++ b/extensions/extensions-manager-ui/extensions-manager-ui.c
@@ -440,7 +440,7 @@ extensions_manager_ui_init (ExtensionsManagerUI *dialog)
 
 	ephy_dialog_construct (EPHY_DIALOG (dialog),
 			       properties,
-			       SHARE_DIR "/glade/extensions-manager-ui.ui",
+			       SHARE_DIR "/ui/extensions-manager-ui.ui",
 			       "extensions_manager_ui",
 			       GETTEXT_PACKAGE);
 
diff --git a/extensions/extensions-manager-ui/extensions-manager-ui.ui b/extensions/extensions-manager-ui/extensions-manager-ui.ui
new file mode 100644
index 0000000..9b35b5a
--- /dev/null
+++ b/extensions/extensions-manager-ui/extensions-manager-ui.ui
@@ -0,0 +1,115 @@
+<?xml version="1.0"?>
+<interface>
+  <!-- interface-requires gtk+ 2.6 -->
+  <!-- interface-naming-policy toplevel-contextual -->
+  <object class="GtkDialog" id="extensions_manager_ui">
+    <property name="border_width">5</property>
+    <property name="title" translatable="yes">Extensions</property>
+    <property name="role">epiphany-extension-manager</property>
+    <property name="destroy_with_parent">True</property>
+    <property name="icon_name">gtk-preferences</property>
+    <property name="type_hint">normal</property>
+    <property name="has_separator">False</property>
+    <child internal-child="vbox">
+      <object class="GtkVBox" id="dialog-vbox1">
+        <property name="visible">True</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">2</property>
+        <child>
+          <object class="GtkVBox" id="vbox1">
+            <property name="visible">True</property>
+            <property name="border_width">5</property>
+            <property name="orientation">vertical</property>
+            <property name="spacing">6</property>
+            <child>
+              <object class="GtkLabel" id="label1">
+                <property name="visible">True</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">&lt;b&gt;Loaded Extensions&lt;/b&gt;</property>
+                <property name="use_markup">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkAlignment" id="alignment1">
+                <property name="visible">True</property>
+                <property name="left_padding">12</property>
+                <child>
+                  <object class="GtkScrolledWindow" id="scrolledwindow1">
+                    <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">etched-in</property>
+                    <child>
+                      <object class="GtkTreeView" id="extensions_treeview">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="headers_visible">False</property>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child internal-child="action_area">
+          <object class="GtkHButtonBox" id="dialog-action_area1">
+            <property name="visible">True</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="helpbutton1">
+                <property name="label">gtk-help</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>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="closebutton1">
+                <property name="label">gtk-close</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>
+              </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="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="-11">helpbutton1</action-widget>
+      <action-widget response="-7">closebutton1</action-widget>
+    </action-widgets>
+  </object>
+</interface>



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]