msgProcessorStatusWidget(new MsgProcessorStatusWidget()),
_titleSetter(this),
- systray(new QSystemTrayIcon(this)),
+ _trayIcon(new QSystemTrayIcon(this)),
- activeTrayIcon("quassel_newmessage"),
- onlineTrayIcon("quassel"),
- offlineTrayIcon("quassel_disconnected"),
+ activeTrayIcon(DesktopIcon("quassel_newmessage", IconLoader::SizeEnormous)),
+ onlineTrayIcon(DesktopIcon("quassel", IconLoader::SizeEnormous)),
+ offlineTrayIcon(DesktopIcon("quassel_disconnected", IconLoader::SizeEnormous)),
trayIconActive(false),
timer(new QTimer(this)),
setWindowTitle("Quassel IRC");
setWindowIcon(offlineTrayIcon);
qApp->setWindowIcon(offlineTrayIcon);
- systray->setIcon(offlineTrayIcon);
+ systemTrayIcon()->setIcon(offlineTrayIcon);
setWindowIconText("Quassel IRC");
QtUi::actionCollection()->addAssociatedWidget(this);
}
void MainWin::setupActions() {
-
-
+ // TODO don't get these from *.ui anymore... we shouldn't need one
+ ui.actionQuit->setIcon(SmallIcon("application-exit"));
+ ui.actionSettingsDlg->setIcon(SmallIcon("configure"));
+ ui.actionManageViews->setIcon(SmallIcon("view-tree"));
+ ui.actionManageViews2->setIcon(SmallIcon("view-tree"));
+ ui.actionAboutQt->setIcon(SmallIcon("qt"));
+ ui.actionAboutQuassel->setIcon(SmallIcon("quassel"));
+ ui.actionConnectCore->setIcon(SmallIcon("network-connect"));
+ ui.actionDisconnectCore->setIcon(SmallIcon("network-disconnect"));
+ ui.actionCoreInfo->setIcon(SmallIcon("help-about"));
}
void MainWin::setupMenus() {
systrayMenu->addSeparator();
systrayMenu->addAction(ui.actionQuit);
- systray->setContextMenu(systrayMenu);
+ systemTrayIcon()->setContextMenu(systrayMenu);
UiSettings s;
if(s.value("UseSystemTrayIcon", QVariant(true)).toBool()) {
- systray->show();
+ systemTrayIcon()->show();
}
#ifndef Q_WS_MAC
- connect(systray, SIGNAL(activated( QSystemTrayIcon::ActivationReason )),
+ connect(systemTrayIcon(), SIGNAL(activated( QSystemTrayIcon::ActivationReason )),
this, SLOT(systrayActivated( QSystemTrayIcon::ActivationReason )));
#endif
statusBar()->showMessage(tr("Connected to core."));
setWindowIcon(onlineTrayIcon);
qApp->setWindowIcon(onlineTrayIcon);
- systray->setIcon(onlineTrayIcon);
+ systemTrayIcon()->setIcon(onlineTrayIcon);
if(sslLabel->width() == 0)
sslLabel->setPixmap(SmallIcon("security-low"));
}
statusBar()->showMessage(tr("Not connected to core."));
setWindowIcon(offlineTrayIcon);
qApp->setWindowIcon(offlineTrayIcon);
- systray->setIcon(offlineTrayIcon);
+ systemTrayIcon()->setIcon(offlineTrayIcon);
sslLabel->setPixmap(QPixmap());
}
// setFocus(); //Qt::ActiveWindowFocusReason
} else {
- if(systray->isSystemTrayAvailable ()) {
+ if(systemTrayIcon()->isSystemTrayAvailable ()) {
clearFocus();
hide();
- if(!systray->isVisible()) {
- systray->show();
+ if(!systemTrayIcon()->isVisible()) {
+ systemTrayIcon()->show();
}
} else {
lower();
#endif /* HAVE_DBUS */
void MainWin::displayTrayIconMessage(const QString &title, const QString &message) {
- systray->showMessage(title, message);
+ systemTrayIcon()->showMessage(title, message);
}
void MainWin::setTrayIconActivity(bool active) {
timer->start(500);
} else {
timer->stop();
- systray->setIcon(onlineTrayIcon);
+ systemTrayIcon()->setIcon(onlineTrayIcon);
}
}
void MainWin::makeTrayIconBlink() {
if(trayIconActive) {
- systray->setIcon(onlineTrayIcon);
+ systemTrayIcon()->setIcon(onlineTrayIcon);
trayIconActive = false;
} else {
- systray->setIcon(activeTrayIcon);
+ systemTrayIcon()->setIcon(activeTrayIcon);
trayIconActive = true;
}
}