Add CFileBrowser

KangLin · Sep 19, 2024 · b7fa120 · b7fa120
1 parent 632ef07
commit b7fa120
Show file tree

Hide file tree

Showing 9 changed files with 359 additions and 10 deletions.
diff --git a/App/MainWindow.cpp b/App/MainWindow.cpp
@@ -18,6 +18,7 @@
 #include "RabbitCommonEncrypt.h"
 #ifdef HAVE_RABBITCOMMON_GUI
 #include "DockFolderBrowser.h"
+#include "FileBrowser.h"
 #endif
 #include "RabbitCommonDir.h"
 
@@ -171,3 +172,10 @@ void MainWindow::slotDownloadError(int nErr, const QString szErr)
 {
     qDebug(log) << "Download file error:" << nErr << szErr;
 }
+
+void MainWindow::on_actionFolder_browser_triggered()
+{
+    CFileBrowser *pBF = new CFileBrowser();
+    pBF->exec();
+}
+
diff --git a/App/MainWindow.h b/App/MainWindow.h
@@ -34,6 +34,8 @@ private slots:
     void slotDownloadFile(const QString szFile);
     void slotDownloadError(int nErr, const QString szErr);
 
+    void on_actionFolder_browser_triggered();
+
 private:
     Ui::MainWindow *ui;
 

diff --git a/App/MainWindow.ui b/App/MainWindow.ui
@@ -23,16 +23,16 @@
          <string>Log</string>
         </property>
         <property name="popupMode">
-         <enum>QToolButton::MenuButtonPopup</enum>
+         <enum>QToolButton::ToolButtonPopupMode::MenuButtonPopup</enum>
         </property>
         <property name="toolButtonStyle">
-         <enum>Qt::ToolButtonIconOnly</enum>
+         <enum>Qt::ToolButtonStyle::ToolButtonIconOnly</enum>
         </property>
         <property name="autoRaise">
          <bool>false</bool>
         </property>
         <property name="arrowType">
-         <enum>Qt::NoArrow</enum>
+         <enum>Qt::ArrowType::NoArrow</enum>
         </property>
        </widget>
       </item>
@@ -133,7 +133,7 @@
      <x>0</x>
      <y>0</y>
      <width>800</width>
-     <height>27</height>
+     <height>20</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuAbout">
@@ -147,29 +147,33 @@
     <property name="title">
      <string>Tools</string>
     </property>
+    <addaction name="actionFolder_browser"/>
    </widget>
    <addaction name="menuAbout"/>
    <addaction name="menuTools"/>
   </widget>
   <widget class="QStatusBar" name="statusbar"/>
   <action name="actionAbout">
    <property name="icon">
-    <iconset theme="help-about">
-     <normaloff>.</normaloff>.</iconset>
+    <iconset theme="help-about"/>
    </property>
    <property name="text">
     <string>About</string>
    </property>
   </action>
   <action name="actionUpdate">
    <property name="icon">
-    <iconset theme="system-software-update">
-     <normaloff>.</normaloff>.</iconset>
+    <iconset theme="system-software-update"/>
    </property>
    <property name="text">
     <string>Update</string>
    </property>
   </action>
+  <action name="actionFolder_browser">
+   <property name="text">
+    <string>Folder browser</string>
+   </property>
+  </action>
  </widget>
  <resources/>
  <connections/>

diff --git a/App/main.cpp b/App/main.cpp
@@ -18,7 +18,6 @@
 #include "RabbitCommonTools.h"
 #include "RabbitCommonDir.h"
 #include "MainWindow.h"
-
 #ifdef HAVE_UPDATE
     #include "FrmUpdater.h"
 #endif

diff --git a/ChangeLog.md b/ChangeLog.md
@@ -2,6 +2,7 @@
   - Fix log file name bug
   - Add environment in about dialog
   - Add CDlgEdit
+  - Add CFileBrowser
 
 ### Version v2.2.6
   - Modify debian package files

diff --git a/ChangeLog_zh_CN.md b/ChangeLog_zh_CN.md
@@ -2,6 +2,7 @@
   - 修复日志文件名错误
   - 在关于对话框中增加环境变量
   - 增加 CDlgEdit
+  - 增加 CFileBrowser
 
 ### 版本： v2.2.6
   - 修改 debian 打包文件

diff --git a/Src/CMakeLists.txt b/Src/CMakeLists.txt
@@ -58,6 +58,7 @@ if(WITH_GUI)
         Style/FrmStyle.h
         TitleBar.h
         DockFolderBrowser/DockFolderBrowser.h
+        FileBrowser/FileBrowser.h
         )
     list(APPEND RABBITCOMMON_HEAD_FILES
         Style/Style.h
@@ -71,6 +72,7 @@ if(WITH_GUI)
         Style/FrmStyle.cpp
         TitleBar.cpp
         DockFolderBrowser/DockFolderBrowser.cpp
+        FileBrowser/FileBrowser.cpp
         Log/DockDebugLog.cpp
         Log/DlgFilter.cpp
         Log/DlgEdit.cpp
@@ -84,7 +86,8 @@ if(WITH_GUI)
         )
     list(APPEND RABBITCOMMON_INCLUDE_DIRS
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/Style>
-        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/DockFolderBrowser>)
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/DockFolderBrowser>
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/FileBrowser>)
 endif()
 
 cmake_dependent_option(BUILD_ABOUT "Set to ON to build about function" ON