diff options
-rw-r--r-- | muse/ChangeLog | 1 | ||||
-rw-r--r-- | muse/configure.ac | 2 | ||||
-rw-r--r-- | muse/muse/widgets/aboutbox.ui | 109 |
3 files changed, 66 insertions, 46 deletions
diff --git a/muse/ChangeLog b/muse/ChangeLog index 8f031aa9..ca5b6193 100644 --- a/muse/ChangeLog +++ b/muse/ChangeLog @@ -1,4 +1,5 @@ 16.09.2010 + * Created rc2 release for 1.1 (rj) * Fixed: Delete track(s) not disconnecting track routes, causing routes to hang around and store in song file. (T356) - Fixed major regressions (my fault) in Song::insertTrack2() and ::removeTrack2(). * Fixed: Dummy audio device: Crashes when Jack midi device created in device manager, or loaded from song. (T356) diff --git a/muse/configure.ac b/muse/configure.ac index 4753c0c5..d67fc4e1 100644 --- a/muse/configure.ac +++ b/muse/configure.ac @@ -2,7 +2,7 @@ dnl -------------------------------------------------- dnl configure.ac for the MusE dnl -------------------------------------------------- -AC_INIT(MusE, 1.1rc1) +AC_INIT(MusE, 1.1rc2) AC_CONFIG_SRCDIR(muse/app.cpp) AM_INIT_AUTOMAKE(1.1) AM_CONFIG_HEADER(config.h) diff --git a/muse/muse/widgets/aboutbox.ui b/muse/muse/widgets/aboutbox.ui index c2e9235d..2dadb447 100644 --- a/muse/muse/widgets/aboutbox.ui +++ b/muse/muse/widgets/aboutbox.ui @@ -1,4 +1,4 @@ -<!DOCTYPE UI><UI version="3.2" stdsetdef="1"> +<!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>AboutBox</class> <widget class="QDialog"> <property name="name"> @@ -8,7 +8,7 @@ <rect> <x>0</x> <y>0</y> - <width>368</width> + <width>377</width> <height>525</height> </rect> </property> @@ -41,55 +41,74 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="QLayoutWidget"> <property name="name"> - <cstring>pixmapLabel1</cstring> + <cstring>layout1</cstring> </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>7</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="maximumSize"> - <size> - <width>32767</width> - <height>32753</height> - </size> - </property> - <property name="pixmap"> - <pixmap>image0</pixmap> - </property> - <property name="scaledContents"> - <bool>false</bool> - </property> - <property name="alignment"> - <set>AlignCenter</set> - </property> - </widget> - <widget class="QLabel"> - <property name="name"> - <cstring>versionLabel</cstring> - </property> - <property name="text"> - <string>Version 1.0.1 - -(C) Copyright 1999-2009 Werner Schweer and others. + <vbox> + <property name="name"> + <cstring>unnamed</cstring> + </property> + <widget class="QLabel"> + <property name="name"> + <cstring>pixmapLabel1</cstring> + </property> + <property name="sizePolicy"> + <sizepolicy> + <hsizetype>7</hsizetype> + <vsizetype>0</vsizetype> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="maximumSize"> + <size> + <width>32767</width> + <height>32753</height> + </size> + </property> + <property name="pixmap"> + <pixmap>image0</pixmap> + </property> + <property name="scaledContents"> + <bool>false</bool> + </property> + <property name="alignment"> + <set>AlignCenter</set> + </property> + </widget> + <widget class="QLabel"> + <property name="name"> + <cstring>versionLabel</cstring> + </property> + <property name="text"> + <string>Version 1.1rc2</string> + </property> + </widget> + <widget class="QLabel"> + <property name="name"> + <cstring>textLabel1</cstring> + </property> + <property name="text"> + <string>(C) Copyright 1999-2010 Werner Schweer and others. See http://www.muse-sequencer.org for new versions and more information. Published under the GNU Public License</string> - </property> - </widget> - <widget class="QPushButton"> - <property name="name"> - <cstring>doneHere</cstring> - </property> - <property name="text"> - <string>&Keep On Rocking!</string> - </property> + </property> + </widget> + <widget class="QPushButton"> + <property name="name"> + <cstring>doneHere</cstring> + </property> + <property name="text"> + <string>&Keep On Rocking!</string> + </property> + <property name="accel"> + <string>Alt+K</string> + </property> + </widget> + </vbox> </widget> </vbox> </widget> |