File 0005-Do-not-offer-In-Title-Bar-as-menu-bar-styl... of Package plasma5-desktop

Overview Repositories Revisions Requests Users Attributes Meta

File 0005-Do-not-offer-In-Title-Bar-as-menu-bar-style.patch of Package plasma5-desktop (Revision 0f517b8d91f87f8e99924fe60d870bf1)

Currently displaying revision 0f517b8d91f87f8e99924fe60d870bf1 , Show latest

From 88290aadaf60d5bf5759814731ae9c93bfa219e0 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fabian@ritter-vogt.de>
Date: Mon, 6 Mar 2017 17:54:54 +0100
Subject: [PATCH 5/5] Do not offer "In Title Bar" as menu bar style

- Not supported as part of this backport
---
 kcms/style/finetuning.ui | 5 -----
 kcms/style/kcmstyle.cpp  | 6 ++----
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/kcms/style/finetuning.ui b/kcms/style/finetuning.ui
index 9da7716a..280df2e6 100644
--- a/kcms/style/finetuning.ui
+++ b/kcms/style/finetuning.ui
@@ -175,11 +175,6 @@
         </item>
         <item>
          <property name="text">
-          <string>Title bar button</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
           <string>Application Menu widget</string>
          </property>
         </item>
diff --git a/kcms/style/kcmstyle.cpp b/kcms/style/kcmstyle.cpp
index e858ed37..69b41ea1 100644
--- a/kcms/style/kcmstyle.cpp
+++ b/kcms/style/kcmstyle.cpp
@@ -740,8 +740,6 @@ QString KCMStyle::menuBarStyleText(int index)
 {
     switch (index) {
         case 1:
-            return QStringLiteral("Decoration");
-        case 2:
             return QStringLiteral("Widget");
     }
 
@@ -751,9 +749,9 @@ QString KCMStyle::menuBarStyleText(int index)
 int KCMStyle::menuBarStyleIndex(const QString &text)
 {
     if (text == QLatin1String("Decoration")) {
-        return 1;
+        return 0;
     } else if (text == QLatin1String("Widget")) {
-        return 2;
+        return 1;
     }
 
     return 0;
-- 
2.11.1

Places

File 0005-Do-not-offer-In-Title-Bar-as-menu-bar-style.patch of Package plasma5-desktop (Revision 0f517b8d91f87f8e99924fe60d870bf1)

Places