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

Author: aldeck
Date: 2010-12-03 01:45:29 +0100 (Fri, 03 Dec 2010)
New Revision: 39712
Changeset: http://dev.haiku-os.org/changeset/39712

Modified:
   
haiku/branches/developer/aldeck/tracker_layout/src/kits/tracker/OpenWithWindow.cpp
   
haiku/branches/developer/aldeck/tracker_layout/src/kits/tracker/PoseViewController.cpp
   
haiku/branches/developer/aldeck/tracker_layout/src/kits/tracker/PoseViewController.h
   
haiku/branches/developer/aldeck/tracker_layout/src/kits/tracker/QueryContainerWindow.cpp
Log:
* Set the message on the "Open with..." superitem, was overlooked.
* Cleanup


Modified: 
haiku/branches/developer/aldeck/tracker_layout/src/kits/tracker/OpenWithWindow.cpp
===================================================================
--- 
haiku/branches/developer/aldeck/tracker_layout/src/kits/tracker/OpenWithWindow.cpp
  2010-12-02 23:46:59 UTC (rev 39711)
+++ 
haiku/branches/developer/aldeck/tracker_layout/src/kits/tracker/OpenWithWindow.cpp
  2010-12-03 00:45:29 UTC (rev 39712)
@@ -389,17 +389,12 @@
                RestoreState(*message);
        else
                RestoreState();
-               
-       //Controller()->CreateMenus();
-       //AddContextMenus();
-       //AddCommonShortcuts();
        
        CheckScreenIntersect();
                // check window frame TODO: should be done in restorestate      
        
        Controller()->TitleView()->Reset();
-               // TODO check for a more robust way for the titleview to get 
updates
-       
+
        // set the window title
        if (CountRefs(fEntriesToOpen) == 1) {
                // if opening just one file, use it in the title

Modified: 
haiku/branches/developer/aldeck/tracker_layout/src/kits/tracker/PoseViewController.cpp
===================================================================
--- 
haiku/branches/developer/aldeck/tracker_layout/src/kits/tracker/PoseViewController.cpp
      2010-12-02 23:46:59 UTC (rev 39711)
+++ 
haiku/branches/developer/aldeck/tracker_layout/src/kits/tracker/PoseViewController.cpp
      2010-12-03 00:45:29 UTC (rev 39712)
@@ -221,6 +221,7 @@
                fOpenWithMenu->Superitem()->SetShortcut('O', B_COMMAND_KEY | 
B_CONTROL_KEY);
                int32 count = PoseView()->SelectionList()->CountItems();
                fOpenWithMenu->Superitem()->SetEnabled(count > 0);
+               fOpenWithMenu->Superitem()->SetMessage(new 
BMessage(kOpenSelectionWith));
        }
 }
 

Modified: 
haiku/branches/developer/aldeck/tracker_layout/src/kits/tracker/PoseViewController.h
===================================================================
--- 
haiku/branches/developer/aldeck/tracker_layout/src/kits/tracker/PoseViewController.h
        2010-12-02 23:46:59 UTC (rev 39711)
+++ 
haiku/branches/developer/aldeck/tracker_layout/src/kits/tracker/PoseViewController.h
        2010-12-03 00:45:29 UTC (rev 39712)
@@ -65,12 +65,12 @@
                        void                            SlowOperationEnded();
                        void                            AddPosesCompleted();
 
-                       BMenuBar*                       MenuBar()               
{ return fMenuBar; };
                        // TODO: Not sure we need to expose everything, there's 
no use for it
                        // anymore with the listener mechanism
-                       BMenu*                          AttributeMenu() { 
return fAttributesMenu; };
-                       BMenu*                          WindowMenu()    { 
return fWindowMenu; };
-                       BMenu*                          FileMenu()              
{ return fFileMenu; };
+                       BMenuBar*                       MenuBar()               
{ return fMenuBar; };
+                       BMenu*                          FileMenu()              
{ return fFileMenu; }; 
+                               // still needed by containerwindow to 
dynamically change the
+                               // kMoveToTrash item's label 
                        BNavigator*             Navigator()             { 
return fNavigator; };
                        BTitleView*             TitleView()             { 
return fTitleView; };
                        BPoseView*                      PoseView()              
{ return fPoseView; };

Modified: 
haiku/branches/developer/aldeck/tracker_layout/src/kits/tracker/QueryContainerWindow.cpp
===================================================================
--- 
haiku/branches/developer/aldeck/tracker_layout/src/kits/tracker/QueryContainerWindow.cpp
    2010-12-02 23:46:59 UTC (rev 39711)
+++ 
haiku/branches/developer/aldeck/tracker_layout/src/kits/tracker/QueryContainerWindow.cpp
    2010-12-03 00:45:29 UTC (rev 39712)
@@ -117,7 +117,7 @@
        CheckScreenIntersect();
                // check window frame TODO: should be done in restorestate
        Controller()->TitleView()->Reset();
-               // TODO check for a more robust way for the titleview to get 
updates
+
        Show();
 }
 


Other related posts:

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