dolphinview: Change case of status bar text

[dolphin.git] / src / views / dolphinview.cpp

diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index d0db814e4d404dee7bd3e36835e8bc6e8ac02db6..704ecda0ce37d498c33365a58c0858eeb63f3022 100644 (file)
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -35,7 +35,7 @@
 #include <KFileItemListProperties>
 #include <KFormat>
 #include <KIO/CopyJob>
 #include <KFileItemListProperties>
 #include <KFormat>
 #include <KIO/CopyJob>

-#include <KIO/DeleteJob>
+#include <KIO/DeleteOrTrashJob>

 #include <KIO/DropJob>
 #include <KIO/JobUiDelegate>
 #include <KIO/Paste>
 #include <KIO/DropJob>
 #include <KIO/JobUiDelegate>
 #include <KIO/Paste>


@@ -49,9 +49,6 @@
 
 #include <kwidgetsaddons_version.h>
 
 
 #include <kwidgetsaddons_version.h>
 

-#include <KIO/DeleteOrTrashJob>
-#include <kio_version.h>
-

 #include <QAbstractItemView>
 #include <QActionGroup>
 #include <QApplication>
 #include <QAbstractItemView>
 #include <QActionGroup>
 #include <QApplication>


@@ -129,6 +126,9 @@ DolphinView::DolphinView(const QUrl &url, QWidget *parent)
 
     m_container = new KItemListContainer(controller, this);
     m_container->installEventFilter(this);
 
     m_container = new KItemListContainer(controller, this);
     m_container->installEventFilter(this);

+#ifndef QT_NO_ACCESSIBILITY
+    m_view->setAccessibleParentsObject(m_container);
+#endif

     setFocusProxy(m_container);
     connect(m_container->horizontalScrollBar(), &QScrollBar::valueChanged, this, [=] {
         hideToolTip();
     setFocusProxy(m_container);
     connect(m_container->horizontalScrollBar(), &QScrollBar::valueChanged, this, [=] {
         hideToolTip();


@@ -267,7 +267,6 @@ void DolphinView::setActive(bool active)
     if (active) {
         m_container->setFocus();
         Q_EMIT activated();
     if (active) {
         m_container->setFocus();
         Q_EMIT activated();

-        Q_EMIT writeStateChanged(m_isFolderWritable);

     }
 }
 
     }
 }
 


@@ -626,7 +625,7 @@ void DolphinView::requestStatusBarText()
             return;
         }
 
             return;
         }
 

-        m_statJobForStatusBarText = KIO::statDetails(m_model->rootItem().url(), KIO::StatJob::SourceSide, KIO::StatRecursiveSize, KIO::HideProgressInfo);
+        m_statJobForStatusBarText = KIO::stat(m_model->rootItem().url(), KIO::StatJob::SourceSide, KIO::StatRecursiveSize, KIO::HideProgressInfo);

         connect(m_statJobForStatusBarText, &KJob::result, this, &DolphinView::slotStatJobResult);
         m_statJobForStatusBarText->start();
     }
         connect(m_statJobForStatusBarText, &KJob::result, this, &DolphinView::slotStatJobResult);
         m_statJobForStatusBarText->start();
     }


@@ -641,11 +640,11 @@ void DolphinView::emitStatusBarText(const int folderCount, const int fileCount,
     if (selection == HasSelection) {
         // At least 2 items are selected because the case of 1 selected item is handled in
         // DolphinView::requestStatusBarText().
     if (selection == HasSelection) {
         // At least 2 items are selected because the case of 1 selected item is handled in
         // DolphinView::requestStatusBarText().

-        foldersText = i18ncp("@info:status", "1 Folder selected", "%1 Folders selected", folderCount);
-        filesText = i18ncp("@info:status", "1 File selected", "%1 Files selected", fileCount);
+        foldersText = i18ncp("@info:status", "1 folder selected", "%1 folders selected", folderCount);
+        filesText = i18ncp("@info:status", "1 file selected", "%1 files selected", fileCount);

     } else {
     } else {

-        foldersText = i18ncp("@info:status", "1 Folder", "%1 Folders", folderCount);
-        filesText = i18ncp("@info:status", "1 File", "%1 Files", fileCount);
+        foldersText = i18ncp("@info:status", "1 folder", "%1 folders", folderCount);
+        filesText = i18ncp("@info:status", "1 file", "%1 files", fileCount);

     }
 
     if (fileCount > 0 && folderCount > 0) {
     }
 
     if (fileCount > 0 && folderCount > 0) {


@@ -655,7 +654,7 @@ void DolphinView::emitStatusBarText(const int folderCount, const int fileCount,
     } else if (folderCount > 0) {
         summary = foldersText;
     } else {
     } else if (folderCount > 0) {
         summary = foldersText;
     } else {

-        summary = i18nc("@info:status", "0 Folders, 0 Files");
+        summary = i18nc("@info:status", "0 folders, 0 files");

     }
     Q_EMIT statusBarTextChanged(summary);
 }
     }
     Q_EMIT statusBarTextChanged(summary);
 }


@@ -1759,7 +1758,7 @@ void DolphinView::updateViewState()
 
                 // scroll to current item and reset the state
                 if (m_scrollToCurrentItem) {
 
                 // scroll to current item and reset the state
                 if (m_scrollToCurrentItem) {

-                    m_view->scrollToItem(currentIndex);
+                    m_view->scrollToItem(currentIndex, KItemListView::ViewItemPosition::Middle);

                     m_scrollToCurrentItem = false;
                 }
                 m_currentItemUrl = QUrl();
                     m_scrollToCurrentItem = false;
                 }
                 m_currentItemUrl = QUrl();


@@ -2243,6 +2242,11 @@ void DolphinView::updateWritableState()
     }
 }
 
     }
 }
 

+bool DolphinView::isFolderWritable() const
+{
+    return m_isFolderWritable;
+}
+

 QUrl DolphinView::viewPropertiesUrl() const
 {
     if (m_viewPropertiesContext.isEmpty()) {
 QUrl DolphinView::viewPropertiesUrl() const
 {
     if (m_viewPropertiesContext.isEmpty()) {


@@ -2283,7 +2287,7 @@ void DolphinView::copyPathToClipboard()
     if (clipboard == nullptr) {
         return;
     }
     if (clipboard == nullptr) {
         return;
     }

-    clipboard->setText(path);
+    clipboard->setText(QDir::toNativeSeparators(path));

 }
 
 void DolphinView::slotIncreaseZoom()
 }
 
 void DolphinView::slotIncreaseZoom()