X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.h;h=49e4cef4c802a2bbd01145d18332bc9c8aa4607c;hp=8caa8b3c4a2bf65adc2550c63ff4b1d686284892;hb=d24dd043d52af12e0ad68625ca0c9a9ec16fc8e1;hpb=67a80c804797ba432378ad6b81fc82b1aa0d9a1d diff --git a/src/qtui/mainwin.h b/src/qtui/mainwin.h index 8caa8b3c..49e4cef4 100644 --- a/src/qtui/mainwin.h +++ b/src/qtui/mainwin.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-09 by the Quassel Project * + * Copyright (C) 2005-2014 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the * * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ #ifndef MAINWIN_H_ @@ -27,12 +27,6 @@ # include #endif -#ifdef Q_WS_WIN -# include -#endif - -#include - #include "qtui.h" #include "titlesetter.h" #include "uisettings.h" @@ -42,6 +36,7 @@ class BufferHotListFilter; class BufferView; class BufferViewConfig; class ClientBufferViewConfig; +class ClientTransfer; class CoreAccount; class CoreConnectionStatusWidget; class BufferViewDock; @@ -50,6 +45,8 @@ class InputWidget; class MsgProcessorStatusWidget; class NickListWidget; class SystemTray; +class ChatMonitorView; +class TopicWidget; class QMenu; class QLabel; @@ -60,13 +57,14 @@ class KHelpMenu; //!\brief The main window of Quassel's QtUi. class MainWin #ifdef HAVE_KDE -: public KMainWindow { + : public KMainWindow +{ #else : public QMainWindow { #endif - Q_OBJECT + Q_OBJECT - public: +public: MainWin(QWidget *parent = 0); virtual ~MainWin(); @@ -74,10 +72,10 @@ class MainWin void addBufferView(ClientBufferViewConfig *config); BufferView *allBuffersView() const; + BufferView *activeBufferView() const; - BufferWidget *bufferWidget() const { return _bufferWidget; } - - inline SystemTray *systemTray() const; + inline BufferWidget *bufferWidget() const { return _bufferWidget; } + inline SystemTray *systemTray() const { return _systemTray; } bool event(QEvent *event); @@ -87,30 +85,29 @@ class MainWin void saveStateToSettings(UiSettings &); void restoreStateFromSettings(UiSettings &); - public slots: +public slots: void showStatusBarMessage(const QString &message); - - void toggleMinimizedToTray(); - - //! Bring window to front and focus it - void forceActivated(); + void hideCurrentBuffer(); + void nextBufferView(); //!< Activate the next bufferview + void previousBufferView(); //!< Activate the previous bufferview + void nextBuffer(); + void previousBuffer(); //! Quit application void quit(); - protected: +protected: void closeEvent(QCloseEvent *event); - void changeEvent(QEvent *event); void moveEvent(QMoveEvent *event); void resizeEvent(QResizeEvent *event); - protected slots: +protected slots: void connectedToCore(); void setConnectedState(); void disconnectedFromCore(); void setDisconnectedState(); - private slots: +private slots: void addBufferView(int bufferViewConfigId); void awayLogDestroyed(); void removeBufferView(int bufferViewConfigId); @@ -119,14 +116,16 @@ class MainWin void showAboutDlg(); void showChannelList(NetworkId netId = NetworkId()); void showCoreConnectionDlg(); + void showCoreConfigWizard(const QVariantList &); void showCoreInfoDlg(); void showAwayLog(); void showSettingsDlg(); void showNotificationsDlg(); void showIgnoreList(QString newRule = QString()); -#ifdef HAVE_KDE void showShortcutsDlg(); -#endif + void showNewTransferDlg(const ClientTransfer *transfer); + void onFullScreenToggled(); + void handleCoreConnectionError(const QString &errorMsg); void userAuthenticationRequired(CoreAccount *, bool *valid, const QString &errorMessage); void handleNoSslInClient(bool *accepted); @@ -145,6 +144,9 @@ class MainWin void on_actionDebugHotList_triggered(); void on_actionDebugLog_triggered(); + void bindJumpKey(); + void onJumpKey(); + void clientNetworkCreated(NetworkId); void clientNetworkRemoved(NetworkId); void clientNetworkUpdated(); @@ -152,23 +154,30 @@ class MainWin void saveMenuBarStatus(bool enabled); void saveStatusBarStatus(bool enabled); +#ifdef Q_WS_MAC + void saveMainToolBarStatus(bool enabled); +#endif void loadLayout(); void saveLayout(); void bufferViewToggled(bool enabled); + void bufferViewVisibilityChanged(bool visible); + void changeActiveBufferView(bool backwards); + void changeActiveBufferView(int bufferViewId); - signals: +signals: void connectToCore(const QVariantMap &connInfo); void disconnectFromCore(); - private: +private: #ifdef HAVE_KDE KHelpMenu *_kHelpMenu; #endif MsgProcessorStatusWidget *_msgProcessorStatusWidget; CoreConnectionStatusWidget *_coreConnectionStatusWidget; + SystemTray *_systemTray; TitleSetter _titleSetter; @@ -179,6 +188,7 @@ class MainWin void setupChatMonitor(); void setupInputWidget(); void setupTopicWidget(); + void setupViewMenuTail(); void setupStatusBar(); void setupSystray(); void setupTitleSetter(); @@ -188,14 +198,12 @@ class MainWin void updateIcon(); void enableMenus(); - void hideToTray(); - - SystemTray *_systemTray; - QList _bufferViews; BufferWidget *_bufferWidget; NickListWidget *_nickListWidget; InputWidget *_inputWidget; + ChatMonitorView *_chatMonitorView; + TopicWidget *_topicWidget; QMenu *_fileMenu, *_networksMenu, *_viewMenu, *_bufferViewsMenu, *_settingsMenu, *_helpMenu, *_helpDebugMenu; QMenu *_toolbarMenu; @@ -208,17 +216,12 @@ class MainWin QSize _normalSize; //!< Size of the non-maximized window QPoint _normalPos; //!< Position of the non-maximized window -#ifdef Q_WS_WIN - DWORD dwTickCount; -#endif - BufferHotListFilter *_bufferHotList; + QHash _jumpKeyMap; + int _activeBufferViewIndex; friend class QtUi; }; -SystemTray *MainWin::systemTray() const { - return _systemTray; -} #endif