diff --git a/CMakeLists.txt b/CMakeLists.txt index df99912..1163433 100644 --- a/CMakeLists.txt +++ b/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 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.desktop DESTINATION "${CMAKE_INSTALL_DATADIR}/applications") + install(FILES resources/space.nouspiro.tenmon.png DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/64x64/apps") + 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) diff --git a/imagescrollareagl.cpp b/imagescrollareagl.cpp index c5071ee..f722a7e 100644 --- a/imagescrollareagl.cpp +++ b/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(new QOpenGLShaderProgram); - m_program->addShaderFromSourceFile(QOpenGLShader::Vertex, ":/shaders/image.vert"); - m_program->addShaderFromSourceFile(QOpenGLShader::Fragment, ":/shaders/image.frag"); + m_program->addShaderFromSourceFile(QOpenGLShader::Vertex, ":/image.vert"); + 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(new QOpenGLShaderProgram); - m_debayerProgram->addShaderFromSourceFile(QOpenGLShader::Vertex, ":/shaders/debayer.vert"); - m_debayerProgram->addShaderFromSourceFile(QOpenGLShader::Fragment, ":/shaders/debayer.frag"); + m_debayerProgram->addShaderFromSourceFile(QOpenGLShader::Vertex, ":/debayer.vert"); + 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(new QOpenGLShaderProgram); - m_thumbnailProgram->addShaderFromSourceFile(QOpenGLShader::Vertex, ":/shaders/thumb.vert"); - m_thumbnailProgram->addShaderFromSourceFile(QOpenGLShader::Fragment, ":/shaders/thumb.frag"); + m_thumbnailProgram->addShaderFromSourceFile(QOpenGLShader::Vertex, ":/thumb.vert"); + m_thumbnailProgram->addShaderFromSourceFile(QOpenGLShader::Fragment, ":/thumb.frag"); m_thumbnailProgram->bind(); m_thumbnailProgram->enableAttributeArray("qt_Vertex"); diff --git a/resources.qrc b/resources.qrc deleted file mode 100644 index b71d1ce..0000000 --- a/resources.qrc +++ /dev/null @@ -1,32 +0,0 @@ - - - invert.png - nuke.png - bayer.png - space.nouspiro.tenmon.png - nuke_a.png - about/tenmon - translations/tenmon_en.qm - translations/tenmon_sk.qm - about/filter.png - about/stretch-panel.png - translations/tenmon_fr.qm - shaders/image.frag - shaders/image.vert - shaders/thumb.frag - shaders/thumb.vert - shaders/debayer.frag - shaders/debayer.vert - falsecolor.png - link.png - - - about/help_en - - - about/help_sk - - - about/help_fr - - diff --git a/bayer.png b/resources/bayer.png similarity index 100% rename from bayer.png rename to resources/bayer.png diff --git a/falsecolor.png b/resources/falsecolor.png similarity index 100% rename from falsecolor.png rename to resources/falsecolor.png diff --git a/icon.ico b/resources/icon.ico similarity index 100% rename from icon.ico rename to resources/icon.ico diff --git a/icon.rc b/resources/icon.rc similarity index 100% rename from icon.rc rename to resources/icon.rc diff --git a/invert.png b/resources/invert.png similarity index 100% rename from invert.png rename to resources/invert.png diff --git a/link.png b/resources/link.png similarity index 100% rename from link.png rename to resources/link.png diff --git a/nuke.png b/resources/nuke.png similarity index 100% rename from nuke.png rename to resources/nuke.png diff --git a/nuke_a.png b/resources/nuke_a.png similarity index 100% rename from nuke_a.png rename to resources/nuke_a.png diff --git a/resources/resources.qrc b/resources/resources.qrc new file mode 100644 index 0000000..c031021 --- /dev/null +++ b/resources/resources.qrc @@ -0,0 +1,26 @@ + + + invert.png + nuke.png + bayer.png + space.nouspiro.tenmon.png + nuke_a.png + ../about/tenmon + ../translations/tenmon_en.qm + ../translations/tenmon_sk.qm + ../about/filter.png + ../about/stretch-panel.png + ../translations/tenmon_fr.qm + falsecolor.png + link.png + + + ../about/help_en + + + ../about/help_sk + + + ../about/help_fr + + diff --git a/space.nouspiro.tenmon.png b/resources/space.nouspiro.tenmon.png similarity index 100% rename from space.nouspiro.tenmon.png rename to resources/space.nouspiro.tenmon.png diff --git a/space.nouspiro.tenmon.svg b/resources/space.nouspiro.tenmon.svg similarity index 100% rename from space.nouspiro.tenmon.svg rename to resources/space.nouspiro.tenmon.svg diff --git a/space.nouspiro.tenmon_128.png b/resources/space.nouspiro.tenmon_128.png similarity index 100% rename from space.nouspiro.tenmon_128.png rename to resources/space.nouspiro.tenmon_128.png diff --git a/tenmon.icns b/resources/tenmon.icns similarity index 100% rename from tenmon.icns rename to resources/tenmon.icns diff --git a/settingsdialog.cpp b/settingsdialog.cpp index f43edc7..3e8f870 100644 --- a/settingsdialog.cpp +++ b/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); diff --git a/shaders/shaders.qrc b/shaders/shaders.qrc new file mode 100644 index 0000000..79c1fd5 --- /dev/null +++ b/shaders/shaders.qrc @@ -0,0 +1,10 @@ + + + debayer.frag + debayer.vert + image.frag + image.vert + thumb.frag + thumb.vert + +