Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion 8192.neothethird.apparmor
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
"policy_groups": [
"networking"
],
"policy_version": 1.3
"policy_version": "@APPARMOR_POLICY@"
}
3 changes: 2 additions & 1 deletion clickable.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"template": "pure-qml-cmake",
"clickable_minimum_required": "8.4",
"build": "pure-qml-cmake",
"kill": "qmlscene"
}
5 changes: 3 additions & 2 deletions manifest.json.in
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
{
"name": "8192.neothethird",
"description": "A game. About squares.",
"architecture": "all",
"title": "8192",
"hooks": {
"8192": {
"apparmor": "8192.neothethird.apparmor",
"desktop": "8192.neothethird.desktop"
}
},
"version": "0.6",
"version": "0.7",
"maintainer": "Jan Sprinz <neo@neothethird.de>",
"framework" : "ubuntu-sdk-15.04.6"
"framework" : "@CLICK_FRAMEWORK@"
}
51 changes: 25 additions & 26 deletions po/8192.neothethird.pot
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# This file is distributed under the same license as the 8192.neothethird package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: 8192.neothethird\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-06-06 08:12+0000\n"
"POT-Creation-Date: 2025-09-02 20:30+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand All @@ -17,13 +17,32 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"

#: ../qml/modules/PopupController.qml:41
#: ../qml/modules/PopupController.qml:118
#: ../qml/modules/PopupController.qml:140 ../qml/modules/Footer.qml:60
#: ../qml/Main.qml:99
#: ../qml/Main.qml:35 ../qml/Main.qml:85
msgid "Welcome to 8192"
msgstr ""

#: ../qml/Main.qml:95 ../qml/modules/Footer.qml:78
msgid "About"
msgstr ""

#: ../qml/Main.qml:99 ../qml/modules/Footer.qml:60
#: ../qml/modules/PopupController.qml:41 ../qml/modules/PopupController.qml:118
#: ../qml/modules/PopupController.qml:140
msgid "Restart"
msgstr ""

#: ../qml/Main.qml:104
msgid "Undo"
msgstr ""

#: ../qml/modules/Header.qml:74
msgid "YOUR SCORE"
msgstr ""

#: ../qml/modules/Header.qml:91
msgid "HIGHSCORE"
msgstr ""

#: ../qml/modules/PopupController.qml:42
msgid "Are you sure you want to restart the game?"
msgstr ""
Expand Down Expand Up @@ -84,26 +103,6 @@ msgstr ""
msgid "Quit"
msgstr ""

#: ../qml/modules/Footer.qml:78 ../qml/Main.qml:95
msgid "About"
msgstr ""

#: ../qml/modules/Header.qml:74
msgid "YOUR SCORE"
msgstr ""

#: ../qml/modules/Header.qml:91
msgid "HIGHSCORE"
msgstr ""

#: ../qml/Main.qml:35 ../qml/Main.qml:85
msgid "Welcome to 8192"
msgstr ""

#: ../qml/Main.qml:104
msgid "Undo"
msgstr ""

#: 8192.neothethird.desktop.in.h:1
msgid "8192"
msgstr ""
12 changes: 6 additions & 6 deletions qml/Main.qml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
*/

import QtQuick 2.4
import Ubuntu.Components 1.3
import Ubuntu.Components.Popups 1.3
import Lomiri.Components 1.3
import Lomiri.Components.Popups 1.3
import Qt.labs.settings 1.0
import QtQuick.Window 2.2
import "modules"
Expand All @@ -49,7 +49,7 @@ Window {
anchorToKeyboard: true
anchors.fill: parent

property string version: "0.6"
property string version: "0.7"
property bool activeState: Qt.application.active
property bool firstStart: true

Expand Down Expand Up @@ -84,9 +84,9 @@ Window {
id: pageHeader
title: i18n.tr("Welcome to 8192")
StyleHints {
foregroundColor: UbuntuColors.orange
backgroundColor: UbuntuColors.porcelain
dividerColor: UbuntuColors.slate
foregroundColor: LomiriColors.orange
backgroundColor: LomiriColors.porcelain
dividerColor: LomiriColors.slate
}
trailingActionBar {
actions: [
Expand Down
6 changes: 3 additions & 3 deletions qml/modules/Footer.qml
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@
*/

import QtQuick 2.4
import Ubuntu.Components 1.3
import Lomiri.Components 1.3

UbuntuShape {
LomiriShape {
id: footer
width: parent.width
height: (width - 5 * spacing) / 6 + spacing * 2.5
color: UbuntuColors.warmGrey
color: LomiriColors.warmGrey

property int score
property int highscore
Expand Down
10 changes: 5 additions & 5 deletions qml/modules/Game.qml
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@
*/

import QtQuick 2.4
import Ubuntu.Components 1.3
import Lomiri.Components 1.3

UbuntuShape {
LomiriShape {
id: app
height: width
focus: true
color: UbuntuColors.warmGrey
color: LomiriColors.warmGrey

property var numbers: []
property var board: new Array(app.rows*app.cols)
Expand Down Expand Up @@ -135,7 +135,7 @@ UbuntuShape {
Component {
id: number

UbuntuShape {
LomiriShape {
id: colorRect
color: number <= 1 ? "transparent" :
number <= 2 ? "#eee4da" :
Expand Down Expand Up @@ -303,7 +303,7 @@ UbuntuShape {
return free[Math.floor(Math.random()*free.length)]
}

UbuntuShape {
LomiriShape {
width: parent.cellOutline
height: width
color: "#F0F0F0"
Expand Down
12 changes: 6 additions & 6 deletions qml/modules/Header.qml
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@
*/

import QtQuick 2.4
import Ubuntu.Components 1.3
import Lomiri.Components 1.3

UbuntuShape {
LomiriShape {
id: header
width: parent.width
height: (width - 5 * spacing) / 3 + spacing * 2.5
color: UbuntuColors.warmGrey
color: LomiriColors.warmGrey

property int score
property int highscore
Expand All @@ -43,7 +43,7 @@ UbuntuShape {
width: parent.width - spacing * 2
spacing: units.gu(1)

UbuntuShape {
LomiriShape {
id: logo
width: parent.height
height: width
Expand All @@ -58,7 +58,7 @@ UbuntuShape {
height: parent.height
spacing: units.gu(1)

UbuntuShape {
LomiriShape {
width: parent.width
height: (parent.height - parent.spacing) / 2
color: "#eee4da"
Expand All @@ -75,7 +75,7 @@ UbuntuShape {
}
}

UbuntuShape {
LomiriShape {
width: parent.width
height: (parent.height - parent.spacing) / 2
color: "#eee4da"
Expand Down
16 changes: 8 additions & 8 deletions qml/modules/PopupController.qml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
*/

import QtQuick 2.4
import Ubuntu.Components 1.3
import Ubuntu.Components.Popups 1.3
import Lomiri.Components 1.3
import Lomiri.Components.Popups 1.3

Item {
id: popupController
Expand All @@ -51,7 +51,7 @@ Item {

Button {
text: i18n.tr("No")
color: UbuntuColors.warmGrey
color: LomiriColors.warmGrey
onClicked: {
PopupUtils.close(restartDia)
}
Expand Down Expand Up @@ -80,7 +80,7 @@ Item {

Button {
text: i18n.tr("Report a bug")
color: UbuntuColors.warmGrey
color: LomiriColors.warmGrey
onClicked: {
Qt.openUrlExternally("https://github.com/neothethird/8192/issues")
PopupUtils.close(aboutDia)
Expand All @@ -89,7 +89,7 @@ Item {

Button {
text: i18n.tr("Close")
color: UbuntuColors.slate
color: LomiriColors.slate
onClicked: {
PopupUtils.close(aboutDia)
}
Expand All @@ -116,7 +116,7 @@ Item {

Button {
text: i18n.tr("Restart")
color: UbuntuColors.warmGrey
color: LomiriColors.warmGrey
onClicked: {
game.purge()
PopupUtils.close(victoryDia)
Expand All @@ -138,7 +138,7 @@ Item {

Button {
text: i18n.tr("Restart")
color: UbuntuColors.green
color: LomiriColors.green
onClicked: {
game.purge()
PopupUtils.close(defeatDia)
Expand All @@ -147,7 +147,7 @@ Item {

Button {
text: i18n.tr("Quit")
color: UbuntuColors.red
color: LomiriColors.red
onClicked: {
game.purge()
Qt.quit()
Expand Down