This commit is contained in:
+967
-945
File diff suppressed because it is too large
Load Diff
@@ -68,7 +68,9 @@ mainWindowImpl::mainWindowImpl(QMainWindow *parent, const char *name)
|
||||
|
||||
//Toolbox verstecken?
|
||||
if (!myConfig->readConfigInt("ShowToolBox", 1)) { groupBox_tools->hide(); }
|
||||
if (myConfig->readConfigInt("ShowIntro", 1)) { QTimer::singleShot(100, this, SLOT( paintStartSplash() )); }
|
||||
if (myConfig->readConfigInt("ShowIntro", 1)) {
|
||||
label_logo->hide();
|
||||
QTimer::singleShot(100, this, SLOT( paintStartSplash() )); }
|
||||
|
||||
|
||||
pushButton_raise->setDisabled(TRUE);
|
||||
@@ -1384,7 +1386,7 @@ void mainWindowImpl::breakButtonClicked() {
|
||||
|
||||
void mainWindowImpl::paintStartSplash() {
|
||||
|
||||
StartSplash *mySplash = new StartSplash();
|
||||
StartSplash *mySplash = new StartSplash(this);
|
||||
|
||||
mySplash->setMaximumSize(400,250);
|
||||
mySplash->setMinimumSize(400,250);
|
||||
@@ -1404,7 +1406,7 @@ void mainWindowImpl::keyPressEvent ( QKeyEvent * event ) {
|
||||
|
||||
}
|
||||
if (event->key() == 66) {
|
||||
|
||||
label_logo->hide();
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -19,8 +19,8 @@
|
||||
***************************************************************************/
|
||||
#include "startsplash.h"
|
||||
|
||||
StartSplash::StartSplash()
|
||||
: QDialog()
|
||||
StartSplash::StartSplash(mainWindowImpl *parent)
|
||||
: QDialog(), myW(parent)
|
||||
{
|
||||
QFontDatabase::addApplicationFont ("src/gui/qt/fonts/c059013l.pfb");
|
||||
QFontDatabase::addApplicationFont ("src/gui/qt/fonts/andybold.ttf");
|
||||
@@ -236,7 +236,11 @@ void StartSplash::paintEvent(QPaintEvent * event) {
|
||||
|
||||
}
|
||||
|
||||
if(frameNo >= 245) { this->hide(); }
|
||||
if(frameNo >= 245) {
|
||||
this->hide();
|
||||
myW->label_logo->show();
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -14,6 +14,8 @@
|
||||
|
||||
#include <iostream>
|
||||
|
||||
#include "mainwindowimpl.h"
|
||||
|
||||
#include <QtGui>
|
||||
#include <QtCore>
|
||||
|
||||
@@ -21,7 +23,7 @@ class StartSplash : public QDialog
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
StartSplash();
|
||||
StartSplash(mainWindowImpl *);
|
||||
|
||||
~StartSplash();
|
||||
|
||||
@@ -35,6 +37,10 @@ public slots:
|
||||
|
||||
void nextAnimationFrame();
|
||||
|
||||
private:
|
||||
|
||||
mainWindowImpl *myW;
|
||||
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user