[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=4b94504

The following commit has been merged in the master branch:
commit 4b94504230cf300161a23c83948cdd909efb4064
Author: Nick Lou <nicklkde at ymail.com>
Date:   Tue Aug 7 17:47:23 2012 +0200

    Make the 'Reset' button in chat appearance config window work
    
    REVIEW: 105701
    BUG: 295106
    FIXED-IN: 0.5
---
 config/appearance-config.cpp | 43 +++++++++++++++++++++++++++++++++----------
 config/appearance-config.h   |  4 +++-
 2 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/config/appearance-config.cpp b/config/appearance-config.cpp
index 5e2a778..d38da3a 100644
--- a/config/appearance-config.cpp
+++ b/config/appearance-config.cpp
@@ -39,10 +39,6 @@ AppearanceConfig::AppearanceConfig(QWidget *parent, const QVariantList& args)
 {
     ui->setupUi(this);
 
-    ChatWindowStyleManager *manager = ChatWindowStyleManager::self();
-    manager->loadStyles();
-    connect(manager, SIGNAL(loadStylesFinished()), SLOT(onStylesLoaded()));
-
     m_demoChatHeader.setChatName(i18n("A demo chat"));
     m_demoChatHeader.setSourceName(i18n("Jabber"));
     m_demoChatHeader.setTimeOpened(QDateTime::currentDateTime());
@@ -50,13 +46,11 @@ AppearanceConfig::AppearanceConfig(QWidget *parent, const QVariantList& args)
     m_demoChatHeader.setDestinationDisplayName(i18nc("Example name", "Ted"));
     m_demoChatHeader.setGroupChat(false);
 
-    ui->chatView->load(AdiumThemeView::SingleUserChat);
-    ui->chatView->initialise(m_demoChatHeader);
+    ChatWindowStyleManager *manager = ChatWindowStyleManager::self();
+    connect(manager, SIGNAL(loadStylesFinished()), SLOT(onStylesLoaded()));
 
-    ui->showHeader->setChecked(ui->chatView->isHeaderDisplayed());
-    ui->customFontBox->setChecked(ui->chatView->isCustomFont());
-    ui->fontFamily->setCurrentFont(QFont(ui->chatView->fontFamily()));
-    ui->fontSize->setValue(ui->chatView->fontSize());
+    //loading theme settings.
+    +    load();
 
     connect(ui->chatView, SIGNAL(loadFinished(bool)), SLOT(sendDemoMessages()));
     connect(ui->styleComboBox, SIGNAL(activated(int)), SLOT(onStyleSelected(int)));
@@ -271,6 +265,35 @@ void AppearanceConfig::sendDemoMessages()
     ui->chatView->addStatusMessage(statusMessage);
 }
 
+void AppearanceConfig::defaults()
+{
+    ChatWindowStyleManager *manager = ChatWindowStyleManager::self();
+    manager->loadStyles();
+
+    onVariantSelected(QLatin1String("renkoo.AdiumMessageStyle"));
+    onStyleSelected(0);
+    ui->showHeader->setChecked(false);
+    ui->customFontBox->setChecked(false);
+    ui->chatView->setUseCustomFont(false);
+    ui->fontFamily->setCurrentFont(KGlobalSettings::generalFont());
+    ui->fontSize->setValue(QWebSettings::DefaultFontSize);
+}
+
+void AppearanceConfig::load()
+{
+    ChatWindowStyleManager *manager = ChatWindowStyleManager::self();
+    manager->loadStyles();
+
+    ui->chatView->load(AdiumThemeView::SingleUserChat);
+    ui->chatView->initialise(m_demoChatHeader);
+
+    ui->showHeader->setChecked(ui->chatView->isHeaderDisplayed());
+    ui->customFontBox->setChecked(ui->chatView->isCustomFont());
+    ui->fontFamily->setCurrentFont(QFont(ui->chatView->fontFamily()));
+    ui->fontSize->setValue(ui->chatView->fontSize());
+}
+
+
 void AppearanceConfig::save()
 {
     kDebug();
diff --git a/config/appearance-config.h b/config/appearance-config.h
index 876d0ed..8e226ee 100644
--- a/config/appearance-config.h
+++ b/config/appearance-config.h
@@ -40,7 +40,9 @@ public:
     ~AppearanceConfig();
 
 public Q_SLOTS:
-    void save();
+    virtual void save();
+    virtual void load();
+    virtual void defaults();
 
 protected:
     void changeEvent(QEvent *e);

-- 
ktp-text-ui packaging