Fix copy on btrfs

Requesting sRGB capable framebuffer is unreliable

CMakeLists.txt

@@ -92,18 +92,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 org.nou.tenmon.desktop DESTINATION "$ENV{FLATPAK_DEST}/share/applications")
-            install(FILES org.nou.tenmon.png DESTINATION "$ENV{FLATPAK_DEST}/share/icons/hicolor/32x32/apps")
-        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()
+        install(FILES space.nouspiro.tenmon.desktop DESTINATION "${CMAKE_INSTALL_DATADIR}/applications")
+        install(FILES space.nouspiro.tenmon.png DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/64x64/apps")
+        install(FILES space.nouspiro.tenmon_128.png DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/128x128/apps" RENAME space.nouspiro.tenmon.png)
     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/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>

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;
-        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 list = dir.entryList(m_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,42 @@ 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());
+
+    auto sRGB_linear = [](cv::Point3f &pixel, const int *pos)
+    {
+        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();
+
     m_image->setLevelOfDetailRange(m_superpixel ? 1 : 0, m_image->mipMaxLevel());
-    m_image->generateMipMaps();
-    m_bwImg = rawImageType.bw;
-    m_srgb = rawImageType.textureFormat == QOpenGLTexture::SRGB8 || rawImageType.textureFormat == QOpenGLTexture::SRGB8_Alpha8;
     update();
 }
 
@@ -297,9 +332,6 @@ void ImageWidget::paintGL()
     }
     else
     {
-#ifdef COLOR_MANAGMENT
-        if(m_srgb)f->glEnable(GL_FRAMEBUFFER_SRGB);
-#endif
         m_vao->bind();
         m_image->bind(0);
         m_program->bind();
@@ -309,10 +341,10 @@ void ImageWidget::paintGL()
         m_program->setUniformValue("zoom", 1.0f/m_scale);
         m_program->setUniformValue("bw", m_bwImg);
         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 +383,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

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-ICON-RESOURCE_EXECUTABLE} install --novendor --size 32 org.nou.tenmon.png org.nou.tenmon 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 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"
@@ -37,6 +39,24 @@ 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)");
+    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 +82,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)));
 
@@ -293,7 +313,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);
 }
 
@@ -309,6 +332,7 @@ void MainWindow::copyOrMove(bool copy, const QString &dest)
         progress.show();
         foreach(const QString &file, files)
         {
+            bool result = false;
             QFileInfo info(file);
             QFile srcFile(file);
             QFile dstFile(dir.absoluteFilePath(info.fileName()));
@@ -317,7 +341,7 @@ void MainWindow::copyOrMove(bool copy, const QString &dest)
                 continue;
 
             if(progress.wasCanceled())
-                break;
+                return;
 #ifdef __linux__
             if(copy)
             {
@@ -327,20 +351,30 @@ void MainWindow::copyOrMove(bool copy, const QString &dest)
                 {
                     dstFile.remove();
                     dstFile.close();
-                    qDebug() << dstFile.fileName();
-                    srcFile.copy(dstFile.fileName());
+                    result = 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 +400,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 +430,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 +454,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);
-        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

@@ -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,7 +52,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();

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>

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,6 +22,12 @@ 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);
@@ -22,6 +36,10 @@ void main(void)
 
     if(invert)color = vec4(1.0) - color;
 
+    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,46 @@
+<?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:
+            <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, PNG, BMP, GIF, PBM, PGM, PPM and SVG images</li>
+            </ul>
+        </p>
+        <p>
+            Features:
+            <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>
+            </ul>
+        </p>
+    </description>
+    <url type="homepage">https://nouspiro.space/?page_id=206</url>
+    <screenshots>
+        <screenshot type="default">
+            <image>https://nouspiro.space/wp-content/uploads/2022/04/tenmon-1024x579.png</image>
+        </screenshot>
+    </screenshots>
+    <content_rating type="oars-1.1"/>
+    <releases>
+    	<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>

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

@@ -304,7 +304,7 @@
     </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>
+        <translation type="vanished">JPEG (*.jpg *.JPG);; PNG (*.png *.PNG);;FITS (*.fits *.FITS);;XISF (*.xisf *.XISF)</translation>
     </message>
     <message>
         <source>Reindex files</source>
@@ -324,7 +324,7 @@
     </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>
+        <translation type="vanished">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>
@@ -332,12 +332,44 @@
     </message>
     <message>
         <source>FITS header editor</source>
-        <translation>FITS header editor</translation>
+        <translation type="vanished">FITS header editor</translation>
     </message>
     <message>
         <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 copy %1 from to %2</source>
+        <translation type="vanished">Failed to copy from %1 to %2</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>Failed to move from %1 to %2ˇ</source>
+        <translation type="obsolete">Failed to move from %1 to %2ˇ {1 ?}</translation>
+    </message>
 </context>
 <context>
     <name>MarkedFiles</name>

translations/tenmon_fr.ts

@@ -304,7 +304,7 @@
     </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>
+        <translation type="vanished">JPEG (*.jpg *.JPG);; PNG (*.png *.PNG);;FITS (*.fits *.FITS);;XISF (*.xisf *.XISF)</translation>
     </message>
     <message>
         <source>Reindex files</source>
@@ -324,7 +324,7 @@
     </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>
+        <translation type="vanished">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>
@@ -332,12 +332,44 @@
     </message>
     <message>
         <source>FITS header editor</source>
-        <translation>Éditeur d&apos;en-tête FITS</translation>
+        <translation type="vanished">Éditeur d&apos;en-tête FITS</translation>
     </message>
     <message>
         <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 type="unfinished">Échec de la copie</translation>
+    </message>
+    <message>
+        <source>Failed to move</source>
+        <translation type="unfinished">Échec du déplacement</translation>
+    </message>
+    <message>
+        <source>Failed to copy %1 from to %2</source>
+        <translation type="obsolete">Échec de la copie de %1 vers %2</translation>
+    </message>
+    <message>
+        <source>Failed to move from %1 to %2</source>
+        <translation type="unfinished">Échec du déplacement de %1 vers %2</translation>
+    </message>
+    <message>
+        <source>Failed to copy from %1 to %2</source>
+        <translation type="unfinished">Échec de la copie de %1 vers %2</translation>
+    </message>
+    <message>
+        <source>Failed to move from %1 to %2ˇ</source>
+        <translation type="obsolete">Échec du déplacement de %1 vers %2ˇ {1 ?}</translation>
+    </message>
 </context>
 <context>
     <name>MarkedFiles</name>

translations/tenmon_sk.ts

@@ -317,7 +317,7 @@
     </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>
+        <translation type="vanished">JPEG (*.jpg *.JPG);; PNG (*.png *.PNG);;FITS (*.fits *.FITS);;XISF (*.xisf *.XISF)</translation>
     </message>
     <message>
         <source>Reindex files</source>
@@ -337,7 +337,7 @@
     </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>
+        <translation type="vanished">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>
@@ -345,12 +345,44 @@
     </message>
     <message>
         <source>FITS header editor</source>
-        <translation>Editor FITS hlavičky</translation>
+        <translation type="vanished">Editor FITS hlavičky</translation>
     </message>
     <message>
         <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 copy %1 from to %2</source>
+        <translation type="vanished">Zlyhalo kopírovanie z %1 do %2</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>Failed to move from %1 to %2ˇ</source>
+        <translation type="obsolete">Zlyhalo presúvanie z %1 do %2ˇ {1 ?}</translation>
+    </message>
 </context>
 <context>
     <name>MarkedFiles</name>