X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.cpp;h=12d49157fde62611a3d83892a824dcb9d841c75a;hp=aeca91e9df2a3c89e64b54b23d7bf3e2696fac11;hb=c5cbe5eb77fce2ab954a98399a1450803108217b;hpb=d6b056e936ec441258d291b7a8af7b83f9f53016 diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp index aeca91e9..12d49157 100644 --- a/src/qtui/mainwin.cpp +++ b/src/qtui/mainwin.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-07 by the Quassel IRC Team * + * Copyright (C) 2005-08 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -17,6 +17,7 @@ * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ +//#define SPUTDEV #include "mainwin.h" @@ -24,28 +25,35 @@ #include "chatline-old.h" #include "client.h" #include "coreconnectdlg.h" +#include "networkmodel.h" +#include "buffermodel.h" #include "nicklistwidget.h" #include "serverlist.h" #include "settingsdlg.h" -//#include "settingspage.h" #include "signalproxy.h" - #include "topicwidget.h" +#include "uisettings.h" #include "selectionmodelsynchronizer.h" #include "mappedselectionmodel.h" +#include "settingspages/fontssettingspage.h" +#include "settingspages/identitiessettingspage.h" +#include "settingspages/networkssettingspage.h" + +#include "debugconsole.h" + MainWin::MainWin(QtUi *_gui, QWidget *parent) : QMainWindow(parent), gui(_gui) { ui.setupUi(this); setWindowTitle("Quassel IRC"); //setWindowTitle(QString::fromUtf8("Κυασελ Εγαρζη")); - setWindowIcon(QIcon(":/qirc-icon.png")); + setWindowIcon(QIcon(":icons/quassel-icon.png")); setWindowIconText("Quassel IRC"); statusBar()->showMessage(tr("Waiting for core...")); serverListDlg = new ServerListDlg(this); settingsDlg = new SettingsDlg(this); - + debugConsole = new DebugConsole(this); } void MainWin::init() { @@ -61,16 +69,17 @@ void MainWin::init() { statusBar()->showMessage(tr("Not connected to core.")); systray = new QSystemTrayIcon(this); - systray->setIcon(QIcon(":/qirc-icon.png")); + systray->setIcon(QIcon(":/icons/quassel-icon.png")); systray->show(); //setupSettingsDlg(); setupMenus(); setupViews(); + setupSettingsDlg(); // create nick dock - nickDock = new QDockWidget("Nicks", this); + nickDock = new QDockWidget(tr("Nicks"), this); nickDock->setObjectName("NickDock"); nickDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea); @@ -81,17 +90,8 @@ void MainWin::init() { ui.menuViews->addAction(nickDock->toggleViewAction()); // restore mainwin state - QSettings s; - s.beginGroup("Geometry"); - //resize(s.value("MainWinSize", QSize(500, 400)).toSize()); - //move(s.value("MainWinPos", QPoint(50, 50)).toPoint()); - if(s.contains("MainWinState")) restoreState(s.value("MainWinState").toByteArray()); - s.endGroup(); - - //s.beginGroup("Buffers"); - //QString net = s.value("CurrentNetwork", "").toString(); - //QString buf = s.value("CurrentBuffer", "").toString(); - //s.endGroup(); + UiSettings s; + restoreState(s.value("MainWinState").toByteArray()); disconnectedFromCore(); // Disable menus and stuff showCoreConnectionDlg(true); // autoconnect if appropriate @@ -104,7 +104,8 @@ void MainWin::init() { setDockNestingEnabled(true); - // TESTING + // new Topic Stuff... should be probably refactored out into a separate method + setCorner(Qt::TopLeftCorner, Qt::LeftDockWidgetArea); setCorner(Qt::BottomLeftCorner, Qt::LeftDockWidgetArea); @@ -112,19 +113,32 @@ void MainWin::init() { setCorner(Qt::BottomRightCorner, Qt::RightDockWidgetArea); - QDockWidget *dock = new QDockWidget("Topic Dock", this); + QDockWidget *dock = new QDockWidget(tr("Topic Dock"), this); dock->setObjectName("TopicDock"); dock->setAllowedAreas(Qt::TopDockWidgetArea | Qt::BottomDockWidgetArea); TopicWidget *topicwidget = new TopicWidget(dock); dock->setWidget(topicwidget); - Client::bufferModel()->mapProperty(0, Qt::DisplayRole, topicwidget, "topic"); + Client::bufferModel()->mapProperty(1, Qt::DisplayRole, topicwidget, "topic"); addDockWidget(Qt::TopDockWidgetArea, dock); ui.menuViews->addAction(dock->toggleViewAction()); + + // attach the BufferWidget to the PropertyMapper + ui.bufferWidget->setModel(Client::bufferModel()); + ui.bufferWidget->setSelectionModel(Client::bufferModel()->standardSelectionModel()); + + // attach the NickList to the PropertyMapper + Client::bufferModel()->mapProperty(0, NetworkModel::BufferIdRole, nickListWidget, "currentBuffer"); + + +#ifdef SPUTDEV + showSettingsDlg(); +#endif + } MainWin::~MainWin() { @@ -150,45 +164,55 @@ void MainWin::setupMenus() { connect(ui.actionNetworkList, SIGNAL(triggered()), this, SLOT(showServerList())); connect(ui.actionEditIdentities, SIGNAL(triggered()), serverListDlg, SLOT(editIdentities())); connect(ui.actionSettingsDlg, SIGNAL(triggered()), this, SLOT(showSettingsDlg())); - ui.actionSettingsDlg->setEnabled(false); + connect(ui.actionDebug_Console, SIGNAL(triggered()), this, SLOT(showDebugConsole())); connect(ui.actionAboutQt, SIGNAL(triggered()), QApplication::instance(), SLOT(aboutQt())); } void MainWin::setupViews() { - - BufferTreeModel *model = Client::bufferModel(); - connect(model, SIGNAL(bufferSelected(Buffer *)), this, SLOT(showBuffer(Buffer *))); - - addBufferView(tr("All Buffers"), model, BufferViewFilter::AllNets, QList()); - addBufferView(tr("All Channels"), model, BufferViewFilter::AllNets|BufferViewFilter::NoQueries|BufferViewFilter::NoServers, QList()); - addBufferView(tr("All Queries"), model, BufferViewFilter::AllNets|BufferViewFilter::NoChannels|BufferViewFilter::NoServers, QList()); - addBufferView(tr("All Networks"), model, BufferViewFilter::AllNets|BufferViewFilter::NoChannels|BufferViewFilter::NoQueries, QList()); - addBufferView(tr("Full Custom"), model, BufferViewFilter::FullCustom, QList()); - + BufferModel *model = Client::bufferModel(); + + addBufferView(tr("All Buffers"), model, BufferViewFilter::AllNets, QList()); + addBufferView(tr("All Channels"), model, BufferViewFilter::AllNets|BufferViewFilter::NoQueries|BufferViewFilter::NoServers, QList()); + addBufferView(tr("All Queries"), model, BufferViewFilter::AllNets|BufferViewFilter::NoChannels|BufferViewFilter::NoServers, QList()); + addBufferView(tr("All Networks"), model, BufferViewFilter::AllNets|BufferViewFilter::NoChannels|BufferViewFilter::NoQueries, QList()); + addBufferView(tr("Full Custom"), model, BufferViewFilter::FullCustom, QList()); + ui.menuViews->addSeparator(); } -void MainWin::addBufferView(const QString &viewname, QAbstractItemModel *model, const BufferViewFilter::Modes &mode, const QList &nets) { +QDockWidget *MainWin::addBufferView(const QString &viewname, QAbstractItemModel *model, const BufferViewFilter::Modes &mode, const QList &nets) { QDockWidget *dock = new QDockWidget(viewname, this); dock->setObjectName(QString("ViewDock-" + viewname)); // should be unique for mainwindow state! dock->setAllowedAreas(Qt::RightDockWidgetArea|Qt::LeftDockWidgetArea); - //dock->setContentsMargins(4,4,4,4); //create the view and initialize it's filter BufferView *view = new BufferView(dock); + view->show(); view->setFilteredModel(model, mode, nets); Client::bufferModel()->synchronizeView(view); dock->setWidget(view); - + dock->show(); + addDockWidget(Qt::LeftDockWidgetArea, dock); ui.menuViews->addAction(dock->toggleViewAction()); netViews.append(dock); + return dock; +} + +void MainWin::setupSettingsDlg() { +#ifdef SPUTDEV + connect(settingsDlg, SIGNAL(finished(int)), QApplication::instance(), SLOT(quit())); // FIXME +#endif + + settingsDlg->registerSettingsPage(new FontsSettingsPage(settingsDlg)); + settingsDlg->registerSettingsPage(new IdentitiesSettingsPage(settingsDlg)); + //settingsDlg->registerSettingsPage(new NetworksSettingsPage(settingsDlg)); } void MainWin::connectedToCore() { foreach(BufferInfo id, Client::allBufferInfos()) { - emit requestBacklog(id, 100, -1); + emit requestBacklog(id, 1000, -1); } ui.menuViews->setEnabled(true); @@ -219,14 +243,14 @@ void MainWin::showCoreConnectionDlg(bool autoConnect) { coreConnectDlg = new CoreConnectDlg(this, autoConnect); connect(coreConnectDlg, SIGNAL(finished(int)), this, SLOT(coreConnectionDlgFinished(int))); coreConnectDlg->setModal(true); - if(!autoConnect || !coreConnectDlg->willDoInternalAutoConnect()) + //if(!autoConnect || !coreConnectDlg->willDoInternalAutoConnect()) coreConnectDlg->show(); // avoid flicker and show dlg only if we do remote connect, which needs a progress bar - if(autoConnect) coreConnectDlg->doAutoConnect(); + //if(autoConnect) coreConnectDlg->doAutoConnect(); } void MainWin::coreConnectionDlgFinished(int /*code*/) { - coreConnectDlg->close(); + //exit(1); } @@ -242,20 +266,17 @@ void MainWin::showSettingsDlg() { settingsDlg->show(); } +void MainWin::showDebugConsole() { + debugConsole->show(); +} + void MainWin::closeEvent(QCloseEvent *event) { //if (userReallyWantsToQuit()) { - ui.bufferWidget->saveState(); - QSettings s; - s.beginGroup("Geometry"); + UiSettings s; s.setValue("MainWinSize", size()); s.setValue("MainWinPos", pos()); s.setValue("MainWinState", saveState()); - s.endGroup(); - s.beginGroup("Buffers"); - //s.setValue("CurrentNetwork", currentNetwork); - s.setValue("CurrentBuffer", currentBuffer); - s.endGroup(); delete systray; event->accept(); //} else { @@ -263,17 +284,3 @@ void MainWin::closeEvent(QCloseEvent *event) //} } -void MainWin::showBuffer(BufferInfo id) { - showBuffer(Client::buffer(id)); -} - -void MainWin::showBuffer(Buffer *b) { - currentBuffer = b->bufferInfo().groupId(); - //emit bufferSelected(b); - //qApp->processEvents(); - ui.bufferWidget->setBuffer(b); - nickListWidget->setBuffer(b); - //if(b->bufferType() == Buffer::ChannelType) nickDock->show(); - //else nickDock->hide(); - //emit bufferSelected(b); -}