Release 20221215

Thanks to Patrick Chevalley for updated french tranlation

CMakeLists.txt

@@ -25,6 +25,7 @@ set(TENMON_SRC
     about.cpp
     database.cpp
     databaseview.cpp
+    delete.cpp
     filesystemwidget.cpp
     imageinfo.cpp
     imageringlist.cpp
@@ -63,6 +64,8 @@ elseif(APPLE)
 else()
     add_compile_definitions("__PCL_LINUX")
     set(tenmon_ICON "")
+    find_package(PkgConfig REQUIRED)
+    pkg_search_module(GIO REQUIRED gio-2.0)
 endif()
 
 add_executable(tenmon WIN32 MACOSX_BUNDLE ${tenmon_ICON} ${TENMON_SRC})
@@ -76,13 +79,14 @@ elseif(APPLE)
     target_link_directories(tenmon PRIVATE 3rdparty/lib/MacOS)
 else()
     target_link_directories(tenmon PRIVATE 3rdparty/lib/Linux)
+    target_include_directories(tenmon PRIVATE ${GIO_INCLUDE_DIRS})
 endif()
 
 target_link_libraries(tenmon Qt5::Widgets Qt5::Sql ${OpenCV_LIBS} ${GSL_LIB} ${GSLCBLAS_LIB} ${EXIF_LIB} ${FITS_LIB} ${RAW_LIB} ${WCS_LIB})
 if(APPLE)
     target_link_libraries(tenmon PCL-pxi lcms-pxi lz4-pxi RFC6234-pxi zlib-pxi "-framework CoreFoundation")
 else()
-    target_link_libraries(tenmon PCL lcms lz4  RFC6234 zlib)
+    target_link_libraries(tenmon PCL lcms lz4  RFC6234 zlib ${GIO_LDFLAGS})
 endif(APPLE)
 
 if(LIBRAW_STATIC)
@@ -92,18 +96,16 @@ endif()
 
 install(TARGETS tenmon BUNDLE DESTINATION .)
 if(UNIX AND NOT APPLE)
+    include(GNUInstallDirs)
     find_program(XDG-DESKTOP-MENU_EXECUTABLE xdg-desktop-menu)
     if(XDG-DESKTOP-MENU_EXECUTABLE)
         install(SCRIPT install.cmake)
     else()
-        if(DEFINED ENV{FLATPAK_DEST})
+        install(FILES space.nouspiro.tenmon.desktop DESTINATION "${CMAKE_INSTALL_DATADIR}/applications")
-            install(FILES org.nou.tenmon.desktop DESTINATION "$ENV{FLATPAK_DEST}/share/applications")
+        install(FILES space.nouspiro.tenmon.png DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/64x64/apps")
-            install(FILES org.nou.tenmon.png DESTINATION "$ENV{FLATPAK_DEST}/share/icons/hicolor/32x32/apps")
+        install(FILES space.nouspiro.tenmon_128.png DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/128x128/apps" RENAME space.nouspiro.tenmon.png)
-        else()
-            install(FILES org.nou.tenmon.desktop DESTINATION "/usr/share/applications")
-            install(FILES org.nou.tenmon.png DESTINATION "/usr/share/icons/hicolor/32x32/apps")
-        endif()
     endif()
+    install(FILES space.nouspiro.tenmon.metainfo.xml DESTINATION "${CMAKE_INSTALL_DATADIR}/metainfo")
 endif(UNIX AND NOT APPLE)
 
 option(RELEASE_BUILD "Release build" OFF)

about/help_en

@@ -13,7 +13,7 @@ img { margin: 5px; }
 <ul>
     <li>FITS 8, 16 bit integer and 32 bit float</li>
     <li>XISF 8, 16 bit integer and 32 bit float</li>
-    <li>JPEG and PNG images</li>
+    <li>JPEG, PNG, BMP, GIF, PBM, PGM, PPM and SVG images</li>
     <li>CR2, NEF, DNG raw images</li>
 </ul>
 </p>

about/help_fr

@@ -13,7 +13,7 @@ img { margin: 5px; }
 <ul>
     <li>FITS 8, 16 bit entier et 32 bit point flottant</li>
     <li>XISF 8, 16 bit entier et 32 bit point flottant</li>
-    <li>images JPEG et PNG</li>
+    <li>images JPEG, PNG, BMP, GIF, PBM, PGM, PPM et SVG</li>
     <li>images RAW CR2, NEF, DNG</li>
 </ul>
 </p>

about/help_sk

@@ -12,7 +12,7 @@ p { padding:0px; margin:5px 5px 10px 5px; }
 <ul>
     <li>FITS 8, 16 bitové celočíselné a 32 bitové s plávajúcou čiarkou</li>
     <li>XISF 8, 16 bitové celočíselné a 32 bitové s plávajúcou čiarkou</li>
-    <li>JPEG a PNG obrázky</li>
+    <li>JPEG, PNG, BMP, GIF, PBM, PGM, PPM a SVG obrázky</li>
     <li>CR2, NEF, DNG raw obrázky</li>
 </ul>
 </p>

about/tenmon

@@ -1,5 +1,5 @@
 <table><tr>
-<td style="padding-right:10px"><img src=":/org.nou.tenmon.png"></td>
+<td style="padding-right:10px"><img src=":/space.nouspiro.tenmon.png"></td>
 <td><h3>Tenmon</h3>
 Tenmon is FITS/XISF image viewer and converter. It also index FITS keywords.<br>
 v@GITVERSION@ Copyright © 2022 Dušan Poizl<br><br>

delete.cpp

@@ -0,0 +1,30 @@
+#ifdef __linux__
+
+#define QT_NO_KEYWORDS
+#include <QString>
+#include <iostream>
+#include <gio/gio.h>
+
+//flatpak bug prevent to use QFile::moveToTrash
+bool moveToTrash(const QString &path)
+{
+    GFile *gfile = g_file_new_for_path(path.toLocal8Bit().data());
+    GError *error = nullptr;
+    g_file_trash(gfile, nullptr, &error);
+    if(error)std::cerr << "failed to trash file " << error->code << " " << error->message << std::endl;
+    g_clear_error(&error);
+    g_object_unref(gfile);
+    return true;
+}
+
+#else
+
+#include <QFile>
+#include <QString>
+
+bool moveToTrash(const QString &path)
+{
+    return QFile::moveToTrash(path);
+}
+
+#endif

filesystemwidget.cpp

@@ -127,6 +127,7 @@ void Filetree::contextMenuEvent(QContextMenuEvent *event)
         auto filter = m_fileSystemModel->filter();
         filter ^= QDir::Hidden;
         m_fileSystemModel->setFilter(filter);
+        m_fileSystemModel->setRootPath(m_rootDir);
     }
 }
 

imageringlist.cpp

@@ -98,12 +98,14 @@ void Image::thumbnailLoadFinish(void *rawImage)
         emit thumbnailLoaded(this);
 }
 
-ImageRingList::ImageRingList(Database *database, QObject *parent) : QAbstractItemModel(parent)
+ImageRingList::ImageRingList(Database *database, const QStringList &nameFilter, QObject *parent) : QAbstractItemModel(parent)
   , m_liveMode(false)
   , m_analyzeLevel(None)
   , m_database(database)
+  , m_nameFilter(nameFilter)
 {
     connect(&m_fileSystemWatcher, SIGNAL(directoryChanged(QString)), this, SLOT(dirChanged(QString)));
+    m_nameFilter.replaceInStrings(QRegExp("^"), "*.");
     m_thumbPool = new QThreadPool(this);
 }
 
@@ -122,10 +124,7 @@ bool ImageRingList::setDir(const QString path, const QString &currentFile)
 
     if(dir.exists())
     {
-        QStringList nameFilter;
+        QStringList list = dir.entryList(m_nameFilter, QDir::Files | QDir::Readable, m_liveMode ? QDir::Time : QDir::Name | QDir::IgnoreCase);
-        nameFilter << "*.jpg" << "*.jpeg" << "*.png" << "*.cr2" << "*.nef" << "*.dng" << "*.fit" << "*.fits" << "*.xisf";
-
-        QStringList list = dir.entryList(nameFilter, QDir::Files | QDir::Readable, m_liveMode ? QDir::Time : QDir::Name | QDir::IgnoreCase);
         QStringList absolutePaths;
         foreach(const QString &file, list)
         {

imageringlist.h

@@ -60,8 +60,9 @@ class ImageRingList : public QAbstractItemModel
     AnalyzeLevel m_analyzeLevel;
     QThreadPool *m_thumbPool;
     Database *m_database;
+    QStringList m_nameFilter;
 public:
-    explicit ImageRingList(Database *database, QObject *parent = 0);
+    explicit ImageRingList(Database *database, const QStringList &nameFilter, QObject *parent = 0);
     ~ImageRingList() override;
     bool setDir(const QString path, const QString &currentFile = QString());
     void setFile(const QString &file);

imagescrollareagl.cpp

@@ -11,6 +11,7 @@
 #include <QCoreApplication>
 #include <QPainter>
 #include <QFileInfo>
+#include <cmath>
 
 struct RawImageType
 {
@@ -26,16 +27,18 @@ const RawImageType rawImageTypes[] = {
     {QOpenGLTexture::Red, QOpenGLTexture::R32F, QOpenGLTexture::Float32, true},
 #ifdef COLOR_MANAGMENT
     {QOpenGLTexture::RGB, QOpenGLTexture::SRGB8, QOpenGLTexture::UInt8, false},
-    {QOpenGLTexture::RGBA,QOpenGLTexture::SRGB8, QOpenGLTexture::UInt8, false},
+    {QOpenGLTexture::RGBA,QOpenGLTexture::SRGB8_Alpha8, QOpenGLTexture::UInt8, false},
 #else
     {QOpenGLTexture::RGB, QOpenGLTexture::RGB8_UNorm, QOpenGLTexture::UInt8, false},
-    {QOpenGLTexture::RGBA,QOpenGLTexture::RGB8_UNorm, QOpenGLTexture::UInt8, false},
+    {QOpenGLTexture::RGBA,QOpenGLTexture::RGBA8_UNorm, QOpenGLTexture::UInt8, false},
 #endif
     {QOpenGLTexture::RGB, QOpenGLTexture::RGB16_UNorm, QOpenGLTexture::UInt16, false},
     {QOpenGLTexture::RGBA, QOpenGLTexture::RGB16_UNorm, QOpenGLTexture::UInt16, false},
     {QOpenGLTexture::RGB, QOpenGLTexture::RGB32F, QOpenGLTexture::Float32, false}
 };
 
+static bool MANUAL_MIPMAP_GEN = false;
+
 void setScrollRange(QScrollBar *scrollBar, int newRange)
 {
     int page = scrollBar->pageStep();
@@ -84,9 +87,6 @@ ImageWidget::ImageWidget(Database *database, QWidget *parent) : QOpenGLWidget(pa
     });
 
     setMouseTracking(true);
-#ifdef COLOR_MANAGMENT
-    setTextureFormat(GL_SRGB8_ALPHA8);
-#endif
 }
 
 ImageWidget::~ImageWidget()
@@ -105,8 +105,11 @@ void ImageWidget::setImage(std::shared_ptr<RawImage> image, int index)
     m_currentImg = index;
 
     const RawImageType &rawImageType = rawImageTypes[image->type()];
+    m_srgb = rawImageType.textureFormat == QOpenGLTexture::SRGB8 || rawImageType.textureFormat == QOpenGLTexture::SRGB8_Alpha8;
+    m_bwImg = rawImageType.bw;
 
     m_image->destroy();
+    m_image->setAutoMipMapGenerationEnabled(false);
     m_image->setFormat(rawImageType.textureFormat);
     m_image->setSize(image->width(), image->height());
     m_image->setMipLevels([&](){ int c = 0; int s = std::min(m_imgWidth, m_imgHeight); while(s>>=1)c++; return c; }());
@@ -115,10 +118,46 @@ void ImageWidget::setImage(std::shared_ptr<RawImage> image, int index)
     m_image->setWrapMode(QOpenGLTexture::ClampToEdge);
     m_image->setBorderColor(0, 0, 0, 0);
     m_image->setData(0, rawImageType.pixelFormat, rawImageType.dataType, (const void*)image->data(), m_transferOptions.get());
-    m_image->setLevelOfDetailRange(m_superpixel ? 1 : 0, m_image->mipMaxLevel());
+
-    m_image->generateMipMaps();
+    auto sRGB_linear = [](cv::Point3f &pixel, const int *pos)
-    m_bwImg = rawImageType.bw;
+    {
-    m_srgb = rawImageType.textureFormat == QOpenGLTexture::SRGB8 || rawImageType.textureFormat == QOpenGLTexture::SRGB8_Alpha8;
+        pixel.x = pixel.x <= 0.04045f ? pixel.x / 12.92f : std::pow((pixel.x + 0.055) / 1.055f, 2.4f);
+        pixel.y = pixel.y <= 0.04045f ? pixel.y / 12.92f : std::pow((pixel.y + 0.055) / 1.055f, 2.4f);
+        pixel.z = pixel.z <= 0.04045f ? pixel.z / 12.92f : std::pow((pixel.z + 0.055) / 1.055f, 2.4f);
+    };
+
+    auto linear_sRGB = [](cv::Point3f &pixel, const int *pos)
+    {
+        pixel.x = pixel.x <= 0.0031308f ? pixel.x * 12.92f : 1.055f * std::pow(pixel.x , 1/2.4f) - 0.055f;
+        pixel.y = pixel.y <= 0.0031308f ? pixel.y * 12.92f : 1.055f * std::pow(pixel.y , 1/2.4f) - 0.055f;
+        pixel.z = pixel.z <= 0.0031308f ? pixel.z * 12.92f : 1.055f * std::pow(pixel.z , 1/2.4f) - 0.055f;
+    };
+
+    //AMD OpenGL driver on Windows doesn't generate mipmaps for sRGB textures correctly
+    if(m_srgb && MANUAL_MIPMAP_GEN)
+    {
+        cv::Mat img = image->mat();
+        img.convertTo(img, CV_32FC3, 1/255.0);
+        img.forEach<cv::Point3f>(sRGB_linear);
+        cv::Size size(img.cols, img.rows);
+        for(int i=1; i<m_image->mipLevels(); i++)
+        {
+            cv::Mat mip;
+            size /= 2;
+            cv::resize(img, mip, size);
+            mip.copyTo(img);
+            mip.forEach<cv::Point3f>(linear_sRGB);
+            mip.convertTo(mip, CV_8UC3, 255);
+            m_image->setData(i, rawImageType.pixelFormat, rawImageType.dataType, (const void*)mip.ptr(), m_transferOptions.get());
+        }
+    }
+    else m_image->generateMipMaps();
+
+    if(m_debayerTex)
+    {
+        f->glDeleteTextures(1, &m_debayerTex);
+        m_debayerTex = 0;
+    }
     update();
 }
 
@@ -177,7 +216,6 @@ void ImageWidget::setOffset(int dx, int dy)
 void ImageWidget::superPixel(bool enable)
 {
     m_superpixel = enable;
-    m_image->setLevelOfDetailRange(enable ? 1 : 0, m_image->mipMaxLevel());
     update();
 }
 
@@ -201,6 +239,9 @@ QImage ImageWidget::renderToImage()
     m_program->setUniformValue("offset", 0.0f, 0.0f);
     m_program->setUniformValue("zoom", 1.0f);
 
+    if(m_superpixel && m_debayerTex)
+        f->glBindTexture(GL_TEXTURE_2D, m_debayerTex);
+    else
         m_image->bind(0);
     f->glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
 
@@ -297,22 +338,25 @@ void ImageWidget::paintGL()
     }
     else
     {
-#ifdef COLOR_MANAGMENT
+        debayer();
-        if(m_srgb)f->glEnable(GL_FRAMEBUFFER_SRGB);
+
-#endif
         m_vao->bind();
+        if(m_superpixel && m_debayerTex)
+            f->glBindTexture(GL_TEXTURE_2D, m_debayerTex);
+        else
             m_image->bind(0);
+
         m_program->bind();
         m_program->setUniformValue("viewport", (float)width(), (float)height());
         m_program->setUniformValue("offset", dx, dy);
         m_program->setUniformValue("mtf_param", m_low, m_mid, m_high);
         m_program->setUniformValue("zoom", 1.0f/m_scale);
-        m_program->setUniformValue("bw", m_bwImg);
+        m_program->setUniformValue("bw", m_bwImg && !m_superpixel);
         m_program->setUniformValue("invert", m_invert);
-        f->glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
 #ifdef COLOR_MANAGMENT
-        if(m_srgb)f->glDisable(GL_FRAMEBUFFER_SRGB);
+        m_program->setUniformValue("srgb", m_srgb);
 #endif
+        f->glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
     }
 
 }
@@ -351,6 +395,8 @@ void ImageWidget::initializeGL()
     qDebug() << (char*)f->glGetString(GL_RENDERER);
     qDebug() << (char*)f->glGetString(GL_VERSION);
 
+    MANUAL_MIPMAP_GEN = QString((const char*)f->glGetString(GL_VENDOR)).startsWith("ATI Technologies Inc", Qt::CaseInsensitive);
+
     qDebug() << context()->format();
 
     // each vertex is  x,y 2D position and s,t texture coordinates
@@ -382,12 +428,27 @@ void ImageWidget::initializeGL()
     m_program->setUniformValue("qt_Texture0", (GLuint)0);
     m_program->setUniformValue("scale", 1.0f, 0.0f);
 
+    m_debayerProgram = std::unique_ptr<QOpenGLShaderProgram>(new QOpenGLShaderProgram);
+    m_debayerProgram->addShaderFromSourceFile(QOpenGLShader::Vertex, ":/shaders/debayer.vert");
+    m_debayerProgram->addShaderFromSourceFile(QOpenGLShader::Fragment, ":/shaders/debayer.frag");
+    if(f3)f3->glBindFragDataLocation(m_debayerProgram->programId(), 0, "color");
+    m_debayerProgram->bind();
+    m_debayerProgram->enableAttributeArray("qt_Vertex");
+    m_debayerProgram->setAttributeBuffer("qt_Vertex", GL_FLOAT, 0, 2, sizeof(float)*4);
+    m_debayerProgram->enableAttributeArray("qt_MultiTexCoord0");
+    m_debayerProgram->setAttributeBuffer("qt_MultiTexCoord0", GL_FLOAT, sizeof(float)*2, 2, sizeof(float)*4);
+    m_debayerProgram->setUniformValue("qt_Texture0", (GLuint)0);
+    if(!m_debayerProgram->link())
+    {
+        qDebug() << "Link failed" << m_debayerProgram->log();
+    }
+
     m_vaoThumb->bind();
 
     m_thumbnailProgram = std::unique_ptr<QOpenGLShaderProgram>(new QOpenGLShaderProgram);
     m_thumbnailProgram->addShaderFromSourceFile(QOpenGLShader::Vertex, ":/shaders/thumb.vert");
     m_thumbnailProgram->addShaderFromSourceFile(QOpenGLShader::Fragment, ":/shaders/thumb.frag");
-    if(f3)f3->glBindFragDataLocation(m_program->programId(), 0, "color");
+    if(f3)f3->glBindFragDataLocation(m_thumbnailProgram->programId(), 0, "color");
     m_thumbnailProgram->bind();
     m_thumbnailProgram->enableAttributeArray("qt_Vertex");
     m_thumbnailProgram->setAttributeBuffer("qt_Vertex", GL_FLOAT, 0, 2, sizeof(float)*4);
@@ -561,6 +622,28 @@ void ImageWidget::thumbSelect(QMouseEvent *event)
     }
 }
 
+void ImageWidget::debayer()
+{
+    if(m_debayerTex > 0 || !m_superpixel || !m_bwImg || m_imgWidth < 0)return;
+
+    QOpenGLFramebufferObject fbo(m_imgWidth, m_imgHeight, QOpenGLFramebufferObject::NoAttachment, GL_TEXTURE_2D, GL_RGBA16);
+    fbo.bind();
+
+    f->glViewport(0, 0, m_imgWidth, m_imgHeight);
+
+    m_debayerProgram->bind();
+    m_image->bind(0);
+    f->glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
+
+    fbo.release();
+    f->glViewport(0, 0, m_width, m_height);
+    m_debayerTex = fbo.takeTexture();
+    f->glBindTexture(GL_TEXTURE_2D, m_debayerTex);
+    f->glGenerateMipmap(GL_TEXTURE_2D);
+    f->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+    f->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
+}
+
 ImageScrollAreaGL::ImageScrollAreaGL(Database *database, QWidget *parent) : QWidget(parent)
 {
     QGridLayout *layout = new QGridLayout(this);

imagescrollareagl.h

@@ -32,6 +32,7 @@ class ImageWidget : public QOpenGLWidget
     QTimer *m_updateTimer;
     std::unique_ptr<QOpenGLShaderProgram> m_program;
     std::unique_ptr<QOpenGLShaderProgram> m_thumbnailProgram;
+    std::unique_ptr<QOpenGLShaderProgram> m_debayerProgram;
     std::unique_ptr<QOpenGLBuffer> m_buffer;
     std::unique_ptr<QOpenGLBuffer> m_bufferSizes;
     std::unique_ptr<QOpenGLTexture> m_image;
@@ -39,6 +40,7 @@ class ImageWidget : public QOpenGLWidget
     std::unique_ptr<QOpenGLVertexArrayObject> m_vaoThumb;
     std::unique_ptr<QOpenGLPixelTransferOptions> m_transferOptions;
     std::unique_ptr<QOpenGLTexture> m_thumbnailTexture;
+    GLuint m_debayerTex = 0;
     std::shared_ptr<RawImage> m_rawImage;
     std::shared_ptr<WCSData> m_wcs;
     int m_width, m_height;
@@ -88,6 +90,7 @@ protected:
     void mouseMoveEvent(QMouseEvent *event) override;
     void mouseReleaseEvent(QMouseEvent *event) override;
     void thumbSelect(QMouseEvent *event);
+    void debayer();
 signals:
     void fileDropped(const QString &path);
     void status(const QString &value, const QString &pixelCoords, const QString &celestialCoords);

install.cmake

@@ -1,4 +1,5 @@
 find_program(XDG-DESKTOP-MENU_EXECUTABLE xdg-desktop-menu)
 find_program(XDG-ICON-RESOURCE_EXECUTABLE xdg-icon-resource)
-execute_process(COMMAND ${XDG-DESKTOP-MENU_EXECUTABLE} install --novendor org.nou.tenmon.desktop WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR})
+execute_process(COMMAND ${XDG-DESKTOP-MENU_EXECUTABLE} install --novendor space.nouspiro.tenmon.desktop WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR})
-execute_process(COMMAND ${XDG-ICON-RESOURCE_EXECUTABLE} install --novendor --size 32 org.nou.tenmon.png org.nou.tenmon WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR})
+execute_process(COMMAND ${XDG-ICON-RESOURCE_EXECUTABLE} install --novendor --size 64 space.nouspiro.tenmon.png space.nouspiro.tenmon WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR})
+execute_process(COMMAND ${XDG-ICON-RESOURCE_EXECUTABLE} install --novendor --size 128 space.nouspiro.tenmon_128.png space.nouspiro.tenmon WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR})

loadrunable.cpp

@@ -406,7 +406,7 @@ void LoadRunable::run()
     {
         QImage img(m_file);
 #ifdef COLOR_MANAGMENT
-        if(img.colorSpace().isValid())
+        if(img.colorSpace().isValid() && img.colorSpace() != QColorSpace::SRgb)
             img.convertToColorSpace(QColorSpace::SRgb);
 #endif
 
@@ -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;
 };
 

main.cpp

@@ -15,15 +15,12 @@ int main(int argc, char *argv[])
     format.setMinorVersion(3);
     format.setOption(QSurfaceFormat::DebugContext);
     format.setProfile(QSurfaceFormat::OpenGLContextProfile::CoreProfile);
-#ifdef COLOR_MANAGMENT
-    format.setColorSpace(QSurfaceFormat::sRGBColorSpace);
-#endif
     QSurfaceFormat::setDefaultFormat(format);
 
     QApplication a(argc, argv);
     a.setOrganizationName("nou");
     a.setApplicationName("Tenmon");
-    a.setWindowIcon(QIcon(":/org.nou.tenmon.png"));
+    a.setWindowIcon(QIcon(":/space.nouspiro.tenmon.png"));
 
     QTranslator translator;
     QTranslator translator2;

mainwindow.cpp

@@ -16,6 +16,8 @@
 #include <QGuiApplication>
 #include <QThreadPool>
 #include <QStatusBar>
+#include <QImageReader>
+#include <QMimeDatabase>
 #include "loadrunable.h"
 #include "markedfiles.h"
 #include "about.h"
@@ -28,6 +30,8 @@
 #include <sys/socket.h>
 #endif
 
+bool moveToTrash(const QString &path);
+
 int MainWindow::socketPair[2] = {0, 0};
 
 MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
@@ -37,6 +41,25 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
 
     SettingsDialog::loadSettings();
 
+    QStringList nameFilter;
+    _saveFilter = tr("FITS (*.fits *.fit);;XISF (*.xisf);;");
+    _openFilter = tr("Images (");
+    QMimeDatabase db;
+    auto supportedFormats = QImageReader::supportedMimeTypes();
+    QStringList filters;
+    for(auto format : supportedFormats)
+    {
+        QMimeType mimeType = db.mimeTypeForName(format);
+        _saveFilter.append(mimeType.filterString() + ";;");
+        _openFilter.append("*.");
+        _openFilter.append(mimeType.suffixes().join(" *."));
+        _openFilter.append(" ");
+        nameFilter.append(mimeType.suffixes());
+    }
+    _openFilter.append("*.fit *.fits *.xisf *.cr2 *.nef *.dng)");
+    _openFilter.append(tr(";;All files (*)"));
+    nameFilter.append({"fit", "fits", "xisf", "cr2", "nef", "dng"});
+
     m_info = new ImageInfo(this);
     QDockWidget *infoDock = new QDockWidget(tr("Image info"), this);
     infoDock->setWidget(m_info);
@@ -62,7 +85,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
     connect(m_stretchPanel, &StretchToolbar::invert, m_imageGL->imageWidget(), &ImageWidget::invert);
     connect(m_stretchPanel, &StretchToolbar::superPixel, m_imageGL->imageWidget(), &ImageWidget::superPixel);
 
-    m_ringList = new ImageRingList(m_database, this);
+    m_ringList = new ImageRingList(m_database, nameFilter, this);
     m_filesystem = new FilesystemWidget(m_ringList, this);
     connect(m_filesystem, SIGNAL(fileSelected(int)), this, SLOT(loadFile(int)));
 
@@ -108,8 +131,9 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
     fileMenu->addAction(tr("Open"), this, SLOT(loadFile()), QKeySequence::Open);
     fileMenu->addAction(tr("Save as"), this, SLOT(saveAs()), QKeySequence::Save);
     fileMenu->addSeparator();
-    fileMenu->addAction(tr("Copy marked files"), this, SLOT(copyMarked()));
+    fileMenu->addAction(tr("Copy marked files"), this, SLOT(copyMarked()), Qt::Key_F5);
-    fileMenu->addAction(tr("Move marked files"), this, SLOT(moveMarked()));
+    fileMenu->addAction(tr("Move marked files"), this, SLOT(moveMarked()), Qt::Key_F6);
+    fileMenu->addAction(tr("Move marked files to trash"), this, &MainWindow::deleteMarked, QKeySequence::Delete);
     fileMenu->addSeparator();
     fileMenu->addAction(tr("Index directory"), this, SLOT(indexDir()));
     fileMenu->addAction(tr("Reindex files"), this, SLOT(reindex()));
@@ -141,7 +165,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
     menuBar()->addMenu(viewMenu);
 
     QMenu *selectMenu = new QMenu(tr("Select"), this);
-    selectMenu->addAction(tr("Mark"), this, SLOT(markImage()), Qt::Key_F5);
+    selectMenu->addAction(tr("Mark"), this, SLOT(markImage()), Qt::Key_F7);
     selectMenu->addAction(tr("Unmark"), this, SLOT(unmarkImage()), Qt::Key_F8);
     selectMenu->addSeparator();
     selectMenu->addAction(tr("Mark and next"), this, SLOT(markAndNext()), Qt::Key_M);
@@ -293,7 +317,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);
     copyOrMove(copy, dest);
 }
 
@@ -307,8 +334,9 @@ void MainWindow::copyOrMove(bool copy, const QString &dest)
         QProgressDialog progress(copy ? tr("Copying") : tr("Moving"), tr("Cancel"), 0, files.size(), this);
         progress.setWindowModality(Qt::WindowModal);
         progress.show();
-        foreach(const QString &file, files)
+        for(const QString &file : files)
         {
+            bool result = false;
             QFileInfo info(file);
             QFile srcFile(file);
             QFile dstFile(dir.absoluteFilePath(info.fileName()));
@@ -317,7 +345,7 @@ void MainWindow::copyOrMove(bool copy, const QString &dest)
                 continue;
 
             if(progress.wasCanceled())
-                break;
+                return;
 #ifdef __linux__
             if(copy)
             {
@@ -327,20 +355,30 @@ void MainWindow::copyOrMove(bool copy, const QString &dest)
                 {
                     dstFile.remove();
                     dstFile.close();
-                    qDebug() << dstFile.fileName();
+                    result = srcFile.copy(dstFile.fileName());
-                    srcFile.copy(dstFile.fileName());
                 }
+                else result = true;
             }
             else
             {
-                srcFile.rename(dstFile.fileName());
+                result = srcFile.rename(dstFile.fileName());
             }
 #else
             if(copy)
-                srcFile.copy(dstFile.fileName());
+                result = srcFile.copy(dstFile.fileName());
             else
-                srcFile.rename(dstFile.fileName());
+                result = srcFile.rename(dstFile.fileName());
 #endif
+            if(!result)
+            {
+                QString t = copy ? tr("Failed to copy") : tr("Failed to move");
+                QString m = copy ? tr("Failed to copy from %1 to %2") : tr("Failed to move from %1 to %2");
+                QMessageBox::StandardButton button = QMessageBox::warning(this, t,
+                                                                          m.arg(srcFile.fileName()).arg(dir.absolutePath()),
+                                                                          QMessageBox::Ignore | QMessageBox::Abort);
+                qDebug() << button;
+                if(button == QMessageBox::Abort)return;
+            }
             progress.setValue(i++);
         }
         m_database->clearMarkedFiles();
@@ -366,7 +404,10 @@ 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,
+                                                _openFilter);
     loadFile(file);
 }
 
@@ -393,7 +434,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);
     indexDir(dir);
 }
 
@@ -417,35 +458,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,
+                                 _saveFilter,
+                                 &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);
+        QString format = filterToFormat(file, selectedFilter);
-        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";
-        }
 
-        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()
@@ -504,6 +555,34 @@ void MainWindow::moveMarked()
     copyOrMove(false);
 }
 
+void MainWindow::deleteMarked()
+{
+    QStringList files = m_database->getMarkedFiles();
+    if(QMessageBox::question(this, tr("Move files to trash?"), tr("Do you want to move %1 files to trash?").arg(files.size())) != QMessageBox::Yes)
+        return;
+
+    QProgressDialog progress(tr("Moving marked files to trash"), tr("Cancel"), 0, files.size(), this);
+    progress.setWindowModality(Qt::WindowModal);
+    progress.show();
+    int i = 0;
+    for(const QString &file : files)
+    {
+        if(!QFile::exists(file))
+            continue;
+
+        if(progress.wasCanceled())
+            return;
+
+        if(!moveToTrash(file))
+        {
+            QMessageBox::warning(this, tr("Failed to move file to trash"), tr("Failed to move file to trash %1").arg(file));
+            return;
+        }
+        progress.setValue(i++);
+    }
+    m_database->clearMarkedFiles();
+}
+
 void MainWindow::toggleFullScreen()
 {
     if(isFullScreen())

mainwindow.h

@@ -28,6 +28,8 @@ class MainWindow : public QMainWindow
     QSocketNotifier *socketNotifier;
     QString _lastDir;
     bool _maximized;
+    QString _openFilter;
+    QString _saveFilter;
 public:
     MainWindow(QWidget *parent = 0);
     ~MainWindow() override;
@@ -50,13 +52,14 @@ 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();
     void unmarkAndNext();
     void copyMarked();
     void moveMarked();
+    void deleteMarked();
     void toggleFullScreen();
     void liveMode(bool active);
     void imageStats(bool imageStats);

resources.qrc

@@ -3,7 +3,7 @@
         <file>invert.png</file>
         <file>nuke.png</file>
         <file>bayer.png</file>
-        <file>org.nou.tenmon.png</file>
+        <file>space.nouspiro.tenmon.png</file>
         <file>nuke_a.png</file>
         <file>about/tenmon</file>
         <file>about/pcl</file>
@@ -16,6 +16,8 @@
         <file>shaders/image.vert</file>
         <file>shaders/thumb.frag</file>
         <file>shaders/thumb.vert</file>
+        <file>shaders/debayer.frag</file>
+        <file>shaders/debayer.vert</file>
     </qresource>
     <qresource lang="en" prefix="/">
         <file alias="help">about/help_en</file>

settingsdialog.cpp

@@ -3,6 +3,7 @@
 #include <QDialogButtonBox>
 #include <QLabel>
 #include <QSettings>
+#include <QApplication>
 #include "rawimage.h"
 
 extern int DEFAULT_WIDTH;
@@ -47,8 +48,12 @@ SettingsDialog::SettingsDialog(QWidget *parent) : QDialog(parent)
     m_thumSize->setValue(settings.value("settings/thumnailsize", THUMB_SIZE).toInt());
     m_thumSize->setToolTip(tr("Thumbnail size in pixels"));
 
+    m_useNativeDialog = new QCheckBox(tr("Don't use native file dialog"), this);
+    m_useNativeDialog->setChecked(QApplication::testAttribute(Qt::AA_DontUseNativeDialogs));
+
     layout->addRow(tr("Image preload count"), m_preloadImages);
     layout->addRow(tr("Thumbnails size"), m_thumSize);
+    layout->addRow(m_useNativeDialog);
     layout->addRow(new QLabel(tr("Changes in settings will take effect after program restart.")));
 
     QDialogButtonBox *buttonBox = new QDialogButtonBox(this);
@@ -67,6 +72,7 @@ void SettingsDialog::loadSettings()
     THUMB_SIZE_BORDER = THUMB_SIZE + 10;
     THUMB_SIZE_BORDER_Y = THUMB_SIZE + 30;
     DEFAULT_WIDTH = settings.value("settings/preloadimagecount", DEFAULT_WIDTH).toInt();
+    QApplication::setAttribute(Qt::AA_DontUseNativeDialogs, settings.value("settings/dontusenativedialogs", false).toBool());
 }
 
 void SettingsDialog::saveSettings()
@@ -74,4 +80,6 @@ void SettingsDialog::saveSettings()
     QSettings settings;
     settings.setValue("settings/thumbnailsize", m_thumSize->value());
     settings.setValue("settings/preloadimagecount", m_preloadImages->value());
+    settings.setValue("settings/dontusenativedialogs", m_useNativeDialog->isChecked());
+    QApplication::setAttribute(Qt::AA_DontUseNativeDialogs, m_useNativeDialog->isChecked());
 }

settingsdialog.h

@@ -3,6 +3,7 @@
 
 #include <QDialog>
 #include <QSpinBox>
+#include <QCheckBox>
 
 class SettingsDialog : public QDialog
 {
@@ -15,6 +16,7 @@ private:
 
     QSpinBox *m_preloadImages;
     QSpinBox *m_thumSize;
+    QCheckBox *m_useNativeDialog;
 };
 
 #endif // SETTINGSDIALOG_H

shaders/debayer.frag

@@ -0,0 +1,41 @@
+#version 330
+
+uniform sampler2D qt_Texture0;
+in vec2 qt_TexCoord0;
+in vec2 center;
+out vec4 color;
+
+#define f(x, y) texelFetch(qt_Texture0, icenter + ivec2(x, y), 0).r
+
+void main(void)
+{
+    ivec2 texSize = textureSize(qt_Texture0, 0);
+    ivec2 icenter = ivec2(center);
+    ivec2 alternate = icenter % 2;
+
+    // cross, checker, theta, phi
+    const vec4 kA = vec4(-1.0, -1.5,  0.5, -1.0) / 8.0;
+    const vec4 kB = vec4( 2.0,  0.0,  0.0,  4.0) / 8.0;
+    const vec4 kC = vec4( 4.0,  6.0,  5.0,  5.0) / 8.0;
+    const vec4 kD = vec4( 0.0,  2.0, -1.0, -1.0) / 8.0;
+    const vec4 kE = vec4(-1.0, -1.5, -1.0,  0.5) / 8.0;
+    const vec4 kF = vec4( 2.0,  0.0,  4.0,  0.0) / 8.0;
+
+    float A = f(0,2) + f(0,-2);
+    float B = f(0,1) + f(0,-1);
+    float C = f(0,0);
+    float D = f(1,1) + f(-1,1) + f(1,-1) + f(-1,-1);
+    float E = f(2,0) + f(-2,0);
+    float F = f(1,0) + f(-1,0);
+
+    vec4 P = kA*A + kB*B + kC*C + kD*D + kE*E + kF*F;
+
+    color.rgb = alternate.y == 0 ?
+                (alternate.x == 0 ? vec3(C, P.xy) : // even row even col
+                                    vec3(P.z, C, P.w)) : // even row odd col
+                (alternate.x == 0 ? vec3(P.w, C, P.z) : // odd row even col
+                                    vec3(P.yx, C)); // odd row odd col
+
+    color.a = 1.0;
+}
+

shaders/debayer.vert

@@ -0,0 +1,16 @@
+#version 330
+
+uniform sampler2D qt_Texture0;
+in vec2 qt_Vertex;
+in vec2 qt_MultiTexCoord0;
+out vec2 qt_TexCoord0;
+out vec2 center;
+
+void main(void)
+{
+    vec2 texSize = vec2(textureSize(qt_Texture0, 0));
+    gl_Position = vec4(qt_Vertex, 0.0, 1.0);
+    qt_TexCoord0 = qt_MultiTexCoord0;
+    qt_TexCoord0.y = 1.0 - qt_TexCoord0.y;
+    center = qt_TexCoord0 * texSize.xy;
+}

shaders/image.frag

@@ -4,9 +4,17 @@ uniform sampler2D qt_Texture0;
 uniform vec3 mtf_param;
 uniform bool bw;
 uniform bool invert;
+uniform bool srgb;
 in vec2 qt_TexCoord0;
 out vec4 color;
 
+vec3 Linear2sRGB(vec3 color)
+{
+    return mix(12.92 * color.rgb,
+               1.055 * pow(color, vec3(1.0 / 2.4)) - 0.055,
+               greaterThan(color, vec3(0.0031308)));
+}
+
 vec4 MTF(vec4 x, vec3 m)
 {
     x = (x - m.x) / (m.z - m.x);
@@ -14,13 +22,23 @@ vec4 MTF(vec4 x, vec3 m)
     return ((m.y - 1) * x) / ((2 * m.y - 1) * x - m.y);
 }
 
+vec3 checker()
+{
+    vec2 pattern = fract(gl_FragCoord.xy * 0.0625) - 0.5;
+    return vec3(step(pattern.x * pattern.y, 0.0) * 0.25 + 0.25);
+}
+
 void main(void)
 {
     color = texture(qt_Texture0, qt_TexCoord0);
     if(bw)color = color.rrra;
     color = MTF(color, mtf_param);
 
-    if(invert)color = vec4(1.0) - color;
+    if(invert)color.rgb = vec3(1.0) - color.rgb;
+
+    color.rgb = mix(checker(), color.rgb, color.a);
+
+    if(srgb)color.rgb = Linear2sRGB(color.rgb);
 
     if(any(lessThan(qt_TexCoord0, vec2(0.0))) || any(greaterThan(qt_TexCoord0, vec2(1.0))))
         color = vec4(0.0, 0.0, 0.0, 1.0);

space.nouspiro.tenmon.desktop

@@ -1,9 +1,9 @@
 [Desktop Entry]
 Type=Application
 Exec=tenmon %U
-Icon=org.nou.tenmon
+Icon=space.nouspiro.tenmon
 Comment=FITS Image viewer
 Name=Tenmon
-Categories=Graphics;2DGraphics;RasterGraphics;Viewer;
+Categories=Graphics;2DGraphics;RasterGraphics;Viewer;Science;Astronomy
 MimeType=image/fits;image/x-xisf;
 Terminal=false

space.nouspiro.tenmon.metainfo.xml

@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop">
+    <id>space.nouspiro.tenmon</id>
+    <launchable type="desktop-id">space.nouspiro.tenmon.desktop</launchable>
+    <name>Tenmon</name>
+    <summary>FITS/XISF image viewer, converter, index and search</summary>
+    <metadata_license>CC0-1.0</metadata_license>
+    <project_license>GPL-3.0</project_license>
+    <description>
+        <p>It is intended primarily for viewing astro photos and images. It supports the following formats:</p>
+        <ul>
+            <li>FITS 8, 16 bit integer and 32 bit float</li>
+            <li>XISF 8, 16 bit integer and 32 bit float</li>
+            <li>RAW CR2, DNG, NEF</li>
+            <li>JPEG, PNG, BMP, GIF, PBM, PGM, PPM and SVG images</li>
+        </ul>
+        <p>Features of application:</p>
+        <ul>
+            <li>Using same stretch function as PixInsight</li>
+            <li>OpenGL accelerated drawing</li>
+            <li>Index and search FITS XISF header data</li>
+            <li>Quick mark images and then copy/move marked files</li>
+            <li>Convert FITS &lt;-&gt; XISF</li>
+            <li>Convert FITS/XISF -&gt; JPEG/PNG</li>
+            <li>Image statistics mean, media, min, max</li>
+            <li>Support for WCS</li>
+            <li>Thumbnails</li>
+            <li>Convert CFA images to colour - debayer</li>
+            <li>Color space aware</li>
+        </ul>
+    </description>
+    <categories>
+        <category>Graphics</category>
+        <category>Viewer</category>
+        <category>Science</category>
+        <category>Astronomy</category>
+    </categories>
+    <keywords>
+        <keyword>astronomy</keyword>
+    </keywords>
+    <url type="homepage">https://nouspiro.space/?page_id=206</url>
+    <url type="bugtracker">https://github.com/flathub/space.nouspiro.tenmon/issues</url>
+    <screenshots>
+        <screenshot type="default">
+            <image>https://nouspiro.space/wp-content/uploads/2022/04/tenmon-1024x579.png</image>
+            <image>https://nouspiro.space/wp-content/uploads/2022/12/tenmon2-1024x645.png</image>
+        </screenshot>
+    </screenshots>
+    <content_rating type="oars-1.1"/>
+    <releases>
+        <release version="20221215" date="2022-12-15">
+            <description>
+                  <ul>
+                      <li>Add debayer support</li>
+                      <li>Move to trash action</li>
+                      <li>Change copy and move shortcuts to F5 and F6</li>
+                      <li>Change mark and unmark key shortcuts to F7 and F8</li>
+                      <li>Fix not refreshing file tree</li>
+                      <li>Add option to not use native file dialog</li>
+                  </ul>
+            </description>
+        </release>
+    	<release version="20221209" date="2022-12-09"/>
+        <release version="20221126" date="2022-11-26"/>
+        <release version="20221121" date="2022-11-11"/>
+        <release version="20221023" date="2022-10-23"/>
+    </releases>
+</component>

space.nouspiro.tenmon.svg

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="128"
+   height="128"
+   viewBox="0 0 33.866666 33.866668"
+   version="1.1"
+   id="svg5"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   sodipodi:docname="space.nouspiro.tenmon.svg"
+   inkscape:export-filename="/home/nou/c++/tenmon/space.nouspiro.tenmon_128.png"
+   inkscape:export-xdpi="96.000008"
+   inkscape:export-ydpi="96.000008"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="mm"
+     showgrid="false"
+     units="px"
+     width="128px"
+     inkscape:zoom="2.6547419"
+     inkscape:cx="54.430903"
+     inkscape:cy="78.162024"
+     inkscape:window-width="1862"
+     inkscape:window-height="1136"
+     inkscape:window-x="58"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs2" />
+  <g
+     inkscape:label="Vrstva 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:#000000;stroke:#ffffff;stroke-width:0;stroke-linejoin:round"
+       id="rect1196"
+       width="33.866665"
+       height="33.866665"
+       x="5e-07"
+       y="5e-07" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:17.276px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.359917"
+       x="-0.41414261"
+       y="23.331123"
+       id="text8592"><tspan
+         sodipodi:role="line"
+         id="tspan8590"
+         style="fill:#ffffff;stroke-width:0.359917"
+         x="-0.41414261"
+         y="23.331123">天文</tspan></text>
+  </g>
+</svg>

stretchtoolbar.cpp

@@ -34,7 +34,7 @@ StretchToolbar::StretchToolbar(QWidget *parent) : QToolBar(tr("Stretch toolbar")
     invertButton->setCheckable(true);
     connect(invertButton, SIGNAL(toggled(bool)), this, SIGNAL(invert(bool)));
 
-    QAction *superPixelButton = addAction(QIcon(":/bayer.png"), tr("Superpixel CFA draw 2x2 pixel as one"));
+    QAction *superPixelButton = addAction(QIcon(":/bayer.png"), tr("Debayer CFA"));
     superPixelButton->setCheckable(true);
     connect(superPixelButton, SIGNAL(toggled(bool)), this, SIGNAL(superPixel(bool)));
 

tenmon.desktop

@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Exec=Tenmon %U
-Icon=org.nou.tenmon
-Comment=FITS Image viewer
-Name=Tenmon
-Categories=Graphics;2DGraphics;RasterGraphics;Viewer;
-MimeType=image/fits;image/x-xisf;
-Terminal=false

translations/tenmon_en.ts

@@ -154,10 +154,6 @@
         <source>Filesystem</source>
         <translation>File system</translation>
     </message>
-    <message>
-        <source>FITS files database</source>
-        <translation type="vanished">FITS files database</translation>
-    </message>
     <message>
         <source>Tenmon</source>
         <translation>Tenmon</translation>
@@ -294,18 +290,10 @@
         <source>Moving</source>
         <translation>Moving</translation>
     </message>
-    <message>
-        <source>Images (*.jpg *.jpeg *.png *.cr2 *.fit *.fits *.xisf *.JPG *.JPEG *.PNG *.CR2 *.FIT *.FITS *.XISF)</source>
-        <translation type="vanished">Images (*.jpg *.jpeg *.png *.cr2 *.fit *.fits *.xisf *.JPG *.JPEG *.PNG *.CR2 *.FIT *.FITS *.XISF)</translation>
-    </message>
     <message>
         <source>Indexing FITS files</source>
         <translation>Indexing FITS files</translation>
     </message>
-    <message>
-        <source>JPEG (*.jpg *.JPG);; PNG (*.png *.PNG);;FITS (*.fits *.FITS);;XISF (*.xisf *.XISF)</source>
-        <translation>JPEG (*.jpg *.JPG);; PNG (*.png *.PNG);;FITS (*.fits *.FITS);;XISF (*.xisf *.XISF)</translation>
-    </message>
     <message>
         <source>Reindex files</source>
         <translation>Reindex files</translation>
@@ -322,10 +310,6 @@
         <source>Star finder</source>
         <translation>Star finder</translation>
     </message>
-    <message>
-        <source>Images (*.jpg *.jpeg *.png *.cr2 *.nef *.dng *.fit *.fits *.xisf *.JPG *.JPEG *.PNG *.CR2 *.NEF *.DNG *.FIT *.FITS *.XISF)</source>
-        <translation>Images (*.jpg *.jpeg *.png *.cr2 *.nef *.dng *.fit *.fits *.xisf *.JPG *.JPEG *.PNG *.CR2 *.NEF *.DNG *.FIT *.FITS *.XISF)</translation>
-    </message>
     <message>
         <source>Edit</source>
         <translation>Edit</translation>
@@ -338,6 +322,58 @@
         <source>Settings</source>
         <translation>Settings</translation>
     </message>
+    <message>
+        <source>Images (</source>
+        <translation>Images (</translation>
+    </message>
+    <message>
+        <source>FITS (*.fits *.fit);;XISF (*.xisf);;</source>
+        <translation>FITS image (*.fits *.fit);;XISF image (*.xisf);;</translation>
+    </message>
+    <message>
+        <source>Failed to copy</source>
+        <translation>Failed to copy</translation>
+    </message>
+    <message>
+        <source>Failed to move</source>
+        <translation>Failed to move</translation>
+    </message>
+    <message>
+        <source>Failed to move from %1 to %2</source>
+        <translation>Failed to move from %1 to %2</translation>
+    </message>
+    <message>
+        <source>Failed to copy from %1 to %2</source>
+        <translation>Failed to copy from %1 to %2</translation>
+    </message>
+    <message>
+        <source>;;All files (*)</source>
+        <translation>;;All files (*)</translation>
+    </message>
+    <message>
+        <source>Move files to trash?</source>
+        <translation>Move files to trash?</translation>
+    </message>
+    <message>
+        <source>Do you want to move %1 files to trash?</source>
+        <translation>Do you want to move %1 files to trash?</translation>
+    </message>
+    <message>
+        <source>Failed to move file to trash</source>
+        <translation>Failed to move file to trash</translation>
+    </message>
+    <message>
+        <source>Failed to move file to trash %1</source>
+        <translation>Failed to move file to trash %1</translation>
+    </message>
+    <message>
+        <source>Move marked files to trash</source>
+        <translation>Move marked files to trash</translation>
+    </message>
+    <message>
+        <source>Moving marked files to trash</source>
+        <translation>Moving marked files to trash</translation>
+    </message>
 </context>
 <context>
     <name>MarkedFiles</name>
@@ -462,6 +498,10 @@
         <source>Changes in settings will take effect after program restart.</source>
         <translation>Changes in settings will take effect after program restart.</translation>
     </message>
+    <message>
+        <source>Don&apos;t use native file dialog</source>
+        <translation>Don&apos;t use native file dialog</translation>
+    </message>
 </context>
 <context>
     <name>StretchToolbar</name>
@@ -481,13 +521,13 @@
         <source>Invert colors</source>
         <translation>Invert colors</translation>
     </message>
-    <message>
-        <source>Superpixel CFA draw 2x2 pixel as one</source>
-        <translation>Superpixel CFA draw 2x2 pixel as one</translation>
-    </message>
     <message>
         <source>Apply auto stretch on load</source>
         <translation>Apply auto stretch on load</translation>
     </message>
+    <message>
+        <source>Debayer CFA</source>
+        <translation>Debayer CFA</translation>
+    </message>
 </context>
 </TS>

translations/tenmon_fr.ts

@@ -154,10 +154,6 @@
         <source>Filesystem</source>
         <translation>Système de fichier</translation>
     </message>
-    <message>
-        <source>FITS files database</source>
-        <translation type="vanished">FITS files database</translation>
-    </message>
     <message>
         <source>Tenmon</source>
         <translation>Tenmon</translation>
@@ -294,18 +290,10 @@
         <source>Moving</source>
         <translation>Déplacement</translation>
     </message>
-    <message>
-        <source>Images (*.jpg *.jpeg *.png *.cr2 *.fit *.fits *.xisf *.JPG *.JPEG *.PNG *.CR2 *.FIT *.FITS *.XISF)</source>
-        <translation type="vanished">Images (*.jpg *.jpeg *.png *.cr2 *.fit *.fits *.xisf *.JPG *.JPEG *.PNG *.CR2 *.FIT *.FITS *.XISF)</translation>
-    </message>
     <message>
         <source>Indexing FITS files</source>
         <translation>Indexation des fichiers FITS</translation>
     </message>
-    <message>
-        <source>JPEG (*.jpg *.JPG);; PNG (*.png *.PNG);;FITS (*.fits *.FITS);;XISF (*.xisf *.XISF)</source>
-        <translation>JPEG (*.jpg *.JPG);; PNG (*.png *.PNG);;FITS (*.fits *.FITS);;XISF (*.xisf *.XISF)</translation>
-    </message>
     <message>
         <source>Reindex files</source>
         <translation>Ré-indexer les fichiers</translation>
@@ -322,10 +310,6 @@
         <source>Star finder</source>
         <translation>Détecteur d&apos;étoiles</translation>
     </message>
-    <message>
-        <source>Images (*.jpg *.jpeg *.png *.cr2 *.nef *.dng *.fit *.fits *.xisf *.JPG *.JPEG *.PNG *.CR2 *.NEF *.DNG *.FIT *.FITS *.XISF)</source>
-        <translation>Images (*.jpg *.jpeg *.png *.cr2 *.nef *.dng *.fit *.fits *.xisf *.JPG *.JPEG *.PNG *.CR2 *.NEF *.DNG *.FIT *.FITS *.XISF)</translation>
-    </message>
     <message>
         <source>Edit</source>
         <translation>Éditer</translation>
@@ -338,6 +322,58 @@
         <source>Settings</source>
         <translation>Réglages</translation>
     </message>
+    <message>
+        <source>Images (</source>
+        <translation>Images (</translation>
+    </message>
+    <message>
+        <source>FITS (*.fits *.fit);;XISF (*.xisf);;</source>
+        <translation>FITS image (*.fits *.fit);;XISF image (*.xisf);;</translation>
+    </message>
+    <message>
+        <source>Failed to copy</source>
+        <translation>Échec de la copie</translation>
+    </message>
+    <message>
+        <source>Failed to move</source>
+        <translation>Échec du déplacement</translation>
+    </message>
+    <message>
+        <source>Failed to move from %1 to %2</source>
+        <translation>Échec du déplacement de %1 vers %2</translation>
+    </message>
+    <message>
+        <source>Failed to copy from %1 to %2</source>
+        <translation>Échec de la copie de %1 vers %2</translation>
+    </message>
+    <message>
+        <source>;;All files (*)</source>
+        <translation>;;Tout les fichiers (*)</translation>
+    </message>
+    <message>
+        <source>Move files to trash?</source>
+        <translation>Déplacer les fichiers dans la corbeille?</translation>
+    </message>
+    <message>
+        <source>Do you want to move %1 files to trash?</source>
+        <translation>Voulez-vous déplacer le fichier %1 dans la corbeille?</translation>
+    </message>
+    <message>
+        <source>Failed to move file to trash</source>
+        <translation>Echec du déplacement dans la corbeille</translation>
+    </message>
+    <message>
+        <source>Failed to move file to trash %1</source>
+        <translation>Echec du déplacement de %1 dans la corbeille</translation>
+    </message>
+    <message>
+        <source>Move marked files to trash</source>
+        <translation>Déplacer les fichiers marqués dans la corbeille</translation>
+    </message>
+    <message>
+        <source>Moving marked files to trash</source>
+        <translation>Déplacement des fichiers marqués dans la corbeille</translation>
+    </message>
 </context>
 <context>
     <name>MarkedFiles</name>
@@ -462,6 +498,10 @@
         <source>Changes in settings will take effect after program restart.</source>
         <translation>Les changements de paramètres prendront effet après le redémarrage du programme.</translation>
     </message>
+    <message>
+        <source>Don&apos;t use native file dialog</source>
+        <translation>N&apos;utilisez pas la boîte de dialogue de fichier natif</translation>
+    </message>
 </context>
 <context>
     <name>StretchToolbar</name>
@@ -481,13 +521,13 @@
         <source>Invert colors</source>
         <translation>Inverser les couleurs</translation>
     </message>
-    <message>
-        <source>Superpixel CFA draw 2x2 pixel as one</source>
-        <translation>Superpixel CFA dessine 2x2 pixels comme un seul</translation>
-    </message>
     <message>
         <source>Apply auto stretch on load</source>
         <translation>Appliquer la luminosité automatiquement au chargement</translation>
     </message>
+    <message>
+        <source>Debayer CFA</source>
+        <translation>Débayeriser CFA</translation>
+    </message>
 </context>
 </TS>

translations/tenmon_sk.ts

@@ -155,14 +155,6 @@
         <source>Filesystem</source>
         <translation>Zoznam súborov</translation>
     </message>
-    <message>
-        <source>FITS Editor</source>
-        <translation type="vanished">FITS editor</translation>
-    </message>
-    <message>
-        <source>FITS files database</source>
-        <translation type="vanished">Databáza FITS súborov</translation>
-    </message>
     <message>
         <source>Tenmon</source>
         <translation>Tenmon</translation>
@@ -247,14 +239,6 @@
         <source>Open file</source>
         <translation>Otvoriť súbor</translation>
     </message>
-    <message>
-        <source>Images (*.jpg *.jpeg *.png *.cr2 *.fit *.fits *.JPG *.JPEG *.PNG *.CR2 *.FIT *.FITS)</source>
-        <translation type="vanished">Obrázky (*.jpg *.jpeg *.png *.cr2 *.fit *.fits *.JPG *.JPEG *.PNG *.CR2 *.FIT *.FITS)</translation>
-    </message>
-    <message>
-        <source>Images (*.jpg *.png *.JPG *.PNG)</source>
-        <translation type="vanished">Obrázky (*.jpg *.png *.JPG *.PNG)</translation>
-    </message>
     <message>
         <source>Select destination</source>
         <translation>Vybrať cieľ</translation>
@@ -307,18 +291,10 @@
         <source>Moving</source>
         <translation>Presúvanie</translation>
     </message>
-    <message>
-        <source>Images (*.jpg *.jpeg *.png *.cr2 *.fit *.fits *.xisf *.JPG *.JPEG *.PNG *.CR2 *.FIT *.FITS *.XISF)</source>
-        <translation type="vanished">Obrázky (*.jpg *.jpeg *.png *.cr2 *.fit *.fits *.xisf *.JPG *.JPEG *.PNG *.CR2 *.FIT *.FITS *.XISF)</translation>
-    </message>
     <message>
         <source>Indexing FITS files</source>
         <translation>Indexovanie FITS/XISF súborov</translation>
     </message>
-    <message>
-        <source>JPEG (*.jpg *.JPG);; PNG (*.png *.PNG);;FITS (*.fits *.FITS);;XISF (*.xisf *.XISF)</source>
-        <translation>JPEG (*.jpg *.JPG);; PNG (*.png *.PNG);;FITS (*.fits *.FITS);;XISF (*.xisf *.XISF)</translation>
-    </message>
     <message>
         <source>Reindex files</source>
         <translation>Reindexuj súbory</translation>
@@ -335,10 +311,6 @@
         <source>Star finder</source>
         <translation>Vyhľadávač hviezd</translation>
     </message>
-    <message>
-        <source>Images (*.jpg *.jpeg *.png *.cr2 *.nef *.dng *.fit *.fits *.xisf *.JPG *.JPEG *.PNG *.CR2 *.NEF *.DNG *.FIT *.FITS *.XISF)</source>
-        <translation>Obrázky (*.jpg *.jpeg *.png *.cr2 *.nef *.dng *.fit *.fits *.xisf *.JPG *.JPEG *.PNG *.CR2 *.NEF *.DNG *.FIT *.FITS *.XISF)</translation>
-    </message>
     <message>
         <source>Edit</source>
         <translation>Upraviť</translation>
@@ -351,6 +323,58 @@
         <source>Settings</source>
         <translation>Nastavenia</translation>
     </message>
+    <message>
+        <source>Images (</source>
+        <translation>Obrázky (</translation>
+    </message>
+    <message>
+        <source>FITS (*.fits *.fit);;XISF (*.xisf);;</source>
+        <translation>Obrázok FITS (*.fits *.fit);;Obrázok XISF (*.xisf);;</translation>
+    </message>
+    <message>
+        <source>Failed to copy</source>
+        <translation>Zlyhalo kopírovanie</translation>
+    </message>
+    <message>
+        <source>Failed to move</source>
+        <translation>Zlyhalo presúvanie</translation>
+    </message>
+    <message>
+        <source>Failed to move from %1 to %2</source>
+        <translation>Zlyhalo presúvanie z %1 do %2</translation>
+    </message>
+    <message>
+        <source>Failed to copy from %1 to %2</source>
+        <translation>Zlyhalo kopírovanie z %1 do %2</translation>
+    </message>
+    <message>
+        <source>;;All files (*)</source>
+        <translation>;;Všetky súbory (*)</translation>
+    </message>
+    <message>
+        <source>Move files to trash?</source>
+        <translation>Presunúť súbory do koša?</translation>
+    </message>
+    <message>
+        <source>Do you want to move %1 files to trash?</source>
+        <translation>Presunúť %1 súborov do koša?</translation>
+    </message>
+    <message>
+        <source>Failed to move file to trash</source>
+        <translation>Zlyhalo presunutie súbora do koša</translation>
+    </message>
+    <message>
+        <source>Failed to move file to trash %1</source>
+        <translation>Zlyhalo presunutie súbora do koša %1</translation>
+    </message>
+    <message>
+        <source>Move marked files to trash</source>
+        <translation>Presunúť označené súbory do koša</translation>
+    </message>
+    <message>
+        <source>Moving marked files to trash</source>
+        <translation>Presúvanie do koša</translation>
+    </message>
 </context>
 <context>
     <name>MarkedFiles</name>
@@ -475,6 +499,10 @@
         <source>Changes in settings will take effect after program restart.</source>
         <translation>Zmeny v nastaveniach sa prejavia po reštarte programu.</translation>
     </message>
+    <message>
+        <source>Don&apos;t use native file dialog</source>
+        <translation>Nepoužívať natívny súborový dialóg</translation>
+    </message>
 </context>
 <context>
     <name>StretchToolbar</name>
@@ -494,13 +522,13 @@
         <source>Invert colors</source>
         <translation>Invertuj farby</translation>
     </message>
-    <message>
-        <source>Superpixel CFA draw 2x2 pixel as one</source>
-        <translation>Super pixel CFA kreslenie 2x2 pixelov ako jeden</translation>
-    </message>
     <message>
         <source>Apply auto stretch on load</source>
         <translation>Aplikuj automatické natiahnutie pri načítaní</translation>
     </message>
+    <message>
+        <source>Debayer CFA</source>
+        <translation>Preveď CFA na farbu</translation>
+    </message>
 </context>
 </TS>