From: Manuel Nickschas Date: Fri, 30 Nov 2007 17:23:36 +0000 (+0000) Subject: More polishing of QuasselTopia, and getting rid of debug output. X-Git-Tag: 0.1.0~44 X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=8f6f3932998ffb3778e4e077dfb301da4cf34c1f More polishing of QuasselTopia, and getting rid of debug output. --- diff --git a/src/common/global.h b/src/common/global.h index c298766b..4b337d5c 100644 --- a/src/common/global.h +++ b/src/common/global.h @@ -23,6 +23,10 @@ #ifndef _GLOBAL_H_ #define _GLOBAL_H_ +// Enable some shortcuts and stuff +//#define DEVELMODE + + /** The protocol version we use fo the communication between core and GUI */ #define GUI_PROTOCOL 3 diff --git a/src/common/ircchannel.cpp b/src/common/ircchannel.cpp index 5fad2eb5..2bcb8ca0 100644 --- a/src/common/ircchannel.cpp +++ b/src/common/ircchannel.cpp @@ -112,7 +112,7 @@ void IrcChannel::join(IrcUser *ircuser) { if(!_userModes.contains(ircuser) && ircuser) { _userModes[ircuser] = QString(); ircuser->joinChannel(name()); - qDebug() << "JOIN" << name() << ircuser->nick() << ircUsers().count(); + //qDebug() << "JOIN" << name() << ircuser->nick() << ircUsers().count(); connect(ircuser, SIGNAL(nickSet(QString)), this, SLOT(ircUserNickSet(QString))); connect(ircuser, SIGNAL(destroyed()), this, SLOT(ircUserDestroyed())); // if you wonder why there is no counterpart to ircUserJoined: @@ -129,7 +129,7 @@ void IrcChannel::part(IrcUser *ircuser) { if(isKnownUser(ircuser)) { _userModes.remove(ircuser); ircuser->partChannel(name()); - qDebug() << "PART" << name() << ircuser->nick() << ircUsers().count(); + //qDebug() << "PART" << name() << ircuser->nick() << ircUsers().count(); // if you wonder why there is no counterpart to ircUserParted: // the joines are propagted by the ircuser. the signal ircUserParted is only for convenience emit ircUserParted(ircuser); @@ -211,7 +211,7 @@ void IrcChannel::ircUserDestroyed() { Q_ASSERT(ircUser); _userModes.remove(ircUser); emit ircUserParted(ircUser); - qDebug() << "DEST" << name() << ircUsers().count(); + //qDebug() << "DEST" << name() << ircUsers().count(); } void IrcChannel::ircUserNickSet(QString nick) { diff --git a/src/common/ircuser.cpp b/src/common/ircuser.cpp index 01bc9634..333ee93b 100644 --- a/src/common/ircuser.cpp +++ b/src/common/ircuser.cpp @@ -39,7 +39,7 @@ IrcUser::IrcUser(const QString &hostmask, NetworkInfo *networkinfo) } IrcUser::~IrcUser() { - qDebug() << nick() << "destroyed."; + //qDebug() << nick() << "destroyed."; } // ==================== diff --git a/src/core/ircserverhandler.cpp b/src/core/ircserverhandler.cpp index 20aeae1d..ec39c57b 100644 --- a/src/core/ircserverhandler.cpp +++ b/src/core/ircserverhandler.cpp @@ -153,7 +153,7 @@ void IrcServerHandler::handleJoin(QString prefix, QStringList params) { QString channel = params[0]; IrcUser *ircuser = networkInfo()->updateNickFromMask(prefix); emit displayMsg(Message::Join, channel, channel, prefix); - qDebug() << "IrcServerHandler::handleJoin()" << prefix << params; + //qDebug() << "IrcServerHandler::handleJoin()" << prefix << params; ircuser->joinChannel(channel); } @@ -285,7 +285,7 @@ void IrcServerHandler::handlePrivmsg(QString prefix, QStringList params) { void IrcServerHandler::handleQuit(QString prefix, QStringList params) { IrcUser *ircuser = networkInfo()->updateNickFromMask(prefix); Q_ASSERT(ircuser); - qDebug() << "IrcServerHandler:handleQuit" << prefix << params; + //qDebug() << "IrcServerHandler:handleQuit" << prefix << params; QString msg; if(params.count()) diff --git a/src/qtopia/bufferviewwidget.cpp b/src/qtopia/bufferviewwidget.cpp index 0b93e063..c6a9836a 100644 --- a/src/qtopia/bufferviewwidget.cpp +++ b/src/qtopia/bufferviewwidget.cpp @@ -33,11 +33,12 @@ BufferViewWidget::BufferViewWidget(QWidget *parent) : QDialog(parent) { ui.tabWidget->removeTab(0); delete w; - addPage(tr("Bufs"), BufferViewFilter::AllNets, QList()); + addPage(tr("All"), BufferViewFilter::AllNets, QList()); addPage(tr("Chans"), BufferViewFilter::AllNets|BufferViewFilter::NoQueries|BufferViewFilter::NoServers, QList()); addPage(tr("Queries"), BufferViewFilter::AllNets|BufferViewFilter::NoChannels|BufferViewFilter::NoServers, QList()); addPage(tr("Nets"), BufferViewFilter::AllNets|BufferViewFilter::NoChannels|BufferViewFilter::NoQueries, QList()); + // this sometimes deadlocks, so we have to hide the dialog from the outside: //connect(Client::bufferModel(), SIGNAL(bufferSelected(Buffer *)), this, SLOT(accept())); } @@ -55,8 +56,5 @@ void BufferViewWidget::addPage(const QString &title, const BufferViewFilter::Mod } void BufferViewWidget::accept() { - qDebug() << "accepting"; QDialog::accept(); - //hide(); - qDebug() << "...done."; } diff --git a/src/qtopia/coreconnectdlg.cpp b/src/qtopia/coreconnectdlg.cpp index 3fe1e354..176e077c 100644 --- a/src/qtopia/coreconnectdlg.cpp +++ b/src/qtopia/coreconnectdlg.cpp @@ -57,9 +57,22 @@ CoreConnectDlg::CoreConnectDlg(QWidget *parent, bool /*doAutoConnect*/) : QDialo AccountSettings s; ui.accountList->addItems(s.knownAccounts()); + // if empty, create a test account + if(!ui.accountList->count()) { + QVariantMap accData; + accData["User"] = "testuser"; + accData["Host"] = "apollo.mindpool.net"; + accData["Port"] = 4242; + accData["Password"] = "testuser"; + s.setValue("Test Account", "AccountData", accData); + ui.accountList->addItems(s.knownAccounts()); + } + // end test account if(ui.accountList->count()) ui.accountList->item(0)->setSelected(true); setWidgetStates(); +#ifdef DEVELMODE doConnect(); // shortcut for development +#endif } CoreConnectDlg::~CoreConnectDlg() { diff --git a/src/qtopia/mainwidget.cpp b/src/qtopia/mainwidget.cpp index 431a7300..287aa79a 100644 --- a/src/qtopia/mainwidget.cpp +++ b/src/qtopia/mainwidget.cpp @@ -37,6 +37,11 @@ MainWidget::~MainWidget() { } void MainWidget::setBuffer(Buffer *buf) { + if(!buf) { + ui.stack->setCurrentIndex(0); + currentBuffer = 0; + return; + } // TODO update topic if changed; handle status buffer display QString title = QString("%1 (%2): \"%3\"").arg(buf->name()).arg(buf->networkName()).arg(buf->topic()); ui.topicBar->setContents(title); diff --git a/src/qtopia/qtopia.pri b/src/qtopia/qtopia.pri index d0a90aab..086ad745 100644 --- a/src/qtopia/qtopia.pri +++ b/src/qtopia/qtopia.pri @@ -5,4 +5,8 @@ HDRS += bufferviewwidget.h chatline.h chatwidget.h coreconnectdlg.h mainwidget.h qtopiaui.h qtopiamainwin.h qtopiauistyle.h topicbar.h SRCS += bufferviewwidget.cpp chatline.cpp chatwidget.cpp coreconnectdlg.cpp main.cpp mainwidget.cpp nicklistwidget.cpp \ qtopiaui.cpp qtopiamainwin.cpp qtopiauistyle.cpp topicbar.cpp -FRMS += ui/bufferviewwidget.ui ui/coreconnectdlg.ui ui/coreconnectprogressdlg.ui ui/editcoreacctdlg.ui ui/mainwidget.ui ui/nicklistwidget.ui +FORMNAMES += aboutdlg.ui bufferviewwidget.ui coreconnectdlg.ui coreconnectprogressdlg.ui editcoreacctdlg.ui mainwidget.ui nicklistwidget.ui + +for(ui, FORMNAMES) { + FRMS += ui/$${ui} +} diff --git a/src/qtopia/qtopiamainwin.cpp b/src/qtopia/qtopiamainwin.cpp index 5ba655d8..3f68fe4c 100644 --- a/src/qtopia/qtopiamainwin.cpp +++ b/src/qtopia/qtopiamainwin.cpp @@ -31,11 +31,11 @@ #include "qtopiaui.h" #include "signalproxy.h" +#include "ui_aboutdlg.h" + #include #include -#define DEBUGMODE - // This constructor is the first thing to be called for a Qtopia app, so we do the init stuff // here (rather than in a main.cpp). QtopiaMainWin::QtopiaMainWin(QWidget *parent, Qt::WFlags flags) : QMainWindow(parent, flags) { @@ -67,6 +67,7 @@ QtopiaMainWin::QtopiaMainWin(QWidget *parent, Qt::WFlags flags) : QMainWindow(pa toolBar = new QToolBar(this); toolBar->setIconSize(QSize(16, 16)); + toolBar->setWindowTitle(tr("Show Toolbar")); addToolBar(toolBar); bufferViewWidget = new BufferViewWidget(this); @@ -96,7 +97,7 @@ QtopiaMainWin::~QtopiaMainWin() { } void QtopiaMainWin::closeEvent(QCloseEvent *event) { -#ifndef DEBUGMODE +#ifndef DEVELMODE QMessageBox *box = new QMessageBox(QMessageBox::Question, tr("Quit Quassel IRC?"), tr("Do you really want to quit Quassel IRC?"), QMessageBox::Cancel, this); QAbstractButton *quit = box->addButton(tr("Quit"), QMessageBox::AcceptRole); @@ -110,12 +111,17 @@ void QtopiaMainWin::closeEvent(QCloseEvent *event) { } void QtopiaMainWin::setupActions() { - showBuffersAction = toolBar->addAction(QIcon(":icon/options-hide"), "Show Buffers", this, SLOT(showBufferView())); // FIXME provide real icon - showNicksAction = toolBar->addAction(QIcon(":icon/list"), "Show Nicks", this, SLOT(showNickList())); + showBuffersAction = toolBar->addAction(QIcon(":icon/options-hide"), tr("Show Buffers"), this, SLOT(showBufferView())); // FIXME provide real icon + showNicksAction = toolBar->addAction(QIcon(":icon/list"), tr("Show Nicks"), this, SLOT(showNickList())); QMenu *menu = new QMenu(this); menu->addAction(showBuffersAction); menu->addAction(showNicksAction); + menu->addSeparator(); + menu->addAction(toolBar->toggleViewAction()); + menu->addSeparator(); + menu->addAction(tr("About..."), this, SLOT(showAboutDlg())); + QSoftMenuBar::addMenuTo(this, menu); } @@ -124,7 +130,7 @@ void QtopiaMainWin::connectedToCore() { emit requestBacklog(id, 100, -1); } -#ifdef DEBUGMODE +#ifdef DEVELMODE // FIXME just for testing: select first available buffer if(Client::allBufferInfos().count() > 1) { Buffer *b = Client::buffer(Client::allBufferInfos()[1]); @@ -144,19 +150,25 @@ AbstractUiMsg *QtopiaMainWin::layoutMsg(const Message &msg) { } void QtopiaMainWin::showBuffer(Buffer *b) { - mainWidget->setBuffer(b); bufferViewWidget->hide(); + mainWidget->setBuffer(b); nickListWidget->setBuffer(b); } void QtopiaMainWin::showBufferView() { bufferViewWidget->showMaximized(); - } void QtopiaMainWin::showNickList() { nickListWidget->showMaximized(); } +void QtopiaMainWin::showAboutDlg() { + QDialog *dlg = new QDialog(this); + dlg->setAttribute(Qt::WA_DeleteOnClose); + Ui::AboutDlg ui; + ui.setupUi(dlg); + dlg->showMaximized(); +} diff --git a/src/qtopia/qtopiamainwin.h b/src/qtopia/qtopiamainwin.h index 306b3c2f..526cb587 100644 --- a/src/qtopia/qtopiamainwin.h +++ b/src/qtopia/qtopiamainwin.h @@ -51,6 +51,7 @@ class QtopiaMainWin : public QMainWindow { void showBuffer(Buffer *); void showBufferView(); void showNickList(); + void showAboutDlg(); protected: void closeEvent(QCloseEvent *); diff --git a/src/qtopia/ui/aboutdlg.ui b/src/qtopia/ui/aboutdlg.ui new file mode 100644 index 00000000..a432221b --- /dev/null +++ b/src/qtopia/ui/aboutdlg.ui @@ -0,0 +1,46 @@ + + AboutDlg + + + + 0 + 0 + 240 + 271 + + + + Dialog + + + + + + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Trebuchet MS'; font-size:10pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Quassel IRC</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:14pt; font-weight:600;"><span style=" font-size:8pt; font-weight:400;">mobile edition</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:5pt;"> </span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:5pt;">(C) 2005-2007 by</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:5pt; font-weight:600;">The Quassel IRC Team</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:5pt;">Manuel Nickschas</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:5pt;">Marcus Eggenberger</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:5pt;">Marco Genise</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:5pt;"><span style=" font-size:4pt;"> </span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:5pt;">&lt;http://quassel-irc.org&gt;</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:5pt;">&lt;devel@quassel-irc.org&gt;</p></body></html> + + + Qt::AlignCenter + + + true + + + + + + + + diff --git a/src/qtopia/ui/bufferviewwidget.ui b/src/qtopia/ui/bufferviewwidget.ui index 7835aec8..c387cb09 100644 --- a/src/qtopia/ui/bufferviewwidget.ui +++ b/src/qtopia/ui/bufferviewwidget.ui @@ -19,7 +19,7 @@ QTabWidget::South - QTabWidget::Triangular + QTabWidget::Rounded 0 diff --git a/src/qtopia/ui/coreconnectprogressdlg.ui b/src/qtopia/ui/coreconnectprogressdlg.ui index 68e1ef86..ed7dfcb8 100644 --- a/src/qtopia/ui/coreconnectprogressdlg.ui +++ b/src/qtopia/ui/coreconnectprogressdlg.ui @@ -13,12 +13,19 @@ Connection Progress - - 9 - - - 6 - + + + + <b>Connection to core in progress.</b> + + + Qt::AlignCenter + + + true + + + @@ -46,8 +53,8 @@ - 20 - 31 + 138 + 51 diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp index aeca91e9..f75d1653 100644 --- a/src/qtui/mainwin.cpp +++ b/src/qtui/mainwin.cpp @@ -188,7 +188,7 @@ void MainWin::addBufferView(const QString &viewname, QAbstractItemModel *model, void MainWin::connectedToCore() { foreach(BufferInfo id, Client::allBufferInfos()) { - emit requestBacklog(id, 100, -1); + emit requestBacklog(id, 1000, -1); } ui.menuViews->setEnabled(true);