feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Change QLineEdit to PathChooser.

Browse Source 
Reviewed-by: ck
This commit is contained in:
kh1
2009-12-03 12:37:42 +01:00
parent 1c40a4bcd6
commit 694e978834
2 changed files with 60 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/qt4projectmanager/qt-maemo/maemosettingspage.cpp
View File

@@ -215,6 +215,7 @@ void MaemoSettingsWidget::initGui()
m_ui->nameLineEdit->setValidator(&m_nameValidator); m_ui->nameLineEdit->setValidator(&m_nameValidator);
m_ui->portLineEdit->setValidator(&m_portValidator); m_ui->portLineEdit->setValidator(&m_portValidator);
m_ui->timeoutLineEdit->setValidator(&m_timeoutValidator); m_ui->timeoutLineEdit->setValidator(&m_timeoutValidator);
m_ui->keyFileLineEdit->setExpectedKind(Utils::PathChooser::File);
foreach(const MaemoDeviceConfigurations::DeviceConfig &devConf, m_devConfs) foreach(const MaemoDeviceConfigurations::DeviceConfig &devConf, m_devConfs)
m_ui->configListWidget->addItem(devConf.name); m_ui->configListWidget->addItem(devConf.name);
} }
@@ -271,7 +272,7 @@ void MaemoSettingsWidget::display(const MaemoDeviceConfigurations::DeviceConfig
m_ui->timeoutLineEdit->setText(QString::number(devConfig.timeout)); m_ui->timeoutLineEdit->setText(QString::number(devConfig.timeout));
m_ui->userLineEdit->setText(devConfig.uname); m_ui->userLineEdit->setText(devConfig.uname);
m_ui->pwdLineEdit->setText(devConfig.pwd); m_ui->pwdLineEdit->setText(devConfig.pwd);
m_ui->keyFileLineEdit->setText(devConfig.keyFile); m_ui->keyFileLineEdit->setPath(devConfig.keyFile);
m_ui->detailsWidget->setEnabled(true); m_ui->detailsWidget->setEnabled(true);
m_nameValidator.setName(devConfig.name); m_nameValidator.setName(devConfig.name);
m_portValidator.setValue(devConfig.port); m_portValidator.setValue(devConfig.port);
@@ -360,7 +361,7 @@ void MaemoSettingsWidget::passwordEditingFinished()
void MaemoSettingsWidget::keyFileEditingFinished() void MaemoSettingsWidget::keyFileEditingFinished()
{ {
currentConfig().keyFile = m_ui->keyFileLineEdit->text(); currentConfig().keyFile = m_ui->keyFileLineEdit->path();
} }
void MaemoSettingsWidget::selectionChanged() void MaemoSettingsWidget::selectionChanged()

105
src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.ui
View File

@@ -42,6 +42,13 @@
<item row="0" column="1"> <item row="0" column="1">
<widget class="QLineEdit" name="nameLineEdit"/> <widget class="QLineEdit" name="nameLineEdit"/>
</item> </item>
<item row="1" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Device type:</string>
</property>
</widget>
</item>
<item row="1" column="1"> <item row="1" column="1">
<widget class="QWidget" name="widget_2" native="true"> <widget class="QWidget" name="widget_2" native="true">
<layout class="QHBoxLayout" name="horizontalLayout_2"> <layout class="QHBoxLayout" name="horizontalLayout_2">
@@ -68,6 +75,39 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="2" column="0">
<widget class="QLabel" name="label_8">
<property name="text">
<string>Authentication type:</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QWidget" name="widget_3" native="true">
<layout class="QHBoxLayout" name="horizontalLayout_3">
<property name="topMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QRadioButton" name="passwordButton">
<property name="text">
<string>Password</string>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="keyButton">
<property name="text">
<string>Key</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="3" column="0"> <item row="3" column="0">
<widget class="QLabel" name="label_3"> <widget class="QLabel" name="label_3">
<property name="text"> <property name="text">
@@ -122,46 +162,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Device type:</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_8">
<property name="text">
<string>Authentication type:</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QWidget" name="widget_3" native="true">
<layout class="QHBoxLayout" name="horizontalLayout_3">
<property name="topMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QRadioButton" name="passwordButton">
<property name="text">
<string>Password</string>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="keyButton">
<property name="text">
<string>Key</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="8" column="0"> <item row="8" column="0">
<widget class="QLabel" name="keyLabel"> <widget class="QLabel" name="keyLabel">
<property name="text"> <property name="text">
@@ -170,11 +170,7 @@
</widget> </widget>
</item> </item>
<item row="8" column="1"> <item row="8" column="1">
<widget class="QLineEdit" name="keyFileLineEdit"> <widget class="Utils::PathChooser" name="keyFileLineEdit" native="true"/>
<property name="echoMode">
<enum>QLineEdit::Normal</enum>
</property>
</widget>
</item> </item>
</layout> </layout>
</widget> </widget>
@@ -218,6 +214,17 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<customwidgets>
<customwidget>
<class>Utils::PathChooser</class>
<extends>QWidget</extends>
<header location="global">utils/pathchooser.h</header>
<container>1</container>
<slots>
<signal>editingFinished()</signal>
</slots>
</customwidget>
</customwidgets>
<resources/> <resources/>
<connections> <connections>
<connection> <connection>
@@ -419,12 +426,12 @@
<slot>keyFileEditingFinished()</slot> <slot>keyFileEditingFinished()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>208</x> <x>268</x>
<y>332</y> <y>337</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>424</x> <x>257</x>
<y>41</y> <y>185</y>
</hint> </hint>
</hints> </hints>
</connection> </connection>