rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-30 08:24:11 +01:00
Code Issues Releases Activity

Merge remote-tracking branch 'origin/filnet/OP-1182_telemetry_widget_is_too_small_on_mac' into rel-14.01

Browse Source
This commit is contained in:
Philippe Renon 2014-01-22 20:59:26 +01:00
commit a41930a5e2
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ground/openpilotgcs/src/plugins/coreplugin/connectionmanager.cpp
View File

@ -50,8 +50,7 @@ ConnectionManager::ConnectionManager(Internal::MainWindow *mainWindow) :
{ {
// device list // device list
m_availableDevList = new QComboBox; m_availableDevList = new QComboBox;
m_availableDevList->setMinimumWidth(120); m_availableDevList->setMinimumContentsLength(tr("USB: OPLinkMini").length());
m_availableDevList->setMaximumWidth(180);
m_availableDevList->setContextMenuPolicy(Qt::CustomContextMenu); m_availableDevList->setContextMenuPolicy(Qt::CustomContextMenu);
// connect button // connect button
@ -60,9 +59,9 @@ ConnectionManager::ConnectionManager(Internal::MainWindow *mainWindow) :
// put everything together // put everything together
QHBoxLayout *layout = new QHBoxLayout; QHBoxLayout *layout = new QHBoxLayout;
layout->setSpacing(5); layout->setSpacing(6);
// cheat a bit with the margin to "nicely" center things vertically // cheat a bit with the margin to "nicely" center things vertically
layout->setContentsMargins(5, 0, 5, 4); layout->setContentsMargins(6, 0, 4, 2);
setLayout(layout); setLayout(layout);
layout->addWidget(new QLabel(tr("Connections:")), 0, Qt::AlignVCenter); layout->addWidget(new QLabel(tr("Connections:")), 0, Qt::AlignVCenter);

4
ground/openpilotgcs/src/plugins/telemetry/monitorwidget.cpp
View File

@ -98,13 +98,13 @@ QGraphicsTextItem *createTextItem(QGraphicsSvgItem *parent, QString elementId, Q
MonitorWidget::MonitorWidget(QWidget *parent) : MonitorWidget::MonitorWidget(QWidget *parent) :
QGraphicsView(parent), aspectRatioMode(Qt::KeepAspectRatio) QGraphicsView(parent), aspectRatioMode(Qt::KeepAspectRatio)
{ {
// setMinimumWidth(180); setMinimumSize(180, 25);
QGraphicsScene *scene = new QGraphicsScene(); QGraphicsScene *scene = new QGraphicsScene();
setScene(scene); setScene(scene);
setSizePolicy(QSizePolicy::Preferred, QSizePolicy::MinimumExpanding); setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
// no scroll bars // no scroll bars
setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);