author | wazlaf <wazlaf> | 2002-09-30 13:43:36 (UTC) |
---|---|---|
committer | wazlaf <wazlaf> | 2002-09-30 13:43:36 (UTC) |
commit | 5db3af80f392f8f063f53cbbad67bbe7c5c6eb6d (patch) (side-by-side diff) | |
tree | 12d8e59152c434e0774f067d5b0163578d603daf /noncore/net | |
parent | b753c264b7acd26aba9f5a73c1fa0a7deb0b73a3 (diff) | |
download | opie-5db3af80f392f8f063f53cbbad67bbe7c5c6eb6d.zip opie-5db3af80f392f8f063f53cbbad67bbe7c5c6eb6d.tar.gz opie-5db3af80f392f8f063f53cbbad67bbe7c5c6eb6d.tar.bz2 |
history functionality, tabs switch colors, extended settings dialog
-rw-r--r-- | noncore/net/opieirc/ircchanneltab.cpp | 17 | ||||
-rw-r--r-- | noncore/net/opieirc/ircchanneltab.h | 20 | ||||
-rw-r--r-- | noncore/net/opieirc/ircmessageparser.cpp | 2 | ||||
-rw-r--r-- | noncore/net/opieirc/ircmisc.cpp | 53 | ||||
-rw-r--r-- | noncore/net/opieirc/ircmisc.h | 27 | ||||
-rw-r--r-- | noncore/net/opieirc/ircquerytab.cpp | 15 | ||||
-rw-r--r-- | noncore/net/opieirc/ircquerytab.h | 6 | ||||
-rw-r--r-- | noncore/net/opieirc/ircservertab.cpp | 15 | ||||
-rw-r--r-- | noncore/net/opieirc/ircservertab.h | 4 | ||||
-rw-r--r-- | noncore/net/opieirc/ircsettings.cpp | 60 | ||||
-rw-r--r-- | noncore/net/opieirc/ircsettings.h | 18 | ||||
-rw-r--r-- | noncore/net/opieirc/irctab.cpp | 2 | ||||
-rw-r--r-- | noncore/net/opieirc/irctab.h | 3 | ||||
-rw-r--r-- | noncore/net/opieirc/ircversion.h | 2 | ||||
-rw-r--r-- | noncore/net/opieirc/mainwindow.cpp | 5 | ||||
-rw-r--r-- | noncore/net/opieirc/opie-irc.control | 3 |
16 files changed, 186 insertions, 66 deletions
diff --git a/noncore/net/opieirc/ircchanneltab.cpp b/noncore/net/opieirc/ircchanneltab.cpp index ddd6cf1..f19e019 100644 --- a/noncore/net/opieirc/ircchanneltab.cpp +++ b/noncore/net/opieirc/ircchanneltab.cpp @@ -3,2 +3,3 @@ #include <qcursor.h> +#include <stdio.h> #include <qhbox.h> @@ -24,4 +25,5 @@ IRCChannelTab::IRCChannelTab(IRCChannel *channel, IRCServerTab *parentTab, MainW m_list->setMaximumWidth(LISTWIDTH); - m_field = new QLineEdit(this); + m_field = new IRCHistoryLineEdit(this); m_popup = new QPopupMenu(m_list); + m_lines = 0; /* Required so that embedded-style "right" clicks work */ @@ -29,2 +31,3 @@ IRCChannelTab::IRCChannelTab(IRCChannel *channel, IRCServerTab *parentTab, MainW connect(m_list, SIGNAL(mouseButtonPressed(int, QListBoxItem *, const QPoint&)), this, SLOT(mouseButtonPressed(int, QListBoxItem *, const QPoint &))); + /* Construct the popup menu */ @@ -47,3 +50,12 @@ void IRCChannelTab::appendText(QString text) { /* not using append because it creates layout problems */ - m_textview->setText(m_textview->text() + text); + QString txt = m_textview->text() + text + "\n"; + if (m_maxLines > 0 && m_lines >= m_maxLines) { + int firstBreak = txt.find('\n'); + if (firstBreak != -1) { + txt = "<qt bgcolor=\"" + m_backgroundColor + "\"/>" + txt.right(txt.length() - (firstBreak + 1)); + } + } else { + m_lines++; + } + m_textview->setText(txt); m_textview->ensureVisible(0, m_textview->contentsHeight()); @@ -78,2 +90,3 @@ void IRCChannelTab::settingsChanged() { m_textview->setText("<qt bgcolor=\"" + m_backgroundColor + "\"/>"); + m_lines = 0; } diff --git a/noncore/net/opieirc/ircchanneltab.h b/noncore/net/opieirc/ircchanneltab.h index 971614b..a03ee3e 100644 --- a/noncore/net/opieirc/ircchanneltab.h +++ b/noncore/net/opieirc/ircchanneltab.h @@ -27,2 +27,3 @@ #include "ircsession.h" +#include "ircmisc.h" #include "mainwindow.h" @@ -58,11 +59,12 @@ protected slots: protected: - IRCServerTab *m_parentTab; - IRCChannel *m_channel; - IRCChannelList *m_list; - QPushButton *m_listButton; - MainWindow *m_mainWindow; - QTextView *m_textview; - QLineEdit *m_field; - QPopupMenu *m_popup; - bool m_listVisible; + IRCServerTab *m_parentTab; + IRCChannel *m_channel; + IRCChannelList *m_list; + QPushButton *m_listButton; + MainWindow *m_mainWindow; + QTextView *m_textview; + IRCHistoryLineEdit *m_field; + QPopupMenu *m_popup; + bool m_listVisible; + int m_lines; }; diff --git a/noncore/net/opieirc/ircmessageparser.cpp b/noncore/net/opieirc/ircmessageparser.cpp index a95c64e..e8d3b1a 100644 --- a/noncore/net/opieirc/ircmessageparser.cpp +++ b/noncore/net/opieirc/ircmessageparser.cpp @@ -519,3 +519,3 @@ void IRCMessageParser::parseNumericalTopic(IRCMessage *message) { -void IRCMessageParser::parseNumericalTopicWhoTime(IRCMessage *message) { +void IRCMessageParser::parseNumericalTopicWhoTime(IRCMessage *) { } diff --git a/noncore/net/opieirc/ircmisc.cpp b/noncore/net/opieirc/ircmisc.cpp index dd7292c..2e7f316 100644 --- a/noncore/net/opieirc/ircmisc.cpp +++ b/noncore/net/opieirc/ircmisc.cpp @@ -32,2 +32,3 @@ QColor IRCFramedColorLabel::color() { + IRCTabBar::IRCTabBar(QWidget *parent, const char *name) : QTabBar(parent, name) { @@ -36,13 +37,15 @@ IRCTabBar::IRCTabBar(QWidget *parent, const char *name) : QTabBar(parent, name) int IRCTabBar::insertTab(QTab *tab, int index = -1) { - if (m_colors.size() == (unsigned int)count()) - m_colors.resize(m_colors.size() * 2 + 1); - if (index == -1) - m_colors.insert(count(), &black); - else - m_colors.insert(index, &black); - return QTabBar::insertTab(tab, 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, const QColor *color) { - m_colors.insert(index, color); +void IRCTabBar::setTabColor(int index, QColor color) { + ((QExtTab *)tab(index))->color = color; update(); @@ -55,3 +58,3 @@ void IRCTabBar::paintLabel(QPainter* p, const QRect& br, QTab* t, bool focus) co r.setBottom(r.bottom() - style().defaultFrameWidth()); - p->setPen(*m_colors.at(t->id)); + p->setPen(((QExtTab *)t)->color); p->drawText(r, AlignCenter | ShowPrefix, t->label); @@ -63,4 +66,32 @@ IRCTabWidget::IRCTabWidget(QWidget *parent, const char *name) : QTabWidget(paren -void IRCTabWidget::setTabColor(int index, const QColor *color) { +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; +} + +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; + } + QLineEdit::keyPressEvent(event); +} diff --git a/noncore/net/opieirc/ircmisc.h b/noncore/net/opieirc/ircmisc.h index 4df6ce0..7151e6b 100644 --- a/noncore/net/opieirc/ircmisc.h +++ b/noncore/net/opieirc/ircmisc.h @@ -24,2 +24,3 @@ #include <qtabwidget.h> +#include <qlineedit.h> #include <qtabbar.h> @@ -27,3 +28,3 @@ #include <qcolor.h> -#include <qvector.h> +#include <qarray.h> @@ -52,2 +53,7 @@ protected: +class QExtTab : public QTab { +public: + QColor color; +}; + class IRCTabWidget : public QTabWidget { @@ -56,3 +62,3 @@ public: IRCTabWidget(QWidget *parent = 0, const char *name = 0); - void setTabColor(int index, const QColor *color); + void setTabColor(int index, QColor color); }; @@ -63,3 +69,3 @@ public: IRCTabBar(QWidget *parent = 0, const char *name = 0); - void setTabColor(int index, const QColor *color); + void setTabColor(int index, QColor color); protected: @@ -68,3 +74,16 @@ protected: protected: - QVector<QColor> m_colors; + QArray<QColor> m_colors; +}; + +/* A QLineEdit with history functionality */ + +class IRCHistoryLineEdit : public QLineEdit { + Q_OBJECT +public: + IRCHistoryLineEdit(QWidget *parent = 0, const char *name = 0); +protected: + void keyPressEvent(QKeyEvent *); +protected: + QStringList m_history; + int m_index; }; diff --git a/noncore/net/opieirc/ircquerytab.cpp b/noncore/net/opieirc/ircquerytab.cpp index b946174..869e4f7 100644 --- a/noncore/net/opieirc/ircquerytab.cpp +++ b/noncore/net/opieirc/ircquerytab.cpp @@ -7,2 +7,3 @@ IRCQueryTab::IRCQueryTab(IRCPerson *person, IRCServerTab *parentTab, MainWindow m_parentTab = parentTab; + m_lines = 0; m_person = new IRCPerson(*person); /* We need this (the person might sign off and the original IRCPerson gets deleted) */ @@ -14,3 +15,3 @@ IRCQueryTab::IRCQueryTab(IRCPerson *person, IRCServerTab *parentTab, MainWindow m_textview->setTextFormat(RichText); - m_field = new QLineEdit(this); + m_field = new IRCHistoryLineEdit(this); m_layout->add(hbox); @@ -25,3 +26,12 @@ void IRCQueryTab::appendText(QString text) { /* not using append because it creates layout problems */ - m_textview->setText(m_textview->text() + text); + QString txt = m_textview->text() + text + "\n"; + if (m_maxLines > 0 && m_lines >= m_maxLines) { + int firstBreak = txt.find('\n'); + if (firstBreak != -1) { + txt = "<qt bgcolor=\"" + m_backgroundColor + "\"/>" + txt.right(txt.length() - (firstBreak + 1)); + } + } else { + m_lines++; + } + m_textview->setText(txt); m_textview->ensureVisible(0, m_textview->contentsHeight()); @@ -65,2 +75,3 @@ void IRCQueryTab::settingsChanged() { m_textview->setText("<qt bgcolor=\"" + m_backgroundColor + "\"/>"); + m_lines = 0; } diff --git a/noncore/net/opieirc/ircquerytab.h b/noncore/net/opieirc/ircquerytab.h index 07fa57f..f9cc8e1 100644 --- a/noncore/net/opieirc/ircquerytab.h +++ b/noncore/net/opieirc/ircquerytab.h @@ -23,4 +23,5 @@ -#include "ircsession.h" #include "mainwindow.h" +#include "ircsession.h" +#include "ircmisc.h" @@ -48,3 +49,4 @@ protected: QTextView *m_textview; - QLineEdit *m_field; + IRCHistoryLineEdit *m_field; + int m_lines; }; diff --git a/noncore/net/opieirc/ircservertab.cpp b/noncore/net/opieirc/ircservertab.cpp index 4ed5364..5d1e290 100644 --- a/noncore/net/opieirc/ircservertab.cpp +++ b/noncore/net/opieirc/ircservertab.cpp @@ -9,2 +9,3 @@ IRCServerTab::IRCServerTab(IRCServer server, MainWindow *mainWindow, QWidget *pa m_close = FALSE; + m_lines = 0; m_description->setText(tr("Connection to")+" <b>" + server.hostname() + ":" + QString::number(server.port()) + "</b>"); @@ -15,3 +16,3 @@ IRCServerTab::IRCServerTab(IRCServer server, MainWindow *mainWindow, QWidget *pa m_layout->add(m_textview); - m_field = new QLineEdit(this); + m_field = new IRCHistoryLineEdit(this); m_layout->add(m_field); @@ -25,3 +26,12 @@ void IRCServerTab::appendText(QString text) { /* not using append because it creates layout problems */ - m_textview->setText(m_textview->text() + text); + QString txt = m_textview->text() + text + "\n"; + if (m_maxLines > 0 && m_lines >= m_maxLines) { + int firstBreak = txt.find('\n'); + if (firstBreak != -1) { + txt = "<qt bgcolor=\"" + m_backgroundColor + "\"/>" + txt.right(txt.length() - (firstBreak + 1)); + } + } else { + m_lines++; + } + m_textview->setText(txt); m_textview->ensureVisible(0, m_textview->contentsHeight()); @@ -60,2 +70,3 @@ void IRCServerTab::settingsChanged() { m_textview->setText("<qt bgcolor=\"" + m_backgroundColor + "\"/>"); + m_lines = 0; } diff --git a/noncore/net/opieirc/ircservertab.h b/noncore/net/opieirc/ircservertab.h index 698689a..8d24cba 100644 --- a/noncore/net/opieirc/ircservertab.h +++ b/noncore/net/opieirc/ircservertab.h @@ -28,2 +28,3 @@ #include "ircquerytab.h" +#include "ircmisc.h" @@ -60,2 +61,3 @@ protected slots: protected: + int m_lines; bool m_close; @@ -65,3 +67,3 @@ protected: QTextView *m_textview; - QLineEdit *m_field; + IRCHistoryLineEdit *m_field; /* Channel tabs associated with this server tab */ diff --git a/noncore/net/opieirc/ircsettings.cpp b/noncore/net/opieirc/ircsettings.cpp index d1fef67..1903e87 100644 --- a/noncore/net/opieirc/ircsettings.cpp +++ b/noncore/net/opieirc/ircsettings.cpp @@ -1,2 +1,4 @@ #include <qlayout.h> +#include <qvalidator.h> +#include <qscrollview.h> #include "ircsettings.h" @@ -4,38 +6,58 @@ #include "ircmisc.h" -#include <stdio.h> IRCSettings::IRCSettings(QWidget* parent, const char* name, bool modal, WFlags f) : QDialog(parent, name, modal, f) { + setCaption("Settings"); m_config = new Config("OpieIRC"); m_config->setGroup("OpieIRC"); - - setCaption("Settings"); - QGridLayout *layout = new QGridLayout(this, 7, 2, 5, 0); - QLabel *label = new QLabel(tr("Background color :"), this); + 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); + 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")), this); + m_background = new IRCFramedColorLabel(QColor(m_config->readEntry("BackgroundColor", "#FFFFFF")), widget); layout->addWidget(m_background, 0, 1); - label = new QLabel(tr("Normal text color :"), this); + label = new QLabel(tr("Normal text color :"), widget); layout->addWidget(label, 1, 0); - m_text = new IRCFramedColorLabel(m_config->readEntry("TextColor", "#000000"), this); + m_text = new IRCFramedColorLabel(m_config->readEntry("TextColor", "#000000"), widget); layout->addWidget(m_text, 1, 1); - label = new QLabel(tr("Error color :"), this); + label = new QLabel(tr("Error color :"), widget); layout->addWidget(label, 2, 0); - m_error = new IRCFramedColorLabel(m_config->readEntry("ErrorColor", "#FF0000"), this); + m_error = new IRCFramedColorLabel(m_config->readEntry("ErrorColor", "#FF0000"), widget); layout->addWidget(m_error, 2, 1); - label = new QLabel(tr("Text written by yourself :"), this); + label = new QLabel(tr("Text written by yourself :"), widget); layout->addWidget(label, 3, 0); - m_self = new IRCFramedColorLabel(m_config->readEntry("SelfColor", "#CC0000"), this); + m_self = new IRCFramedColorLabel(m_config->readEntry("SelfColor", "#CC0000"), widget); layout->addWidget(m_self, 3, 1); - label = new QLabel(tr("Text written by others :"), this); + label = new QLabel(tr("Text written by others :"), widget); layout->addWidget(label, 4, 0); - m_other = new IRCFramedColorLabel(m_config->readEntry("OtherColor", "#0000BB"), this); + m_other = new IRCFramedColorLabel(m_config->readEntry("OtherColor", "#0000BB"), widget); layout->addWidget(m_other, 4, 1); - label = new QLabel(tr("Text written by the server :"), this); + label = new QLabel(tr("Text written by the server :"), widget); layout->addWidget(label, 5, 0); - m_server = new IRCFramedColorLabel(m_config->readEntry("ServerColor", "#0000FF"), this); + m_server = new IRCFramedColorLabel(m_config->readEntry("ServerColor", "#0000FF"), widget); layout->addWidget(m_server, 5, 1); - label = new QLabel(tr("Notifications :"), this); + label = new QLabel(tr("Notifications :"), widget); layout->addWidget(label, 6, 0); - m_notification = new IRCFramedColorLabel(m_config->readEntry("NotificationColor", "#AAE300"), this); + m_notification = new IRCFramedColorLabel(m_config->readEntry("NotificationColor", "#AAE300"), widget); layout->addWidget(m_notification, 6, 1); + tw->addTab(view, tr("Colors")); showMaximized(); @@ -58,2 +80,3 @@ void IRCSettings::accept() { IRCTab::m_notificationColor = getColorString(m_notification); + IRCTab::m_maxLines = m_lines->text().toInt(); m_config->writeEntry("BackgroundColor", getColorString(m_background)); @@ -65,2 +88,3 @@ void IRCSettings::accept() { m_config->writeEntry("NotificationColor", getColorString(m_notification)); + m_config->writeEntry("Lines", m_lines->text()); QDialog::accept(); diff --git a/noncore/net/opieirc/ircsettings.h b/noncore/net/opieirc/ircsettings.h index 1d3aeb7..190abaf 100644 --- a/noncore/net/opieirc/ircsettings.h +++ b/noncore/net/opieirc/ircsettings.h @@ -25,2 +25,3 @@ #include <qdialog.h> +#include <qlineedit.h> @@ -35,10 +36,11 @@ protected slots: protected: - Config *m_config; - QWidget *m_background; - QWidget *m_text; - QWidget *m_error; - QWidget *m_self; - QWidget *m_server; - QWidget *m_other; - QWidget *m_notification; + Config *m_config; + QWidget *m_background; + QWidget *m_text; + QWidget *m_error; + QWidget *m_self; + QWidget *m_server; + QWidget *m_other; + QWidget *m_notification; + QLineEdit *m_lines; }; diff --git a/noncore/net/opieirc/irctab.cpp b/noncore/net/opieirc/irctab.cpp index a4dd7e2..0bb9d4c 100644 --- a/noncore/net/opieirc/irctab.cpp +++ b/noncore/net/opieirc/irctab.cpp @@ -12,3 +12,3 @@ QString IRCTab::m_otherColor; QString IRCTab::m_notificationColor; - +int IRCTab::m_maxLines; diff --git a/noncore/net/opieirc/irctab.h b/noncore/net/opieirc/irctab.h index e3a1857..7a2d0a2 100644 --- a/noncore/net/opieirc/irctab.h +++ b/noncore/net/opieirc/irctab.h @@ -37,2 +37,3 @@ public: IRCTab(QWidget *parent = 0, const char *name = 0, WFlags f = 0); + /* The ID is required to store the position of this IRCTab inside the IRCTabWidget */ void setID(int id); @@ -60,2 +61,4 @@ public: static QString m_notificationColor; + /* Max number of lines to be displayed */ + static int m_maxLines; }; diff --git a/noncore/net/opieirc/ircversion.h b/noncore/net/opieirc/ircversion.h index f0f196e..ec6acfa 100644 --- a/noncore/net/opieirc/ircversion.h +++ b/noncore/net/opieirc/ircversion.h @@ -23,3 +23,3 @@ -#define APP_VERSION "OpieIRC 0.3" +#define APP_VERSION "OpieIRC 0.4" #define APP_COPYSTR "(c) 2002 by Wenzel Jakob" diff --git a/noncore/net/opieirc/mainwindow.cpp b/noncore/net/opieirc/mainwindow.cpp index fe59c3b..bb03a1c 100644 --- a/noncore/net/opieirc/mainwindow.cpp +++ b/noncore/net/opieirc/mainwindow.cpp @@ -38,2 +38,3 @@ void MainWindow::loadSettings() { IRCTab::m_notificationColor = config.readEntry("NotificationColor", "#AA3300"); + IRCTab::m_maxLines = config.readNumEntry("Lines", 100); } @@ -41,3 +42,3 @@ void MainWindow::loadSettings() { void MainWindow::selected(QWidget *) { - m_tabWidget->setTabColor(m_tabWidget->currentPageIndex(), &black); + m_tabWidget->setTabColor(m_tabWidget->currentPageIndex(), black); } @@ -54,3 +55,3 @@ void MainWindow::changeEvent(IRCTab *tab) { if (tab->id() != m_tabWidget->currentPageIndex()) - m_tabWidget->setTabColor(tab->id(), &blue); + m_tabWidget->setTabColor(tab->id(), blue); } diff --git a/noncore/net/opieirc/opie-irc.control b/noncore/net/opieirc/opie-irc.control index 9e93991..aada957 100644 --- a/noncore/net/opieirc/opie-irc.control +++ b/noncore/net/opieirc/opie-irc.control @@ -7,3 +7,2 @@ Version: $QPE_VERSION-$SUB_VERSION Depends: opie-base ($QPE_VERSION) -Description: The Opie IRC client lets you chat on your favorite - IRC server using your zaurus or ipaq +Description: The Opie IRC client lets you chat on your favorite IRC server using your handheld computer |