diff --git a/src/gui/properties/propertieswidget.cpp b/src/gui/properties/propertieswidget.cpp index 4cea02a0a..59f60c96b 100644 --- a/src/gui/properties/propertieswidget.cpp +++ b/src/gui/properties/propertieswidget.cpp @@ -113,13 +113,19 @@ PropertiesWidget::PropertiesWidget(QWidget *parent, MainWindow* main_window, Tra #endif // Downloaded pieces progress bar + tempProgressBarArea->setVisible(false); downloaded_pieces = new DownloadedPiecesBar(this); - ProgressHLayout->insertWidget(1, downloaded_pieces); + groupBarLayout->addWidget(downloaded_pieces, 0, 1); downloaded_pieces->setFixedHeight(barHeight); + downloaded_pieces->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); + // Pieces availability bar + tempAvailabilityBarArea->setVisible(false); pieces_availability = new PieceAvailabilityBar(this); - ProgressHLayout_2->insertWidget(1, pieces_availability); + groupBarLayout->addWidget(pieces_availability, 1, 1); pieces_availability->setFixedHeight(barHeight); + pieces_availability->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); + // Tracker list trackerList = new TrackerList(this); connect(trackerUpButton, SIGNAL(clicked()), trackerList, SLOT(moveSelectionUp())); diff --git a/src/gui/properties/propertieswidget.ui b/src/gui/properties/propertieswidget.ui index 2340f5e32..7ad836036 100644 --- a/src/gui/properties/propertieswidget.ui +++ b/src/gui/properties/propertieswidget.ui @@ -10,14 +10,20 @@ 452 - - Form - 0 - + + 0 + + + 0 + + + 0 + + 0 @@ -25,22 +31,25 @@ 0 - + 0 - + + 0 + + + 0 + + + 0 + + 0 - - - 0 - 0 - - true @@ -55,115 +64,88 @@ - - - QLayout::SetDefaultConstraint - - - - - - 0 - 0 - - - - - 100 - 16777215 - - - - Progress: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 0 - 0 - - - - - 50 - 16777215 - - - - - - - Qt::PlainText - - - Qt::AlignLeading - - - 0 - - - - - - - - - QLayout::SetDefaultConstraint - - - - - - 0 - 0 - - - - - 100 - 16777215 - - - - Availability: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 0 - 0 - - - - - 50 - 16777215 - - - - - - - Qt::PlainText - - - Qt::AlignLeading - - - - + + + + 4 + + + 4 + + + + + + 0 + 0 + + + + Progress: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + Qt::PlainText + + + + + + + + 0 + 0 + + + + Availability: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + Qt::PlainText + + + + + + + Qt::PlainText + + + + + + + Qt::PlainText + + + + + @@ -173,225 +155,17 @@ - - - - 0 - 0 - - + Transfer - - - - - 0 - 0 - - - - Time Active: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 0 - 0 - - - - - - - Qt::PlainText - - - - - - - - 0 - 0 - - - - ETA: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 0 - 0 - - - - - - - Qt::PlainText - - - - - - - - 0 - 0 - - - - Connections: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 0 - 0 - - - - - - - Qt::PlainText - - - - - - - - 0 - 0 - - - - Downloaded: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 0 - 0 - - - - - - - Qt::PlainText - - - - - - - - 0 - 0 - - - - Uploaded: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 0 - 0 - - - - - - - Qt::PlainText - - - - - - - - 0 - 0 - - - - Seeds: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 0 - 0 - - - - - - - Qt::PlainText - - - - - - - - 0 - 0 - - - - Download Speed: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - + + 4 + + + 4 + @@ -400,9 +174,6 @@ 0 - - - Qt::PlainText @@ -432,9 +203,6 @@ 0 - - - Qt::PlainText @@ -456,16 +224,42 @@ - - + + + + + 0 + 0 + + + + Connections: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + 0 0 - - + + Qt::PlainText + + + + + + + + 0 + 0 + Qt::PlainText @@ -488,22 +282,64 @@ - - + + + + + 0 + 0 + + + + Share Ratio: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + 0 0 - - + + Qt::PlainText + + + + + + + + 0 + 0 + Qt::PlainText + + + + + 0 + 0 + + + + Downloaded: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + @@ -520,24 +356,8 @@ - - - - - 0 - 0 - - - - - - - Qt::PlainText - - - - - + + 0 @@ -545,55 +365,33 @@ - Wasted: + Last Seen Complete: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - 0 - 0 - - - - - - - Qt::PlainText - - - - - - - - 0 - 0 - - - - Share Ratio: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - + + 0 0 - - + + Qt::PlainText + + + + + + + + 0 + 0 + Qt::PlainText @@ -616,38 +414,6 @@ - - - - - 0 - 0 - - - - - - - Qt::PlainText - - - - - - - - 0 - 0 - - - - Last Seen Complete: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - @@ -656,29 +422,200 @@ 0 + + Qt::PlainText + + + + + + + + 0 + 0 + + - + Seeds: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + Download Speed: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 0 + Qt::PlainText + + + + + 0 + 0 + + + + Qt::PlainText + + + + + + + + 0 + 0 + + + + Qt::PlainText + + + + + + + + 0 + 0 + + + + Uploaded: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + Qt::PlainText + + + + + + + + 0 + 0 + + + + Qt::PlainText + + + + + + + + 0 + 0 + + + + Time Active: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + Qt::PlainText + + + + + + + + 0 + 0 + + + + ETA: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + Wasted: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + - - - - 0 - 0 - - + Information + + 4 + + + 2 + @@ -703,9 +640,6 @@ 0 - - - Qt::PlainText @@ -735,9 +669,6 @@ 0 - - - Qt::PlainText @@ -767,9 +698,6 @@ 0 - - - Qt::PlainText @@ -799,9 +727,6 @@ 0 - - - Qt::PlainText @@ -831,9 +756,6 @@ 0 - - - Qt::PlainText @@ -863,9 +785,6 @@ 0 - - - Qt::PlainText @@ -895,9 +814,6 @@ 0 - - - Qt::PlainText @@ -930,15 +846,9 @@ 0 - - - Qt::PlainText - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - true @@ -1000,7 +910,7 @@ - + @@ -1169,8 +1079,7 @@ - - +