[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=ab53649

The following commit has been merged in the master branch:
commit ab53649bac7588ca1f21ad8bb1f3baf2eca476f1
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sun Oct 3 14:03:24 2010 +0000

    Removed send button and status bar as discussed at the KDE Telepathy
    Sprint.
    
    svn path=/trunk/playground/network/telepathy-chat-handler/; revision=1182153
---
 lib/chatwindow.cpp |  3 ---
 lib/chatwindow.h   |  2 +-
 lib/chatwindow.ui  | 31 -------------------------------
 3 files changed, 1 insertion(+), 35 deletions(-)

diff --git a/lib/chatwindow.cpp b/lib/chatwindow.cpp
index d21b88b..03e8e83 100644
--- a/lib/chatwindow.cpp
+++ b/lib/chatwindow.cpp
@@ -63,7 +63,6 @@ ChatWindow::ChatWindow(ChatConnection* chat, QWidget *parent) :
     d->isGroupChat = false;
 
     ui->setupUi(this);
-    ui->statusLabel->setText("");
 
     ui->formatColor->setText("");
     ui->formatColor->setIcon(KIcon("format-text-color"));
@@ -105,7 +104,6 @@ ChatWindow::ChatWindow(ChatConnection* chat, QWidget *parent) :
     connect(m_chatConnection->channel().data(), SIGNAL(messageReceived(Tp::ReceivedMessage)), SLOT(handleIncomingMessage(Tp::ReceivedMessage)));
     connect(m_chatConnection->channel().data(), SIGNAL(messageSent(Tp::Message, Tp::MessageSendingFlags, QString)), SLOT(handleMessageSent(Tp::Message, Tp::MessageSendingFlags, QString)));
     connect(m_chatConnection->channel().data(), SIGNAL(chatStateChanged(Tp::ContactPtr, ChannelChatState)), SLOT(onChatStatusChanged(Tp::ContactPtr, ChannelChatState)));
-    connect(ui->sendMessageButton, SIGNAL(released()), SLOT(sendMessage()));
     connect(ui->chatArea, SIGNAL(loadFinished(bool)), SLOT(chatViewReady()));
 
     connect(ui->sendMessageBox, SIGNAL(textChanged()), SLOT(onInputBoxChanged()));
@@ -311,7 +309,6 @@ void ChatWindow::updateEnabledState(bool enable)
 {
     //update GUI
     ui->sendMessageBox->setEnabled(enable);
-    ui->sendMessageButton->setEnabled(enable);
 
     //set up the initial chat window details.
     if (enable) {
diff --git a/lib/chatwindow.h b/lib/chatwindow.h
index cf902f7..434ece2 100644
--- a/lib/chatwindow.h
+++ b/lib/chatwindow.h
@@ -39,7 +39,7 @@ class MessageBoxEventFilter : public QObject
 {
     Q_OBJECT
 public:
-    MessageBoxEventFilter(QObject* parent = 0) : QObject(parent) {};
+    MessageBoxEventFilter(QObject* parent = 0) : QObject(parent) {}
     virtual ~MessageBoxEventFilter() {}
 protected:
     bool eventFilter(QObject *obj, QEvent *event);
diff --git a/lib/chatwindow.ui b/lib/chatwindow.ui
index 35cd042..cfe60fd 100644
--- a/lib/chatwindow.ui
+++ b/lib/chatwindow.ui
@@ -129,37 +129,6 @@
      </property>
     </widget>
    </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <widget class="QLabel" name="statusLabel">
-       <property name="text">
-        <string>TextLabel</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QPushButton" name="sendMessageButton">
-       <property name="text">
-        <string>&Send</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
   </layout>
  </widget>
  <customwidgets>

-- 
ktp-text-ui packaging