/***************************************************************************
- * Copyright (C) 2005-09 by the Quassel Project *
+ * Copyright (C) 2005-2010 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
#include "inputwidget.h"
#include "irclistmodel.h"
#include "ircconnectionwizard.h"
-#include "jumpkeyhandler.h"
#include "legacysystemtray.h"
#include "msgprocessorstatuswidget.h"
#include "nicklistwidget.h"
#include "qtuistyle.h"
#include "settingsdlg.h"
#include "settingspagedlg.h"
+#include "statusnotifieritem.h"
#include "toolbaractionprovider.h"
#include "topicwidget.h"
#include "verticaldock.h"
#ifndef HAVE_KDE
-# ifdef HAVE_DBUS
-# include "desktopnotificationbackend.h"
-# endif
# ifdef HAVE_PHONON
# include "phononnotificationbackend.h"
# endif
#include "settingspages/notificationssettingspage.h"
#include "settingspages/topicwidgetsettingspage.h"
+#ifndef HAVE_KDE
+# include "settingspages/shortcutssettingspage.h"
+#endif
+
MainWin::MainWin(QWidget *parent)
#ifdef HAVE_KDE
: KMainWindow(parent),
_awayLog(0),
_layoutLoaded(false)
{
+ setAttribute(Qt::WA_DeleteOnClose, false); // we delete the mainwin manually
+
QtUiSettings uiSettings;
QString style = uiSettings.value("Style", QString()).toString();
if(!style.isEmpty()) {
setWindowTitle("Quassel IRC");
setWindowIconText("Quassel IRC");
updateIcon();
-
- installEventFilter(new JumpKeyHandler(this));
}
void MainWin::init() {
setupHotList();
#ifndef HAVE_KDE
- QtUi::registerNotificationBackend(new TaskbarNotificationBackend(this));
-# ifndef QT_NO_SYSTEMTRAYICON
- QtUi::registerNotificationBackend(new SystrayNotificationBackend(this));
-# endif
# ifdef HAVE_PHONON
QtUi::registerNotificationBackend(new PhononNotificationBackend(this));
# endif
-# ifdef HAVE_DBUS
- QtUi::registerNotificationBackend(new DesktopNotificationBackend(this));
+# ifndef QT_NO_SYSTEMTRAYICON
+ QtUi::registerNotificationBackend(new SystrayNotificationBackend(this));
# endif
+ QtUi::registerNotificationBackend(new TaskbarNotificationBackend(this));
+
#else /* HAVE_KDE */
QtUi::registerNotificationBackend(new KNotificationBackend(this));
#endif /* HAVE_KDE */
QtUi::registerNotificationBackend(new IndicatorNotificationBackend(this));
#endif
+ // we assume that at this point, all configurable actions are defined!
+ QtUi::loadShortcuts();
+
connect(bufferWidget(), SIGNAL(currentChanged(BufferId)), SLOT(currentBufferChanged(BufferId)));
setDisconnectedState(); // Disable menus and stuff
s.setValue("MainWinMinimized", isMinimized());
s.setValue("MainWinMaximized", isMaximized());
s.setValue("MainWinHidden", !isVisible());
+ BufferId lastBufId = Client::bufferModel()->currentBuffer();
+ if(lastBufId.isValid())
+ s.setValue("LastUsedBufferId", lastBufId.toInt());
#ifdef HAVE_KDE
saveAutoSaveSettings();
}
void MainWin::setupActions() {
- ActionCollection *coll = QtUi::actionCollection("General");
+ ActionCollection *coll = QtUi::actionCollection("General", tr("General"));
// File
coll->addAction("ConnectCore", new Action(SmallIcon("network-connect"), tr("&Connect to Core..."), coll,
this, SLOT(showCoreConnectionDlg())));
this, SLOT(showCoreInfoDlg())));
coll->addAction("ConfigureNetworks", new Action(SmallIcon("configure"), tr("Configure &Networks..."), coll,
this, SLOT(on_actionConfigureNetworks_triggered())));
+ // FIXME: use QKeySequence::Quit once we depend on Qt 4.6
coll->addAction("Quit", new Action(SmallIcon("application-exit"), tr("&Quit"), coll,
- this, SLOT(quit()), tr("Ctrl+Q")));
+ this, SLOT(quit()), Qt::CTRL + Qt::Key_Q));
// View
coll->addAction("ConfigureBufferViews", new Action(tr("&Configure Chat Lists..."), coll,
coll->addAction("ShowAwayLog", new Action(tr("Show Away Log"), coll,
this, SLOT(showAwayLog())));
coll->addAction("ToggleMenuBar", new Action(SmallIcon("show-menu"), tr("Show &Menubar"), coll,
- 0, 0, tr("Ctrl+M")))->setCheckable(true);
+ 0, 0, QKeySequence(Qt::CTRL + Qt::Key_M)))->setCheckable(true);
coll->addAction("ToggleStatusBar", new Action(tr("Show Status &Bar"), coll,
0, 0))->setCheckable(true);
// Settings
+ coll->addAction("ConfigureShortcuts", new Action(SmallIcon("configure-shortcuts"), tr("Configure &Shortcuts..."), coll,
+ this, SLOT(showShortcutsDlg())));
coll->addAction("ConfigureQuassel", new Action(SmallIcon("configure"), tr("&Configure Quassel..."), coll,
- this, SLOT(showSettingsDlg()), tr("F7")));
+ this, SLOT(showSettingsDlg()), QKeySequence(Qt::Key_F7)));
// Help
coll->addAction("AboutQuassel", new Action(SmallIcon("quassel"), tr("&About Quassel"), coll,
QtUi::style(), SLOT(reload()), QKeySequence::Refresh));
// Navigation
+ coll = QtUi::actionCollection("Navigation", tr("Navigation"));
+
coll->addAction("JumpHotBuffer", new Action(tr("Jump to hot chat"), coll,
this, SLOT(on_jumpHotBuffer_triggered()), QKeySequence(Qt::META + Qt::Key_A)));
+
+ // Jump keys
+#ifdef Q_WS_MAC
+ const int bindModifier = Qt::ControlModifier | Qt::AltModifier;
+ const int jumpModifier = Qt::ControlModifier;
+#else
+ const int bindModifier = Qt::ControlModifier;
+ const int jumpModifier = Qt::AltModifier;
+#endif
+
+ coll->addAction("BindJumpKey0", new Action(tr("Set Quick Access #0"), coll, this, SLOT(bindJumpKey()),
+ QKeySequence(bindModifier + Qt::Key_0)))->setProperty("Index", 0);
+ coll->addAction("BindJumpKey1", new Action(tr("Set Quick Access #1"), coll, this, SLOT(bindJumpKey()),
+ QKeySequence(bindModifier + Qt::Key_1)))->setProperty("Index", 1);
+ coll->addAction("BindJumpKey2", new Action(tr("Set Quick Access #2"), coll, this, SLOT(bindJumpKey()),
+ QKeySequence(bindModifier + Qt::Key_2)))->setProperty("Index", 2);
+ coll->addAction("BindJumpKey3", new Action(tr("Set Quick Access #3"), coll, this, SLOT(bindJumpKey()),
+ QKeySequence(bindModifier + Qt::Key_3)))->setProperty("Index", 3);
+ coll->addAction("BindJumpKey4", new Action(tr("Set Quick Access #4"), coll, this, SLOT(bindJumpKey()),
+ QKeySequence(bindModifier + Qt::Key_4)))->setProperty("Index", 4);
+ coll->addAction("BindJumpKey5", new Action(tr("Set Quick Access #5"), coll, this, SLOT(bindJumpKey()),
+ QKeySequence(bindModifier + Qt::Key_5)))->setProperty("Index", 5);
+ coll->addAction("BindJumpKey6", new Action(tr("Set Quick Access #6"), coll, this, SLOT(bindJumpKey()),
+ QKeySequence(bindModifier + Qt::Key_6)))->setProperty("Index", 6);
+ coll->addAction("BindJumpKey7", new Action(tr("Set Quick Access #7"), coll, this, SLOT(bindJumpKey()),
+ QKeySequence(bindModifier + Qt::Key_7)))->setProperty("Index", 7);
+ coll->addAction("BindJumpKey8", new Action(tr("Set Quick Access #8"), coll, this, SLOT(bindJumpKey()),
+ QKeySequence(bindModifier + Qt::Key_8)))->setProperty("Index", 8);
+ coll->addAction("BindJumpKey9", new Action(tr("Set Quick Access #9"), coll, this, SLOT(bindJumpKey()),
+ QKeySequence(bindModifier + Qt::Key_9)))->setProperty("Index", 9);
+
+ coll->addAction("JumpKey0", new Action(tr("Quick Access #0"), coll, this, SLOT(onJumpKey()),
+ QKeySequence(jumpModifier + Qt::Key_0)))->setProperty("Index", 0);
+ coll->addAction("JumpKey1", new Action(tr("Quick Access #1"), coll, this, SLOT(onJumpKey()),
+ QKeySequence(jumpModifier + Qt::Key_1)))->setProperty("Index", 1);
+ coll->addAction("JumpKey2", new Action(tr("Quick Access #2"), coll, this, SLOT(onJumpKey()),
+ QKeySequence(jumpModifier + Qt::Key_2)))->setProperty("Index", 2);
+ coll->addAction("JumpKey3", new Action(tr("Quick Access #3"), coll, this, SLOT(onJumpKey()),
+ QKeySequence(jumpModifier + Qt::Key_3)))->setProperty("Index", 3);
+ coll->addAction("JumpKey4", new Action(tr("Quick Access #4"), coll, this, SLOT(onJumpKey()),
+ QKeySequence(jumpModifier + Qt::Key_4)))->setProperty("Index", 4);
+ coll->addAction("JumpKey5", new Action(tr("Quick Access #5"), coll, this, SLOT(onJumpKey()),
+ QKeySequence(jumpModifier + Qt::Key_5)))->setProperty("Index", 5);
+ coll->addAction("JumpKey6", new Action(tr("Quick Access #6"), coll, this, SLOT(onJumpKey()),
+ QKeySequence(jumpModifier + Qt::Key_6)))->setProperty("Index", 6);
+ coll->addAction("JumpKey7", new Action(tr("Quick Access #7"), coll, this, SLOT(onJumpKey()),
+ QKeySequence(jumpModifier + Qt::Key_7)))->setProperty("Index", 7);
+ coll->addAction("JumpKey8", new Action(tr("Quick Access #8"), coll, this, SLOT(onJumpKey()),
+ QKeySequence(jumpModifier + Qt::Key_8)))->setProperty("Index", 8);
+ coll->addAction("JumpKey9", new Action(tr("Quick Access #9"), coll, this, SLOT(onJumpKey()),
+ QKeySequence(jumpModifier + Qt::Key_9)))->setProperty("Index", 9);
}
void MainWin::setupMenus() {
#ifdef HAVE_KDE
_settingsMenu->addAction(KStandardAction::configureNotifications(this, SLOT(showNotificationsDlg()), this));
_settingsMenu->addAction(KStandardAction::keyBindings(this, SLOT(showShortcutsDlg()), this));
+#else
+ _settingsMenu->addAction(coll->action("ConfigureShortcuts"));
#endif
_settingsMenu->addAction(coll->action("ConfigureQuassel"));
}
void MainWin::bufferViewToggled(bool enabled) {
+ if(!enabled && !isVisible()) {
+ // hiding the mainwindow triggers a toggle of the bufferview (which pretty much sucks big time)
+ // since this isn't our fault and we can't do anything about it, we suppress the resulting calls
+ return;
+ }
QAction *action = qobject_cast<QAction *>(sender());
Q_ASSERT(action);
BufferViewDock *dock = qobject_cast<BufferViewDock *>(action->parent());
if(enabled) {
Client::bufferViewOverlay()->addView(dock->bufferViewId());
- BufferViewConfig *config = dock->config();
- if(config && config->isInitialized()) {
- BufferIdList buffers;
- if(config->networkId().isValid()) {
- foreach(BufferId bufferId, config->bufferList()) {
- if(Client::networkModel()->networkId(bufferId) == config->networkId())
- buffers << bufferId;
- }
- foreach(BufferId bufferId, config->temporarilyRemovedBuffers().toList()) {
- if(Client::networkModel()->networkId(bufferId) == config->networkId())
- buffers << bufferId;
- }
- } else {
- buffers = BufferIdList::fromSet(config->bufferList().toSet() + config->temporarilyRemovedBuffers());
- }
- Client::backlogManager()->checkForBacklog(buffers);
- }
} else {
Client::bufferViewOverlay()->removeView(dock->bufferViewId());
}
}
void MainWin::setupSystray() {
-#ifndef QT_NO_SYSTEMTRAYICON
+#ifdef HAVE_DBUS
+ _systemTray = new StatusNotifierItem(this);
+#elif !defined QT_NO_SYSTEMTRAYICON
_systemTray = new LegacySystemTray(this);
#else
_systemTray = new SystemTray(this); // dummy
IrcConnectionWizard *wizard = new IrcConnectionWizard(this, Qt::Sheet);
wizard->show();
}
+ else {
+ QtUiSettings s;
+ BufferId lastUsedBufferId(s.value("LastUsedBufferId").toInt());
+ if(lastUsedBufferId.isValid())
+ Client::bufferModel()->switchToBuffer(lastUsedBufferId);
+ }
}
void MainWin::loadLayout() {
int accountId = Client::currentCoreAccount().accountId().toInt();
QByteArray state = s.value(QString("MainWinState-%1").arg(accountId)).toByteArray();
if(state.isEmpty()) {
- // Make sure that the default bufferview is shown
- if(_bufferViews.count())
- _bufferViews.at(0)->show();
+ foreach(BufferViewDock *view, _bufferViews)
+ view->show();
+ _layoutLoaded = true;
return;
}
void MainWin::saveLayout() {
QtUiSettings s;
- int accountId = Client::currentCoreAccount().accountId().toInt();
- if(accountId > 0) s.setValue(QString("MainWinState-%1").arg(accountId) , saveState(accountId));
+ int accountId = _bufferViews.count()? Client::currentCoreAccount().accountId().toInt() : 0; // only save if we still have a layout!
+ if(accountId > 0)
+ s.setValue(QString("MainWinState-%1").arg(accountId) , saveState(accountId));
}
void MainWin::disconnectedFromCore() {
if(dock && actionData.toInt() != -1) {
removeAction(action);
_bufferViews.removeAll(dock);
- Client::bufferViewOverlay()->removeView(dock->bufferViewId());
dock->deleteLater();
}
}
AboutDlg(this).exec();
}
-#ifdef HAVE_KDE
void MainWin::showShortcutsDlg() {
- KShortcutsDialog::configure(QtUi::actionCollection("General"), KShortcutsEditor::LetterShortcutsDisallowed);
-}
+#ifdef HAVE_KDE
+ KShortcutsDialog dlg(KShortcutsEditor::AllActions, KShortcutsEditor::LetterShortcutsDisallowed, this);
+ foreach(KActionCollection *coll, QtUi::actionCollections())
+ dlg.addCollection(coll, coll->property("Category").toString());
+ dlg.exec();
+#else
+ SettingsPageDlg dlg(new ShortcutsSettingsPage(QtUi::actionCollections(), this), this);
+ dlg.exec();
#endif
+}
/********************************************************************************************************/
if(event->type() == QEvent::WindowActivate) {
BufferId buffer = Client::bufferModel()->currentBuffer();
if(buffer.isValid())
- QtUi::closeNotifications(buffer);
+ Client::instance()->markBufferAsRead(buffer);
}
return QMainWindow::event(event);
}
else
type = AbstractNotificationBackend::HighlightFocused;
- QtUi::invokeNotification(bufId, type, sender, contents);
+ QtUi::instance()->invokeNotification(bufId, type, sender, contents);
}
}
}
void MainWin::currentBufferChanged(BufferId buffer) {
if(buffer.isValid())
- QtUi::closeNotifications(buffer);
+ Client::instance()->markBufferAsRead(buffer);
}
void MainWin::clientNetworkCreated(NetworkId id) {
Client::bufferModel()->switchToBuffer(bufferId);
}
+void MainWin::onJumpKey() {
+ QAction *action = qobject_cast<QAction *>(sender());
+ if(!action || !Client::bufferModel())
+ return;
+ int idx = action->property("Index").toInt();
+
+ if(_jumpKeyMap.isEmpty())
+ _jumpKeyMap = CoreAccountSettings().jumpKeyMap();
+
+ if(!_jumpKeyMap.contains(idx))
+ return;
+
+ BufferId buffer = _jumpKeyMap.value(idx);
+ if(buffer.isValid())
+ Client::bufferModel()->switchToBuffer(buffer);
+
+}
+
+void MainWin::bindJumpKey() {
+ QAction *action = qobject_cast<QAction *>(sender());
+ if(!action || !Client::bufferModel())
+ return;
+ int idx = action->property("Index").toInt();
+
+ _jumpKeyMap[idx] = Client::bufferModel()->currentBuffer();
+ CoreAccountSettings().setJumpKeyMap(_jumpKeyMap);
+}
+
void MainWin::on_actionDebugNetworkModel_triggered() {
QTreeView *view = new QTreeView;
view->setAttribute(Qt::WA_DeleteOnClose);
void MainWin::showStatusBarMessage(const QString &message) {
statusBar()->showMessage(message, 10000);
}
-
projects / quassel.git / blobdiff