[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=74915eb

The following commit has been merged in the master branch:
commit 74915eb780c95d6ac329d582df2fcd27ef93ffbc
Merge: 33fe58abc04f3e349fcf67294da96fd22a0232bc 0055195415449d3a89228a321eac1af7c7176d65
Author: Francesco Nwokeka <francesco.nwokeka at gmail.com>
Date:   Sun Mar 27 16:03:13 2011 +0200

    Merge branch 'findText'

 app/chat-window.cpp     |  21 +++++++
 app/chat-window.h       |   2 +
 lib/CMakeLists.txt      |   1 +
 lib/chat-search-bar.cpp | 151 ++++++++++++++++++++++++++++++++++++++++++++++++
 lib/chat-search-bar.h   |  84 +++++++++++++++++++++++++++
 lib/chat-widget.cpp     |  43 +++++++++++++-
 lib/chat-widget.h       |  12 ++++
 lib/chat-widget.ui      |   9 +++
 8 files changed, 322 insertions(+), 1 deletion(-)

diff --cc app/chat-window.cpp
index 1255f61,ba3576f..3b79498
--- a/app/chat-window.cpp
+++ b/app/chat-window.cpp
@@@ -43,9 -42,17 +43,19 @@@ ChatWindow::ChatWindow(
      KStandardAction::quit(KApplication::instance(), SLOT(quit()), actionCollection());
      KStandardAction::preferences(this, SLOT(showSettingsDialog()), actionCollection());
      KStandardAction::configureNotifications(this, SLOT(showNotificationsDialog()), actionCollection());
 +    KStandardAction::showMenubar(this->menuBar(), SLOT(setVisible(bool)), actionCollection());
 +
  
+     // keyboard shortcut to toggle search bar
+     KAction *toggleSearchBarAction = new KAction(this);
+     toggleSearchBarAction->setIcon(KIcon("edit-find"));
+     toggleSearchBarAction->setShortcut(QKeySequence(QKeySequence::Find));
+ 
+     connect(toggleSearchBarAction, SIGNAL(triggered(Qt::MouseButtons,Qt::KeyboardModifiers)), this, SLOT(onSearchActionToggled()));
+ 
+     // add to collection so user can modify shortcut
+     actionCollection()->addAction(i18n("Find text"), toggleSearchBarAction);
+ 
      // set up m_tabWidget
      m_tabWidget = new KTabWidget(this);
      m_tabWidget->setTabReorderingEnabled(true);

-- 
ktp-text-ui packaging