From da65f629e2f674a2a7b08957bfdc2745cf57c394 Mon Sep 17 00:00:00 2001 From: Lukas W Date: Fri, 24 Jan 2014 19:28:13 +0100 Subject: [PATCH] #67: Add list of all committers to about window --- CMakeLists.txt | 13 ++++++++++++- src/gui/about_dialog.cpp | 18 +++++++++++++++--- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 92e5d6b67..47c051617 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -346,7 +346,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}) diff --git a/src/gui/about_dialog.cpp b/src/gui/about_dialog.cpp index 41a502696..cd9cca16c 100644 --- a/src/gui/about_dialog.cpp +++ b/src/gui/about_dialog.cpp @@ -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") ); + } } - - -