Changeset 5817


Ignore:
Timestamp:
03/21/14 08:17:38 (6 years ago)
Author:
rohit_tandon
Message:

Elapse back will work with Play section. In zoom panel elapse back will work only within the zoomed phrase.

Location:
trunk/Obi/Obi/ProjectView
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Obi/Obi/ProjectView/ProjectView.cs

    r5816 r5817  
    3838        public event EventHandler BlocksVisibilityChanged; // triggered when phrase blocks are bbecoming  visible or invisible // @phraseLimit 
    3939        public event ProgressChangedEventHandler ProgressChanged; //Updates the toolstrip progress bar on obi form 
     40        private KeyboardShortcuts_Settings keyboardShortcuts; 
    4041         
    4142     
     
    33863387                mContentView.InitializeShortcutKeys(); 
    33873388 
    3388                 KeyboardShortcuts_Settings keyboardShortcuts = ObiForm.KeyboardShortcuts; 
     3389            keyboardShortcuts = ObiForm.KeyboardShortcuts; 
    33893390            mShortcutKeys = new Dictionary<Keys, HandledShortcutKey> (); 
    33903391            mShortcutKeys[keyboardShortcuts.ProjectView_MoveToNextViewClockwise.Value] = delegate() { return SelectViewsInCycle(true); }; 
     
    33973398            mShortcutKeys[keyboardShortcuts.ProjectView_HardResetAllSettings.Value] = delegate() { return SettingsFileHardReset(); }; 
    33983399            mShortcutKeys[keyboardShortcuts.ContentView_TransportBarExpandPlayOptions.Value] = delegate() { return TransportBar.ExpandPlayOptions(); }; 
    3399             mShortcutKeys[keyboardShortcuts.ContentView_TransportBarExpandRecordOptions.Value] = delegate() { return TransportBar.ExpandRecordOptions(); }; 
    3400             mShortcutKeys[keyboardShortcuts.ContentView_FastPlayNormalizeWithElapseBack.Value] = delegate() { return TransportBar.FastPlayNormaliseWithLapseBack(); }; 
     3400            mShortcutKeys[keyboardShortcuts.ContentView_TransportBarExpandRecordOptions.Value] = delegate() { return TransportBar.ExpandRecordOptions(); };            
    34013401            mTransportBar.InitializeTooltipsForTransportpar(); 
    34023402 
     
    34173417            if (!CanUseKey ( key )) return false; 
    34183418            SetF1Help(key); 
     3419            if (key==keyboardShortcuts.ContentView_FastPlayNormalizeWithElapseBack.Value) 
     3420            { 
     3421                if(Selection!=null && Selection.Node!=null && Selection.Node is PhraseNode) 
     3422                SelectPhraseInContentView((PhraseNode)Selection.Node); 
     3423            } 
    34193424            return (((msg.Msg == WM_KEYDOWN) || (msg.Msg == WM_SYSKEYDOWN)) && 
    34203425                CanUseKey ( key ) && mShortcutKeys.ContainsKey ( key ) && mShortcutKeys[key] ()) || 
  • trunk/Obi/Obi/ProjectView/TransportBar.cs

    r5813 r5817  
    16461646                    mCurrentPlaylist = mMasterPlaylist; //@masternewbehaviour 
    16471647                    PhraseNode currentPhrase = FindPlaybackStartNode(mView.Selection == null ? null : mView.Selection.Node); 
    1648                     if (currentPhrase != null) mCurrentPlaylist.CurrentPhrase = currentPhrase; 
     1648                    if (currentPhrase != null) 
     1649                    { 
     1650                        mCurrentPlaylist.CurrentPhrase = currentPhrase; 
     1651                    } 
    16491652                    UpdateButtons(); 
    16501653                } 
     
    26042607            { 
    26052608                double time = ((AudioSelection)mView.Selection).AudioRange.CursorTime; 
    2606                 if (time < 1 && ((mView.Selection.Node.PrecedingNode is PhraseNode) || (mView.Selection.Node.PrecedingNode is EmptyNode))) 
     2609                if (time < 1 && !mView.IsZoomWaveformActive && ((mView.Selection.Node.PrecedingNode is PhraseNode) || (mView.Selection.Node.PrecedingNode is EmptyNode))) 
    26072610                { 
    26082611                    ObiNode preceedingNode = mView.Selection.Node.PrecedingNode; 
Note: See TracChangeset for help on using the changeset viewer.