X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.h;h=4f3f750dbad39dd18ffb18740d896f150059fd9d;hb=d76bb125c8dd275095409edd3426700a98d89f3a;hp=8c9c1ec71781e024709aff8b4d77de7e4c90399a;hpb=8386eed0a503bd2683b908bc05d682231331894b;p=quassel.git diff --git a/src/qtui/mainwin.h b/src/qtui/mainwin.h index 8c9c1ec7..4f3f750d 100644 --- a/src/qtui/mainwin.h +++ b/src/qtui/mainwin.h @@ -31,8 +31,6 @@ # include #endif -#include - #include "qtui.h" #include "titlesetter.h" #include "uisettings.h" @@ -75,9 +73,11 @@ class MainWin void addBufferView(ClientBufferViewConfig *config); BufferView *allBuffersView() const; - BufferWidget *bufferWidget() const { return _bufferWidget; } + inline BufferWidget *bufferWidget() const { return _bufferWidget; } - inline SystemTray *systemTray() const; +#ifndef QT_NO_SYSTEMTRAYICON + inline SystemTray *systemTray() const { return _systemTray; } +#endif bool event(QEvent *event); @@ -90,7 +90,9 @@ class MainWin public slots: void showStatusBarMessage(const QString &message); +#ifndef QT_NO_SYSTEMTRAYICON void toggleMinimizedToTray(); +#endif //! Bring window to front and focus it void forceActivated(); @@ -119,6 +121,7 @@ class MainWin void showAboutDlg(); void showChannelList(NetworkId netId = NetworkId()); void showCoreConnectionDlg(); + void showCoreConfigWizard(const QVariantList &); void showCoreInfoDlg(); void showAwayLog(); void showSettingsDlg(); @@ -127,7 +130,7 @@ class MainWin #ifdef HAVE_KDE void showShortcutsDlg(); #endif - void startInternalCore(); + void handleCoreConnectionError(const QString &errorMsg); void userAuthenticationRequired(CoreAccount *, bool *valid, const QString &errorMessage); void handleNoSslInClient(bool *accepted); void handleNoSslInCore(bool *accepted); @@ -188,9 +191,10 @@ class MainWin void updateIcon(); void enableMenus(); +#ifndef QT_NO_SYSTEMTRAYICON void hideToTray(); - SystemTray *_systemTray; +#endif QList _bufferViews; BufferWidget *_bufferWidget; @@ -217,8 +221,4 @@ class MainWin friend class QtUi; }; -SystemTray *MainWin::systemTray() const { - return _systemTray; -} - #endif