style(widget): Style fixes

res.qrc

@@ -131,5 +131,7 @@
         <file>ui/loginScreen/loginScreen.css</file>
         <file>img/others/logout-icon.svg</file>
         <file>img/caps_lock.svg</file>
+        <file>ui/contentDialog/contentDialog.css</file>
+        <file>ui/tooliconsZone/tooliconsZone.css</file>
     </qresource>
 </RCC>

src/widget/categorywidget.cpp

@@ -254,52 +254,25 @@ void CategoryWidget::onCompactChanged(bool _compact)
     topLayout->setSpacing(0);
     topLayout->setMargin(0);
 
-    (void)_compact;
+    Q_UNUSED(_compact);
     setCompact(true);
 
-    if (true)
-    {
-        nameLabel->minimizeMaximumWidth();
+    nameLabel->minimizeMaximumWidth();
 
-        mainLayout = nullptr;
+    mainLayout = nullptr;
 
-        container->setFixedHeight(25);
-        container->setLayout(topLayout);
+    container->setFixedHeight(25);
+    container->setLayout(topLayout);
 
-        topLayout->addSpacing(18);
-        topLayout->addWidget(&statusPic);
-        topLayout->addSpacing(5);
-        topLayout->addWidget(nameLabel, 100);
-        topLayout->addWidget(lineFrame, 1);
-        topLayout->addSpacing(5);
-        topLayout->addWidget(statusLabel);
-        topLayout->addSpacing(5);
-        topLayout->activate();
-    }
-    /*else
-    {
-        nameLabel->setMaximumWidth(QWIDGETSIZE_MAX);
-
-        mainLayout = new QVBoxLayout();
-        mainLayout->setSpacing(0);
-        mainLayout->setContentsMargins(20, 0, 20, 0);
-
-        container->setFixedHeight(25);
-        container->setLayout(mainLayout);
-
-        topLayout->addWidget(&statusPic);
-        topLayout->addSpacing(10);
-        topLayout->addWidget(nameLabel, 1);
-        topLayout->addSpacing(5);
-        topLayout->addWidget(statusLabel);
-        topLayout->activate();
-
-        mainLayout->addStretch();
-        mainLayout->addLayout(topLayout);
-        mainLayout->addWidget(lineFrame);
-        mainLayout->addStretch();
-        mainLayout->activate();
-    }*/
+    topLayout->addSpacing(18);
+    topLayout->addWidget(&statusPic);
+    topLayout->addSpacing(5);
+    topLayout->addWidget(nameLabel, 100);
+    topLayout->addWidget(lineFrame, 1);
+    topLayout->addSpacing(5);
+    topLayout->addWidget(statusLabel);
+    topLayout->addSpacing(5);
+    topLayout->activate();
 
     Style::repolish(this);
 }

src/widget/contentdialog.cpp

@@ -59,7 +59,7 @@ ContentDialog::ContentDialog(SettingsWidget* settingsWidget, QWidget* parent)
     boxLayout->setSpacing(0);
 
     splitter = new QSplitter(this);
-    setStyleSheet("QSplitter{color: rgb(255, 255, 255);background-color: rgb(255, 255, 255);alternate-background-color: rgb(255, 255, 255);border-color: rgb(255, 255, 255);gridline-color: rgb(255, 255, 255);selection-color: rgb(255, 255, 255);selection-background-color: rgb(255, 255, 255);}QSplitter:handle{color: rgb(255, 255, 255);background-color: rgb(255, 255, 255);}");
+    setStyleSheet(Style::getStylesheet(":/ui/contentDialog/contentDialog.css"));
     splitter->setHandleWidth(6);
 
     QWidget *friendWidget = new QWidget();
@@ -455,7 +455,7 @@ void ContentDialog::updateTitleAndStatusIcon(const QString& username)
         setWindowTitle(displayWidget->getTitle() + QStringLiteral(" - ") + username);
 
         // it's null when it's a groupchat
-        if(displayWidget->getFriend() == nullptr)
+        if (displayWidget->getFriend() == nullptr)
         {
             setWindowIcon(QIcon(":/img/group.svg"));
             return;
@@ -611,7 +611,7 @@ void ContentDialog::moveEvent(QMoveEvent* event)
 
 void ContentDialog::keyPressEvent(QKeyEvent* event)
 {
-    if(event->key() != Qt::Key_Escape)
+    if (event->key() != Qt::Key_Escape)
         QDialog::keyPressEvent(event); // Ignore escape keyboard shortcut.
 }
 

src/widget/form/addfriendform.cpp

@@ -133,13 +133,12 @@ void AddFriendForm::setMode(Mode mode)
 
 bool AddFriendForm::addFriendRequest(const QString &friendAddress, const QString &message)
 {
-    if(Settings::getInstance().addFriendRequest(friendAddress, message))
+    if (Settings::getInstance().addFriendRequest(friendAddress, message))
     {
         addFriendRequestWidget(friendAddress, message);
-        if(isShown())
-        {
+        if (isShown())
             onCurrentChanged(tabWidget->currentIndex());
-        }
+
         return true;
     }
     return false;
@@ -197,13 +196,14 @@ void AddFriendForm::onIdChanged(const QString &id)
     QString toxIdText(tr("Tox ID", "Tox ID of the person you're sending a friend request to"));
     QString toxIdComment(tr("either 76 hexadecimal characters or name@example.com", "Tox ID format description"));
 
-    if(isValidId)
+    if (isValidId)
     {
         toxIdLabel.setText(toxIdText +
                            QStringLiteral(" (") +
                            toxIdComment +
                            QStringLiteral(")"));
-    } else
+    }
+    else
     {
         toxIdLabel.setText(toxIdText +
                            QStringLiteral(" <font color='red'>(") +

src/widget/form/chatform.cpp

@@ -119,7 +119,7 @@ ChatForm::ChatForm(Friend* chatFriend)
     connect(this, &ChatForm::chatAreaCleared, getOfflineMsgEngine(), &OfflineMsgEngine::removeAllReceipts);
     connect(statusMessageLabel, &CroppingLabel::customContextMenuRequested, this, [&](const QPoint& pos)
     {
-        if(!statusMessageLabel->text().isEmpty())
+        if (!statusMessageLabel->text().isEmpty())
         {
             QWidget* sender = static_cast<QWidget*>(this->sender());
 
@@ -580,7 +580,7 @@ void ChatForm::onEnableCallButtons()
 
 void ChatForm::onMicMuteToggle()
 {
-    if (audioInputFlag == true)
+    if (audioInputFlag)
     {
         coreav->micMuteToggle(f->getFriendID());
         if (micButton->objectName() == "red")
@@ -600,7 +600,7 @@ void ChatForm::onMicMuteToggle()
 
 void ChatForm::onVolMuteToggle()
 {
-    if (audioOutputFlag == true)
+    if (audioOutputFlag)
     {
         coreav->volMuteToggle(f->getFriendID());
         if (volButton->objectName() == "red")

src/widget/form/chatform.h

@@ -92,6 +92,12 @@ private slots:
 private:
     void retranslateUi();
     void showOutgoingCall(bool video);
+    void startCounter();
+    void stopCounter();
+    QString secondsToDHMS(quint32 duration);
+    void enableCallButtons();
+    void disableCallButtons();
+    void SendMessageStr(QString msg);
 
 protected:
     virtual GenericNetCamView* createNetcam() final override;
@@ -117,14 +123,8 @@ private:
 
     ScreenshotGrabber* screenshotGrabber;
     QHash<uint, FileTransferInstance*> ftransWidgets;
-    void startCounter();
-    void stopCounter();
-    QString secondsToDHMS(quint32 duration);
     CallConfirmWidget *callConfirm;
-    void enableCallButtons();
-    void disableCallButtons();
     bool isTyping;
-    void SendMessageStr(QString msg);
 };
 
 #endif // CHATFORM_H

src/widget/form/genericchatform.cpp

@@ -243,7 +243,7 @@ void GenericChatForm::showFileMenu()
 
 void GenericChatForm::hideFileMenu()
 {
-    if(fileFlyout->isShown() || fileFlyout->isBeingShown())
+    if (fileFlyout->isShown() || fileFlyout->isBeingShown())
         fileFlyout->animateHide();
 }
 
@@ -470,17 +470,13 @@ QString GenericChatForm::resolveToxId(const ToxId &id)
 {
     Friend *f = FriendList::findFriend(id);
     if (f)
-    {
         return f->getDisplayedName();
-    }
-    else
+
+    for (Group *it : GroupList::getAllGroups())
     {
-        for (auto it : GroupList::getAllGroups())
-        {
-            QString res = it->resolveToxId(id);
-            if (res.size())
-                return res;
-        }
+        QString res = it->resolveToxId(id);
+        if (res.size())
+            return res;
     }
 
     return QString();

src/widget/form/groupchatform.cpp

@@ -220,7 +220,7 @@ void GroupChatForm::onUserListChanged()
     if (peersCount > 1 && group->isAvGroupchat())
     {
         // don't set button to green if call running
-        if(!inCall)
+        if (!inCall)
         {
             callButton->setEnabled(true);
             callButton->setObjectName("green");
@@ -285,7 +285,7 @@ void GroupChatForm::dropEvent(QDropEvent *ev)
 
 void GroupChatForm::onMicMuteToggle()
 {
-    if (audioInputFlag == true)
+    if (audioInputFlag)
     {
         if (micButton->objectName() == "red")
         {
@@ -306,7 +306,7 @@ void GroupChatForm::onMicMuteToggle()
 
 void GroupChatForm::onVolMuteToggle()
 {
-    if (audioOutputFlag == true)
+    if (audioOutputFlag)
     {
         if (volButton->objectName() == "red")
         {

src/widget/form/groupinviteform.cpp

@@ -186,10 +186,9 @@ void GroupInviteForm::deleteInviteButtons(QWidget* widget)
 void GroupInviteForm::retranslateUi()
 {
     headLabel->setText(tr("Groups"));
-    if(createButton)
-    {
+    if (createButton)
         createButton->setText(tr("Create new group"));
-    }
+
     inviteBox->setTitle(tr("Group invites"));
 
     for (QPushButton* acceptButton : acceptButtons)

src/widget/form/profileform.cpp

@@ -370,11 +370,11 @@ void ProfileForm::onDeleteClicked()
 
         QVector<QString> manualDeleteFiles = nexus.getProfile()->remove();
 
-        if(!manualDeleteFiles.empty())
+        if (!manualDeleteFiles.empty())
         {
             QString message = tr("The following files could not be deleted:", "deletion failed text part 1") + "\n\n";
 
-            for(auto& file : manualDeleteFiles)
+            for (auto& file : manualDeleteFiles)
             {
                 message = message + file + "\n";
             }

src/widget/form/profileform.h

@@ -45,7 +45,10 @@ signals:
     void clicked();
 
 protected:
-    virtual void mouseReleaseEvent(QMouseEvent*) final override {emit clicked();}
+    virtual void mouseReleaseEvent(QMouseEvent*) final override
+    {
+        emit clicked();
+    }
 };
 
 class ProfileForm : public QWidget

src/widget/form/settings/aboutform.h

@@ -35,7 +35,10 @@ class AboutForm  : public GenericForm
 public:
     AboutForm();
     ~AboutForm();
-    virtual QString getFormName() final override {return tr("About");}
+    virtual QString getFormName() final override
+    {
+        return tr("About");
+    }
 
 protected:
 

src/widget/form/settings/advancedform.h

@@ -34,7 +34,10 @@ class AdvancedForm : public GenericForm
 public:
     AdvancedForm();
     ~AdvancedForm();
-    virtual QString getFormName() final override {return tr("Advanced");}
+    virtual QString getFormName() final override
+    {
+        return tr("Advanced");
+    }
 
 protected:
     bool eventFilter(QObject *o, QEvent *e) final override;

src/widget/form/settings/avform.cpp

@@ -212,10 +212,10 @@ void AVForm::selectBestModes(QVector<VideoMode> &allVideoModes)
         qDebug("width: %d, height: %d, FPS: %f, pixel format: %s", mode.width, mode.height, mode.FPS, pixelFormat.toStdString().c_str());
 
         // PS3-Cam protection, everything above 60fps makes no sense
-        if(mode.FPS > 60)
+        if (mode.FPS > 60)
             continue;
 
-        for(auto iter = idealModes.begin(); iter != idealModes.end(); ++iter)
+        for (auto iter = idealModes.begin(); iter != idealModes.end(); ++iter)
         {
             int res = iter->first;
             VideoMode idealMode = iter->second;

src/widget/form/settings/generalform.h

@@ -34,7 +34,10 @@ class GeneralForm : public GenericForm
 public:
     explicit GeneralForm(SettingsWidget *parent);
     ~GeneralForm();
-    virtual QString getFormName() final override {return tr("General");}
+    virtual QString getFormName() final override
+    {
+        return tr("General");
+    }
 
 private slots:
     void onEnableIPv6Updated();

src/widget/form/settings/genericsettings.h

@@ -28,7 +28,10 @@ public:
     virtual ~GenericForm() {}
 
     virtual QString getFormName() = 0;
-    QPixmap getFormIcon() {return formIcon;}
+    QPixmap getFormIcon()
+    {
+        return formIcon;
+    }
 
 protected:
     QPixmap formIcon;

src/widget/form/settings/privacyform.h

@@ -32,7 +32,10 @@ class PrivacyForm : public GenericForm
 public:
     PrivacyForm();
     ~PrivacyForm();
-    virtual QString getFormName() final override {return tr("Privacy");}
+    virtual QString getFormName() final override
+    {
+        return tr("Privacy");
+    }
 
 private slots:
     void onEnableLoggingUpdated();

src/widget/genericchatroomwidget.cpp

@@ -183,14 +183,10 @@ void GenericChatroomWidget::reloadTheme()
 
 void GenericChatroomWidget::mouseReleaseEvent(QMouseEvent* event)
 {
-    if(event->button() == Qt::LeftButton)
-    {
+    if (event->button() == Qt::LeftButton)
         emit chatroomWidgetClicked(this);
-    }
     else
-    {
         event->ignore();
-    }
 }
 
 void GenericChatroomWidget::enterEvent(QEvent*)

src/widget/loginscreen.cpp

@@ -40,7 +40,7 @@ LoginScreen::LoginScreen(QWidget *parent) :
     ui->setupUi(this);
 
     // permanently disables maximize button https://github.com/tux3/qTox/issues/1973
-    this->setWindowFlags(windowFlags() &! Qt::WindowMaximizeButtonHint);
+    this->setWindowFlags(windowFlags() & ~Qt::WindowMaximizeButtonHint);
     this->setFixedSize(this->size());
 
     connect(&quitShortcut, &QShortcut::activated, this, &LoginScreen::close);
@@ -271,9 +271,9 @@ void LoginScreen::retranslateUi()
 void LoginScreen::onImportProfile()
 {
     ProfileImporter *pi = new ProfileImporter(this);
-    if(pi->importProfile() == true)
-    {
+
+    if (pi->importProfile())
         reset();
-    }
+
     delete pi;
 }

src/widget/tool/screengrabberchooserrectitem.cpp

@@ -203,9 +203,8 @@ void ScreenGrabberChooserRectItem::mousePressHandle(int x, int y, QGraphicsScene
     Q_UNUSED(x);
     Q_UNUSED(y);
 
-    if(event->button() == Qt::LeftButton)
+    if (event->button() == Qt::LeftButton)
         this->state = HandleResizing;
-
 }
 
 void ScreenGrabberChooserRectItem::mouseMoveHandle(int x, int y, QGraphicsSceneMouseEvent* event)
@@ -221,13 +220,13 @@ void ScreenGrabberChooserRectItem::mouseMoveHandle(int x, int y, QGraphicsSceneM
     bool increaseX = ((x < 0) == (delta.x() < 0));
     bool increaseY = ((y < 0) == (delta.y() < 0));
 
-    if((delta.x() < 0 && increaseX) || (delta.x() >= 0 && !increaseX))
+    if ((delta.x() < 0 && increaseX) || (delta.x() >= 0 && !increaseX))
     {
         moveBy(delta.x(), 0);
         delta.rx() *= -1;
     }
 
-    if((delta.y() < 0 && increaseY) || (delta.y() >= 0 && !increaseY))
+    if ((delta.y() < 0 && increaseY) || (delta.y() >= 0 && !increaseY))
     {
         moveBy(0, delta.y());
         delta.ry() *= -1;

src/widget/widget.cpp

@@ -563,7 +563,7 @@ void Widget::moveEvent(QMoveEvent *event)
 
 void Widget::closeEvent(QCloseEvent *event)
 {
-    if (Settings::getInstance().getShowSystemTray() && Settings::getInstance().getCloseToTray() == true)
+    if (Settings::getInstance().getShowSystemTray() && Settings::getInstance().getCloseToTray())
     {
         event->ignore();
         this->hide();
@@ -1020,7 +1020,7 @@ void Widget::onFriendStatusChanged(int friendId, Status status)
 
     f->setStatus(status);
     f->getFriendWidget()->updateStatusLight();
-    if(f->getFriendWidget()->isActive())
+    if (f->getFriendWidget()->isActive())
         setWindowTitle(f->getFriendWidget()->getTitle());
 
     ContentDialog::updateFriendStatus(friendId);
@@ -1342,7 +1342,7 @@ bool Widget::newMessageAlert(QWidget* currentWindow, bool isActive, bool sound,
 
 void Widget::onFriendRequestReceived(const QString& userId, const QString& message)
 {
-    if(addFriendForm->addFriendRequest(userId, message))
+    if (addFriendForm->addFriendRequest(userId, message))
     {
         friendRequestsUpdate();
         newMessageAlert(window(), isActiveWindow(), true, true);
@@ -1981,7 +1981,7 @@ void Widget::clearAllReceipts()
 void Widget::reloadTheme()
 {
     QString statusPanelStyle = Style::getStylesheet(":/ui/window/statusPanel.css");
-    ui->tooliconsZone->setStyleSheet(Style::resolve("QPushButton{background-color:@themeDark;border:none;}QPushButton:hover{background-color:@themeMediumDark;border:none;}QPushButton:checked{background-color:@themeMedium;border:none;}QPushButton:pressed{background-color:@themeMediumLight;border:none;}"));
+    ui->tooliconsZone->setStyleSheet(Style::getStylesheet(":/ui/tooliconsZone/tooliconsZone.css"));
     ui->statusPanel->setStyleSheet(statusPanelStyle);
     ui->statusHead->setStyleSheet(statusPanelStyle);
     ui->friendList->setStyleSheet(Style::getStylesheet(":/ui/friendList/friendList.css"));

ui/contentDialog/contentDialog.css

@@ -0,0 +1,16 @@
+QSplitter
+{
+    color: white;
+    background-color: white;
+    alternate-background-color: white;
+    border-color: white;
+    gridline-color: white;
+    selection-color: white;
+    selection-background-color: white;
+}
+
+QSplitter:handle
+{
+    color: white;
+    background-color: white;
+}

ui/tooliconsZone/tooliconsZone.css

@@ -0,0 +1,23 @@
+QPushButton
+{
+    background-color: @themeDark;
+    border: none;
+}
+
+QPushButton:hover
+{
+    background-color: @themeMediumDark;
+    border: none;
+}
+
+QPushButton:checked
+{
+    background-color: @themeMedium;
+    border: none;
+}
+
+QPushButton:pressed
+{
+    background-color: @themeMediumLight;
+    border: none;
+}