updates

8 files changed, 159 insertions, 154 deletions

diff --git a/muse/CMakeLists.txt b/muse/CMakeLists.txt
index fbe97d72..ec1ab318 100644
--- a/muse/CMakeLists.txt
+++ b/muse/CMakeLists.txt
@@ -3,7 +3,7 @@
 #  Linux Music Editor
 #  $Id:$
 #
-#  Copyright (C) 2002-2006 by Werner Schweer and others
+#  Copyright (C) 2002-2008 by Werner Schweer and others
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License version 2.
@@ -41,18 +41,18 @@ set(CMAKE_BUILD_WITH_INSTALL_RPATH ON)
 set(CMAKE_SKIP_RULE_DEPENDENCY TRUE)
 
 # The MusE version number.
-SET(MusE_VERSION_MAJOR 1)
+SET(MusE_VERSION_MAJOR 2)
 SET(MusE_VERSION_MINOR 0)
-SET(MusE_VERSION_PATCH "pre1")
-SET(MusE_VERSION       "1.0")
-SET(MusE_VERSION_FULL  "1.0pre1")
-SET(MusE_INSTALL_NAME  "muse-1.0pre1")
+SET(MusE_VERSION_PATCH 1)
+SET(MusE_VERSION       "2.0.1")
+SET(MusE_VERSION_FULL  "2.0.1")
+SET(MusE_INSTALL_NAME  "muse-2.0")
 
 include ( ${PROJECT_SOURCE_DIR}/cmake/UsePkgConfig1.cmake )
 include ( ${PROJECT_SOURCE_DIR}/cmake/TargetDoc.cmake)
 
 option ( ENABLE_DSSI   "enable Disposable Soft Synth Interface"  ON)
-option ( ENABLE_VST    "enable VST/win support"                 OFF)
+option ( ENABLE_VST    "enable VST/win support"                  OFF)
 option ( ENABLE_FLUID  "enable fluidsynth softsynth plugins"     ON)
 option ( ENABLE_ZYNADDSUBFX "enable zyaddsubfx softsynth plugin" OFF)
 
diff --git a/muse/ChangeLog b/muse/ChangeLog
index 9d3b8889..6e3d4c81 100644
--- a/muse/ChangeLog
+++ b/muse/ChangeLog
@@ -1,4 +1,6 @@
 17.1. (ws)
+      - added svn revision number to "About" box
+      - changed version number to 2.0.1, install to muse-2.0
       - routing pulldown menu in mixer will stay if SHIFT is pressed while clicking;
         this allows for fast selection of more than one routing targets
 30.12. (rj)
diff --git a/muse/NEWS b/muse/NEWS
index a0e50418..e394dd72 100644
--- a/muse/NEWS
+++ b/muse/NEWS
@@ -1,4 +1,4 @@
-MusE 1.0:
+MusE 2.0.1:
       New features:
       - new "project" paradigma
       - "auto fill" parts
@@ -10,33 +10,3 @@ MusE 1.0:
       - new midi routing code
       - midi plugins
       - parts and events are updated in realtime during recording
-
-MusE 0.7:
-      New features:
-
-      - MusE now depends on JACK; midi event timing is coupled
-        to JACK timing i.e
-      - simpler integration of internal software synthesizer;
-        midi events are now delivered directly to synthesizer without
-        ALSA. This eleminates the need of an extra realtime thread
-        for every synthesizer instance.
-      - instrument definition files "*.idf" files now describe
-        available midi controller for instrument
-      - software synthesizer show available midi controller
-        with name in controller editor pulldown
-      - 14 bit midi controllers (RPN'n NRPN's) can be handled in
-        graphical controller editor
-      - imported midi can be added to current song
-      - "New" now shows a selection of template songs to start with
-      - Keyboard shortcuts editor: most (all?) shortcuts can now be changed at
-        runtime.
-      - Redesigned audio-mixer with much improved routing capabilities
-        towards JACK.
-      - Track types extended, input, output, group, aux, wavetrack,
-        softsynth, miditrack, drumtrack
-      - The beginings of automation, only volume/pan at the moment.
-      - Improved RT performance, xruns should be a thing of the past. :)
-      - JACK transport integration
-      - support of JACK "freewheel" mode
-      - extended configuration - configurable shortcuts
-
diff --git a/muse/muse/CMakeLists.txt b/muse/muse/CMakeLists.txt
index d851287a..7e861d96 100644
--- a/muse/muse/CMakeLists.txt
+++ b/muse/muse/CMakeLists.txt
@@ -20,6 +20,17 @@
 
 include(${PROJECT_SOURCE_DIR}/pch.txt)
 
+add_custom_command(
+   OUTPUT ${CMAKE_BINARY_DIR}/revision.h
+   COMMAND svn info ${PROJECT_SOURCE_DIR} | grep Revision | cut -f 2 -d \" \" > ${CMAKE_BINARY_DIR}/revision.h
+   WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+   )
+
+set_source_files_properties(
+      ${PROJECT_BINARY_DIR}/revision.h
+      PROPERTIES generated true
+      )
+
 include_directories(
       ${CMAKE_CURRENT_BINARY_DIR}
       )
@@ -159,6 +170,8 @@ add_executable ( muse
       audioinput.cpp
       audiogroup.cpp
       exportmidi.cpp
+      revision.cpp
+      ${PROJECT_BINARY_DIR}/revision.h
       )
 
 set_target_properties( muse
diff --git a/muse/muse/aboutbox.ui b/muse/muse/aboutbox.ui
index 4016babc..867c5536 100644
--- a/muse/muse/aboutbox.ui
+++ b/muse/muse/aboutbox.ui
@@ -5,8 +5,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>568</width>
-    <height>276</height>
+    <width>585</width>
+    <height>348</height>
    </rect>
   </property>
   <property name="sizePolicy" >
@@ -487,122 +487,104 @@
   <property name="windowTitle" >
    <string>AboutBox</string>
   </property>
-  <layout class="QGridLayout" >
-   <property name="leftMargin" >
-    <number>9</number>
-   </property>
-   <property name="topMargin" >
-    <number>9</number>
-   </property>
-   <property name="rightMargin" >
-    <number>9</number>
-   </property>
-   <property name="bottomMargin" >
-    <number>9</number>
-   </property>
-   <property name="horizontalSpacing" >
-    <number>6</number>
-   </property>
-   <property name="verticalSpacing" >
-    <number>6</number>
-   </property>
-   <item row="0" column="2" >
-    <widget class="QLabel" name="textLabel1" >
-     <property name="sizePolicy" >
-      <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text" >
-      <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;/head>&lt;body style=" white-space: pre-wrap; font-family:Arial; font-size:10pt; font-weight:400; font-style:normal; text-decoration:none;">&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:14pt; font-weight:600;">MusE&lt;/p>&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:14pt; font-weight:600;">&lt;span style=" font-size:10pt; font-weight:400;">Version 2.0.0&lt;/span>&lt;/p>&lt;p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;/p>&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">(C) Copyright 1999-2008 Werner Schweer and Others. &lt;/p>&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">See http://muse-sequencer.org for new versions and&lt;/p>&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">more information.&lt;/p>&lt;p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;/p>&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Published under the GNU Public License&lt;/p>&lt;/body>&lt;/html></string>
-     </property>
-     <property name="wordWrap" >
-      <bool>false</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="1" >
-    <widget class="QLabel" name="label" >
-     <property name="text" >
-      <string/>
-     </property>
-     <property name="pixmap" >
-      <pixmap resource="muse.qrc" >:/xpm/muse_icon_64x64.png</pixmap>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="0" >
-    <widget class="QLabel" name="museIcon" >
-     <property name="sizePolicy" >
-      <sizepolicy vsizetype="Preferred" hsizetype="Fixed" >
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text" >
-      <string/>
-     </property>
-     <property name="textFormat" >
-      <enum>Qt::PlainText</enum>
-     </property>
-     <property name="pixmap" >
-      <pixmap/>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0" colspan="3" >
+  <layout class="QVBoxLayout" >
+   <item>
     <layout class="QHBoxLayout" >
-     <property name="spacing" >
-      <number>6</number>
-     </property>
-     <property name="leftMargin" >
-      <number>0</number>
-     </property>
-     <property name="topMargin" >
-      <number>0</number>
-     </property>
-     <property name="rightMargin" >
-      <number>0</number>
-     </property>
-     <property name="bottomMargin" >
-      <number>0</number>
-     </property>
      <item>
-      <spacer>
-       <property name="orientation" >
-        <enum>Qt::Horizontal</enum>
+      <widget class="QLabel" name="museIcon" >
+       <property name="sizePolicy" >
+        <sizepolicy vsizetype="Preferred" hsizetype="Fixed" >
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
        </property>
-       <property name="sizeHint" >
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QPushButton" name="doneHere" >
        <property name="text" >
-        <string>Keep On Rocking!</string>
+        <string/>
+       </property>
+       <property name="textFormat" >
+        <enum>Qt::PlainText</enum>
+       </property>
+       <property name="pixmap" >
+        <pixmap resource="muse.qrc" >:/xpm/muse_icon_64x64.png</pixmap>
+       </property>
+       <property name="margin" >
+        <number>20</number>
        </property>
       </widget>
      </item>
      <item>
-      <spacer>
-       <property name="orientation" >
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" >
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
+      <layout class="QVBoxLayout" >
+       <item>
+        <widget class="QLabel" name="titleLabel" >
+         <property name="font" >
+          <font>
+           <pointsize>14</pointsize>
+           <weight>75</weight>
+           <bold>true</bold>
+          </font>
+         </property>
+         <property name="text" >
+          <string>MusE</string>
+         </property>
+         <property name="margin" >
+          <number>10</number>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="versionLabel" >
+         <property name="text" >
+          <string>Version: 2.0.1</string>
+         </property>
+         <property name="indent" >
+          <number>20</number>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="revisionLabel" >
+         <property name="text" >
+          <string>Revision: 628</string>
+         </property>
+         <property name="indent" >
+          <number>20</number>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="copyrightLabel" >
+         <property name="sizePolicy" >
+          <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text" >
+          <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
+p, li { white-space: pre-wrap; }
+&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
+&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Arial'; font-size:14pt; font-weight:600;">&lt;span style=" font-size:10pt; font-weight:400;">(C) Copyright 1999-2008 Werner Schweer and Others. &lt;/span>&lt;/p>
+&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Arial'; font-size:10pt;">See http://www.muse-sequencer.org for new versions and&lt;/p>
+&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Arial'; font-size:10pt;">more information.&lt;/p>
+&lt;p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Arial'; font-size:10pt;">&lt;/p>
+&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Arial'; font-size:10pt;">Published under the GNU Public License&lt;/p>&lt;/body>&lt;/html></string>
+         </property>
+         <property name="wordWrap" >
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+      </layout>
      </item>
     </layout>
    </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox" >
+     <property name="standardButtons" >
+      <set>QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11" />
@@ -611,18 +593,18 @@
  </resources>
  <connections>
   <connection>
-   <sender>doneHere</sender>
-   <signal>clicked()</signal>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
    <receiver>AboutBox</receiver>
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel" >
-     <x>279</x>
-     <y>245</y>
+     <x>531</x>
+     <y>326</y>
     </hint>
     <hint type="destinationlabel" >
-     <x>491</x>
-     <y>260</y>
+     <x>582</x>
+     <y>29</y>
     </hint>
    </hints>
   </connection>
diff --git a/muse/muse/help.cpp b/muse/muse/help.cpp
index da5b987a..c17581ae 100644
--- a/muse/muse/help.cpp
+++ b/muse/muse/help.cpp
@@ -18,6 +18,7 @@
 //  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //=============================================================================
 
+#include "config.h"
 #include "muse.h"
 #include "globals.h"
 #include "gconfig.h"
@@ -25,6 +26,18 @@
 #include "help.h"
 
 //---------------------------------------------------------
+//   AboutBoxDialog
+//---------------------------------------------------------
+
+AboutBoxDialog::AboutBoxDialog()
+      {
+      extern int revision;
+      setupUi(this);
+      versionLabel->setText("Version: " VERSION);
+      revisionLabel->setText(QString("Revision: %1").arg(revision));
+      }
+
+//---------------------------------------------------------
 //   startHelpBrowser
 //---------------------------------------------------------
 
diff --git a/muse/muse/help.h b/muse/muse/help.h
index a97bf4f5..c2a54d90 100644
--- a/muse/muse/help.h
+++ b/muse/muse/help.h
@@ -29,9 +29,7 @@
 
 class AboutBoxDialog : public QDialog, Ui::AboutBox {
    public:
-      AboutBoxDialog() {
-            setupUi(this);
-            }
+      AboutBoxDialog();
       };
 
 #endif
diff --git a/muse/muse/revision.cpp b/muse/muse/revision.cpp
new file mode 100644
index 00000000..a1a32dca
--- /dev/null
+++ b/muse/muse/revision.cpp
@@ -0,0 +1,27 @@
+//=============================================================================
+//  MusE
+//  Linux Music Editor
+//  $Id:$
+//
+//  Copyright (C) 2008 by Werner Schweer and others
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
+
+
+int revision =
+
+#include "revision.h"
+
+;
+