some qwhatsthis introduced, the IRCHistoryLineEdit now catches tabs

6 files changed, 48 insertions, 5 deletions

diff --git a/noncore/net/opieirc/ircmisc.cpp b/noncore/net/opieirc/ircmisc.cpp
index 2e7f316..c8e6190 100644
--- a/noncore/net/opieirc/ircmisc.cpp
+++ b/noncore/net/opieirc/ircmisc.cpp
@@ -66,16 +66,17 @@ IRCTabWidget::IRCTabWidget(QWidget *parent, const char *name) : QTabWidget(paren
 
 void IRCTabWidget::setTabColor(int index, QColor color) {
     ((IRCTabBar *)tabBar())->setTabColor(index, color);
 }
 
 
 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]);
@@ -87,11 +88,26 @@ void IRCHistoryLineEdit::keyPressEvent(QKeyEvent *event) {
         }
         if (m_index == 0) {
             m_index = -1;
             setText("");
         }
     } else if (key == Key_Return) {
         m_history.prepend(text());
         m_index = -1;
+    } else if (key == Key_Tab) {
+        printf("got tab\n");
+        return;
     }
     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) {
+            qDebug("tab!");
+            return TRUE;
+        }
+    }
+    return QLineEdit::eventFilter(object, event);
+}
diff --git a/noncore/net/opieirc/ircmisc.h b/noncore/net/opieirc/ircmisc.h
index 7151e6b..6a8db50 100644
--- a/noncore/net/opieirc/ircmisc.h
+++ b/noncore/net/opieirc/ircmisc.h
@@ -70,22 +70,23 @@ public:
     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 */
+/* A QLineEdit with history functionality and tab completion */
 
 class IRCHistoryLineEdit : public QLineEdit {
     Q_OBJECT
 public:
     IRCHistoryLineEdit(QWidget *parent = 0, const char *name = 0);
+    virtual bool eventFilter(QObject *object, QEvent *event);
 protected:
     void keyPressEvent(QKeyEvent *);
 protected:
     QStringList m_history;
     int         m_index;
 };
 
 #endif /* __IRCMISC_H */
diff --git a/noncore/net/opieirc/ircservereditor.cpp b/noncore/net/opieirc/ircservereditor.cpp
index f976c84..8604835 100644
--- a/noncore/net/opieirc/ircservereditor.cpp
+++ b/noncore/net/opieirc/ircservereditor.cpp
@@ -1,41 +1,49 @@
 #include <qmessagebox.h>
 #include <qlayout.h>
 #include <qlabel.h>
+#include <qwhatsthis.h>
 #include "ircservereditor.h"
 
-IRCServerEditor::IRCServerEditor(IRCServer server, QWidget* parent, const char* name, bool modal = FALSE, WFlags f) : QDialog(parent, name, modal, f) {
+IRCServerEditor::IRCServerEditor(IRCServer server, QWidget* parent, const char* name, bool modal = FALSE, WFlags) : QDialog(parent, name, modal, WStyle_ContextHelp) {
     QGridLayout *layout = new QGridLayout(this, 7, 2, 5, 5);
     QLabel *label = new QLabel(tr("Profile name :"), this);
     m_name = new QLineEdit(server.name(), this);
+    QWhatsThis::add(m_name, tr("The name of this server profile in the overview"));
     layout->addWidget(label, 0, 0);
     layout->addWidget(m_name, 0, 1);
     label = new QLabel(tr("Hostname :"), this);
     m_hostname = new QLineEdit(server.hostname(), this);
+    QWhatsThis::add(m_hostname, tr("The server to connect to - can be any valid host name or IP address"));
     layout->addWidget(label, 1, 0);
     layout->addWidget(m_hostname, 1, 1);
     label = new QLabel(tr("Port :"), this);
     m_port = new QLineEdit(QString::number(server.port()), this);
+    QWhatsThis::add(m_port, tr("The server port to connect to. Usually 6667"));
     layout->addWidget(label, 2, 0);
     layout->addWidget(m_port, 2, 1);
     label = new QLabel(tr("Nickname :"), this);
     m_nickname = new QLineEdit(server.nick(), this);
+    QWhatsThis::add(m_nickname, tr("Your nick name on the IRC network"));
     layout->addWidget(label, 3, 0);
     layout->addWidget(m_nickname, 3, 1);
     label = new QLabel(tr("Realname :"), this);
     m_realname = new QLineEdit(server.realname(), this);
+    QWhatsThis::add(m_realname, tr("Your real name"));
     layout->addWidget(label, 4, 0);
     layout->addWidget(m_realname, 4, 1);
     label = new QLabel(tr("Password :"), this);
     m_password = new QLineEdit(server.password(), this);
+    QWhatsThis::add(m_password, tr("Password to connect to the server (if required)"));
     layout->addWidget(label, 5, 0);
     layout->addWidget(m_password, 5, 1);
     label = new QLabel(tr("Channels :"), this);
     m_channels = new QLineEdit(server.channels(), this);
+    QWhatsThis::add(m_channels, tr("Comma-Separated list of all channels you would like to join automatically"));
     layout->addWidget(label, 6, 0);
     layout->addWidget(m_channels, 6, 1);
     setCaption(tr("Edit server information"));
     showMaximized();
 }
 
 
 void IRCServerEditor::accept() {
diff --git a/noncore/net/opieirc/ircserverlist.cpp b/noncore/net/opieirc/ircserverlist.cpp
index 3293591..595ae3e 100644
--- a/noncore/net/opieirc/ircserverlist.cpp
+++ b/noncore/net/opieirc/ircserverlist.cpp
@@ -1,12 +1,13 @@
 #include <qlayout.h>
 #include <qlabel.h>
 #include <qhbox.h>
 #include <qpushbutton.h>
+#include <qwhatsthis.h>
 #include "ircserverlist.h"
 #include "ircservereditor.h"
 
 class IRCListBoxServer : public QListBoxText {
 public:
     IRCListBoxServer(IRCServer server) : QListBoxText(server.name()) {
         m_server = server;
     }
@@ -18,28 +19,32 @@ public:
     void setServer(IRCServer server) {
         m_server = server;
         setText(m_server.name());
     }
 protected:
     IRCServer m_server;
 };
 
-IRCServerList::IRCServerList(QWidget* parent, const char *name, bool modal, WFlags f) : QDialog(parent, name, modal, f) {
+IRCServerList::IRCServerList(QWidget* parent, const char *name, bool modal, WFlags) : QDialog(parent, name, modal, WStyle_ContextHelp) {
     QVBoxLayout *layout = new QVBoxLayout(this, 5, 5);
     setCaption(tr("Serverlist Browser"));
     QLabel *label = new QLabel(tr("Please choose a server profile"), this);
     label->setAlignment(AlignHCenter);
     layout->addWidget(label);
     m_list = new QListBox(this);
+    QWhatsThis::add(m_list, tr("Select a server profile from this list and then tap on OK in the upper-right corner"));
     layout->addWidget(m_list);
     QHBox *buttons = new QHBox(this);
     QPushButton *del = new QPushButton(tr("Delete"), buttons);
     QPushButton *edit = new QPushButton(tr("Edit"), buttons);
     QPushButton *add = new QPushButton(tr("Add"), buttons);
+    QWhatsThis::add(del, tr("Delete the currently selected server profile"));
+    QWhatsThis::add(edit, tr("Edit the currently selected server profile"));
+    QWhatsThis::add(add, tr("Add a new server profile"));
     connect(del, SIGNAL(clicked()), this, SLOT(delServer()));
     connect(edit, SIGNAL(clicked()), this, SLOT(editServer()));
     connect(add, SIGNAL(clicked()), this, SLOT(addServer()));
     layout->addWidget(buttons);
     /* Load the configuration file */
     m_config = new Config("OpieIRC");
     m_config->setGroup("OpieIRC");
     int count = m_config->readNumEntry("ServerCount", 0);
diff --git a/noncore/net/opieirc/ircsettings.cpp b/noncore/net/opieirc/ircsettings.cpp
index 1903e87..78eaed3 100644
--- a/noncore/net/opieirc/ircsettings.cpp
+++ b/noncore/net/opieirc/ircsettings.cpp
@@ -1,68 +1,77 @@
 #include <qlayout.h>
 #include <qvalidator.h>
 #include <qscrollview.h>
+#include <qwhatsthis.h>
 #include "ircsettings.h"
 #include "irctab.h"
 #include "ircmisc.h"
 
-IRCSettings::IRCSettings(QWidget* parent, const char* name, bool modal, WFlags f) : QDialog(parent, name, modal, f) {
+IRCSettings::IRCSettings(QWidget* parent, const char* name, bool modal, WFlags) : QDialog(parent, name, modal, WStyle_ContextHelp) {
     setCaption("Settings");
     m_config = new Config("OpieIRC");
     m_config->setGroup("OpieIRC");
     QHBoxLayout *l = new QHBoxLayout(this, 2, 2);
     QTabWidget *tw = new QTabWidget(this);
     l->addWidget(tw);
     /* General Configuration */
     QWidget *widget = new QWidget(tw);
     QGridLayout *layout = new QGridLayout(widget, 1, 2, 5, 0);
     QLabel *label = new QLabel(tr("Lines displayed :"), widget);
     layout->addWidget(label, 0, 0);
     m_lines = new QLineEdit(m_config->readEntry("Lines", "100"), widget);
+    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(widget, tr("General"));
 
     /* Color configuration */
     QScrollView *view = new QScrollView(tw);
     view->setResizePolicy(QScrollView::AutoOneFit);
     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 IRCFramedColorLabel(QColor(m_config->readEntry("BackgroundColor", "#FFFFFF")), widget);
+    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 IRCFramedColorLabel(m_config->readEntry("TextColor", "#000000"), widget);
+    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 IRCFramedColorLabel(m_config->readEntry("ErrorColor", "#FF0000"), widget);
+    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 IRCFramedColorLabel(m_config->readEntry("SelfColor", "#CC0000"), widget);
+    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 IRCFramedColorLabel(m_config->readEntry("OtherColor", "#0000BB"), widget);
+    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 IRCFramedColorLabel(m_config->readEntry("ServerColor", "#0000FF"), widget);
+    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 IRCFramedColorLabel(m_config->readEntry("NotificationColor", "#AAE300"), widget);
+    QWhatsThis::add(m_notification, tr("Text color to be used to display notifications"));
     layout->addWidget(m_notification, 6, 1);
     tw->addTab(view, tr("Colors"));
     showMaximized();
 }
 
 QString IRCSettings::getColorString(QWidget *widget) {
     QColor color = ((IRCFramedColorLabel *)widget)->color();
     QString temp;
diff --git a/noncore/net/opieirc/mainwindow.cpp b/noncore/net/opieirc/mainwindow.cpp
index bb03a1c..7928310 100644
--- a/noncore/net/opieirc/mainwindow.cpp
+++ b/noncore/net/opieirc/mainwindow.cpp
@@ -1,31 +1,35 @@
 #include <qpe/qpemenubar.h>
 #include <qpe/resource.h>
 #include <qpe/config.h>
 #include <qpopupmenu.h>
+#include <qwhatsthis.h>
 
 #include "mainwindow.h"
 #include "ircservertab.h"
 #include "ircserverlist.h"
 #include "ircsettings.h"
 
-MainWindow::MainWindow(QWidget *parent, const char *name, WFlags f) : QMainWindow(parent, name, f) {
+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);
     QPEMenuBar *menuBar = new QPEMenuBar(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();
 }
 
 void MainWindow::loadSettings() {
     Config config("OpieIRC");
     config.setGroup("OpieIRC");