Changeset 1276

Timestamp:

10/08/07 00:25:49 (11 months ago)

Author:

calvin

Message:

fix a couple typos in pattern context menu, a command id changed name and wasnt updated everywhere, alt-p in parameterview returns focus, reverted CMachineView::OnViewProperties?

Location:

trunk/src/buzelib

Files:

• MachineParameterView.cpp (modified) (1 diff)
• MachineParameterView.h (modified) (2 diffs)
• MachineView.cpp (modified) (3 diffs)
• MachineView.h (modified) (2 diffs)
• MainFrm.cpp (modified) (1 diff)
• PatternView.cpp (modified) (2 diffs)
• SequenceView.cpp (modified) (1 diff)
• SequenceView.h (modified) (2 diffs)

trunk/src/buzelib/MachineParameterView.cpp

@@ -248 +248 @@
 }
 
+LRESULT CMachineParameterView::OnRestoreFocus(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) {
+        sliderView.SetFocus();  
+        return 0;
+}
 
 LRESULT CMachineParameterView::OnPresetRandom(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/) {

trunk/src/buzelib/MachineParameterView.h

@@ -87 +87 @@
                 COMMAND_ID_HANDLER(ID_PRESET_COPY_TRACK, OnPresetCopyTrack)
 
-                COMMAND_HANDLER(IDC_PRESETDROPDOWN, LBN_SELCHANGE, OnSelChange);
+                COMMAND_HANDLER(IDC_PRESETDROPDOWN, LBN_SELCHANGE, OnSelChange)
+                COMMAND_HANDLER(IDC_PRESETDROPDOWN, CBN_CLOSEUP, OnRestoreFocus)  
                 
                 COMMAND_ID_HANDLER(ID_PARAMETERVIEW_NEXTSLIDER, OnNextSlider)
@@ -133 +134 @@
         
         LRESULT OnShowPresetsToolbar(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);
+        LRESULT OnRestoreFocus(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);
 
         void OnUpdate(CView* pSender, LPARAM lHint, LPVOID pHint);

trunk/src/buzelib/MachineView.cpp

@@ -265 +265 @@
                 document->clearSelectedMachines();
                 document->selectMachine(propMachine);
-                mainFrame->SendMessage(WM_COMMAND, ID_MACHINE_PROPERTIES, 0);
+                mainFrame->SendMessage(WM_COMMAND, ID_MACHINE_PARAMETERS, 0);
         }
         return 0;
@@ -754 +754 @@
         menu.InsertMenu(-1, MF_BYPOSITION|MF_STRING|nGrayIfMultiSel, (UINT_PTR)ID_MACHINE_PATTERNS, "Patterns\tF2");
         menu.InsertMenu(-1, MF_BYPOSITION|MF_STRING|nGrayIfMultiSel, (UINT_PTR)ID_MACHINE_SEQUENCER, "Sequencer");
-        menu.InsertMenu(-1, MF_BYPOSITION|MF_STRING, (UINT_PTR)ID_MACHINE_PROPERTIES, "Parameters\tShift-Enter");
+        menu.InsertMenu(-1, MF_BYPOSITION|MF_STRING, (UINT_PTR)ID_MACHINE_PARAMETERS, "Parameters\tShift-Enter");
 //      menu.InsertMenu(-1, (machine->hasAttributes()&&singleSelect)?0:MF_GRAYED|MF_BYPOSITION|MF_STRING, (UINT_PTR)ID_MACHINE_ATTRIBUTES, "Attributes...");
         menu.InsertMenu(-1, MF_BYPOSITION|MF_STRING, (UINT_PTR)ID_VIEW_PROPERTIES, "Properties\tCtrl+Backspace");
@@ -1523 +1523 @@
 }
 
+LRESULT CMachineView::OnViewProperties(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/) {
+        // NOTE: this is the same as mainframes ID_MACHINE_PROPERTIES!
+        if (document->getSelectedMachines() == 0) return 0;
+
+        if (document->selectedPropertyProvider) 
+                delete document->selectedPropertyProvider;
+        document->selectedPropertyProvider = new CMachinePropertyProvider(*this, document, document->getSelectedMachine(0));
+        document->updateAllViews(0, UpdateProperties);
+        return 0;
+}
+
 bool CMachineView::OnDropMachine(std::string machineName, std::string instrumentName, int x, int y) {
 

trunk/src/buzelib/MachineView.h

@@ -112 +112 @@
                 COMMAND_ID_HANDLER(ID_EDIT_SELECTALL, OnSelectAll)
                 COMMAND_ID_HANDLER(ID_EDIT_CLEARSELECTION, OnClearSelection)
+                COMMAND_ID_HANDLER(ID_VIEW_PROPERTIES, OnViewProperties)
         END_MSG_MAP()
 
@@ -144 +145 @@
         LRESULT OnSelectAll(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
         LRESULT OnClearSelection(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
+        LRESULT OnViewProperties(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
         void OnUpdate(CView* pSender, LPARAM lHint, LPVOID pHint);
 

trunk/src/buzelib/MainFrm.cpp

@@ -832 +832 @@
         if (document->getSelectedMachines() == 0) return 0;
 
+        showPropertyView();
         if (document->selectedPropertyProvider) 
                 delete document->selectedPropertyProvider;

trunk/src/buzelib/PatternView.cpp

@@ -1695 +1695 @@
         bool hasPattern = pattern != 0;
 
-        menu.InsertMenu(-1, (!hasPattern&&!hasMoreTracks?MF_GRAYED:0)|MF_BYPOSITION|MF_STRING, (UINT_PTR)ID_MACHINE_ADDTRACK, "Add Track\tNum +");
-        menu.InsertMenu(-1, (!hasPattern&&!hasLessTracks?MF_GRAYED:0)|MF_BYPOSITION|MF_STRING, (UINT_PTR)ID_MACHINE_REMOVETRACK, "Delete Last Track\tNum -");
+        menu.InsertMenu(-1, (!hasPattern||!hasMoreTracks?MF_GRAYED:0)|MF_BYPOSITION|MF_STRING, (UINT_PTR)ID_MACHINE_ADDTRACK, "Add Track\tCtrl+Num +");
+        menu.InsertMenu(-1, (!hasPattern||!hasLessTracks?MF_GRAYED:0)|MF_BYPOSITION|MF_STRING, (UINT_PTR)ID_MACHINE_REMOVETRACK, "Delete Last Track\tCtrl+Num -");
         menu.InsertMenu(-1, (!hasPattern?MF_GRAYED:0)|MF_BYPOSITION|MF_STRING, (UINT_PTR)ID_PATTERN_DOUBLEROWS, "Double\tCtrl+F");
         menu.InsertMenu(-1, (!hasPattern?MF_GRAYED:0)|MF_BYPOSITION|MF_STRING, (UINT_PTR)ID_PATTERN_HALVEROWS, "Halve\tCtrl+G");
@@ -1710 +1710 @@
         menu.InsertMenu(-1, (!hasPattern?MF_GRAYED:0)|MF_BYPOSITION|MF_STRING, (UINT_PTR)ID_MACHINE_PROPERTIES, "Machine Properties");
         menu.InsertMenu(-1, MF_BYPOSITION|MF_SEPARATOR);
-        menu.InsertMenu(-1, (!hasPattern&&!patternEditor.HasSelection()?MF_GRAYED:0)|MF_BYPOSITION|MF_STRING, (UINT_PTR)ID_EDIT_CUT, "Cut\tCtrl+X");
-        menu.InsertMenu(-1, (!hasPattern&&!patternEditor.HasSelection()?MF_GRAYED:0)|MF_BYPOSITION|MF_STRING, (UINT_PTR)ID_EDIT_COPY, "Copy\tCtrl+C");
+        menu.InsertMenu(-1, (!hasPattern||!patternEditor.HasSelection()?MF_GRAYED:0)|MF_BYPOSITION|MF_STRING, (UINT_PTR)ID_EDIT_CUT, "Cut\tCtrl+X");
+        menu.InsertMenu(-1, (!hasPattern||!patternEditor.HasSelection()?MF_GRAYED:0)|MF_BYPOSITION|MF_STRING, (UINT_PTR)ID_EDIT_COPY, "Copy\tCtrl+C");
         menu.InsertMenu(-1, (!hasPattern?MF_GRAYED:0)|MF_BYPOSITION|MF_STRING, (UINT_PTR)ID_EDIT_PASTE, "Paste\tCtrl+V");
-        menu.InsertMenu(-1, (!hasPattern&&!patternEditor.HasSelection()?MF_GRAYED:0)|MF_BYPOSITION|MF_STRING, (UINT_PTR)ID_EDIT_CLEAR, "Clear\tDelete");
+        menu.InsertMenu(-1, (!hasPattern||!patternEditor.HasSelection()?MF_GRAYED:0)|MF_BYPOSITION|MF_STRING, (UINT_PTR)ID_EDIT_CLEAR, "Clear\tDelete");
 
         ClientToScreen(&pt);

trunk/src/buzelib/SequenceView.cpp

@@ -749 +749 @@
 }
 
-LRESULT CSequenceView::OnMachineProperties(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/) {
-        metaplugin* p = editor.getMachine();
-        if (p != 0) {
-                document->clearSelectedMachines();
-                document->selectMachine(p);
-                mainFrame->showMachineParameters(p);
-        }
-        return 0;
-}
-
-
 LRESULT CSequenceView::OnHelp(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) {
         mainFrame->showHelpView(ID_HELP_SEQUENCERVIEW);

trunk/src/buzelib/SequenceView.h

@@ -107 +107 @@
                 COMMAND_ID_HANDLER(ID_SEQUENCEVIEW_DROPDOWNSCALE, OnDropdownScale)
                 COMMAND_ID_HANDLER(ID_SEQUENCEVIEW_DROPDOWNSTEP, OnDropdownStep)
-                COMMAND_ID_HANDLER(ID_MACHINE_PROPERTIES, OnMachineProperties)
 
                 COMMAND_ID_HANDLER(ID_PATTERN_CLONE, OnPatternClone)
@@ -183 +182 @@
         LRESULT OnCloseUpStep(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);
         LRESULT OnPatternClone(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);
-        LRESULT OnMachineProperties(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
         
         LRESULT OnPatternCreate(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);