FileBrowser: modify undo

KangLin · Nov 26, 2024 · 81e4e78 · 81e4e78
1 parent d1f5d8f
commit 81e4e78
Show file tree

Hide file tree

Showing 4 changed files with 106 additions and 14 deletions.
diff --git a/Src/FileBrowser/FileBrowser.cpp b/Src/FileBrowser/FileBrowser.cpp
@@ -2,6 +2,7 @@
 
 #include <QSettings>
 #include <QPushButton>
+#include <QScrollBar>
 #include <QToolButton>
 #include <QMenu>
 #include <QWidgetAction>
@@ -77,6 +78,7 @@ CFileBrowser::CFileBrowser(QWidget *parent)
         if(!m_pSpliter) break;
 
         m_pTree = new CFileBroserTreeView(m_pSpliter);
+        m_pTree->setAutoScroll(true);
         m_pTable = new QTableView(m_pSpliter);
         //m_pList = new QListView(pSpliter);
         m_pTextEdit = new QTextEdit(m_pSpliter);
@@ -101,6 +103,7 @@ CFileBrowser::CFileBrowser(QWidget *parent)
         pToolBar->addActions(lstUndo);
 #endif
 
+        /*
         szTitle = tr("New folder");
         pAction = pToolBar->addAction(
             QIcon::fromTheme("folder-new"), szTitle,
@@ -131,6 +134,31 @@ CFileBrowser::CFileBrowser(QWidget *parent)
                 m_pTree->update(index);
             });
         pAction->setStatusTip(szTitle);
+        */
+
+        pToolBar->addAction(QIcon::fromTheme("go-up"), tr("Up"),
+                            this, [&](){
+            QString szDir;
+            QModelIndex index = m_pTree->currentIndex();
+            szDir = m_pModel->filePath(index);
+            QDir d(szDir);
+            if(d.exists()) {
+                szDir = szDir + QDir::separator() + "..";
+            } else {
+                QFileInfo fi(szDir);
+                szDir = fi.absolutePath();
+            }
+            qDebug(log) << "Dir" << szDir;
+            auto i = m_pModel->index(szDir);
+            if(i.isValid())
+            {
+                m_pUndoStack->push(new CChange(i, this));
+                m_pTree->setCurrentIndex(i);
+                slotClicked(i);
+                m_pTree->doItemsLayout();
+                m_pTree->scrollTo(i);
+            }
+        });
 
         szTitle = tr("Option");
         QToolButton* pButtonOption = new QToolButton(pToolBar);
@@ -236,6 +264,7 @@ CFileBrowser::CFileBrowser(QWidget *parent)
             m_pTree->header()->hideSection(3);
             m_pSpliter->addWidget(m_pTree);
 
+            /*
             if(m_pTable) {
                 check = connect(m_pTree, &QTreeView::clicked,
                                 m_pTable, &QTableView::setRootIndex);
@@ -245,22 +274,12 @@ CFileBrowser::CFileBrowser(QWidget *parent)
                 check = connect(m_pTree, &QTreeView::clicked,
                                 m_pList, &QListView::setRootIndex);
                 Q_ASSERT(check);
-            }
+            }//*/
             check = connect(
                 m_pTree, &QTreeView::clicked,
-                this, [&](const QModelIndex &index) {
-                    if (m_pModel) {
-                        if(m_pModel->isDir(index)) {
-                            m_pTable->show();
-                            m_pTextEdit->hide();
-                            return;
-                        }
-                        m_pTable->hide();
-#if defined(Q_OS_ANDROID)
-                        QString szFile = m_pModel->filePath(index);
-                        ShowFile(szFile);
-#endif
-                    }
+                this, [&](const QModelIndex& index){
+                    m_pUndoStack->push(new CChange(index, this));
+                    slotClicked(index);
                 });
             Q_ASSERT(check);
             check = connect(
@@ -297,6 +316,7 @@ CFileBrowser::CFileBrowser(QWidget *parent)
                 m_pTable, &QTableView::clicked,
                 this, [&](const QModelIndex &index) {
                     if (m_pModel) {
+                        m_pUndoStack->push(new CChange(index, this));
                         QString szDir = m_pModel->filePath(index);
                         m_pTree->setCurrentIndex(index);
                         m_pTree->expand(index);
@@ -417,6 +437,24 @@ int CFileBrowser::ShowFile(const QString &szFile)
     return 0;
 }
 
+void CFileBrowser::slotClicked(const QModelIndex &index)
+{
+    qDebug(log) << "CFileBrowser::slotClicked" << index;
+    if (m_pModel) {
+        if(m_pModel->isDir(index)) {
+            m_pTable->setRootIndex(index);
+            m_pTable->show();
+            m_pTextEdit->hide();
+            return;
+        }
+        m_pTable->hide();
+#if defined(Q_OS_ANDROID)
+        QString szFile = m_pModel->filePath(index);
+        ShowFile(szFile);
+#endif
+    }
+}
+
 CDlgFileBrowser::CDlgFileBrowser(QWidget *parent) : QDialog(parent)
     ,m_pFileBrowser(nullptr)
 {

diff --git a/Src/FileBrowser/FileBrowser.h b/Src/FileBrowser/FileBrowser.h
@@ -16,6 +16,7 @@
 #include "rabbitcommon_export.h"
 
 class CFileBroserTreeView;
+class CChange;
 /*!
  * \brief File browser
  * \ingroup API
@@ -40,6 +41,9 @@ class RABBITCOMMON_EXPORT CFileBrowser : public QWidget
     void sigDoubleClicked(const QString &szItem, bool bDir);
     void sigChanged(const QString &szItem, bool bDir);
 
+public Q_SLOTS:
+    void slotClicked(const QModelIndex &index);
+
 private:
     QString readFile(const QString &filePath);
     int ShowFile(const QString &szFile);
@@ -57,6 +61,8 @@ class RABBITCOMMON_EXPORT CFileBrowser : public QWidget
     QAction* m_pHiddenFile;
     QAction* m_pAssociated;
     QAction* m_pOrientation;
+
+    friend class CChange;
 };
 
 /*!

diff --git a/Src/FileBrowser/UndoCommand.cpp b/Src/FileBrowser/UndoCommand.cpp
@@ -53,3 +53,36 @@ void CDeleteFolder::redo()
     setObsolete(!bRet);
     qDebug(log) << "CDeleteFolder::redo()" << bRet << m_szPath;
 }
+
+CChange::CChange(const QModelIndex &index, CFileBrowser *pThis)
+    : QUndoCommand()
+    , m_pThis(pThis)
+    , m_Index(index)
+{
+    QFileSystemModel* model = m_pThis->m_pModel;
+    if(model)
+        setText(model->filePath(index));
+}
+
+CChange::~CChange()
+{
+    qDebug(log) << "CChange::~CChange()";
+}
+
+void CChange::undo()
+{
+    qDebug(log) << "CChange::undo()" << m_Index;
+    m_pThis->m_pTree->setCurrentIndex(m_Index);
+    m_pThis->slotClicked(m_Index);
+    m_pThis->m_pTree->doItemsLayout();
+    m_pThis->m_pTree->scrollTo(m_Index);
+}
+
+void CChange::redo()
+{
+    qDebug(log) << "CChange::redo()" << m_Index;
+    m_pThis->slotClicked(m_Index);
+    m_pThis->m_pTree->setCurrentIndex(m_Index);
+    m_pThis->m_pTree->doItemsLayout();
+    m_pThis->m_pTree->scrollTo(m_Index);
+}
diff --git a/Src/FileBrowser/UndoCommand.h b/Src/FileBrowser/UndoCommand.h
@@ -6,6 +6,8 @@
 
 #include <QUndoCommand>
 #include <QFileSystemModel>
+#include "FileBroserTreeView.h"
+#include "FileBrowser.h"
 
 class CNewFolder : public QUndoCommand
 {
@@ -29,4 +31,17 @@ class CDeleteFolder : public QUndoCommand
     QString m_szPath;
 };
 
+class CChange: public QUndoCommand
+{
+public:
+    CChange(const QModelIndex &index, CFileBrowser* pThis);
+    virtual ~CChange();
+    virtual void undo() override;
+    virtual void redo() override;
+
+private:
+    CFileBrowser* m_pThis;
+    QModelIndex m_Index;
+};
+
 #endif // UNDOCOMMAND_H