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

The following commit has been merged in the master branch:
commit eb0c8ba89eb591ec297c99a78bcde4076e6c7826
Author: Alin M Elena <alinm.elena at gmail.com>
Date:   Sat Apr 21 14:31:11 2012 +0100

    Removes the send button is pretty redundant nowadays
---
 lib/chat-widget.cpp |  4 +---
 lib/chat-widget.ui  | 18 ------------------
 2 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/lib/chat-widget.cpp b/lib/chat-widget.cpp
index d41089a..4d042aa 100644
--- a/lib/chat-widget.cpp
+++ b/lib/chat-widget.cpp
@@ -186,7 +186,6 @@ ChatWidget::ChatWidget(const Tp::TextChannelPtr & channel, const Tp::AccountPtr
     // make the sendMessageBox a focus proxy for the chatview
     d->ui.chatArea->setFocusProxy(d->ui.sendMessageBox);
     connect(d->ui.sendMessageBox, SIGNAL(returnKeyPressed()), SLOT(sendMessage()));
-    connect(d->ui.sendButton, SIGNAL(clicked()), SLOT(sendMessage()));
 
     connect(d->ui.searchBar, SIGNAL(findTextSignal(QString,QWebPage::FindFlags)), this, SLOT(findTextInChat(QString,QWebPage::FindFlags)));
     connect(d->ui.searchBar, SIGNAL(findNextSignal(QString,QWebPage::FindFlags)), this, SLOT(findNextTextInChat(QString,QWebPage::FindFlags)));
@@ -275,8 +274,7 @@ ChatSearchBar *ChatWidget::chatSearchBar() const
 
 void ChatWidget::setChatEnabled(bool enable)
 {
-    d->ui.sendMessageBox->setEnabled(enable);
-    d->ui.sendButton->setEnabled(enable);
+    d->ui.sendMessageBox->setEnabled(enable);    
 
     // show a message informing the user
     AdiumThemeStatusInfo statusMessage;
diff --git a/lib/chat-widget.ui b/lib/chat-widget.ui
index 0c3a2d7..cf6128f 100644
--- a/lib/chat-widget.ui
+++ b/lib/chat-widget.ui
@@ -156,30 +156,12 @@
        </property>
       </widget>
      </item>
-     <item>
-      <widget class="KPushButton" name="sendButton">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="text">
-        <string>&Send</string>
-       </property>
-      </widget>
-     </item>
     </layout>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
-   <class>KPushButton</class>
-   <extends>QPushButton</extends>
-   <header>kpushbutton.h</header>
-  </customwidget>
-  <customwidget>
    <class>AdiumThemeView</class>
    <extends>QWidget</extends>
    <header>adium-theme-view.h</header>

-- 
ktp-text-ui packaging