From 9aa2a3f8653caae553f6f823b330a2b796ef967c Mon Sep 17 00:00:00 2001 From: wmayer Date: Mon, 14 Oct 2013 12:57:00 +0200 Subject: [PATCH] + Use of style sheets --- src/Gui/Application.cpp | 14 ++ src/Gui/DlgGeneral.ui | 37 +++++ src/Gui/DlgGeneralImp.cpp | 60 +++++++- src/Gui/DlgGeneralImp.h | 1 + src/Gui/Icons/background.png | Bin 0 -> 22499 bytes src/Gui/Icons/background.xpm | 265 ----------------------------------- src/Gui/Icons/resource.qrc | 1 + src/Gui/MainWindow.cpp | 13 +- src/Main/MainGui.cpp | 1 - 9 files changed, 121 insertions(+), 271 deletions(-) create mode 100644 src/Gui/Icons/background.png delete mode 100644 src/Gui/Icons/background.xpm diff --git a/src/Gui/Application.cpp b/src/Gui/Application.cpp index 1fe47f5c4..3bf5406ea 100644 --- a/src/Gui/Application.cpp +++ b/src/Gui/Application.cpp @@ -1725,6 +1725,20 @@ void Application::runApplication(void) mw.loadWindowSettings(); } + hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/MainWindow"); + QMdiArea* mdi = mw.findChild(); + mdi->setProperty("showImage", hGrp->GetBool("TiledBackground", false)); + + std::string style = hGrp->GetASCII("StyleSheet"); + if (!style.empty()) { + QFile f(QLatin1String(style.c_str())); + if (f.open(QFile::ReadOnly)) { + mdi->setBackground(QBrush(Qt::NoBrush)); + QTextStream str(&f); + qApp->setStyleSheet(str.readAll()); + } + } + //initialize spaceball. mainApp.initSpaceball(&mw); diff --git a/src/Gui/DlgGeneral.ui b/src/Gui/DlgGeneral.ui index c7ed86359..f7b6bda16 100644 --- a/src/Gui/DlgGeneral.ui +++ b/src/Gui/DlgGeneral.ui @@ -208,6 +208,43 @@ + + + + 0 + + + 6 + + + + + Enable tiled background + + + + + + + + + 0 + + + 6 + + + + + Style sheet: + + + + + + + + diff --git a/src/Gui/DlgGeneralImp.cpp b/src/Gui/DlgGeneralImp.cpp index 920baaa0c..709d157fa 100644 --- a/src/Gui/DlgGeneralImp.cpp +++ b/src/Gui/DlgGeneralImp.cpp @@ -26,6 +26,7 @@ # include # include # include +# include #endif #include "DlgGeneralImp.h" @@ -127,7 +128,7 @@ void DlgGeneralImp::saveSettings() SplashScreen->onSave(); // set new user defined style - (void)QApplication::setStyle(WindowStyle->currentText()); + //(void)QApplication::setStyle(WindowStyle->currentText()); setRecentFileSize(); ParameterGrp::handle hGrp = WindowParameter::getDefaultParameter()->GetGroup("General"); @@ -144,6 +145,40 @@ void DlgGeneralImp::saveSettings() int pixel = size.toInt(); hGrp->SetInt("ToolbarIconSize", pixel); getMainWindow()->setIconSize(QSize(pixel,pixel)); + + hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/MainWindow"); + hGrp->SetBool("TiledBackground", this->tiledBackground->isChecked()); + QMdiArea* mdi = getMainWindow()->findChild(); + mdi->setProperty("showImage", this->tiledBackground->isChecked()); + + QVariant sheet = this->StyleSheets->itemData(this->StyleSheets->currentIndex()); + if (this->selectedStyleSheet != sheet.toString()) { + this->selectedStyleSheet = sheet.toString(); + hGrp->SetASCII("StyleSheet", (const char*)sheet.toByteArray()); + + if (!sheet.toString().isEmpty()) { + QFile f(sheet.toString()); + if (f.open(QFile::ReadOnly)) { + mdi->setBackground(QBrush(Qt::NoBrush)); + QTextStream str(&f); + qApp->setStyleSheet(str.readAll()); + } + } + } + + if (sheet.toString().isEmpty()) { + if (this->tiledBackground->isChecked()) { + qApp->setStyleSheet(QString()); + mdi->setBackground(QPixmap(QLatin1String(":/icons/background.png"))); + } + else { + qApp->setStyleSheet(QString()); + mdi->setBackground(QBrush(QColor(160,160,160))); + } + } + + if (mdi->style()) + mdi->style()->unpolish(qApp); } void DlgGeneralImp::loadSettings() @@ -204,6 +239,29 @@ void DlgGeneralImp::loadSettings() this->toolbarIconSize->addItem(tr("Extra large (%1 x %1)").arg(48), QVariant((int)48)); index = this->toolbarIconSize->findData(QVariant(current)); if (index > -1) this->toolbarIconSize->setCurrentIndex(index); + + hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/MainWindow"); + this->tiledBackground->setChecked(hGrp->GetBool("TiledBackground", false)); + + // List all .css files + QDir dir(QLatin1String(":/stylesheets")); + QString filter = QString::fromAscii("*.css"); + QFileInfoList fileNames = dir.entryInfoList(QStringList(filter), QDir::Files, QDir::Name); + this->StyleSheets->addItem(tr("No style sheet"), QString::fromAscii("")); + for (QFileInfoList::iterator it = fileNames.begin(); it != fileNames.end(); ++it) { + this->StyleSheets->addItem(it->baseName(), it->absoluteFilePath()); + } + + // read also from resource directory + dir.setPath(QString::fromUtf8((App::Application::getResourceDir() + "Gui/Stylesheets/").c_str())); + fileNames = dir.entryInfoList(QStringList(filter), QDir::Files, QDir::Name); + for (QFileInfoList::iterator it = fileNames.begin(); it != fileNames.end(); ++it) { + this->StyleSheets->addItem(it->baseName(), it->absoluteFilePath()); + } + + this->selectedStyleSheet = QString::fromAscii(hGrp->GetASCII("StyleSheet").c_str()); + index = this->StyleSheets->findData(this->selectedStyleSheet); + if (index > -1) this->StyleSheets->setCurrentIndex(index); } void DlgGeneralImp::changeEvent(QEvent *e) diff --git a/src/Gui/DlgGeneralImp.h b/src/Gui/DlgGeneralImp.h index c7c99b45a..42933520e 100644 --- a/src/Gui/DlgGeneralImp.h +++ b/src/Gui/DlgGeneralImp.h @@ -54,6 +54,7 @@ protected: private: void setRecentFileSize(); QTabWidget* watched; + QString selectedStyleSheet; }; } // namespace Dialog diff --git a/src/Gui/Icons/background.png b/src/Gui/Icons/background.png new file mode 100644 index 0000000000000000000000000000000000000000..5ee4473d19eaa2a68c117fe0c66fe330228f704a GIT binary patch literal 22499 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 freecadsplash.png + background.png mouse_pointer.png delete.png edit_remove.png diff --git a/src/Gui/MainWindow.cpp b/src/Gui/MainWindow.cpp index 10ffda39b..675c02a07 100644 --- a/src/Gui/MainWindow.cpp +++ b/src/Gui/MainWindow.cpp @@ -82,7 +82,6 @@ #include "Macro.h" #include "ProgressBar.h" -#include "Icons/background.xpm" #include "WidgetFactory.h" #include "BitmapFactory.h" #include "Splashscreen.h" @@ -292,8 +291,7 @@ MainWindow::MainWindow(QWidget * parent, Qt::WFlags f) d->mdiArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAsNeeded); d->mdiArea->setOption(QMdiArea::DontMaximizeSubWindowOnActivation, false); d->mdiArea->setActivationOrder(QMdiArea::ActivationHistoryOrder); - QPixmap backgnd((const char**) background); - d->mdiArea->setBackground(backgnd); + d->mdiArea->setBackground(QBrush(QColor(160,160,160))); setCentralWidget(d->mdiArea); #endif @@ -1107,8 +1105,15 @@ void MainWindow::closeEvent (QCloseEvent * e) if (e->isAccepted()) { // Send close event to all non-modal dialogs QList dialogs = this->findChildren(); + // It is possible that closing a dialog internally closes further dialogs. Thus, + // we have to check the pointer before. + QList< QPointer > dialogs_ptr; for (QList::iterator it = dialogs.begin(); it != dialogs.end(); ++it) { - (*it)->close(); + dialogs_ptr.append(*it); + } + for (QList< QPointer >::iterator it = dialogs_ptr.begin(); it != dialogs_ptr.end(); ++it) { + if (!(*it).isNull()) + (*it)->close(); } QList mdis = this->findChildren(); // Force to close any remaining (passive) MDI child views diff --git a/src/Main/MainGui.cpp b/src/Main/MainGui.cpp index a9722c7f3..c3823cdf5 100644 --- a/src/Main/MainGui.cpp +++ b/src/Main/MainGui.cpp @@ -61,7 +61,6 @@ #include #include #include -#include #include void PrintInitHelp(void);