[Performous-commit] Tapio Vierros : Add a push button for changing the music file.

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

Module: editor
Branch: master
Commit: 6baa717e233b84b5aa639bd34b056ebae9aeecf4

Author: Tapio Vierros <tap...@gm...>
Date:   Wed Jan 19 18:11:15 2011 +0200

Add a push button for changing the music file.

---

 editor.ui    |   12 +++++++++++-
 editorapp.cc |    2 ++
 2 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/editor.ui b/editor.ui
index 1b76db0..3706b5c 100644
--- a/editor.ui
+++ b/editor.ui
@@ -77,7 +77,7 @@
         <item row="0" column="0">
          <widget class="QTabWidget" name="tabWidget">
           <property name="currentIndex">
-           <number>0</number>
+           <number>1</number>
           </property>
           <widget class="QWidget" name="tabNote">
            <attribute name="title">
@@ -306,6 +306,16 @@
               </property>
              </spacer>
             </item>
+            <item row="2" column="3">
+             <widget class="QPushButton" name="cmdMusicFile">
+              <property name="toolTip">
+               <string>Change music file...</string>
+              </property>
+              <property name="text">
+               <string>Load music...</string>
+              </property>
+             </widget>
+            </item>
            </layout>
           </widget>
          </widget>
diff --git a/editorapp.cc b/editorapp.cc
index 073049e..512bc2c 100644
--- a/editorapp.cc
+++ b/editorapp.cc
@@ -29,6 +29,8 @@ EditorApp::EditorApp(QWidget *parent): QMainWindow(parent), projectFileName(), h
 	// Custom signals/slots
 	connect(noteGraph, SIGNAL(operationDone(const Operation&)), this, SLOT(operationDone(const Operation&)));
 	connect(noteGraph, SIGNAL(updateNoteInfo(NoteLabel*)), this, SLOT(updateNoteInfo(NoteLabel*)));
+	// Duplicate/reused signals/slots
+	connect(ui.cmdMusicFile, SIGNAL(clicked()), this, SLOT(on_actionMusicFile_triggered()));
 
 	// We must set the initial lyrics here, because constructor doesn't have
 	// signals yet ready, which leads to empty undo stack