rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-05 21:52:10 +01:00
Code Issues Releases Activity

Merge branch 'bsongis/OP-1099_Hidden_icons_in_configuration_tab' into next

Browse Source
This commit is contained in:
Alessio Morale 2013-11-18 14:10:58 +01:00
commit f36e3d66c1
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ground/openpilotgcs/src/libs/utils/mytabbedstackwidget.cpp
View File

@ -36,20 +36,20 @@ MyTabbedStackWidget::MyTabbedStackWidget(QWidget *parent, bool isVertical, bool
m_vertical(isVertical), m_vertical(isVertical),
m_iconAbove(iconAbove) m_iconAbove(iconAbove)
{ {
m_listWidget = new QListWidget(this); m_listWidget = new QListWidget();
m_stackWidget = new QStackedWidget(); m_stackWidget = new QStackedWidget();
m_stackWidget->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Expanding); m_stackWidget->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Expanding);
QBoxLayout *toplevelLayout; QBoxLayout *toplevelLayout;
if (m_vertical) { if (m_vertical) {
toplevelLayout = new QHBoxLayout; toplevelLayout = new QHBoxLayout();
toplevelLayout->addWidget(m_listWidget); toplevelLayout->addWidget(m_listWidget);
toplevelLayout->addWidget(m_stackWidget); toplevelLayout->addWidget(m_stackWidget);
m_listWidget->setFlow(QListView::TopToBottom); m_listWidget->setFlow(QListView::TopToBottom);
m_listWidget->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding); m_listWidget->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding);
m_listWidget->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); m_listWidget->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
} else { } else {
toplevelLayout = new QVBoxLayout; toplevelLayout = new QVBoxLayout();
toplevelLayout->addWidget(m_stackWidget); toplevelLayout->addWidget(m_stackWidget);
toplevelLayout->addWidget(m_listWidget); toplevelLayout->addWidget(m_listWidget);
m_listWidget->setFlow(QListView::LeftToRight); m_listWidget->setFlow(QListView::LeftToRight);
@ -59,6 +59,7 @@ MyTabbedStackWidget::MyTabbedStackWidget(QWidget *parent, bool isVertical, bool
if (m_iconAbove && m_vertical) { if (m_iconAbove && m_vertical) {
m_listWidget->setFixedWidth(80); // this should be computed instead m_listWidget->setFixedWidth(80); // this should be computed instead
m_listWidget->setWrapping(false);
} }
toplevelLayout->setSpacing(0); toplevelLayout->setSpacing(0);

7
ground/openpilotgcs/src/libs/utils/mytabbedstackwidget.h
View File

@ -51,10 +51,7 @@ public:
int currentIndex() const; int currentIndex() const;
void insertCornerWidget(int index, QWidget *widget); void insertCornerWidget(int index, QWidget *widget);
int cornerWidgetCount()
{
return m_cornerWidgetCount;
}
QWidget *currentWidget() QWidget *currentWidget()
{ {
return m_stackWidget->currentWidget(); return m_stackWidget->currentWidget();
@ -77,10 +74,8 @@ private slots:
private: private:
QListWidget *m_listWidget; QListWidget *m_listWidget;
QStackedWidget *m_stackWidget; QStackedWidget *m_stackWidget;
QWidget *m_selectionWidget;
bool m_vertical; bool m_vertical;
bool m_iconAbove; bool m_iconAbove;
int m_cornerWidgetCount;
}; };
#endif // MYTABBEDSTACKWIDGET_H #endif // MYTABBEDSTACKWIDGET_H