diff --git a/src/properties/propertieswidget.cpp b/src/properties/propertieswidget.cpp index eac3f2f02..18eca8fa1 100644 --- a/src/properties/propertieswidget.cpp +++ b/src/properties/propertieswidget.cpp @@ -114,6 +114,7 @@ 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 @@ -152,14 +153,15 @@ void PropertiesWidget::showPiecesDownloaded(bool show) { void PropertiesWidget::setVisibility(bool visible) { if(!visible && state == VISIBLE) { QSplitter *hSplitter = static_cast(parentWidget()); - slideSizes = hSplitter->sizes(); stackedProperties->setVisible(false); - QList sizes; - sizes << hSplitter->geometry().height()-30 << 30; - hSplitter->setSizes(sizes); + slideSizes = hSplitter->sizes(); hSplitter->handle(1)->setVisible(false); hSplitter->handle(1)->setDisabled(true); + QList sizes = QList() << hSplitter->geometry().height()-30 << 30; + hSplitter->setSizes(sizes); + hSplitter->updateGeometry(); state = REDUCED; + return; } if(visible && state == REDUCED) { @@ -365,7 +367,7 @@ void PropertiesWidget::loadDynamicData() { std::vector avail; h.piece_availability(avail); pieces_availability->setAvailability(avail); - avail_average_lbl->setText(QString::number(h.status().distributed_copies, 'f', 1)); + avail_average_lbl->setText(QString::number(h.status().distributed_copies, 'f', 3)); } else { showPiecesAvailability(false); } diff --git a/src/properties/propertieswidget.ui b/src/properties/propertieswidget.ui index e9c7a94e5..67ba2c39f 100644 --- a/src/properties/propertieswidget.ui +++ b/src/properties/propertieswidget.ui @@ -55,7 +55,7 @@ 0 0 520 - 377 + 373 @@ -557,13 +557,14 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:8pt; font-weight:400; font-style:normal;"> +</style></head><body style=" font-family:'Sans'; font-size:8pt; font-weight:400; font-style:normal;"> <table border="0" style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;"> <tr> <td style="border: none;"> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans';"></p></td></tr></table></body></html> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Ubuntu';"></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Ubuntu';"></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Ubuntu';"></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p></td></tr></table></body></html> true @@ -835,13 +836,13 @@ p, li { white-space: pre-wrap; } 5 - 4 + 0 5 - 2 + 0 diff --git a/src/properties/proptabbar.cpp b/src/properties/proptabbar.cpp index 8998f7205..8394d973e 100644 --- a/src/properties/proptabbar.cpp +++ b/src/properties/proptabbar.cpp @@ -37,11 +37,11 @@ #include "iconprovider.h" #ifdef Q_WS_MAC -#define DEFAULT_BUTTON_CSS "QPushButton {border: 1px solid rgb(85, 81, 91);border-radius: 3px;padding: 2px; margin-left: 8px; margin-right: 8px;}" -#define SELECTED_BUTTON_CSS "QPushButton {border: 1px solid rgb(85, 81, 91);border-radius: 3px;padding: 2px;background-color: rgb(255, 208, 105); margin-left: 8px; margin-right: 8px;}" +#define DEFAULT_BUTTON_CSS "QPushButton {border: 1px solid #888;border-radius: 2px; padding: 4px; margin-left: 0px; margin-right: 8px;}" +#define SELECTED_BUTTON_CSS "QPushButton {border: 1px solid #888;border-radius: 2px; padding: 4px;background-color: palette(highlight); margin-left: 0px; margin-right: 8px;}" #else -#define DEFAULT_BUTTON_CSS "QPushButton {border: 1px solid rgb(85, 81, 91);border-radius: 3px;padding: 2px; margin-left: 3px; margin-right: 3px;}" -#define SELECTED_BUTTON_CSS "QPushButton {border: 1px solid rgb(85, 81, 91);border-radius: 3px;padding: 2px;background-color: rgb(255, 208, 105); margin-left: 3px; margin-right: 3px;}" +#define DEFAULT_BUTTON_CSS "QPushButton {border: 1px solid #888;border-radius: 2px; padding: 4px; margin-left: 0px; margin-right: 3px;}" +#define SELECTED_BUTTON_CSS "QPushButton {border: 1px solid #888;border-radius: 2px; padding: 4px;background-color: palette(highlight); margin-left: 0px; margin-right: 3px;}" #endif const int BTN_ICON_SIZE = 16; @@ -50,7 +50,7 @@ PropTabBar::PropTabBar(QWidget *parent) : QHBoxLayout(parent), m_currentIndex(-1) { m_btnGroup = new QButtonGroup(this); - setContentsMargins(5, 4, 5, 2); + setContentsMargins(0, 0, 0, 0); // 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"))); @@ -86,6 +86,10 @@ PropTabBar::PropTabBar(QWidget *parent) : addItem(new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum)); // SIGNAL/SLOT connect(m_btnGroup, SIGNAL(buttonClicked(int)), SLOT(setCurrentIndex(int))); + // Disable buttons focus + foreach(QAbstractButton *btn, m_btnGroup->buttons()) { + btn->setFocusPolicy(Qt::NoFocus); + } } PropTabBar::~PropTabBar() { diff --git a/src/transferlistfilterswidget.h b/src/transferlistfilterswidget.h index 6b1dfc309..c74b109e3 100644 --- a/src/transferlistfilterswidget.h +++ b/src/transferlistfilterswidget.h @@ -206,6 +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); statusFilters = new StatusFiltersWidget(this); vLayout->addWidget(statusFilters); labelFilters = new LabelFiltersList(this);