StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2835 from agilob:login_form_style

Browse Source 
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:
Zetok Zalbavar 2016-01-24 14:42:35 +00:00
commit 3343645b61
No known key found for this signature in database
GPG Key ID: C953D3880212068A
4 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/loginscreen.ui
View File

@ -42,7 +42,7 @@
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
<number>1</number> <number>0</number>
</property> </property>
<widget class="QWidget" name="newPage"> <widget class="QWidget" name="newPage">
<layout class="QHBoxLayout" name="horizontalLayout_5"> <layout class="QHBoxLayout" name="horizontalLayout_5">
@ -279,7 +279,7 @@
</spacer> </spacer>
</item> </item>
<item> <item>
<widget class="QLabel" name="label_3"> <widget class="QLabel" name="userNameLabel">
<property name="text"> <property name="text">
<string>Username:</string> <string>Username:</string>
</property> </property>

2
src/nexus.cpp
View File

@ -25,7 +25,6 @@
#include "persistence/settings.h" #include "persistence/settings.h"
#include "video/camerasource.h" #include "video/camerasource.h"
#include "widget/gui.h" #include "widget/gui.h"
#include "widget/style.h"
#include "widget/loginscreen.h" #include "widget/loginscreen.h"
#include <QThread> #include <QThread>
#include <QDebug> #include <QDebug>
@ -98,7 +97,6 @@ void Nexus::start()
qRegisterMetaType<std::shared_ptr<VideoFrame>>("std::shared_ptr<VideoFrame>"); qRegisterMetaType<std::shared_ptr<VideoFrame>>("std::shared_ptr<VideoFrame>");
loginScreen = new LoginScreen(); loginScreen = new LoginScreen();
loginScreen->setStyleSheet(Style::getStylesheet(":/ui/loginScreen/loginScreen.css"));
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
globalMenuBar = new QMenuBar(0); globalMenuBar = new QMenuBar(0);

3
src/widget/loginscreen.cpp
View File

@ -26,6 +26,7 @@
#include "src/persistence/settings.h" #include "src/persistence/settings.h"
#include "src/widget/form/setpassworddialog.h" #include "src/widget/form/setpassworddialog.h"
#include "src/widget/translator.h" #include "src/widget/translator.h"
#include "src/widget/style.h"
#include <QMessageBox> #include <QMessageBox>
#include <QDebug> #include <QDebug>
@ -55,6 +56,8 @@ LoginScreen::LoginScreen(QWidget *parent) :
connect(ui->autoLoginCB, &QCheckBox::stateChanged, this, &LoginScreen::onAutoLoginToggled); connect(ui->autoLoginCB, &QCheckBox::stateChanged, this, &LoginScreen::onAutoLoginToggled);
reset(); reset();
this->setStyleSheet(Style::getStylesheet(":/ui/loginScreen/loginScreen.css"));
retranslateUi(); retranslateUi();
Translator::registerHandler(std::bind(&LoginScreen::retranslateUi, this), this); Translator::registerHandler(std::bind(&LoginScreen::retranslateUi, this), this);
} }

8
ui/loginScreen/loginScreen.css
View File

@ -46,3 +46,11 @@ QStackedWidget QPushButton
#createAccountButton:hover { #createAccountButton:hover {
background: #0c530d; background: #0c530d;
} }
QLabel, QCheckBox, QProgressBar {
color: black;
}
QCheckBox::disabled {
color: gray;
}