Commit 94dc3836 authored by Nicolas Arnaud-Cormos's avatar Nicolas Arnaud-Cormos Committed by Eike Ziller
Browse files

Fix alignment issue on Mac OSX with PathChooser.



Add buttons directly into the PathChooser instead of creating new QPushButton widgets.

Change-Id: I7b607c4c8cc7b27ec0d23d9849182437fc28aabc
Reviewed-by: default avatarTobias Nätterlund <tobias.naetterlund@kdab.com>
Reviewed-by: default avatarMehdi Fekari <mfekari@rim.com>
Reviewed-by: default avatarEike Ziller <eike.ziller@digia.com>
parent e1aa3222
......@@ -40,6 +40,7 @@
#include <QProgressDialog>
#include <QMessageBox>
#include <QAbstractButton>
using namespace ProjectExplorer;
using namespace Qnx::Internal;
......@@ -59,10 +60,12 @@ BlackBerryDeviceConfigurationWidget::BlackBerryDeviceConfigurationWidget(const I
connect(ui->debugToken, SIGNAL(changed(QString)), this, SLOT(updateUploadButton()));
connect(ui->debugToken, SIGNAL(editingFinished()), this, SLOT(debugTokenEditingFinished()));
connect(ui->debugToken, SIGNAL(browsingFinished()), this, SLOT(debugTokenEditingFinished()));
connect(ui->requestButton, SIGNAL(clicked()), this, SLOT(requestDebugToken()));
connect(ui->uploadButton, SIGNAL(clicked()), this, SLOT(uploadDebugToken()));
connect(uploader, SIGNAL(finished(int)), this, SLOT(uploadFinished(int)));
ui->debugToken->addButton(tr("Request"), this, SLOT(requestDebugToken()));
ui->debugToken->addButton(tr("Upload"), this, SLOT(uploadDebugToken()));
uploadButton = ui->debugToken->buttonAtIndex(2);
initGui();
}
......@@ -126,7 +129,7 @@ void BlackBerryDeviceConfigurationWidget::uploadDebugToken()
void BlackBerryDeviceConfigurationWidget::updateUploadButton()
{
ui->uploadButton->setEnabled(!ui->debugToken->path().isEmpty());
uploadButton->setEnabled(!ui->debugToken->path().isEmpty());
}
void BlackBerryDeviceConfigurationWidget::uploadFinished(int status)
......
......@@ -38,6 +38,7 @@
QT_BEGIN_NAMESPACE
class QProgressDialog;
class QAbstractButton;
QT_END_NAMESPACE
namespace Qnx {
......@@ -76,6 +77,7 @@ private:
BlackBerryDeviceConfiguration::Ptr deviceConfiguration() const;
Ui::BlackBerryDeviceConfigurationWidget *ui;
QAbstractButton *uploadButton;
QProgressDialog *progressDialog;
......
......@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>334</width>
<height>109</height>
<height>131</height>
</rect>
</property>
<layout class="QFormLayout" name="formLayout">
......@@ -67,25 +67,7 @@
</widget>
</item>
<item row="2" column="1">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="Utils::PathChooser" name="debugToken" native="true"/>
</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>
<widget class="Utils::PathChooser" name="debugToken" native="true"/>
</item>
<item row="3" column="0">
<widget class="QLabel" name="keyLabel">
......
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