Restore window frame for now

Author: Nico-Duduf

src/duqf-app/app-version.h

@@ -3,7 +3,7 @@
 
 #define VERSION_MAJOR 0
 #define VERSION_MINOR 9
-#define VERSION_BUILD 0
+#define VERSION_BUILD 1
 #define VERSION_SUFFIX "Beta"
 
 #define STRINGIFY_VERSION(A, B, C) CONCAT(A, B, C )

src/duqf-app/duui.cpp

@@ -36,18 +36,18 @@ void DuUI::buildUI(const QCommandLineParser &cli, DuSplashScreen *s)
 {
     s->newMessage("Building UI");
 
-#ifdef _WIN32
+//#ifdef _WIN32
 
     //On Windows, the widget needs to be encapsulated in a native window for frameless rendering
     //In this case, QWinWidget creates the mainwindow, and adds it to a layout
-    QWinWidget *w = new QWinWidget(cli);
+    /*QWinWidget *w = new QWinWidget(cli);
 
     // Restore Geometry and state
     w->restoreGeometry( DuSettingsManager::instance()->uiWindowGeometry() );
     w->getMainWindow()->restoreState(DuSettingsManager::instance()->uiWindowState());
     // But hide the docks for a cleaner look
-    //w->getMainWindow()->hideAllDocks();
-#else
+    //w->getMainWindow()->hideAllDocks();*/
+//#else
     //On OS X / Linux, the widget can handle everything itself so just create Widget as normal
     MainWindow *w = new MainWindow( cli );
 
@@ -56,7 +56,7 @@ void DuUI::buildUI(const QCommandLineParser &cli, DuSplashScreen *s)
     w->restoreState(DuSettingsManager::instance()->uiWindowState());
     // But hide the docks for a cleaner look
     //w->hideAllDocks();
-#endif
+//#endif
 
     //if (!cli.isSet("no_ui"))
     w->show();

src/duqf-widgets/dumainwindow.cpp

@@ -48,7 +48,7 @@ void DuMainWindow::addDockWidget(Qt::DockWidgetArea area, DuDockWidget *dockwidg
 
 void DuMainWindow::setupUi()
 {
-    this->setWindowIcon(QIcon(":/icons/app"));
+    this->setWindowIcon(QIcon(APP_ICON));
     QMainWindow::setWindowTitle(QStringLiteral(STR_INTERNALNAME));
 
     QWidget *centralWidget = new QWidget(this);
@@ -69,11 +69,10 @@ void DuMainWindow::setupToolBar()
     ui_mainToolBar->setProperty("osClass", "win");
 #elif defined(Q_OS_MAC)
     ui_mainToolBar->setProperty("osClass", "mac");
-    ui_mainToolBar->installEventFilter(this);
 #elif defined(Q_OS_LINUX)
     ui_mainToolBar->setProperty("osClass", "linux");
-    ui_mainToolBar->installEventFilter(this);
 #endif
+    ui_mainToolBar->installEventFilter(this);
 
     // Appearance
     ui_mainToolBar->setObjectName("mainToolBar");
@@ -91,9 +90,9 @@ void DuMainWindow::connectEvents()
 {
     // Window Buttons
 #ifdef Q_OS_WIN
-    connect(m_minimizeAction, &QAction::triggered, this, &DuMainWindow::minimizeTriggered);
+    /*connect(m_minimizeAction, &QAction::triggered, this, &DuMainWindow::minimizeTriggered);
     connect(m_maximizeAction, &QAction::triggered, this, &DuMainWindow::maximizeTriggered);
-    connect(m_closeAction, &QAction::triggered, this, &DuMainWindow::close);
+    connect(m_closeAction, &QAction::triggered, this, &DuMainWindow::close);*/
 #endif
 }
 
@@ -323,7 +322,7 @@ void DuMainWindow::addWindowButtons(bool showVersion)
     ui_mainToolBar->addWidget(new DuToolBarSpacer());
 
 #ifdef Q_OS_WIN
-    ui_mainToolBar->addAction(m_minimizeAction);
+    /*ui_mainToolBar->addAction(m_minimizeAction);
     QWidget *minWidget = ui_mainToolBar->widgetForAction(m_minimizeAction);
     minWidget->setFixedSize(
         DuUI::adjustToDpi(QSize(24,24))
@@ -345,7 +344,7 @@ void DuMainWindow::addWindowButtons(bool showVersion)
         DuUI::adjustToDpi(QSize(24,24))
         );
     closeWidget->setObjectName("windowButton");
-    ui_mainToolBar->layout()->setAlignment(closeWidget, Qt::AlignTop);
+    ui_mainToolBar->layout()->setAlignment(closeWidget, Qt::AlignTop);*/
 
 #endif // WIN
 }

src/resources.qrc

@@ -83,6 +83,7 @@
         <file alias="more">resources/icons/more.svg</file>
         <file alias="settings">resources/icons/settings.svg</file>
         <file alias="users90">resources/icons/users90.svg</file>
+        <file alias="app">resources/icons/ramses-icon-small.svg</file>
     </qresource>
     <qresource prefix="/styles">
         <file alias="console">resources/styles/console.css</file>