projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
some minor fixes:
[quassel.git]
/
src
/
qtui
/
mainwin.cpp
diff --git
a/src/qtui/mainwin.cpp
b/src/qtui/mainwin.cpp
index
1d2aeb9
..
925c64f
100644
(file)
--- a/
src/qtui/mainwin.cpp
+++ b/
src/qtui/mainwin.cpp
@@
-25,11
+25,6
@@
#include "bufferviewconfig.h"
#include "bufferviewfilter.h"
#include "bufferviewmanager.h"
#include "bufferviewconfig.h"
#include "bufferviewfilter.h"
#include "bufferviewmanager.h"
-#ifdef SPUTDEV
-# include "chatline.h"
-#else
-# include "chatline-old.h"
-#endif
#include "client.h"
#include "clientbacklogmanager.h"
#include "coreconnectdlg.h"
#include "client.h"
#include "clientbacklogmanager.h"
#include "coreconnectdlg.h"
@@
-83,6
+78,7
@@
MainWin::MainWin(QtUi *_gui, QWidget *parent)
ui.setupUi(this);
setWindowTitle("Quassel IRC");
setWindowIcon(offlineTrayIcon);
ui.setupUi(this);
setWindowTitle("Quassel IRC");
setWindowIcon(offlineTrayIcon);
+ qApp->setWindowIcon(offlineTrayIcon);
systray->setIcon(offlineTrayIcon);
setWindowIconText("Quassel IRC");
systray->setIcon(offlineTrayIcon);
setWindowIconText("Quassel IRC");
@@
-424,6
+420,7
@@
void MainWin::setConnectedState() {
ui.bufferWidget->show();
statusBar()->showMessage(tr("Connected to core."));
setWindowIcon(onlineTrayIcon);
ui.bufferWidget->show();
statusBar()->showMessage(tr("Connected to core."));
setWindowIcon(onlineTrayIcon);
+ qApp->setWindowIcon(onlineTrayIcon);
systray->setIcon(onlineTrayIcon);
if(sslLabel->width() == 0)
sslLabel->setPixmap(QPixmap::fromImage(QImage(":/16x16/status/no-ssl")));
systray->setIcon(onlineTrayIcon);
if(sslLabel->width() == 0)
sslLabel->setPixmap(QPixmap::fromImage(QImage(":/16x16/status/no-ssl")));
@@
-482,6
+479,7
@@
void MainWin::setDisconnectedState() {
// nickListWidget->reset();
statusBar()->showMessage(tr("Not connected to core."));
setWindowIcon(offlineTrayIcon);
// nickListWidget->reset();
statusBar()->showMessage(tr("Not connected to core."));
setWindowIcon(offlineTrayIcon);
+ qApp->setWindowIcon(offlineTrayIcon);
systray->setIcon(offlineTrayIcon);
sslLabel->setPixmap(QPixmap());
}
systray->setIcon(offlineTrayIcon);
sslLabel->setPixmap(QPixmap());
}
@@
-522,7
+520,7
@@
void MainWin::closeEvent(QCloseEvent *event) {
}
void MainWin::systrayActivated( QSystemTrayIcon::ActivationReason activationReason) {
}
void MainWin::systrayActivated( QSystemTrayIcon::ActivationReason activationReason) {
- if
(activationReason == QSystemTrayIcon::Trigger) {
+ if(activationReason == QSystemTrayIcon::Trigger) {
toggleVisibility();
}
}
toggleVisibility();
}
}
@@
-530,11
+528,12
@@
void MainWin::systrayActivated( QSystemTrayIcon::ActivationReason activationReas
void MainWin::toggleVisibility() {
if(isHidden() /*|| !isActiveWindow()*/) {
show();
void MainWin::toggleVisibility() {
if(isHidden() /*|| !isActiveWindow()*/) {
show();
- if(isMinimized())
- if
(isMaximized())
+ if(isMinimized())
{
+ if(isMaximized())
showMaximized();
else
showNormal();
showMaximized();
else
showNormal();
+ }
raise();
activateWindow();
raise();
activateWindow();
@@
-569,12
+568,13
@@
void MainWin::receiveMessage(const Message &msg) {
UiSettings uiSettings;
UiSettings uiSettings;
+#ifndef SPUTDEV
if(uiSettings.value("DisplayPopupMessages", QVariant(true)).toBool()) {
// FIXME don't invoke style engine for this!
if(uiSettings.value("DisplayPopupMessages", QVariant(true)).toBool()) {
// FIXME don't invoke style engine for this!
- QString text = QtUi::style()->styleString(Message::mircToInternal(msg.
text())).t
ext;
+ QString text = QtUi::style()->styleString(Message::mircToInternal(msg.
contents())).plainT
ext;
displayTrayIconMessage(title, text);
}
displayTrayIconMessage(title, text);
}
-
+#endif
if(uiSettings.value("AnimateTrayIcon", QVariant(true)).toBool()) {
QApplication::alert(this);
setTrayIconActivity(true);
if(uiSettings.value("AnimateTrayIcon", QVariant(true)).toBool()) {
QApplication::alert(this);
setTrayIconActivity(true);