ui : improve configuration menu and contactView

- new icon for settings menu in mainwindow.
- adds animations between navwidgets.
- improves look of contactView.
- improves look of quality dialog.
- removes code for bars not used anymore.
- removes some qdebug left.
- fixes paths icons.

Tuleap: #148
Change-Id: I9f04e9c8d13c2064bfc006d95d2dd1c166160092

RingWinClient.pro

@@ -39,7 +39,6 @@ SOURCES += main.cpp\
     callwidget.cpp \
     configurationwidget.cpp \
     navstack.cpp \
-    navbar.cpp \
     navwidget.cpp \
     accountdetails.cpp \
     aboutdialog.cpp \
@@ -64,7 +63,6 @@ SOURCES += main.cpp\
     combar.cpp \
     idlabel.cpp \
     smartlist.cpp \
-    mainwindowtoolbar.cpp \
     ringcontactlineedit.cpp \
     pixbufmanipulator.cpp \
     qualitydialog.cpp
@@ -73,7 +71,6 @@ HEADERS  += mainwindow.h \
     callwidget.h \
     configurationwidget.h \
     navstack.h \
-    navbar.h \
     navwidget.h \
     accountdetails.h \
     aboutdialog.h \
@@ -99,7 +96,6 @@ HEADERS  += mainwindow.h \
     combar.h \
     idlabel.h \
     smartlist.h \
-    mainwindowtoolbar.h \
     ringcontactlineedit.h \
     pixbufmanipulator.h \
     qualitydialog.h \
@@ -113,7 +109,6 @@ contains(DEFINES, URI_PROTOCOL) {
 FORMS    += mainwindow.ui \
     callwidget.ui \
     configurationwidget.ui \
-    navbar.ui \
     accountdetails.ui \
     aboutdialog.ui \
     wizarddialog.ui \

accountdetails.cpp

@@ -40,15 +40,6 @@ AccountDetails::AccountDetails(QWidget *parent) :
 
     setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
 
-    ui->audioCodecView->setShowGrid(false);
-    ui->audioCodecView->verticalHeader()->hide();
-    ui->audioCodecView->horizontalHeader()->hide();
-    ui->videoCodecView->setShowGrid(false);
-    ui->videoCodecView->verticalHeader()->hide();
-    ui->videoCodecView->horizontalHeader()->hide();
-
-    ui->lrcfg_username->setAlignment(Qt::AlignCenter);
-
     connect(ui->lrcfg_tlsCaListCertificate, SIGNAL(clicked(bool)), this, SLOT(onCertButtonClicked()));
     connect(ui->lrcfg_tlsCertificate, SIGNAL(clicked(bool)), this, SLOT(onCertButtonClicked()));
     connect(ui->lrcfg_tlsPrivateKeyCertificate, SIGNAL(clicked(bool)), this, SLOT(onCertButtonClicked()));
@@ -251,3 +242,10 @@ AccountDetails::stopRingtone() {
     if (RingtoneModel::instance().isPlaying())
         RingtoneModel::instance().play(idx);
 }
+
+QPushButton*
+AccountDetails::getDeleteAccountButton()
+{
+    return ui->deleteAccountButton;
+}
+

accountdetails.h

@@ -27,6 +27,8 @@
 #include "audio/codecmodel.h"
 #include "account.h"
 
+class QPushButton;
+
 namespace Ui {
 class AccountDetails;
 }
@@ -39,6 +41,7 @@ public:
     explicit AccountDetails(QWidget* parent = 0);
     ~AccountDetails();
 
+    QPushButton* getDeleteAccountButton();
     void setAccount(Account* currentAccount);
     void save();
 

accountstatedelegate.cpp

@@ -28,9 +28,11 @@ AccountStateDelegate::AccountStateDelegate(QObject *parent) :
 void
 AccountStateDelegate::paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const
 {
+    painter->setRenderHint(QPainter::Antialiasing);
     QStyleOptionViewItemV4 opt = option;
     initStyleOption(&opt, index);
     if (index.column() == 0) {
+        // name & checkbox
         auto name = index.model()->data(index, Qt::DisplayRole).toString();
         opt.text = QString();
         QStyle* style = opt.widget ? opt.widget->style() : QApplication::style();
@@ -41,14 +43,28 @@ AccountStateDelegate::paint(QPainter *painter, const QStyleOptionViewItem &optio
         if (cg == QPalette::Normal && !(opt.state & QStyle::State_Active))
             cg = QPalette::Inactive;
         auto font = painter->font();
-        font.setBold(true);
+        font.setPointSize(12);
         painter->setFont(font);
-        painter->setPen(AccountModel::instance().
-                        getAccountByModelIndex(index)->stateColorName());
         painter->setOpacity(1.0);
+        opt.displayAlignment = Qt::AlignTop;
+
+        painter->setPen(Qt::black);
         painter->drawText(QRect(rect.left() + 25, rect.top(),
                                 rect.width(), rect.height()),
                                 opt.displayAlignment, name);
+
+        // status
+        auto account = AccountModel::instance().getAccountByModelIndex(index);
+        QString stateColor(account->stateColorName());
+        QString accountStatus = account->toHumanStateName();
+
+        painter->setPen(stateColor);
+
+        opt.displayAlignment = Qt::AlignBottom|Qt::AlignLeft;
+
+        painter->drawText(QRect(rect.left() + 25, rect.top(),
+                                rect.width(), rect.height()),
+                                opt.displayAlignment, accountStatus);
     }
 }
 

callutilsdialog.ui

@@ -15,16 +15,16 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <property name="leftMargin">
-    <number>0</number>
+    <number>4</number>
    </property>
    <property name="topMargin">
     <number>4</number>
    </property>
    <property name="rightMargin">
-    <number>0</number>
+    <number>4</number>
    </property>
    <property name="bottomMargin">
-    <number>1</number>
+    <number>4</number>
    </property>
    <item>
     <widget class="QListView" name="contactView"/>

callwidget.cpp

@@ -53,7 +53,7 @@
 #include "pixbufmanipulator.h"
 
 CallWidget::CallWidget(QWidget* parent) :
-    NavWidget(END ,parent),
+    NavWidget(parent),
     ui(new Ui::CallWidget),
     menu_(new QMenu()),
     imDelegate_(new ImDelegate())
@@ -65,6 +65,8 @@ CallWidget::CallWidget(QWidget* parent) :
     setActualCall(nullptr);
     videoRenderer_ = nullptr;
 
+    connect(ui->settingsButton, &QPushButton::clicked, this, &CallWidget::settingsButtonClicked);
+
     connect(ui->videoWidget, SIGNAL(setChatVisibility(bool)),
             ui->instantMessagingWidget, SLOT(setVisible(bool)));
 
@@ -154,7 +156,7 @@ CallWidget::CallWidget(QWidget* parent) :
         setupOutOfCallIM();
         setupSmartListMenu();
 
-        connect(ui->smartList, &SmartList::btnVideoClicked, this, &CallWidget::on_btnComBarVideo_clicked);
+        connect(ui->smartList, &SmartList::btnVideoClicked, this, &CallWidget::btnComBarVideoClicked);
 
         connect(RecentModel::instance().selectionModel(),
                 SIGNAL(selectionChanged(QItemSelection,QItemSelection)),
@@ -558,20 +560,20 @@ CallWidget::placeCall()
 }
 
 void
-CallWidget::settingsButton_clicked()
+CallWidget::settingsButtonClicked()
 {
     ui->smartList->reset();
     emit NavigationRequested(ScreenEnum::ConfScreen);
 }
 
 void
-CallWidget::contactButton_clicked(bool checked)
+CallWidget::contactButtonClicked(bool checked)
 {
     ui->mainTabMenu->setCurrentIndex(checked ? 1 : 0);
 }
 
 void
-CallWidget::historicButton_clicked(bool checked)
+CallWidget::historicButtonClicked(bool checked)
 {
     ui->mainTabMenu->setCurrentIndex(checked ? 2 : 0);
 }
@@ -596,7 +598,7 @@ CallWidget::on_btnCall_clicked()
 }
 
 void
-CallWidget::on_btnComBarVideo_clicked()
+CallWidget::btnComBarVideoClicked()
 {
     if (not highLightedIndex_.isValid())
         return;

callwidget.h

@@ -55,15 +55,16 @@ public:
     void atExit();
 
 public slots:
-    void contactButton_clicked(bool checked);
-    void settingsButton_clicked();
-    void historicButton_clicked(bool checked);
+    void contactButtonClicked(bool checked);
+    void settingsButtonClicked();
+    void historicButtonClicked(bool checked);
+    void showIMOutOfCall(const QModelIndex& nodeIdx);
+    void btnComBarVideoClicked();
+
 //UI SLOTS
 public slots:
     void on_ringContactLineEdit_returnPressed();
     void on_btnCall_clicked();
-    void on_btnComBarVideo_clicked();
-    void showIMOutOfCall(const QModelIndex& nodeIdx);
     inline void on_entered(const QModelIndex& i){highLightedIndex_ = i;};
 
 //UI SLOTS

callwidget.ui

@@ -508,6 +508,70 @@
                 <property name="bottomMargin">
                  <number>0</number>
                 </property>
+                <item>
+                 <layout class="QHBoxLayout" name="horizontalLayout_9">
+                  <property name="spacing">
+                   <number>0</number>
+                  </property>
+                  <property name="topMargin">
+                   <number>7</number>
+                  </property>
+                  <property name="rightMargin">
+                   <number>7</number>
+                  </property>
+                  <item>
+                   <spacer name="horizontalSpacer_11">
+                    <property name="orientation">
+                     <enum>Qt::Horizontal</enum>
+                    </property>
+                    <property name="sizeHint" stdset="0">
+                     <size>
+                      <width>40</width>
+                      <height>20</height>
+                     </size>
+                    </property>
+                   </spacer>
+                  </item>
+                  <item>
+                   <widget class="QPushButton" name="settingsButton">
+                    <property name="sizePolicy">
+                     <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+                      <horstretch>0</horstretch>
+                      <verstretch>0</verstretch>
+                     </sizepolicy>
+                    </property>
+                    <property name="minimumSize">
+                     <size>
+                      <width>30</width>
+                      <height>30</height>
+                     </size>
+                    </property>
+                    <property name="maximumSize">
+                     <size>
+                      <width>30</width>
+                      <height>30</height>
+                     </size>
+                    </property>
+                    <property name="toolTip">
+                     <string>settings menu</string>
+                    </property>
+                    <property name="text">
+                     <string/>
+                    </property>
+                    <property name="icon">
+                     <iconset resource="ressources.qrc">
+                      <normaloff>:/images/icons/ic_settings_white_48dp_2x.png</normaloff>:/images/icons/ic_settings_white_48dp_2x.png</iconset>
+                    </property>
+                    <property name="iconSize">
+                     <size>
+                      <width>18</width>
+                      <height>18</height>
+                     </size>
+                    </property>
+                   </widget>
+                  </item>
+                 </layout>
+                </item>
                 <item>
                  <spacer name="verticalSpacer">
                   <property name="orientation">
@@ -529,15 +593,30 @@
                     <verstretch>0</verstretch>
                    </sizepolicy>
                   </property>
+                  <property name="minimumSize">
+                   <size>
+                    <width>100</width>
+                    <height>100</height>
+                   </size>
+                  </property>
                   <property name="maximumSize">
                    <size>
                     <width>16777215</width>
-                    <height>200</height>
+                    <height>100</height>
                    </size>
                   </property>
                   <property name="text">
                    <string/>
                   </property>
+                  <property name="scaledContents">
+                   <bool>false</bool>
+                  </property>
+                  <property name="alignment">
+                   <set>Qt::AlignCenter</set>
+                  </property>
+                  <property name="wordWrap">
+                   <bool>false</bool>
+                  </property>
                  </widget>
                 </item>
                 <item alignment="Qt::AlignHCenter">
@@ -699,7 +778,7 @@
                     </property>
                     <property name="icon">
                      <iconset resource="ressources.qrc">
-                      <normaloff>:/images/ic_share_white.png</normaloff>:/images/ic_share_white.png</iconset>
+                      <normaloff>:/images/icons/ic_share_white_24dp_2x.png</normaloff>:/images/icons/ic_share_white_24dp_2x.png</iconset>
                     </property>
                     <property name="iconSize">
                      <size>
@@ -811,6 +890,9 @@
                       <height>30</height>
                      </size>
                     </property>
+                    <property name="toolTip">
+                     <string/>
+                    </property>
                     <property name="text">
                      <string/>
                     </property>

configurationwidget.cpp

@@ -23,6 +23,7 @@
 #include <QDir>
 #include <QStandardPaths>
 #include <QFileDialog>
+#include <QPropertyAnimation>
 
 #include "video/devicemodel.h"
 #include "video/channel.h"
@@ -49,7 +50,7 @@
 #endif
 
 ConfigurationWidget::ConfigurationWidget(QWidget *parent) :
-    NavWidget(Nav, parent),
+    NavWidget(parent),
     ui(new Ui::ConfigurationWidget),
     accountModel_(&AccountModel::instance()),
     deviceModel_(&Video::DeviceModel::instance()),
@@ -57,6 +58,26 @@ ConfigurationWidget::ConfigurationWidget(QWidget *parent) :
 {
     ui->setupUi(this);
 
+    connect(ui->exitSettingsButton, &QPushButton::clicked, this, [=]() {
+        if (CallModel::instance().getActiveCalls().size() == 0
+                && Video::PreviewManager::instance().isPreviewing()) {
+            Video::PreviewManager::instance().stopPreview();
+        }
+        accountModel_->save();
+        accountDetails_->save();
+    });
+
+    connect(accountDetails_->getDeleteAccountButton(), &QPushButton::clicked, this, [=]() {
+        auto account = accountModel_->getAccountByModelIndex(
+                    ui->accountView->currentIndex());
+        if (account != accountModel_->ip2ip())
+            accountModel_->remove(account);
+    });
+
+    connect(ui->exitSettingsButton, &QPushButton::clicked, this, [=]() {
+        emit NavigationRequested(ScreenEnum::CallScreen);
+    });
+
     ui->accountView->setModel(accountModel_);
     accountStateDelegate_ = new AccountStateDelegate();
     ui->accountView->setItemDelegate(accountStateDelegate_);
@@ -79,7 +100,7 @@ ConfigurationWidget::ConfigurationWidget(QWidget *parent) :
                 CategorizedHistoryModel::instance().historyLimit());
     ui->closeOrMinCheckBox->setChecked(settings_.value(
                                            SettingsKey::closeOrMinimized).toBool());
-    connect(ui->tabWidget, &QTabWidget::currentChanged, [](int index) {
+    connect(ui->stackedWidget, &QStackedWidget::currentChanged, [](int index) {
         if (index == 1
                 && CallModel::instance().getActiveCalls().size() == 0) {
             Video::PreviewManager::instance().startPreview();
@@ -105,6 +126,32 @@ ConfigurationWidget::ConfigurationWidget(QWidget *parent) :
         Media::RecordingModel::instance().setAlwaysRecording(checked);
     });
 
+    connect(ui->generalTabButton, &QPushButton::toggled, [=] (bool toggled) {
+        if (toggled) {
+            ui->stackedWidget->setCurrentWidget(ui->generalPage);
+            ui->videoTabButton->setChecked(false);
+            ui->accountTabButton->setChecked(false);
+        }
+    });
+
+    connect(ui->videoTabButton, &QPushButton::toggled, [=] (bool toggled) {
+        if (toggled) {
+            ui->stackedWidget->setCurrentWidget(ui->videoPage);
+            ui->accountTabButton->setChecked(false);
+            ui->generalTabButton->setChecked(false);
+        }
+    });
+
+    connect(ui->accountTabButton, &QPushButton::toggled, [=] (bool toggled) {
+        if (toggled) {
+            ui->stackedWidget->setCurrentWidget(ui->accountPage);
+            ui->videoTabButton->setChecked(false);
+            ui->generalTabButton->setChecked(false);
+        }
+    });
+
+    ui->generalTabButton->setChecked(true);
+
 #ifndef ENABLE_AUTOUPDATE
     ui->checkUpdateButton->hide();
     ui->intervalUpdateCheckSpinBox->hide();
@@ -115,7 +162,7 @@ ConfigurationWidget::ConfigurationWidget(QWidget *parent) :
 
 void ConfigurationWidget::showPreview()
 {
-    if (ui->tabWidget->currentIndex() == 1
+    if (ui->stackedWidget->currentIndex() == 1
             && CallModel::instance().getActiveCalls().size() == 0) {
         ui->previewUnavailable->hide();
         ui->videoView->show();
@@ -139,16 +186,6 @@ ConfigurationWidget::showEvent(QShowEvent *event) {
     showPreview();
 }
 
-void
-ConfigurationWidget::atExit() {
-    if (CallModel::instance().getActiveCalls().size() == 0
-            && Video::PreviewManager::instance().isPreviewing()) {
-        Video::PreviewManager::instance().stopPreview();
-    }
-    accountModel_->save();
-    accountDetails_->save();
-}
-
 ConfigurationWidget::~ConfigurationWidget()
 {
     delete ui;
@@ -206,15 +243,6 @@ ConfigurationWidget::accountSelected(QItemSelection itemSel) {
     AccountSerializationAdapter adapter(account, accountDetails_);
 }
 
-void
-ConfigurationWidget::on_deleteAccountButton_clicked()
-{
-    auto account = accountModel_->getAccountByModelIndex(
-                ui->accountView->currentIndex());
-    if (account != accountModel_->ip2ip())
-        accountModel_->remove(account);
-}
-
 void
 ConfigurationWidget::on_addAccountButton_clicked()
 {
@@ -285,7 +313,7 @@ ConfigurationWidget::on_intervalUpdateCheckSpinBox_valueChanged(int arg1)
 }
 
 void
-ConfigurationWidget::on_tabWidget_currentChanged(int index)
+ConfigurationWidget::on_stackedWidget_currentChanged(int index)
 {
     Q_UNUSED(index)
     showPreview();

configurationwidget.h

@@ -41,7 +41,6 @@ class ConfigurationWidget : public NavWidget
 public:
     explicit ConfigurationWidget(QWidget *parent = 0);
     ~ConfigurationWidget();
-    void atExit();
 
 protected:
     void showEvent(QShowEvent *event);
@@ -50,7 +49,6 @@ protected:
 private slots:
     void on_deviceBox_currentIndexChanged(int index);
     void on_sizeBox_currentIndexChanged(int index);
-    void on_deleteAccountButton_clicked();
     void on_addAccountButton_clicked();
     void on_startupBox_toggled(bool checked);
     void on_clearHistoryButton_clicked();
@@ -59,7 +57,7 @@ private slots:
     void on_checkUpdateButton_clicked();
     void on_autoUpdateCheckBox_toggled(bool checked);
     void on_intervalUpdateCheckSpinBox_valueChanged(int arg1);
-    void on_tabWidget_currentChanged(int index);
+    void on_stackedWidget_currentChanged(int index);
     void on_recordPath_clicked();
 
 private slots: