Changeset b61fc026e7a6957c78c3af4e6b250ad8310431dd

Timestamp:

04/04/10 15:22:20 (3 years ago)

Author:

Matias De la Puente <mfpuente.ar@…>

Children:

16031c0c0382e0dec3ff640ff27c96d69a9ff602

Parents:

0f5bda49b75774e8c0e4aa3b3ce6d6fbd2bb93db

git-committer:

Matias De la Puente <mfpuente.ar@…> (04/04/10 15:22:20)

Message:

Add SidePanel? with show/hide action in MainWindow?

SidePanel? accepts SidePage? objects

Location:

libi4uc

Files:

• Makefile.am (modified) (1 diff)
• i4ucmainwindowpresenter.vala (modified) (1 diff)
• i4ucmainwindowview.vala (modified) (5 diffs)
• i4ucmainwindowviewiface.vala (modified) (1 diff)
• i4ucsettings.vala (modified) (3 diffs)
• i4ucsidepage.vala (added)
• i4ucsidepanel.vala (added)

libi4uc/Makefile.am

@@ -44 +44 @@
         i4ucsearchbarviewiface.vala \
         i4ucsettings.vala \
+        i4ucsidepage.vala \
+        i4ucsidepanel.vala \
         i4ucsyntaxhighlightmenu.vala \
         i4ucsyntaxhighlightmenuiface.vala \

libi4uc/i4ucmainwindowpresenter.vala

@@ -31 +31 @@
                 //Configure view
                 _main_window_view.title = _("IDE for microcontrollers");
+                _main_window_view.show_side_panel_active = I4uc.Settings.instance.side_panel_visible;
+                _main_window_view.side_panel_visible = I4uc.Settings.instance.side_panel_visible;
                 
                 //Connect view signals
+                _main_window_view.show_side_panel_changed.connect (on_show_side_panel_changed);
                 _main_window_view.about_clicked.connect (on_about_clicked);
+        }
+
+        private void on_show_side_panel_changed ()
+        {
+                _main_window_view.side_panel_visible = _main_window_view.show_side_panel_active;
+                I4uc.Settings.instance.side_panel_visible = _main_window_view.show_side_panel_active;
         }
         

libi4uc/i4ucmainwindowview.vala

@@ -27 +27 @@
         private UIManager _ui_manager = new UIManager ();
         private PagesPanel _pages_panel = new PagesPanel ();
+        private SidePanel _side_panel = new SidePanel ();
+        private ToggleAction _show_side_panel_action;
         
         public UIManager ui_manager { get { return _ui_manager; } }
         public PagesPanel pages_panel { get { return _pages_panel; } }
-        
+        public SidePanel side_panel { get { return _side_panel; } }
+
+        public bool show_side_panel_active
+        {
+                set { _show_side_panel_action.active = value; }
+                get { return _show_side_panel_action.active; }
+        }
+
+        public bool side_panel_visible
+        {
+                set { _side_panel.visible = value; }
+                get { return _side_panel.visible; }
+        }
+
         public MainWindowView ()
         {
@@ -40 +55 @@
                 _action_group = new ActionGroup ("I4ucMainWindowActions");
                 _action_group.add_actions (_action_entries, this);
-                
+                _action_group.add_toggle_actions (_toggle_action_entries, this);
+
                 _ui_manager.insert_action_group (_action_group, 0);
                 _ui_manager.add_ui_from_string (_UI, -1);
-                
+
+                _show_side_panel_action = _action_group.get_action ("ShowSidePanelAction") as ToggleAction;
+
                 var menubar = (MenuBar)_ui_manager.get_widget ("/MainMenu");
                 var toolbar = (Toolbar)_ui_manager.get_widget ("/MainToolbar");
                 Gtk.Callback non_homogeneous = (item) => { ((ToolItem)item).set_homogeneous (false); };
                 toolbar.foreach (non_homogeneous);
+
+                var hpaned = new HPaned ();
+                hpaned.add1 (_side_panel);
+                hpaned.add2 (_pages_panel);
                 
                 var vbox = new VBox (false, 0);
                 vbox.pack_start (menubar, false, false, 0);
                 vbox.pack_start (toolbar, false, false, 0);
-                vbox.pack_start (_pages_panel, true, true, 0);
+                vbox.pack_start (hpaned, true, true, 0);
                 add (vbox);
         }
@@ -73 +95 @@
                 about_dialog.destroy ();
         }
-        
+
+        private void on_show_side_panel ()
+        {
+                this.show_side_panel_changed ();
+        }
+
         private void on_quit ()
         {
@@ -95 +122 @@
         };
         
+        private const ToggleActionEntry[] _toggle_action_entries =
+        {
+                { "ShowSidePanelAction", null, N_("Side Panel"), null, N_("Show or hide side panel"), on_show_side_panel, false }
+        };
+
         private const string _UI = """
 <ui>
@@ -107 +139 @@
                 </menu>
                 <menu name="ViewMenu" action="ViewMenuAction">
+                        <menuitem action="ShowSidePanelAction"/>
+                        <separator/>
                         <placeholder name="ViewMenuOps"/>
                 </menu>

libi4uc/i4ucmainwindowviewiface.vala

@@ -24 +24 @@
 {
         public abstract string title { set; get; }
-        
+        public abstract bool show_side_panel_active { set; get; }
+        public abstract bool side_panel_visible { set; get; }
+
+        public signal void show_side_panel_changed ();
         public signal bool exit_clicked ();
         public signal void about_clicked ();

libi4uc/i4ucsettings.vala

@@ -35 +35 @@
         private HashMap<string, Builder> _builders = new HashMap<string, Builder> ();
         
-        public bool projects_panel_visible { set; get; }
+        public bool side_panel_visible { set; get; }
         public bool logs_panel_visible { set; get; }
         public string working_folder { set; get; }
@@ -81 +81 @@
                         return;
                 
-                this.projects_panel_visible = key_file.get_boolean (_I4UC_SETTINGS, "projects_panel_visible");
+                this.side_panel_visible = key_file.get_boolean (_I4UC_SETTINGS, "side_panel_visible");
                 this.logs_panel_visible = key_file.get_boolean (_I4UC_SETTINGS, "logs_panel_visible");
                 
@@ -107 +107 @@
                 var key_file = new KeyFile ();
                 
-                key_file.set_boolean (_I4UC_SETTINGS, "projects_panel_visible", _projects_panel_visible);
+                key_file.set_boolean (_I4UC_SETTINGS, "side_panel_visible", _side_panel_visible);
                 key_file.set_boolean (_I4UC_SETTINGS, "logs_panel_visible", _logs_panel_visible);