[haiku-commits] r39266 - haiku/branches/developer/aldeck/tracker_layout/src/kits/tracker

Author: aldeck
Date: 2010-11-02 01:37:21 +0100 (Tue, 02 Nov 2010)
New Revision: 39266
Changeset: http://dev.haiku-os.org/changeset/39266

Removed:
   
haiku/branches/developer/aldeck/tracker_layout/src/kits/tracker/VolumeWindow.cpp
   
haiku/branches/developer/aldeck/tracker_layout/src/kits/tracker/VolumeWindow.h
Modified:
   
haiku/branches/developer/aldeck/tracker_layout/src/kits/tracker/ContainerWindow.cpp
   
haiku/branches/developer/aldeck/tracker_layout/src/kits/tracker/DefaultControls.cpp
   
haiku/branches/developer/aldeck/tracker_layout/src/kits/tracker/PoseViewController.cpp
   
haiku/branches/developer/aldeck/tracker_layout/src/kits/tracker/PoseViewController.h
Log:
* Moved last bits of VolumeWindow context menu code to the general 
BContainerWindow, and forgeting a few useless items on purpose to make it 
consistent.

* VolumeWindow is gone for good, i.e: there's no need for a special 
ContainerWindow anymore for the root directory.

* Minor style updates to old code.

TODO: fix the copy/move menu navigation to work with the recent listener 
mechanism. Disabled for now.




Modified: 
haiku/branches/developer/aldeck/tracker_layout/src/kits/tracker/ContainerWindow.cpp
===================================================================
--- 
haiku/branches/developer/aldeck/tracker_layout/src/kits/tracker/ContainerWindow.cpp
 2010-11-01 22:51:03 UTC (rev 39265)
+++ 
haiku/branches/developer/aldeck/tracker_layout/src/kits/tracker/ContainerWindow.cpp
 2010-11-02 00:37:21 UTC (rev 39266)
@@ -815,13 +815,11 @@
        if (PoseView()->ViewMode() == kListMode)
                Controller()->ShowAttributeMenu();*/
 
-       //int32 selectCount = PoseView()->SelectionList()->CountItems();
+       SetupOpenWithMenu(Controller()->FileMenu());
 
-       // TODO review that
-       //SetupOpenWithMenu(Controller()->FileMenu());
-       //SetupMoveCopyMenus(selectCount
-       //              ? 
PoseView()->SelectionList()->FirstItem()->TargetModel()->EntryRef() : NULL,
-       //      Controller()->FileMenu());
+       SetupMoveCopyMenus(PoseView()->SelectionList()->CountItems()
+               ? 
PoseView()->SelectionList()->FirstItem()->TargetModel()->EntryRef()
+               : NULL, Controller()->FileMenu());
 }
 
 
@@ -1770,13 +1768,12 @@
                // invoked - this would prevent Cut/Copy/Paste from working
                fPoseView->CommitActivePose();
 
-       // TODO review that
-       // File menu
-       //int32 selectCount = PoseView()->SelectionList()->CountItems();        
-       //SetupOpenWithMenu(Controller()->FileMenu());
-       //SetupMoveCopyMenus(selectCount
-       //      ? 
PoseView()->SelectionList()->FirstItem()->TargetModel()->EntryRef() : NULL, 
Controller()->FileMenu());
+       SetupOpenWithMenu(Controller()->FileMenu());
 
+       SetupMoveCopyMenus(PoseView()->SelectionList()->CountItems()
+               ? 
PoseView()->SelectionList()->FirstItem()->TargetModel()->EntryRef()
+               : NULL, Controller()->FileMenu());
+
        UpdateMenu(Controller()->MenuBar(), kMenuBarContext);
 
        fController->AttributeMenu()->MimeTypesChanged();
@@ -2068,6 +2065,8 @@
 void
 BContainerWindow::SetupMoveCopyMenus(const entry_ref *item_ref, BMenu *parent)
 {
+       return; // TODO: Port to the new listener mechanism
+       
        if (PoseView()->TargetModel()->IsTrash()
                || PoseView()->TargetModel()->IsInTrash()
                || PoseView()->TargetModel()->IsPrintersDir()
@@ -2456,11 +2455,17 @@
                new BMessage(kShowSelectionWindow), 'A', B_SHIFT_KEY));
        menu->AddItem(new BMenuItem(B_TRANSLATE("Select all"),
                new BMessage(B_SELECT_ALL), 'A'));
-       if (!PoseView()->TargetModel()->IsTrash()) {
+       if (!PoseView()->TargetModel()->IsTrash()
+               && !PoseView()->TargetModel()->IsRoot()) {
                menu->AddItem(new BMenuItem(B_TRANSLATE("Open parent"),
                        new BMessage(kOpenParentDir), B_UP_ARROW));
        }
 
+       if (PoseView()->TargetModel()->IsRoot()) {
+               menu->AddSeparatorItem();
+               menu->AddItem(new MountMenu(B_TRANSLATE("Mount")));
+       } 
+
        menu->AddSeparatorItem();
        BMenu* addOnMenuItem = new BMenu(B_TRANSLATE("Add-ons"));
        addOnMenuItem->SetFont(be_plain_font);

Modified: 
haiku/branches/developer/aldeck/tracker_layout/src/kits/tracker/DefaultControls.cpp
===================================================================
--- 
haiku/branches/developer/aldeck/tracker_layout/src/kits/tracker/DefaultControls.cpp
 2010-11-01 22:51:03 UTC (rev 39265)
+++ 
haiku/branches/developer/aldeck/tracker_layout/src/kits/tracker/DefaultControls.cpp
 2010-11-02 00:37:21 UTC (rev 39266)
@@ -114,9 +114,11 @@
        Model* model = fController->PoseView()->TargetModel();
        printf("DefaultFileMenu::TargetModelChanged() model = '%s'\n", 
model->Name());
 
-       // empty the menu
+       // this ensures proper locking
        if (!IsHidden())
                Hide();
+               
+       // empty the menu
        RemoveItems(0, CountItems(), true);
 
        if (model->IsRoot()) {

Modified: 
haiku/branches/developer/aldeck/tracker_layout/src/kits/tracker/PoseViewController.cpp
===================================================================
--- 
haiku/branches/developer/aldeck/tracker_layout/src/kits/tracker/PoseViewController.cpp
      2010-11-01 22:51:03 UTC (rev 39265)
+++ 
haiku/branches/developer/aldeck/tracker_layout/src/kits/tracker/PoseViewController.cpp
      2010-11-02 00:37:21 UTC (rev 39266)
@@ -318,8 +318,8 @@
 //     #pragma mark -
 
 
-BHScrollBar::BHScrollBar(const char *name, BView *target,
-       BTitleView *titleView)
+BHScrollBar::BHScrollBar(const char* name, BView* target,
+       BTitleView* titleView)
        :
        BScrollBar(name, target, 0, 100, B_HORIZONTAL),
        fTitleView(titleView)
@@ -335,5 +335,5 @@
                fTitleView->ScrollTo(BPoint(value, origin.y));
        }
 
-       _inherited::ValueChanged(value);
+       BScrollBar::ValueChanged(value);
 }

Modified: 
haiku/branches/developer/aldeck/tracker_layout/src/kits/tracker/PoseViewController.h
===================================================================
--- 
haiku/branches/developer/aldeck/tracker_layout/src/kits/tracker/PoseViewController.h
        2010-11-01 22:51:03 UTC (rev 39265)
+++ 
haiku/branches/developer/aldeck/tracker_layout/src/kits/tracker/PoseViewController.h
        2010-11-02 00:37:21 UTC (rev 39266)
@@ -92,16 +92,13 @@
 
 
 class BHScrollBar : public BScrollBar {
-       public:
-               BHScrollBar(const char *name, BView *target, BTitleView 
*titleView);
+public:
+                                                               
BHScrollBar(const char* name, BView* target, BTitleView* titleView);
 
-               // BScrollBar overrides
-               virtual void ValueChanged(float);
+       virtual void                            ValueChanged(float);            
 
-       private:
-               BTitleView *fTitleView;
-
-               typedef BScrollBar _inherited;
+private:
+                       BTitleView*                     fTitleView;
 };

Other related posts:

  • » [haiku-commits] r39266 - haiku/branches/developer/aldeck/tracker_layout/src/kits/tracker - alex