Browse Source

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
pull/2860/head
Zetok Zalbavar 10 years ago
parent
commit
3343645b61
No known key found for this signature in database
GPG Key ID: C953D3880212068A
  1. 4
      src/loginscreen.ui
  2. 2
      src/nexus.cpp
  3. 3
      src/widget/loginscreen.cpp
  4. 8
      ui/loginScreen/loginScreen.css

4
src/loginscreen.ui

@ -42,7 +42,7 @@ @@ -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 @@ @@ -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>

2
src/nexus.cpp

@ -25,7 +25,6 @@ @@ -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() @@ -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);

3
src/widget/loginscreen.cpp

@ -26,6 +26,7 @@ @@ -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) : @@ -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);
}

8
ui/loginScreen/loginScreen.css

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

Loading…
Cancel
Save