sync

diff --git a/.roobuilder.jcfg b/.roobuilder.jcfg
index 87db39f..ef31a59 100644 (file)
--- a/.roobuilder.jcfg
+++ b/.roobuilder.jcfg
@@ -68,7 +68,8 @@
                 "src/JsRender/NodeWriter.vala",
                 "src/JsRender/NodeToValaExtended.vala",
                 "src/JsRender/NodeToValaWrapped.vala",
-                "src/Builder4/MainWindow.bjs"
+                "src/Builder4/MainWindow.bjs",
+                "src/Settings.vala"
             ]
         }
     ],

diff --git a/src/Application.vala b/src/Application.vala
index 4ca26b9..9b2a3ef 100644 (file)
--- a/src/Application.vala
+++ b/src/Application.vala
@@ -118,7 +118,7 @@
                    { "application/x-rootwindow-drop", 0, Target.ROOTWIN }
                };
                */
-               public AppSettings settings = null;
+               //public AppSettings settings = null;
 
 
 
@@ -154,7 +154,7 @@
                        
                        
                        configDirectory();
-                       this.settings = AppSettings.factory();  
+               //      this.settings = AppSettings.factory();  
                        var opt_context = new OptionContext ("Application Builder");
                        
                        try {
@@ -187,17 +187,20 @@
 
                }
 
+               static Settings settings;
+
                protected override void activate () 
                {
                        var css = new Gtk.CssProvider();
                        css.load_from_resource("/css/roobuilder.css");
                        
+                       
                        Gtk.StyleContext.add_provider_for_display(
                                Gdk.Display.get_default(),
                                css     ,
                                Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION
                        );
-                       
+                       BuilderApplication.settings = new Settings();
                
                        var w = new Xcls_MainWindow();
                    w.initChildren();