[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=03f0f2e

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

    Use styleId instead of styleName everywhere in the lib.
    
    svn path=/trunk/playground/network/telepathy-chat-handler/; revision=1177522
---
 lib/chatwindowstyle.cpp | 37 ++++++++++++++++++++++---------------
 lib/chatwindowstyle.h   |  8 +++++---
 2 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/lib/chatwindowstyle.cpp b/lib/chatwindowstyle.cpp
index 3c21ef1..20b8666 100644
--- a/lib/chatwindowstyle.cpp
+++ b/lib/chatwindowstyle.cpp
@@ -16,6 +16,7 @@
 */
 
 #include "chatwindowstyle.h"
+#include "chatstyleplistfilereader.h"
 
 // Qt includes
 #include <QFile>
@@ -33,9 +34,10 @@
 class ChatWindowStyle::Private
 {
 public:
-    QString styleName;
-    StyleVariants variantsList;
+    QString styleId;
     QString baseHref;
+    StyleVariants variantsList;
+    QString defaultVariantName;
     QString currentVariantPath;
 
     QString templateHtml;
@@ -58,28 +60,28 @@ public:
     QHash<QString, bool> compactVariants;
 };
 
-ChatWindowStyle::ChatWindowStyle(const QString &styleName, StyleBuildMode styleBuildMode)
-        : QObject(), d(new Private)
+ChatWindowStyle::ChatWindowStyle(const QString &styleId, StyleBuildMode styleBuildMode)
+	: QObject(), d(new Private)
 {
-    init(styleName, styleBuildMode);
+    init(styleId, styleBuildMode);
 }
 
-ChatWindowStyle::ChatWindowStyle(const QString &styleName, const QString &variantPath, StyleBuildMode styleBuildMode)
-        : QObject(), d(new Private)
+ChatWindowStyle::ChatWindowStyle(const QString &styleId, const QString &variantPath, StyleBuildMode styleBuildMode)
+	: QObject(), d(new Private)
 {
     d->currentVariantPath = variantPath;
-    init(styleName, styleBuildMode);
+    init(styleId, styleBuildMode);
 }
 
-void ChatWindowStyle::init(const QString &styleName, StyleBuildMode styleBuildMode)
+void ChatWindowStyle::init(const QString &styleId, StyleBuildMode styleBuildMode)
 {
-    QStringList styleDirs = KGlobal::dirs()->findDirs("data", QString("ktelepathy/styles/%1/Contents/Resources/").arg(styleName));
+    QStringList styleDirs = KGlobal::dirs()->findDirs("data", QString("ktelepathy/styles/%1/Contents/Resources/").arg(styleId));
 
     if (styleDirs.isEmpty()) {
-        kDebug(14000) << "Failed to find style" << styleName;
-        return;
+	kDebug(14000) << "Failed to find style" << styleId;
+	return;
     }
-    d->styleName = styleName;
+    d->styleId = styleId;
     if (styleDirs.count() > 1)
         kDebug(14000) << "found several styles with the same name. using first";
     d->baseHref = styleDirs.at(0);
@@ -119,9 +121,9 @@ ChatWindowStyle::StyleVariants ChatWindowStyle::getVariants()
     return d->variantsList;
 }
 
-QString ChatWindowStyle::getStyleName() const
+QString ChatWindowStyle::id() const
 {
-    return d->styleName;
+    return d->styleId;
 }
 
 QString ChatWindowStyle::getStyleBaseHref() const
@@ -267,9 +269,14 @@ void ChatWindowStyle::readStyleFiles()
     QString outgoingStateSendingFile = d->baseHref + QString("Outgoing/StateSending.html");
     QString outgoingStateSentFile = d->baseHref + QString("Outgoing/StateSent.html");
     QString outgoingStateErrorFile = d->baseHref + QString("Outgoing/StateError.html");
+    QString infoPlistFile = d->baseHref + QString("../Info.plist");
+
 
     QFile fileAccess;
 
+    ChatStylePlistFileReader plistReader(infoPlistFile);
+    d->defaultVariantName = plistReader.defaultVariant();
+
     //Load template file
     if (QFile::exists(templateFile)) {
         fileAccess.setFileName(templateFile);
diff --git a/lib/chatwindowstyle.h b/lib/chatwindowstyle.h
index 6177027..9ad9e96 100644
--- a/lib/chatwindowstyle.h
+++ b/lib/chatwindowstyle.h
@@ -51,8 +51,8 @@ public:
      * @brief Build a single chat window style.
      *
      */
-    explicit ChatWindowStyle(const QString &styleName, StyleBuildMode styleBuildMode = StyleBuildNormal);
-    ChatWindowStyle(const QString &styleName, const QString &variantPath, StyleBuildMode styleBuildMode = StyleBuildFast);
+    explicit ChatWindowStyle(const QString &styleId, StyleBuildMode styleBuildMode = StyleBuildNormal);
+    ChatWindowStyle(const QString &styleId, const QString &variantPath, StyleBuildMode styleBuildMode = StyleBuildFast);
     ~ChatWindowStyle();
 
     /**
@@ -77,7 +77,7 @@ public:
      *
      * @return the style path based.
      */
-    QString getStyleName() const;
+    QString id() const;
 
     /**
      * Get the style resource directory.
@@ -139,6 +139,8 @@ public:
      * Reload style from disk.
      */
     void reload();
+
+    QString defaultVariantName();
 private:
     /**
      * Read style HTML files from disk

-- 
ktp-text-ui packaging