summaryrefslogtreecommitdiff
path: root/muse2/muse
diff options
context:
space:
mode:
authorOrcan Ogetbil <oget.fedora@gmail.com>2013-09-02 13:33:18 -0400
committerOrcan Ogetbil <oget.fedora@gmail.com>2013-09-02 13:33:18 -0400
commitb05fdd7bd212cf664eb64ec292936f1843a400f5 (patch)
tree406db9154dbe508b15404c3bb7f65b448d30ad12 /muse2/muse
parent9d08fbdd3ee0e41dd6d13206a31043b72684ada4 (diff)
About box displays the git string and year 2013
Diffstat (limited to 'muse2/muse')
-rw-r--r--muse2/muse/main.cpp5
-rw-r--r--muse2/muse/widgets/aboutbox.ui2
-rw-r--r--muse2/muse/widgets/aboutbox_impl.cpp4
3 files changed, 7 insertions, 4 deletions
diff --git a/muse2/muse/main.cpp b/muse2/muse/main.cpp
index feb14324..2d2165d1 100644
--- a/muse2/muse/main.cpp
+++ b/muse2/muse/main.cpp
@@ -127,7 +127,10 @@ static void getCapabilities()
static void printVersion(const char* prog)
{
- fprintf(stderr, "%s: Linux Music Editor; Version %s, (svn revision %s)\n", prog, VERSION, SVNVERSION);
+ if (strcmp("", GITSTRING))
+ fprintf(stderr, "%s: Linux Music Editor; Version %s, (%s)\n", prog, VERSION, GITSTRING);
+ else
+ fprintf(stderr, "%s: Linux Music Editor; Version %s\n", prog, VERSION);
}
//---------------------------------------------------------
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 + ")"));
}
}