Compare commits

...

5 Commits

Author SHA1 Message Date
nou cb1237cbc4 Fix Info.plist 2026-05-08 11:42:54 +02:00
nou dbc9baba13 Fix Info.plist icon 2026-05-08 09:09:55 +02:00
nou bd99501616 Add support for open with on MacOS 2026-05-08 08:44:46 +02:00
nou fccbf4d810 Update icons 2026-05-05 19:12:32 +02:00
nou 0a11289f34 Add automatic check for new versions 2026-04-28 17:09:49 +02:00
21 changed files with 133 additions and 13 deletions
+10 -1
View File
@@ -29,6 +29,7 @@ add_subdirectory(libXISF)
set(TENMON_SRC
src/about.cpp src/about.h
src/application.cpp src/application.h
src/batchprocessing.cpp src/batchprocessing.h src/batchprocessing.ui
src/chartgraph.h src/chartgraph.cpp
src/database.cpp src/database.h
@@ -74,6 +75,9 @@ elseif(APPLE)
set(tenmon_ICON ${CMAKE_CURRENT_SOURCE_DIR}/resources/tenmon.icns)
find_package(Qt6 COMPONENTS DBus REQUIRED)
set_source_files_properties(${tenmon_ICON} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
set(MACOSX_BUNDLE_ICON_FILE "tenmon.icns")
set(MACOSX_BUNDLE_BUNDLE_NAME "tenmon")
set(MACOSX_BUNDLE_GUI_IDENTIFIER "space.nouspiro.tenmon")
else()
set(tenmon_ICON "")
find_package(Qt6 COMPONENTS DBus REQUIRED)
@@ -112,6 +116,7 @@ endif(STELLARSOLVER_INCLUDE AND STELLARSOLVER_LIB)
target_link_libraries(tenmon PRIVATE Qt6::Widgets Qt6::Sql Qt6::OpenGLWidgets Qt6::Qml Qt6::Charts Qt6::Svg ${EXIF_LIB} ${FITS_LIB} ${RAW_LIB} ${WCS_LIB} ${LCMS2_LIB} XISF)
if(APPLE)
target_link_libraries(tenmon PRIVATE Qt6::DBus "-framework CoreFoundation")
set_target_properties(tenmon PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in")
elseif(UNIX)
target_link_libraries(tenmon PRIVATE Qt6::DBus)
endif(APPLE)
@@ -134,8 +139,12 @@ if(UNIX AND NOT APPLE)
install(SCRIPT install.cmake)
else()
install(FILES 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_16.png DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/16x16/apps" RENAME space.nouspiro.tenmon.png)
install(FILES resources/space.nouspiro.tenmon_32.png DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/32x32/apps" RENAME space.nouspiro.tenmon.png)
install(FILES resources/space.nouspiro.tenmon_64.png DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/64x64/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)
install(FILES resources/space.nouspiro.tenmon_256.png DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/256x256/apps" RENAME space.nouspiro.tenmon.png)
install(FILES resources/space.nouspiro.tenmon_512.png DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/512x512/apps" RENAME space.nouspiro.tenmon.png)
install(FILES space.nouspiro.tenmon.xisf.xml DESTINATION "${CMAKE_INSTALL_DATADIR}/mime/packages")
endif()
install(FILES space.nouspiro.tenmon.metainfo.xml DESTINATION "${CMAKE_INSTALL_DATADIR}/metainfo")
+50
View File
@@ -0,0 +1,50 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
<string>tenmon</string>
<key>CFBundleGetInfoString</key>
<string>${MACOSX_BUNDLE_INFO_STRING}</string>
<key>CFBundleIconFile</key>
<string>${MACOSX_BUNDLE_ICON_FILE}</string>
<key>CFBundleIdentifier</key>
<string>${MACOSX_BUNDLE_GUI_IDENTIFIER}</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
<string>${MACOSX_BUNDLE_LONG_VERSION_STRING}</string>
<key>CFBundleName</key>
<string>${MACOSX_BUNDLE_BUNDLE_NAME}</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>
<key>CFBundleVersion</key>
<string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string>
<key>CSResourcesFileMapped</key>
<true/>
<key>NSHumanReadableCopyright</key>
<string>${MACOSX_BUNDLE_COPYRIGHT}</string>
<key>CFBundleDocumentTypes</key>
<array>
<dict>
<key>CFBundleTypeExtensions</key>
<array>
<string>fits</string>
<string>fit</string>
<string>xisf</string>
<string>png</string>
<string>jpg</string>
<string>jpeg</string>
<string>tiff</string>
<string>tif</string>
</array>
<key>CFBundleTypeRole</key>
<string>Viewer</string>
</dict>
</array>
</dict>
</plist>
+1 -1
View File
@@ -1,5 +1,5 @@
<table><tr>
<td style="padding-right:10px"><img src=":/space.nouspiro.tenmon.png"></td>
<td style="padding-right:10px"><img src=":/space.nouspiro.tenmon_64.png"></td>
<td><h3>Tenmon</h3>
Tenmon is FITS/XISF image viewer and converter. It also index FITS keywords.<br>
v@GITVERSION@ Copyright © 2026 Dušan Poizl<br><br>
+5 -1
View File
@@ -2,6 +2,10 @@ find_program(XDG-DESKTOP-MENU_EXECUTABLE xdg-desktop-menu)
find_program(XDG-ICON-RESOURCE_EXECUTABLE xdg-icon-resource)
find_program(XDG-MIME xdg-mime)
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 resources/space.nouspiro.tenmon.png space.nouspiro.tenmon WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR})
execute_process(COMMAND ${XDG-ICON-RESOURCE_EXECUTABLE} install --novendor --size 16 resources/space.nouspiro.tenmon_16.png space.nouspiro.tenmon WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR})
execute_process(COMMAND ${XDG-ICON-RESOURCE_EXECUTABLE} install --novendor --size 32 resources/space.nouspiro.tenmon_32.png space.nouspiro.tenmon WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR})
execute_process(COMMAND ${XDG-ICON-RESOURCE_EXECUTABLE} install --novendor --size 64 resources/space.nouspiro.tenmon_64.png space.nouspiro.tenmon WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR})
execute_process(COMMAND ${XDG-ICON-RESOURCE_EXECUTABLE} install --novendor --size 128 resources/space.nouspiro.tenmon_128.png space.nouspiro.tenmon WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR})
execute_process(COMMAND ${XDG-ICON-RESOURCE_EXECUTABLE} install --novendor --size 256 resources/space.nouspiro.tenmon_256.png space.nouspiro.tenmon WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR})
execute_process(COMMAND ${XDG-ICON-RESOURCE_EXECUTABLE} install --novendor --size 512 resources/space.nouspiro.tenmon_512.png space.nouspiro.tenmon WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR})
execute_process(COMMAND ${XDG-MIME} install --novendor space.nouspiro.tenmon.xisf.xml WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR})
Binary file not shown.

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 1.4 MiB

+1 -1
View File
@@ -15,7 +15,7 @@
<file>bggr.png</file>
<file>grbg.png</file>
<file>gbrg.png</file>
<file>space.nouspiro.tenmon.png</file>
<file>space.nouspiro.tenmon_64.png</file>
<file>../translations/tenmon_pt_BR.qm</file>
<file alias="help">../about/help_en</file>
<file>colormap.png</file>
Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 58 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 247 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.0 KiB

Binary file not shown.
+19
View File
@@ -0,0 +1,19 @@
#include "application.h"
#include <QFileOpenEvent>
Application::Application(int &argc, char **argv) : QApplication(argc, argv)
{
}
bool Application::event(QEvent *event)
{
if (event->type() == QEvent::FileOpen) {
QFileOpenEvent *openEvent = static_cast<QFileOpenEvent *>(event);
emit openFileEvent(openEvent->file());
}
return QApplication::event(event);
}
+16
View File
@@ -0,0 +1,16 @@
#ifndef APPLICATION_H
#define APPLICATION_H
#include <QApplication>
class Application : public QApplication
{
Q_OBJECT
public:
Application(int &argc, char **argv);
bool event(QEvent *event) override;
signals:
void openFileEvent(const QString &file);
};
#endif // APPLICATION_H
+4 -4
View File
@@ -1,5 +1,5 @@
#include "mainwindow.h"
#include <QApplication>
#include "application.h"
#include <QCommandLineParser>
#include <QSettings>
#include <QSurfaceFormat>
@@ -102,11 +102,10 @@ int main(int argc, char *argv[])
}
QSurfaceFormat::setDefaultFormat(format);
QApplication a(argc, argv);
Application a(argc, argv);
a.setOrganizationName("nou");
a.setApplicationName("Tenmon");
a.setWindowIcon(QIcon(":/space.nouspiro.tenmon.png"));
a.setWindowIcon(QIcon(":/space.nouspiro.tenmon_64.png"));
QTranslator translator;
QTranslator translator2;
@@ -127,6 +126,7 @@ int main(int argc, char *argv[])
a.installTranslator(&translator2);
MainWindow w;
QObject::connect(&a, &Application::openFileEvent, &w, static_cast<void (MainWindow::*)(const QString&)>(&MainWindow::loadFile));
w.show();
if(!cmd.positionalArguments().isEmpty() && !cmd.isSet("script"))
+19 -4
View File
@@ -405,6 +405,14 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
if(_plateSolving)_plateSolving->setFeatures(QDockWidget::DockWidgetClosable | QDockWidget::DockWidgetMovable);
m_stretchPanel->setFloatable(false);
}
if(settings.value("settings/checkupdate", false).toBool())
{
QDateTime lastcheck = settings.value("settings/lastcheck").toDateTime();
QDateTime weekago = QDateTime::currentDateTimeUtc().addDays(-7);
if(!lastcheck.isValid() || lastcheck < weekago)
checkNewVersion(true);
}
}
MainWindow::~MainWindow()
@@ -823,21 +831,27 @@ void MainWindow::exportCSV()
m_databaseView->exportCSV(file);
}
void MainWindow::checkNewVersion()
void MainWindow::checkNewVersion(bool autocheck)
{
QNetworkAccessManager *manager = new QNetworkAccessManager(this);
QNetworkRequest request(QUrl("https://gitea.nouspiro.space/api/v1/repos/nou/tenmon/releases/latest"));
request.setRawHeader("accept", "application/json");
QNetworkReply *reply = manager->get(request);
connect(reply, &QNetworkReply::finished, [this, manager, reply](){
connect(reply, &QNetworkReply::finished, [this, manager, reply, autocheck](){
QJsonParseError error;
QJsonDocument json = QJsonDocument::fromJson(reply->readAll(), &error);
if(json.isObject() && json.object().contains("tag_name"))
{
QSettings settings;
settings.setValue("settings/lastcheck", QDateTime::currentDateTimeUtc());
QString tag = json.object().value("tag_name").toString();
QString version = getVersion();
if(version >= tag)
QMessageBox::information(this, tr("Update check"), tr("You have newest version"));
{
if(!autocheck)
QMessageBox::information(this, tr("Update check"), tr("You have newest version"));
}
else
{
if(QMessageBox::question(this, tr("Update check"), tr("New version %1 is available. Do you want to download it now?").arg(tag)) == QMessageBox::Yes)
@@ -851,7 +865,8 @@ void MainWindow::checkNewVersion()
}
else
{
QMessageBox::warning(this, tr("Update check"), tr("Failed to check version"));
if(!autocheck)
QMessageBox::warning(this, tr("Update check"), tr("Failed to check version"));
}
reply->deleteLater();
+1 -1
View File
@@ -69,7 +69,7 @@ public slots:
void showMarkFilesDialog();
void showSettingsDialog();
void exportCSV();
void checkNewVersion();
void checkNewVersion(bool autocheck = false);
void openFileManager();
void runScript(const QString &script, const QString &outdir, const QStringList &paths, const QString &arg, bool exit);
};
+6
View File
@@ -147,6 +147,10 @@ SettingsDialog::SettingsDialog(QWidget *parent) : QDialog(parent)
else if(lang == "sk")m_lang->setCurrentIndex(2);
else if(lang == "pt_BR")m_lang->setCurrentIndex(3);
m_checkUpdate = new QCheckBox(tr("Check for new version"), this);
m_checkUpdate->setToolTip(tr("Check for new version every week"));
m_checkUpdate->setChecked(settings.value("settings/checkupdate", false).toBool());
layout->addRow(tr("Image preload count"), m_preloadImages);
layout->addRow(tr("Thumbnails size"), m_thumSize);
layout->addRow(tr("Saturation"), m_saturation);
@@ -156,6 +160,7 @@ SettingsDialog::SettingsDialog(QWidget *parent) : QDialog(parent)
layout->addRow(m_qualityThumbnail);
layout->addRow(m_useNativeDialog);
layout->addRow(m_bestFit);
layout->addRow(m_checkUpdate);
layout->addRow(new QLabel(tr("FITS header highlight"), this));
layout->addRow(m_headerHighlight);
layout->addRow(m_keyword, color);
@@ -265,4 +270,5 @@ void SettingsDialog::saveSettings()
case 3: lang = "pt_BR"; break;
}
settings.setValue("settings/lang", lang);
settings.setValue("settings/checkupdate", m_checkUpdate->isChecked());
}
+1
View File
@@ -33,6 +33,7 @@ private:
QColor m_color = Qt::yellow;
QLineEdit *m_keyword;
QComboBox *m_lang;
QCheckBox *m_checkUpdate;
};
#endif // SETTINGSDIALOG_H