Reorganize resources

CMakeLists.txt

@@ -57,12 +57,13 @@ if(COLOR_MANAGMENT)
     add_compile_definitions("COLOR_MANAGMENT")
 endif(COLOR_MANAGMENT)
 
-qt_add_resources(TENMON_SRC resources.qrc)
+qt_add_resources(TENMON_SRC resources/resources.qrc)
+qt_add_resources(TENMON_SRC shaders/shaders.qrc)
 if(WIN32)
-    list(APPEND TENMON_SRC icon.rc)
+    list(APPEND TENMON_SRC resources/icon.rc)
     set(tenmon_ICON "")
 elseif(APPLE)
-    set(tenmon_ICON ${CMAKE_CURRENT_SOURCE_DIR}/tenmon.icns)
+    set(tenmon_ICON ${CMAKE_CURRENT_SOURCE_DIR}/resources/tenmon.icns)
     set_source_files_properties(${tenmon_ICON} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
 else()
     set(tenmon_ICON "")
@@ -98,11 +99,11 @@ if(UNIX AND NOT APPLE)
     if(XDG-DESKTOP-MENU_EXECUTABLE)
         install(SCRIPT install.cmake)
     else()
-        install(FILES space.nouspiro.tenmon.desktop DESTINATION "${CMAKE_INSTALL_DATADIR}/applications")
+        install(FILES resources/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 resources/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)
+        install(FILES resources/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")
+    install(FILES resources/space.nouspiro.tenmon.metainfo.xml DESTINATION "${CMAKE_INSTALL_DATADIR}/metainfo")
 endif(UNIX AND NOT APPLE)
 
 option(RELEASE_BUILD "Release build" OFF)

imagescrollareagl.cpp

@@ -383,7 +383,6 @@ void ImageWidget::paintGL()
         m_program->setUniformValue("false_color", m_falseColor && m_bwImg);
         m_program->setUniformValue("invert", m_invert);
         m_program->setUniformValue("filtering", m_scale > 1.0f ? FILTERING : 1);
-        qDebug() << 1.0 / m_scale;
 #ifdef COLOR_MANAGMENT
         m_program->setUniformValue("srgb", m_srgb);
 #endif
@@ -448,8 +447,8 @@ void ImageWidget::initializeGL()
     // f->glVertexAttribPointer(0, 2, GL_FLOAT, false, sizeof(float)*4, 0);
 
     m_program = std::unique_ptr<QOpenGLShaderProgram>(new QOpenGLShaderProgram);
-    m_program->addShaderFromSourceFile(QOpenGLShader::Vertex, ":/shaders/image.vert");
+    m_program->addShaderFromSourceFile(QOpenGLShader::Vertex, ":/image.vert");
-    m_program->addShaderFromSourceFile(QOpenGLShader::Fragment, ":/shaders/image.frag");
+    m_program->addShaderFromSourceFile(QOpenGLShader::Fragment, ":/image.frag");
 
     if(!m_program->link())
     {
@@ -465,8 +464,8 @@ void ImageWidget::initializeGL()
     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::Vertex, ":/debayer.vert");
-    m_debayerProgram->addShaderFromSourceFile(QOpenGLShader::Fragment, ":/shaders/debayer.frag");
+    m_debayerProgram->addShaderFromSourceFile(QOpenGLShader::Fragment, ":/debayer.frag");
 
     m_debayerProgram->bind();
     m_debayerProgram->enableAttributeArray("qt_Vertex");
@@ -482,8 +481,8 @@ void ImageWidget::initializeGL()
     m_vaoThumb->bind();
 
     m_thumbnailProgram = std::unique_ptr<QOpenGLShaderProgram>(new QOpenGLShaderProgram);
-    m_thumbnailProgram->addShaderFromSourceFile(QOpenGLShader::Vertex, ":/shaders/thumb.vert");
+    m_thumbnailProgram->addShaderFromSourceFile(QOpenGLShader::Vertex, ":/thumb.vert");
-    m_thumbnailProgram->addShaderFromSourceFile(QOpenGLShader::Fragment, ":/shaders/thumb.frag");
+    m_thumbnailProgram->addShaderFromSourceFile(QOpenGLShader::Fragment, ":/thumb.frag");
 
     m_thumbnailProgram->bind();
     m_thumbnailProgram->enableAttributeArray("qt_Vertex");

resources.qrc

@@ -1,32 +0,0 @@
-<RCC>
-    <qresource prefix="/">
-        <file>invert.png</file>
-        <file>nuke.png</file>
-        <file>bayer.png</file>
-        <file>space.nouspiro.tenmon.png</file>
-        <file>nuke_a.png</file>
-        <file>about/tenmon</file>
-        <file>translations/tenmon_en.qm</file>
-        <file>translations/tenmon_sk.qm</file>
-        <file>about/filter.png</file>
-        <file>about/stretch-panel.png</file>
-        <file>translations/tenmon_fr.qm</file>
-        <file>shaders/image.frag</file>
-        <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>
-        <file>falsecolor.png</file>
-        <file>link.png</file>
-    </qresource>
-    <qresource prefix="/" lang="en">
-        <file alias="help">about/help_en</file>
-    </qresource>
-    <qresource prefix="/" lang="sk">
-        <file alias="help">about/help_sk</file>
-    </qresource>
-    <qresource prefix="/" lang="fr">
-        <file alias="help">about/help_fr</file>
-    </qresource>
-</RCC>

resources/resources.qrc

@@ -0,0 +1,26 @@
+<RCC>
+    <qresource prefix="/">
+        <file>invert.png</file>
+        <file>nuke.png</file>
+        <file>bayer.png</file>
+        <file>space.nouspiro.tenmon.png</file>
+        <file>nuke_a.png</file>
+        <file>../about/tenmon</file>
+        <file>../translations/tenmon_en.qm</file>
+        <file>../translations/tenmon_sk.qm</file>
+        <file>../about/filter.png</file>
+        <file>../about/stretch-panel.png</file>
+        <file>../translations/tenmon_fr.qm</file>
+        <file>falsecolor.png</file>
+        <file>link.png</file>
+    </qresource>
+    <qresource lang="en" prefix="/">
+        <file alias="help">../about/help_en</file>
+    </qresource>
+    <qresource lang="sk" prefix="/">
+        <file alias="help">../about/help_sk</file>
+    </qresource>
+    <qresource lang="fr" prefix="/">
+        <file alias="help">../about/help_fr</file>
+    </qresource>
+</RCC>

settingsdialog.cpp

@@ -61,7 +61,7 @@ SettingsDialog::SettingsDialog(QWidget *parent) : QDialog(parent)
     m_useNativeDialog->setChecked(QApplication::testAttribute(Qt::AA_DontUseNativeDialogs));
 
     m_filtering = new QComboBox(this);
-    m_filtering->addItems({tr("Nearest"), tr("Bilinear"), tr("Bicubic")});
+    m_filtering->addItems({tr("Nearest"), tr("Linear"), tr("Cubic")});
     m_filtering->setCurrentIndex(FILTERING);
 
     layout->addRow(tr("Image preload count"), m_preloadImages);

shaders/shaders.qrc

@@ -0,0 +1,10 @@
+<RCC>
+    <qresource prefix="/">
+        <file>debayer.frag</file>
+        <file>debayer.vert</file>
+        <file>image.frag</file>
+        <file>image.vert</file>
+        <file>thumb.frag</file>
+        <file>thumb.vert</file>
+    </qresource>
+</RCC>