mirror of
https://bitbucket.org/smil3y/kde-workspace.git
synced 2025-02-23 18:32:50 +00:00
generic: adjust to protocol changes
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
parent
412c2d1d03
commit
f1e1351261
7 changed files with 8 additions and 8 deletions
|
@ -10,6 +10,6 @@ makedir=false
|
||||||
moving=false
|
moving=false
|
||||||
source=false
|
source=false
|
||||||
Icon=edit-find
|
Icon=edit-find
|
||||||
Class=:local
|
local=true
|
||||||
determineMimetypeFromExtension=false
|
determineMimetypeFromExtension=false
|
||||||
maxInstances=10
|
maxInstances=10
|
||||||
|
|
|
@ -10,4 +10,4 @@ linking=false
|
||||||
moving=false
|
moving=false
|
||||||
Icon=camera-photo
|
Icon=camera-photo
|
||||||
maxInstances=1
|
maxInstances=1
|
||||||
Class=:local
|
local=true
|
||||||
|
|
|
@ -6,4 +6,4 @@ exec=kio_network
|
||||||
listing=true
|
listing=true
|
||||||
reading=true
|
reading=true
|
||||||
determineMimetypeFromExtension=false
|
determineMimetypeFromExtension=false
|
||||||
Class=:internet
|
local=false
|
||||||
|
|
|
@ -11,5 +11,5 @@ moving=true
|
||||||
Icon=folder-remote
|
Icon=folder-remote
|
||||||
maxInstances=4
|
maxInstances=4
|
||||||
#TODO DocPath=kioslave/file.html
|
#TODO DocPath=kioslave/file.html
|
||||||
Class=:local
|
local=true
|
||||||
deleteRecursive=true
|
deleteRecursive=true
|
||||||
|
|
|
@ -10,7 +10,7 @@ linking=false
|
||||||
moving=true
|
moving=true
|
||||||
Icon=user-trash-full
|
Icon=user-trash-full
|
||||||
maxInstances=2
|
maxInstances=2
|
||||||
Class=:local
|
local=true
|
||||||
renameFromFile=true
|
renameFromFile=true
|
||||||
renameToFile=true
|
renameToFile=true
|
||||||
copyFromFile=true
|
copyFromFile=true
|
||||||
|
|
|
@ -59,7 +59,7 @@ void AsyncFileTester::checkIfFolder(const QModelIndex &index, QObject *object, c
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (KProtocolInfo::protocolClass(url.protocol()) == QString(":local")) {
|
if (KProtocolInfo::protocolIsLocal(url.protocol())) {
|
||||||
AsyncFileTester *tester = new AsyncFileTester(index, object, method);
|
AsyncFileTester *tester = new AsyncFileTester(index, object, method);
|
||||||
tester->delayedFolderCheck(url);
|
tester->delayedFolderCheck(url);
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -472,7 +472,7 @@ void FolderView::init()
|
||||||
|
|
||||||
void FolderView::networkStatusChanged(const KNetworkManager::KNetworkStatus status)
|
void FolderView::networkStatusChanged(const KNetworkManager::KNetworkStatus status)
|
||||||
{
|
{
|
||||||
if (KProtocolInfo::protocolClass(m_url.protocol()) != ":local") {
|
if (!KProtocolInfo::protocolIsLocal(m_url.protocol())) {
|
||||||
if (status == KNetworkManager::ConnectedStatus) {
|
if (status == KNetworkManager::ConnectedStatus) {
|
||||||
m_dirLister->openUrl(m_url);
|
m_dirLister->openUrl(m_url);
|
||||||
} else {
|
} else {
|
||||||
|
@ -1419,7 +1419,7 @@ void FolderView::setUrl(const KUrl &url)
|
||||||
m_url = url;
|
m_url = url;
|
||||||
setAssociatedApplicationUrls(KUrl::List() << m_url);
|
setAssociatedApplicationUrls(KUrl::List() << m_url);
|
||||||
|
|
||||||
if (KProtocolInfo::protocolClass(m_url.protocol()) == ":local") {
|
if (KProtocolInfo::protocolIsLocal(m_url.protocol())) {
|
||||||
m_dirLister->openUrl(m_url);
|
m_dirLister->openUrl(m_url);
|
||||||
} else if (m_networkManager->status() != KNetworkManager::ConnectedStatus) {
|
} else if (m_networkManager->status() != KNetworkManager::ConnectedStatus) {
|
||||||
QString networkStatus(i18n("Network is not reachable"));
|
QString networkStatus(i18n("Network is not reachable"));
|
||||||
|
|
Loading…
Add table
Reference in a new issue