changed startup origin

git-svn-id: https://svn.code.sf.net/p/pianobooster/code/trunk@33 ba081f5d-443b-49a7-ac4b-446c3f91f371

PianoBooster/src/CMakeLists.txt

@@ -12,20 +12,11 @@ ENDIF(WIN32)
 # set project's name
 PROJECT( pianobooster )
 
-SET(PB_BASE_SRCS MidiFile.cpp MidiTrack.cpp Song.cpp Conductor.cpp Util.cpp
+SET(PB_BASE_SRCS MidiFile.cpp MidiDevice.cpp MidiTrack.cpp Song.cpp Conductor.cpp Util.cpp
     Chord.cpp Tempo.cpp rtmidi/RtMidi.cpp)
-SET(PB_BASE_HDR MidiFile.h MidiTrack.h Song.h Conductor.h Rating.h Util.h
+SET(PB_BASE_HDR MidiFile.h MidiDevice.h MidiTrack.h Song.h Conductor.h Rating.h Util.h
     MidiDevice.h Chord.h Tempo.h rtmidi/RtMidi.h)
 
-IF(WIN32)
-    SET(PB_BASE_SRCS ${PB_BASE_SRCS} MidiDevice.cpp)
-    ADD_DEFINITIONS(-Wall -g -D__WINDOWS_MM__ -D_WIN32)
-ELSE(WIN32)
-    SET(PB_BASE_SRCS ${PB_BASE_SRCS} MidiDevice.cpp)
-    #ADD_DEFINITIONS("-Wall -ansi -pedantic")
-    ADD_DEFINITIONS(-Wall -g -D__LINUX_ALSASEQ__)
-ENDIF(WIN32)
-
 # with SET() command you can change variables or define new ones
 # here we define PIANOBOOSTER_SRCS variable that contains a list of all .cpp files
 # note that we don't need \ at the end of line
@@ -71,7 +62,6 @@ SET( PIANOBOOSTER_UIS
     ./GuiMidiSetupDialog.ui
     ./GuiKeyboardSetupDialog.ui
     ./GuiPreferencesDialog.ui
-
 )
 
 # and finally an resource file
@@ -80,7 +70,7 @@ SET( PIANOBOOSTER_RCS
 )
 
 # enable warnings
-ADD_DEFINITIONS( -Wall)
+ADD_DEFINITIONS(-Wall)
 
 # by default only QtCore and QtGui modules are enabled
 # other modules must be enabled like this:
@@ -119,12 +109,13 @@ LINK_LIBRARIES( ${QT_LIBRARIES} )
 
 # Add in the link libraries for each operating system
 IF(${CMAKE_SYSTEM} MATCHES "Linux")
+    ADD_DEFINITIONS(-D__LINUX_ALSASEQ__)
     LINK_LIBRARIES (asound)
 ENDIF(${CMAKE_SYSTEM} MATCHES "Linux")
 
 IF(${CMAKE_SYSTEM} MATCHES "Windows")
     FIND_PACKAGE(WINDRES REQUIRED)
-    ADD_DEFINITIONS(-D__WINDOWS_MM__)
+    ADD_DEFINITIONS(-D__WINDOWS_MM__ -D_WIN32)
     LINK_LIBRARIES(winmm opengl32)
 ENDIF(${CMAKE_SYSTEM} MATCHES "Windows")
 
@@ -140,7 +131,6 @@ ADD_EXECUTABLE( pianobooster ${PIANOBOOSTER_SRCS} ${PIANOBOOSTER_MOC_SRCS}
     ${PIANOBOOSTER_UI_HDRS}
 )
 
-SET_TARGET_PROPERTIES(pianobooster PROPERTIES COMPILE_FLAGS "-Wall")
 SET_TARGET_PROPERTIES(pianobooster PROPERTIES LINK_FLAGS "-mwindows")
 
 

PianoBooster/src/Cfg.h

@@ -81,9 +81,9 @@ public:
 
 #if BLACK_BACKGROUND
     static const CColour staveColour()           {return CColour(0.1, 0.7, 0.1);} // green
-    static const CColour staveColourDim()        {return CColour(0.2, 0.5, 0.2);} // grey
+    static const CColour staveColourDim()        {return CColour(0.15, 0.40, 0.15);} // grey
     static const CColour noteColour()            {return CColour(0.1, 0.9, 0.1);} // green
-    static const CColour noteColourDim()         {return CColour(0.3, 0.6, 0.3);} // green
+    static const CColour noteColourDim()         {return CColour(0.25, 0.45, 0.25);} // green
     //static const CColour playedGoodColour()    {return CColour(0.6, 0.6, 1.0);} // grey
     static const CColour playedGoodColour()      {return CColour(0.5, 0.6, 1.0);} // purple 0.6, 0.6, 1.0
     static const CColour playedBadColour()       {return CColour(0.8, 0.3, 0.8);} // orange 0.7, 0.0, 0.0

PianoBooster/src/GuiKeyboardSetupDialog.cpp

@@ -38,6 +38,7 @@ GuiKeyboardSetupDialog::GuiKeyboardSetupDialog(QWidget *parent)
 {
     m_song = 0;
     setupUi(this);
+    setWindowTitle("Piano Keyboard Settings");
 }
 
 void GuiKeyboardSetupDialog::init(CSong* song, QSettings* settings)

PianoBooster/src/GuiMidiSetupDialog.cpp

@@ -40,6 +40,7 @@ GuiMidiSetupDialog::GuiMidiSetupDialog(QWidget *parent)
     m_latencyChanged = false;
     m_midiChanged = false;
 
+    setWindowTitle("Midi Setup");
 }
 
 

PianoBooster/src/GuiPreferencesDialog.cpp

@@ -36,6 +36,7 @@ GuiPreferencesDialog::GuiPreferencesDialog(QWidget *parent)
     m_song = 0;
     m_settings = 0;
     m_glView = 0;
+    setWindowTitle("Preferences");
 }
 
 

PianoBooster/src/GuiSidePanel.ui

@@ -255,7 +255,7 @@
      <property name="orientation" >
       <enum>Qt::Vertical</enum>
      </property>
-     <property name="sizeHint" >
+     <property name="sizeHint" stdset="0" >
       <size>
        <width>100</width>
        <height>11</height>

PianoBooster/src/GuiTopBar.ui

@@ -30,9 +30,6 @@
   <property name="windowTitle" >
    <string>Form</string>
   </property>
-  <property name="windowIcon" >
-   <iconset/>
-  </property>
   <layout class="QHBoxLayout" >
    <property name="sizeConstraint" >
     <enum>QLayout::SetMaximumSize</enum>

PianoBooster/src/Notation.h

@@ -118,7 +118,6 @@ public:
         }
         if (timing < m_maxLeftEdge)
             m_maxLeftEdge = timing;
-ppTrace("m_maxLeftEdge  %d %d", m_maxLeftEdge,  timing); //fixme
     }
 
     void clearAllNoteTimmings()

PianoBooster/src/QtWindow.cpp

@@ -295,8 +295,8 @@ void Window::open()
 
 void Window::readSettings()
 {
-    QPoint pos = m_settings->value("window/pos", QPoint(0, 0)).toPoint();
-    QSize size = m_settings->value("window/size", QSize(600, 400)).toSize();
+    QPoint pos = m_settings->value("window/pos", QPoint(25, 25)).toPoint();
+    QSize size = m_settings->value("window/size", QSize(800, 600)).toSize();
     resize(size);
     move(pos);
 }

PianoBooster/src/ReleaseNote.txt

@@ -21,7 +21,7 @@ v0.5.2 beta1: (7 March 2009)
 - Fix a bug left or right now correctly dim the other stave.
 - Added start-up checks that Open GL is present.
 - Fix the pulse of sound when stopping the music
-- Added timing markers.
+- Added timing markers which show when the pianist pressed the note.
 
 
 */