Switch to unified view

a/dirbrowser/cdbrowser.h b/dirbrowser/cdbrowser.h
1
/* Copyright (C) 2014 J.F.Dockes 
1
/* Copyright (C) 2014-2018 J.F.Dockes 
2
 *   This program is free software; you can redistribute it and/or modify
2
 *   This program is free software; you can redistribute it and/or modify
3
 *   it under the terms of the GNU General Public License as published by
3
 *   it under the terms of the GNU General Public License as published by
4
 *   the Free Software Foundation; either version 2 of the License, or
4
 *   the Free Software Foundation; either version 2 of the License, or
5
 *   (at your option) any later version.
5
 *   (at your option) any later version.
6
 *
6
 *
...
...
121
121
122
 protected:
122
 protected:
123
    void keyPressEvent(QKeyEvent *e);
123
    void keyPressEvent(QKeyEvent *e);
124
124
125
private:
125
private:
126
    virtual void processOnLinkClicked(const QUrl &);
126
    bool popupOther(QAction *act);
127
    bool popupOther(QAction *act);
127
    void initContainerHtml(const std::string& ss=string());
128
    void initContainerHtml(const std::string& ss=string());
128
    void browseContainer(std::string, std::string, QPoint scrollpos = QPoint());
129
    void browseContainer(std::string, std::string, QPoint scrollpos = QPoint());
129
    void search(const string& objid, const string& iss, QPoint scrollpos = 
130
    void search(const string& objid, const string& iss, QPoint scrollpos = 
130
                QPoint());
131
                QPoint());
...
...
145
                              const UPnPClient::UPnPDirObject&, int maxartlen);
146
                              const UPnPClient::UPnPDirObject&, int maxartlen);
146
    static QString DSToHtml(unsigned int idx,
147
    static QString DSToHtml(unsigned int idx,
147
                            const UPnPClient::UPnPDeviceDesc& dev);
148
                            const UPnPClient::UPnPDeviceDesc& dev);
148
    static QString initialServersPage();
149
    static QString initialServersPage();
149
    static QString emptyServersPage();
150
    static QString emptyServersPage();
151
152
    // This is used to limit our automatic descent further down when a
153
    // container has a unique container entry. To defend against some
154
    // pathological trees
155
    int m_autoclickcnt{0};
150
    
156
    
151
    // When displaying the servers list, we periodically check the
157
    // When displaying the servers list, we periodically check the
152
    // server pool state. The last seen Media Server descriptions are
158
    // server pool state. The last seen Media Server descriptions are
153
    // stored in m_msdescs for diffing with the new ones and deciding
159
    // stored in m_msdescs for diffing with the new ones and deciding
154
    // if we need to redraw. Timer and servers list are only used
160
    // if we need to redraw. Timer and servers list are only used