diff --git a/src/activities/geo-country/resource/board/board1_0.qml b/src/activities/geo-country/resource/board/board1_0.qml index dbaba4be0..21f5ee05f 100644 --- a/src/activities/geo-country/resource/board/board1_0.qml +++ b/src/activities/geo-country/resource/board/board1_0.qml @@ -1,186 +1,123 @@ /* GCompris * * Copyright (C) 2015 Bruno Coudoin * * Authors: * Bruno Coudoin (GTK+ version) * Pulkit Gupta (Qt Quick port) * * 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. * * You should have received a copy of the GNU General Public License * along with this program; if not, see . */ import QtQuick 2.0 QtObject { property string instruction: qsTr("Districts of France") property variant levels: [ { "pixmapfile" : "france/france-regions.png", "type" : "SHAPE_BACKGROUND_IMAGE" }, { - "pixmapfile" : "france/rhone-alpes.png", - "sound": "voices-$CA/$LOCALE/france/rhone-alpes.$CA", - "toolTipText" : "Rhône Alpes", - "x" : "0.639", - "y" : "0.6" - }, - { - "pixmapfile" : "france/paca.png", - "sound": "voices-$CA/$LOCALE/france/provence-alpes-cote_d_azur.$CA", - "toolTipText" : "Provence Alpes Côte d'Azur", - "x" : "0.671", - "y" : "0.73" - }, - { - "pixmapfile" : "france/poitou-charentes.png", - "sound": "voices-$CA/$LOCALE/france/poitou-charentes.$CA", - "toolTipText" : "Poitou Charentes", - "x" : "0.363", - "y" : "0.517" - }, - { - "pixmapfile" : "france/picardie.png", - "sound": "voices-$CA/$LOCALE/france/picardie.$CA", - "toolTipText" : "Picardie", - "x" : "0.506", - "y" : "0.158" + "pixmapfile" : "france/corse.png", + "sound" : "voices-$CA/$LOCALE/france/corse.$CA", + "x" : "0.836", + "y" : "0.905", + "toolTipText" : "Corse" }, { - "pixmapfile" : "france/pays-de-la-loire.png", - "sound": "voices-$CA/$LOCALE/france/pays-de-la-loire.$CA", - "toolTipText" : "Pays de la Loire", - "x" : "0.333", - "y" : "0.382" + "pixmapfile" : "france/nouvelle-aquitaine.png", + "sound" : "voices-$CA/$LOCALE/france/nouvelle-aquitaine.$CA", + "x" : "0.37", + "y" : "0.64", + "toolTipText" : "Nouvelle-Aquitaine" }, { - "pixmapfile" : "france/nord-pas-de-calais.png", - "sound": "voices-$CA/$LOCALE/france/nord-pas-de-calais.$CA", - "toolTipText" : "Nord Pas de Calais", - "x" : "0.51", - "y" : "0.062" + "pixmapfile" : "france/occitanie.png", + "sound" : "voices-$CA/$LOCALE/france/occitanie.$CA", + "x" : "0.47", + "y" : "0.776", + "toolTipText" : "Occitanie" }, { - "pixmapfile" : "france/midi-pyrenees.png", - "sound": "voices-$CA/$LOCALE/france/midi-pyrenees.$CA", - "toolTipText" : "Midi Pyrénées", - "x" : "0.444", - "y" : "0.763" + "pixmapfile" : "france/paca.png", + "sound" : "voices-$CA/$LOCALE/france/paca.$CA", + "x" : "0.672", + "y" : "0.728", + "toolTipText" : "Provence-Alpes-Côte d'Azur" }, { - "pixmapfile" : "france/lorraine.png", - "sound": "voices-$CA/$LOCALE/france/lorraine.$CA", - "toolTipText" : "Lorraine", - "x" : "0.667", - "y" : "0.243" + "pixmapfile" : "france/auvergne-rhone-alpes.png", + "sound" : "voices-$CA/$LOCALE/france/auvergne-rhone-alpes.$CA", + "x" : "0.597", + "y" : "0.586", + "toolTipText" : "Auvergne-Rhône-Alpes" }, { - "pixmapfile" : "france/limousin.png", - "sound": "voices-$CA/$LOCALE/france/limousin.$CA", - "toolTipText" : "Limousin", - "x" : "0.45", - "y" : "0.566" + "pixmapfile" : "france/centre-val-de-loire.png", + "sound" : "voices-$CA/$LOCALE/france/centre-val-de-loire.$CA", + "x" : "0.439", + "y" : "0.360", + "toolTipText" : "Centre-Val de Loire" }, { - "pixmapfile" : "france/languedoc-roussillon.png", - "sound": "voices-$CA/$LOCALE/france/languedoc-roussillon.$CA", - "toolTipText" : "Languedoc Roussillon", - "x" : "0.532", - "y" : "0.778" + "pixmapfile" : "france/pays-de-la-loire.png", + "sound" : "voices-$CA/$LOCALE/france/pays-de-la-loire.$CA", + "x" : "0.316", + "y" : "0.378", + "toolTipText" : "Pays de la Loire" }, { "pixmapfile" : "france/ile-de-france.png", - "sound": "voices-$CA/$LOCALE/france/ile-de-france.$CA", - "toolTipText" : "Ile de France", - "x" : "0.493", - "y" : "0.253" - }, - { - "pixmapfile" : "france/haute-normandie.png", - "sound": "voices-$CA/$LOCALE/france/haute-normandie.$CA", - "toolTipText" : "Normandie", - "x" : "0.421", - "y" : "0.181" - }, - { - "pixmapfile" : "france/franche-conte.png", - "sound": "voices-$CA/$LOCALE/france/franche-conte.$CA", - "toolTipText" : "Franche Comté", - "x" : "0.669", - "y" : "0.407" - }, - { - "pixmapfile" : "france/corse.png", - "sound": "voices-$CA/$LOCALE/france/corse.$CA", - "toolTipText" : "Corse", - "x" : "0.836", - "y" : "0.909" - }, - { - "pixmapfile" : "france/champagne-ardenne.png", - "sound": "voices-$CA/$LOCALE/france/champagne-ardenne.$CA", - "toolTipText" : "Champagne Ardenne", - "x" : "0.593", - "y" : "0.23" - }, - { - "pixmapfile" : "france/centre.png", - "sound": "voices-$CA/$LOCALE/france/centre.$CA", - "toolTipText" : "Centre", - "x" : "0.449", - "y" : "0.361" + "sound" : "voices-$CA/$LOCALE/france/ile-de-france.$CA", + "x" : "0.486", + "y" : "0.253", + "toolTipText" : "Île-de-france" }, { "pixmapfile" : "france/bretagne.png", - "sound": "voices-$CA/$LOCALE/france/bretagne.$CA", - "toolTipText" : "Bretagne", - "x" : "0.231", - "y" : "0.303" - }, - { - "pixmapfile" : "france/bourgogne.png", - "sound": "voices-$CA/$LOCALE/france/bourgogne.$CA", - "toolTipText" : "Bourgogne", - "x" : "0.574", - "y" : "0.398" + "sound" : "voices-$CA/$LOCALE/france/bretagne.$CA", + "x" : "0.216", + "y" : "0.291", + "toolTipText" : "Bretagne" }, { - "pixmapfile" : "france/basse-normandie.png", - "sound": "voices-$CA/$LOCALE/france/basse-normandie.$CA", - "toolTipText" : "Basse Normandie", - "x" : "0.354", - "y" : "0.22" + "pixmapfile" : "france/normandie.png", + "sound" : "voices-$CA/$LOCALE/france/normandie.$CA", + "x" : "0.366", + "y" : "0.199", + "toolTipText" : "Normandie" }, { - "pixmapfile" : "france/auvergne.png", - "sound": "voices-$CA/$LOCALE/france/auvergne.$CA", - "toolTipText" : "Auvergne", - "x" : "0.532", - "y" : "0.564" + "pixmapfile" : "france/haut-de-france.png", + "sound" : "voices-$CA/$LOCALE/france/haut-de-france.$CA", + "x" : "0.503", + "y" : "0.117", + "toolTipText" : "Haut de France" }, { - "pixmapfile" : "france/aquitaine.png", - "sound": "voices-$CA/$LOCALE/france/aquitaine.$CA", - "toolTipText" : "Aquitaine", - "x" : "0.357", - "y" : "0.714" + "pixmapfile" : "france/grand-est.png", + "sound" : "voices-$CA/$LOCALE/france/grand-est.$CA", + "x" : "0.649", + "y" : "0.233", + "toolTipText" : "Grand est" }, { - "pixmapfile" : "france/alsace.png", - "sound": "voices-$CA/$LOCALE/france/alsace.$CA", - "toolTipText" : "Alsace", - "x" : "0.729", - "y" : "0.286" + "pixmapfile" : "france/bourgogne-franche-comte.png", + "sound" : "voices-$CA/$LOCALE/france/bourgogne-franche-comte.$CA", + "x" : "0.613", + "y" : "0.398", + "toolTipText" : "Bourgogne-Franche-Comté" } ] } diff --git a/src/activities/geo-country/resource/france/alsace.png b/src/activities/geo-country/resource/france/alsace.png deleted file mode 100644 index a5ccb00c5..000000000 Binary files a/src/activities/geo-country/resource/france/alsace.png and /dev/null differ diff --git a/src/activities/geo-country/resource/france/aquitaine.png b/src/activities/geo-country/resource/france/aquitaine.png deleted file mode 100644 index e9603dc43..000000000 Binary files a/src/activities/geo-country/resource/france/aquitaine.png and /dev/null differ diff --git a/src/activities/geo-country/resource/france/auvergne-rhone-alpes.png b/src/activities/geo-country/resource/france/auvergne-rhone-alpes.png new file mode 100644 index 000000000..8946e4222 Binary files /dev/null and b/src/activities/geo-country/resource/france/auvergne-rhone-alpes.png differ diff --git a/src/activities/geo-country/resource/france/auvergne.png b/src/activities/geo-country/resource/france/auvergne.png deleted file mode 100644 index 2d7ac4bbf..000000000 Binary files a/src/activities/geo-country/resource/france/auvergne.png and /dev/null differ diff --git a/src/activities/geo-country/resource/france/basse-normandie.png b/src/activities/geo-country/resource/france/basse-normandie.png deleted file mode 100644 index a2f9f56ee..000000000 Binary files a/src/activities/geo-country/resource/france/basse-normandie.png and /dev/null differ diff --git a/src/activities/geo-country/resource/france/bourgogne-franche-comte.png b/src/activities/geo-country/resource/france/bourgogne-franche-comte.png new file mode 100644 index 000000000..403d4cebe Binary files /dev/null and b/src/activities/geo-country/resource/france/bourgogne-franche-comte.png differ diff --git a/src/activities/geo-country/resource/france/bourgogne.png b/src/activities/geo-country/resource/france/bourgogne.png deleted file mode 100644 index 9c6cba781..000000000 Binary files a/src/activities/geo-country/resource/france/bourgogne.png and /dev/null differ diff --git a/src/activities/geo-country/resource/france/bretagne.png b/src/activities/geo-country/resource/france/bretagne.png index b543584cc..3d91eae22 100644 Binary files a/src/activities/geo-country/resource/france/bretagne.png and b/src/activities/geo-country/resource/france/bretagne.png differ diff --git a/src/activities/geo-country/resource/france/centre-val-de-loire.png b/src/activities/geo-country/resource/france/centre-val-de-loire.png new file mode 100644 index 000000000..e7f68eede Binary files /dev/null and b/src/activities/geo-country/resource/france/centre-val-de-loire.png differ diff --git a/src/activities/geo-country/resource/france/centre.png b/src/activities/geo-country/resource/france/centre.png deleted file mode 100644 index 4d83f98c0..000000000 Binary files a/src/activities/geo-country/resource/france/centre.png and /dev/null differ diff --git a/src/activities/geo-country/resource/france/champagne-ardenne.png b/src/activities/geo-country/resource/france/champagne-ardenne.png deleted file mode 100644 index 2f3964706..000000000 Binary files a/src/activities/geo-country/resource/france/champagne-ardenne.png and /dev/null differ diff --git a/src/activities/geo-country/resource/france/corse.png b/src/activities/geo-country/resource/france/corse.png index 68936b1b2..603e3413d 100644 Binary files a/src/activities/geo-country/resource/france/corse.png and b/src/activities/geo-country/resource/france/corse.png differ diff --git a/src/activities/geo-country/resource/france/france-regions.png b/src/activities/geo-country/resource/france/france-regions.png index 971afd90b..0a5fae4a9 100644 Binary files a/src/activities/geo-country/resource/france/france-regions.png and b/src/activities/geo-country/resource/france/france-regions.png differ diff --git a/src/activities/geo-country/resource/france/franche-conte.png b/src/activities/geo-country/resource/france/franche-conte.png deleted file mode 100644 index 45bbef019..000000000 Binary files a/src/activities/geo-country/resource/france/franche-conte.png and /dev/null differ diff --git a/src/activities/geo-country/resource/france/grand-est.png b/src/activities/geo-country/resource/france/grand-est.png new file mode 100644 index 000000000..ef8f6de3e Binary files /dev/null and b/src/activities/geo-country/resource/france/grand-est.png differ diff --git a/src/activities/geo-country/resource/france/haut-de-france.png b/src/activities/geo-country/resource/france/haut-de-france.png new file mode 100644 index 000000000..1b24f6e1a Binary files /dev/null and b/src/activities/geo-country/resource/france/haut-de-france.png differ diff --git a/src/activities/geo-country/resource/france/haute-normandie.png b/src/activities/geo-country/resource/france/haute-normandie.png deleted file mode 100644 index e4d3628e7..000000000 Binary files a/src/activities/geo-country/resource/france/haute-normandie.png and /dev/null differ diff --git a/src/activities/geo-country/resource/france/ile-de-france.png b/src/activities/geo-country/resource/france/ile-de-france.png index 7d2f5639b..cb43b53ef 100644 Binary files a/src/activities/geo-country/resource/france/ile-de-france.png and b/src/activities/geo-country/resource/france/ile-de-france.png differ diff --git a/src/activities/geo-country/resource/france/languedoc-roussillon.png b/src/activities/geo-country/resource/france/languedoc-roussillon.png deleted file mode 100644 index 948230a4e..000000000 Binary files a/src/activities/geo-country/resource/france/languedoc-roussillon.png and /dev/null differ diff --git a/src/activities/geo-country/resource/france/limousin.png b/src/activities/geo-country/resource/france/limousin.png deleted file mode 100644 index 7d735d89e..000000000 Binary files a/src/activities/geo-country/resource/france/limousin.png and /dev/null differ diff --git a/src/activities/geo-country/resource/france/lorraine.png b/src/activities/geo-country/resource/france/lorraine.png deleted file mode 100644 index 2ccac571d..000000000 Binary files a/src/activities/geo-country/resource/france/lorraine.png and /dev/null differ diff --git a/src/activities/geo-country/resource/france/midi-pyrenees.png b/src/activities/geo-country/resource/france/midi-pyrenees.png deleted file mode 100644 index bbff579c3..000000000 Binary files a/src/activities/geo-country/resource/france/midi-pyrenees.png and /dev/null differ diff --git a/src/activities/geo-country/resource/france/nord-pas-de-calais.png b/src/activities/geo-country/resource/france/nord-pas-de-calais.png deleted file mode 100644 index ae179d7d2..000000000 Binary files a/src/activities/geo-country/resource/france/nord-pas-de-calais.png and /dev/null differ diff --git a/src/activities/geo-country/resource/france/normandie.png b/src/activities/geo-country/resource/france/normandie.png new file mode 100644 index 000000000..abfa29955 Binary files /dev/null and b/src/activities/geo-country/resource/france/normandie.png differ diff --git a/src/activities/geo-country/resource/france/nouvelle-aquitaine.png b/src/activities/geo-country/resource/france/nouvelle-aquitaine.png new file mode 100644 index 000000000..9e7370c89 Binary files /dev/null and b/src/activities/geo-country/resource/france/nouvelle-aquitaine.png differ diff --git a/src/activities/geo-country/resource/france/occitanie.png b/src/activities/geo-country/resource/france/occitanie.png new file mode 100644 index 000000000..5dbe38df8 Binary files /dev/null and b/src/activities/geo-country/resource/france/occitanie.png differ diff --git a/src/activities/geo-country/resource/france/paca.png b/src/activities/geo-country/resource/france/paca.png index 30766d0b9..c16619335 100644 Binary files a/src/activities/geo-country/resource/france/paca.png and b/src/activities/geo-country/resource/france/paca.png differ diff --git a/src/activities/geo-country/resource/france/pays-de-la-loire.png b/src/activities/geo-country/resource/france/pays-de-la-loire.png index b2c7c0199..ba74545bb 100644 Binary files a/src/activities/geo-country/resource/france/pays-de-la-loire.png and b/src/activities/geo-country/resource/france/pays-de-la-loire.png differ diff --git a/src/activities/geo-country/resource/france/picardie.png b/src/activities/geo-country/resource/france/picardie.png deleted file mode 100644 index 01e9fd3c4..000000000 Binary files a/src/activities/geo-country/resource/france/picardie.png and /dev/null differ diff --git a/src/activities/geo-country/resource/france/poitou-charentes.png b/src/activities/geo-country/resource/france/poitou-charentes.png deleted file mode 100644 index 01da664bb..000000000 Binary files a/src/activities/geo-country/resource/france/poitou-charentes.png and /dev/null differ diff --git a/src/activities/geo-country/resource/france/rhone-alpes.png b/src/activities/geo-country/resource/france/rhone-alpes.png deleted file mode 100644 index 862f7477d..000000000 Binary files a/src/activities/geo-country/resource/france/rhone-alpes.png and /dev/null differ