Git commit c07a363248880242549976d8d1b58a8bbd38fa94 by Bruno Coudoin. Committed on 28/06/2016 at 00:25. Pushed by bcoudoin into branch 'KDE/0.60'. geo-country, update to match the new french region Probably the first software to be updated as the new regions name are just = official today. M +63 -126 src/activities/geo-country/resource/board/board1_0.qml D +- -- src/activities/geo-country/resource/france/alsace.png D +- -- src/activities/geo-country/resource/france/aquitaine.png A +- -- src/activities/geo-country/resource/france/auvergne-rhone-al= pes.png D +- -- src/activities/geo-country/resource/france/auvergne.png D +- -- src/activities/geo-country/resource/france/basse-normandie.p= ng A +- -- src/activities/geo-country/resource/france/bourgogne-franche= -comte.png D +- -- src/activities/geo-country/resource/france/bourgogne.png M +- -- src/activities/geo-country/resource/france/bretagne.png A +- -- src/activities/geo-country/resource/france/centre-val-de-loi= re.png D +- -- src/activities/geo-country/resource/france/centre.png D +- -- src/activities/geo-country/resource/france/champagne-ardenne= .png M +- -- src/activities/geo-country/resource/france/corse.png M +- -- src/activities/geo-country/resource/france/france-regions.png D +- -- src/activities/geo-country/resource/france/franche-conte.png A +- -- src/activities/geo-country/resource/france/grand-est.png A +- -- src/activities/geo-country/resource/france/haut-de-france.png D +- -- src/activities/geo-country/resource/france/haute-normandie.p= ng M +- -- src/activities/geo-country/resource/france/ile-de-france.png D +- -- src/activities/geo-country/resource/france/languedoc-roussil= lon.png D +- -- src/activities/geo-country/resource/france/limousin.png D +- -- src/activities/geo-country/resource/france/lorraine.png D +- -- src/activities/geo-country/resource/france/midi-pyrenees.png D +- -- src/activities/geo-country/resource/france/nord-pas-de-calai= s.png A +- -- src/activities/geo-country/resource/france/normandie.png A +- -- src/activities/geo-country/resource/france/nouvelle-aquitain= e.png A +- -- src/activities/geo-country/resource/france/occitanie.png M +- -- src/activities/geo-country/resource/france/paca.png M +- -- src/activities/geo-country/resource/france/pays-de-la-loire.= png D +- -- src/activities/geo-country/resource/france/picardie.png D +- -- src/activities/geo-country/resource/france/poitou-charentes.= png D +- -- src/activities/geo-country/resource/france/rhone-alpes.png http://commits.kde.org/gcompris/c07a363248880242549976d8d1b58a8bbd38fa94 diff --git a/src/activities/geo-country/resource/board/board1_0.qml b/src/a= ctivities/geo-country/resource/board/board1_0.qml index dbaba4b..21f5ee0 100644 --- a/src/activities/geo-country/resource/board/board1_0.qml +++ b/src/activities/geo-country/resource/board/board1_0.qml @@ -29,158 +29,95 @@ QtObject { "type" : "SHAPE_BACKGROUND_IMAGE" }, { - "pixmapfile" : "france/rhone-alpes.png", - "sound": "voices-$CA/$LOCALE/france/rhone-alpes.$CA", - "toolTipText" : "Rh=C3=B4ne Alpes", - "x" : "0.639", - "y" : "0.6" - }, - { - "pixmapfile" : "france/paca.png", - "sound": "voices-$CA/$LOCALE/france/provence-alpes-cote_d_azur.$C= A", - "toolTipText" : "Provence Alpes C=C3=B4te 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=C3=A9n=C3=A9es", - "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=C3=B4te 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=C3=B4ne-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=C3=A9", - "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" : "=C3=8Ele-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=C3=A9" } ] } diff --git a/src/activities/geo-country/resource/france/alsace.png b/src/ac= tivities/geo-country/resource/france/alsace.png deleted file mode 100644 index a5ccb00..0000000 Binary files a/src/activities/geo-country/resource/france/alsace.png and /d= ev/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 e9603dc..0000000 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-alpe= s.png b/src/activities/geo-country/resource/france/auvergne-rhone-alpes.png new file mode 100644 index 0000000..8946e42 Binary files /dev/null and b/src/activities/geo-country/resource/france/auv= ergne-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 2d7ac4b..0000000 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 a2f9f56..0000000 Binary files a/src/activities/geo-country/resource/france/basse-normandie.p= ng and /dev/null differ diff --git a/src/activities/geo-country/resource/france/bourgogne-franche-c= omte.png b/src/activities/geo-country/resource/france/bourgogne-franche-com= te.png new file mode 100644 index 0000000..403d4ce Binary files /dev/null and b/src/activities/geo-country/resource/france/bou= rgogne-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 9c6cba7..0000000 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 b543584..3d91eae 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 0000000..e7f68ee Binary files /dev/null and b/src/activities/geo-country/resource/france/cen= tre-val-de-loire.png differ diff --git a/src/activities/geo-country/resource/france/centre.png b/src/ac= tivities/geo-country/resource/france/centre.png deleted file mode 100644 index 4d83f98..0000000 Binary files a/src/activities/geo-country/resource/france/centre.png and /d= ev/null differ diff --git a/src/activities/geo-country/resource/france/champagne-ardenne.p= ng b/src/activities/geo-country/resource/france/champagne-ardenne.png deleted file mode 100644 index 2f39647..0000000 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/act= ivities/geo-country/resource/france/corse.png index 68936b1..603e341 100644 Binary files a/src/activities/geo-country/resource/france/corse.png and b/s= rc/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 971afd9..0a5fae4 100644 Binary files a/src/activities/geo-country/resource/france/france-regions.pn= g 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 45bbef0..0000000 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 0000000..ef8f6de Binary files /dev/null and b/src/activities/geo-country/resource/france/gra= nd-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 0000000..1b24f6e Binary files /dev/null and b/src/activities/geo-country/resource/france/hau= t-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 e4d3628..0000000 Binary files a/src/activities/geo-country/resource/france/haute-normandie.p= ng 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 7d2f563..cb43b53 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-roussillo= n.png b/src/activities/geo-country/resource/france/languedoc-roussillon.png deleted file mode 100644 index 948230a..0000000 Binary files a/src/activities/geo-country/resource/france/languedoc-roussil= lon.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 7d735d8..0000000 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 2ccac57..0000000 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 bbff579..0000000 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 ae179d7..0000000 Binary files a/src/activities/geo-country/resource/france/nord-pas-de-calai= s.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 0000000..abfa299 Binary files /dev/null and b/src/activities/geo-country/resource/france/nor= mandie.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 0000000..9e7370c Binary files /dev/null and b/src/activities/geo-country/resource/france/nou= velle-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 0000000..5dbe38d Binary files /dev/null and b/src/activities/geo-country/resource/france/occ= itanie.png differ diff --git a/src/activities/geo-country/resource/france/paca.png b/src/acti= vities/geo-country/resource/france/paca.png index 30766d0..c166193 100644 Binary files a/src/activities/geo-country/resource/france/paca.png and b/sr= c/activities/geo-country/resource/france/paca.png differ diff --git a/src/activities/geo-country/resource/france/pays-de-la-loire.pn= g b/src/activities/geo-country/resource/france/pays-de-la-loire.png index b2c7c01..ba74545 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 d= iffer 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 01e9fd3..0000000 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.pn= g b/src/activities/geo-country/resource/france/poitou-charentes.png deleted file mode 100644 index 01da664..0000000 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/s= rc/activities/geo-country/resource/france/rhone-alpes.png deleted file mode 100644 index 862f747..0000000 Binary files a/src/activities/geo-country/resource/france/rhone-alpes.png a= nd /dev/null differ