diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index dec526d4e..af1a8047b 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -155,6 +155,7 @@ MainWindow::MainWindow(QWidget *parent, QStringList torrentCmdLine) : QMainWindo //vSplitter->setChildrenCollapsible(false); hSplitter = new QSplitter(Qt::Vertical); hSplitter->setChildrenCollapsible(false); + hSplitter->setContentsMargins(0, 4, 0, 0); // Transfer List tab transferList = new TransferListWidget(hSplitter, this, QBtSession::instance()); @@ -235,7 +236,6 @@ MainWindow::MainWindow(QWidget *parent, QStringList torrentCmdLine) : QMainWindo // Load Window state and sizes readSettings(); - properties->readSettings(); if(!ui_locked) { if(pref.startMinimized()) @@ -247,6 +247,8 @@ MainWindow::MainWindow(QWidget *parent, QStringList torrentCmdLine) : QMainWindo } } + properties->readSettings(); + // Start watching the executable for updates executable_watcher = new QFileSystemWatcher(); connect(executable_watcher, SIGNAL(fileChanged(QString)), this, SLOT(notifyOfUpdate(QString))); diff --git a/src/properties/propertieswidget.cpp b/src/properties/propertieswidget.cpp index 18eca8fa1..f49621e86 100644 --- a/src/properties/propertieswidget.cpp +++ b/src/properties/propertieswidget.cpp @@ -114,7 +114,6 @@ PropertiesWidget::PropertiesWidget(QWidget *parent, MainWindow* main_window, Tra // Tab bar m_tabBar = new PropTabBar(); verticalLayout->addLayout(m_tabBar); - verticalLayout->setMargin(0); connect(m_tabBar, SIGNAL(tabChanged(int)), stackedProperties, SLOT(setCurrentIndex(int))); connect(m_tabBar, SIGNAL(visibilityToggled(bool)), SLOT(setVisibility(bool))); // Dynamic data refresher @@ -159,7 +158,6 @@ void PropertiesWidget::setVisibility(bool visible) { hSplitter->handle(1)->setDisabled(true); QList sizes = QList() << hSplitter->geometry().height()-30 << 30; hSplitter->setSizes(sizes); - hSplitter->updateGeometry(); state = REDUCED; return; } diff --git a/src/properties/propertieswidget.ui b/src/properties/propertieswidget.ui index 67ba2c39f..e548becf5 100644 --- a/src/properties/propertieswidget.ui +++ b/src/properties/propertieswidget.ui @@ -830,22 +830,6 @@ p, li { white-space: pre-wrap; } - - - - 5 - - - 0 - - - 5 - - - 0 - - - diff --git a/src/properties/proptabbar.cpp b/src/properties/proptabbar.cpp index 8394d973e..6dee17ed4 100644 --- a/src/properties/proptabbar.cpp +++ b/src/properties/proptabbar.cpp @@ -50,7 +50,7 @@ PropTabBar::PropTabBar(QWidget *parent) : QHBoxLayout(parent), m_currentIndex(-1) { m_btnGroup = new QButtonGroup(this); - setContentsMargins(0, 0, 0, 0); + setContentsMargins(0, 4, 0, 4); // General tab QPushButton *main_infos_button = new QPushButton(IconProvider::instance()->getIcon("document-properties"), tr("General"), parent); main_infos_button->setShortcut(QKeySequence(QString::fromUtf8("Alt+P"))); diff --git a/src/transferlistfilterswidget.h b/src/transferlistfilterswidget.h index c74b109e3..82e759821 100644 --- a/src/transferlistfilterswidget.h +++ b/src/transferlistfilterswidget.h @@ -206,7 +206,7 @@ public: TransferListFiltersWidget(QWidget *parent, TransferListWidget *transferList): QFrame(parent), transferList(transferList), nb_labeled(0), nb_torrents(0) { // Construct lists vLayout = new QVBoxLayout(); - vLayout->setContentsMargins(0, 0, 0, 0); + vLayout->setContentsMargins(0, 4, 0, 4); statusFilters = new StatusFiltersWidget(this); vLayout->addWidget(statusFilters); labelFilters = new LabelFiltersList(this);