Changeset 9c00fa2176b76854d300d8e1879dba175e299dcc

Timestamp:

06/08/10 15:19:05 (3 years ago)

Author:

Matias De la Puente <mfpuente.ar@…>

Children:

34fbc249592793418e7eb907cccee13196e06ed6

Parents:

9717a84fce18b736017d72fa9a7a8e64ea952ce0

git-committer:

Matias De la Puente <mfpuente.ar@…> (06/08/10 15:19:05)

Message:

Remove Bottom{Page,Panel}

Use Page and PagesPanel? instead

Location:

libi4uc

Files:

• Makefile.am (modified) (1 diff)
• i4ucbottompage.vala (deleted)
• i4ucbottompanel.vala (deleted)
• i4ucdocumentpageview.vala (modified) (1 diff)
• i4uclogpage.vala (modified) (1 diff)
• i4ucmainwindowview.vala (modified) (2 diffs)
• i4ucpage.vala (modified) (2 diffs)
• i4ucpagespanel.vala (modified) (1 diff)
• i4ucpagespaneliface.vala (modified) (1 diff)
• i4ucprofilebuilderlogpage.vala (modified) (1 diff)
• i4ucprogrammersview.vala (modified) (2 diffs)
• i4ucprojectsview.vala (modified) (2 diffs)
• i4ucsidepanel.vala (modified) (1 diff)
• i4ucviewutils.vala (modified) (1 diff)

libi4uc/Makefile.am

@@ -41 +41 @@
         i4ucaddprofiledialogviewiface.vala \
         i4ucauthorslist.vala \
-        i4ucbottompage.vala \
-        i4ucbottompanel.vala \
         i4ucbuilder.vala \
         i4ucbuilderdevicetype.vala \

libi4uc/i4ucdocumentpageview.vala

@@ -219 +219 @@
         public DocumentPageView ()
         {
+                base.with_close_button ();
+                
                 create_error_bar ();
                 create_reload_bar ();

libi4uc/i4uclogpage.vala

@@ -21 +21 @@
 using Gtk;
 
-public class I4uc.LogPage : BottomPage, LogPageIface
+public class I4uc.LogPage : Page, LogPageIface
 {
         private ListStore _log_store;

libi4uc/i4ucmainwindowview.vala

@@ -28 +28 @@
         private PagesPanel _pages_panel = new PagesPanel ();
         private SidePanel _side_panel = new SidePanel ();
-        private BottomPanel _bottom_panel = new BottomPanel ();
+        private PagesPanel _bottom_panel = new PagesPanel ();
         
         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 BottomPanel bottom_panel { get { return _bottom_panel; } }
+        public PagesPanel bottom_panel { get { return _bottom_panel; } }
 
         public bool show_side_panel_active
@@ -88 +88 @@
                 var toolbar = (Toolbar)_ui_manager.get_widget ("/MainToolbar");
                 toolbar.set_style (ToolbarStyle.ICONS);
+                
+                _bottom_panel.page_position = PagePosition.BOTTOM;
 
                 var vpaned = new VPaned ();

libi4uc/i4ucpage.vala

@@ -24 +24 @@
 {
         public string title { set; get; }
-        public HBox tab_label { private set; get; }
+        public Box tab_label { private set; get; }
         
         private Image _tab_image = new Image.from_stock (STOCK_FILE, IconSize.MENU);
@@ -55 +55 @@
         public Page ()
         {
+                _tab_label = new HBox (false, 5);
+                _tab_label.pack_start (_tab_image, false, false, 0);
+                _tab_label.pack_start (_tab_mark, false, false, 0);
+                _tab_label.pack_start (_tab_title, false, false, 0);
+                _tab_label.show_all ();
+        }
+        
+        public Page.with_close_button ()
+        {
+                this ();
+                
                 var close_button = ViewUtils.create_close_button ();
                 close_button.clicked.connect (() => this.close_clicked ());
                 close_button.tooltip_text = _("Close page");
                 
-                _tab_label = new HBox (false, 5);
-                _tab_label.pack_start (_tab_image, false, false, 0);
-                _tab_label.pack_start (_tab_mark, false, false, 0);
-                _tab_label.pack_start (_tab_title, false, false, 0);
                 _tab_label.pack_start (close_button, false, false, 0);
                 _tab_label.show_all ();
-        }       
+        }
 }

libi4uc/i4ucpagespanel.vala

@@ -29 +29 @@
         
         public PageIface current_page { get { return _current_page; } }
+        
+        public PagePosition page_position
+        {
+                set { _notebook.tab_pos = ViewUtils.from_page_position (value); }
+                get { return ViewUtils.to_page_position (_notebook.tab_pos); }
+        }
         
         public PagesPanel ()

libi4uc/i4ucpagespaneliface.vala

@@ -21 +21 @@
 using Gee;
 
+public enum I4uc.PagePosition
+{
+        BOTTOM,
+        LEFT,
+        RIGHT,
+        TOP
+}
+
 public interface I4uc.PagesPanelIface : GLib.Object
 {
         public abstract PageIface current_page { get; }
+        public abstract PagePosition page_position { set; get; }
 
         public signal void page_added (PageIface page);

libi4uc/i4ucprofilebuilderlogpage.vala

@@ -21 +21 @@
 using Gtk;
 
-public class I4uc.ProfileBuilderLogPage : BottomPage, ProfileBuilderLogPageIface
+public class I4uc.ProfileBuilderLogPage : Page, ProfileBuilderLogPageIface
 {
         private ListStore _log_store;

libi4uc/i4ucprogrammersview.vala

@@ -27 +27 @@
         private PagesPanel _pages_panel;
         private SidePanel _side_panel;
-        private BottomPanel _bottom_panel;
+        private PagesPanel _bottom_panel;
         private ProgrammersSidePage _side_page = new ProgrammersSidePage ();
         private LogPage _log_page = new LogPage ();
@@ -83 +83 @@
         }
         
-        public ProgrammersView (UIManager ui_manager, PagesPanel pages_panel, SidePanel side_panel, BottomPanel bottom_panel)
+        public ProgrammersView (UIManager ui_manager, PagesPanel pages_panel, SidePanel side_panel, PagesPanel bottom_panel)
         {
                 _ui_manager = ui_manager;

libi4uc/i4ucprojectsview.vala

@@ -27 +27 @@
         private ActionGroup _action_group;
         private SidePanel _side_panel;
-        private BottomPanel _bottom_panel;
+        private PagesPanel _bottom_panel;
         private ProjectsSidePageView _side_page_view = new ProjectsSidePageView ();
         private ProfileBuilderLogPage _build_log_page = new ProfileBuilderLogPage ();
@@ -101 +101 @@
         }
         
-        public ProjectsView (UIManager ui_manager, SidePanel side_panel, BottomPanel bottom_panel)
+        public ProjectsView (UIManager ui_manager, SidePanel side_panel, PagesPanel bottom_panel)
         {
                 _ui_manager = ui_manager;

libi4uc/i4ucsidepanel.vala

@@ -29 +29 @@
         
         public PageIface current_page { get { return _current_page; } }
+        
+        public PagePosition page_position
+        {
+                set { _notebook.tab_pos = ViewUtils.from_page_position (value); }
+                get { return ViewUtils.to_page_position (_notebook.tab_pos); }
+        }
         
         public SidePanel ()

libi4uc/i4ucviewutils.vala

@@ -79 +79 @@
                 return TabImage.NONE;
         }
+        
+        public PagePosition to_page_position (PositionType position_type)
+        {
+                var page_position = PagePosition.TOP;
+                switch (position_type)
+                {
+                        case PositionType.BOTTOM: page_position = PagePosition.BOTTOM; break;
+                        case PositionType.LEFT: page_position = PagePosition.LEFT; break;
+                        case PositionType.RIGHT: page_position = PagePosition.RIGHT; break;
+                        case PositionType.TOP: page_position = PagePosition.TOP; break;
+                }
+                return page_position;
+        }
+        
+        public PositionType from_page_position (PagePosition page_position)
+        {
+                var position_type = PositionType.TOP;
+                switch (page_position)
+                {
+                        case PagePosition.BOTTOM: position_type = PositionType.BOTTOM; break;
+                        case PagePosition.LEFT: position_type = PositionType.LEFT; break;
+                        case PagePosition.RIGHT: position_type = PositionType.RIGHT; break;
+                        case PagePosition.TOP: position_type = PositionType.TOP; break;
+                }
+                return position_type;
+        }
 }