Changeset 1343

Timestamp:

01/10/08 13:24:37 (9 months ago)

Author:

calvin

Message:

clean out unused ClientViewListener?-stuff, comment out unfinished theme editor and keyboard shortcuts in prefs, paramviews are opened as popup or in last dock automatically

Location:

trunk/src/buzelib

Files:

• AnalyzerView.cpp (modified) (2 diffs)
• AnalyzerView.h (modified) (2 diffs)
• CommentView.cpp (modified) (2 diffs)
• CommentView.h (modified) (3 diffs)
• CpuMeterView.cpp (modified) (2 diffs)
• CpuMeterView.h (modified) (3 diffs)
• DebugView.cpp (modified) (2 diffs)
• DebugView.h (modified) (2 diffs)
• DockTabFrame/ClientViewListener.h (deleted)
• DockTabFrame/DockTabFrame.cpp (modified) (1 diff)
• DockTabFrame/DockTabFrame.h (modified) (11 diffs)
• DockTabFrame/DockTabSerializer.cpp (modified) (1 diff)
• DockTabFrame/DockTabViewManager.h (modified) (1 diff)
• FileBrowserView.cpp (modified) (2 diffs)
• FileBrowserView.h (modified) (3 diffs)
• HelpView.cpp (modified) (2 diffs)
• HelpView.h (modified) (3 diffs)
• InputMixerView.cpp (modified) (2 diffs)
• InputMixerView.h (modified) (2 diffs)
• MachineFolderView.cpp (modified) (2 diffs)
• MachineFolderView.h (modified) (3 diffs)
• MachineParameterView.cpp (modified) (2 diffs)
• MachineParameterView.h (modified) (3 diffs)
• MachineView.cpp (modified) (2 diffs)
• MachineView.h (modified) (3 diffs)
• MainFrm.cpp (modified) (3 diffs)
• MainFrm.h (modified) (18 diffs)
• PatternView.cpp (modified) (2 diffs)
• PatternView.h (modified) (3 diffs)
• PreferencesView.cpp (modified) (3 diffs)
• PreferencesView.h (modified) (2 diffs)
• PreferencesViewProperties.cpp (modified) (1 diff)
• PropertyListView.cpp (modified) (2 diffs)
• PropertyListView.h (modified) (2 diffs)
• RecorderView.cpp (modified) (2 diffs)
• RecorderView.h (modified) (3 diffs)
• SequenceView.cpp (modified) (2 diffs)
• SequenceView.h (modified) (5 diffs)
• WaveTableView.cpp (modified) (2 diffs)
• WaveTableView.h (modified) (5 diffs)

trunk/src/buzelib/AnalyzerView.cpp

@@ -11 +11 @@
 using namespace zzub;
 
-AnalyzerView::AnalyzerView(CMainFrame* frame, ClientViewListener* cl)
-        :clientViewListener( cl)
-        ,fft(MAX_FFT_SIZE, frame->player->masterInfo.samples_per_second)
+AnalyzerView::AnalyzerView(CMainFrame* frame)
+        :fft(MAX_FFT_SIZE, frame->player->masterInfo.samples_per_second)
     ,recorder_buffer(frame->player)
 {
@@ -43 +42 @@
     player->master->removePostProcessor(this);
 
-    mainFrame->closeClientWindow(const_cast<ClientView*>(mainFrame->get(m_hWnd)));
+        mainFrame->closeClientWindow(const_cast<ClientView*>(mainFrame->frame.getClientView(m_hWnd)));
         return 0;
 }

trunk/src/buzelib/AnalyzerView.h

@@ -5 +5 @@
 
 class AnalyzerView : public CWindowImpl<AnalyzerView>, zzub::recorder_buffer {
-        ClientViewListener* clientViewListener;
         CMainFrame* mainFrame;
         zzub::player* player;
@@ -37 +36 @@
 
 
-        AnalyzerView(CMainFrame* frame, ClientViewListener* cl);
+        AnalyzerView(CMainFrame* frame);
         ~AnalyzerView(void);
 

trunk/src/buzelib/CommentView.cpp

@@ -13 +13 @@
 */
 
-CCommentView::CCommentView(CMainFrame* mainFrm, ClientViewListener* cl)
+CCommentView::CCommentView(CMainFrame* mainFrm)
     :CViewImpl<CMainFrame, CDocument, CCommentView>(mainFrm->document)
-        ,clientViewListener(cl)
 {
     mainFrame = mainFrm;
@@ -45 +44 @@
 
 LRESULT CCommentView::OnClose(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) {
-        mainFrame->closeClientWindow(const_cast<ClientView*>(mainFrame->get(m_hWnd)));
+        mainFrame->closeClientWindow(const_cast<ClientView*>(mainFrame->frame.getClientView(m_hWnd)));
     document->removeView(this);
         return 0;

trunk/src/buzelib/CommentView.h

@@ -2 +2 @@
 
 class CMainFrame;
-class ClientViewListener;
 
 class CCommentView 
@@ -8 +7 @@
     , public CWindowImpl<CCommentView> {
 public:
-        ClientViewListener* clientViewListener;
     CMainFrame* mainFrame;
     CEdit edit;
@@ -28 +26 @@
         END_MSG_MAP()
 
-    CCommentView(CMainFrame* mf, ClientViewListener* cl);
+    CCommentView(CMainFrame* mf);
         ~CCommentView();
         LRESULT OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);

trunk/src/buzelib/CpuMeterView.cpp

@@ -10 +10 @@
 using namespace zzub;
 
-CCpuMeterView::CCpuMeterView(CMainFrame* mainFrm, ClientViewListener* cl)
-        :clientViewListener(cl)
-{
+CCpuMeterView::CCpuMeterView(CMainFrame* mainFrm) {
         mainFrame = mainFrm;
 }
@@ -51 +49 @@
 
         mainFrame->removeTimerHandler(this);
-        mainFrame->closeClientWindow(const_cast<ClientView*>(mainFrame->get(m_hWnd)));
+        mainFrame->closeClientWindow(const_cast<ClientView*>(mainFrame->frame.getClientView(m_hWnd)));
         return 0;
 }

trunk/src/buzelib/CpuMeterView.h

@@ -7 +7 @@
 {
 public:
-        ClientViewListener* clientViewListener;
         CListViewCtrl pluginList;
         CStatic details;
@@ -16 +15 @@
 
         BEGIN_MSG_MAP(CCpuMeterView)
-                COMMAND_ID_HANDLER( ID_CLIENTVIEWLIST_DOCKABLE, OnClientViewDockable)
-                COMMAND_ID_HANDLER( ID_CLIENTVIEWLIST_HIDE,     OnClientViewHide)
-                COMMAND_ID_HANDLER( ID_CLIENTVIEWLIST_FLOATING, OnClientViewFloating)
-
                 MESSAGE_HANDLER(WM_CREATE, OnCreate)
                 MESSAGE_HANDLER(WM_CLOSE, OnClose)
@@ -25 +20 @@
         END_MSG_MAP()
 
-        CCpuMeterView(CMainFrame* mainFrm, ClientViewListener* cl);
+        CCpuMeterView(CMainFrame* mainFrm);
         ~CCpuMeterView(void);
-
-        LRESULT OnClientViewDockable(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/) { clientViewListener->clientViewDockable(m_hWnd); return 0; }
-        LRESULT OnClientViewHide(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/) { clientViewListener->clientViewHide(m_hWnd); return 0; }
-        LRESULT OnClientViewFloating(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/) { clientViewListener->clientViewFloating(m_hWnd); return 0; }
 
         LRESULT OnCreate(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/);

trunk/src/buzelib/DebugView.cpp

@@ -4 +4 @@
 #include ".\debugview.h"
 
-CDebugView::CDebugView(CMainFrame* mf, ClientViewListener* cl) {
+CDebugView::CDebugView(CMainFrame* mf) {
         mainFrame = mf;
 }
@@ -21 +21 @@
 
 LRESULT CDebugView::OnClose(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) {
-        mainFrame->closeClientWindow(const_cast<ClientView*>(mainFrame->get(m_hWnd)));
+        mainFrame->closeClientWindow(const_cast<ClientView*>(mainFrame->frame.getClientView(m_hWnd)));
     return 0;
 }

trunk/src/buzelib/DebugView.h

@@ -2 +2 @@
 
 class CMainFrame;
-class ClientViewListener;
 
 class CDebugView : public CWindowImpl<CDebugView> {
 public:
-        ClientViewListener* clientViewListener;
     std::string text;
     CMainFrame* mainFrame;
@@ -19 +17 @@
         END_MSG_MAP()
 
-    CDebugView(CMainFrame* mf, ClientViewListener* cl);
+    CDebugView(CMainFrame* mf);
         ~CDebugView();
         LRESULT OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);

trunk/src/buzelib/DockTabFrame/DockTabFrame.cpp

@@ -6 +6 @@
 
 #include "DockTabFrame.h"
-#include "ClientViewListener.h"
 
-int Frame::DockPane::instanceCount = 0;
-CBrush Frame::DockPane::systemFrameBrush;
-CBrush Frame::DockPane::activeCaptionBrush;
-CBrush Frame::DockPane::inactiveCaptionBrush;
-CBrush Frame::DockPane::activeBorderBrush;
-CBrush Frame::DockPane::inactiveBorderBrush;
+int DockSplitTab::Frame::DockPane::instanceCount = 0;
+CBrush DockSplitTab::Frame::DockPane::systemFrameBrush;
+CBrush DockSplitTab::Frame::DockPane::activeCaptionBrush;
+CBrush DockSplitTab::Frame::DockPane::inactiveCaptionBrush;
+CBrush DockSplitTab::Frame::DockPane::activeBorderBrush;
+CBrush DockSplitTab::Frame::DockPane::inactiveBorderBrush;
                 
-COLORREF Frame::DockPane::activeCaptionTextColor;
-COLORREF Frame::DockPane::inactiveCaptionTextColor;
+COLORREF DockSplitTab::Frame::DockPane::activeCaptionTextColor;
+COLORREF DockSplitTab::Frame::DockPane::inactiveCaptionTextColor;
                 
-int   Frame::DockPane::systemCxFrame;
-int   Frame::DockPane::systemCyFrame;
-int   Frame::DockPane::systemCaptionHeight;
-CFont Frame::DockPane::systemCaptionFont;
+int   DockSplitTab::Frame::DockPane::systemCxFrame;
+int   DockSplitTab::Frame::DockPane::systemCyFrame;
+int   DockSplitTab::Frame::DockPane::systemCaptionHeight;
+CFont DockSplitTab::Frame::DockPane::systemCaptionFont;
                 
-HCURSOR Frame::DockPane::verCursor;
-HCURSOR Frame::DockPane::horCursor;
+HCURSOR DockSplitTab::Frame::DockPane::verCursor;
+HCURSOR DockSplitTab::Frame::DockPane::horCursor;

trunk/src/buzelib/DockTabFrame/DockTabFrame.h

@@ -124 +124 @@
         public:
                 virtual void clientDetached( ClientView* clientView) = 0;
+                virtual void clientChangedPlace( ClientView* clientView, DockSplitTab::FramePlace place, DockSplitTab::DockSide side) = 0;
         };
         
@@ -2122 +2123 @@
                 }
 
-                public:
-                        // anders added
-                void setDockSize(DockSide dockSide, int size) {
-                        layout.resizeDock(dockSide, size);
-                }
-
-                protected:
-                
                 DockPane* createDockPane( DockSide dockSide, int dockWidth, int dockSize, SplitPane* splitPane = NULL) {
                         
@@ -3707 +3700 @@
                                                              );
                                         this->setCurrentPane( &this->mainPane);
+                                        this->cbListener->clientChangedPlace(clientView, placeMAINPANE, dockUNKNOWN);
                                         break;
                                         
@@ -3727 +3721 @@
                                         clientView->dockSide = dropParcel->targetDock;
                                         this->setCurrentPane( splitPane);
+                                        this->cbListener->clientChangedPlace(clientView, placeDOCKPANE, dropParcel->targetDock);
                                         break;
                                         
@@ -3754 +3749 @@
                                                                 );
                                         this->setCurrentPane( splitPane);
+                                        this->cbListener->clientChangedPlace(clientView, placeFLOATFRAME, dockUNKNOWN);
                                         break;
                                         
@@ -3865 +3861 @@
                                                                 clientView->owner = &this->mainPane;
                                                                 clientViewWnd = clientView->wnd;
+                                                                this->cbListener->clientChangedPlace(clientView, placeMAINPANE, dockUNKNOWN);
                                                         }
                                                 } while ( NULL != position);
@@ -3885 +3882 @@
                                         
                                         targetDockPane = this->dockPanes[ dropParcel->targetDock];
-                                        if ( NULL == targetDockPane)
+                                        if ( NULL == targetDockPane) {
                                                 
                                                 // create a new dock pane and attach the split pane to it
@@ -3893 +3890 @@
                                                                                      , splitPane
                                                                                      );
-                                        else {
+
+                                                // notify all clientviews belonging to this split pane they place just changed place
+                                                if ( NULL != ( position = this->clientViews.GetStartPosition()))
+                                                        do {
+                                                                ClientView* clientView = this->clientViews.GetNextValue( position);
+                                                                if ( clientView->owner == splitPane)
+                                                                        this->cbListener->clientChangedPlace(clientView, placeDOCKPANE, dropParcel->targetDock);
+                                                        } while ( NULL != position);
+                                        } else {
                                                 
                                                 // move all client windows from the split pane to an existing dock pane
@@ -3910 +3915 @@
                                                                         clientView->owner = targetDockPane->getPane();
                                                                         clientViewWnd = clientView->wnd;
+                                                                        this->cbListener->clientChangedPlace(clientView, placeDOCKPANE, dropParcel->targetDock);
                                                                 }
                                                         } while ( NULL != position);
@@ -3943 +3949 @@
                                                 // create a new float pane and attach the split pane to it
                                                 targetFloatFrame = this->createFloatFrame( floatFrameRect, splitPane);
+
+                                                // notify all clientviews belonging to this split pane they place just changed place
+                                                if ( NULL != ( position = this->clientViews.GetStartPosition()))
+                                                        do {
+                                                                ClientView* clientView = this->clientViews.GetNextValue( position);
+                                                                if ( clientView->owner == targetFloatFrame->getPane())
+                                                                        this->cbListener->clientChangedPlace(clientView, placeFLOATFRAME, dockUNKNOWN);
+                                                        } while ( NULL != position);
                                         } else {
                                                 
@@ -3959 +3973 @@
                                                                                                 );
                                                                         clientView->owner = targetFloatFrame->getPane();
+                                                                        this->cbListener->clientChangedPlace(clientView, placeFLOATFRAME, dockUNKNOWN);
                                                                 }
                                                         } while ( NULL != position);

trunk/src/buzelib/DockTabFrame/DockTabSerializer.cpp

@@ -5 +5 @@
 #include "DockTabViewManager.h"
 #include "DockTabSerializer.h"
-#include "ClientViewListener.h"
-//#include "MultiClientView.h"
 
 using namespace pug;

trunk/src/buzelib/DockTabFrame/DockTabViewManager.h

@@ -133 +133 @@
             tip = toolTip;
 
-                ViewT* view = new ViewT(frame, frame);
+                ViewT* view = new ViewT(frame);
                 RECT rcFrame;
                 frame->GetClientRect(&rcFrame);

trunk/src/buzelib/FileBrowserView.cpp

@@ -101 +101 @@
 
 
-CFileBrowserView::CFileBrowserView(CMainFrame* mainFrm, ClientViewListener* cl)
-        :clientViewListener( cl)
+CFileBrowserView::CFileBrowserView(CMainFrame* mainFrm)
 {
         player = mainFrm->player;
@@ -167 +166 @@
 
         // denne fixet crash når vi lukker hele clienten
-        mainFrame->closeClientWindow(const_cast<ClientView*>(mainFrame->get(m_hWnd)));
+        mainFrame->closeClientWindow(const_cast<ClientView*>(mainFrame->frame.getClientView(m_hWnd)));
         return 0;
 }

trunk/src/buzelib/FileBrowserView.h

@@ -4 +4 @@
         class ClientView;
 }
-class ClientViewListener;
-
 #include "Utils/DragDropImpl.h"
 #include "FileBrowserList.h"
@@ -30 +28 @@
         , public CMessageFilter
 {
-        ClientViewListener* clientViewListener;
-
         zzub::player* player;
         CMainFrame* mainFrame;
@@ -82 +78 @@
         END_MSG_MAP()
 
-        CFileBrowserView(CMainFrame* mainFrm, ClientViewListener* cl);
+        CFileBrowserView(CMainFrame* mainFrm);
         ~CFileBrowserView(void);
 

trunk/src/buzelib/HelpView.cpp

@@ -5 +5 @@
 using namespace DockSplitTab;
 
-CHelpView::CHelpView(CMainFrame* mainFrm, ClientViewListener* cl)
-        :clientViewListener(cl)
-{
+CHelpView::CHelpView(CMainFrame* mainFrm) {
     mainFrame = mainFrm;
 }
@@ -53 +51 @@
         pLoop->RemoveMessageFilter(this);
 
-        mainFrame->closeClientWindow(const_cast<ClientView*>(mainFrame->get(m_hWnd)));
+        mainFrame->closeClientWindow(const_cast<ClientView*>(mainFrame->frame.getClientView(m_hWnd)));
 
         return 0;

trunk/src/buzelib/HelpView.h

@@ -2 +2 @@
 
 class CMainFrame;
-class ClientViewListener;
 
 class CHelpView 
@@ -9 +8 @@
 {
 public:
-        ClientViewListener* clientViewListener;
     CMainFrame* mainFrame;
     CFont helpFont;
@@ -25 +23 @@
         END_MSG_MAP()
 
-    CHelpView(CMainFrame* mf, ClientViewListener* cl);
+    CHelpView(CMainFrame* mf);
         ~CHelpView();
         LRESULT OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);

trunk/src/buzelib/InputMixerView.cpp

@@ -10 +10 @@
 using namespace zzub;
 
-CInputMixerView::CInputMixerView(CMainFrame* mainFrm, ClientViewListener* cl)
+CInputMixerView::CInputMixerView(CMainFrame* mainFrm)
     :CViewImpl<CMainFrame, CDocument, CInputMixerView>(mainFrm->document)
-        ,clientViewListener( cl)
 {
     assert(mainFrm->document->getSelectedMachines() > 0);
@@ -26 +25 @@
 LRESULT CInputMixerView::OnClose(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/) {
         // denne fixet crash når vi lukker hele clienten
-        mainFrame->closeClientWindow(const_cast<ClientView*>(mainFrame->get(m_hWnd)));
+        mainFrame->closeClientWindow(const_cast<ClientView*>(mainFrame->frame.getClientView(m_hWnd)));
 
     document->removeView(this);

trunk/src/buzelib/InputMixerView.h

@@ -10 +10 @@
     , public zzub::event_handler
 {
-        ClientViewListener* clientViewListener;
         std::vector<CVisualVolumeSlider*> sliders;
 
@@ -30 +29 @@
         END_MSG_MAP()
 
-        CInputMixerView(CMainFrame* mainFrm, ClientViewListener* cl);
+        CInputMixerView(CMainFrame* mainFrm);
         ~CInputMixerView(void);
 

trunk/src/buzelib/MachineFolderView.cpp

@@ -22 +22 @@
 
 
-MachineFolderView::MachineFolderView(CMainFrame* mainFrm, ClientViewListener* clientViewListener)
-    :clientViewListener( clientViewListener) {
+MachineFolderView::MachineFolderView(CMainFrame* mainFrm) {
         player = mainFrm->player;
         mainFrame = mainFrm;
@@ -35 +34 @@
 
 LRESULT MachineFolderView::OnClose(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/) {
-        mainFrame->closeClientWindow(const_cast<ClientView*>(mainFrame->get(m_hWnd)));
+        mainFrame->closeClientWindow(const_cast<ClientView*>(mainFrame->frame.getClientView(m_hWnd)));
         return 0;
 }