[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=65de2d4

The following commit has been merged in the master branch:
commit 65de2d43eae4038e828d9f0af162acb5e92b0819
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Fri Sep 17 15:37:36 2010 +0000

    Enable/Disable the "show header" in the chat window config as applicable
    
    
    svn path=/trunk/playground/network/telepathy-chat-handler/; revision=1176410
---
 config/mainwindow.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/config/mainwindow.cpp b/config/mainwindow.cpp
index d31e952..355732a 100644
--- a/config/mainwindow.cpp
+++ b/config/mainwindow.cpp
@@ -15,16 +15,16 @@ MainWindow::MainWindow(QWidget *parent) :
     ui->setupUi(this);
 
     ChatWindowStyleManager* manager = ChatWindowStyleManager::self();
-    manager->loadStyles();
+   // manager->loadStyles();
     connect(manager, SIGNAL(loadStylesFinished()), SLOT(onStylesLoaded()));
 
     //set up a pretend config chat.
     TelepathyChatInfo info;
 
     info.setChatName("A demo chat");
+    info.setSourceName("Jabber");
     info.setTimeOpened(QDateTime::currentDateTime());
     info.setDestinationName("BobMarley at yahoo.com");
-    info.setSourceName("Jabber");
     info.setDestinationDisplayName("Bob Marley");
 
     ui->chatView->initialise(info);
@@ -66,8 +66,10 @@ void MainWindow::onStylesLoaded()
     ui->styleComboBox->setCurrentItem(currentStyle->getStyleName());
 
     updateVariantsList();
+    //FIXME call onStyleSelected
 }
 
+
 void MainWindow::updateVariantsList()
 {
     kDebug();
@@ -88,6 +90,8 @@ void MainWindow::onStyleSelected(const QString & styleName)
     ChatWindowStyle* style = ChatWindowStyleManager::self()->getValidStyleFromPool(styleName);
     ui->chatView->setChatStyle(style);
     updateVariantsList();
+    ui->showHeader->setEnabled(style->hasHeader());
+
 }
 
 void MainWindow::onVariantSelected(const QString &variant)
@@ -106,7 +110,6 @@ void MainWindow::onShowHeaderChanged(bool showHeader)
 void MainWindow::sendDemoMessages()
 {
     //add a fake message
-    //in my head Bob Marley is quite a chatty friendly guy...
 
     TelepathyChatMessageInfo message(TelepathyChatMessageInfo::RemoteToLocal);
     message.setMessage("Hello");

-- 
ktp-text-ui packaging