Changeset 68d32f66789e5a7a481d8216159260cb2e6e2220

Timestamp:

28/12/10 11:33:56 (2 years ago)

Author:

Matias De la Puente <mfpuente.ar@…>

Children:

a380ad2939f8b774cd43660ee93d06d38929d7d7

Parents:

47b701a6646050bc639a18969b1ada4845b6e1c3

git-committer:

Matias De la Puente <mfpuente.ar@…> (28/12/10 11:33:56)

Message:

Move print settings from Utils to App

Location:

gtkfrontend

Files:

• app.vala (modified) (3 diffs)
• documentpageview.vala (modified) (3 diffs)
• documentsview.vala (modified) (4 diffs)
• main.vala (modified) (3 diffs)
• utils.vala (modified) (1 diff)

gtkfrontend/app.vala

@@ -19 +19 @@
  *      Matias De la Puente <mfpuente.ar@gmail.com>
  */
+using Gtk;
 
 public class I4uc.GtkFrontend.App : GLib.Object, I4uc.Core.App
@@ -50 +51 @@
         public I4uc.Core.Settings settings { get { return _settings; } }
         
+        public PageSetup page_setup { set; get; default = new PageSetup (); }
+        public PrintSettings print_settings { set; get; default = new PrintSettings (); }
+        
         public void load_all ()
         {
@@ -59 +63 @@
                 var bottom_panel = _main_window_view.bottom_panel;
                 
-                _documents_view = new DocumentsView (ui_manager, pages_panel, side_panel);
+                _documents_view = new DocumentsView (ui_manager, pages_panel, side_panel, this);
                 _projects_view = new ProjectsView (ui_manager, side_panel, bottom_panel);
                 _programmers_view = new ProgrammersView (ui_manager, pages_panel, side_panel, bottom_panel);

gtkfrontend/documentpageview.vala

@@ -23 +23 @@
 public class I4uc.GtkFrontend.DocumentPageView : Page, I4uc.Core.DocumentPageView
 {
+        private App _app;
         private MessageBar _error_message_bar = new MessageBar ();
         private MessageBar _reload_message_bar = new MessageBar ();
@@ -115 +116 @@
         }
         
-        public DocumentPageView ()
+        public DocumentPageView (App app)
         {
                 base.with_close_button ();
+                
+                _app = app;
                 
                 create_error_bar ();
@@ -208 +211 @@
                 
                 var operation = new PrintOperation ();
-                operation.print_settings = Utils.print_settings;
-                operation.default_page_setup = Utils.page_setup;
+                operation.print_settings = _app.print_settings;
+                operation.default_page_setup = _app.page_setup;
                 
                 operation.paginate.connect ((operation, context) => {

gtkfrontend/documentsview.vala

@@ -27 +27 @@
         private PagesPanel _pages_panel;
         private PagesPanel _side_panel;
+        private App _app;
         private SyntaxHighlightMenu _syntax_highlight_menu;
         private DocumentPreferencesPageView _preferences_page_view = new DocumentPreferencesPageView ();
@@ -49 +50 @@
         public bool syntax_highlight_menu_sensitive { set; get; }
         
-        public DocumentsView (UIManager ui_manager, PagesPanel pages_panel, PagesPanel side_panel)
+        public DocumentsView (UIManager ui_manager, PagesPanel pages_panel, PagesPanel side_panel, App app)
         {
                 _ui_manager = ui_manager;
                 _pages_panel = pages_panel;
                 _side_panel = side_panel;
+                _app = app;
                 
                 _action_group = new ActionGroup ("I4ucDocumentsActions");
@@ -118 +120 @@
         public I4uc.Core.DocumentPageView create_page_view ()
         {
-                var page_view = new DocumentPageView ();
+                var page_view = new DocumentPageView (_app);
                 page_view.show_all ();
                 return page_view;
@@ -125 +127 @@
         public void show_page_setup_dialog ()
         {
-                var new_page_setup = print_run_page_setup_dialog (null, Utils.page_setup, Utils.print_settings);
-                Utils.page_setup = new_page_setup;
+                var new_page_setup = print_run_page_setup_dialog (null, _app.page_setup, _app.print_settings);
+                _app.page_setup = new_page_setup;
         }
         

gtkfrontend/main.vala

@@ -172 +172 @@
         
         // Load printer settings
-        Utils.page_setup = new PageSetup ();
-        Utils.print_settings = new PrintSettings ();
         var key_file = new KeyFile ();
         
@@ -182 +180 @@
         
         if (key_file.has_group ("Page setup settings"))
-                Utils.page_setup = new PageSetup.from_key_file (key_file, "Page setup settings");
+                _app.page_setup = new PageSetup.from_key_file (key_file, "Page setup settings");
         
         if (key_file.has_group ("Print settings"))
-                Utils.print_settings = new PrintSettings.from_key_file (key_file, "Print settings");
+                _app.print_settings = new PrintSettings.from_key_file (key_file, "Print settings");
 }
 
@@ -199 +197 @@
         var key_file = new KeyFile ();
         
-        Utils.page_setup.to_key_file (key_file, "Page setup settings");
-        Utils.print_settings.to_key_file (key_file, "Print settings");
+        _app.page_setup.to_key_file (key_file, "Page setup settings");
+        _app.print_settings.to_key_file (key_file, "Print settings");
         
         size_t len;

gtkfrontend/utils.vala

@@ -24 +24 @@
 namespace I4uc.GtkFrontend.Utils
 {
-        // Printer settings
-        public PageSetup page_setup;
-        public PrintSettings print_settings;
-        
         public HBox create_hbox (string title, SizeGroup size_group, VBox vbox)
         {