[Performous-commit] Tapio Vierros : Remove syllable timing.

[Tapio V. <aa...@us...>]

Module: editor
Branch: master
Commit: 850a7a036be2aaa215ec0e99d9ccc81ab04bfb0f

Author: Tapio Vierros <tap...@gm...>
Date:   Mon Feb  7 13:03:32 2011 +0200

Remove syllable timing.

---

 editor.ui    |   53 +++++++++++++++--------------------------------------
 editorapp.cc |    2 --
 2 files changed, 15 insertions(+), 40 deletions(-)

diff --git a/editor.ui b/editor.ui
index a0eddfe..ebeeda1 100644
--- a/editor.ui
+++ b/editor.ui
@@ -367,19 +367,6 @@
               </property>
              </widget>
             </item>
-            <item row="1" column="1">
-             <widget class="QPushButton" name="cmdTimeSyllable">
-              <property name="toolTip">
-               <string>Set selected note start to cursor position.</string>
-              </property>
-              <property name="text">
-               <string>Time syllable (N)</string>
-              </property>
-              <property name="shortcut">
-               <string>N</string>
-              </property>
-             </widget>
-            </item>
             <item row="5" column="0">
              <spacer name="verticalSpacer_3">
               <property name="orientation">
@@ -393,53 +380,43 @@
               </property>
              </spacer>
             </item>
-            <item row="4" column="0" colspan="2">
-             <widget class="QLabel" name="lblCurrentSentence">
+            <item row="2" column="0">
+             <widget class="QCheckBox" name="chkGrabSeekHandle">
               <property name="text">
-               <string>Current sentence:</string>
+               <string>Keep playback position in view</string>
+              </property>
+              <property name="checked">
+               <bool>true</bool>
               </property>
              </widget>
             </item>
-            <item row="1" column="2">
+            <item row="1" column="1">
              <widget class="QPushButton" name="cmdTimeSentence">
               <property name="toolTip">
                <string>Set selected note start to cursor position and move to next sentence start.</string>
               </property>
               <property name="text">
-               <string>Time sentence (M)</string>
+               <string>Time phrase (N)</string>
               </property>
               <property name="shortcut">
-               <string>M</string>
-              </property>
-             </widget>
-            </item>
-            <item row="2" column="1">
-             <widget class="QPushButton" name="cmdSkipSyllable">
-              <property name="text">
-               <string>Skip syllable (J)</string>
-              </property>
-              <property name="shortcut">
-               <string>J</string>
+               <string>N</string>
               </property>
              </widget>
             </item>
-            <item row="2" column="2">
+            <item row="1" column="2">
              <widget class="QPushButton" name="cmdSkipSentence">
               <property name="text">
-               <string>Skip Sentence (K)</string>
+               <string>Skip phrase (M)</string>
               </property>
               <property name="shortcut">
-               <string>K</string>
+               <string>M</string>
               </property>
              </widget>
             </item>
-            <item row="2" column="0">
-             <widget class="QCheckBox" name="chkGrabSeekHandle">
+            <item row="2" column="1" colspan="2">
+             <widget class="QLabel" name="lblCurrentSentence">
               <property name="text">
-               <string>Keep playback position in view</string>
-              </property>
-              <property name="checked">
-               <bool>true</bool>
+               <string>Current sentence:</string>
               </property>
              </widget>
             </item>
diff --git a/editorapp.cc b/editorapp.cc
index 77bc47d..4cf0e79 100644
--- a/editorapp.cc
+++ b/editorapp.cc
@@ -40,9 +40,7 @@ EditorApp::EditorApp(QWidget *parent): QMainWindow(parent), gettingStarted(), pr
 	// Custom signals/slots
 	connect(noteGraph, SIGNAL(operationDone(const Operation&)), this, SLOT(operationDone(const Operation&)));
 	connect(noteGraph, SIGNAL(updateNoteInfo(NoteLabel*)), this, SLOT(updateNoteInfo(NoteLabel*)));
-	connect(ui.cmdTimeSyllable, SIGNAL(pressed()), noteGraph, SLOT(timeSyllable()));
 	connect(ui.cmdTimeSentence, SIGNAL(pressed()), noteGraph, SLOT(timeSentence()));
-	connect(ui.cmdSkipSyllable, SIGNAL(pressed()), noteGraph, SLOT(selectNextSyllable()));
 	connect(ui.cmdSkipSentence, SIGNAL(pressed()), noteGraph, SLOT(selectNextSentenceStart()));
 	connect(ui.chkGrabSeekHandle, SIGNAL(toggled(bool)), noteGraph, SLOT(setSeekHandleWrapToViewport(bool)));
 	connect(ui.cmdMusicFile, SIGNAL(clicked()), this, SLOT(on_actionMusicFile_triggered()));