mirror of
https://github.com/qTox/qTox.git
synced 2024-03-22 14:00:36 +08:00
Merge pull request #2835 from agilob:login_form_style
agilob (4): Fix label text colour in login profile Loginpage: Apply black colour to qcheckbox as well Loginpage: Apply black colour to progressbar Make disabled checkbox gray
This commit is contained in:
commit
3343645b61
|
@ -42,7 +42,7 @@
|
|||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="currentIndex">
|
||||
<number>1</number>
|
||||
<number>0</number>
|
||||
</property>
|
||||
<widget class="QWidget" name="newPage">
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_5">
|
||||
|
@ -279,7 +279,7 @@
|
|||
</spacer>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLabel" name="label_3">
|
||||
<widget class="QLabel" name="userNameLabel">
|
||||
<property name="text">
|
||||
<string>Username:</string>
|
||||
</property>
|
||||
|
|
|
@ -25,7 +25,6 @@
|
|||
#include "persistence/settings.h"
|
||||
#include "video/camerasource.h"
|
||||
#include "widget/gui.h"
|
||||
#include "widget/style.h"
|
||||
#include "widget/loginscreen.h"
|
||||
#include <QThread>
|
||||
#include <QDebug>
|
||||
|
@ -98,7 +97,6 @@ void Nexus::start()
|
|||
qRegisterMetaType<std::shared_ptr<VideoFrame>>("std::shared_ptr<VideoFrame>");
|
||||
|
||||
loginScreen = new LoginScreen();
|
||||
loginScreen->setStyleSheet(Style::getStylesheet(":/ui/loginScreen/loginScreen.css"));
|
||||
|
||||
#ifdef Q_OS_MAC
|
||||
globalMenuBar = new QMenuBar(0);
|
||||
|
|
|
@ -26,6 +26,7 @@
|
|||
#include "src/persistence/settings.h"
|
||||
#include "src/widget/form/setpassworddialog.h"
|
||||
#include "src/widget/translator.h"
|
||||
#include "src/widget/style.h"
|
||||
#include <QMessageBox>
|
||||
#include <QDebug>
|
||||
|
||||
|
@ -55,6 +56,8 @@ LoginScreen::LoginScreen(QWidget *parent) :
|
|||
connect(ui->autoLoginCB, &QCheckBox::stateChanged, this, &LoginScreen::onAutoLoginToggled);
|
||||
|
||||
reset();
|
||||
this->setStyleSheet(Style::getStylesheet(":/ui/loginScreen/loginScreen.css"));
|
||||
|
||||
retranslateUi();
|
||||
Translator::registerHandler(std::bind(&LoginScreen::retranslateUi, this), this);
|
||||
}
|
||||
|
|
|
@ -46,3 +46,11 @@ QStackedWidget QPushButton
|
|||
#createAccountButton:hover {
|
||||
background: #0c530d;
|
||||
}
|
||||
|
||||
QLabel, QCheckBox, QProgressBar {
|
||||
color: black;
|
||||
}
|
||||
|
||||
QCheckBox::disabled {
|
||||
color: gray;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user