Changeset View
Standalone View
src/dolphinviewcontainer.cpp
| Show All 25 Lines | |||||
| 26 | #include "global.h" | 26 | #include "global.h" | ||
| 27 | #include "search/dolphinsearchbox.h" | 27 | #include "search/dolphinsearchbox.h" | ||
| 28 | #include "statusbar/dolphinstatusbar.h" | 28 | #include "statusbar/dolphinstatusbar.h" | ||
| 29 | #include "trash/dolphintrash.h" | 29 | #include "trash/dolphintrash.h" | ||
| 30 | #include "views/viewmodecontroller.h" | 30 | #include "views/viewmodecontroller.h" | ||
| 31 | #include "views/viewproperties.h" | 31 | #include "views/viewproperties.h" | ||
| 32 | 32 | | |||
| 33 | #include <KFileItemActions> | 33 | #include <KFileItemActions> | ||
| 34 | #include <KFilePlacesModel> | ||||
| 34 | #include <KIO/PreviewJob> | 35 | #include <KIO/PreviewJob> | ||
| 35 | #include <KLocalizedString> | 36 | #include <KLocalizedString> | ||
| 36 | #include <KMessageWidget> | 37 | #include <KMessageWidget> | ||
| 37 | #include <KProtocolManager> | 38 | #include <KProtocolManager> | ||
| 38 | #include <KRun> | 39 | #include <KRun> | ||
| 39 | #include <KShell> | 40 | #include <KShell> | ||
| 40 | #include <KUrlComboBox> | 41 | #include <KUrlComboBox> | ||
| 41 | #include <KUrlNavigator> | 42 | #include <KUrlNavigator> | ||
| ▲ Show 20 Lines • Show All 362 Lines • ▼ Show 20 Line(s) | |||||
| 404 | } | 405 | } | ||
| 405 | 406 | | |||
| 406 | void DolphinViewContainer::reload() | 407 | void DolphinViewContainer::reload() | ||
| 407 | { | 408 | { | ||
| 408 | view()->reload(); | 409 | view()->reload(); | ||
| 409 | m_messageWidget->hide(); | 410 | m_messageWidget->hide(); | ||
| 410 | } | 411 | } | ||
| 411 | 412 | | |||
| 413 | QString DolphinViewContainer::getCaption() const | ||||
| 414 | { | ||||
| 415 | QString schemePrefix; | ||||
| 416 | if (!url().isLocalFile()) { | ||||
| 417 | schemePrefix.append(url().scheme() + " - "); | ||||
| 418 | if (!url().host().isEmpty()) { | ||||
| 419 | schemePrefix.append(url().host() + " - "); | ||||
| 420 | } | ||||
| 421 | } | ||||
| 422 | | ||||
| 423 | if (GeneralSettings::showFullPathInTitlebar()) { | ||||
| 424 | const QString path = url().adjusted(QUrl::StripTrailingSlash).path(); | ||||
| 425 | return schemePrefix + path; | ||||
| 426 | } | ||||
| 427 | | ||||
| 428 | KFilePlacesModel *placesModel = DolphinPlacesModelSingleton::instance().placesModel(); | ||||
| 429 | const auto& matchedPlaces = placesModel->match(placesModel->index(0,0), KFilePlacesModel::UrlRole, url(), 1, Qt::MatchExactly); | ||||
| 430 | | ||||
| 431 | if (!matchedPlaces.isEmpty()) { | ||||
| 432 | return placesModel->text(matchedPlaces.first()); | ||||
| 433 | } | ||||
| 434 | | ||||
| 435 | QString fileName = url().adjusted(QUrl::StripTrailingSlash).fileName(); | ||||
| 436 | if (fileName.isEmpty()) { | ||||
| 437 | fileName = '/'; | ||||
| 438 | } | ||||
| 439 | | ||||
| 440 | if (isSearchModeEnabled()) { | ||||
| 441 | if(currentSearchText().isEmpty()){ | ||||
| 442 | return i18n("Search"); | ||||
| 443 | } else { | ||||
| 444 | return i18n("Search for %1", currentSearchText()); | ||||
| 445 | } | ||||
| 446 | } | ||||
markg: I'm guessing now, please have a look at the code to see if this is possible.
You're doing QUrl… | |||||
Hi Mark, yes I would really like to avoid this QUrl magic :) The problem (as I see it), is that I do not always have a KFileItem with the correct contents (but please correct me if I am wrong here, since this code is pretty new to me), for example: When Dolphin starts up, it basically navigates to a QUrl either passed on the command line, or uses the home directory, so in this case we do not have a populated KFileItem. But when the user navigates using the view, we should have a KFileItem, because the view basically displays a list of KFileItems, so no problem here. But if the user types in a new url in the locator, i.e. if I type in remote:// this I do not have a KFileItem for this URL and hence we cannot display the user friendly string for it. This is why i tried doing a KIO::stat on the QUrl, but had limited success. It seems like some of the "pseudo" protocols like remote:// and smb:// doesn't really support stat in all cases, for example stat of remote: doesn't give me the "Network" pretty name :/ So is there a way where I consistently can populate KFileItem, mainly the UDS_NAME or UDS_PRETTY_NAME attributes, given a QUrl? hallas: Hi Mark,
yes I would really like to avoid this QUrl magic :) The problem (as I see it), is… | |||||
When you press <enter> dolphin does it's magic and opens the url you typed. At that point a KFileITem of it lives somewhere within Dolphin's reach otherwise no view would be populated ;) I will have a look at this tomorrow and see if i can figure something out. Funny note though, the very first (or one of) commits i did in dolphin was unifying the title to what it is now :) markg: When you press <enter> dolphin does it's magic and opens the url you typed. At that point a… | |||||
| 447 | | ||||
| 448 | return schemePrefix + fileName; | ||||
| 449 | } | ||||
| 450 | | ||||
| 412 | void DolphinViewContainer::setUrl(const QUrl& newUrl) | 451 | void DolphinViewContainer::setUrl(const QUrl& newUrl) | ||
| 413 | { | 452 | { | ||
| 414 | if (newUrl != m_urlNavigator->locationUrl()) { | 453 | if (newUrl != m_urlNavigator->locationUrl()) { | ||
| 415 | m_urlNavigator->setLocationUrl(newUrl); | 454 | m_urlNavigator->setLocationUrl(newUrl); | ||
| 416 | } | 455 | } | ||
| 417 | 456 | | |||
| 418 | #ifdef KActivities_FOUND | 457 | #ifdef KActivities_FOUND | ||
| 419 | m_activityResourceInstance->setUri(newUrl); | 458 | m_activityResourceInstance->setUri(newUrl); | ||
| ▲ Show 20 Lines • Show All 305 Lines • Show Last 20 Lines | |||||
I'm guessing now, please have a look at the code to see if this is possible.
You're doing QUrl foo to figure stuff out about the url. It will (probably) work in most scenario's but there is an easier and more reliable way.
When a view is opened or changed, it - somewhere in dolphin - exists as KFileItem. That object knows everything about the item (if it's a folder, a file, a link.. etc...).
Now, i don't see the KFileItem as class member of DolphinViewContainer so i'm guessing it comes in DolphinViewContainer via signals/slots (where i do see it) but isn't stored. If you want to go for a reliable title handling i'd go for saving the KFileItem that belong to the current view as a class member and build up the title based on that.
You should not need to stat for it again as that is already done when the item is opened. You just need to keep it stored in DolphinViewContainer to use it.
It will probably simplify this getCaption function quite a bit.