projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Another try...
[quassel.git]
/
src
/
qtui
/
mainwin.h
diff --git
a/src/qtui/mainwin.h
b/src/qtui/mainwin.h
index
277e4e8
..
40764f3
100644
(file)
--- a/
src/qtui/mainwin.h
+++ b/
src/qtui/mainwin.h
@@
-52,7
+52,7
@@
class MainWin : public QMainWindow {
protected:
void closeEvent(QCloseEvent *event);
protected:
void closeEvent(QCloseEvent *event);
- virtual void
keyPressEvent(QKey
Event *event);
+ virtual void
changeEvent(Q
Event *event);
protected slots:
void connectedToCore();
protected slots:
void connectedToCore();
@@
-60,9
+60,9
@@
class MainWin : public QMainWindow {
void systrayActivated( QSystemTrayIcon::ActivationReason );
private slots:
void systrayActivated( QSystemTrayIcon::ActivationReason );
private slots:
-
void showSettingsDlg();
void showNetworkDlg();
void showSettingsDlg();
void showNetworkDlg();
+ void showAboutDlg();
void showDebugConsole();
void showCoreConnectionDlg(bool autoConnect = false);
void showDebugConsole();
void showCoreConnectionDlg(bool autoConnect = false);
@@
-82,6
+82,8
@@
class MainWin : public QMainWindow {
Ui::MainWin ui;
QtUi *gui;
Ui::MainWin ui;
QtUi *gui;
+ QMenu *systrayMenu;
+
void setupMenus();
void setupViews();
void setupNickWidget();
void setupMenus();
void setupViews();
void setupNickWidget();
@@
-92,13
+94,15
@@
class MainWin : public QMainWindow {
void setupSettingsDlg();
void setupSettingsDlg();
+ void toggleVisibility();
+
void enableMenus();
void enableMenus();
- QHash<int, QModelIndex> _keyboardJump;
QSystemTrayIcon *systray;
CoreConnectDlg *coreConnectDlg;
SettingsDlg *settingsDlg;
QSystemTrayIcon *systray;
CoreConnectDlg *coreConnectDlg;
SettingsDlg *settingsDlg;
+ DebugConsole *debugConsole;
BufferId currentBuffer;
QString currentProfile;
BufferId currentBuffer;
QString currentProfile;
@@
-110,7
+114,6
@@
class MainWin : public QMainWindow {
QAction *actionEditNetworks;
QList<QAction *> networkActions;
QAction *actionEditNetworks;
QList<QAction *> networkActions;
- DebugConsole *debugConsole;
friend class QtUi;
};
friend class QtUi;
};