[gnome-usage] Revert "window: Port to Gtk+ widget template"



commit 6c0e1de0137db9acca23527b18d1e87d582b0e61
Author: Petr Štětka <pstetka redhat com>
Date:   Tue May 9 17:41:29 2017 +0200

    Revert "window: Port to Gtk+ widget template"
    
    This reverts commit ccfb845da9d829cb6aeae8070e41d740c291661a.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=781617

 data/org.gnome.Usage.gresource.xml |    1 -
 data/ui/window.ui                  |   25 -------------------------
 src/header-bar.vala                |    7 ++-----
 src/window.vala                    |   17 ++++++++++-------
 4 files changed, 12 insertions(+), 38 deletions(-)
---
diff --git a/data/org.gnome.Usage.gresource.xml b/data/org.gnome.Usage.gresource.xml
index 7b6b5fa..0da135d 100644
--- a/data/org.gnome.Usage.gresource.xml
+++ b/data/org.gnome.Usage.gresource.xml
@@ -6,6 +6,5 @@
         <file preprocess="xml-stripblanks">ui/header-bar.ui</file>
         <file preprocess="xml-stripblanks">ui/performance-view.ui</file>
         <file preprocess="xml-stripblanks">ui/process-dialog.ui</file>
-        <file preprocess="xml-stripblanks">ui/window.ui</file>
     </gresource>
 </gresources>
diff --git a/src/header-bar.vala b/src/header-bar.vala
index 872d514..659cbf1 100644
--- a/src/header-bar.vala
+++ b/src/header-bar.vala
@@ -40,17 +40,14 @@ namespace Usage
            { "select-none", select_none },
         };
 
-        public HeaderBar ()
+           public HeaderBar(Gtk.Stack stack)
            {
                mode = HeaderBarMode.PERFORMANCE;
+            stack_switcher.set_stack(stack);
 
             set_mode(HeaderBarMode.PERFORMANCE);
            }
 
-        public void set_stack (Gtk.Stack stack) {
-            stack_switcher.set_stack(stack);
-        }
-
            public void set_mode(HeaderBarMode mode)
            {
             switch(this.mode)
diff --git a/src/window.vala b/src/window.vala
index 68ff2bd..238e5db 100644
--- a/src/window.vala
+++ b/src/window.vala
@@ -1,27 +1,28 @@
 namespace Usage
 {
-    [GtkTemplate (ui = "/org/gnome/Usage/ui/window.ui")]
     public class Window : Gtk.ApplicationWindow
     {
-        [GtkChild]
         private Usage.HeaderBar header_bar;
-
-        [GtkChild]
-        private Gtk.Stack stack;
-
         private View[] views;
 
                public Window(Gtk.Application application)
         {
             GLib.Object(application : application);
 
+            this.set_default_size(950, 600);
+            this.set_size_request(930, 300);
+            this.window_position = Gtk.WindowPosition.CENTER;
+            this.set_title(_("Usage"));
+
             load_css();
             Gtk.Settings.get_for_screen(get_screen()).notify["gtk-application-prefer-dark-theme"].connect(() 
=>
             {
                 load_css();
             });
 
-            header_bar.set_stack (stack);
+                       var stack = new Gtk.Stack();
+                       header_bar = new Usage.HeaderBar(stack);
+                       set_titlebar(header_bar);
 
             views = new View[]
             {
@@ -53,6 +54,8 @@ namespace Usage
                     header_bar.set_mode(HeaderBarMode.POWER);
                 }
             });
+
+            this.add(stack);
         }
 
         public Usage.HeaderBar get_header_bar()


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