X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.cpp;h=4c89e8e2c4adbb7e534ceec04a7191530e291d86;hp=1b7380413bb56bde99ec68fbb043bf4a501698c4;hb=858c7dbcbfa84deda9a71b4f4d25b1555bae3cc1;hpb=1aef6bf0d3d2a7ef469b9a9f68ceb891cc8a896c diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp index 1b738041..4c89e8e2 100644 --- a/src/qtui/mainwin.cpp +++ b/src/qtui/mainwin.cpp @@ -17,13 +17,12 @@ * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -//#define SPUTDEV - #include "mainwin.h" #include "aboutdlg.h" #include "chatwidget.h" #include "bufferview.h" +#include "chatline.h" #include "chatline-old.h" #include "client.h" #include "coreconnectdlg.h" @@ -51,6 +50,7 @@ #include "debugconsole.h" +#include "global.h" MainWin::MainWin(QtUi *_gui, QWidget *parent) : QMainWindow(parent), @@ -70,7 +70,10 @@ MainWin::MainWin(QtUi *_gui, QWidget *parent) void MainWin::init() { QtUiSettings s; - resize(s.value("MainWinSize").toSize()); + if(s.value("MainWinSize").isValid()) + resize(s.value("MainWinSize").toSize()); + else + resize(QSize(800, 500)); Client::signalProxy()->attachSignal(this, SIGNAL(requestBacklog(BufferInfo, QVariant, QVariant))); @@ -94,9 +97,9 @@ void MainWin::init() { setupMenus(); setupViews(); setupNickWidget(); + setupTopicWidget(); setupChatMonitor(); setupInputWidget(); - setupTopicWidget(); setupSystray(); @@ -108,16 +111,16 @@ void MainWin::init() { disconnectedFromCore(); // Disable menus and stuff showCoreConnectionDlg(true); // autoconnect if appropriate - // attach the BufferWidget to the PropertyMapper + // attach the BufferWidget to the BufferModel and the default selection ui.bufferWidget->setModel(Client::bufferModel()); ui.bufferWidget->setSelectionModel(Client::bufferModel()->standardSelectionModel()); - -#ifdef SPUTDEV - //showSettingsDlg(); - //showAboutDlg(); - showNetworkDlg(); - exit(1); -#endif + + if(Global::SPUTDEV) { + //showSettingsDlg(); + //showAboutDlg(); + //showNetworkDlg(); + //exit(1); + } } @@ -169,6 +172,7 @@ QDockWidget *MainWin::addBufferView(const QString &viewname, QAbstractItemModel dock->show(); addDockWidget(Qt::LeftDockWidgetArea, dock); + ui.menuViews->addAction(dock->toggleViewAction()); netViews.append(dock); @@ -184,11 +188,6 @@ void MainWin::setupSettingsDlg() { //Category: General settingsDlg->registerSettingsPage(new IdentitiesSettingsPage(settingsDlg)); settingsDlg->registerSettingsPage(new NetworksSettingsPage(settingsDlg)); - - -#ifdef SPUTDEV - connect(settingsDlg, SIGNAL(finished(int)), QApplication::instance(), SLOT(quit())); // FIXME -#endif } void MainWin::setupNickWidget() { @@ -201,9 +200,12 @@ void MainWin::setupNickWidget() { nickDock->setWidget(nickListWidget); addDockWidget(Qt::RightDockWidgetArea, nickDock); + ui.menuViews->addAction(nickDock->toggleViewAction()); - Client::bufferModel()->mapProperty(0, NetworkModel::BufferIdRole, nickListWidget, "currentBuffer"); + // attach the NickListWidget to the BufferModel and the default selection + nickListWidget->setModel(Client::bufferModel()); + nickListWidget->setSelectionModel(Client::bufferModel()->standardSelectionModel()); } void MainWin::setupChatMonitor() { @@ -220,10 +222,10 @@ void MainWin::setupChatMonitor() { return; chatWidget->init(BufferId(0)); - QList lines; + QList lines; QList msgs = buf->contents(); foreach(AbstractUiMsg *msg, msgs) { - lines.append(dynamic_cast(msg)); + lines.append(dynamic_cast(msg)); } chatWidget->setContents(lines); connect(buf, SIGNAL(msgAppended(AbstractUiMsg *)), chatWidget, SLOT(appendMsg(AbstractUiMsg *))); @@ -254,9 +256,12 @@ void MainWin::setupTopicWidget() { VerticalDock *dock = new VerticalDock(tr("Topic"), this); dock->setObjectName("TopicDock"); TopicWidget *topicwidget = new TopicWidget(dock); + connect(topicwidget, SIGNAL(topicChanged(const QString &)), this, SLOT(changeTopic(const QString &))); + dock->setWidget(topicwidget); - Client::bufferModel()->mapProperty(1, Qt::DisplayRole, topicwidget, "topic"); + topicwidget->setModel(Client::bufferModel()); + topicwidget->setSelectionModel(Client::bufferModel()->standardSelectionModel()); addDockWidget(Qt::TopDockWidgetArea, dock); @@ -266,9 +271,8 @@ void MainWin::setupTopicWidget() { void MainWin::setupSystray() { systray = new QSystemTrayIcon(this); systray->setIcon(QIcon(":/icons/quassel-icon.png")); - - QString toolTip("left click to minimize the quassel client to tray"); - systray->setToolTip(toolTip); +// systray->setToolTip("left click to minimize the quassel client to tray"); +// systray->setToolTip(toolTip); systrayMenu = new QMenu(this); systrayMenu->addAction(ui.actionAboutQuassel); @@ -280,36 +284,45 @@ void MainWin::setupSystray() { systray->setContextMenu(systrayMenu); - QtUiSettings s; - if(s.value("UseSystemTrayIcon").toBool()) { + UiSettings s; + if(s.value("UseSystemTrayIcon", QVariant(true)).toBool()) { systray->show(); } - - #ifndef Q_WS_MAC + +#ifndef Q_WS_MAC connect(systray, SIGNAL(activated( QSystemTrayIcon::ActivationReason )), this, SLOT(systrayActivated( QSystemTrayIcon::ActivationReason ))); - #endif +#endif } void MainWin::changeEvent(QEvent *event) { if(event->type() == QEvent::WindowStateChange) { if(windowState() & Qt::WindowMinimized) { - QtUiSettings s; + UiSettings s; if(s.value("UseSystemTrayIcon").toBool() && s.value("MinimizeOnMinimize").toBool()) { toggleVisibility(); + event->ignore(); } } } } +// FIXME this should be made prettier... +void MainWin::changeTopic(const QString &topic) { + BufferId id = ui.bufferWidget->currentBuffer(); + if(!id.isValid()) return; + Buffer *buffer = Client::buffer(id); + if(buffer) Client::userInput(buffer->bufferInfo(), QString("/topic %1").arg(topic)); +} + void MainWin::connectedToCore() { foreach(BufferInfo id, Client::allBufferInfos()) { emit requestBacklog(id, 1000, -1); } ui.menuViews->setEnabled(true); - ui.menuCore->setEnabled(true); + //ui.menuCore->setEnabled(true); ui.actionConnectCore->setEnabled(false); ui.actionDisconnectCore->setEnabled(true); //ui.actionNetworkList->setEnabled(true); @@ -319,17 +332,18 @@ void MainWin::connectedToCore() { void MainWin::disconnectedFromCore() { ui.menuViews->setEnabled(false); - ui.menuCore->setEnabled(false); + //ui.menuCore->setEnabled(false); ui.actionDisconnectCore->setEnabled(false); //ui.actionNetworkList->setEnabled(false); ui.bufferWidget->hide(); ui.actionConnectCore->setEnabled(true); - nickListWidget->reset(); + // nickListWidget->reset(); statusBar()->showMessage(tr("Not connected to core.")); } AbstractUiMsg *MainWin::layoutMsg(const Message &msg) { - return new ChatLine(msg); + if(Global::SPUTDEV) return new ChatLine(msg); + return new ChatLineOld(msg); } void MainWin::showCoreConnectionDlg(bool autoConnect) { @@ -358,7 +372,7 @@ void MainWin::showAboutDlg() { } void MainWin::closeEvent(QCloseEvent *event) { - QtUiSettings s; + UiSettings s; if(s.value("UseSystemTrayIcon").toBool() && s.value("MinimizeOnClose").toBool()) { toggleVisibility(); event->ignore(); @@ -374,7 +388,7 @@ void MainWin::systrayActivated( QSystemTrayIcon::ActivationReason activationReas } void MainWin::toggleVisibility() { - if(isHidden() || !isActiveWindow()) { + if(isHidden() /*|| !isActiveWindow()*/) { show(); if(isMinimized()) if (isMaximized()) @@ -383,9 +397,11 @@ void MainWin::toggleVisibility() { showNormal(); raise(); - activateWindow(); + setFocus(Qt::ActiveWindowFocusReason); + // activateWindow(); } else { if(systray->isSystemTrayAvailable ()) { + clearFocus(); hide(); if(!systray->isVisible()) { systray->show(); @@ -430,13 +446,13 @@ void MainWin::clientNetworkUpdated() { a->setText(net->networkName()); if(net->connectionState() == Network::Initialized) { a->setIcon(QIcon(":/16x16/actions/network-connect")); - a->setEnabled(true); + //a->setEnabled(true); } else if(net->connectionState() == Network::Disconnected) { a->setIcon(QIcon(":/16x16/actions/network-disconnect")); - a->setEnabled(true); + //a->setEnabled(true); } else { a->setIcon(QIcon(":/16x16/actions/gear")); - a->setEnabled(false); + //a->setEnabled(false); } return; }