Changeset 8884b7871bd5444d3a505a7d2b9075a69deae9ed

Timestamp:

22/03/10 20:01:50 (3 years ago)

Author:

Matias De la Puente <mfpuente.ar@…>

Children:

03ea8d2b66b016923b66ad71912e6906bf8c1a5d

Parents:

63e85bdc294f960ed78c8cb40b44f2b506383dd8

git-committer:

Matias De la Puente <mfpuente.ar@…> (22/03/10 20:01:50)

Message:

Add document preferences action

Files:

• libi4uc/Makefile.am (modified) (2 diffs)
• libi4uc/i4ucdocumentpagepresenter.vala (modified) (1 diff)
• libi4uc/i4ucdocumentpageview.vala (modified) (1 diff)
• libi4uc/i4ucdocumentpageviewiface.vala (modified) (1 diff)
• libi4uc/i4ucdocumentpreferencespagepresenter.vala (added)
• libi4uc/i4ucdocumentpreferencespageview.vala (added)
• libi4uc/i4ucdocumentpreferencespageviewfactory.vala (added)
• libi4uc/i4ucdocumentpreferencespageviewiface.vala (added)
• libi4uc/i4ucdocumentspresenter.vala (modified) (3 diffs)
• libi4uc/i4ucdocumentsview.vala (modified) (3 diffs)
• libi4uc/i4ucdocumentsviewiface.vala (modified) (1 diff)
• libi4uc/i4ucsettings.vala (modified) (1 diff)
• libi4uc/i4ucviewutils.vala (added)
• src/main.vala (modified) (1 diff)

libi4uc/Makefile.am

@@ -20 +20 @@
         i4ucdocumentpageviewfactory.vala \
         i4ucdocumentpageviewiface.vala \
+        i4ucdocumentpreferencespagepresenter.vala \
+        i4ucdocumentpreferencespageview.vala \
+        i4ucdocumentpreferencespageviewfactory.vala \
+        i4ucdocumentpreferencespageviewiface.vala \
         i4ucdocumentspresenter.vala \
         i4ucdocumentsview.vala \
@@ -29 +33 @@
         i4ucpagespanel.vala \
         i4ucsettings.vala \
+        i4ucviewutils.vala \
         $(NULL)
 

libi4uc/i4ucdocumentpagepresenter.vala

@@ -44 +44 @@
         {
                 _view = view;
+                
+                //configure view
+                var settings = I4uc.Settings.instance;
+                _view.font_name = settings.documents_font;
+                _view.tab_width = settings.documents_tab_width;
+                _view.auto_indent = settings.documents_auto_indent;
+                _view.highlight_current_line = settings.documents_highlight_current_line;
+                _view.insert_spaces_instead_of_tabs = settings.documents_insert_spaces_instead_of_tabs;
+                _view.show_line_numbers = settings.documents_show_line_numbers;
+                _view.highlight_matching_brackets = settings.documents_highlight_matching_brackets;
+                _view.wrap_mode = settings.documents_wrap_mode;
                 
                 //connect view signals

libi4uc/i4ucdocumentpageview.vala

@@ -25 +25 @@
         private SourceView _source_view;
         private SourceBuffer _source_buffer = new SourceBuffer (null);
+        
+        public string font_name
+        {
+                set { _source_view.modify_font (Pango.FontDescription.from_string (value)); }
+                get { return ""; }
+        }
+        
+        public int tab_width
+        {
+                set { _source_view.tab_width = value; }
+                get { return (int)_source_view.tab_width; }
+        }
+        
+        public bool auto_indent
+        {
+                set { _source_view.auto_indent = value; }
+                get { return _source_view.auto_indent; }
+        }
+        
+        public bool highlight_current_line
+        {
+                set { _source_view.highlight_current_line = value; }
+                get { return _source_view.highlight_current_line; }
+        }
+        
+        public bool insert_spaces_instead_of_tabs
+        {
+                set { _source_view.insert_spaces_instead_of_tabs = value; }
+                get { return _source_view.insert_spaces_instead_of_tabs; }
+        }
+        
+        public bool show_line_numbers
+        {
+                set { _source_view.show_line_numbers = value; }
+                get { return _source_view.show_line_numbers; }
+        }
+        
+        public bool highlight_matching_brackets
+        {
+                set { _source_buffer.highlight_matching_brackets = value; }
+                get { return _source_buffer.highlight_matching_brackets; }
+        }
+        
+        public bool wrap_mode
+        {
+                set { _source_view.wrap_mode = value ? WrapMode.WORD_CHAR : WrapMode.NONE; }
+                get { return _source_view.wrap_mode == WrapMode.WORD_CHAR; }
+        }
         
         public string content

libi4uc/i4ucdocumentpageviewiface.vala

@@ -27 +27 @@
         public abstract string tab_tooltip { set; get; }
         public abstract bool tab_mark { set; get; }
+        public abstract string font_name { set; get; }
+        public abstract int tab_width { set; get; }
+        public abstract bool auto_indent { set; get; }
+        public abstract bool highlight_current_line { set; get; }
+        public abstract bool insert_spaces_instead_of_tabs { set; get; }
+        public abstract bool show_line_numbers { set; get; }
+        public abstract bool highlight_matching_brackets { set; get; }
+        public abstract bool wrap_mode { set; get; }
         public abstract string content { get; }
         

libi4uc/i4ucdocumentspresenter.vala

@@ -25 +25 @@
         private DocumentsViewIface _view;
         private DocumentPageViewFactory _page_view_factory;
+        private DocumentPreferencesPageViewFactory _preferences_page_view_factory;
         private ArrayList <DocumentPagePresenter> _page_presenters = new ArrayList <DocumentPagePresenter> ();
         private DocumentPagePresenter _page_presenter_selected;
+        private DocumentPreferencesPagePresenter _preferences_page_presenter;
         
-        public DocumentsPresenter (DocumentsViewIface view, DocumentPageViewFactory page_view_factory)
+        public DocumentsPresenter (DocumentsViewIface view, DocumentPageViewFactory page_view_factory, DocumentPreferencesPageViewFactory preferences_page_view_factory)
         {
                 _view = view;
                 _page_view_factory = page_view_factory;
+                _preferences_page_view_factory = preferences_page_view_factory;
                 
                 //configure view
@@ -42 +45 @@
                 _view.save_clicked.connect (on_save_clicked);
                 _view.save_as_clicked.connect (on_save_as_clicked);
+                _view.document_preferences_clicked.connect (on_preferences_clicked);
         }
         
@@ -96 +100 @@
         }
         
+        private void on_preferences_clicked ()
+        {
+                if (_preferences_page_presenter == null)
+                {
+                        var page_view = _preferences_page_view_factory.create_page ();
+                        _preferences_page_presenter = new DocumentPreferencesPagePresenter (page_view, _page_presenters);
+                        _preferences_page_view_factory.add_page (page_view);
+                        _preferences_page_presenter.view.close_clicked.connect ((view) => {
+                                _preferences_page_view_factory.remove_page (view);
+                                _preferences_page_presenter = null;
+                        });
+                }
+                _preferences_page_view_factory.show_page (_preferences_page_presenter.view);
+        }
+        
         private DocumentPageViewIface? get_page_view_from_title (string title)
         {

libi4uc/i4ucdocumentsview.vala

@@ -78 +78 @@
         }
         
+        private void on_document_preferences ()
+        {
+                this.document_preferences_clicked ();
+        }
+        
         private const ActionEntry[] _action_entries =
         {
@@ -83 +88 @@
                 { "OpenDocumentAction", STOCK_OPEN, null, null, N_("Open a file"), on_open },
                 { "SaveDocumentAction", STOCK_SAVE, null, null, N_("Save current document"), on_save },
-                { "SaveAsDocumentAction", STOCK_SAVE_AS, null, null, N_("Save current document with a diferent name"), on_save_as }
+                { "SaveAsDocumentAction", STOCK_SAVE_AS, null, null, N_("Save current document with a diferent name"), on_save_as },
+                { "DocumentsMenuAction", null, N_("_Documents") },
+                        { "DocumentsPreferencesAction", STOCK_PREFERENCES, N_("Documents preferences"), null, N_("Change documents preferences"), on_document_preferences }
         };
         
@@ -100 +107 @@
                         </placeholder>
                 </menu>
+                <placeholder name="MenuBarOps">
+                        <menu name="DocumentsMenu" action="DocumentsMenuAction">
+                                <menuitem action="DocumentsPreferencesAction"/>
+                        </menu>
+                </placeholder>
         </menubar>
         <toolbar name="MainToolbar">

libi4uc/i4ucdocumentsviewiface.vala

@@ -29 +29 @@
         public signal void save_clicked ();
         public signal void save_as_clicked ();
+        public signal void document_preferences_clicked ();
 }

libi4uc/i4ucsettings.vala

@@ -76 +76 @@
                     key_file.get_start_group () != _I4UC_SETTINGS)
                         return;
-                                
+                
                 this.projects_panel_visible = key_file.get_boolean (_I4UC_SETTINGS, "projects_panel_visible");
                 this.logs_panel_visible = key_file.get_boolean (_I4UC_SETTINGS, "logs_panel_visible");

src/main.vala

@@ -31 +31 @@
         
         var document_page_view_factory = new DocumentPageViewFactory (main_window_view.pages_panel);
+        var document_preferences_page_view_factory = new DocumentPreferencesPageViewFactory (main_window_view.pages_panel);
         
         var main_window_presenter = new MainWindowPresenter (main_window_view);
-        var documents_presenter = new DocumentsPresenter (main_window_view.documents_view, document_page_view_factory);
+        var documents_presenter = new DocumentsPresenter (main_window_view.documents_view, document_page_view_factory, document_preferences_page_view_factory);
         
         Gtk.main ();