diff --git a/CMakeLists.txt b/CMakeLists.txt index 056c4ca..d279611 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,7 +19,7 @@ execute_process( set(QT_IMPORTS_DIR "lib/${ARCH_TRIPLET}") -set(PROJECT_NAME "mines.neothethird") +set(PROJECT_NAME "mines.alaskalinuxuser") set(CMAKE_INSTALL_PREFIX /) set(DATA_DIR /) set(DESKTOP_FILE_NAME ${PROJECT_NAME}.desktop) diff --git a/README.md b/README.md index dba4a1c..e87608a 100644 --- a/README.md +++ b/README.md @@ -20,6 +20,9 @@ Set up [clickable](https://github.com/bhdouglass/clickable) and run `clickable` A big thanks to Robert Ancell and everybody who contributed to Mines or other Minesweeper derivates for letting me rip off their work. Thanks to Brian Douglass for Clickable. Thanks to the original Creators of Ubuntu Touch, the Ubuntu SDK and the Ubuntu UI toolkit. Thank you to everybody who helps keeping [Ubuntu Touch](https://ubports.com) alive. +## Updated +20250827 Updated for Focal by Alaskalinuxuser + ## License Copyright (C) 2015 Robert Ancell diff --git a/clickable.json b/clickable.json index c98a52c..a5c5e0b 100644 --- a/clickable.json +++ b/clickable.json @@ -1,4 +1,5 @@ { - "template": "pure-qml-cmake", + "clickable_minimum_required": "8.4", + "build": "pure-qml-cmake", "kill": "qmlscene" } diff --git a/manifest.json.in b/manifest.json.in index 6136bd4..e31270a 100644 --- a/manifest.json.in +++ b/manifest.json.in @@ -1,14 +1,15 @@ { - "name": "mines.neothethird", + "name": "mines.alaskalinuxuser", "description": "Clear the minefield.", + "architecture": "all", "title": "Mines", "hooks": { "mines": { - "apparmor": "mines.neothethird.apparmor", - "desktop": "mines.neothethird.desktop" + "apparmor": "mines.alaskalinuxuser.apparmor", + "desktop": "mines.alaskalinuxuser.desktop" } }, - "version": "1.1", - "maintainer": "Jan Sprinz ", - "framework" : "ubuntu-sdk-15.04.6" + "version": "1.2", + "maintainer": "Alaskalinuxuser ", + "framework" : "@CLICK_FRAMEWORK@" } diff --git a/mines.alaskalinuxuser.apparmor b/mines.alaskalinuxuser.apparmor new file mode 100644 index 0000000..fc73d82 --- /dev/null +++ b/mines.alaskalinuxuser.apparmor @@ -0,0 +1,5 @@ +{ + "policy_groups": [ + ], + "policy_version": "@APPARMOR_POLICY@" +} diff --git a/mines.neothethird.desktop.in b/mines.alaskalinuxuser.desktop.in similarity index 100% rename from mines.neothethird.desktop.in rename to mines.alaskalinuxuser.desktop.in diff --git a/mines.neothethird.apparmor b/mines.neothethird.apparmor deleted file mode 100644 index ec91af4..0000000 --- a/mines.neothethird.apparmor +++ /dev/null @@ -1,5 +0,0 @@ -{ - "policy_groups": [ - ], - "policy_version": 1.3 -} diff --git a/po/mines.alaskalinuxuser.pot b/po/mines.alaskalinuxuser.pot new file mode 100644 index 0000000..ec29aa5 --- /dev/null +++ b/po/mines.alaskalinuxuser.pot @@ -0,0 +1,160 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the mines.alaskalinuxuser package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: mines.alaskalinuxuser\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2025-09-02 21:23+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. TRANSLATORS: Title for dialog shown when starting a new game while one in progress +#: ../qml/Main.qml:92 +msgid "Game in progress" +msgstr "" + +#. TRANSLATORS: Content for dialog shown when starting a new game while one in progress +#: ../qml/Main.qml:94 +msgid "Are you sure you want to restart this game?" +msgstr "" + +#. TRANSLATORS: Button in new game dialog that cancels the current game and starts a new one +#: ../qml/Main.qml:97 +msgid "Restart game" +msgstr "" + +#. TRANSLATORS: Button in new game dialog that cancels new game request +#: ../qml/Main.qml:106 +msgid "Continue current game" +msgstr "" + +#. TRANSLATORS: Title for dialog confirming if scores should be cleared +#. TRANSLATORS: Button in clear scores dialog that clears scores +#. TRANSLATORS: Action in high scores page that clears scores +#: ../qml/Main.qml:117 ../qml/Main.qml:122 ../qml/Main.qml:324 +msgid "Clear scores" +msgstr "" + +#. TRANSLATORS: Content for dialog confirming if scores should be cleared +#: ../qml/Main.qml:119 +msgid "Existing scores will be deleted. This cannot be undone." +msgstr "" + +#. TRANSLATORS: Button in clear scores dialog that cancels clear scores request +#: ../qml/Main.qml:131 +msgid "Keep existing scores" +msgstr "" + +#. TRANSLATORS: Title of application +#: ../qml/Main.qml:147 ../qml/Main.qml:234 mines.alaskalinuxuser.desktop.in.h:2 +msgid "Mines" +msgstr "" + +#. TRANSLATORS: Action on main page that shows game instructions +#. TRANSLATORS: Title of page with game instructions +#: ../qml/Main.qml:151 ../qml/Main.qml:208 +msgid "How to Play" +msgstr "" + +#. TRANSLATORS: Action on main page that shows settings dialog +#. TRANSLATORS: Title of page showing settings +#: ../qml/Main.qml:157 ../qml/Main.qml:337 +msgid "Settings" +msgstr "" + +#. TRANSLATORS: Action on main page that starts a new game +#: ../qml/Main.qml:163 +msgid "New Game" +msgstr "" + +#: ../qml/Main.qml:252 +msgid "Version: " +msgstr "" + +#. TRANSLATORS: Short description +#: ../qml/Main.qml:261 +msgid "" +"Mines is a puzzle game where the goal is to find the mines in a minefield." +msgstr "" + +#. TRANSLATORS: Game instructions +#: ../qml/Main.qml:271 +msgid "" +"The minefield is divided into a grid of squares. Touch a square to check if " +"there is a mine there. If no mine is present the square will show the number " +"of mines surrounding it. Use logic to determine a square that cannot contain " +"a mine to check next. If you hit a mine it explodes and the game is over. " +"You can flag where a mine is by touching and holding that square. Have fun!" +msgstr "" + +#. TRANSLATORS: GPL notice +#: ../qml/Main.qml:281 +msgid "" +"This program is free software: you can redistribute it and/or modify it " +"under the terms of the GNU General Public License as published by the Free " +"Software Foundation, either version 3 of the License, or (at your option) " +"any later version. This program is distributed in the hope that it will be " +"useful, but WITHOUT ANY WARRANTY; without even the implied warranty of " +"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public " +"License for more details." +msgstr "" + +#: ../qml/Main.qml:290 +msgid "SOURCE" +msgstr "" + +#: ../qml/Main.qml:290 +msgid "ISSUES" +msgstr "" + +#: ../qml/Main.qml:290 +msgid "DONATE" +msgstr "" + +#: ../qml/Main.qml:300 +msgid "Copyright (c) 2015 Robert Ancell" +msgstr "" + +#: ../qml/Main.qml:309 +msgid "Copyright (c) 2017 Jan Sprinz " +msgstr "" + +#. TRANSLATORS: Title of page showing high scores +#: ../qml/Main.qml:321 +msgid "High Scores" +msgstr "" + +#. TRANSLATORS: Label beside checkbox setting for controlling vibrations when placing flags +#: ../qml/Main.qml:349 +msgid "Vibrate when placing flags" +msgstr "" + +#. TRANSLATORS: Label above setting to choose the minefield size +#: ../qml/Main.qml:359 +msgid "Minefield size:" +msgstr "" + +#. TRANSLATORS: Setting name for small minefield +#: ../qml/Main.qml:366 +msgid "Small" +msgstr "" + +#. TRANSLATORS: Setting name for large minefield +#: ../qml/Main.qml:369 +msgid "Large" +msgstr "" + +#. TRANSLATORS: Description format for minefield size, %width%, %height% and %nmines% is replaced with the field width, height and number of mines +#: ../qml/Main.qml:375 +msgid "%width%×%height%, %nmines% mines" +msgstr "" diff --git a/po/mines.neothethird.pot b/po/mines.neothethird.pot index e67396b..b3eb615 100644 --- a/po/mines.neothethird.pot +++ b/po/mines.neothethird.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: mines.neothethird\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-09-23 21:06+0000\n" +"POT-Creation-Date: 2025-08-27 21:10+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -55,7 +55,7 @@ msgid "Keep existing scores" msgstr "" #. TRANSLATORS: Title of application -#: ../qml/Main.qml:147 ../qml/Main.qml:234 +#: ../qml/Main.qml:147 ../qml/Main.qml:234 mines.neothethird.desktop.in.h:2 msgid "Mines" msgstr "" diff --git a/qml/Main.qml b/qml/Main.qml index a752179..5481016 100644 --- a/qml/Main.qml +++ b/qml/Main.qml @@ -26,17 +26,17 @@ */ import QtQuick 2.4 -import Ubuntu.Components 1.3 -import Ubuntu.Components.ListItems 1.3 as ListItem -import Ubuntu.Components.Popups 1.3 +import Lomiri.Components 1.3 +import Lomiri.Components.ListItems 1.3 as ListItem +import Lomiri.Components.Popups 1.3 import QtQuick.LocalStorage 2.0 MainView { - applicationName: "mines.neothethird" + applicationName: "mines.alaskalinuxuser" automaticOrientation: true id: app - property string version: "1.1" + property string version: "1.2" width: units.gu(40) height: units.gu(71) @@ -95,7 +95,7 @@ MainView { Button { // TRANSLATORS: Button in new game dialog that cancels the current game and starts a new one text: i18n.tr("Restart game") - color: UbuntuColors.red + color: LomiriColors.red onClicked: { reset_field() PopupUtils.close(d) @@ -120,7 +120,7 @@ MainView { Button { // TRANSLATORS: Button in clear scores dialog that clears scores text: i18n.tr("Clear scores") - color: UbuntuColors.red + color: LomiriColors.red onClicked: { table.clear_scores() PopupUtils.close(d) @@ -235,7 +235,7 @@ MainView { fontSize: "x-large" } - UbuntuShape { + LomiriShape { width: units.gu(12); height: units.gu(12) anchors.horizontalCenter: parent.horizontalCenter radius: "medium" @@ -246,7 +246,7 @@ MainView { Label { width: parent.width - linkColor: UbuntuColors.orange + linkColor: LomiriColors.orange horizontalAlignment: Text.AlignHCenter wrapMode: Text.WrapAtWordBoundaryOrAnywhere text: i18n.tr("Version: ") + app.version @@ -254,7 +254,7 @@ MainView { Label { width: parent.width - linkColor: UbuntuColors.orange + linkColor: LomiriColors.orange horizontalAlignment: Text.AlignHCenter wrapMode: Text.WrapAtWordBoundaryOrAnywhere // TRANSLATORS: Short description @@ -264,7 +264,7 @@ MainView { Label { width: parent.width - linkColor: UbuntuColors.orange + linkColor: LomiriColors.orange horizontalAlignment: Text.AlignHCenter wrapMode: Text.WrapAtWordBoundaryOrAnywhere // TRANSLATORS: Game instructions @@ -274,7 +274,7 @@ MainView { Label { width: parent.width - linkColor: UbuntuColors.orange + linkColor: LomiriColors.orange horizontalAlignment: Text.AlignHCenter wrapMode: Text.WrapAtWordBoundaryOrAnywhere // TRANSLATORS: GPL notice @@ -284,7 +284,7 @@ MainView { Label { width: parent.width - linkColor: UbuntuColors.orange + linkColor: LomiriColors.orange horizontalAlignment: Text.AlignHCenter wrapMode: Text.WrapAtWordBoundaryOrAnywhere text: "" + i18n.tr("SOURCE") + " | " + i18n.tr("ISSUES") + " | " + i18n.tr("DONATE") + "" @@ -293,7 +293,7 @@ MainView { Label { width: parent.width - linkColor: UbuntuColors.orange + linkColor: LomiriColors.orange horizontalAlignment: Text.AlignHCenter wrapMode: Text.WrapAtWordBoundaryOrAnywhere style: Font.Bold @@ -302,7 +302,7 @@ MainView { Label { width: parent.width - linkColor: UbuntuColors.orange + linkColor: LomiriColors.orange horizontalAlignment: Text.AlignHCenter wrapMode: Text.WrapAtWordBoundaryOrAnywhere style: Font.Bold diff --git a/qml/MinefieldView.qml b/qml/MinefieldView.qml index 32f0e4d..e3da370 100644 --- a/qml/MinefieldView.qml +++ b/qml/MinefieldView.qml @@ -26,7 +26,7 @@ */ import QtQuick 2.4 -import Ubuntu.Components 1.3 +import Lomiri.Components 1.3 import QtFeedback 5.0 Grid { @@ -36,8 +36,8 @@ Grid { rotation: landscape ? 90 : 0 Behavior on rotation { NumberAnimation { - easing: UbuntuAnimation.StandardEasing - duration: UbuntuAnimation.FastDuration + easing: LomiriAnimation.StandardEasing + duration: LomiriAnimation.FastDuration } } property MinefieldModel model