summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--muse/ChangeLog1
-rw-r--r--muse/muse/Makefile.am2
-rw-r--r--muse/muse/app.cpp2
-rw-r--r--muse/muse/help.cpp4
-rw-r--r--muse/muse/widgets/Makefile.am5
-rw-r--r--muse/muse/widgets/aboutbox.ui2
6 files changed, 11 insertions, 5 deletions
diff --git a/muse/ChangeLog b/muse/ChangeLog
index 5793aab1..13785dcd 100644
--- a/muse/ChangeLog
+++ b/muse/ChangeLog
@@ -1,5 +1,6 @@
12.07.2010
* Fixed: When wave files were edited allocation was on stack which caused crashes for larger selections, now done on heap (rj)
+ * Added: Print svn version in -v and About box. (rj)
10.07.2010
* Added: Insert measure, inserts empty space and moves everything after playpointer to the right and
Part-insert, pastes parts and moves everything after the paste point to the right
diff --git a/muse/muse/Makefile.am b/muse/muse/Makefile.am
index bbf6ae44..253add16 100644
--- a/muse/muse/Makefile.am
+++ b/muse/muse/Makefile.am
@@ -21,7 +21,7 @@ AM_CPPFLAGS += -DENABLE_PYTHON
SUBDIRS += remote
PYLIBS=$(PYTHON_LIB) remote/libremote.a
endif
-
+AM_CXXFLAGS +=-DSVNVERSION=\"$(shell svnversion)\"
EXTRA_PROGRAMS = givertcap
diff --git a/muse/muse/app.cpp b/muse/muse/app.cpp
index 5ac48d23..be1d53b4 100644
--- a/muse/muse/app.cpp
+++ b/muse/muse/app.cpp
@@ -2007,7 +2007,7 @@ bool MusE::saveAs()
static void printVersion(const char* prog)
{
- fprintf(stderr, "%s: Linux Music Editor; Version %s\n", prog, VERSION);
+ fprintf(stderr, "%s: Linux Music Editor; Version %s, (svn revision %s)\n", prog, VERSION, SVNVERSION);
}
//---------------------------------------------------------
diff --git a/muse/muse/help.cpp b/muse/muse/help.cpp
index 0b1f659f..0563d642 100644
--- a/muse/muse/help.cpp
+++ b/muse/muse/help.cpp
@@ -15,7 +15,7 @@
#include "globals.h"
#include "gconfig.h"
#include "icons.h"
-#include "aboutbox.h"
+#include "aboutbox_impl.h"
//---------------------------------------------------------
// startHelpBrowser
@@ -65,7 +65,7 @@ void MusE::startBugBrowser()
void MusE::about()
{
- AboutBox ab;
+ AboutBoxImpl ab;
ab.show();
ab.exec();
}
diff --git a/muse/muse/widgets/Makefile.am b/muse/muse/widgets/Makefile.am
index 9c3236a3..f9c10037 100644
--- a/muse/muse/widgets/Makefile.am
+++ b/muse/muse/widgets/Makefile.am
@@ -9,6 +9,9 @@ libwidgets_a_CPPFLAGS += -include $(top_srcdir)/all.h
## musewidgetsplugin_so_CPPFLAGS += -include $(top_srcdir)/all-pic.h
endif
+AM_CXXFLAGS +=-DSVNVERSION=\"$(shell svnversion)\"
+
+
noinst_LIBRARIES = libwidgets.a
dist_libwidgets_a_SOURCES = \
@@ -71,6 +74,7 @@ dist_libwidgets_a_SOURCES = \
shortcutcapturedialog.cpp shortcutcapturedialog.h \
combobox.cpp combobox.h \
checkbox.cpp checkbox.h \
+ aboutbox_impl.cpp aboutbox_impl.h \
listitem.h \
menutitleitem.h \
\
@@ -150,6 +154,7 @@ nodist_libwidgets_a_SOURCES = \
moc_shortcutconfig.cpp \
moc_shortcutcapturedialog.cpp \
moc_combobox.cpp \
+ moc_aboutbox_impl.cpp\
moc_aboutbox.cpp \
moc_songinfo.cpp \
moc_didyouknow.cpp \
diff --git a/muse/muse/widgets/aboutbox.ui b/muse/muse/widgets/aboutbox.ui
index 4404df03..c2e9235d 100644
--- a/muse/muse/widgets/aboutbox.ui
+++ b/muse/muse/widgets/aboutbox.ui
@@ -71,7 +71,7 @@
</widget>
<widget class="QLabel">
<property name="name">
- <cstring>textLabel1</cstring>
+ <cstring>versionLabel</cstring>
</property>
<property name="text">
<string>Version 1.0.1