projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Trying to fix some CoreConnectDlg layout issues...
[quassel.git]
/
src
/
qtui
/
mainwin.h
diff --git
a/src/qtui/mainwin.h
b/src/qtui/mainwin.h
index
3a3be26
..
0e915cf
100644
(file)
--- a/
src/qtui/mainwin.h
+++ b/
src/qtui/mainwin.h
@@
-52,6
+52,8
@@
class MainWin : public QMainWindow {
protected:
void closeEvent(QCloseEvent *event);
protected:
void closeEvent(QCloseEvent *event);
+ virtual void changeEvent(QEvent *event);
+ virtual void keyPressEvent(QKeyEvent *event);
protected slots:
void connectedToCore();
protected slots:
void connectedToCore();
@@
-59,35
+61,48
@@
class MainWin : public QMainWindow {
void systrayActivated( QSystemTrayIcon::ActivationReason );
private slots:
void systrayActivated( QSystemTrayIcon::ActivationReason );
private slots:
-
void showSettingsDlg();
void showSettingsDlg();
+ void showNetworkDlg();
+ void showAboutDlg();
void showDebugConsole();
void showDebugConsole();
+
void showCoreConnectionDlg(bool autoConnect = false);
void coreConnectionDlgFinished(int result);
void showCoreConnectionDlg(bool autoConnect = false);
void coreConnectionDlgFinished(int result);
- void disconnectFromNet();
+ void clientNetworkCreated(NetworkId);
+ void clientNetworkRemoved(NetworkId);
+ void clientNetworkUpdated();
+ void connectOrDisconnectFromNet();
signals:
void connectToCore(const QVariantMap &connInfo);
void disconnectFromCore();
signals:
void connectToCore(const QVariantMap &connInfo);
void disconnectFromCore();
- void disconnectFromNetwork(NetworkId);
void requestBacklog(BufferInfo, QVariant, QVariant);
private:
Ui::MainWin ui;
QtUi *gui;
void requestBacklog(BufferInfo, QVariant, QVariant);
private:
Ui::MainWin ui;
QtUi *gui;
+ QMenu *systrayMenu;
+
void setupMenus();
void setupViews();
void setupNickWidget();
void setupChatMonitor();
void setupInputWidget();
void setupTopicWidget();
void setupMenus();
void setupViews();
void setupNickWidget();
void setupChatMonitor();
void setupInputWidget();
void setupTopicWidget();
-
+ void setupSystray();
+
void setupSettingsDlg();
void setupSettingsDlg();
+ void toggleVisibility();
+
void enableMenus();
void enableMenus();
+ void bindKey(int key);
+ void jumpKey(int key);
+
+ QHash<int, BufferId> _keyboardJump;
QSystemTrayIcon *systray;
CoreConnectDlg *coreConnectDlg;
QSystemTrayIcon *systray;
CoreConnectDlg *coreConnectDlg;
@@
-100,6
+115,9
@@
class MainWin : public QMainWindow {
QDockWidget *nickDock;
NickListWidget *nickListWidget;
QDockWidget *nickDock;
NickListWidget *nickListWidget;
+ QAction *actionEditNetworks;
+ QList<QAction *> networkActions;
+
DebugConsole *debugConsole;
friend class QtUi;
};
DebugConsole *debugConsole;
friend class QtUi;
};