Browse Source

set login dialog style via css stylesheet

pull/2390/head
Nils Fenner 10 years ago
parent
commit
06ba8a0f6a
No known key found for this signature in database
GPG Key ID: 9591A163FF9BE04C
  1. 1
      res.qrc
  2. 18
      src/loginscreen.ui
  3. 2
      src/nexus.cpp
  4. 12
      ui/loginScreen/loginScreen.css

1
res.qrc

@ -119,5 +119,6 @@ @@ -119,5 +119,6 @@
<file>ui/volButton/volButtonDisabled.png</file>
<file>img/login_logo.svg</file>
<file>ui/notificationEdge/notificationEdge.css</file>
<file>ui/loginScreen/loginScreen.css</file>
</qresource>
</RCC>

18
src/loginscreen.ui

@ -631,15 +631,6 @@ margin-bottom:45px;</string> @@ -631,15 +631,6 @@ margin-bottom:45px;</string>
<bold>true</bold>
</font>
</property>
<property name="autoFillBackground">
<bool>false</bool>
</property>
<property name="styleSheet">
<string notr="true">border-radius:5px;
padding:5px;
color:white;
background-color:#6cc865;</string>
</property>
<property name="text">
<string>Create Profile</string>
</property>
@ -996,15 +987,6 @@ margin-bottom:5px;</string> @@ -996,15 +987,6 @@ margin-bottom:5px;</string>
<bold>true</bold>
</font>
</property>
<property name="autoFillBackground">
<bool>false</bool>
</property>
<property name="styleSheet">
<string notr="true">border-radius:5px;
padding:5px;
color:white;
background-color:#6cc865;</string>
</property>
<property name="text">
<string>Load</string>
</property>

2
src/nexus.cpp

@ -24,6 +24,7 @@ @@ -24,6 +24,7 @@
#include "persistence/settings.h"
#include "video/camerasource.h"
#include "widget/gui.h"
#include "widget/style.h"
#include "widget/loginscreen.h"
#include <QThread>
#include <QDebug>
@ -92,6 +93,7 @@ void Nexus::start() @@ -92,6 +93,7 @@ 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);

12
ui/loginScreen/loginScreen.css

@ -0,0 +1,12 @@ @@ -0,0 +1,12 @@
#loginButton,
#createAccountButton {
border-radius:5px;
padding:5px;
color:white;
background-color:#42a33a;
}
#loginButton:hover,
#createAccountButton:hover {
background: #0c530d;
}
Loading…
Cancel
Save