diff --git a/CMakeLists.txt b/CMakeLists.txt index 407bf9887..228c74eb5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,7 +29,7 @@ SET(PROJECT_AUTHOR "LMMS Developers") SET(PROJECT_URL "http://lmms.io") SET(PROJECT_EMAIL "lmms-devel@lists.sourceforge.net") SET(PROJECT_DESCRIPTION "${PROJECT_NAME_UCASE} - Free music production software") -SET(PROJECT_COPYRIGHT "${PROJECT_AUTHOR}, 2008-${PROJECT_YEAR}") +SET(PROJECT_COPYRIGHT "2008-${PROJECT_YEAR} ${PROJECT_AUTHOR}") SET(VERSION_MAJOR "1") SET(VERSION_MINOR "1") SET(VERSION_PATCH "3") diff --git a/src/core/main.cpp b/src/core/main.cpp index fb3598c4d..d5beb6d9b 100644 --- a/src/core/main.cpp +++ b/src/core/main.cpp @@ -82,14 +82,6 @@ static inline QString baseName( const QString & file ) -static std::string getCurrentYear() -{ - return QString::number( QDate::currentDate().year() ).toStdString(); -} - - - - inline void loadTranslation( const QString & tname, const QString & dir = ConfigManager::inst()->localeDir() ) { @@ -107,14 +99,14 @@ inline void loadTranslation( const QString & tname, void printVersion( char *executableName ) { printf( "LMMS %s\n(%s %s, Qt %s, %s)\n\n" - "Copyright (c) 2004-%s LMMS developers.\n\n" + "Copyright (c) %s\n\n" "This program is free software; you can redistribute it and/or\n" "modify it under the terms of the GNU General Public\n" "License as published by the Free Software Foundation; either\n" "version 2 of the License, or (at your option) any later version.\n\n" "Try \"%s --help\" for more information.\n\n", LMMS_VERSION, PLATFORM, MACHINE, QT_VERSION_STR, GCC_VERSION, - getCurrentYear().c_str(), executableName ); + LMMS_PROJECT_COPYRIGHT, executableName ); } @@ -123,7 +115,7 @@ void printVersion( char *executableName ) void printHelp() { printf( "LMMS %s\n" - "Copyright (c) 2004-%s LMMS developers.\n\n" + "Copyright (c) %s\n\n" "Usage: lmms [ -r ] [ options ]\n" " [ -u ]\n" " [ -d ]\n" @@ -157,7 +149,7 @@ void printHelp() "-v, --version Show version information and exit.\n" " --allowroot Bypass root user startup check (use with caution).\n" "-h, --help Show this usage information and exit.\n\n", - LMMS_VERSION, getCurrentYear().c_str() ); + LMMS_VERSION, LMMS_PROJECT_COPYRIGHT ); } diff --git a/src/gui/AboutDialog.cpp b/src/gui/AboutDialog.cpp index 6d39a8e46..69fe2b107 100644 --- a/src/gui/AboutDialog.cpp +++ b/src/gui/AboutDialog.cpp @@ -46,9 +46,12 @@ AboutDialog::AboutDialog(QWidget* parent) : arg( QT_VERSION_STR ). arg( GCC_VERSION ) ); + copyrightLabel->setText( copyrightLabel->text(). + arg( LMMS_PROJECT_COPYRIGHT ) ); + authorLabel->setPlainText( embed::getText( "AUTHORS" ) ); - licenseLabel->setPlainText( embed::getText( "COPYING" ) ); + licenseLabel->setPlainText( embed::getText( "LICENSE.txt" ) ); involvedLabel->setPlainText( embed::getText( "CONTRIBUTORS" ) ); } diff --git a/src/gui/dialogs/about_dialog.ui b/src/gui/dialogs/about_dialog.ui index 6d9a11337..d6ce6ff81 100644 --- a/src/gui/dialogs/about_dialog.ui +++ b/src/gui/dialogs/about_dialog.ui @@ -133,9 +133,9 @@ - + - Copyright (c) 2004-2014, LMMS developers + Copyright © %1 true diff --git a/src/lmmsversion.h.in b/src/lmmsversion.h.in index 09c82ea0f..4f575d154 100644 --- a/src/lmmsversion.h.in +++ b/src/lmmsversion.h.in @@ -3,4 +3,4 @@ #define LMMS_VERSION_PATCH @VERSION_PATCH@ #define LMMS_VERSION_SUFFIX "@VERSION_SUFFIX@" #define LMMS_VERSION "@VERSION@" - +#define LMMS_PROJECT_COPYRIGHT "@PROJECT_COPYRIGHT@"