[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=1e1910c

The following commit has been merged in the master branch:
commit 1e1910c3fa426cbb196ec34b5b473baf87ce24e4
Author: Daniel Cohen <analoguecolour at gmail.com>
Date:   Sun Apr 13 18:08:35 2014 +0200

    Cleaned up presence/leave options
---
 config/appearance-config-tab.cpp | 27 ++++++++-------------------
 config/appearance-config-tab.h   |  4 ++--
 2 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/config/appearance-config-tab.cpp b/config/appearance-config-tab.cpp
index 5f90c29..c1c4ab4 100644
--- a/config/appearance-config-tab.cpp
+++ b/config/appearance-config-tab.cpp
@@ -56,8 +56,8 @@ AppearanceConfigTab::AppearanceConfigTab(QWidget *parent, TabMode mode)
     connect(ui->customFontBox, SIGNAL(clicked(bool)), SLOT(onFontGroupChanged(bool)));
     connect(ui->fontFamily, SIGNAL(currentFontChanged(QFont)), SLOT(onFontFamilyChanged(QFont)));
     connect(ui->fontSize, SIGNAL(valueChanged(int)), SLOT(onFontSizeChanged(int)));
-    connect(ui->showPresenceCheckBox, SIGNAL(stateChanged(int)), SLOT(onShowPresenceChangesChanged(int)));
-    connect(ui->showLeaveCheckBox, SIGNAL(stateChanged(int)), SLOT(onShowLeaveChangesChanged(int)));
+    connect(ui->showPresenceCheckBox, SIGNAL(toggled(bool)), SLOT(onShowPresenceChangesChanged(bool)));
+    connect(ui->showLeaveCheckBox, SIGNAL(toggled(bool)), SLOT(onShowLeaveChangesChanged(bool)));
 }
 
 AppearanceConfigTab::~AppearanceConfigTab()
@@ -98,24 +98,16 @@ void AppearanceConfigTab::onFontSizeChanged(int fontSize)
     tabChanged();
 }
 
-void AppearanceConfigTab::onShowPresenceChangesChanged(int state)
+void AppearanceConfigTab::onShowPresenceChangesChanged(bool stateChanged)
 {
-    if (state == Qt::Checked) {
-        ui->chatView->setShowPresenceChanges(true);
-    } else {
-        ui->chatView->setShowPresenceChanges(false);
-    }
+    ui->chatView->setShowPresenceChanges(stateChanged);
     ui->chatView->initialise(m_demoChatHeader);
     tabChanged();
 }
 
-void AppearanceConfigTab::onShowLeaveChangesChanged(int state)
+void AppearanceConfigTab::onShowLeaveChangesChanged(bool leaveChanged)
 {
-    if (state == Qt::Checked) {
-        ui->chatView->setShowLeaveChanges(true);
-    } else {
-        ui->chatView->setShowLeaveChanges(false);
-    }
+    ui->chatView->setShowLeaveChanges(leaveChanged);
     ui->chatView->initialise(m_demoChatHeader);
     tabChanged();
 }
@@ -349,9 +341,6 @@ void AppearanceConfigTab::defaultTab()
     ui->chatView->setUseCustomFont(false);
     ui->fontFamily->setCurrentFont(KGlobalSettings::generalFont());
     ui->fontSize->setValue(QWebSettings::DefaultFontSize);
-    if (m_groupChat) {
-        ui->showPresenceCheckBox->setChecked(false);
-    } else {
-        ui->showPresenceCheckBox->setChecked(true);
-    }
+    ui->showPresenceCheckBox->setChecked(!m_groupChat);
+
 }
diff --git a/config/appearance-config-tab.h b/config/appearance-config-tab.h
index ab0789a..9582660 100644
--- a/config/appearance-config-tab.h
+++ b/config/appearance-config-tab.h
@@ -65,8 +65,8 @@ private Q_SLOTS:
     void onFontGroupChanged(bool useCustomFont);
     void onFontFamilyChanged(const QFont &font);
     void onFontSizeChanged(int fontSize);
-    void onShowPresenceChangesChanged(int stateChanged);
-    void onShowLeaveChangesChanged(int joinLeaveChanged);
+    void onShowPresenceChangesChanged(bool stateChanged);
+    void onShowLeaveChangesChanged(bool leaveChanged);
 
 private:
     Ui::ChatWindowConfig *ui;

-- 
ktp-text-ui packaging