Commit 8350298e authored by David Kaspar's avatar David Kaspar

Qnx: Improved layout of BlackBerryDeviceConfigurationWidget

Widget margins has been zeroed so the default margins of
the 'Type Specific' group applies only. Request and Upload buttons
has been placed on a separate row to allow better width stretching.

Task-number: QTCREATORBUG-9981

Change-Id: I86d3be06d0057e92289fe6ed5cf38f16f5f3158b
Reviewed-by: default avatarChristian Kandeler <christian.kandeler@digia.com>
Reviewed-by: default avatarTobias Hunger <tobias.hunger@digia.com>
Reviewed-by: default avatarDavid Kaspar <dkaspar@blackberry.com>
parent 2f1d585f
......@@ -78,9 +78,8 @@ BlackBerryDeviceConfigurationWidget::BlackBerryDeviceConfigurationWidget(const I
connect(BlackBerryDeviceConnectionManager::instance(), SIGNAL(deviceAboutToConnect(Core::Id)),
this, SLOT(clearConnectionLog(Core::Id)));
ui->debugToken->addButton(tr("Request"), this, SLOT(requestDebugToken()));
ui->debugToken->addButton(tr("Upload"), this, SLOT(uploadDebugToken()));
uploadButton = ui->debugToken->buttonAtIndex(2);
connect(ui->requestButton, SIGNAL(clicked()), this, SLOT(requestDebugToken()));
connect(ui->uploadButton, SIGNAL(clicked()), this, SLOT(uploadDebugToken()));
QString debugTokenBrowsePath = QnxUtils::dataDirPath();
if (!QFileInfo(debugTokenBrowsePath).exists())
......@@ -159,7 +158,7 @@ void BlackBerryDeviceConfigurationWidget::uploadDebugToken()
void BlackBerryDeviceConfigurationWidget::updateUploadButton()
{
uploadButton->setEnabled(!ui->debugToken->path().isEmpty());
ui->uploadButton->setEnabled(!ui->debugToken->path().isEmpty());
}
void BlackBerryDeviceConfigurationWidget::uploadFinished(int status)
......@@ -242,6 +241,8 @@ void BlackBerryDeviceConfigurationWidget::initGui()
if (deviceConfiguration()->machineType() == IDevice::Emulator) {
ui->debugToken->setEnabled(false);
ui->requestButton->setEnabled(false);
ui->uploadButton->setEnabled(false);
ui->debugTokenLabel->setEnabled(false);
}
......
......@@ -6,11 +6,26 @@
<rect>
<x>0</x>
<y>0</y>
<width>334</width>
<height>208</height>
<width>458</width>
<height>308</height>
</rect>
</property>
<layout class="QFormLayout" name="formLayout">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item row="0" column="0">
<widget class="QLabel" name="hostNameLabel">
<property name="text">
......@@ -69,31 +84,69 @@
<item row="2" column="1">
<widget class="Utils::PathChooser" name="debugToken" native="true"/>
</item>
<item row="3" column="0">
<item row="5" column="0">
<widget class="QLabel" name="keyLabel">
<property name="text">
<string>Private key file:</string>
</property>
<property name="buddy">
<cstring>keyFileLineEdit</cstring>
</property>
</widget>
</item>
<item row="3" column="1">
<item row="5" column="1">
<widget class="Utils::PathChooser" name="keyFileLineEdit" native="true"/>
</item>
<item row="4" column="0">
<item row="6" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Connection log:</string>
</property>
<property name="buddy">
<cstring>connectionLog</cstring>
</property>
</widget>
</item>
<item row="5" column="0" colspan="2">
<item row="7" column="0" colspan="2">
<widget class="QPlainTextEdit" name="connectionLog">
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item row="3" column="1">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<spacer name="horizontalSpacer">
<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="QPushButton" name="requestButton">
<property name="text">
<string>Request</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="uploadButton">
<property name="text">
<string>Upload</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
<zorder>debugToken</zorder>
<zorder>keyFileLineEdit</zorder>
<zorder>hostNameLabel</zorder>
<zorder>hostLineEdit</zorder>
......@@ -115,6 +168,14 @@
</slots>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>hostLineEdit</tabstop>
<tabstop>pwdLineEdit</tabstop>
<tabstop>showPasswordCheckBox</tabstop>
<tabstop>requestButton</tabstop>
<tabstop>uploadButton</tabstop>
<tabstop>connectionLog</tabstop>
</tabstops>
<resources/>
<connections/>
</ui>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment