commit 97a21b4d2be31e9c31bb759bfc4158a1219cf5a5
author Nicolas Jager <nicolas.jager@savoirfairelinux.com> Thu Dec 03 16:55:45 2015 -0500
committer Edric Milaret <edric.ladent-milaret@savoirfairelinux.com> Mon Dec 07 11:23:41 2015 -0500
tree 7a47f538c47ca6cc545fb83712b267f25bfaf878
parent e36688f48f58794a053c1a6087aeb3bf80ecec01

Refurbishing of the MS Windows client UI

Tuleap: #148
Change-Id: Iadcad55172a857941eca0e8160f35dff2eabff5a

mainwindow.cpp

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 7087683..1e7f152 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -20,7 +20,6 @@
 #include "ui_mainwindow.h"
 
 #include <QSizeGrip>
-#include "aboutdialog.h"
 
 #include "media/text.h"
 #include "media/textrecording.h"
@@ -31,9 +30,13 @@
 #include <QWinThumbnailToolButton>
 #endif
 
+#include "aboutdialog.h"
+#include "mainwindowtoolbar.h"
+
 MainWindow::MainWindow(QWidget *parent) :
     QMainWindow(parent),
-    ui(new Ui::MainWindow)
+    ui(new Ui::MainWindow),
+    mwToolBar_(new MainWindowToolBar)
 {
     ui->setupUi(this);
 
@@ -49,13 +52,6 @@
     auto configAction = new QAction("Configuration", this);
     menu->addAction(configAction);
 
-    auto exitAction = new QAction("Exit", this);
-    connect(exitAction, &QAction::triggered, []() {
-        QCoreApplication::exit();
-    });
-
-    menu->addAction(exitAction);
-
     sysIcon.setContextMenu(menu);
     sysIcon.show();
 
@@ -78,6 +74,19 @@
         ::AppendMenuA(sysMenu, MF_STRING, IDM_ABOUTBOX, aboutTitle.toStdString().c_str());
     }
 #endif
+
+    resize(1054, 600);
+
+    addToolBar(static_cast<QToolBar*>(mwToolBar_));
+
+    auto callWidget = static_cast<CallWidget*>(navStack_->getNavWidget(ScreenEnum::CallScreen));
+
+    connect(mwToolBar_->getSettingsButton(), &QAction::triggered,
+            callWidget, &CallWidget::on_settingsButton_clicked);
+    connect(mwToolBar_->getHistoryButton(), &QAction::triggered,
+            callWidget, &CallWidget::on_historicButton_clicked);
+    connect(mwToolBar_->getContactListButton(), &QAction::triggered,
+            callWidget, &CallWidget::on_contactButton_clicked);
 }
 
 MainWindow::~MainWindow()
@@ -140,3 +149,12 @@
     thumbbar->addButton(settings);
 #endif
 }
+
+void
+MainWindow::switchNormalMaximize()
+{
+    if(isMaximized())
+        showNormal();
+    else
+        showMaximized();
+}