diff options
author | Florian Jung <flo@windfisch.org> | 2013-09-18 22:40:48 +0200 |
---|---|---|
committer | Florian Jung <flo@windfisch.org> | 2013-09-18 22:40:48 +0200 |
commit | 32589cdd760755d685a76d31469798fde74ad827 (patch) | |
tree | d50afd9a2a176846dd6c5b19d734ed9108e44aad /muse2/muse/widgets | |
parent | af09b4f881888b97903cda57907cda571be83b18 (diff) | |
parent | 48a93993cfce160fb7d4cf0b67b4b77e22db19e5 (diff) |
Merge branch 'master' into audiomsg_overhaul
Diffstat (limited to 'muse2/muse/widgets')
-rw-r--r-- | muse2/muse/widgets/aboutbox.ui | 2 | ||||
-rw-r--r-- | muse2/muse/widgets/aboutbox_impl.cpp | 4 | ||||
-rw-r--r-- | muse2/muse/widgets/itransformbase.ui | 15 |
3 files changed, 18 insertions, 3 deletions
diff --git a/muse2/muse/widgets/aboutbox.ui b/muse2/muse/widgets/aboutbox.ui index bf14e099..29497422 100644 --- a/muse2/muse/widgets/aboutbox.ui +++ b/muse2/muse/widgets/aboutbox.ui @@ -58,7 +58,7 @@ <item> <widget class="QLabel" name="textLabel1"> <property name="text"> - <string>(C) Copyright 1999-2012 Werner Schweer and others. + <string>(C) Copyright 1999-2013 Werner Schweer and others. See http://www.muse-sequencer.org for new versions and more information. diff --git a/muse2/muse/widgets/aboutbox_impl.cpp b/muse2/muse/widgets/aboutbox_impl.cpp index b53e246f..fcb96a1d 100644 --- a/muse2/muse/widgets/aboutbox_impl.cpp +++ b/muse2/muse/widgets/aboutbox_impl.cpp @@ -31,8 +31,8 @@ AboutBoxImpl::AboutBoxImpl() setupUi(this); imageLabel->setPixmap(*aboutMuseImage); QString version(VERSION); - QString svnrevision(SVNVERSION); - versionLabel->setText("Version: " + version + " (svn revision: "+ svnrevision +")"); + QString gitstring(GITSTRING); + versionLabel->setText("Version: " + version + (gitstring == QString() ? "" : "\n("+ gitstring + ")")); } } diff --git a/muse2/muse/widgets/itransformbase.ui b/muse2/muse/widgets/itransformbase.ui index 52c29a7e..882f383f 100644 --- a/muse2/muse/widgets/itransformbase.ui +++ b/muse2/muse/widgets/itransformbase.ui @@ -94,6 +94,11 @@ <string>RPN</string> </property> </item> + <item> + <property name="text"> + <string>Program</string> + </property> + </item> </widget> </item> <item row="0" column="2"> @@ -432,6 +437,11 @@ <string>RPN</string> </property> </item> + <item> + <property name="text"> + <string>Program</string> + </property> + </item> </widget> </item> <item row="1" column="1"> @@ -615,6 +625,11 @@ <string>Random</string> </property> </item> + <item> + <property name="text"> + <string>Toggle</string> + </property> + </item> </widget> </item> <item row="1" column="4"> |