summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <montel@kde.org>2016-09-19 05:27:19 (GMT)
committerMontel Laurent <montel@kde.org>2016-09-19 05:27:19 (GMT)
commita9b5c3127f83e8927934664266022ca0452174f1 (patch)
treec5f1046e24e63b9f58ce341918ddc2b9d89e696e
parent51c2a7ecbd98c40f60d89313a96936e56babf3ca (diff)
Remove AutoHideTabBarWithSingleTab as discussed
-rw-r--r--CMakeLists.txt2
-rw-r--r--messagelist/src/core/settings.kcfg5
-rw-r--r--messagelist/src/pane.cpp14
3 files changed, 5 insertions, 16 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6f19a15..2f5b4d5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,7 @@ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
include(ECMQtDeclareLoggingCategory)
include(ECMAddTests)
-set(PIM_VERSION "5.3.57")
+set(PIM_VERSION "5.3.58")
set(MESSAGELIB_LIB_VERSION ${PIM_VERSION})
set(AKONADIMIME_LIB_VERSION "5.3.40")
diff --git a/messagelist/src/core/settings.kcfg b/messagelist/src/core/settings.kcfg
index 4bc23d4..b4aaf6d 100644
--- a/messagelist/src/core/settings.kcfg
+++ b/messagelist/src/core/settings.kcfg
@@ -11,11 +11,6 @@
<label>Display tooltips for messages and group headers</label>
<whatsthis>Enable this option to display tooltips when hovering over an item in the message list.</whatsthis>
</entry>
- <entry name="AutoHideTabBarWithSingleTab" type="Bool">
- <default>true</default>
- <label>Hide tab bar when only one tab is open</label>
- <whatsthis>With this option enabled the tab bar will be displayed only when there are two or more tabs. With this option disabled the tab bar will be always shown. When the tab bar is hidden you can always open a folder in a new tab by middle-clicking it.</whatsthis>
- </entry>
<entry name="TabsHaveCloseButton" type="Bool">
<default>false</default>
<label>Show close button on each tab</label>
diff --git a/messagelist/src/pane.cpp b/messagelist/src/pane.cpp
index 4bee113..c57f3c1 100644
--- a/messagelist/src/pane.cpp
+++ b/messagelist/src/pane.cpp
@@ -826,18 +826,12 @@ void Pane::Private::updateTabControls()
mMoveTabLeftAction->setEnabled(enableAction);
}
- if (MessageListSettings::self()->autoHideTabBarWithSingleTab()) {
- q->tabBar()->setVisible(enableAction);
- if (enableAction) {
- q->setCornerWidget(mNewTabButton, Qt::TopLeftCorner);
- mNewTabButton->setVisible(true);
- } else {
- q->setCornerWidget(Q_NULLPTR, Qt::TopLeftCorner);
- }
- } else {
- q->tabBar()->setVisible(true);
+ q->tabBar()->setVisible(enableAction);
+ if (enableAction) {
q->setCornerWidget(mNewTabButton, Qt::TopLeftCorner);
mNewTabButton->setVisible(true);
+ } else {
+ q->setCornerWidget(Q_NULLPTR, Qt::TopLeftCorner);
}
const bool hasCloseButton(MessageListSettings::self()->tabsHaveCloseButton());