mirror/lmms
1
0
Fork 0
mirror of https://github.com/LMMS/lmms.git synced 2026-03-06 15:18:09 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix outdated copyright info, fix license not showing in the about dialog

Browse Source
This commit is contained in:
Umcaruje
2016-01-28 23:19:46 +01:00
parent f528e3d400
commit 3ffa8ac8f5
5 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -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")

16
src/core/main.cpp
View File

@@ -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 <project file> ] [ options ]\n"
" [ -u <in> <out> ]\n"
" [ -d <in> ]\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 );
}

5
src/gui/AboutDialog.cpp
View File

@@ -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" ) );
}

4
src/gui/dialogs/about_dialog.ui
View File

@@ -133,9 +133,9 @@
</spacer>
</item>
<item>
<widget class="QLabel" name="label_3">
<widget class="QLabel" name="copyrightLabel">
<property name="text">
<string>Copyright (c) 2004-2014, LMMS developers</string>
<string>Copyright © %1</string>
</property>
<property name="wordWrap">
<bool>true</bool>

2
src/lmmsversion.h.in
View File

@@ -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@"