Skip to content

Commit

Permalink
Fix spelling :P
Browse files Browse the repository at this point in the history
  • Loading branch information
abranson committed May 1, 2016
1 parent 3eca810 commit 58e12ab
Show file tree
Hide file tree
Showing 9 changed files with 25 additions and 22 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Colordots is a game of connecting. Link as many dots as you can in thirty moves. Connect two or more dots of the same colour to remove them, make a closed shape to remove all enclosed dots. Forked from Colordots by Marko Wallin (https://github.com/walokra/colordots), which was ported from Dotty which is written for Ubuntu Phone by Robert Ancell (https://launchpad.net/dotty). Similar to Dots game for Android/iOS.
Colourdots is a game of connecting. Link as many dots as you can in thirty moves. Connect two or more dots of the same colour to remove them, make a closed shape to remove all enclosed dots. Forked from Colordots by Marko Wallin (https://github.com/walokra/colordots), which was ported from Dotty which is written for Ubuntu Phone by Robert Ancell (https://launchpad.net/dotty). Similar to Dots game for Android/iOS.
6 changes: 3 additions & 3 deletions harbour-colordots.desktop → harbour-colourdots.desktop
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[Desktop Entry]
Type=Application
X-Nemo-Application-Type=silica-qt5
Name=Colordots
Icon=harbour-colordots
Exec=harbour-colordots
Name=Colourdots
Icon=harbour-colourdots
Exec=harbour-colourdots
File renamed without changes
8 changes: 4 additions & 4 deletions harbour-colordots.pro → harbour-colourdots.pro
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
TARGET = harbour-colordots
TARGET = harbour-colourdots

# Application version
DEFINES += APP_VERSION=\\\"$$VERSION\\\"
Expand All @@ -12,9 +12,9 @@ SOURCES += \
HEADERS +=

OTHER_FILES = \
rpm/harbour-colordots.spec \
rpm/harbour-colordots.yaml \
rpm/harbour-colordots.changes \
rpm/harbour-colourdots.spec \
rpm/harbour-colourdots.yaml \
rpm/harbour-colourdots.changes \
qml/CoverPage.qml \
qml/MainPage.qml \
qml/Settings.qml \
Expand Down
4 changes: 2 additions & 2 deletions main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ int main(int argc, char *argv[])
QScopedPointer<QGuiApplication> app(SailfishApp::application(argc, argv));
QScopedPointer<QQuickView> view(SailfishApp::createView());

app->setApplicationName("Colordots");
app->setOrganizationName("harbour-colordots");
app->setApplicationName("Colourdots");
app->setOrganizationName("harbour-colourdots");
app->setApplicationVersion(APP_VERSION);

view->setSource(SailfishApp::pathTo("qml/main.qml"));
Expand Down
2 changes: 1 addition & 1 deletion qml/MainPage.qml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Page {
width: parent.width;
anchors { left: parent.left; right: parent.right; }

PageHeader { id: header; title: "Colordots" }
PageHeader { id: header; title: "Colourdots" }

PullDownMenu {
MenuItem {
Expand Down
3 changes: 3 additions & 0 deletions rpm/harbour-colordots.changes → rpm/harbour-colourdots.changes
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
* Tue Apr 26 2016 Andrew Branson <[email protected]> 0.5-1
Switched old loop function for enclosed shape removal
Enable diagonal connections
* Sun Jul 26 2015 Marko Wallin <[email protected]> 0.4-1
Fix wrong shape if no moves possible. Fix race condition in 60s mode.
* Sun Dec 14 2014 Marko Wallin <[email protected]> 0.3-1
Expand Down
12 changes: 6 additions & 6 deletions rpm/harbour-colordots.spec → rpm/harbour-colourdots.spec
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Generated by: spectacle version 0.27
#

Name: harbour-colordots
Name: harbour-colourdots

# >> macros
# << macros
Expand All @@ -12,14 +12,14 @@ Name: harbour-colordots
%{!?qtc_qmake5:%define qtc_qmake5 %qmake5}
%{!?qtc_make:%define qtc_make make}
%{?qtc_builddir:%define _builddir %qtc_builddir}
Summary: Link as many dots as you can in 30 moves or 60 seconds. Four dots for a square
Version: 0.4.0
Summary: Link as many same coloured dots as you can. Close a shape to include its contents!
Version: 0.5
Release: 1
Group: Amusements/Games
License: LICENSE
URL: http://ruleoftech.com/lab/colordots
URL: http://github.com/abranson/colourdots
Source0: %{name}-%{version}.tar.bz2
Source100: harbour-colordots.yaml
Source100: harbour-colourdots.yaml
Requires: sailfishsilica-qt5
BuildRequires: pkgconfig(sailfishapp)
BuildRequires: pkgconfig(Qt5Core)
Expand All @@ -28,7 +28,7 @@ BuildRequires: pkgconfig(Qt5Quick)
BuildRequires: desktop-file-utils

%description
Link as many dots as you can in thirty moves or 60 seconds. Connect one dot to another, connect four dots to make a square. Ported from Dotty which is written for Ubuntu Phone. Similar to Dots game for Android/iOS.
Colourdots is a game of connecting. Link as many dots as you can in thirty moves. Connect two or more dots of the same colour to remove them, make a closed shape to remove all enclosed dots. Iteration of Colordots.

%prep
%setup -q -n %{name}-%{version}
Expand Down
10 changes: 5 additions & 5 deletions rpm/harbour-colordots.yaml → rpm/harbour-colourdots.yaml
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
Name: harbour-colordots
Summary: Link as many dots as you can in 30 moves or 60 seconds. Four dots for a square
Version: 0.4.0
Name: harbour-colourdots
Summary: Link as many same coloured dots as you can. Close a shape to include its contents!
Version: 0.5
Release: 1
Group: Amusements/Games
URL: http://ruleoftech.com/lab/colordots
URL: http://github.com/abranson/colourdots
License: LICENSE
Sources:
- '%{name}-%{version}.tar.bz2'
Description: |-
Link as many dots as you can in thirty moves or 60 seconds. Connect one dot to another, connect four dots to make a square. Ported from Dotty which is written for Ubuntu Phone. Similar to Dots game for Android/iOS.
Colourdots is a game of connecting. Link as many dots as you can in thirty moves. Connect two or more dots of the same colour to remove them, make a closed shape to remove all enclosed dots. Iteration of Colordots.
Configure: none
Builder: qtc5
QMakeOptions:
Expand Down

0 comments on commit 58e12ab

Please sign in to comment.