Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #816 from PhenomRetroShare/Fix_StartPasswordFocus

Browse Source 
Fix Start page password focus.
This commit is contained in:
csoler 2017-05-10 19:34:53 +02:00 committed by GitHub
commit af18e4c314
2 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
retroshare-gui/src/gui/StartDialog.cpp
View File

@ -73,13 +73,16 @@ StartDialog::StartDialog(QWidget *parent)
} }
} }
QObject::connect(ui.loadName,SIGNAL(currentIndexChanged(int)),this,SLOT(updateSelectedProfile(int))) ; QObject::connect(ui.loadName,SIGNAL(currentIndexChanged(int)),this,SLOT(updateSelectedProfile(int))) ;
QObject::connect(ui.password_input,SIGNAL(returnPressed()),this,SLOT(loadPerson())) ; QObject::connect(ui.password_input,SIGNAL(returnPressed()),this,SLOT(loadPerson())) ;
QObject::connect(ui.loadButton, SIGNAL(clicked()), this, SLOT(loadPerson()));
if (pidx > 0) if (pidx > 0)
{ {
ui.loadName->setCurrentIndex(pidx); ui.loadName->setCurrentIndex(pidx);
} }
ui.password_input->setFocus();
} }
void StartDialog::updateSelectedProfile(int) void StartDialog::updateSelectedProfile(int)

35
retroshare-gui/src/gui/StartDialog.ui
View File

@ -17,7 +17,7 @@
<iconset resource="images.qrc"> <iconset resource="images.qrc">
<normaloff>:/images/logo/logo_32.png</normaloff>:/images/logo/logo_32.png</iconset> <normaloff>:/images/logo/logo_32.png</normaloff>:/images/logo/logo_32.png</iconset>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_2"> <layout class="QVBoxLayout" name="StartDialogVLayout">
<property name="leftMargin"> <property name="leftMargin">
<number>0</number> <number>0</number>
</property> </property>
@ -31,7 +31,7 @@
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
<layout class="QGridLayout" name="gridLayout_4"> <layout class="QGridLayout" name="mainGLayout">
<property name="leftMargin"> <property name="leftMargin">
<number>0</number> <number>0</number>
</property> </property>
@ -42,9 +42,9 @@
<number>0</number> <number>0</number>
</property> </property>
<item row="0" column="0" colspan="4"> <item row="0" column="0" colspan="4">
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="topGLayout">
<item row="0" column="0"> <item row="0" column="0">
<spacer name="horizontalSpacer"> <spacer name="topLeftHSpacer">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
@ -57,7 +57,7 @@
</spacer> </spacer>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QLabel" name="label"> <widget class="QLabel" name="rsTopLogo">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
@ -115,7 +115,7 @@
</widget> </widget>
</item> </item>
<item row="0" column="2"> <item row="0" column="2">
<spacer name="horizontalSpacer_2"> <spacer name="topRightHSpacer">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
@ -129,8 +129,8 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="2" column="1" rowspan="2" colspan="2"> <item row="1" column="1" rowspan="2" colspan="2">
<widget class="QGroupBox" name="groupBox"> <widget class="QGroupBox" name="profilGBox">
<property name="enabled"> <property name="enabled">
<bool>true</bool> <bool>true</bool>
</property> </property>
@ -143,9 +143,9 @@
<property name="title"> <property name="title">
<string/> <string/>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="profilGBoxVLayout">
<item> <item>
<widget class="QLabel" name="label_3"> <widget class="QLabel" name="nameLabel">
<property name="text"> <property name="text">
<string>Profile - Location:</string> <string>Profile - Location:</string>
</property> </property>
@ -155,7 +155,7 @@
<widget class="QComboBox" name="loadName"/> <widget class="QComboBox" name="loadName"/>
</item> </item>
<item> <item>
<widget class="QLabel" name="label_2"> <widget class="QLabel" name="passwordLabel">
<property name="text"> <property name="text">
<string>Password:</string> <string>Password:</string>
</property> </property>
@ -181,6 +181,19 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="3" column="1" colspan="2">
<widget class="QPushButton" name="loadButton">
<property name="text">
<string>Log In</string>
</property>
<property name="default">
<bool>true</bool>
</property>
<property name="flat">
<bool>false</bool>
</property>
</widget>
</item>
<item row="4" column="1" colspan="2"> <item row="4" column="1" colspan="2">
<widget class="QLabel" name="labelProfile"> <widget class="QLabel" name="labelProfile">
<property name="toolTip"> <property name="toolTip">