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)));
setupMenus();
setupViews();
setupNickWidget();
+ setupTopicWidget();
setupChatMonitor();
setupInputWidget();
- setupTopicWidget();
setupSystray();
dock->show();
addDockWidget(Qt::LeftDockWidgetArea, dock);
+
ui.menuViews->addAction(dock->toggleViewAction());
netViews.append(dock);
nickDock->setWidget(nickListWidget);
addDockWidget(Qt::RightDockWidgetArea, nickDock);
+
ui.menuViews->addAction(nickDock->toggleViewAction());
Client::bufferModel()->mapProperty(0, NetworkModel::BufferIdRole, nickListWidget, "currentBuffer");
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");
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);
systray->setContextMenu(systrayMenu);
- QtUiSettings s;
- if(s.value("UseSystemTrayIcon").toBool()) {
+ UiSettings s;
+ if(s.value("UseSystemTrayIcon", QVariant(true)).toBool()) {
systray->show();
}
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);
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();
}
void MainWin::closeEvent(QCloseEvent *event) {
- QtUiSettings s;
+ UiSettings s;
if(s.value("UseSystemTrayIcon").toBool() && s.value("MinimizeOnClose").toBool()) {
toggleVisibility();
event->ignore();
}
void MainWin::toggleVisibility() {
- if(isHidden() || !isActiveWindow()) {
+ if(isHidden() /*|| !isActiveWindow()*/) {
show();
if(isMinimized())
if (isMaximized())
showNormal();
raise();
- activateWindow();
+ setFocus(Qt::ActiveWindowFocusReason);
+ // activateWindow();
} else {
if(systray->isSystemTrayAvailable ()) {
+ clearFocus();
hide();
if(!systray->isVisible()) {
systray->show();