[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=babca8f

The following commit has been merged in the master branch:
commit babca8f6e4adab969eba17aa8d3e115e1982c70f
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Wed Mar 21 01:00:04 2012 +0100

    Handle variant name for single variant themes
---
 lib/chat-window-style.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/lib/chat-window-style.cpp b/lib/chat-window-style.cpp
index 9ec0589..086ee04 100644
--- a/lib/chat-window-style.cpp
+++ b/lib/chat-window-style.cpp
@@ -311,6 +311,9 @@ void ChatWindowStyle::listVariants()
         variantPath = QString(QLatin1String("Variants/%1")).arg(*it);
         d->variantsList.insert(variantName, variantPath);
     }
+    if (d->variantsList.isEmpty()) {
+        d->variantsList.insert(d->defaultVariantName, QLatin1String("main.css"));
+    }
 }
 
 void ChatWindowStyle::setContent(InternalIdentifier id, const QString& content)
@@ -337,6 +340,15 @@ void ChatWindowStyle::readStyleFiles()
     QString infoPlistFile = d->baseHref + QLatin1String("../Info.plist");
     ChatStylePlistFileReader plistReader(infoPlistFile);
     d->defaultVariantName = plistReader.defaultVariant();
+    if (d->defaultVariantName.isEmpty()) {
+        // older themes use this
+        d->defaultVariantName = plistReader.displayNameForNoVariant();
+    }
+    if (d->defaultVariantName.isEmpty()) {
+        // If name is still empty we use "Normal"
+        d->defaultVariantName = i18nc("Normal style variant menu item", "Normal");
+    }
+    kDebug() << "defaultVariantName = " << d->defaultVariantName;
     d->defaultFontFamily  = plistReader.defaultFontFamily();
     d->defaultFontSize    = plistReader.defaultFontSize();
     d->disableCombineConsecutive = plistReader.disableCombineConsecutive();

-- 
ktp-text-ui packaging