|
a/dirbrowser/cdbrowser.cpp |
|
b/dirbrowser/cdbrowser.cpp |
|
... |
|
... |
| 298 |
m_sysUpdId = 0;
|
298 |
m_sysUpdId = 0;
|
| 299 |
}
|
299 |
}
|
| 300 |
}
|
300 |
}
|
| 301 |
}
|
301 |
}
|
| 302 |
|
302 |
|
|
|
303 |
// This gets called by actual signals actual events. We need to
|
|
|
304 |
// separate the implementation in processOnLinkClicked() for counting
|
|
|
305 |
// automatic calls (when seeing a container with a single container
|
|
|
306 |
// entry for example, and to avoid unlimited recursion on a pathologic tree).
|
| 303 |
void CDBrowser::onLinkClicked(const QUrl &url)
|
307 |
void CDBrowser::onLinkClicked(const QUrl &url)
|
|
|
308 |
{
|
|
|
309 |
m_autoclickcnt = 0;
|
|
|
310 |
processOnLinkClicked(url);
|
|
|
311 |
}
|
|
|
312 |
|
|
|
313 |
void CDBrowser::processOnLinkClicked(const QUrl &url)
|
| 304 |
{
|
314 |
{
|
| 305 |
m_timer.stop();
|
315 |
m_timer.stop();
|
| 306 |
string scurl = qs2utf8s(url.toString());
|
316 |
string scurl = qs2utf8s(url.toString());
|
| 307 |
qDebug() << "CDBrowser::onLinkClicked: " << url.toString() <<
|
317 |
qDebug() << "CDBrowser::onLinkClicked: " << url.toString() <<
|
| 308 |
" button " << m_lastbutton << " mid " << Qt::MidButton;
|
318 |
" button " << m_lastbutton << " mid " << Qt::MidButton;
|
|
... |
|
... |
| 674 |
};
|
684 |
};
|
| 675 |
string DirObjCmp::nullstr;
|
685 |
string DirObjCmp::nullstr;
|
| 676 |
|
686 |
|
| 677 |
void CDBrowser::onBrowseDone(int)
|
687 |
void CDBrowser::onBrowseDone(int)
|
| 678 |
{
|
688 |
{
|
| 679 |
//qDebug() <<"CDBrowser::onBrowseDone";
|
689 |
//qDebug() <<"CDBrowser::onBrowseDone: " << m_entries.size() << " entries";
|
| 680 |
if (!m_reader) {
|
690 |
if (!m_reader) {
|
| 681 |
qDebug() << "CDBrowser::onBrowseDone(int) no reader: cancelled";
|
691 |
qDebug() << "CDBrowser::onBrowseDone(int) no reader: cancelled";
|
| 682 |
return;
|
692 |
return;
|
| 683 |
}
|
693 |
}
|
| 684 |
|
694 |
if (m_autoclickcnt++ < 3 && m_entries.size() == 1 &&
|
|
|
695 |
m_entries[0].m_type == UPnPDirObject::container) {
|
|
|
696 |
QUrl cturl(QString("http://h/C%1").arg(0));
|
|
|
697 |
processOnLinkClicked(cturl);
|
|
|
698 |
return;
|
|
|
699 |
}
|
|
|
700 |
|
| 685 |
vector<string> sortcrits;
|
701 |
vector<string> sortcrits;
|
| 686 |
int sortkind = CSettingsStorage::getInstance()->getSortKind();
|
702 |
int sortkind = CSettingsStorage::getInstance()->getSortKind();
|
| 687 |
if (sortkind == CSettingsStorage::SK_MINIMFNORDER &&
|
703 |
if (sortkind == CSettingsStorage::SK_MINIMFNORDER &&
|
| 688 |
m_reader->getKind() == ContentDirectory::CDSKIND_MINIM &&
|
704 |
m_reader->getKind() == ContentDirectory::CDSKIND_MINIM &&
|
| 689 |
m_curpath.back().searchStr.empty() &&
|
705 |
m_curpath.back().searchStr.empty() &&
|