chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 18:50:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Show GIT branch in titlebar, and GIT revision in about dialog

Browse Source
This commit is contained in:
Mark Watkins 2011-11-09 01:03:39 +10:00
parent 047515dfb0
commit 0cbc058bc9
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
SleepyHeadQT.pro
View File

@ -22,6 +22,15 @@ CONFIG += rtti
TARGET = SleepyHead
TEMPLATE = app
# GIT_VERSION = $$system(git describe --tags --long --abbrev=6 --dirty="*")
#exists(.git):DEFINES += GIT_BRANCH=\\\"$$system(git rev-parse --symbolic-full-name --abbrev-ref HEAD)\\\"
exists(.git):DEFINES += GIT_BRANCH=\\\"$$system(git rev-parse --abbrev-ref HEAD)\\\"
else:DEFINES += GIT_BRANCH=\\\"NOT BUILT FROM GIT SOURCE\\\"
exists(.git):DEFINES += GIT_REVISION=\\\"$$system(git rev-parse HEAD)\\\"
else:DEFINES += GIT_BRANCH=\\\"UNKNOWN\\\"
SOURCES += main.cpp\
SleepLib/machine.cpp \

9
mainwindow.cpp
View File

@ -62,7 +62,9 @@ MainWindow::MainWindow(QWidget *parent) :
logtime.start();
ui->setupUi(this);
this->setWindowTitle(tr("SleepyHead")+QString(" v%1.%2.%3 BREAKY (%4)").arg(major_version).arg(minor_version).arg(revision_number).arg(PREF["Profile"].toString()));
QString version=PREF["VersionString"].toString();
if (QString(GIT_BRANCH)!="master") version+=QString(" ")+QString(GIT_BRANCH);
this->setWindowTitle(tr("SleepyHead")+QString(" v%1 (Profile: %2)").arg(version).arg(PREF["Profile"].toString()));
ui->tabWidget->setCurrentIndex(0);
//move(0,0);
overview=NULL;
@ -368,12 +370,13 @@ void MainWindow::on_webView_loadProgress(int progress)
void MainWindow::on_action_About_triggered()
{
QString msg=tr("<html><body><div align='center'><h2>SleepyHead v%1.%2.%3</h2>Build Date: %4 %5<hr>"
QString msg=tr("<html><body><div align='center'><h2>SleepyHead v%1.%2.%3</h2>Build Date: %4 %5<br/>Revision: %6<hr>"
"Copyright &copy;2011 Mark Watkins (jedimark) <br> \n"
"<a href='http://sleepyhead.sourceforge.net'>http://sleepyhead.sourceforge.net</a> <hr>"
"This software is released under the GNU Public License <br>"
"<i>This software comes with absolutely no warranty, either express of implied. It comes with no guarantee of fitness for any particular purpose. No guarantees are made regarding the accuracy of any data this program displays."
"</div></body></html>").arg(major_version).arg(minor_version).arg(revision_number).arg(__DATE__).arg(__TIME__);
"</div></body></html>").arg(major_version).arg(minor_version).arg(revision_number).arg(__DATE__).arg(__TIME__).arg(GIT_REVISION);
QMessageBox msgbox(QMessageBox::Information,tr("About SleepyHead"),"",QMessageBox::Ok,this);
msgbox.setTextFormat(Qt::RichText);
msgbox.setText(msg);