ui:update ui

Signed-off-by: xiaoming <[email protected]>
QQxiaoming · Jul 31, 2023 · 5367c67 · 5367c67
1 parent a377d6e
commit 5367c67
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 22 deletions.
diff --git a/README.md b/README.md
@@ -29,7 +29,7 @@ QFSViewer is a small tool for developers to view the contents of various file sy
 
 Currently supported formats include:
 
-jffs2\vfat\exfat\ext4\ext3\ext2
+jffs2\fat12\fat16\fat32\exfat\ext4\ext3\ext2
 
 ## Contributing
 
@@ -40,7 +40,7 @@ The current project is recommended to use version Qt6.2.0 or higher.
 ## Thanks
 
 - [QFontIcon](https://github.com/dridk/QFontIcon)
-- [ext4](https://github.com/gkostka/lwext4)
+- [lwext4](https://github.com/gkostka/lwext4)
 - [ff15](http://elm-chan.org/fsw/ff/00index_e.html)
-- [jffs2](https://github.com/rickardp/jffs2extract)
+- [jffs2extract](https://github.com/rickardp/jffs2extract)
 - [treemodel.cpp](https://github.com/chocoball/QTreeViewTest)
diff --git a/README_zh_CN.md b/README_zh_CN.md
@@ -29,7 +29,7 @@ QFSViewer一款用于开发人员查看各种文件系统原始映像文件内
 
 目前支持格式包括：
 
-jffs2\vfat\exfat\ext4\ext3\ext2
+jffs2\fat12\fat16\fat32\exfat\ext4\ext3\ext2
 
 ## 贡献
 
@@ -40,7 +40,7 @@ jffs2\vfat\exfat\ext4\ext3\ext2
 ## 感谢
 
 - [QFontIcon](https://github.com/dridk/QFontIcon)
-- [ext4](https://github.com/gkostka/lwext4)
+- [lwext4](https://github.com/gkostka/lwext4)
 - [ff15](http://elm-chan.org/fsw/ff/00index_e.html)
-- [jffs2](https://github.com/rickardp/jffs2extract)
+- [jffs2extract](https://github.com/rickardp/jffs2extract)
 - [treemodel.cpp](https://github.com/chocoball/QTreeViewTest)
diff --git a/build_deb.sh b/build_deb.sh
@@ -7,7 +7,7 @@ QT_DIR=/opt/Qt6.2.0/6.2.0/gcc_64
 # 定义版本号
 QFSVIEWER_MAJARVERSION="0"
 QFSVIEWER_SUBVERSION="0"
-QFSVIEWER_REVISION="1"
+QFSVIEWER_REVISION="2"
 ###############################################################################
 
 

diff --git a/build_dmg.sh b/build_dmg.sh
@@ -7,7 +7,7 @@ QT_DIR=/opt/Qt6.2.0/6.2.0/gcc_64
 # 定义版本号
 QFSVIEWER_MAJARVERSION="0"
 QFSVIEWER_SUBVERSION="0"
-QFSVIEWER_REVISION="1"
+QFSVIEWER_REVISION="2"
 ###############################################################################
 
 

diff --git a/build_setup.bat b/build_setup.bat
@@ -7,7 +7,7 @@ set "QT_TOOLS_DIR=C:/Qt/Qt6.2.0/Tools/mingw810_32/bin"
 :: 定义Inno Setup目录
 set "INNO_SETUP_DIR=C:/Program Files (x86)/Inno Setup 6"
 :: 定义版本号
-set "QFSVIEWER_VERSION=0.0.1"
+set "QFSVIEWER_VERSION=0.0.2"
 :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 
 

diff --git a/partform_unix.pri b/partform_unix.pri
@@ -1,4 +1,4 @@
 ###############################################################################
 # 定义版本号路径
-QFSVIEWER_VERSION=0.0.1
+QFSVIEWER_VERSION=0.0.2
 ###############################################################################
diff --git a/partform_win32.pri b/partform_win32.pri
@@ -1,4 +1,4 @@
 ###############################################################################
 # 定义版本号路径
-QFSVIEWER_VERSION=0.0.1
+QFSVIEWER_VERSION=0.0.2
 ###############################################################################
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
@@ -16,7 +16,7 @@ MainWindow::MainWindow(QWidget *parent) :
     fsView = new FSViewWindow(this);
     ui->radioButton_jffs2->setChecked(true);
     ui->radioButton_ext4->setChecked(false);
-    ui->radioButton_vfat->setChecked(false);
+    ui->radioButton_fat->setChecked(false);
     ui->radioButton_exfat->setChecked(false);
     ui->lineEdit->setText("/home/qqm/Downloads/work/qfsviewer/test");
 }
@@ -31,7 +31,7 @@ void MainWindow::do_list_fs(const QString &imgFile)
 {
     QMap<QString, QRadioButton *> fsTypeMap = {
         {"jffs2", ui->radioButton_jffs2},
-        {"vfat", ui->radioButton_vfat},
+        {"fatX", ui->radioButton_fat},
         {"exfat", ui->radioButton_exfat},
         {"ext4", ui->radioButton_ext4},
         {"ext3", ui->radioButton_ext3},
@@ -50,7 +50,7 @@ void MainWindow::do_list_fs(const QString &imgFile)
     fsView->show();
     if(imgType == "jffs2") {
         fsView->setJffs2FSImgView(imgFile,0,info.size());
-    } else if((imgType == "vfat") || (imgType == "exfat")) {
+    } else if((imgType == "fatX") || (imgType == "exfat")) {
         fsView->setFatFSImgView(imgFile,0,info.size());
     } else if((imgType == "ext4") || (imgType == "ext3") || (imgType == "ext2")) {
         fsView->setExt4FSImgView(imgFile,0,info.size());
@@ -60,7 +60,7 @@ void MainWindow::do_list_fs(const QString &imgFile)
 void MainWindow::on_pushButton_clicked()
 {
     QString originFile = ui->lineEdit->text();
-    QString imgFile = QFileDialog::getOpenFileName(this, "Select image file", originFile.isEmpty()?QDir::homePath():originFile, "Image Files (*.data *.raw *.img *.bin *.img.gz *.bin.gz *.ext4 *.ext3 *.ext2 *.jffs2 *.vfat *.exfat);;All Files (*)" );
+    QString imgFile = QFileDialog::getOpenFileName(this, "Select image file", originFile.isEmpty()?QDir::homePath():originFile, "Image Files (*.data *.raw *.img *.bin *.img.gz *.bin.gz *.ext4 *.ext3 *.ext2 *.jffs2 *.fat* *.exfat);;All Files (*)" );
     if(imgFile.isEmpty()) {
         return;
     }

diff --git a/src/mainwindow.ui b/src/mainwindow.ui
@@ -25,21 +25,21 @@
         <item>
          <widget class="QRadioButton" name="radioButton_jffs2">
           <property name="text">
-           <string>JFFS2</string>
+           <string>jffs2</string>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="QRadioButton" name="radioButton_vfat">
+         <widget class="QRadioButton" name="radioButton_fat">
           <property name="text">
-           <string>VFAT</string>
+           <string>fatX(12/16/32)</string>
           </property>
          </widget>
         </item>
         <item>
          <widget class="QRadioButton" name="radioButton_exfat">
           <property name="text">
-           <string>EXFAT</string>
+           <string>exfat</string>
           </property>
          </widget>
         </item>
@@ -50,21 +50,21 @@
         <item>
          <widget class="QRadioButton" name="radioButton_ext4">
           <property name="text">
-           <string>EXT4</string>
+           <string>ext4</string>
           </property>
          </widget>
         </item>
         <item>
          <widget class="QRadioButton" name="radioButton_ext3">
           <property name="text">
-           <string>EXT3</string>
+           <string>ext3</string>
           </property>
          </widget>
         </item>
         <item>
          <widget class="QRadioButton" name="radioButton_ext2">
           <property name="text">
-           <string>EXT2</string>
+           <string>ext2</string>
           </property>
          </widget>
         </item>

diff --git a/test/test.vfat → test/test.fat12 b/test/test.vfat → test/test.fat12