[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=583d99a

The following commit has been merged in the master branch:
commit 583d99a7d95ce6efe4fe39288ac167761b4e80ce
Author: Dominik Schmidt <ich at dominik-schmidt.de>
Date:   Mon Sep 20 12:49:02 2010 +0000

    Implement a defaultVariantName in ChatWindowStyle with the plistfilereader.
    
    svn path=/trunk/playground/network/telepathy-chat-handler/; revision=1177523
---
 lib/chatview.cpp        | 31 ++++++++++++++++++++++++-------
 lib/chatview.h          |  4 +++-
 lib/chatwindowstyle.cpp |  9 ++++++++-
 3 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/lib/chatview.cpp b/lib/chatview.cpp
index a6493c0..a35160e 100644
--- a/lib/chatview.cpp
+++ b/lib/chatview.cpp
@@ -54,7 +54,13 @@ ChatView::ChatView(QWidget *parent) :
     }
 
     QString variant = appearanceConfig.readEntry("styleVariant");
-    m_variantPath = QString("Variants/%1.css").arg(variant);
+    if(!variant.isEmpty()) {
+        m_variantPath = QString("Variants/%1.css").arg(variant);
+        m_variantName = variant;
+    } else {
+        m_variantPath = QString("Variants/%1.css").arg(m_chatStyle->defaultVariantName());
+        m_variantName = m_chatStyle->defaultVariantName();
+    }
     m_displayHeader = appearanceConfig.readEntry("displayHeader", false);
 
 
@@ -138,13 +144,9 @@ void ChatView::initialise(const TelepathyChatInfo &chatInfo)
     }
 }
 
-const QString ChatView::variant() const
-{
-    return m_variantPath;
-}
-
 void ChatView::setVariant(const QString &variant)
 {
+    m_variantName = variant;
     m_variantPath = QString("Variants/%1.css").arg(variant);
 
     //FIXME update the display!
@@ -162,10 +164,15 @@ void ChatView::setChatStyle(ChatWindowStyle *chatStyle)
 
     //load the first variant
     QHash<QString, QString> variants = chatStyle->getVariants();
-    if (variants.keys().length() > 0) {
+    if(!chatStyle->defaultVariantName().isEmpty()) {
+        m_variantPath = variants.value(chatStyle->defaultVariantName());
+        m_variantName = chatStyle->defaultVariantName();
+    } else if (variants.keys().length() > 0) {
         m_variantPath = variants.values()[0];
+        m_variantName = variants.keys()[0];
     } else {
         m_variantPath = "";
+        m_variantName = "";
     }
 
 
@@ -307,3 +314,13 @@ QString ChatView::formatTime(const QString &_timeFormat, const QDateTime &dateTi
 
     return QString(buffer);
 }
+
+const QString ChatView::variantName() const
+{
+    return m_variantName;
+}
+
+const QString ChatView::variantPath() const
+{
+    return m_variantPath;
+}
diff --git a/lib/chatview.h b/lib/chatview.h
index 5d52ff2..11437df 100644
--- a/lib/chatview.h
+++ b/lib/chatview.h
@@ -38,7 +38,8 @@ public:
     //override various parts loaded from the config file.
     //note that the following will clear the contents of the chat window.
 
-    const QString variant() const;
+    const QString variantPath() const;
+    const QString variantName() const;
     void setVariant(const QString& variant);
 
     ChatWindowStyle *chatStyle() const;
@@ -55,6 +56,7 @@ public slots:
 private:
     ChatWindowStyle* m_chatStyle;
     QString m_variantPath;
+    QString m_variantName;
     KEmoticons m_emoticons;
     QString replaceHeaderKeywords(QString htmlTemplate, const TelepathyChatInfo&);
     //QString replaceMessageKeywords(QString htmlTemplate, const TelepathyChatMessageInfo&);
diff --git a/lib/chatwindowstyle.cpp b/lib/chatwindowstyle.cpp
index 20b8666..74a37a9 100644
--- a/lib/chatwindowstyle.cpp
+++ b/lib/chatwindowstyle.cpp
@@ -38,7 +38,6 @@ public:
     QString baseHref;
     StyleVariants variantsList;
     QString defaultVariantName;
-    QString currentVariantPath;
 
     QString templateHtml;
     QString headerHtml;
@@ -89,6 +88,9 @@ void ChatWindowStyle::init(const QString &styleId, StyleBuildMode styleBuildMode
     readStyleFiles();
     if (styleBuildMode & StyleBuildNormal) {
         listVariants();
+        if(d->defaultVariantName.isEmpty() && !d->variantsList.isEmpty()) {
+            d->defaultVariantName = d->variantsList.keys().first();
+        }
     }
 }
 
@@ -126,6 +128,11 @@ QString ChatWindowStyle::id() const
     return d->styleId;
 }
 
+QString ChatWindowStyle::defaultVariantName()
+{
+    return d->defaultVariantName;
+}
+
 QString ChatWindowStyle::getStyleBaseHref() const
 {
     return d->baseHref;

-- 
ktp-text-ui packaging