diff --git a/admin.desktop b/admin.desktop old mode 100755 new mode 100644 diff --git a/admin/StupanAdmin.pro b/admin/StupanAdmin.pro index fb5891d3f65deced3c1e3fb95db58f112306a2c6..8b50ca3691baadec0652a9e8ab7cd6cd50d116c9 100644 --- a/admin/StupanAdmin.pro +++ b/admin/StupanAdmin.pro @@ -11,10 +11,9 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets TARGET = stupan-admin TEMPLATE = app -admin.path = /usr/bin -admin.files = stupan-admin +target.path = /usr/bin -INSTALLS += admin +INSTALLS += target QMAKE_CXXFLAGS += -Wall -pedantic diff --git a/debian/changelog b/debian/changelog index c91945f89b133b695de65b8e462f267d9f6c1085..10e88c6827baaf026a84b8e9879a01e09685afed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +stupan (1.15-1) jammy; urgency=medium + + * Re-implement rune easter egg. + + -- Hugo Hörnquist <hugo@lysator.liu.se> Thu, 30 Mar 2023 18:46:03 +0200 + stupan (1.14.1-1) una; urgency=medium * debian changelog to better reflect reality. diff --git a/debian/rules b/debian/rules index dca10d171750d5886e5c66372c6602178c406024..9a1f7635e70fa9666f66ad0530716fa595ca863a 100755 --- a/debian/rules +++ b/debian/rules @@ -5,11 +5,19 @@ #export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic #export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed -%: - dh $@ -#override_dh_auto_install: -# dh_auto_install -- prefix=/usr +override_dh_auto_configure: + mkdir build + cd build && qmake ../stupan.pro + +override_dh_auto_build: + cd build && make + lrelease stupan.pro -#override_dh_install: -# dh_install --list-missing -X.pyc -X.pyo +override_dh_auto_install: + $(MAKE) -C build install INSTALL_ROOT=$(CURDIR)/debian/stupan + install -d $(CURDIR)/debian/stupan/usr/share/stupan/ + install -m 644 -t $(CURDIR)/debian/stupan/usr/share/stupan/ kassa/stupan_dk.qm + +%: + dh $@ diff --git a/kassa.desktop b/kassa.desktop old mode 100755 new mode 100644 diff --git a/kassa/StupanKassa.pro b/kassa/StupanKassa.pro index f7dc393a16dbce1a07266af7656148b329b3d2bb..7449e5bdefad1174b4763b9f5db80552f7730480 100644 --- a/kassa/StupanKassa.pro +++ b/kassa/StupanKassa.pro @@ -11,10 +11,9 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets TARGET = stupan-kassa TEMPLATE = app -kassa.path = /usr/bin -kassa.files = stupan-kassa +target.path = /usr/bin -INSTALLS += kassa +INSTALLS += target QMAKE_CXXFLAGS += -Wall -pedantic @@ -25,7 +24,7 @@ HEADERS += widget.h FORMS += widget.ui -TRANSLATIONS = stupan_dk.ts +TRANSLATIONS += stupan_dk.ts win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../StupanCommon/release/ -lStupanCommon else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../StupanCommon/debug/ -lStupanCommon diff --git a/kassa/main.cpp b/kassa/main.cpp index 539bbe8f6af8f4cbfb360e9ad446c8f5ea0c0919..483cf78708109f4ca31b75659c00b81799480cf4 100644 --- a/kassa/main.cpp +++ b/kassa/main.cpp @@ -1,17 +1,46 @@ #include "widget.h" #include <QApplication> #include <QTranslator> +#include <QCoreApplication> +#include <QVector> + +#include "configuration.h" +#include "utils.h" int main(int argc, char *argv[]) { // QLocale::setDefault(QLocale(QLocale::Swedish, QLocale::Sweden)); QApplication a(argc, argv); - QString locale = QLocale::system().name(); + //QString locale = QLocale::languageToString(QLocale::system().language()); + + //qDebug() << locale; QTranslator translator; - translator.load(QStringLiteral("stupan_") + locale, "/usr/share/stupan"); - a.installTranslator(&translator); + QDate today = { QDate::currentDate() }; + if (6 > today.daysTo(QDate(today.year(), 4, 1))) { + //translator.load(QStringLiteral("stupan_") + "dk", "/usr/share/stupan"); + qDebug() << QCoreApplication::applicationDirPath(); + QVector<QString> paths = { + QCoreApplication::applicationDirPath(), + "/usr/share/stupan", + }; + + foreach (auto path, paths) { + qDebug() << "Attempting to load translations from" << path; + if (translator.load("stupan_dk", path)) { + a.installTranslator(&translator); + qDebug() << "Loaded!"; + break; + } else { + qDebug() << "Failed loading tranlation"; + } + } + } + + + QString HOME = QString::fromLocal8Bit(getenv("HOME")); + Configuration conf(HOME + "/.stupan/config"); Widget w; w.show();