Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 08:49:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix issue with icon being disabled on login window while authenticating

Browse source
This commit is contained in:
Ryan Huffman 2014-04-28 09:11:09 -07:00
parent 81a0cbe761
commit 01f66420de
2 changed files with 72 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/ui/LoginDialog.cpp
View file

@ -67,7 +67,7 @@ void LoginDialog::handleLoginFailed() {
_ui->errorLabel->setVisible(true); _ui->errorLabel->setVisible(true);
_ui->errorLabel->show(); _ui->errorLabel->show();
_ui->loginAreaContainer->setDisabled(false); _ui->loginArea->setDisabled(false);
_ui->emailLineEdit->setFocus(); _ui->emailLineEdit->setFocus();
_ui->emailLineEdit->setSelection(0, _ui->emailLineEdit->maxLength()); _ui->emailLineEdit->setSelection(0, _ui->emailLineEdit->maxLength());
}; };
@ -83,7 +83,7 @@ void LoginDialog::handleLoginClicked() {
_ui->infoLabel->setVisible(true); _ui->infoLabel->setVisible(true);
_ui->errorLabel->setVisible(false); _ui->errorLabel->setVisible(false);
_ui->loginAreaContainer->setDisabled(true); _ui->loginArea->setDisabled(true);
AccountManager::getInstance().requestAccessToken(_ui->emailLineEdit->text(), _ui->passwordLineEdit->text()); AccountManager::getInstance().requestAccessToken(_ui->emailLineEdit->text(), _ui->passwordLineEdit->text());
} }
}; };

81
interface/ui/loginDialog.ui
View file

@ -6,7 +6,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>1159</width> <width>1003</width>
<height>130</height> <height>130</height>
</rect> </rect>
</property> </property>
@ -201,6 +201,62 @@
<property name="bottomMargin"> <property name="bottomMargin">
<number>30</number> <number>30</number>
</property> </property>
<item>
<spacer name="spacerLeft">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QWidget" name="logoArea" native="true">
<layout class="QHBoxLayout" name="horizontalLayout_4">
<property name="spacing">
<number>0</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>12</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="logoLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap>../resources/images/hifi-logo.png</pixmap>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item> <item>
<widget class="QWidget" name="loginArea" native="true"> <widget class="QWidget" name="loginArea" native="true">
<property name="sizePolicy"> <property name="sizePolicy">
@ -237,16 +293,6 @@ border-width: 1px; border-style: solid; border-radius: 3px; border-color: #aaa;
<property name="bottomMargin"> <property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<item>
<widget class="QLabel" name="logoLabel">
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap>../resources/images/hifi-logo.png</pixmap>
</property>
</widget>
</item>
<item> <item>
<widget class="QLineEdit" name="emailLineEdit"> <widget class="QLineEdit" name="emailLineEdit">
<property name="sizePolicy"> <property name="sizePolicy">
@ -400,6 +446,19 @@ border-radius: 4px;</string>
</layout> </layout>
</widget> </widget>
</item> </item>
<item>
<spacer name="spacerRight">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>