mirror of
https://github.com/d47081/qBittorrent.git
synced 2025-01-24 05:25:37 +00:00
Merge pull request #4917 from Chocobo1/fix_comment_space
Fix additional space in comment label
This commit is contained in:
commit
d1ce5826e1
@ -689,7 +689,7 @@ void AddNewTorrentDialog::setMetadataProgressIndicator(bool visibleIndicator, co
|
|||||||
void AddNewTorrentDialog::setupTreeview()
|
void AddNewTorrentDialog::setupTreeview()
|
||||||
{
|
{
|
||||||
if (!m_hasMetadata) {
|
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"));
|
ui->date_lbl->setText(tr("Not Available", "This date is unavailable"));
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
@ -697,7 +697,7 @@ void AddNewTorrentDialog::setupTreeview()
|
|||||||
setWindowTitle(m_torrentInfo.name());
|
setWindowTitle(m_torrentInfo.name());
|
||||||
|
|
||||||
// Set torrent information
|
// 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"));
|
ui->date_lbl->setText(!m_torrentInfo.creationDate().isNull() ? m_torrentInfo.creationDate().toString(Qt::DefaultLocaleShortDate) : tr("Not available"));
|
||||||
|
|
||||||
// Prepare content tree
|
// Prepare content tree
|
||||||
@ -777,3 +777,14 @@ void AddNewTorrentDialog::savingModeChanged(bool enabled)
|
|||||||
ui->defaultSavePathCheckBox->setVisible(false);
|
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);
|
||||||
|
}
|
||||||
|
@ -95,6 +95,7 @@ private:
|
|||||||
void setMetadataProgressIndicator(bool visibleIndicator, const QString &labelText = QString());
|
void setMetadataProgressIndicator(bool visibleIndicator, const QString &labelText = QString());
|
||||||
void setupTreeview();
|
void setupTreeview();
|
||||||
QString defaultSavePath() const;
|
QString defaultSavePath() const;
|
||||||
|
void setCommentText(const QString &str) const;
|
||||||
|
|
||||||
void showEvent(QShowEvent *event) override;
|
void showEvent(QShowEvent *event) override;
|
||||||
|
|
||||||
|
@ -287,7 +287,7 @@
|
|||||||
<number>0</number>
|
<number>0</number>
|
||||||
</property>
|
</property>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QLabel" name="comment_lbl">
|
<widget class="QLabel" name="commentLabel">
|
||||||
<property name="textFormat">
|
<property name="textFormat">
|
||||||
<enum>Qt::RichText</enum>
|
<enum>Qt::RichText</enum>
|
||||||
</property>
|
</property>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user