Switch to unified view

a/dirbrowser/cdbrowser.h b/dirbrowser/cdbrowser.h
...
...
71
    void getSearchCaps(std::set<std::string>& caps) {caps = m_searchcaps;}
71
    void getSearchCaps(std::set<std::string>& caps) {caps = m_searchcaps;}
72
    void search(const std::string& iss);
72
    void search(const std::string& iss);
73
73
74
    // Entry for path inside current server: for going back later
74
    // Entry for path inside current server: for going back later
75
    struct CtPathElt {
75
    struct CtPathElt {
76
        CtPathElt() : scrollpos(0,0) {}
76
        CtPathElt() {}
77
        CtPathElt(const std::string& id, const std::string& tt, 
77
        CtPathElt(const std::string& id, const std::string& tt,
78
                  const std::string ss = std::string())
78
                  bool ispl, const std::string ss = std::string())
79
            : objid(id), title(tt), searchStr(ss), scrollpos(0,0) {}
79
            : objid(id), title(tt), isPlaylist(ispl), searchStr(ss) {}
80
        std::string objid;
80
        std::string objid;
81
        std::string title;
81
        std::string title;
82
        bool isPlaylist;
82
        std::string searchStr;
83
        std::string searchStr;
83
        QPoint scrollpos;
84
        QPoint scrollpos{0,0};
84
    };
85
    };
85
86
86
    // This is called when a new tab is created to browse a
87
    // This is called when a new tab is created to browse a
87
    // container. We have no server link yet.
88
    // container. We have no server link yet.
88
    void browseIn(QString UDN, vector<CtPathElt> path);
89
    void browseIn(QString UDN, vector<CtPathElt> path);
...
...
124
125
125
private:
126
private:
126
    virtual void processOnLinkClicked(const QUrl &);
127
    virtual void processOnLinkClicked(const QUrl &);
127
    bool popupOther(QAction *act);
128
    bool popupOther(QAction *act);
128
    void initContainerHtml(const std::string& ss=string());
129
    void initContainerHtml(const std::string& ss=string());
129
    void browseContainer(std::string, std::string, QPoint scrollpos = QPoint());
130
    void browseContainer(std::string ctid, std::string title, bool ispl,
131
                         QPoint scrollpos = QPoint());
130
    void search(const string& objid, const string& iss, QPoint scrollpos = 
132
    void search(const string& objid, const string& iss, QPoint scrollpos = 
131
                QPoint());
133
                QPoint());
132
    void curpathClicked(unsigned int i);
134
    void curpathClicked(unsigned int i);
133
    void waitForPage();
135
    void waitForPage();
134
    void mySetHtml(const QString&);
136
    void mySetHtml(const QString&);
...
...
137
    void updateAlphamap(char& curinitial, const std::string& tt);
139
    void updateAlphamap(char& curinitial, const std::string& tt);
138
    void maybeShowAlphamap(unsigned int nct);
140
    void maybeShowAlphamap(unsigned int nct);
139
    QString alphalinks(const string& initials);
141
    QString alphalinks(const string& initials);
140
    
142
    
141
    static const std::string CTTitleStartMarker;
143
    static const std::string CTTitleStartMarker;
144
    static const std::string plContainerClass;
142
    void init_HTML();
145
    void init_HTML();
143
    static QString CTToHtml(unsigned int idx,
146
    static QString CTToHtml(unsigned int idx,
144
                            const UPnPClient::UPnPDirObject& e);
147
                            const UPnPClient::UPnPDirObject& e);
145
    static QString ItemToHtml(unsigned int idx,
148
    static QString ItemToHtml(unsigned int idx,
146
                              const UPnPClient::UPnPDirObject&, int maxartlen);
149
                              const UPnPClient::UPnPDirObject&, int maxartlen);
...
...
195
    std::unordered_set<std::string> m_recwalkdedup;
198
    std::unordered_set<std::string> m_recwalkdedup;
196
199
197
    // Pointer to parent tabbed object for access to shared state (insertActive)
200
    // Pointer to parent tabbed object for access to shared state (insertActive)
198
    DirBrowser *m_browsers;
201
    DirBrowser *m_browsers;
199
202
200
    // Objid and index in entries for the last popup menu click
203
    // Attributes for the popup menu click:
201
    std::string m_popupobjid;
204
    std::string m_popupobjid;
202
    std::string m_popupobjtitle;
205
    std::string m_popupobjtitle;
203
    std::string m_popupotype;
206
    std::string m_popupotype;
204
    int m_popupidx;
207
    int m_popupidx{-1};
208
    bool m_popupispl{false};
205
    QPoint m_popupos;
209
    QPoint m_popupos;
206
    int m_popupmode; // now, next, at end
210
    int m_popupmode; // now, next, at end
207
211
208
    // Remember last click kind for detecting midclick
212
    // Remember last click kind for detecting midclick
209
    Qt::MouseButton m_lastbutton;
213
    Qt::MouseButton m_lastbutton;