#include "mainwin.h"
#include "aboutdlg.h"
+#include "action.h"
+#include "actioncollection.h"
#include "bufferview.h"
#include "bufferviewconfig.h"
#include "bufferviewfilter.h"
#include "settingspages/networkssettingspage.h"
#include "settingspages/notificationssettingspage.h"
-#include "global.h"
#include "qtuistyle.h"
MainWin::MainWin(QWidget *parent)
offlineTrayIcon(":/icons/quassel-icon-offline.png"),
trayIconActive(false),
- timer(new QTimer(this))
+ timer(new QTimer(this)),
+ _actionCollection(new ActionCollection(this))
{
UiSettings uiSettings;
QString style = uiSettings.value("Style", QString("")).toString();
systray->setIcon(offlineTrayIcon);
setWindowIconText("Quassel IRC");
+ QtUi::actionCollection()->addAssociatedWidget(this);
+
statusBar()->showMessage(tr("Waiting for core..."));
installEventFilter(new JumpKeyHandler(this));
connect(desktopNotifications, SIGNAL(NotificationClosed(uint, uint)), this, SLOT(desktopNotificationClosed(uint, uint)));
connect(desktopNotifications, SIGNAL(ActionInvoked(uint, const QString&)), this, SLOT(desktopNotificationInvoked(uint, const QString&)));
#endif
- QtUiApplication* app = dynamic_cast<QtUiApplication*> qApp;
+ QtUiApplication* app = qobject_cast<QtUiApplication*> qApp;
connect(app, SIGNAL(saveStateToSession(const QString&)), this, SLOT(saveStateToSession(const QString&)));
connect(app, SIGNAL(saveStateToSessionSettings(SessionSettings&)), this, SLOT(saveStateToSessionSettings(SessionSettings&)));
}
setCorner(Qt::BottomRightCorner, Qt::RightDockWidgetArea);
// setup stuff...
+ setupActions();
setupMenus();
setupViews();
setupNickWidget();
// attach the BufferWidget to the BufferModel and the default selection
ui.bufferWidget->setModel(Client::bufferModel());
ui.bufferWidget->setSelectionModel(Client::bufferModel()->standardSelectionModel());
- ui.menuViews->addAction(ui.bufferWidget->searchBar()->toggleViewAction());
+ ui.menuViews->addAction(QtUi::actionCollection()->action("toggleSearchBar"));
_titleSetter.setModel(Client::bufferModel());
_titleSetter.setSelectionModel(Client::bufferModel()->standardSelectionModel());
s.setValue("MainWinState", saveState());
}
+void MainWin::setupActions() {
+
+
+}
+
void MainWin::setupMenus() {
connect(ui.actionConnectCore, SIGNAL(triggered()), this, SLOT(showCoreConnectionDlg()));
connect(ui.actionDisconnectCore, SIGNAL(triggered()), Client::instance(), SLOT(disconnectFromCore()));
void MainWin::saveStateToSession(const QString &sessionId) {
return;
SessionSettings s(sessionId);
-
+
s.setValue("MainWinSize", size());
s.setValue("MainWinPos", pos());
s.setValue("MainWinState", saveState());