[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=06af045

The following commit has been merged in the master branch:
commit 06af045c651aab35af4e0b2885348bedf87675af
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Sun May 13 22:51:22 2012 +0200

    Remove some buttons from the default main toolbar and improve their tooltips
    
    Reviewed-by: David Edmundson
---
 app/chat-window.cpp | 7 +++++++
 app/chatwindow.rc   | 6 +-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/chat-window.cpp b/app/chat-window.cpp
index 119f7bc..c8ac113 100644
--- a/app/chat-window.cpp
+++ b/app/chat-window.cpp
@@ -571,21 +571,28 @@ void ChatWindow::setupCustomActions()
     connect(previousTabAction, SIGNAL(triggered()), this, SLOT(onPreviousTabActionTriggered()));
 
     KAction *audioCallAction = new KAction(KIcon(QLatin1String("audio-headset")), i18n("&Audio Call"), this);
+    audioCallAction->setToolTip(i18nc("Toolbar icon tooltip", "Start an audio call with this contact"));
     connect(audioCallAction, SIGNAL(triggered()), this, SLOT(onAudioCallTriggered()));
 
     KAction *blockContactAction = new KAction(KIcon(QLatin1String("im-ban-kick-user")), i18n("&Block Contact"), this);
+    blockContactAction->setToolTip(i18nc("Toolbar icon tooltip",
+                                         "Blocking means that this contact will not see you online and you will not receive any messages from this contact"));
     connect(blockContactAction, SIGNAL(triggered()), this, SLOT(onBlockContactTriggered()));
 
     KAction *fileTransferAction = new KAction(KIcon(QLatin1String("mail-attachment")), i18n("&Send File"), this);
+    fileTransferAction->setToolTip(i18nc("Toolbar icon tooltip", "Send a file to this contact"));
     connect(fileTransferAction, SIGNAL(triggered()), this, SLOT(onFileTransferTriggered()));
 
     KAction *inviteToChat = new KAction(KIcon(QLatin1String("user-group-new")), i18n("&Invite to Chat"), this);
+    inviteToChat->setToolTip(i18nc("Toolbar icon tooltip", "Invite any other contacts to join this chat"));
     connect(inviteToChat, SIGNAL(triggered()), this, SLOT(onInviteToChatTriggered()));
 
     KAction *videoCallAction = new KAction(KIcon(QLatin1String("camera-web")), i18n("&Video Call"), this);
+    videoCallAction->setToolTip(i18nc("Toolbar icon tooltip", "Start a vido call with this contact"));
     connect(videoCallAction, SIGNAL(triggered()), this, SLOT(onVideoCallTriggered()));
 
     KAction *shareDesktopAction = new KAction(KIcon(QLatin1String("krfb")), i18n("Share My &Desktop"), this);
+    shareDesktopAction->setToolTip(i18nc("Toolbar icon tooltip", "Start an application that allows this contact to see your desktop"));
     connect(shareDesktopAction, SIGNAL(triggered()), this, SLOT(onShareDesktopTriggered()));
 
     m_spellDictCombo = new Sonnet::DictionaryComboBox();
diff --git a/app/chatwindow.rc b/app/chatwindow.rc
index c398c29..6e8c002 100644
--- a/app/chatwindow.rc
+++ b/app/chatwindow.rc
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gui name="ktp-text-ui"
-     version="3"
+     version="4"
      xmlns="http://www.kde.org/standards/kxmlgui/1.0"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://www.kde.org/standards/kxmlgui/1.0
@@ -26,13 +26,9 @@
 
  <ToolBar noMerge="1" name="mainToolBar">
   <text>Main Toolbar</text>
-  <Action name="invite-to-chat"/>
-  <Separator />
   <Action name="audio-call"/>
   <Action name="video-call"/>
   <Action name="send-file"/>
-  <Action name="share-desktop"/>
-  <Action name="open-log"/>
   <Separator />
   <Action name="edit_find"/>
  </ToolBar>

-- 
ktp-text-ui packaging