From 7e6dfa759ca6ed22ae7a0c8f1db3c4fdbfb68768 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Sun, 12 Jul 2015 18:08:35 +0800 Subject: [PATCH] Replace horizontal line with border --- src/gui/properties/propertieswidget.cpp | 7 +++---- src/gui/properties/propertieswidget.ui | 9 +-------- src/gui/properties/proptabbar.cpp | 5 +++-- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/src/gui/properties/propertieswidget.cpp b/src/gui/properties/propertieswidget.cpp index 663d0c9b0..b673d1285 100644 --- a/src/gui/properties/propertieswidget.cpp +++ b/src/gui/properties/propertieswidget.cpp @@ -68,10 +68,6 @@ PropertiesWidget::PropertiesWidget(QWidget *parent, MainWindow* main_window, Tra setupUi(this); setAutoFillBackground(true); - // Icons - trackerUpButton->setIcon(GuiIconProvider::instance()->getIcon("go-up")); - trackerDownButton->setIcon(GuiIconProvider::instance()->getIcon("go-down")); - state = VISIBLE; // Set Properties list model @@ -129,6 +125,8 @@ PropertiesWidget::PropertiesWidget(QWidget *parent, MainWindow* main_window, Tra // Tracker list trackerList = new TrackerList(this); + trackerUpButton->setIcon(GuiIconProvider::instance()->getIcon("go-up")); + trackerDownButton->setIcon(GuiIconProvider::instance()->getIcon("go-down")); connect(trackerUpButton, SIGNAL(clicked()), trackerList, SLOT(moveSelectionUp())); connect(trackerDownButton, SIGNAL(clicked()), trackerList, SLOT(moveSelectionDown())); horizontalLayout_trackers->insertWidget(0, trackerList); @@ -146,6 +144,7 @@ PropertiesWidget::PropertiesWidget(QWidget *parent, MainWindow* main_window, Tra speed_layout->addWidget(speedWidget); // Tab bar m_tabBar = new PropTabBar(); + m_tabBar->setContentsMargins(0, 5, 0, 0); verticalLayout->addLayout(m_tabBar); connect(m_tabBar, SIGNAL(tabChanged(int)), stackedProperties, SLOT(setCurrentIndex(int))); connect(m_tabBar, SIGNAL(tabChanged(int)), this, SLOT(saveSettings())); diff --git a/src/gui/properties/propertieswidget.ui b/src/gui/properties/propertieswidget.ui index 7ad836036..920f003ec 100644 --- a/src/gui/properties/propertieswidget.ui +++ b/src/gui/properties/propertieswidget.ui @@ -59,7 +59,7 @@ 0 0 549 - 447 + 450 @@ -1083,13 +1083,6 @@ - - - - Qt::Horizontal - - - diff --git a/src/gui/properties/proptabbar.cpp b/src/gui/properties/proptabbar.cpp index 5b0b2c591..11be20734 100644 --- a/src/gui/properties/proptabbar.cpp +++ b/src/gui/properties/proptabbar.cpp @@ -39,7 +39,8 @@ PropTabBar::PropTabBar(QWidget *parent) : QHBoxLayout(parent), m_currentIndex(-1) { - setSpacing(2); + setAlignment(Qt::AlignLeft | Qt::AlignCenter); + setSpacing(3); m_btnGroup = new QButtonGroup(this); // General tab QPushButton *main_infos_button = new QPushButton(GuiIconProvider::instance()->getIcon("document-properties"), tr("General"), parent); @@ -63,7 +64,7 @@ PropTabBar::PropTabBar(QWidget *parent) : addWidget(files_button); m_btnGroup->addButton(files_button, FILES_TAB); // Spacer - addItem(new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum)); + addItem(new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Fixed)); // Speed tab QPushButton *speed_button = new QPushButton(GuiIconProvider::instance()->getIcon("office-chart-line"), tr("Speed"), parent); addWidget(speed_button);