add plguins for JPEG-XR/DDS/JPEG 2000, add options for Folder/Catalog…

… views - add plguins for JPEG-XR/DDS/JPEG 2000 - add option for saving progress.ini - add option for save width of Folder/Catalog views - add option to start app with Folder/Catalog view
kanryu · Mar 13, 2018 · 2a7ef9a · 2a7ef9a
1 parent 87b3b6b
commit 2a7ef9a
Show file tree

Hide file tree

Showing 17 changed files with 382 additions and 125 deletions.
diff --git a/QuickViewer/QuickViewer.pro b/QuickViewer/QuickViewer.pro
@@ -16,7 +16,7 @@ contains(DEFINES, QV_WITHOUT_OPENGL) {
     QT += opengl opengl-private
 }
 
-VERSION = 1.0.9
+VERSION = 1.1.0
 
 TARGET = QuickViewer
 TEMPLATE = app
@@ -245,6 +245,9 @@ win32 : !CONFIG(debug, debug|release) {
         install_qrawspeed.files = \
             ../../../qrawspeed/imageformats-$${TARGET_ARCH}/qrawspeed0.dll \
             ../../../qrawspeed/imageformats-$${TARGET_ARCH}/qapng2.dll \
+            ../../../qrawspeed/imageformats-$${TARGET_ARCH}/qjp2.dll \
+            ../../../qrawspeed/imageformats-$${TARGET_ARCH}/qdds.dll \
+            ../../../qrawspeed/imageformats-$${TARGET_ARCH}/qjpegxr.dll \
 
 #            ../../../qrawspeed/imageformats-$${TARGET_ARCH}/qlodepng0.dll \
 

diff --git a/QuickViewer/src/catalog/catalogwindow.cpp b/QuickViewer/src/catalog/catalogwindow.cpp
@@ -228,6 +228,12 @@ void CatalogWindow::dropEvent(QDropEvent *e)
     resetVolumes();
 }
 
+void CatalogWindow::resizeEvent(QResizeEvent *event)
+{
+    QWidget::resizeEvent(event);
+    qApp->setCatalogViewWidth(event->size().width());
+}
+
 void CatalogWindow::on_treeItemChanged(QString)
 {
     //ui->pathCombo->setCurrentText(QDir::toNativeSeparators(path));

diff --git a/QuickViewer/src/catalog/catalogwindow.h b/QuickViewer/src/catalog/catalogwindow.h
@@ -38,6 +38,7 @@ class CatalogWindow : public QWidget
     void searchByWord(bool doForce=false);
     void dragEnterEvent(QDragEnterEvent *e);
     void dropEvent(QDropEvent *e);
+    void resizeEvent(QResizeEvent *event);
     bool isCatalogSearching();
     void clearTagFrame();
     void initTagButtons();

diff --git a/QuickViewer/src/folderview/folderwindow.cpp b/QuickViewer/src/folderview/folderwindow.cpp
@@ -116,6 +116,7 @@ void FolderWindow::dropEvent(QDropEvent *e)
 void FolderWindow::resizeEvent(QResizeEvent *event)
 {
     QWidget::resizeEvent(event);
+    qApp->setFolderViewWidth(event->size().width());
     resetPathLabel(event->size().width());
 
 }

diff --git a/QuickViewer/src/mainwindow.cpp b/QuickViewer/src/mainwindow.cpp
@@ -28,6 +28,7 @@ MainWindow::MainWindow(QWidget *parent)
     : QMainWindow(parent)
     , ui(new Ui::MainWindow)
     , m_sliderChanging(false)
+    , m_onWindowClosing(false)
     , m_viewerWindowStateMaximized(false)
 //    , contextMenu(this)
     , m_pageManager(this)
@@ -131,11 +132,15 @@ MainWindow::MainWindow(QWidget *parent)
     // Folders
     ui->actionOpenVolumeWithProgress->setChecked(qApp->OpenVolumeWithProgress());
     ui->actionShowReadProgress->setChecked(qApp->ShowReadProgress());
+    ui->actionSaveReadProgress->setChecked(qApp->SaveReadProgress());
+    ui->actionSaveFolderViewWidth->setChecked(qApp->SaveFolderViewWidth());
 
     // Catalogs
+    ui->actionCatalogIconLongText->setChecked(qApp->IconLongText());
     ui->actionSearchTitleWithOptions->setChecked(qApp->SearchTitleWithOptions());
     ui->actionCatalogTitleWithoutOptions->setChecked(qApp->TitleWithoutOptions());
     ui->actionShowTagBar->setChecked(qApp->ShowTagBar());
+    ui->actionSaveCatalogViewWidth->setChecked(qApp->SaveCatalogViewWidth());
 
     switch(qApp->CatalogViewModeSetting()) {
     case qvEnums::List: ui->actionCatalogViewList->setChecked(true); break;
@@ -334,7 +339,7 @@ void MainWindow::keyPressEvent(QKeyEvent *event)
 
 void MainWindow::closeEvent(QCloseEvent *)
 {
-    onCatalogWindow_closed();
+    m_onWindowClosing = true;
     delete m_contextMenu;
     m_contextMenu = nullptr;
     qApp->setWindowGeometry(saveGeometry());
@@ -452,7 +457,7 @@ void MainWindow::loadVolume(QString path, bool prohibitProhibit2Page)
     if(m_pageManager.loadVolume(path)) {
         return;
     }
-
+    createFolderWindow(true, path);
     ui->statusLabel->setText(tr("Image file not found. Can't be opened", "Text to display in the status bar when failed to open the specified Volume"));
 }
 
@@ -492,6 +497,12 @@ void MainWindow::makeBookmarkMenu()
 void MainWindow::setThumbnailManager(ThumbnailManager *manager)
 {
     m_thumbManager = manager;
+
+    switch(qApp->ShowOptionViewOnStartup()) {
+    case qvEnums::NoViewStartup: break;
+    case qvEnums::FolderStartup: createFolderWindow(!qApp->ShowPanelSeparateWindow()); break;
+    case qvEnums::CatalogStartup: createCatalogWindow(!qApp->ShowPanelSeparateWindow()); break;
+    }
 }
 
 void MainWindow::onActionExit_triggered()
@@ -633,6 +644,8 @@ void MainWindow::onFolderWindow_closed()
     if(m_folderWindow) {
         delete m_folderWindow;
         m_folderWindow = nullptr;
+        if(!m_onWindowClosing)
+            qApp->setShowOptionViewOnStartup(qvEnums::NoViewStartup);
     }
 }
 
@@ -648,9 +661,9 @@ void MainWindow::onFolderWindow_openVolume(QString path)
     loadVolume(path);
 }
 
-void MainWindow::createFolderWindow(bool docked)
+void MainWindow::createFolderWindow(bool docked, QString path)
 {
-    QString oldpath;
+    QString oldpath = path;
     if(m_folderWindow) {
         oldpath = m_folderWindow->currentPath();
         onFolderWindow_closed();
@@ -660,8 +673,10 @@ void MainWindow::createFolderWindow(bool docked)
         if(oldpath.isEmpty())
             oldpath = qApp->HomeFolderPath();
     }
+    qApp->setShowOptionViewOnStartup(qvEnums::FolderStartup);
     if(docked) {
         closeAllDockedWindow();
+        int lastwidth = qApp->FolderViewWidth();
         m_folderWindow = new FolderWindow(nullptr, ui);
         m_folderWindow->setFolderPath(oldpath, false);
         connect(m_folderWindow, SIGNAL(closed()), this, SLOT(onFolderWindow_closed()));
@@ -670,7 +685,7 @@ void MainWindow::createFolderWindow(bool docked)
         ui->catalogSplitter->insertWidget(0, m_folderWindow);
         auto sizes = ui->catalogSplitter->sizes();
         int sum = sizes[0]+sizes[1];
-        sizes[0] = 200;
+        sizes[0] = qApp->SaveFolderViewWidth() ? lastwidth : 200;
         sizes[1] = sum-sizes[0];
         ui->catalogSplitter->setSizes(sizes);
         m_folderWindow->setAsInnerWidget();
@@ -706,6 +721,8 @@ void MainWindow::onCatalogWindow_closed()
     if(m_catalogWindow) {
         delete m_catalogWindow;
         m_catalogWindow = nullptr;
+        if(!m_onWindowClosing)
+            qApp->setShowOptionViewOnStartup(qvEnums::NoViewStartup);
     }
 }
 
@@ -720,16 +737,18 @@ void MainWindow::createCatalogWindow(bool docked)
 {
     if(m_catalogWindow)
         onCatalogWindow_closed();
+    qApp->setShowOptionViewOnStartup(qvEnums::CatalogStartup);
     if(docked) {
         closeAllDockedWindow();
+        int lastwidth = qApp->CatalogViewWidth();
         m_catalogWindow = new CatalogWindow(nullptr, ui);
         m_catalogWindow->setThumbnailManager(m_thumbManager);
         connect(m_catalogWindow, SIGNAL(closed()), this, SLOT(onCatalogWindow_closed()));
         connect(m_catalogWindow, SIGNAL(openVolume(QString)), this, SLOT(onCatalogWindow_openVolume(QString)));
         ui->catalogSplitter->insertWidget(0, m_catalogWindow);
         auto sizes = ui->catalogSplitter->sizes();
         int sum = sizes[0]+sizes[1];
-        sizes[0] = 200;
+        sizes[0] = qApp->SaveCatalogViewWidth() ? lastwidth : 200;
         sizes[1] = sum-sizes[0];
         ui->catalogSplitter->setSizes(sizes);
         m_catalogWindow->setAsInnerWidget();
@@ -1126,6 +1145,16 @@ void MainWindow::onActionShowReadProgress_triggered(bool enabled)
     }
 }
 
+void MainWindow::onActionSaveReadProgress_triggered(bool enable)
+{
+    qApp->setSaveReadProgress(enable);
+}
+
+void MainWindow::onActionSaveFolderViewWidth_triggered(bool enable)
+{
+    qApp->setSaveFolderViewWidth(enable);
+}
+
 void MainWindow::resetVolumeCaption()
 {
     m_volumeCaption = m_imageString.getTitleBarText();
@@ -1235,6 +1264,11 @@ void MainWindow::onActionCatalogIconLongText_triggered(bool enable)
         m_catalogWindow->resetViewMode();
 }
 
+void MainWindow::onActionSaveCatalogViewWidth_triggered(bool enable)
+{
+    qApp->setSaveCatalogViewWidth(enable);
+}
+
 void MainWindow::onActionTurnPageOnLeft_triggered()
 {
     if(qApp->RightSideBook())

diff --git a/QuickViewer/src/mainwindow.h b/QuickViewer/src/mainwindow.h
@@ -56,7 +56,7 @@ class MainWindow : public QMainWindow
 
     // FolderWindow
     bool isFolderSearching();
-    void createFolderWindow(bool docked);
+    void createFolderWindow(bool docked, QString path="");
 
     // CatalogWindow
     bool isCatalogSearching();
@@ -96,6 +96,8 @@ public slots:
     void onFolderWindow_openVolume(QString path);
     void onActionOpenVolumeWithProgress_triggered(bool enabled);
     void onActionShowReadProgress_triggered(bool enabled);
+    void onActionSaveReadProgress_triggered(bool enable);
+    void onActionSaveFolderViewWidth_triggered(bool enable);
 
     // Catalog
     void onActionShowCatalog_triggered();
@@ -108,6 +110,7 @@ public slots:
     void onActionCatalogViewIconNoText_triggered();
     void onActionShowTagBar_triggered(bool enable);
     void onActionCatalogIconLongText_triggered(bool enable);
+    void onActionSaveCatalogViewWidth_triggered(bool enable);
 
     // RetouchWindow
     void onActionShowBrightnessWindow_triggered(bool enable);
@@ -200,6 +203,7 @@ private slots:
     Ui::MainWindow *ui;
     bool m_viewerWindowStateMaximized;
     bool m_sliderChanging;
+    bool m_onWindowClosing;
 
     /**
      * @brief m_contextMenu Define on the context menu mainwindow.ui for the main screen and separate at startup

diff --git a/QuickViewer/src/mainwindow.ui b/QuickViewer/src/mainwindow.ui
@@ -421,6 +421,7 @@
     <addaction name="actionCatalogIconLongText"/>
     <addaction name="actionCatalogTitleWithoutOptions"/>
     <addaction name="actionSearchTitleWithOptions"/>
+    <addaction name="actionSaveCatalogViewWidth"/>
    </widget>
    <widget class="QMenu" name="menu_Folder">
     <property name="title">
@@ -430,9 +431,11 @@
     <addaction name="separator"/>
     <addaction name="actionOpenVolumeWithProgress"/>
     <addaction name="actionShowReadProgress"/>
+    <addaction name="actionSaveReadProgress"/>
     <addaction name="separator"/>
     <addaction name="actionShowSubfolders"/>
     <addaction name="actionConfirmDeletePage"/>
+    <addaction name="actionSaveFolderViewWidth"/>
    </widget>
    <widget class="QMenu" name="menu_Image">
     <property name="title">
@@ -1227,6 +1230,30 @@
     <string extracomment="Switch to previous image, or to previous volume if the page is last button">Prev page or volume</string>
    </property>
   </action>
+  <action name="actionSaveCatalogViewWidth">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string extracomment="Flag to restore the width of Catalog view">Save the Catalog view width</string>
+   </property>
+  </action>
+  <action name="actionSaveFolderViewWidth">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string extracomment="Flag to restore the width of Folder view">Save the Folder display width</string>
+   </property>
+  </action>
+  <action name="actionSaveReadProgress">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string extracomment="Flag to save progress.ini">Save how far you read</string>
+   </property>
+  </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
@@ -2769,6 +2796,54 @@
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>actionSaveCatalogViewWidth</sender>
+   <signal>triggered(bool)</signal>
+   <receiver>MainWindow</receiver>
+   <slot>onActionSaveCatalogViewWidth_triggered(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>-1</x>
+     <y>-1</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>392</x>
+     <y>294</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>actionSaveFolderViewWidth</sender>
+   <signal>triggered(bool)</signal>
+   <receiver>MainWindow</receiver>
+   <slot>onActionSaveFolderViewWidth_triggered(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>-1</x>
+     <y>-1</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>392</x>
+     <y>294</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>actionSaveReadProgress</sender>
+   <signal>triggered(bool)</signal>
+   <receiver>MainWindow</receiver>
+   <slot>onActionSaveReadProgress_triggered(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>-1</x>
+     <y>-1</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>392</x>
+     <y>294</y>
+    </hint>
+   </hints>
+  </connection>
  </connections>
  <slots>
   <slot>on_nextPage_triggered()</slot>
@@ -2846,5 +2921,9 @@
   <slot>onActionShaderCpuSpline36_triggered()</slot>
   <slot>onActionShaderCpuLanczos3_triggered()</slot>
   <slot>onActionShaderCpuLanczos4_triggered()</slot>
+  <slot>onActionSaveCatalogViewWidth_triggered(bool)</slot>
+  <slot>onActionSaveFolderViewWidth_triggered(bool)</slot>
+  <slot>onActionDisableCreationProgress_triggered(bool)</slot>
+  <slot>onActionSaveReadProgress_triggered(bool)</slot>
  </slots>
 </ui>