hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge pull request #132 from Lukas-W/stable-0.4

Browse Source 
Update about window
This commit is contained in:
Tobias Doerffel
2014-01-24 14:54:03 -08:00
parent 9f39867256 da65f629e2
commit 37b6393893
3 changed files with 30 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
CMakeLists.txt
View File

@@ -347,7 +347,18 @@ FILE(GLOB_RECURSE lmms_SOURCES ${CMAKE_SOURCE_DIR}/src/*.cpp)
SET(lmms_MOC ${lmms_INCLUDES})
SET(lmms_EMBEDDED_RESOURCES ${CMAKE_SOURCE_DIR}/AUTHORS ${CMAKE_SOURCE_DIR}/COPYING)
# Get list of all committers from git history, ordered by number of commits
FIND_PACKAGE(Git)
IF(GIT_FOUND)
SET(CONTRIBUTORS ${CMAKE_BINARY_DIR}/CONTRIBUTORS)
EXECUTE_PROCESS(
COMMAND ${GIT_EXECUTABLE} shortlog -sne
COMMAND cut -c8-
OUTPUT_FILE ${CONTRIBUTORS}
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
ENDIF(GIT_FOUND)
SET(lmms_EMBEDDED_RESOURCES ${CMAKE_SOURCE_DIR}/AUTHORS ${CMAKE_SOURCE_DIR}/COPYING ${CONTRIBUTORS})
QT4_WRAP_CPP(lmms_MOC_out ${lmms_MOC} OPTIONS -nw)
QT4_WRAP_UI(lmms_UI_out ${lmms_UI})

18
src/gui/about_dialog.cpp
View File

@@ -79,7 +79,19 @@ aboutDialog::aboutDialog() :
authorLabel->setPlainText( embed::getText( "AUTHORS" ) );
licenseLabel->setPlainText( embed::getText( "COPYING" ) );
QString contText = embed::getText( "CONTRIBUTORS" );
if ( contText.length() >= 2 )
{
QWidget *widget = new QWidget();
QVBoxLayout *layout = new QVBoxLayout();
QTextEdit *contWidget = new QTextEdit();
contWidget->setReadOnly(true);
contWidget->setText( contText );
layout->addWidget( new QLabel( tr("Contributors ordered by number of commits:"), this ) );
layout->addWidget( contWidget );
widget->setLayout( layout );
tabWidget->insertTab( 2, widget, tr("Involved") );
}
}

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

@@ -1,3 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0" >
<class>AboutDialog</class>
<widget class="QDialog" name="AboutDialog" >
@@ -125,7 +126,7 @@
<item>
<widget class="QLabel" name="label_3" >
<property name="text" >
<string>Copyright (c) 2004-2013, LMMS developers</string>
<string>Copyright (c) 2004-2014, LMMS developers</string>
</property>
<property name="wordWrap" >
<bool>true</bool>
@@ -151,7 +152,7 @@
<item>
<widget class="QLabel" name="label_4" >
<property name="text" >
<string>http://lmms.sourceforge.net</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a href=&quot;http://lmms.sourceforge.net&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://lmms.sourceforge.net&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="wordWrap" >
<bool>true</bool>