Release 20221126

loadrunable.cpp

@@ -541,9 +541,10 @@ bool readXISFHeader(const QString &path, ImageInfoData &info)
     return true;
 }
 
-ConvertRunable::ConvertRunable(const QString &in, const QString &out) :
+ConvertRunable::ConvertRunable(const QString &in, const QString &out, const QString &format) :
     m_infile(in),
-    m_outfile(out)
+    m_outfile(out),
+    m_format(format)
 {
 }
 
@@ -648,7 +649,7 @@ void ConvertRunable::run()
 
     if(rawimage)
     {
-        if(m_outfile.endsWith(".XISF", Qt::CaseInsensitive))
+        if(m_format == "XISF")
         {
             pcl::XISFOptions options;
             pcl::FITSKeywordArray fitskeywords;
@@ -675,7 +676,7 @@ void ConvertRunable::run()
 
         }
 
-        if(m_outfile.endsWith(".FITS", Qt::CaseInsensitive) || m_outfile.endsWith(".FIT", Qt::CaseInsensitive))
+        if(m_format == "FITS")
         {
             int status = 0;
             fitsfile *fw;

loadrunable.h

@@ -25,8 +25,9 @@ class ConvertRunable : public QRunnable
 {
     QString m_infile;
     QString m_outfile;
+    QString m_format;
 public:
-    ConvertRunable(const QString &in, const QString &out);
+    ConvertRunable(const QString &in, const QString &out, const QString &format);
     void run() override;
 };
 

mainwindow.cpp

@@ -293,7 +293,10 @@ void MainWindow::closeEvent(QCloseEvent *event)
 
 void MainWindow::copyOrMove(bool copy)
 {
-    QString dest = QFileDialog::getExistingDirectory(this, tr("Select destination"), _lastDir);
+    QString dest = QFileDialog::getExistingDirectory(this,
+                                                     tr("Select destination"),
+                                                     _lastDir,
+                                                     QFileDialog::ShowDirsOnly | QFileDialog::DontUseNativeDialog);
     copyOrMove(copy, dest);
 }
 
@@ -366,7 +369,12 @@ void MainWindow::pixmapLoaded(Image *image)
 
 void MainWindow::loadFile()
 {
-    QString file = QFileDialog::getOpenFileName(this, tr("Open file"), _lastDir, tr("Images (*.jpg *.jpeg *.png *.cr2 *.nef *.dng *.fit *.fits *.xisf *.JPG *.JPEG *.PNG *.CR2 *.NEF *.DNG *.FIT *.FITS *.XISF)"));
+    QString file = QFileDialog::getOpenFileName(this,
+                                                tr("Open file"),
+                                                _lastDir,
+                                                tr("Images (*.jpg *.jpeg *.png *.cr2 *.nef *.dng *.fit *.fits *.xisf *.JPG *.JPEG *.PNG *.CR2 *.NEF *.DNG *.FIT *.FITS *.XISF)"),
+                                                nullptr,
+                                                QFileDialog::DontUseNativeDialog);
     loadFile(file);
 }
 
@@ -393,7 +401,7 @@ void MainWindow::loadFile(int row)
 
 void MainWindow::indexDir()
 {
-    QString dir = QFileDialog::getExistingDirectory(this, tr("Index directory"), _lastDir);
+    QString dir = QFileDialog::getExistingDirectory(this, tr("Index directory"), _lastDir, QFileDialog::ShowDirsOnly | QFileDialog::DontUseNativeDialog);
     indexDir(dir);
 }
 
@@ -417,35 +425,45 @@ void MainWindow::reindex()
 void MainWindow::saveAs()
 {
     QString selectedFilter;
-    QString file = QFileDialog::getSaveFileName(this, tr("Save as"), _lastDir, tr("JPEG (*.jpg *.JPG);; PNG (*.png *.PNG);;FITS (*.fits *.FITS);;XISF (*.xisf *.XISF)"), &selectedFilter);
+    QString file = QFileDialog::getSaveFileName(this,
+                                 tr("Save as"),
+                                 _lastDir,
+                                 tr("JPEG (*.jpg *.JPG);; PNG (*.png *.PNG);;FITS (*.fits *.FITS);;XISF (*.xisf *.XISF)"),
+                                 &selectedFilter);
+    auto filterToFormat = [](const QString &file, const QString &filter) -> const char*
+    {
+        QString suffix = QFileInfo(file).suffix();
+        if(!suffix.compare("jpg", Qt::CaseInsensitive) || !suffix.compare("jpeg", Qt::CaseInsensitive))return "JPEG";
+        if(!suffix.compare("png", Qt::CaseInsensitive))return "PNG";
+        if(!suffix.compare("fits", Qt::CaseInsensitive) || !suffix.compare("fit", Qt::CaseInsensitive))return "FITS";
+        if(!suffix.compare("xisf", Qt::CaseInsensitive))return "XISF";
+        if(filter.contains("png"))return "PNG";
+        if(filter.contains("fits"))return "FITS";
+        if(filter.contains("xisf"))return "XISF";
+        return "JPEG";
+    };
+
     if(!file.isEmpty())
     {
-        QFileInfo info(file);
-        if(info.suffix().isEmpty())
-        {
-            if(selectedFilter.contains("jpg"))file += ".jpg";
-            if(selectedFilter.contains("png"))file += ".png";
-            if(selectedFilter.contains("fits"))file += ".fits";
-            if(selectedFilter.contains("xisf"))file += ".xisf";
-        }
+        QString format = filterToFormat(file, selectedFilter);
 
-        if(file.endsWith(".fits") || file.endsWith(".xisf"))
+        if(format == "FITS" || format == "XISF")
         {
-            convert(file);
+            convert(file, format);
         }
         else
         {
             QImage img = m_imageGL->imageWidget()->renderToImage();
             if(!img.isNull())
-                img.save(file);
+                img.save(file, filterToFormat(file, selectedFilter));
         }
     }
 }
 
-void MainWindow::convert(const QString &outfile)
+void MainWindow::convert(const QString &outfile, const QString &format)
 {
     QString file = m_ringList->currentImage()->name();
-    QThreadPool::globalInstance()->start(new ConvertRunable(file, outfile));
+    QThreadPool::globalInstance()->start(new ConvertRunable(file, outfile, format));
 }
 
 void MainWindow::markImage()

mainwindow.h

@@ -50,7 +50,7 @@ protected slots:
     void indexDir(const QString &dir);
     void reindex();
     void saveAs();
-    void convert(const QString &outfile);
+    void convert(const QString &outfile, const QString &format);
     void markImage();
     void unmarkImage();
     void markAndNext();

space.nouspiro.tenmon.metainfo.xml

@@ -38,6 +38,7 @@
     </screenshots>
     <content_rating type="oars-1.1"/>
     <releases>
+        <release version="20221126" date="2022-11-26"/>
         <release version="20221121" date="2022-11-11"/>
         <release version="20221023" date="2022-10-23"/>
     </releases>