Browse Source

Merge pull request #4917 from Chocobo1/fix_comment_space

Fix additional space in comment label
adaptive-webui-19844
sledgehammer999 9 years ago
parent
commit
d1ce5826e1
  1. 15
      src/gui/addnewtorrentdialog.cpp
  2. 1
      src/gui/addnewtorrentdialog.h
  3. 2
      src/gui/addnewtorrentdialog.ui

15
src/gui/addnewtorrentdialog.cpp

@ -689,7 +689,7 @@ void AddNewTorrentDialog::setMetadataProgressIndicator(bool visibleIndicator, co @@ -689,7 +689,7 @@ void AddNewTorrentDialog::setMetadataProgressIndicator(bool visibleIndicator, co
void AddNewTorrentDialog::setupTreeview()
{
if (!m_hasMetadata) {
ui->comment_lbl->setText(tr("Not Available", "This comment is unavailable"));
setCommentText(tr("Not Available", "This comment is unavailable"));
ui->date_lbl->setText(tr("Not Available", "This date is unavailable"));
}
else {
@ -697,7 +697,7 @@ void AddNewTorrentDialog::setupTreeview() @@ -697,7 +697,7 @@ void AddNewTorrentDialog::setupTreeview()
setWindowTitle(m_torrentInfo.name());
// Set torrent information
ui->comment_lbl->setText(Utils::Misc::parseHtmlLinks(m_torrentInfo.comment()));
setCommentText(Utils::Misc::parseHtmlLinks(m_torrentInfo.comment()));
ui->date_lbl->setText(!m_torrentInfo.creationDate().isNull() ? m_torrentInfo.creationDate().toString(Qt::DefaultLocaleShortDate) : tr("Not available"));
// Prepare content tree
@ -777,3 +777,14 @@ void AddNewTorrentDialog::savingModeChanged(bool enabled) @@ -777,3 +777,14 @@ void AddNewTorrentDialog::savingModeChanged(bool enabled)
ui->defaultSavePathCheckBox->setVisible(false);
}
}
void AddNewTorrentDialog::setCommentText(const QString &str) const
{
ui->commentLabel->setText(str);
// workaround for the additional space introduced by QScrollArea
int lineHeight = ui->commentLabel->fontMetrics().lineSpacing();
int lines = 1 + str.count("\n");
int height = lineHeight * lines;
ui->scrollArea->setMaximumHeight(height);
}

1
src/gui/addnewtorrentdialog.h

@ -95,6 +95,7 @@ private: @@ -95,6 +95,7 @@ private:
void setMetadataProgressIndicator(bool visibleIndicator, const QString &labelText = QString());
void setupTreeview();
QString defaultSavePath() const;
void setCommentText(const QString &str) const;
void showEvent(QShowEvent *event) override;

2
src/gui/addnewtorrentdialog.ui

@ -287,7 +287,7 @@ @@ -287,7 +287,7 @@
<number>0</number>
</property>
<item>
<widget class="QLabel" name="comment_lbl">
<widget class="QLabel" name="commentLabel">
<property name="textFormat">
<enum>Qt::RichText</enum>
</property>

Loading…
Cancel
Save