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

Minor stuff.. Collapse turned off on mac for Jimbo

Browse Source
This commit is contained in:
Mark Watkins 2011-07-23 17:56:13 +10:00
parent 303fb6c7ff
commit 07ca39b914
4 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
daily.cpp
View File

@ -290,9 +290,13 @@ Daily::Daily(QWidget *parent,QGLWidget * shared) :
gSplitter->refresh(); gSplitter->refresh();
// Turning off collapse feature on Mac
#ifndef Q_WS_MAC
gSplitter->setChildrenCollapsible(true); // We set this per widget.. gSplitter->setChildrenCollapsible(true); // We set this per widget..
gSplitter->setCollapsible(gSplitter->indexOf(SF),false); gSplitter->setCollapsible(gSplitter->indexOf(SF),false);
gSplitter->setStretchFactor(gSplitter->indexOf(SF),0); gSplitter->setStretchFactor(gSplitter->indexOf(SF),0);
#endif
ui->graphSizer->layout(); ui->graphSizer->layout();
QTextCharFormat format = ui->calendar->weekdayTextFormat(Qt::Saturday); QTextCharFormat format = ui->calendar->weekdayTextFormat(Qt::Saturday);

2
main.cpp
View File

@ -53,9 +53,9 @@ int main(int argc, char *argv[])
a.setFont(QFont("FreeSans",10)); a.setFont(QFont("FreeSans",10));
qInstallMsgHandler(MyOutputHandler);
MainWindow w; MainWindow w;
mainwin=&w; mainwin=&w;
qInstallMsgHandler(MyOutputHandler);
w.show(); w.show();
return a.exec(); return a.exec();

9
mainwindow.cpp
View File

@ -37,7 +37,6 @@ void MainWindow::Log(QString s)
} }
QString subversion="0";
MainWindow::MainWindow(QWidget *parent) : MainWindow::MainWindow(QWidget *parent) :
QMainWindow(parent), QMainWindow(parent),
ui(new Ui::MainWindow) ui(new Ui::MainWindow)
@ -47,7 +46,7 @@ MainWindow::MainWindow(QWidget *parent) :
// this->showMaximized(); // this->showMaximized();
//#endif //#endif
ui->setupUi(this); ui->setupUi(this);
this->setWindowTitle(tr("SleepyHead")+QString(" v0.8.")+subversion); this->setWindowTitle(tr("SleepyHead")+QString(" v%1.%2.%3").arg(major_version).arg(minor_version).arg(revision_number));
ui->tabWidget->setCurrentIndex(0); ui->tabWidget->setCurrentIndex(0);
PRS1Loader::Register(); PRS1Loader::Register();
@ -140,7 +139,7 @@ MainWindow::~MainWindow()
void MainWindow::Startup() void MainWindow::Startup()
{ {
qDebug() << windowTitle() << "built with Qt"<< QT_VERSION_STR << "on" << __DATE__ << __TIME__;
qstatus->setText(tr("Loading Data")); qstatus->setText(tr("Loading Data"));
qprogress->show(); qprogress->show();
qstatusbar->showMessage("Your computer loads faster than JediMark's",1900); qstatusbar->showMessage("Your computer loads faster than JediMark's",1900);
@ -286,12 +285,12 @@ void MainWindow::on_webView_loadProgress(int progress)
void MainWindow::on_action_About_triggered() void MainWindow::on_action_About_triggered()
{ {
QString msg=tr("<html><body><div align='center'><h2>SleepyHead v0.8.0</h2><hr>" QString msg=tr("<html><body><div align='center'><h2>SleepyHead v%1.%2.%3</h2>Build Date: %4 %5<hr>"
"Copyright &copy;2011 Mark Watkins (jedimark) <br> \n" "Copyright &copy;2011 Mark Watkins (jedimark) <br> \n"
"<a href='http://sleepyhead.sourceforge.net'>http://sleepyhead.sourceforge.net</a> <hr>" "<a href='http://sleepyhead.sourceforge.net'>http://sleepyhead.sourceforge.net</a> <hr>"
"This software is released under the GNU Public License <br>" "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." "<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>"); "</div></body></html>").arg(major_version).arg(minor_version).arg(revision_number).arg(__DATE__).arg(__TIME__);
QMessageBox msgbox(QMessageBox::Information,tr("About SleepyHead"),"",QMessageBox::Ok,this); QMessageBox msgbox(QMessageBox::Information,tr("About SleepyHead"),"",QMessageBox::Ok,this);
msgbox.setTextFormat(Qt::RichText); msgbox.setTextFormat(Qt::RichText);
msgbox.setText(msg); msgbox.setText(msg);

4
mainwindow.h
View File

@ -14,6 +14,10 @@
#include "overview.h" #include "overview.h"
#include "oximetry.h" #include "oximetry.h"
const int major_version=0;
const int minor_version=8;
const int revision_number=1;
namespace Ui { namespace Ui {
class MainWindow; class MainWindow;
} }