Changeset 1269

Show
Ignore:
Timestamp:
09/27/07 00:53:32 (13 months ago)
Author:
calvin
Message:

pattern editor shift-f doubles pattern length, parameter view alt-p shows preset dropdown (zeffis patch)

Location:
trunk/src/buzelib
Files:
6 modified

Legend:

Unmodified
Added
Removed

  • trunk/src/buzelib/MachineParameterView.cpp

    r1268 r1269  
    6666        presetDropDown.SetFont((HFONT) GetStockObject( DEFAULT_GUI_FONT )); 
    6767 
    68         insertToolbarBand(presetDropDown, "", 100); 
     68        insertToolbarBand(presetDropDown, "&Preset", 100); 
    6969 
    7070        hWndButtonToolBar = mainFrame->CreateSimpleToolBarCtrl(m_hWnd, IDR_PARAMETERS, FALSE, ATL_SIMPLE_TOOLBAR_PANE_STYLE); 
    … …  
    240240        return 0; 
    241241} 
     242 
     243 
     244LRESULT CMachineParameterView::OnShowPresetsToolbar(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) { 
     245presetDropDown.ShowDropDown(); 
     246presetDropDown.SetFocus();  
     247        return 0; 
     248} 
     249 
    242250 
    243251LRESULT CMachineParameterView::OnPresetRandom(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/) { 

  • trunk/src/buzelib/MachineParameterView.h

    r1260 r1269  
    8888 
    8989                COMMAND_HANDLER(IDC_PRESETDROPDOWN, LBN_SELCHANGE, OnSelChange); 
    90  
     90                 
    9191                COMMAND_ID_HANDLER(ID_PARAMETERVIEW_NEXTSLIDER, OnNextSlider) 
    9292                COMMAND_ID_HANDLER(ID_PARAMETERVIEW_PREVIOUSSLIDER, OnPrevSlider) 
    … …  
    9898                COMMAND_ID_HANDLER(ID_PARAMETERVIEW_MOVEPAGELEFT, OnMovePageLeft) 
    9999                COMMAND_ID_HANDLER(ID_PARAMETERVIEW_ENTERVALUE, OnEnterValue) 
     100                COMMAND_ID_HANDLER(ID_PARAMETERVIEW_PRESETS, OnShowPresetsToolbar) 
     101                 
    100102        END_MSG_MAP() 
    101103 
    … …  
    129131        LRESULT OnMovePageLeft(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled); 
    130132        LRESULT OnEnterValue(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled); 
     133         
     134        LRESULT OnShowPresetsToolbar(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled); 
    131135 
    132136        void OnUpdate(CView* pSender, LPARAM lHint, LPVOID pHint); 

  • trunk/src/buzelib/PatternView.cpp

    r1267 r1269  
    403403        return 0; 
    404404} 
     405 
     406// test 010 
     407LRESULT CPatternView::OnPatternDoubleLength(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/) { 
     408    if (pattern == 0) return 0; 
     409        document->setPatternLength(machine, pattern, pattern->getRows() * 2); 
     410        return 0; 
     411} 
     412 
    405413 
    406414LRESULT CPatternView::OnPatternHalveRows(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/) { 

  • trunk/src/buzelib/PatternView.h

    r1260 r1269  
    102102                COMMAND_ID_HANDLER(ID_PATTERN_DELETE, OnPatternDelete) 
    103103                COMMAND_ID_HANDLER(ID_PATTERN_DOUBLEROWS, OnPatternDoubleRows) 
     104                COMMAND_ID_HANDLER(ID_PATTERN_DOUBLELENGTH, OnPatternDoubleLength)       
    104105                COMMAND_ID_HANDLER(ID_PATTERN_HALVEROWS, OnPatternHalveRows) 
    105106                COMMAND_ID_HANDLER(ID_VIEW_PROPERTIES, OnViewProperties) 
    … …  
    231232        LRESULT OnPatternDelete(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled); 
    232233        LRESULT OnPatternDoubleRows(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled); 
     234        LRESULT OnPatternDoubleLength(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled); 
    233235        LRESULT OnPatternHalveRows(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled); 
    234236        LRESULT OnViewProperties(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled); 

  • trunk/src/buzelib/buze.rc

    r1260 r1269  
    816816    "F",            ID_PATTERN_DOUBLEROWS,  VIRTKEY, CONTROL, NOINVERT 
    817817    "G",            ID_PATTERN_HALVEROWS,   VIRTKEY, CONTROL, NOINVERT 
     818        "F",                    ID_PATTERN_DOUBLELENGTH,  VIRTKEY, SHIFT, NOINVERT 
    818819    "Q",            ID_PATTERNVIEW_TRANSPOSESELECTIONUP, VIRTKEY, CONTROL,  
    819820                                                    NOINVERT 
    … …  
    971972        VK_LEFT,                ID_PARAMETERVIEW_MOVEPAGELEFT, CONTROL, VIRTKEY, NOINVERT 
    972973        VK_RETURN,              ID_PARAMETERVIEW_ENTERVALUE, VIRTKEY, NOINVERT 
     974        "p",                    ID_PARAMETERVIEW_PRESETS, VIRTKEY, ALT, NOINVERT         
    973975END 
    974976 
    … …  
    12121214 
    12131215 
     1216 

  • trunk/src/buzelib/resource.h

    r1260 r1269  
    383383#define ID_PATTERNEDITOR_NEXTWAVE               53417 
    384384#define ID_PATTERNEDITOR_PREVWAVE               53418 
     385#define ID_PATTERN_DOUBLELENGTH         53419 
     386#define ID_PARAMETERVIEW_PRESETS                53420 
    385387 
    386388// Next default values for new objects 
    … …  
    389391#ifndef APSTUDIO_READONLY_SYMBOLS 
    390392#define _APS_NEXT_RESOURCE_VALUE        238 
    391 #define _APS_NEXT_COMMAND_VALUE         53417 
     393#define _APS_NEXT_COMMAND_VALUE         53421 
    392394#define _APS_NEXT_CONTROL_VALUE         1082 
    393395#define _APS_NEXT_SYMED_VALUE           101