X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.h;h=f9e53e398e15b72b8b3d24901092559f915ad59a;hb=d4b81a6d777de45611034b26bd89973d19e60c96;hp=e5b6ba218fd7031c3c605fcfff458c256f1ee434;hpb=6a95ba6273599fa24e79fb008e38197448c29605;p=quassel.git

diff --git a/src/qtui/mainwin.h b/src/qtui/mainwin.h
index e5b6ba21..f9e53e39 100644
--- a/src/qtui/mainwin.h
+++ b/src/qtui/mainwin.h
@@ -22,9 +22,7 @@
 
 #include <QUuid>
 
-#ifdef HAVE_KDE4
-#  include <KMainWindow>
-#elif defined HAVE_KF5
+#ifdef HAVE_KF5
 #  include <KXmlGui/KMainWindow>
 #else
 #  include <QMainWindow>
@@ -68,7 +66,6 @@ class MainWin
 
 public:
     MainWin(QWidget *parent = 0);
-    virtual ~MainWin();
 
     void init();
 
@@ -100,8 +97,7 @@ public slots:
 
     void showMigrationWarning(bool show);
 
-    //! Quit application
-    void quit();
+    void onExitRequested(const QString &reason);
 
 protected:
     void closeEvent(QCloseEvent *event);
@@ -121,7 +117,17 @@ private slots:
     void currentBufferChanged(BufferId);
     void messagesInserted(const QModelIndex &parent, int start, int end);
     void showAboutDlg();
-    void showChannelList(NetworkId netId = NetworkId());
+
+    /**
+     * Show the channel list dialog for the network, optionally searching by channel name
+     *
+     * @param networkId        Network ID for associated network
+     * @param channelFilters   Partial channel name to search for, or empty to show all
+     * @param listImmediately  If true, immediately list channels, otherwise just show dialog
+     */
+    void showChannelList(NetworkId netId = {}, const QString &channelFilters = {},
+                         bool listImmediately = false);
+
     void showNetworkConfig(NetworkId netId = NetworkId());
     void showCoreConnectionDlg();
     void showCoreConfigWizard(const QVariantList &, const QVariantList &);
@@ -198,6 +204,7 @@ private slots:
     void on_actionDebugMessageModel_triggered();
     void on_actionDebugHotList_triggered();
     void on_actionDebugLog_triggered();
+    void on_actionShowResourceTree_triggered();
 
     void bindJumpKey();
     void onJumpKey();