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

  • From: alex@xxxxxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Sun, 31 Jul 2011 04:15:21 +0200 (CEST)

Author: aldeck
Date: 2011-07-31 04:15:21 +0200 (Sun, 31 Jul 2011)
New Revision: 42520
Changeset: https://dev.haiku-os.org/changeset/42520

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/DefaultControls.h
   
haiku/branches/developer/aldeck/tracker_layout/src/kits/tracker/PoseViewController.cpp
   
haiku/branches/developer/aldeck/tracker_layout/src/kits/tracker/PoseViewController.h
Log:
* Simplify naming, remove DefaultXxx prefix


Modified: 
haiku/branches/developer/aldeck/tracker_layout/src/kits/tracker/ContainerWindow.cpp
===================================================================
--- 
haiku/branches/developer/aldeck/tracker_layout/src/kits/tracker/ContainerWindow.cpp
 2011-07-31 01:53:32 UTC (rev 42519)
+++ 
haiku/branches/developer/aldeck/tracker_layout/src/kits/tracker/ContainerWindow.cpp
 2011-07-31 02:15:21 UTC (rev 42520)
@@ -1495,8 +1495,8 @@
                                                                        : 
B_TRANSLATE("Move to Trash"));
                                                        }
                                                        // Deskbar doesn't have 
a menu bar, so check if there is Controller()->MenuBar()
-                                                       if 
(Controller()->MenuBar() && Controller()->FileMenu()) {
-                                                               item = 
Controller()->FileMenu()->FindItem(kMoveToTrash);
+                                                       if 
(Controller()->MenuBar() && Controller()->GetFileMenu() != NULL) {
+                                                               item = 
Controller()->GetFileMenu()->FindItem(kMoveToTrash);
                                                                if (item) {
                                                                        
item->SetLabel(dontMoveToTrash
                                                                                
? B_TRANSLATE("Delete")

Modified: 
haiku/branches/developer/aldeck/tracker_layout/src/kits/tracker/DefaultControls.cpp
===================================================================
--- 
haiku/branches/developer/aldeck/tracker_layout/src/kits/tracker/DefaultControls.cpp
 2011-07-31 01:53:32 UTC (rev 42519)
+++ 
haiku/branches/developer/aldeck/tracker_layout/src/kits/tracker/DefaultControls.cpp
 2011-07-31 02:15:21 UTC (rev 42520)
@@ -37,10 +37,10 @@
 const float kMaxMenuWidth = 150; // OpenWithMenu
 
 
-//     #pragma mark - DefaultFileContextMenu
+//     #pragma mark - FileContextMenu
 
 
-DefaultFileContextMenu::DefaultFileContextMenu(PoseViewController* controller)
+FileContextMenu::FileContextMenu(PoseViewController* controller)
        :
        BPopUpMenu("FileContext", false, false)
 {
@@ -104,10 +104,10 @@
 }
 
 
-//     #pragma mark - DefaultFileMenu
+//     #pragma mark - FileMenu
 
 
-DefaultFileMenu::DefaultFileMenu(PoseViewController* controller)
+FileMenu::FileMenu(PoseViewController* controller)
        :
        BMenu(B_TRANSLATE("File")),
        fController(controller)
@@ -118,7 +118,7 @@
 
 
 void
-DefaultFileMenu::AttachedToWindow()
+FileMenu::AttachedToWindow()
 {
        // This method is called just before showing the menu
        Model* model = fController->PoseView()->TargetModel();
@@ -158,7 +158,7 @@
 
 
 void
-DefaultFileMenu::TargetModelChanged()
+FileMenu::TargetModelChanged()
 {
        Model* model = fController->PoseView()->TargetModel();
 
@@ -286,7 +286,7 @@
 
 
 void
-DefaultFileMenu::SelectionChanged()
+FileMenu::SelectionChanged()
 {
        PoseList* selection = fController->PoseView()->SelectionList();
        Model* model = fController->PoseView()->TargetModel();
@@ -322,10 +322,10 @@
 }
 
 
-//     #pragma mark - DefaultMoveMenu
+//     #pragma mark - MoveMenu
 
 
-DefaultMoveMenu::DefaultMoveMenu(const char* itemName, uint32 messageWhat,
+MoveMenu::MoveMenu(const char* itemName, uint32 messageWhat,
        PoseViewController* controller)
        :
        BNavMenu(itemName, messageWhat, 
controller->PoseView()->ContainerWindow()),
@@ -338,13 +338,13 @@
 
 
 void
-DefaultMoveMenu::TargetModelChanged()
+MoveMenu::TargetModelChanged()
 {
 }
 
 
 void
-DefaultMoveMenu::SelectionChanged()
+MoveMenu::SelectionChanged()
 {
        const entry_ref* firstRef
                = fController->PoseView()->SelectionList()->CountItems() > 0
@@ -356,7 +356,7 @@
 
 
 void
-DefaultMoveMenu::_Populate(const entry_ref *ref, bool addLocalOnly)
+MoveMenu::_Populate(const entry_ref *ref, bool addLocalOnly)
 {
        if (ref == NULL) {
                SetEnabled(false);
@@ -474,10 +474,10 @@
 }
 
 
-//     #pragma mark - DefaultWindowMenu
+//     #pragma mark - WindowMenu
 
 
-DefaultWindowMenu::DefaultWindowMenu(PoseViewController* controller)
+WindowMenu::WindowMenu(PoseViewController* controller)
        :
        BMenu(B_TRANSLATE("Window"))
 {

Modified: 
haiku/branches/developer/aldeck/tracker_layout/src/kits/tracker/DefaultControls.h
===================================================================
--- 
haiku/branches/developer/aldeck/tracker_layout/src/kits/tracker/DefaultControls.h
   2011-07-31 01:53:32 UTC (rev 42519)
+++ 
haiku/branches/developer/aldeck/tracker_layout/src/kits/tracker/DefaultControls.h
   2011-07-31 02:15:21 UTC (rev 42520)
@@ -32,15 +32,15 @@
 class PoseViewController;
 
 
-class DefaultFileContextMenu : public BPopUpMenu {
+class FileContextMenu : public BPopUpMenu {
 public:
-                                                               
DefaultFileContextMenu(PoseViewController* controller);
+                                                               
FileContextMenu(PoseViewController* controller);
 };
 
 
-class DefaultFileMenu : public BMenu, public PoseViewListener {
+class FileMenu : public BMenu, public PoseViewListener {
 public:
-                                                               
DefaultFileMenu(PoseViewController* controller);
+                                                               
FileMenu(PoseViewController* controller);
        virtual void                            AttachedToWindow();
        virtual void                            TargetModelChanged();
        virtual void                            SelectionChanged();
@@ -52,9 +52,9 @@
 };
 
 
-class DefaultWindowMenu : public BMenu, public PoseViewListener {
+class WindowMenu : public BMenu, public PoseViewListener {
 public:
-                                                               
DefaultWindowMenu(PoseViewController* controller);
+                                                               
WindowMenu(PoseViewController* controller);
        virtual void                            TargetModelChanged() {}; // TODO
        virtual void                            SelectionChanged() {};
        virtual void                            MimeTypesChanged() {};
@@ -62,9 +62,9 @@
 };
 
 
-class DefaultMoveMenu : public BNavMenu, public PoseViewListener {
+class MoveMenu : public BNavMenu, public PoseViewListener {
 public:
-                                                               
DefaultMoveMenu(const char* itemName,
+                                                               MoveMenu(const 
char* itemName,
                                                                        uint32 
messageWhat,
                                                                        
PoseViewController* controller);
 

Modified: 
haiku/branches/developer/aldeck/tracker_layout/src/kits/tracker/PoseViewController.cpp
===================================================================
--- 
haiku/branches/developer/aldeck/tracker_layout/src/kits/tracker/PoseViewController.cpp
      2011-07-31 01:53:32 UTC (rev 42519)
+++ 
haiku/branches/developer/aldeck/tracker_layout/src/kits/tracker/PoseViewController.cpp
      2011-07-31 02:15:21 UTC (rev 42520)
@@ -106,11 +106,11 @@
 void
 PoseViewController::CreateMenus()
 {
-       DefaultFileMenu* fileMenu = new DefaultFileMenu(this);
+       FileMenu* fileMenu = new FileMenu(this);
        fPoseView->AddListener(fileMenu);
        fFileMenu = fileMenu;
 
-       fWindowMenu = new DefaultWindowMenu(this);
+       fWindowMenu = new WindowMenu(this);
 
        AttributesMenu<BMenu>* attributesMenu = new AttributesMenu<BMenu>(this);
        fPoseView->AddListener(attributesMenu);
@@ -125,16 +125,16 @@
 void
 PoseViewController::CreateMoveCopyMenus()
 {
-       DefaultMoveMenu* menu
-               = new DefaultMoveMenu(B_TRANSLATE("Move to"), kMoveSelectionTo, 
this);
+       MoveMenu* menu
+               = new MoveMenu(B_TRANSLATE("Move to"), kMoveSelectionTo, this);
        fPoseView->AddListener(menu);
        fMoveToMenu = menu;
 
-       menu = new DefaultMoveMenu(B_TRANSLATE("Copy to"), kCopySelectionTo, 
this);
+       menu = new MoveMenu(B_TRANSLATE("Copy to"), kCopySelectionTo, this);
        fPoseView->AddListener(menu);
        fCopyToMenu = menu;
 
-       menu = new DefaultMoveMenu(B_TRANSLATE("Create link"), kCreateLink, 
this);
+       menu = new MoveMenu(B_TRANSLATE("Create link"), kCreateLink, this);
        fPoseView->AddListener(menu);
        fCreateLinkMenu = menu;
 

Modified: 
haiku/branches/developer/aldeck/tracker_layout/src/kits/tracker/PoseViewController.h
===================================================================
--- 
haiku/branches/developer/aldeck/tracker_layout/src/kits/tracker/PoseViewController.h
        2011-07-31 01:53:32 UTC (rev 42519)
+++ 
haiku/branches/developer/aldeck/tracker_layout/src/kits/tracker/PoseViewController.h
        2011-07-31 02:15:21 UTC (rev 42520)
@@ -68,7 +68,7 @@
                        // TODO: Not sure we need to expose everything, there's 
no use for it
                        // anymore with the listener mechanism
                        BMenuBar*                       MenuBar()               
{ return fMenuBar; };
-                       BMenu*                          FileMenu()              
{ return fFileMenu; };
+                       BMenu*                          GetFileMenu()   { 
return fFileMenu; };
                                // still needed by containerwindow to 
dynamically change the
                                // kMoveToTrash item's label
                        BNavigator*             Navigator()             { 
return fNavigator; };


Other related posts:

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