diff --git a/src/config/configfile.cpp b/src/config/configfile.cpp index d28acefb..01e35628 100644 --- a/src/config/configfile.cpp +++ b/src/config/configfile.cpp @@ -109,6 +109,9 @@ void ConfigFile::createDefaultConfig() { TiXmlElement * confElement11 = new TiXmlElement( "ShowToolBox" ); config->LinkEndChild( confElement11 ); confElement11->SetAttribute("value", 1); + TiXmlElement * confElement13 = new TiXmlElement( "ShowIntro" ); + config->LinkEndChild( confElement13 ); + confElement13->SetAttribute("value", 1); doc.SaveFile( configFileName ); diff --git a/src/gui/qt/fonts/andybold.ttf b/src/gui/qt/fonts/andybold.ttf new file mode 100644 index 00000000..74cabd1f Binary files /dev/null and b/src/gui/qt/fonts/andybold.ttf differ diff --git a/src/gui/qt/mainwindowimpl.cpp b/src/gui/qt/mainwindowimpl.cpp index 4698f792..bf6ac1be 100755 --- a/src/gui/qt/mainwindowimpl.cpp +++ b/src/gui/qt/mainwindowimpl.cpp @@ -68,6 +68,7 @@ mainWindowImpl::mainWindowImpl(QMainWindow *parent, const char *name) //Toolbox verstecken? if (!myConfig->readConfigInt("ShowToolBox", 1)) { groupBox_tools->hide(); } + if (myConfig->readConfigInt("ShowIntro", 1)) { paintStartSplash(); } pushButton_raise->setDisabled(TRUE); @@ -1385,7 +1386,7 @@ void mainWindowImpl::paintStartSplash() { StartSplash *mySplash = new StartSplash(); - mySplash->setGeometry(0,0,300,200); + mySplash->setGeometry(0,0,400,250); mySplash->setWindowFlags(Qt::SplashScreen); mySplash->show(); diff --git a/src/gui/qt/settingsdialog.ui b/src/gui/qt/settingsdialog.ui index 792deb40..e21b8253 100644 --- a/src/gui/qt/settingsdialog.ui +++ b/src/gui/qt/settingsdialog.ui @@ -235,19 +235,6 @@ 6 - - - - - 75 - true - - - - Interface - - - @@ -255,7 +242,7 @@ - + Qt::Vertical @@ -275,6 +262,26 @@ + + + + + 75 + true + + + + Interface + + + + + + + Show Intro on Startup + + + diff --git a/src/gui/qt/settingsdialogimpl.cpp b/src/gui/qt/settingsdialogimpl.cpp index f5fa9f0f..f0defdb1 100644 --- a/src/gui/qt/settingsdialogimpl.cpp +++ b/src/gui/qt/settingsdialogimpl.cpp @@ -48,6 +48,7 @@ settingsDialogImpl::settingsDialogImpl(QWidget *parent, const char *name) //Interface checkBox_showToolbox->setChecked(myConfig.readConfigInt("ShowToolBox", 1)); + checkBox_showIntro->setChecked(myConfig.readConfigInt("ShowIntro", 1)); connect( buttonBox, SIGNAL( accepted() ), this, SLOT( isAccepted() ) ); @@ -76,5 +77,6 @@ void settingsDialogImpl::isAccepted() { // Interface myConfig.writeConfigInt("ShowToolBox", checkBox_showToolbox->isChecked()); + myConfig.writeConfigInt("ShowIntro", checkBox_showIntro->isChecked()); } diff --git a/src/gui/qt/startsplash/startsplash.cpp b/src/gui/qt/startsplash/startsplash.cpp index 27fa3e41..caf72c78 100644 --- a/src/gui/qt/startsplash/startsplash.cpp +++ b/src/gui/qt/startsplash/startsplash.cpp @@ -23,7 +23,7 @@ StartSplash::StartSplash() : QWidget() { QFontDatabase::addApplicationFont ("src/gui/qt/fonts/c059013l.pfb"); - + QFontDatabase::addApplicationFont ("src/gui/qt/fonts/andybold.ttf"); frameNo = 0; @@ -46,31 +46,201 @@ void StartSplash::nextAnimationFrame() { void StartSplash::paintEvent(QPaintEvent * event) { QPainter painter(this); + QFont welcomeFont("Century Schoolbook L",29); + QFont haveFont("Andy MT",30); + QPixmap logo(":/graphics/graphics/logo-140-100.png"); if(frameNo < 40) { painter.setBrush(QColor(0+frameNo,40+frameNo,6+frameNo)); - painter.drawRect(0,0,299,199); + painter.drawRect(0,0,399,249); } if(frameNo >= 40 && frameNo < 65) { painter.setBrush(QColor(40,80,46)); - painter.drawRect(0,0,299,199); + painter.drawRect(0,0,399,249); } - if(frameNo >= 65 && frameNo < 90) { + if(frameNo >= 65 && frameNo < 68) { painter.setBrush(QColor(40,80,46)); - painter.drawRect(0,0,299,199); + painter.drawRect(0,0,399,249); - QFont font1("Century Schoolbook L",20); - painter.setFont(font1); + + painter.setRenderHint(QPainter::Antialiasing, TRUE); + painter.setFont(welcomeFont); painter.setPen(QColor(255,255,255)); - painter.drawText(20,20,140,40,1,"Welcome"); + painter.drawText(48,30,300,40,4,"W"); } + if(frameNo >= 68 && frameNo < 71) { + + painter.setBrush(QColor(40,80,46)); + painter.drawRect(0,0,399,249); + + painter.setRenderHint(QPainter::Antialiasing, TRUE); + painter.setFont(welcomeFont); + painter.setPen(QColor(255,255,255)); + painter.drawText(48,30,300,40,4,"We"); + + } + + if(frameNo >= 71 && frameNo < 74) { + + painter.setBrush(QColor(40,80,46)); + painter.drawRect(0,0,399,249); + + painter.setRenderHint(QPainter::Antialiasing, TRUE); + painter.setFont(welcomeFont); + painter.setPen(QColor(255,255,255)); + painter.drawText(48,30,300,40,4,"Wel"); + + } + + if(frameNo >= 74 && frameNo < 77) { + + painter.setBrush(QColor(40,80,46)); + painter.drawRect(0,0,399,249); + + painter.setRenderHint(QPainter::Antialiasing, TRUE); + painter.setFont(welcomeFont); + painter.setPen(QColor(255,255,255)); + painter.drawText(48,30,300,40,4,"Welc"); + + } + + if(frameNo >= 77 && frameNo < 80) { + + painter.setBrush(QColor(40,80,46)); + painter.drawRect(0,0,399,249); + + painter.setRenderHint(QPainter::Antialiasing, TRUE); + painter.setFont(welcomeFont); + painter.setPen(QColor(255,255,255)); + painter.drawText(48,30,300,40,4,"Welco"); + + } + + if(frameNo >= 80 && frameNo < 83) { + + painter.setBrush(QColor(40,80,46)); + painter.drawRect(0,0,399,249); + + painter.setRenderHint(QPainter::Antialiasing, TRUE); + painter.setFont(welcomeFont); + painter.setPen(QColor(255,255,255)); + painter.drawText(48,30,300,40,4,"Welcom"); + + } + + if(frameNo >= 83 && frameNo < 92) { + + painter.setBrush(QColor(40,80,46)); + painter.drawRect(0,0,399,249); + + painter.setRenderHint(QPainter::Antialiasing, TRUE); + painter.setFont(welcomeFont); + painter.setPen(QColor(255,255,255)); + painter.drawText(48,30,300,40,4,"Welcome"); + + } + + if(frameNo >= 92 && frameNo < 95) { + + painter.setBrush(QColor(40,80,46)); + painter.drawRect(0,0,399,249); + + painter.setRenderHint(QPainter::Antialiasing, TRUE); + painter.setFont(welcomeFont); + painter.setPen(QColor(255,255,255)); + painter.drawText(48,30,300,40,4,"Welcome t"); + + } + + if(frameNo >= 95 && frameNo < 120 ) { + + painter.setBrush(QColor(40,80,46)); + painter.drawRect(0,0,399,249); + + painter.setRenderHint(QPainter::Antialiasing, TRUE); + painter.setFont(welcomeFont); + painter.setPen(QColor(255,255,255)); + painter.drawText(48,30,300,40,4,"Welcome to"); + + } + + if(frameNo >= 120 && frameNo < 145) { +// + painter.setBrush(QColor(40,80,46)); + painter.drawRect(0,0,399,249); + + painter.setRenderHint(QPainter::Antialiasing, TRUE); + painter.setFont(welcomeFont); + painter.setPen(QColor(255,255,255)); + painter.drawText(48,30,300,40,4,"Welcome to"); + +// painter.setOpacity() + painter.drawPixmap(130,85,140,100,logo); + + } + + if(frameNo >= 145 && frameNo < 157) { +// + painter.setBrush(QColor(40,80,46)); + painter.drawRect(0,0,399,249); + + painter.setRenderHint(QPainter::Antialiasing, TRUE); + painter.setFont(welcomeFont); + painter.setPen(QColor(255,255,255)); + painter.drawText(48,30,300,40,4,"Welcome to"); + + painter.drawPixmap(130,85,140,100,logo); + + } + + if(frameNo >= 157 && frameNo < 200) { +// + painter.setBrush(QColor(40,80,46)); + painter.drawRect(0,0,399,249); + + painter.setRenderHint(QPainter::Antialiasing, TRUE); + painter.setFont(welcomeFont); + painter.setPen(QColor(255,255,255)); + painter.drawText(48,30,300,40,4,"Welcome to"); + +// painter.setOpacity() + painter.drawPixmap(130,85,140,100,logo); + + painter.setFont(haveFont); + painter.setPen(QColor(255,255,255)); + painter.drawText(48,190,300,40,4,"Have a lot of fun!"); + + } + + if(frameNo >= 200 && frameNo < 285) { +// + painter.setBrush(QColor(40,80,46)); + painter.drawRect(0,0,399,249); + + painter.setRenderHint(QPainter::Antialiasing, TRUE); + painter.setFont(welcomeFont); + painter.setPen(QColor(255,255,255)); + painter.drawText(48,30,300,40,4,"Welcome to"); + +// painter.setOpacity() + painter.drawPixmap(130,85,140,100,logo); + + painter.setFont(haveFont); + painter.setPen(QColor(255,255,255)); + painter.drawText(48,190,300,40,4,"Have a lot of fun! ;-)"); + + } + + if(frameNo >= 285 ) { this->hide(); } + + }