a/dirbrowser/cdbrowser.h b/dirbrowser/cdbrowser.h
...
...
82
        bool isPlaylist;
82
        bool isPlaylist;
83
        std::string searchStr;
83
        std::string searchStr;
84
        QPoint scrollpos{0,0};
84
        QPoint scrollpos{0,0};
85
    };
85
    };
86
86
87
    // This is called when a new tab is created to browse a
87
    // Browse specified container in newly created tab.
88
    // container. We have no server link yet.
88
    // We have no server link yet.
89
    void browseIn(QString UDN, std::vector<CtPathElt> path);
89
    void browseInNewTab(QString UDN, std::vector<CtPathElt> path);
90
90
91
    std::string getServerUDN();
91
    std::string getServerUDN();
92
    const std::vector<CtPathElt>& getcurpath() {
92
    const std::vector<CtPathElt>& getcurpath() {
93
        return m_curpath;
93
        return m_curpath;
94
    }
94
    }
...
...
108
    virtual void simpleAdd(QAction *);
108
    virtual void simpleAdd(QAction *);
109
    virtual void recursiveAdd(QAction *);
109
    virtual void recursiveAdd(QAction *);
110
    virtual void back(QAction *);
110
    virtual void back(QAction *);
111
    virtual void rreaperDone(int);
111
    virtual void rreaperDone(int);
112
    virtual void onContentsSizeChanged(const QSize&);
112
    virtual void onContentsSizeChanged(const QSize&);
113
#ifdef USING_WEBENGINE
114
    virtual void onPopupJsDone(const QVariant&);
115
    virtual void onJSRan(const QVariant&);
116
#else
113
    virtual void mouseReleaseEvent(QMouseEvent *event);
117
    virtual void mouseReleaseEvent(QMouseEvent *event);
114
118
    void keyPressEvent(QKeyEvent *e);
115
    virtual void onPopupJsDone(const QVariant&);
119
#endif
116
    virtual void onLoadFinished(bool);
117
    
120
    
118
 signals:
121
 signals:
119
    void sig_tracks_to_playlist(const MetaDataList&);
122
    void sig_tracks_to_playlist(const MetaDataList&);
120
    void sig_tracks_to_randplay(RandPlayer::PlayMode,
123
    void sig_tracks_to_randplay(RandPlayer::PlayMode,
121
                                const std::vector<UPnPClient::UPnPDirObject>&);
124
                                const std::vector<UPnPClient::UPnPDirObject>&);
...
...
123
    void sig_searchcaps_changed();
126
    void sig_searchcaps_changed();
124
    void sig_browse_in_new_tab(QString UDN,
127
    void sig_browse_in_new_tab(QString UDN,
125
                               std::vector<CDBrowser::CtPathElt>);
128
                               std::vector<CDBrowser::CtPathElt>);
126
    void sig_rand_stop();
129
    void sig_rand_stop();
127
    void sig_sort_order();
130
    void sig_sort_order();
128
129
 protected:
130
    void keyPressEvent(QKeyEvent *e);
131
131
132
private:
132
private:
133
    virtual void processOnLinkClicked(const QUrl &);
133
    virtual void processOnLinkClicked(const QUrl &);
134
    bool popupOther(QAction *act);
134
    bool popupOther(QAction *act);
135
    void initContainerHtml(const std::string& ss = std::string());
135
    void initContainerHtml(const std::string& ss = std::string());
...
...
184
    std::map<char, std::string> m_alphamap;
184
    std::map<char, std::string> m_alphamap;
185
    
185
    
186
    // Threaded objects to perform directory reads and recursive walks
186
    // Threaded objects to perform directory reads and recursive walks
187
    CDBrowseQO *m_reader;
187
    CDBrowseQO *m_reader;
188
    RecursiveReaper    *m_reaper;
188
    RecursiveReaper    *m_reaper;
189
    void deleteReaders();
189
    void deleteReaders(const QString& from);
190
190
191
    bool newCds(int cdsidx);
191
    bool newCds(int cdsidx);
192
192
193
    // Busy dialog for lengthy ops
193
    // Busy dialog for lengthy ops
194
    QProgressDialog *m_progressD;
194
    QProgressDialog *m_progressD;
...
...
214
    std::string m_popupotype;
214
    std::string m_popupotype;
215
    int m_popupidx{-1};
215
    int m_popupidx{-1};
216
    bool m_popupispl{false};
216
    bool m_popupispl{false};
217
    QPoint m_popupos;
217
    QPoint m_popupos;
218
    int m_popupmode; // now, next, at end
218
    int m_popupmode; // now, next, at end
219
#ifdef USING_WEBENGINE
220
    // No use trying to insert stuff before the initial page insert ran
221
    bool m_somethingran{false};
222
#endif
219
223
220
    // Remember last click kind for detecting midclick
224
    // Remember last click kind for detecting midclick
221
    Qt::MouseButton m_lastbutton;
225
    Qt::MouseButton m_lastbutton;
222
226
223
    // State for init browsing in subdir instead of servers page (middle-click)
227
    // State for init browsing in subdir instead of servers page (middle-click)