[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=8c8cd7d

The following commit has been merged in the master branch:
commit 8c8cd7dc1e684164967f99e77c68a0042876e3d7
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Sun Apr 13 15:30:06 2014 +0200

    Reorganize menu bar in text-ui
    
    This replaces 'File' menu by 'Conversation' menu (because we don't deal with
    files in text ui but with conversations), and moves there some actions from
    'Actions' menu, which are not really actions, but are move related to
    conversations.
    
    REVIEW: 117539
---
 app/chat-window.cpp |  5 ++++-
 app/chatwindow.rc   | 21 ++++++++++++++-------
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/app/chat-window.cpp b/app/chat-window.cpp
index 0893835..8608c0a 100644
--- a/app/chat-window.cpp
+++ b/app/chat-window.cpp
@@ -758,6 +758,9 @@ void ChatWindow::setupChatTabSignals(ChatTab *chatTab)
 
 void ChatWindow::setupCustomActions()
 {
+    KStandardAction::close(this, SLOT(closeCurrentTab()), this);
+    KStandardAction::quit(this, SLOT(close()), this);
+
     KAction *nextTabAction = new KAction(KIcon(QLatin1String("go-next-view")), i18n("&Next Tab"), this);
     nextTabAction->setShortcuts(KStandardShortcut::tabNext());
     connect(nextTabAction, SIGNAL(triggered()), this, SLOT(onNextTabActionTriggered()));
@@ -794,7 +797,7 @@ void ChatWindow::setupCustomActions()
     KAction* collaborateDocumentAction = new KAction(KIcon(QLatin1String("document-share")), i18n("&Collaboratively edit a document"), this);
     connect(collaborateDocumentAction, SIGNAL(triggered()), this, SLOT(onCollaborateDocumentTriggered()));
 
-    KAction* showInfoAction = new KAction(KIcon(QLatin1String("")), i18n("&Contact info"), this);
+    KAction* showInfoAction = new KAction(KIcon(QLatin1String("view-pim-contacts")), i18n("&Contact info"), this);
     connect(showInfoAction, SIGNAL(triggered()), this, SLOT(onShowInfoTriggered()));
 
     m_spellDictCombo = new Sonnet::DictionaryComboBox();
diff --git a/app/chatwindow.rc b/app/chatwindow.rc
index c8fa144..3ad0c8f 100644
--- a/app/chatwindow.rc
+++ b/app/chatwindow.rc
@@ -1,29 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gui name="ktp-text-ui"
-     version="7"
+     version="8"
      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
                          http://www.kde.org/standards/kxmlgui/1.0/kxmlgui.xsd" >
 
  <MenuBar>
-  <Menu name="file"/>
+  <Menu name="file" deleted="true"/>
+  <Menu name="conversation" append="first_menu"><text>&Conversation</text>
+   <Action name="invite-to-chat"/>
+   <Action name="leave-chat"/>
+   <Separator/>
+   <Action name="clear-chat-view"/>
+   <Action name="open-log"/>
+   <separator/>
+   <Action name="contact-info"/>
+   <Separator/>
+   <Action name="file_close"/>
+   <Action name="file_quit"/>
+  </Menu>
   <Menu name="edit"/>
   <Menu name="actions"><text>&Actions</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="collaborate-document"/>
-   <Action name="open-log"/>
    <Separator />
    <Action name="block-contact"/>
    <Separator />
-   <Action name="clear-chat-view"/>
-   <Separator />
-   <Action name="contact-info"/>
   </Menu>
   <Menu name="settings"/>
   <Menu name="help"/>

-- 
ktp-text-ui packaging