diff options
| -rw-r--r-- | muse/configure.ac | 5 | ||||
| -rw-r--r-- | muse/muse/arranger/Makefile.am | 2 | ||||
| -rw-r--r-- | muse/muse/driver/Makefile.am | 2 | ||||
| -rw-r--r-- | muse/muse/waveedit/waveview.cpp | 4 | ||||
| -rw-r--r-- | muse/muse/widgets/gensetbase.ui | 33 |
5 files changed, 36 insertions, 10 deletions
diff --git a/muse/configure.ac b/muse/configure.ac index e79419f2..4753c0c5 100644 --- a/muse/configure.ac +++ b/muse/configure.ac @@ -2,9 +2,9 @@ dnl -------------------------------------------------- dnl configure.ac for the MusE dnl -------------------------------------------------- -AC_INIT(MusE, 1.0.1) +AC_INIT(MusE, 1.1rc1) AC_CONFIG_SRCDIR(muse/app.cpp) -AM_INIT_AUTOMAKE(1.0.1) +AM_INIT_AUTOMAKE(1.1) AM_CONFIG_HEADER(config.h) ### AM_MAINTAINER_MODE AM_ACLOCAL_INCLUDE(m4) @@ -747,7 +747,6 @@ synti/organ/Makefile synti/s1/Makefile synti/vam/Makefile synti/deicsonze/Makefile -synti/deicsonze2/Makefile synti/simpledrums/Makefile lib/Makefile lib/synthi/Makefile diff --git a/muse/muse/arranger/Makefile.am b/muse/muse/arranger/Makefile.am index 34861d1a..7b99b4c4 100644 --- a/muse/muse/arranger/Makefile.am +++ b/muse/muse/arranger/Makefile.am @@ -11,7 +11,7 @@ dist_libarranger_a_SOURCES = \ pcanvas.cpp pcanvas.h \ tlist.cpp tlist.h \ alayout.cpp alayout.h \ - trackinfo.cpp + trackinfo.cpp trackautomationview.h nodist_libarranger_a_SOURCES = \ moc_arranger.cpp \ diff --git a/muse/muse/driver/Makefile.am b/muse/muse/driver/Makefile.am index 689b6c95..da3eba07 100644 --- a/muse/muse/driver/Makefile.am +++ b/muse/muse/driver/Makefile.am @@ -6,5 +6,5 @@ AM_CXXFLAGS += $(JACK_CFLAGS) libdriver_a_SOURCES = audiodev.h alsamidi.cpp alsamidi.h jack.cpp jackaudio.h \ dummyaudio.cpp alsatimer.cpp alsatimer.h timerdev.h rtctimer.cpp rtctimer.h \ - jackmidi.cpp + jackmidi.cpp jackmidi.h diff --git a/muse/muse/waveedit/waveview.cpp b/muse/muse/waveedit/waveview.cpp index b3ea7f92..7f298e9a 100644 --- a/muse/muse/waveedit/waveview.cpp +++ b/muse/muse/waveedit/waveview.cpp @@ -551,6 +551,10 @@ void WaveView::cmd(int n) if (modifyoperation != -1) { if (selectionStart == selectionStop) { printf("No selection. Ignoring\n"); //@!TODO: Disable menu options when no selection + QMessageBox::information(this, + QString("MusE"), + QWidget::tr("No selection. Ignoring")); + return; } diff --git a/muse/muse/widgets/gensetbase.ui b/muse/muse/widgets/gensetbase.ui index af81eda9..5de2dbd7 100644 --- a/muse/muse/widgets/gensetbase.ui +++ b/muse/muse/widgets/gensetbase.ui @@ -8,8 +8,8 @@ <rect> <x>0</x> <y>0</y> - <width>520</width> - <height>478</height> + <width>494</width> + <height>499</height> </rect> </property> <property name="caption"> @@ -832,6 +832,14 @@ </property> <widget class="QLayoutWidget" row="0" column="0"> <property name="name"> + <cstring>layout6</cstring> + </property> + <grid> + <property name="name"> + <cstring>unnamed</cstring> + </property> + <widget class="QLayoutWidget" row="0" column="0"> + <property name="name"> <cstring>layout12</cstring> </property> <hbox> @@ -886,6 +894,21 @@ </widget> </hbox> </widget> + <widget class="QLabel" row="1" column="0"> + <property name="name"> + <cstring>textLabel1_6</cstring> + </property> + <property name="font"> + <font> + <pointsize>8</pointsize> + </font> + </property> + <property name="text"> + <string>Note: External editor opened from the internal editor.</string> + </property> + </widget> + </grid> + </widget> </grid> </widget> <widget class="QGroupBox" row="2" column="0"> @@ -1232,7 +1255,7 @@ Shorter periods are desirable.</string> <string>Help Browser:</string> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="4"> + <widget class="QLabel" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -1240,7 +1263,7 @@ Shorter periods are desirable.</string> <string>GUI Refresh Rate</string> </property> </widget> - <widget class="QSpinBox" row="0" column="4" rowspan="1" colspan="2"> + <widget class="QSpinBox" row="0" column="3" rowspan="1" colspan="2"> <property name="name"> <cstring>guiRefreshSelect</cstring> </property> @@ -1257,7 +1280,7 @@ Shorter periods are desirable.</string> <number>20</number> </property> </widget> - <widget class="QLineEdit" row="1" column="1" rowspan="1" colspan="5"> + <widget class="QLineEdit" row="1" column="1" rowspan="1" colspan="4"> <property name="name"> <cstring>helpBrowser</cstring> </property> |