diff --git a/doc/index.docbook b/doc/index.docbook --- a/doc/index.docbook +++ b/doc/index.docbook @@ -25,11 +25,13 @@ + + NFS"> USB"> Samba"> - + Left"> Right"> Up"> diff --git a/krusader/FileSystem/fileitem.h b/krusader/FileSystem/fileitem.h --- a/krusader/FileSystem/fileitem.h +++ b/krusader/FileSystem/fileitem.h @@ -153,7 +153,7 @@ QString m_group; //< file group name bool m_isLink; //< true if the file is a symlink - QString m_linkDest; //< if it's a sym link - its destination + QString m_linkDest; //< if it's a symlink - its destination bool m_isBrokenLink; //< true if the link destination does not exist QString m_permissions; //< file permissions string diff --git a/krusader/Panel/panelfunc.cpp b/krusader/Panel/panelfunc.cpp --- a/krusader/Panel/panelfunc.cpp +++ b/krusader/Panel/panelfunc.cpp @@ -506,8 +506,9 @@ // ask the user for the filename to edit const QUrl filePath = KChooseDir::getFile(i18n("Enter the filename to edit:"), QUrl(panel->getCurrentName()), panel->virtualPath()); - if(filePath.isEmpty()) - return ; // the user canceled + if (filePath.isEmpty()) { + return; // the user canceled + } if (filePath.isLocalFile()) { // if the file exists, edit it instead of creating a new one @@ -561,7 +562,7 @@ } if (statJob->statResult().isDir()) { - KMessageBox::error(nullptr, i18n("You cannot edit a folder")); + KMessageBox::sorry(nullptr, i18n("You cannot edit a folder")); return; } diff --git a/krusader/krglobal.cpp b/krusader/krglobal.cpp --- a/krusader/krglobal.cpp +++ b/krusader/krglobal.cpp @@ -32,7 +32,7 @@ KConfig *KrGlobal::config = nullptr; KMountMan *KrGlobal::mountMan = nullptr; KrBookmarkHandler *KrGlobal::bookman = nullptr; -KRslots* KrGlobal::slot = nullptr; +KRslots *KrGlobal::slot = nullptr; KrusaderView *KrGlobal::mainView = nullptr; QWidget *KrGlobal::mainWindow = nullptr; UserAction *KrGlobal::userAction = nullptr; diff --git a/krusader/krslots.cpp b/krusader/krslots.cpp --- a/krusader/krslots.cpp +++ b/krusader/krslots.cpp @@ -225,8 +225,9 @@ } else tmp1 = url1.path(); if (!url2.isLocalFile()) { if (!downloadToTemp(url2, tmp2)) { - if (tmp1 != url1.path()) + if (tmp1 != url1.path()) { QFile::remove(tmp1); + } return; } } else tmp2 = url2.path(); @@ -236,8 +237,9 @@ tmp2 != url2.path() ? tmp2 : QString()); *p << diffProg << tmp1 << tmp2; p->start(); - if (!p->waitForStarted()) + if (!p->waitForStarted()) { KMessageBox::error(nullptr, i18n("Error executing %1.", diffProg)); + } } // GUI toggle slots