projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixes #484 - issues with ssl status indicator
[quassel.git]
/
src
/
qtui
/
mainwin.h
diff --git
a/src/qtui/mainwin.h
b/src/qtui/mainwin.h
index
a20a8af
..
e3fdb61
100644
(file)
--- a/
src/qtui/mainwin.h
+++ b/
src/qtui/mainwin.h
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-0
8
by the Quassel Project *
+ * Copyright (C) 2005-0
9
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-38,6
+38,7
@@
class BufferView;
class BufferViewConfig;
class BufferViewDock;
class BufferWidget;
class BufferViewConfig;
class BufferViewDock;
class BufferWidget;
+class InputWidget;
class MsgProcessorStatusWidget;
class NickListWidget;
class SystemTrayIcon;
class MsgProcessorStatusWidget;
class NickListWidget;
class SystemTrayIcon;
@@
-62,7
+63,7
@@
class MainWin
void init();
void init();
- void addBufferView(BufferViewConfig *config
= 0
);
+ void addBufferView(BufferViewConfig *config);
BufferView *allBuffersView() const;
inline QSystemTrayIcon *systemTrayIcon() const;
BufferView *allBuffersView() const;
inline QSystemTrayIcon *systemTrayIcon() const;
@@
-84,8
+85,7
@@
class MainWin
protected slots:
void connectedToCore();
void setConnectedState();
protected slots:
void connectedToCore();
void setConnectedState();
- void updateLagIndicator(int lag);
- void securedConnection();
+ void updateLagIndicator(int lag = -1);
void disconnectedFromCore();
void setDisconnectedState();
void systrayActivated(QSystemTrayIcon::ActivationReason);
void disconnectedFromCore();
void setDisconnectedState();
void systrayActivated(QSystemTrayIcon::ActivationReason);
@@
-96,6
+96,7
@@
class MainWin
void messagesInserted(const QModelIndex &parent, int start, int end);
void showAboutDlg();
void showChannelList(NetworkId netId = NetworkId());
void messagesInserted(const QModelIndex &parent, int start, int end);
void showAboutDlg();
void showChannelList(NetworkId netId = NetworkId());
+ void startInternalCore();
void showCoreConnectionDlg(bool autoConnect = false);
void showCoreInfoDlg();
void showSettingsDlg();
void showCoreConnectionDlg(bool autoConnect = false);
void showCoreInfoDlg();
void showSettingsDlg();
@@
-139,7
+140,6
@@
class MainWin
void setupActions();
void setupBufferWidget();
void setupMenus();
void setupActions();
void setupBufferWidget();
void setupMenus();
- void setupViews();
void setupNickWidget();
void setupChatMonitor();
void setupInputWidget();
void setupNickWidget();
void setupChatMonitor();
void setupInputWidget();
@@
-157,6
+157,7
@@
class MainWin
QList<BufferViewDock *> _bufferViews;
BufferWidget *_bufferWidget;
NickListWidget *_nickListWidget;
QList<BufferViewDock *> _bufferViews;
BufferWidget *_bufferWidget;
NickListWidget *_nickListWidget;
+ InputWidget *_inputWidget;
QMenu *_fileMenu, *_networksMenu, *_viewMenu, *_bufferViewsMenu, *_settingsMenu, *_helpMenu, *_helpDebugMenu;
QMenu *_fileMenu, *_networksMenu, *_viewMenu, *_bufferViewsMenu, *_settingsMenu, *_helpMenu, *_helpDebugMenu;