only shorten tooltips on URL column and tab name

This commit is contained in:
Martin Rotter 2021-11-22 07:49:17 +01:00
parent 258cff1c18
commit 9f68cf81bb
3 changed files with 9 additions and 6 deletions

View file

@ -26,7 +26,7 @@
<url type="donation">https://github.com/sponsors/martinrotter</url> <url type="donation">https://github.com/sponsors/martinrotter</url>
<content_rating type="oars-1.1" /> <content_rating type="oars-1.1" />
<releases> <releases>
<release version="4.0.4" date="2021-11-19"/> <release version="4.0.4" date="2021-11-22"/>
</releases> </releases>
<content_rating type="oars-1.0"> <content_rating type="oars-1.0">
<content_attribute id="violence-cartoon">none</content_attribute> <content_attribute id="violence-cartoon">none</content_attribute>

View file

@ -351,10 +351,13 @@ QVariant MessagesModel::data(const QModelIndex& idx, int role) const {
if (idx.column() == MSG_DB_SCORE_INDEX) { if (idx.column() == MSG_DB_SCORE_INDEX) {
return data(idx, Qt::ItemDataRole::EditRole); return data(idx, Qt::ItemDataRole::EditRole);
} }
else { else if (idx.column() == MSG_DB_URL_INDEX) {
return TextFactory::shorten(data(idx, Qt::ItemDataRole::DisplayRole).toString(), return TextFactory::shorten(data(idx, Qt::ItemDataRole::DisplayRole).toString(),
TEXT_TOOLTIP_LIMIT); TEXT_TOOLTIP_LIMIT);
} }
else {
return data(idx, Qt::ItemDataRole::DisplayRole);
}
} }
} }

View file

@ -288,7 +288,7 @@ void TabWidget::gotoPreviousTab() {
} }
void TabWidget::indentTabText(int index) { void TabWidget::indentTabText(int index) {
#if defined(Q_OS_MACOSOS) #if defined(Q_OS_MACOS)
if (tabBar()->tabType(index) != TabBar::FeedReader && !tabIcon(index).isNull()) { if (tabBar()->tabType(index) != TabBar::FeedReader && !tabIcon(index).isNull()) {
// We have closable tab with some icon, fix the title. // We have closable tab with some icon, fix the title.
const QString text = tabText(index); const QString text = tabText(index);
@ -311,7 +311,7 @@ void TabWidget::removeTab(int index, bool clear_from_memory) {
} }
int TabWidget::addTab(TabContent* widget, const QIcon& icon, const QString& label, TabBar::TabType type) { int TabWidget::addTab(TabContent* widget, const QIcon& icon, const QString& label, TabBar::TabType type) {
const int index = QTabWidget::addTab(widget, icon, label); const int index = QTabWidget::addTab(widget, icon, TextFactory::shorten(label));
tabBar()->setTabType(index, type); tabBar()->setTabType(index, type);
indentTabText(index); indentTabText(index);
@ -319,7 +319,7 @@ int TabWidget::addTab(TabContent* widget, const QIcon& icon, const QString& labe
} }
int TabWidget::addTab(TabContent* widget, const QString& label, TabBar::TabType type) { int TabWidget::addTab(TabContent* widget, const QString& label, TabBar::TabType type) {
const int index = QTabWidget::addTab(widget, label); const int index = QTabWidget::addTab(widget, TextFactory::shorten(label));
tabBar()->setTabType(index, type); tabBar()->setTabType(index, type);
indentTabText(index); indentTabText(index);
@ -349,7 +349,7 @@ void TabWidget::changeIcon(int index, const QIcon& new_icon) {
void TabWidget::changeTitle(int index, const QString& new_title) { void TabWidget::changeTitle(int index, const QString& new_title) {
setTabText(index, TextFactory::shorten(new_title)); setTabText(index, TextFactory::shorten(new_title));
setTabToolTip(index, new_title); setTabToolTip(index, TextFactory::shorten(new_title));
indentTabText(index); indentTabText(index);
} }