projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added a useful popup to the topic bar. Should probably be beautified though...
[quassel.git]
/
src
/
qtui
/
mainwin.h
diff --git
a/src/qtui/mainwin.h
b/src/qtui/mainwin.h
index
32bf286
..
a317c77
100644
(file)
--- a/
src/qtui/mainwin.h
+++ b/
src/qtui/mainwin.h
@@
-63,6
+63,7
@@
class MainWin : public QMainWindow {
protected slots:
void connectedToCore();
protected slots:
void connectedToCore();
+ void securedConnection();
void disconnectedFromCore();
void systrayActivated( QSystemTrayIcon::ActivationReason );
void disconnectedFromCore();
void systrayActivated( QSystemTrayIcon::ActivationReason );
@@
-94,6
+95,7
@@
class MainWin : public QMainWindow {
QtUi *gui;
QMenu *systrayMenu;
QtUi *gui;
QMenu *systrayMenu;
+ QLabel *sslLabel;
void setupMenus();
void setupViews();
void setupMenus();
void setupViews();
@@
-111,7
+113,8
@@
class MainWin : public QMainWindow {
QSystemTrayIcon *systray;
QIcon activeTrayIcon;
QSystemTrayIcon *systray;
QIcon activeTrayIcon;
- QIcon inactiveTrayIcon;
+ QIcon onlineTrayIcon;
+ QIcon offlineTrayIcon;
bool trayIconActive;
QTimer *timer;
bool trayIconActive;
QTimer *timer;
@@
-123,7
+126,6
@@
class MainWin : public QMainWindow {
QString currentProfile;
QList<QDockWidget *> netViews;
QString currentProfile;
QList<QDockWidget *> netViews;
- QDockWidget *nickDock;
NickListWidget *nickListWidget;
QAction *actionEditNetworks;
NickListWidget *nickListWidget;
QAction *actionEditNetworks;