projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pressing enter in the topic line now sets the channel topic.
[quassel.git]
/
src
/
qtui
/
mainwin.h
diff --git
a/src/qtui/mainwin.h
b/src/qtui/mainwin.h
index
a78832d
..
57c8bb3
100644
(file)
--- a/
src/qtui/mainwin.h
+++ b/
src/qtui/mainwin.h
@@
-53,7
+53,6
@@
class MainWin : public QMainWindow {
protected:
void closeEvent(QCloseEvent *event);
virtual void changeEvent(QEvent *event);
protected:
void closeEvent(QCloseEvent *event);
virtual void changeEvent(QEvent *event);
- virtual void keyPressEvent(QKeyEvent *event);
protected slots:
void connectedToCore();
protected slots:
void connectedToCore();
@@
-63,6
+62,7
@@
class MainWin : public QMainWindow {
private slots:
void showSettingsDlg();
void showNetworkDlg();
private slots:
void showSettingsDlg();
void showNetworkDlg();
+ void showAboutDlg();
void showDebugConsole();
void showCoreConnectionDlg(bool autoConnect = false);
void showDebugConsole();
void showCoreConnectionDlg(bool autoConnect = false);
@@
-73,6
+73,8
@@
class MainWin : public QMainWindow {
void clientNetworkUpdated();
void connectOrDisconnectFromNet();
void clientNetworkUpdated();
void connectOrDisconnectFromNet();
+ void changeTopic(const QString &topic);
+
signals:
void connectToCore(const QVariantMap &connInfo);
void disconnectFromCore();
signals:
void connectToCore(const QVariantMap &connInfo);
void disconnectFromCore();
@@
-98,14
+100,11
@@
class MainWin : public QMainWindow {
void enableMenus();
void enableMenus();
- void bindKey(int key);
- void jumpKey(int key);
-
- QHash<int, BufferId> _keyboardJump;
QSystemTrayIcon *systray;
CoreConnectDlg *coreConnectDlg;
SettingsDlg *settingsDlg;
QSystemTrayIcon *systray;
CoreConnectDlg *coreConnectDlg;
SettingsDlg *settingsDlg;
+ DebugConsole *debugConsole;
BufferId currentBuffer;
QString currentProfile;
BufferId currentBuffer;
QString currentProfile;
@@
-117,7
+116,6
@@
class MainWin : public QMainWindow {
QAction *actionEditNetworks;
QList<QAction *> networkActions;
QAction *actionEditNetworks;
QList<QAction *> networkActions;
- DebugConsole *debugConsole;
friend class QtUi;
};
friend class QtUi;
};