X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.h;h=445b1d4e42830bdd9df9bab7ead532d9cbf7cd79;hp=9807550c2d7daff5b1c776b3c617742241ccab5a;hb=2088ce3b27f71c7c7e4f91d8f2428f7ccecf4074;hpb=3efffa2c3f687b21c8040e9a7ee3830e8f539abf diff --git a/src/qtui/mainwin.h b/src/qtui/mainwin.h index 9807550c..445b1d4e 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-2015 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -15,22 +15,19 @@ * 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_ -#define MAINWIN_H_ +#pragma once -#ifdef HAVE_KDE +#ifdef HAVE_KDE4 # include +#elif defined HAVE_KF5 +# include #else # include #endif -#ifdef Q_WS_WIN -# include -#endif - #include "qtui.h" #include "titlesetter.h" #include "uisettings.h" @@ -40,6 +37,7 @@ class BufferHotListFilter; class BufferView; class BufferViewConfig; class ClientBufferViewConfig; +class ClientTransfer; class CoreAccount; class CoreConnectionStatusWidget; class BufferViewDock; @@ -49,6 +47,7 @@ class MsgProcessorStatusWidget; class NickListWidget; class SystemTray; class ChatMonitorView; +class TopicWidget; class QMenu; class QLabel; @@ -59,13 +58,13 @@ class KHelpMenu; //!\brief The main window of Quassel's QtUi. class MainWin #ifdef HAVE_KDE -: public KMainWindow { + : public KMainWindow { #else -: public QMainWindow { + : public QMainWindow { #endif - Q_OBJECT + Q_OBJECT - public: +public: MainWin(QWidget *parent = 0); virtual ~MainWin(); @@ -73,12 +72,10 @@ class MainWin void addBufferView(ClientBufferViewConfig *config); BufferView *allBuffersView() const; + BufferView *activeBufferView() const; inline BufferWidget *bufferWidget() const { return _bufferWidget; } - -#ifndef QT_NO_SYSTEMTRAYICON inline SystemTray *systemTray() const { return _systemTray; } -#endif bool event(QEvent *event); @@ -88,32 +85,29 @@ class MainWin void saveStateToSettings(UiSettings &); void restoreStateFromSettings(UiSettings &); - public slots: +public slots: void showStatusBarMessage(const QString &message); - -#ifndef QT_NO_SYSTEMTRAYICON - void toggleMinimizedToTray(); -#endif - - //! 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); @@ -128,9 +122,10 @@ class MainWin 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); @@ -149,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(); @@ -156,23 +154,28 @@ class MainWin void saveMenuBarStatus(bool enabled); void saveStatusBarStatus(bool enabled); + void saveMainToolBarStatus(bool enabled); 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; @@ -183,6 +186,7 @@ class MainWin void setupChatMonitor(); void setupInputWidget(); void setupTopicWidget(); + void setupViewMenuTail(); void setupStatusBar(); void setupSystray(); void setupTitleSetter(); @@ -192,17 +196,14 @@ class MainWin void updateIcon(); void enableMenus(); -#ifndef QT_NO_SYSTEMTRAYICON - void hideToTray(); - SystemTray *_systemTray; -#endif - QList _bufferViews; BufferWidget *_bufferWidget; NickListWidget *_nickListWidget; InputWidget *_inputWidget; ChatMonitorView *_chatMonitorView; + TopicWidget *_topicWidget; + QAction *_fullScreenAction; QMenu *_fileMenu, *_networksMenu, *_viewMenu, *_bufferViewsMenu, *_settingsMenu, *_helpMenu, *_helpDebugMenu; QMenu *_toolbarMenu; QToolBar *_mainToolBar, *_chatViewToolBar, *_nickToolBar; @@ -214,13 +215,9 @@ 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; }; - -#endif