Use OKeyConfigWidget/Manager for managing next and prev tab

keyboard shortcuts

6 files changed, 84 insertions, 8 deletions

diff --git a/noncore/net/opieirc/ircmisc.cpp b/noncore/net/opieirc/ircmisc.cpp
index df6f874..9b9bff8 100644
--- a/noncore/net/opieirc/ircmisc.cpp
+++ b/noncore/net/opieirc/ircmisc.cpp
@@ -1,99 +1,133 @@
 #include "ircmisc.h"
 
 /* OPIE */
 #include <opie2/odebug.h>
+#include <opie2/oconfig.h>
+#include <opie2/okeyconfigmanager.h>
 using namespace Opie::Core;
 
+
 IRCTabBar::IRCTabBar(QWidget *parent, const char *name) : QTabBar(parent, name) {
 }
 
 int IRCTabBar::insertTab(QTab *tab, int index) {
     /* FIXME: find some nicer way to do this */
     QExtTab *ext = new QExtTab();
     ext->color = black;
     ext->label = tab->text();
     ext->r = tab->rect();
     ext->enabled = tab->isEnabled();
     ext->iconset = tab->iconSet();
     delete tab;
     return QTabBar::insertTab(ext, index);
 }
 
 void IRCTabBar::setTabColor(int index, QColor color) {
     ((QExtTab *)tab(index))->color = color;
     update();
 }
 
 void IRCTabBar::paintLabel(QPainter* p, const QRect& br, QTab* t, bool focus) const {
     QRect r = br;
     QTabBar::paintLabel(p, br, t, focus);
     if (t->id == currentTab())
         r.setBottom(r.bottom() - style().defaultFrameWidth());
     p->setPen(((QExtTab *)t)->color);
     p->drawText(r, AlignCenter | ShowPrefix, t->label);
 }
 
 IRCTabWidget::IRCTabWidget(QWidget *parent, const char *name) : QTabWidget(parent, name) {
     setTabBar(new IRCTabBar(this, "tab control"));
 }
 
 void IRCTabWidget::setTabColor(int index, QColor color) {
     ((IRCTabBar *)tabBar())->setTabColor(index, color);
 }
 
 
+
+static OKeyConfigManager* s_manager = 0;
+OKeyConfigManager* IRCHistoryLineEdit::keyConfigInstance() {
+    if ( !s_manager ) {
+        /*
+         * black list with the DeviceButtons as default
+         * because we do not grab the keyboard and they
+         * wouldn't work
+         */
+        OKeyPair::List blackList = OKeyPair::hardwareKeys();
+        blackList.append( OKeyPair::returnKey() );
+        blackList.append( OKeyPair::leftArrowKey() );
+        blackList.append( OKeyPair::upArrowKey() );
+        blackList.append( OKeyPair::downArrowKey() );
+
+        s_manager = new OKeyConfigManager(new OConfig("opieirc-keys"),
+                                          "keys", blackList,
+                                          false, 0, "irc_history_line_keyconfigm" );
+        s_manager->addKeyConfig( OKeyConfigItem( tr("Next Tab"), "next_tab", QPixmap(),
+                                                 KeyNextTab, OKeyPair(Qt::Key_N, Qt::ControlButton) ));
+        s_manager->addKeyConfig( OKeyConfigItem( tr("Previous Tab"), "prev_tab", QPixmap(),
+                                                 KeyPrevTab, OKeyPair(Qt::Key_P, Qt::ControlButton) ));
+        s_manager->load();
+    }
+
+    return s_manager;
+}
+
+
 IRCHistoryLineEdit::IRCHistoryLineEdit(QWidget *parent, const char *name) : QLineEdit(parent, name) {
     m_index = -1;
     installEventFilter(this);
 }
 
 void IRCHistoryLineEdit::keyPressEvent(QKeyEvent *event) {
     int key = event->key();
     if (key == Key_Up) {
         if (m_history.count() > 0 && m_index < (signed int)m_history.count()-1) {
             m_index++;
             setText(m_history[m_index]);
         }
     } else if (key == Key_Down) {
         if (m_history.count() > 0 && m_index > 0) {
             m_index--;
             setText(m_history[m_index]);
         }
         if (m_index == 0) {
             m_index = -1;
             setText("");
         }
     } else if (key == Key_Return) {
         m_history.prepend(text());
         m_index = -1;
-    } else if (key == Key_N && event->state() == Qt::ControlButton) {
+    }
+
+    switch( keyConfigInstance()->handleKeyEventId( event ) ) {
+    case KeyNextTab:
         emit nextTab();
         return;
-    } else if ( ( key == Key_Y || key == Key_Z ) && event->state() == Qt::ControlButton) {
-        emit closeTab();
-        return;
-    } else if (key == Key_P && event->state() == Qt::ControlButton) {
+    case KeyPrevTab:
         emit prevTab();
         return;
+    default:
+        break;
     }
 
     QLineEdit::keyPressEvent(event);
 }
 
 bool IRCHistoryLineEdit::eventFilter(QObject *object, QEvent *event) {
     if (event->type() == QEvent::KeyPress) {
         QKeyEvent *k = (QKeyEvent *) event;
         /* Catch tab characters */
         if (k->key() == Key_Tab) {
             emit nextTab();
             return TRUE;
         }
     }
     return QLineEdit::eventFilter(object, event);
 }
 
 
 void IRCHistoryLineEdit::setEditFocus() {
     setActiveWindow();
     setFocus();
 }
diff --git a/noncore/net/opieirc/ircmisc.h b/noncore/net/opieirc/ircmisc.h
index c42dcbd..37eed28 100644
--- a/noncore/net/opieirc/ircmisc.h
+++ b/noncore/net/opieirc/ircmisc.h
@@ -1,79 +1,93 @@
 /*
     OpieIRC - An embedded IRC client
     Copyright (C) 2002 Wenzel Jakob
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 */
 
 #ifndef __IRCMISC_H
 #define __IRCMISC_H
 
 #include <qtabwidget.h>
 #include <qlineedit.h>
 #include <qtabbar.h>
 #include <qlabel.h>
 #include <qcolor.h>
 #include <qarray.h>
 
+namespace Opie {
+namespace Core {
+class OKeyConfigManager;
+}
+}
+
+
 /* Custom colored QTabWidget */
 
 class QExtTab : public QTab {
 public:
     QColor color;
 };
 
 class IRCTabWidget : public QTabWidget {
     Q_OBJECT
 public:
     IRCTabWidget(QWidget *parent = 0, const char *name = 0);
     void setTabColor(int index, QColor color);
 };
 
 class IRCTabBar : public QTabBar {
     Q_OBJECT
 public:
     IRCTabBar(QWidget *parent = 0, const char *name = 0);
     void setTabColor(int index, QColor color);
 protected:
     void paintLabel(QPainter*, const QRect&, QTab*, bool) const;
     int insertTab(QTab *, int index = -1);
 protected:
     QArray<QColor> m_colors;
 };
 
 /* A QLineEdit with history functionality and tab completion */
 
 class IRCHistoryLineEdit : public QLineEdit {
     Q_OBJECT
 public:
+    enum KeyMode {
+        KeyNextTab,
+        KeyPrevTab
+    };
+
+    static Opie::Core::OKeyConfigManager* keyConfigInstance();
+
     IRCHistoryLineEdit(QWidget *parent = 0, const char *name = 0);
     virtual bool eventFilter(QObject *object, QEvent *event);
 public slots:
     void setEditFocus();
 signals:
     void nextTab();
     void prevTab();
     void closeTab();
 
 
 protected:
     void keyPressEvent(QKeyEvent *);
 protected:
     QStringList m_history;
     int         m_index;
 };
 
 #endif /* __IRCMISC_H */
diff --git a/noncore/net/opieirc/ircsettings.cpp b/noncore/net/opieirc/ircsettings.cpp
index 13fcc24..1fba030 100644
--- a/noncore/net/opieirc/ircsettings.cpp
+++ b/noncore/net/opieirc/ircsettings.cpp
@@ -1,110 +1,128 @@
 
 #include "ircsettings.h"
 #include "irctab.h"
+#include "ircmisc.h"
 
 /* OPIE */
 #include <opie2/ocolorbutton.h>
 #include <opie2/otabwidget.h>
+#include <opie2/okeyconfigwidget.h>
 #include <qpe/qpeapplication.h>
 
 /* QT */
 #include <qvalidator.h>
 #include <qwhatsthis.h>
 
 using namespace Opie;
 using namespace Opie::Ui;
 IRCSettings::IRCSettings(QWidget* parent, const char* name, bool modal, WFlags) : QDialog(parent, name, modal, WStyle_ContextHelp)
 {
     setCaption(tr("Settings") );
     m_config = new Config("OpieIRC");
     m_config->setGroup("OpieIRC");
     QHBoxLayout *l = new QHBoxLayout(this, 2, 2);
     OTabWidget *tw = new OTabWidget(this);
     l->addWidget(tw);
     /* General Configuration */
     QWidget *genwidget = new QWidget(tw);
     QGridLayout *layout = new QGridLayout(genwidget, 1, 2, 5, 0);
     QLabel *label = new QLabel(tr("Lines displayed :"), genwidget);
     layout->addWidget(label, 0, 0);
     m_lines = new QLineEdit(m_config->readEntry("Lines", "100"), genwidget);
     QWhatsThis::add(m_lines, tr("Amount of lines to be displayed in chats before old lines get deleted - this is necessary to restrain memory consumption. Set to 0 if you don't need this"));
     QIntValidator *validator = new QIntValidator(this);
     validator->setTop(10000);
     validator->setBottom(0);
     m_lines->setValidator(validator);
     layout->addWidget(m_lines, 0, 1);
     tw->addTab(genwidget, "opieirc/settings", tr("General"));
 
     /* Color configuration */
     QScrollView *view = new QScrollView(this);
     view->setResizePolicy(QScrollView::AutoOneFit);
     view->setFrameStyle( QFrame::NoFrame );
     QWidget *widget = new QWidget(view->viewport());
     view->addChild(widget);
     layout = new QGridLayout(widget, 7, 2, 5, 0);
     label = new QLabel(tr("Background color :"), widget);
     layout->addWidget(label, 0, 0);
     m_background = new OColorButton(widget, m_config->readEntry("BackgroundColor", "#FFFFFF"));
     QWhatsThis::add(m_background, tr("Background color to be used in chats"));
     layout->addWidget(m_background, 0, 1);
     label = new QLabel(tr("Normal text color :"), widget);
     layout->addWidget(label, 1, 0);
     m_text = new OColorButton(widget, m_config->readEntry("TextColor", "#000000"));
     QWhatsThis::add(m_text, tr("Text color to be used in chats"));
     layout->addWidget(m_text, 1, 1);
     label = new QLabel(tr("Error color :"), widget);
     layout->addWidget(label, 2, 0);
     m_error = new OColorButton(widget, m_config->readEntry("ErrorColor", "#FF0000"));
     QWhatsThis::add(m_error, tr("Text color to be used to display errors"));
     layout->addWidget(m_error, 2, 1);
     label = new QLabel(tr("Text written by yourself :"), widget);
     layout->addWidget(label, 3, 0);
     m_self = new OColorButton(widget, m_config->readEntry("SelfColor", "#CC0000"));
     QWhatsThis::add(m_self, tr("Text color to be used to identify text written by yourself"));
     layout->addWidget(m_self, 3, 1);
     label = new QLabel(tr("Text written by others :"), widget);
     layout->addWidget(label, 4, 0);
     m_other = new OColorButton(widget, m_config->readEntry("OtherColor", "#0000BB"));
     QWhatsThis::add(m_other, tr("Text color to be used to identify text written by others"));
     layout->addWidget(m_other, 4, 1);
     label = new QLabel(tr("Text written by the server :"), widget);
     layout->addWidget(label, 5, 0);
     m_server = new OColorButton(widget, m_config->readEntry("ServerColor", "#0000FF"));
     QWhatsThis::add(m_server, tr("Text color to be used to identify text written by the server"));
     layout->addWidget(m_server, 5, 1);
     label = new QLabel(tr("Notifications :"), widget);
     layout->addWidget(label, 6, 0);
     m_notification = new OColorButton(widget, m_config->readEntry("NotificationColor", "#AAE300"));
     QWhatsThis::add(m_notification, tr("Text color to be used to display notifications"));
     layout->addWidget(m_notification, 6, 1);
     tw->addTab(view, "opieirc/colors", tr("Colors"));
-    tw->setCurrentTab( genwidget );
 
+
+    /*
+     * IRC EditLine KeyConfiguration
+     */
+    m_keyConf = new Opie::Ui::OKeyConfigWidget(tw, "KEyConfig GUI" );
+    m_keyConf->setChangeMode( OKeyConfigWidget::Queue );
+    m_keyConf->insert( tr("Keyboard Shortcuts"),
+                       IRCHistoryLineEdit::keyConfigInstance() );
+    m_keyConf->load();
+    tw->addTab(m_keyConf, "SettingsIcon", tr("Keyboard Shortcuts") );
+
+    tw->setCurrentTab( genwidget );
     QPEApplication::showDialog( this );
 }
 
 void IRCSettings::accept()
 {
     IRCTab::m_backgroundColor = m_background->color().name();
     IRCTab::m_textColor = m_text->color().name();
     IRCTab::m_errorColor = m_error->color().name();
     IRCTab::m_selfColor = m_self->color().name();
     IRCTab::m_otherColor = m_other->color().name();
     IRCTab::m_serverColor = m_server->color().name();
     IRCTab::m_notificationColor = m_notification->color().name();
     IRCTab::m_maxLines = m_lines->text().toInt();
+    m_keyConf->save();
+
+
     m_config->writeEntry("BackgroundColor", IRCTab::m_backgroundColor);
     m_config->writeEntry("TextColor", IRCTab::m_textColor);
     m_config->writeEntry("ErrorColor", IRCTab::m_errorColor);
     m_config->writeEntry("SelfColor", IRCTab::m_selfColor);
     m_config->writeEntry("OtherColor", IRCTab::m_otherColor);
     m_config->writeEntry("ServerColor", IRCTab::m_serverColor);
     m_config->writeEntry("NotificationColor", IRCTab::m_notificationColor);
     m_config->writeEntry("Lines", m_lines->text());
+    IRCHistoryLineEdit::keyConfigInstance()->save();
+
     QDialog::accept();
 }
 
 IRCSettings::~IRCSettings()
 {
     delete m_config;
 }
diff --git a/noncore/net/opieirc/ircsettings.h b/noncore/net/opieirc/ircsettings.h
index 56e667b..a032aff 100644
--- a/noncore/net/opieirc/ircsettings.h
+++ b/noncore/net/opieirc/ircsettings.h
@@ -1,51 +1,55 @@
 /*
     OpieIRC - An embedded IRC client
     Copyright (C) 2002 Wenzel Jakob
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 */
 
 #ifndef __IRCSETTINGS_H
 #define __IRCSETTINGS_H
 
 #include <qpe/config.h>
 #include <qdialog.h>
 #include <qlineedit.h>
 
 namespace Opie {
 class OColorButton;
+namespace Ui {
+class OKeyConfigWidget;
+}
 }
 
 class IRCSettings : public QDialog {
     Q_OBJECT
 public:
     IRCSettings(QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags f = 0);
     ~IRCSettings();
 protected slots:
     void accept();
 protected:
     Config       *m_config;
     Opie::OColorButton *m_background;
     Opie::OColorButton *m_text;
     Opie::OColorButton *m_error;
     Opie::OColorButton *m_self;
     Opie::OColorButton *m_server;
     Opie::OColorButton *m_other;
     Opie::OColorButton *m_notification;
+    Opie::Ui::OKeyConfigWidget *m_keyConf;
     QLineEdit    *m_lines;
 };
 
 #endif /* __IRCSETTINGS_H */
diff --git a/noncore/net/opieirc/irctab.cpp b/noncore/net/opieirc/irctab.cpp
index 8e1dc16..2b3ecd4 100644
--- a/noncore/net/opieirc/irctab.cpp
+++ b/noncore/net/opieirc/irctab.cpp
@@ -1,45 +1,50 @@
+#include "irctab.h"
+#include "mainwindow.h"
+
+#include <opie2/okeyconfigmanager.h>
 #include <qpe/resource.h>
+
+
 #include <qpushbutton.h>
 #include <qwhatsthis.h>
-#include "irctab.h"
-#include "mainwindow.h"
+
 
 QString IRCTab::m_errorColor;
 QString IRCTab::m_serverColor;
 QString IRCTab::m_textColor;
 QString IRCTab::m_backgroundColor;
 QString IRCTab::m_selfColor;
 QString IRCTab::m_otherColor;
 QString IRCTab::m_notificationColor;
 int IRCTab::m_maxLines;
 
 IRCTab::IRCTab(QWidget *parent, const char *name, WFlags f) : QWidget(parent, name, f) {
     m_layout = new QVBoxLayout(this);
     QHBoxLayout *descLayout = new QHBoxLayout(m_layout);
     descLayout->setMargin(5);
     m_description = new QLabel(tr("Missing description"), this);
     QWhatsThis::add(m_description, tr("Description of the tab's content"));
     descLayout->addWidget(m_description);
     descLayout->setStretchFactor(m_description, 5);
     QPushButton *close = new QPushButton(this);
     QWhatsThis::add(close, tr("Close this tab"));
     close->setPixmap(Resource::loadPixmap("close"));
     connect(close, SIGNAL(clicked()), this, SLOT(remove()));
     descLayout->addWidget(close);
     descLayout->setStretchFactor(m_description, 1);
 }
 
 
 void IRCTab::setID(int id) {
     m_id = id;
 }
 
 int IRCTab::id() {
     return m_id;
 }
 
 void IRCTab::showEvent( QShowEvent *ev ) {
     topLevelWidget()->setCaption( MainWindow::appCaption() + " " + title() );
     QWidget::showEvent( ev );
     emit editFocus();
 }
diff --git a/noncore/net/opieirc/mainwindow.cpp b/noncore/net/opieirc/mainwindow.cpp
index 1143213..2e674c5 100644
--- a/noncore/net/opieirc/mainwindow.cpp
+++ b/noncore/net/opieirc/mainwindow.cpp
@@ -15,114 +15,115 @@ QString MainWindow::appCaption() {
 MainWindow::MainWindow(QWidget *parent, const char *name, WFlags) : QMainWindow(parent, name, WStyle_ContextHelp) {
     setCaption(tr("IRC Client"));
     m_tabWidget = new IRCTabWidget(this);
     QWhatsThis::add(m_tabWidget, tr("Server connections, channels, queries and other things will be placed here"));
     connect(m_tabWidget, SIGNAL(currentChanged(QWidget*)), this, SLOT(selected(QWidget*)));
     setCentralWidget(m_tabWidget);
     setToolBarsMovable(FALSE);
     QMenuBar *menuBar = new QMenuBar(this);
     QPopupMenu *irc = new QPopupMenu(this);
     menuBar->insertItem(tr("IRC"), irc);
     QAction *a = new QAction(tr("New connection"), Resource::loadPixmap("pass"), QString::null, 0, this, 0);
     connect(a, SIGNAL(activated()), this, SLOT(newConnection()));
     a->setWhatsThis(tr("Create a new connection to an IRC server"));
     a->addTo(irc);
     a = new QAction(tr("Settings"), Resource::loadPixmap("SettingsIcon"), QString::null, 0, this, 0);
     a->setWhatsThis(tr("Configure OpieIRC's behavior and appearance"));
     connect(a, SIGNAL(activated()), this, SLOT(settings()));
     a->addTo(irc);
     loadSettings();
 }
 
 /*IRCTabWidget MainWindow::getTabWidget(){
   return m_tabWidget;
 } */
 
 void MainWindow::loadSettings() {
     Config config("OpieIRC");
     config.setGroup("OpieIRC");
     IRCTab::m_backgroundColor = config.readEntry("BackgroundColor", "#FFFFFF");
     IRCTab::m_textColor = config.readEntry("TextColor", "#000000");
     IRCTab::m_errorColor = config.readEntry("ErrorColor", "#FF0000");
     IRCTab::m_selfColor = config.readEntry("SelfColor", "#CC0000");
     IRCTab::m_otherColor = config.readEntry("OtherColor", "#0000BB");
     IRCTab::m_serverColor = config.readEntry("ServerColor", "#0000FF");
     IRCTab::m_notificationColor = config.readEntry("NotificationColor", "#AA3300");
     IRCTab::m_maxLines = config.readNumEntry("Lines", 100);
 }
 
 void MainWindow::selected(QWidget *) {
     m_tabWidget->setTabColor(m_tabWidget->currentPageIndex(), black);
     emit updateScroll();
 }
 
 void MainWindow::addTab(IRCTab *tab) {
     connect(tab, SIGNAL(changed(IRCTab*)), this, SLOT(changeEvent(IRCTab*)));
     connect(tab, SIGNAL(ping (const QString&)), this, SLOT(slotPing(const QString&)));
     connect(tab, SIGNAL(nextTab()), this, SLOT(slotNextTab()));
     connect(tab, SIGNAL(prevTab()), this, SLOT(slotPrevTab()));
     connect(tab, SIGNAL(closeTab()), this, SLOT(slotCloseTab()));
 
     m_tabWidget->addTab(tab, tab->title());
     m_tabWidget->showPage(tab);
     tab->setID(m_tabWidget->currentPageIndex());
     m_tabs.append(tab);
 }
 
 void MainWindow::changeEvent(IRCTab *tab) {
     if (tab->id() != m_tabWidget->currentPageIndex())
         m_tabWidget->setTabColor(tab->id(), blue);
 }
 
 void MainWindow::killTab(IRCTab *tab) {
     m_tabWidget->removePage(tab);
     m_tabs.remove(tab);
+
     /* there might be nicer ways to do this .. */
     delete tab;
 }
 
 void MainWindow::newConnection() {
     IRCServerList list(this, "ServerList", TRUE);
     if (list.exec() == QDialog::Accepted && list.hasServer()) {
         IRCServerTab *serverTab = new IRCServerTab(list.server(), this, m_tabWidget);
         addTab(serverTab);
         serverTab->doConnect();
     }
 }
 
 void MainWindow::settings() {
     IRCSettings settings(this, "Settings", TRUE);
     if (settings.exec() == QDialog::Accepted) {
         QListIterator<IRCTab> it(m_tabs);
         for (; it.current(); ++it) {
             /* Inform all tabs about the new settings */
             it.current()->settingsChanged();
         }
     }
 }
 
 
 void MainWindow::slotNextTab() {
     int i = m_tabWidget->currentPageIndex ();
     m_tabWidget->setCurrentPage ( i+1 );
 
     int j = m_tabWidget->currentPageIndex ();
     if ( i == j )
         m_tabWidget->setCurrentPage ( 1 );
 }
 
 void MainWindow::slotPrevTab() {
     int i = m_tabWidget->currentPageIndex ();
     if ( i > 1 )
         m_tabWidget->setCurrentPage ( i-1 );
 }
 
 void MainWindow::slotCloseTab() {
     IRCTab *tab = (IRCTab *) m_tabWidget->currentPage ();
     if ( tab )
         killTab ( tab );
 }
 
 void MainWindow::slotPing( const QString& channel ) {
     raise();
 }