[sdk/kapptemplate] src/templates/C++/kde-frameworks6/doc: remove silly goose from template
Git commit dc01971b666e390537fcb28b3f1c35088aa9de69 by Johnny Jazeix. Committed on 15/06/2024 at 11:06. Pushed by jjazeix into branch 'master'. remove silly goose from template M +1-2src/templates/C++/kde-frameworks6/doc/index.docbook https://invent.kde.org/sdk/kapptemplate/-/commit/dc01971b666e390537fcb28b3f1c35088aa9de69 diff --git a/src/templates/C++/kde-frameworks6/doc/index.docbook b/src/templates/C++/kde-frameworks6/doc/index.docbook index 44d32fdf..646ec74d 100644 --- a/src/templates/C++/kde-frameworks6/doc/index.docbook +++ b/src/templates/C++/kde-frameworks6/doc/index.docbook @@ -389,8 +389,7 @@ application work. --> My Mouse doesn't work. How do I quit ? -You silly goose! Check out the Commands -Section for the answer. +Check out the Commands Section for the answer.
[frameworks/kdoctools] src: remove silly goose from template
Git commit d86b849a4df5da4eafa2c5fd53b7e289b850fcd3 by Johnny Jazeix. Committed on 14/06/2024 at 16:28. Pushed by cullmann into branch 'master'. remove silly goose from template M +1-2src/template.docbook https://invent.kde.org/frameworks/kdoctools/-/commit/d86b849a4df5da4eafa2c5fd53b7e289b850fcd3 diff --git a/src/template.docbook b/src/template.docbook index dc35b496..7790fe87 100644 --- a/src/template.docbook +++ b/src/template.docbook @@ -389,8 +389,7 @@ application work. --> My Mouse doesn't work. How do I quit ? -You silly goose! Check out the Commands -Section for the answer. +Check out the Commands Section for the answer.
[education/gcompris/KDE/4.0] docs/docbook: docs, bump version to 4.1
Git commit b39e9cc03137dc5d6493ec2a8cfc4ed778df57b4 by Johnny Jazeix. Committed on 11/05/2024 at 08:55. Pushed by jjazeix into branch 'KDE/4.0'. docs, bump version to 4.1 M +2-2docs/docbook/index.docbook https://invent.kde.org/education/gcompris/-/commit/b39e9cc03137dc5d6493ec2a8cfc4ed778df57b4 diff --git a/docs/docbook/index.docbook b/docs/docbook/index.docbook index 1c90b0a5b5..cc5c992689 100644 --- a/docs/docbook/index.docbook +++ b/docs/docbook/index.docbook @@ -46,12 +46,12 @@ Don't forget to include this last date. Please respect the format of the date (-MM-DD),it is used by scripts. --> -2024-02-21 +2024-05-23 -4.0 +4.1
[education/gcompris] docs/docbook: docs, bump version to 4.1
Git commit f35bf970623fc84817a00f3fba030fb73e263cd5 by Johnny Jazeix. Committed on 11/05/2024 at 08:08. Pushed by jjazeix into branch 'master'. docs, bump version to 4.1 M +2-2docs/docbook/index.docbook https://invent.kde.org/education/gcompris/-/commit/f35bf970623fc84817a00f3fba030fb73e263cd5 diff --git a/docs/docbook/index.docbook b/docs/docbook/index.docbook index 05f068c519..f90dc5ba69 100644 --- a/docs/docbook/index.docbook +++ b/docs/docbook/index.docbook @@ -46,12 +46,12 @@ Don't forget to include this last date. Please respect the format of the date (-MM-DD),it is used by scripts. --> -2024-02-21 +2024-05-23 -4.0 +4.1
[education/gcompris] docs/docbook: docbook, update copyright year
Git commit 6183901ba4e2ba763ab90e4660ab0b006d3551c0 by Johnny Jazeix. Committed on 24/02/2024 at 11:37. Pushed by jjazeix into branch 'master'. docbook, update copyright year M +1-1docs/docbook/index.docbook https://invent.kde.org/education/gcompris/-/commit/6183901ba4e2ba763ab90e4660ab0b006d3551c0 diff --git a/docs/docbook/index.docbook b/docs/docbook/index.docbook index 1c90b0a5b5..05f068c519 100644 --- a/docs/docbook/index.docbook +++ b/docs/docbook/index.docbook @@ -360,7 +360,7 @@ or make it show real car images instead of filled rectangles (traffic). -Program copyright 2000-2023 Timothée Giet and others +Program copyright 2000-2024 Timothée Giet and others
[education/gcompris/KDE/4.0] docs/docbook: docs, bump version to 4.0
Git commit 2da20b7804e2db4b3b2cfdf899ae2c0b6a0d9ae3 by Johnny Jazeix. Committed on 18/02/2024 at 18:11. Pushed by jjazeix into branch 'KDE/4.0'. docs, bump version to 4.0 M +2-2docs/docbook/index.docbook https://invent.kde.org/education/gcompris/-/commit/2da20b7804e2db4b3b2cfdf899ae2c0b6a0d9ae3 diff --git a/docs/docbook/index.docbook b/docs/docbook/index.docbook index ad509e3ca7..1c90b0a5b5 100644 --- a/docs/docbook/index.docbook +++ b/docs/docbook/index.docbook @@ -46,12 +46,12 @@ Don't forget to include this last date. Please respect the format of the date (-MM-DD),it is used by scripts. --> -2023-06-06 +2024-02-21 -3.3 +4.0
[education/gcompris] docs/docbook: docs, bump version to 4.0
Git commit 47352459ae5d3c719062087ce5f09310764fc665 by Johnny Jazeix. Committed on 18/02/2024 at 16:16. Pushed by jjazeix into branch 'master'. docs, bump version to 4.0 M +2-2docs/docbook/index.docbook https://invent.kde.org/education/gcompris/-/commit/47352459ae5d3c719062087ce5f09310764fc665 diff --git a/docs/docbook/index.docbook b/docs/docbook/index.docbook index ad509e3ca7..1c90b0a5b5 100644 --- a/docs/docbook/index.docbook +++ b/docs/docbook/index.docbook @@ -46,12 +46,12 @@ Don't forget to include this last date. Please respect the format of the date (-MM-DD),it is used by scripts. --> -2023-06-06 +2024-02-21 -3.3 +4.0
[education/gcompris/KDE/4.0] docs/docbook: docbook, add missing word in sentence
Git commit 7a5400027dea7f0250e00cd791f1cd7e9ef2bb26 by Johnny Jazeix. Committed on 22/01/2024 at 08:04. Pushed by jjazeix into branch 'KDE/4.0'. docbook, add missing word in sentence M +1-1docs/docbook/index.docbook https://invent.kde.org/education/gcompris/-/commit/7a5400027dea7f0250e00cd791f1cd7e9ef2bb26 diff --git a/docs/docbook/index.docbook b/docs/docbook/index.docbook index ee1c49cf1f..ad509e3ca7 100644 --- a/docs/docbook/index.docbook +++ b/docs/docbook/index.docbook @@ -119,7 +119,7 @@ with a control bar at the bottom. Each icon represents an activity. Around each one, you can find small icons which give additional information about the activity. A simple click on the icon will lead you to an activity or a menu of activities. There are 8 sections -(categories) of activities, which placed on the top or on the left (only if your orientation is portrait). For example, +(categories) of activities, which are placed on the top or on the left (only if your orientation is portrait). For example, there is section "Board games", which includes board games, like chess, tic tac toe or align four. Some categories have subcategories to better filter the activities. For math activities, we have three subcategories: numeration, arithmetic and measures. The stars indicate the age group for which each game is designed:
[education/gcompris/KDE/4.0] docs/docbook: docbook, remove duplicated word in doc
Git commit 2d4c0e2e99269a6250a73450d1e8a4f30d6eb381 by Johnny Jazeix. Committed on 22/01/2024 at 08:04. Pushed by jjazeix into branch 'KDE/4.0'. docbook, remove duplicated word in doc M +1-1docs/docbook/index.docbook https://invent.kde.org/education/gcompris/-/commit/2d4c0e2e99269a6250a73450d1e8a4f30d6eb381 diff --git a/docs/docbook/index.docbook b/docs/docbook/index.docbook index 411cd9c71e..ee1c49cf1f 100644 --- a/docs/docbook/index.docbook +++ b/docs/docbook/index.docbook @@ -80,7 +80,7 @@ for example 'xx.yy.zz' The purpose of is to provide playful activities but always educational. is part of project and is placed under the https://www.gnu.org/licenses/agpl-3.0.html;>AGPLv3 license. All the code, except the engine for analog electricity activity is under https://www.gnu.org/licenses/gpl.html;>GPLv3 license. is available on the following operating systems: /, , MacOSX, , Android. -It requires a 3D card with support of OpenGL 2.1 or higher is required. 32 bits color depth mandatory +It requires a 3D card with support of OpenGL 2.1 or higher. 32 bits color depth mandatory.
[education/gcompris] docs/docbook: docbook, add missing word in sentence
Git commit 9989ef0ce5fc1cdc21a078d7d5f837bd217dd979 by Johnny Jazeix. Committed on 21/01/2024 at 18:58. Pushed by jjazeix into branch 'master'. docbook, add missing word in sentence M +1-1docs/docbook/index.docbook https://invent.kde.org/education/gcompris/-/commit/9989ef0ce5fc1cdc21a078d7d5f837bd217dd979 diff --git a/docs/docbook/index.docbook b/docs/docbook/index.docbook index ee1c49cf1f..ad509e3ca7 100644 --- a/docs/docbook/index.docbook +++ b/docs/docbook/index.docbook @@ -119,7 +119,7 @@ with a control bar at the bottom. Each icon represents an activity. Around each one, you can find small icons which give additional information about the activity. A simple click on the icon will lead you to an activity or a menu of activities. There are 8 sections -(categories) of activities, which placed on the top or on the left (only if your orientation is portrait). For example, +(categories) of activities, which are placed on the top or on the left (only if your orientation is portrait). For example, there is section "Board games", which includes board games, like chess, tic tac toe or align four. Some categories have subcategories to better filter the activities. For math activities, we have three subcategories: numeration, arithmetic and measures. The stars indicate the age group for which each game is designed:
[education/gcompris] docs/docbook: docbook, remove duplicated word in doc
Git commit b1ab433cb13518fcf15defc061eb52f5c26033ba by Johnny Jazeix. Committed on 21/01/2024 at 14:05. Pushed by jjazeix into branch 'master'. docbook, remove duplicated word in doc M +1-1docs/docbook/index.docbook https://invent.kde.org/education/gcompris/-/commit/b1ab433cb13518fcf15defc061eb52f5c26033ba diff --git a/docs/docbook/index.docbook b/docs/docbook/index.docbook index 411cd9c71e..ee1c49cf1f 100644 --- a/docs/docbook/index.docbook +++ b/docs/docbook/index.docbook @@ -80,7 +80,7 @@ for example 'xx.yy.zz' The purpose of is to provide playful activities but always educational. is part of project and is placed under the https://www.gnu.org/licenses/agpl-3.0.html;>AGPLv3 license. All the code, except the engine for analog electricity activity is under https://www.gnu.org/licenses/gpl.html;>GPLv3 license. is available on the following operating systems: /, , MacOSX, , Android. -It requires a 3D card with support of OpenGL 2.1 or higher is required. 32 bits color depth mandatory +It requires a 3D card with support of OpenGL 2.1 or higher. 32 bits color depth mandatory.
[education/gcompris] docs/docbook: docbook, add --launch option documentation
Git commit cd4baf5a5f5153edd8a1cdf21210690273b383f8 by Johnny Jazeix.
Committed on 11/10/2023 at 21:03.
Pushed by jjazeix into branch 'master'.
docbook, add --launch option documentation
M +5-0docs/docbook/index.docbook
https://invent.kde.org/education/gcompris/-/commit/cd4baf5a5f5153edd8a1cdf21210690273b383f8
diff --git a/docs/docbook/index.docbook b/docs/docbook/index.docbook
index 148056dd93..7937a5db92 100644
--- a/docs/docbook/index.docbook
+++ b/docs/docbook/index.docbook
@@ -306,6 +306,11 @@ or make it show real car images instead of filled
rectangles (traffic).
Specify the activity when starting GCompris.
+
+--start-level level
+Specify the level on which to start the activity specified by --launch
option when starting GCompris. Ignored if no --launch option, or if level
specified is invalid.
+
+
--difficulty {value|min-max}
For the session, force GCompris activities difficulty to be either at
value or between min and max values. The values must be between 1 and 6, and if
the format is min-max, the min value must be lower than the max value. If it is
not the case GCompris will not start.
[education/gcompris/KDE/3.0] docs/docbook: doc, bump version
Git commit 475c0e03ebf1f5d79b279ff794fae1b272e3b4bd by Johnny Jazeix. Committed on 06/08/2023 at 15:04. Pushed by jjazeix into branch 'KDE/3.0'. doc, bump version M +2-2docs/docbook/index.docbook https://invent.kde.org/education/gcompris/-/commit/475c0e03ebf1f5d79b279ff794fae1b272e3b4bd diff --git a/docs/docbook/index.docbook b/docs/docbook/index.docbook index 7e3a9b02d..148056dd9 100644 --- a/docs/docbook/index.docbook +++ b/docs/docbook/index.docbook @@ -46,12 +46,12 @@ Don't forget to include this last date. Please respect the format of the date (-MM-DD),it is used by scripts. --> -2023-02-25 +2023-06-06 -3.1 +3.3
[education/gcompris] docs/docbook: doc, bump version
Git commit 68fb94472a96b7979a3328b6baa86640637ff535 by Johnny Jazeix. Committed on 06/08/2023 at 15:03. Pushed by jjazeix into branch 'master'. doc, bump version M +2-2docs/docbook/index.docbook https://invent.kde.org/education/gcompris/-/commit/68fb94472a96b7979a3328b6baa86640637ff535 diff --git a/docs/docbook/index.docbook b/docs/docbook/index.docbook index 7e3a9b02d..148056dd9 100644 --- a/docs/docbook/index.docbook +++ b/docs/docbook/index.docbook @@ -46,12 +46,12 @@ Don't forget to include this last date. Please respect the format of the date (-MM-DD),it is used by scripts. --> -2023-02-25 +2023-06-06 -3.1 +3.3
[sdk/pology] /: fr, add sieve to convert apostrophes according to the French team rules
Git commit 00b8de37bad27d448e4b0143dedfddb77c9fe775 by Johnny Jazeix.
Committed on 03/06/2023 at 11:52.
Pushed by jjazeix into branch 'master'.
fr, add sieve to convert apostrophes according to the French team rules
M +9-0doc/user/sieving.docbook
M +1-0lang/fr/sieve/CMakeLists.txt
A +51 -0lang/fr/sieve/setApostrophe.py
https://invent.kde.org/sdk/pology/-/commit/00b8de37bad27d448e4b0143dedfddb77c9fe775
diff --git a/doc/user/sieving.docbook b/doc/user/sieving.docbook
index 4abc63c24..8ffdeb9ee 100644
--- a/doc/user/sieving.docbook
+++ b/doc/user/sieving.docbook
@@ -2574,6 +2574,15 @@ Note that percent characters in the
plural-forms field are es
+
+fr:setApostrophe
+
+In French language, the ’ character is the
apostrophe. A rule in the French team is to use directly '.
fr:setApostrophe will detect the ’ and
transform them to '.
+
+There are no parameters.
+
+
+
ru:fill-doc-date-kde
diff --git a/lang/fr/sieve/CMakeLists.txt b/lang/fr/sieve/CMakeLists.txt
index 7f85e8a41..9d4bb3c83 100644
--- a/lang/fr/sieve/CMakeLists.txt
+++ b/lang/fr/sieve/CMakeLists.txt
@@ -1,5 +1,6 @@
set(sieves
setUbsp.py
+setApostrophe.py
)
get_current_source_subdir(srcsubdir)
install(FILES ${sieves} DESTINATION ${DATA_INSTALL_DIR}/${srcsubdir})
diff --git a/lang/fr/sieve/setApostrophe.py b/lang/fr/sieve/setApostrophe.py
new file mode 100644
index 0..52fbf4822
--- /dev/null
+++ b/lang/fr/sieve/setApostrophe.py
@@ -0,0 +1,51 @@
+# -*- coding: UTF-8 -*-
+
+"""
+Replace apostrophe (’) with the ' according to the French rules.
+
+Documented in C{doc/user/sieving.docbook}.
+
+@author: Johnny Jazeix
+@license: GPLv3"""
+
+import re
+
+from pology import _, n_
+from pology.report import report
+
+
+def setup_sieve (p):
+
+p.set_desc(_("@info sieve description",
+ "Replace apostrophe (’) with the ' symbol."))
+
+
+class Sieve (object):
+"""Replace ’ by ' when needed"""
+
+def __init__ (self, params):
+self.nmatch = 0
+
+def process (self, msg, cat):
+
+oldcount=msg.modcount
+
+for i in range(len(msg.msgstr)):
+msg.msgstr[i]=self.setApostrophe(msg.msgstr[i])
+
+if oldcount 0:
+report(n_("@info",
+ "Apostrophes updated in %(num)d message.",
+ "Apostrophes updated in %(num)d messages.",
+ num=self.nmatch))
+
+def setApostrophe(self, text):
+"""Set correctly apostrophes"""
+text=text.replace("’", "'")
+
+return text
[education/gcompris/KDE/3.0] /: core, little text cleaning for the new difficulty option
Git commit 71551d6cf6f36fffc4353c9b010f3553c400f3b8 by Johnny Jazeix, on behalf
of Timothée Giet.
Committed on 17/03/2023 at 12:26.
Pushed by jjazeix into branch 'KDE/3.0'.
core, little text cleaning for the new difficulty option
M +1-1docs/docbook/index.docbook
M +1-1src/core/main.cpp
https://invent.kde.org/education/gcompris/commit/71551d6cf6f36fffc4353c9b010f3553c400f3b8
diff --git a/docs/docbook/index.docbook b/docs/docbook/index.docbook
index dadb6e5ba..7e3a9b02d 100644
--- a/docs/docbook/index.docbook
+++ b/docs/docbook/index.docbook
@@ -307,7 +307,7 @@ or make it show real car images instead of filled
rectangles (traffic).
--difficulty {value|min-max}
-For the session, force the GCompris activities difficulties to be at
either value or between min and max values. The values must be between 1 and 6,
and if the format is min-max, the min value must be lower than the max value.
If it is not the case GCompris will not start.
+For the session, force GCompris activities difficulty to be either at
value or between min and max values. The values must be between 1 and 6, and if
the format is min-max, the min value must be lower than the max value. If it is
not the case GCompris will not start.
--export-activities-as-sql
diff --git a/src/core/main.cpp b/src/core/main.cpp
index 65cc4ab27..4ee0243b5 100644
--- a/src/core/main.cpp
+++ b/src/core/main.cpp
@@ -209,7 +209,7 @@ int main(int argc, char *argv[])
parser.addOption(clListActivities);
QCommandLineOption clDifficultyRange("difficulty",
- QObject::tr("Specify the range of the
activity difficulties to display for the session. Either a single value (2), or
a range (3-6). Values must be between 1 and 6."), "difficulty");
+ QObject::tr("Specify the range of
activity difficulty to display for the session. Either a single value (2), or a
range (3-6). Values must be between 1 and 6."), "difficulty");
parser.addOption(clDifficultyRange);
parser.process(app);
[education/gcompris/KDE/3.0] /: core, add command-line option to set the difficulty.
Git commit fac9653d99aef48f3bacc2d793f879002fd2c241 by Johnny Jazeix.
Committed on 17/03/2023 at 12:26.
Pushed by jjazeix into branch 'KDE/3.0'.
core, add command-line option to set the difficulty.
gcompris-qt --difficulty x to set to x difficulty (x between 1 and 6) or
gcompris-qt --difficulty x-y to set difficulty between x and y (x and between 1
and 6, x < y).
If there is any error parsing the difficulty, an error is displayed and
GCompris leaves.
M +4-0docs/docbook/index.docbook
M +2-0src/activities/menu/ConfigurationItem.qml
M +6-3src/core/ActivityInfoTree.cpp
M +14 -2src/core/ActivityInfoTree.h
M +13 -5src/core/ApplicationSettings.cpp
M +22 -0src/core/ApplicationSettings.h
M +2-2src/core/GComprisPlugin.cpp
M +32 -0src/core/main.cpp
https://invent.kde.org/education/gcompris/commit/fac9653d99aef48f3bacc2d793f879002fd2c241
diff --git a/docs/docbook/index.docbook b/docs/docbook/index.docbook
index 3203a9fab..dadb6e5ba 100644
--- a/docs/docbook/index.docbook
+++ b/docs/docbook/index.docbook
@@ -306,6 +306,10 @@ or make it show real car images instead of filled
rectangles (traffic).
Specify the activity when starting GCompris.
+--difficulty {value|min-max}
+For the session, force the GCompris activities difficulties to be at
either value or between min and max values. The values must be between 1 and 6,
and if the format is min-max, the min value must be lower than the max value.
If it is not the case GCompris will not start.
+
+
--export-activities-as-sql
Export activities as SQL.
diff --git a/src/activities/menu/ConfigurationItem.qml
b/src/activities/menu/ConfigurationItem.qml
index a0bf13535..b96a6809c 100644
--- a/src/activities/menu/ConfigurationItem.qml
+++ b/src/activities/menu/ConfigurationItem.qml
@@ -371,6 +371,7 @@ Item {
GCText {
text: qsTr("Difficulty filter:")
fontSize: mediumSize
+visible:
!ApplicationSettings.filterLevelOverridedByCommandLineOption
width: dialogConfig.contentWidth
height: 50 * ApplicationInfo.ratio
}
@@ -379,6 +380,7 @@ Item {
id: difficultyFlow
width: dialogConfig.contentWidth
spacing: 5 * ApplicationInfo.ratio
+visible:
!ApplicationSettings.filterLevelOverridedByCommandLineOption
property int starsSize: Math.floor(dialogConfig.contentWidth *
0.11)
Image {
diff --git a/src/core/ActivityInfoTree.cpp b/src/core/ActivityInfoTree.cpp
index a6b68ba32..aeb8f94fa 100644
--- a/src/core/ActivityInfoTree.cpp
+++ b/src/core/ActivityInfoTree.cpp
@@ -19,6 +19,7 @@
#include
QString ActivityInfoTree::m_startingActivity = "";
+ActivityInfoTree *ActivityInfoTree::m_instance = nullptr;
ActivityInfoTree::ActivityInfoTree(QObject *parent) :
QObject(parent),
@@ -256,7 +257,7 @@ QObject *ActivityInfoTree::menuTreeProvider(QQmlEngine
*engine, QJSEngine *scrip
{
Q_UNUSED(scriptEngine)
-ActivityInfoTree *menuTree = new ActivityInfoTree(nullptr);
+ActivityInfoTree *menuTree = getInstance();
QQmlComponent componentRoot(engine,
QUrl("qrc:/gcompris/src/activities/menu/ActivityInfo.qml"));
QObject *objectRoot = componentRoot.create();
@@ -351,12 +352,14 @@ void ActivityInfoTree::filterBySearch(const QString )
Q_EMIT menuTreeChanged();
}
-void ActivityInfoTree::minMaxFiltersChanged(quint32 levelMin, quint32
levelMax, bool emitChanged)
+void ActivityInfoTree::minMaxFiltersChanged(quint32 levelMin, quint32
levelMax, bool doSynchronize)
{
for (ActivityInfo *activity: qAsConst(m_menuTreeFull)) {
activity->enableDatasetsBetweenDifficulties(levelMin, levelMax);
}
-ApplicationSettings::getInstance()->sync();
+if (doSynchronize) {
+ApplicationSettings::getInstance()->sync();
+}
}
QVariantList ActivityInfoTree::allCharacters()
diff --git a/src/core/ActivityInfoTree.h b/src/core/ActivityInfoTree.h
index 25ffe64a5..fe9a9b1fe 100644
--- a/src/core/ActivityInfoTree.h
+++ b/src/core/ActivityInfoTree.h
@@ -28,6 +28,13 @@ class ActivityInfoTree : public QObject
Q_PROPERTY(QString startingActivity MEMBER m_startingActivity NOTIFY
startingActivityChanged)
public:
+static ActivityInfoTree *getInstance()
+{
+if (!m_instance) {
+m_instance = new ActivityInfoTree();
+}
+return m_instance;
+}
QQmlListProperty menuTree();
ActivityInfo *getRootMenu() const;
void setRootMenu(ActivityInfo *rootMenu);
@@ -42,15 +49,20 @@ public:
static void setStartingActivity(const QString ) {
m_startingActivity = startingActivity; }
-protected Q_SLOTS:
+protected:
+static ActivityInfoTree *m_instance;
+
+public Q_SLOTS:
+Q_INVOKABLE void minMaxFiltersChanged(quint32 levelMin, quint32 levelMax,
bool doSynchronize = true);
Q_INVOKABLE void
[education/gcompris] /: core, add command-line option to set the difficulty.
Git commit b14ec28be263528256b90c242db36f83675ead01 by Johnny Jazeix.
Committed on 15/03/2023 at 20:51.
Pushed by jjazeix into branch 'master'.
core, add command-line option to set the difficulty.
gcompris-qt --difficulty x to set to x difficulty (x between 1 and 6) or
gcompris-qt --difficulty x-y to set difficulty between x and y (x and between 1
and 6, x < y).
If there is any error parsing the difficulty, an error is displayed and
GCompris leaves.
M +4-0docs/docbook/index.docbook
M +2-0src/activities/menu/ConfigurationItem.qml
M +6-3src/core/ActivityInfoTree.cpp
M +14 -2src/core/ActivityInfoTree.h
M +13 -5src/core/ApplicationSettings.cpp
M +22 -0src/core/ApplicationSettings.h
M +2-2src/core/GComprisPlugin.cpp
M +32 -0src/core/main.cpp
https://invent.kde.org/education/gcompris/commit/b14ec28be263528256b90c242db36f83675ead01
diff --git a/docs/docbook/index.docbook b/docs/docbook/index.docbook
index 3203a9fab..dadb6e5ba 100644
--- a/docs/docbook/index.docbook
+++ b/docs/docbook/index.docbook
@@ -306,6 +306,10 @@ or make it show real car images instead of filled
rectangles (traffic).
Specify the activity when starting GCompris.
+--difficulty {value|min-max}
+For the session, force the GCompris activities difficulties to be at
either value or between min and max values. The values must be between 1 and 6,
and if the format is min-max, the min value must be lower than the max value.
If it is not the case GCompris will not start.
+
+
--export-activities-as-sql
Export activities as SQL.
diff --git a/src/activities/menu/ConfigurationItem.qml
b/src/activities/menu/ConfigurationItem.qml
index a0bf13535..b96a6809c 100644
--- a/src/activities/menu/ConfigurationItem.qml
+++ b/src/activities/menu/ConfigurationItem.qml
@@ -371,6 +371,7 @@ Item {
GCText {
text: qsTr("Difficulty filter:")
fontSize: mediumSize
+visible:
!ApplicationSettings.filterLevelOverridedByCommandLineOption
width: dialogConfig.contentWidth
height: 50 * ApplicationInfo.ratio
}
@@ -379,6 +380,7 @@ Item {
id: difficultyFlow
width: dialogConfig.contentWidth
spacing: 5 * ApplicationInfo.ratio
+visible:
!ApplicationSettings.filterLevelOverridedByCommandLineOption
property int starsSize: Math.floor(dialogConfig.contentWidth *
0.11)
Image {
diff --git a/src/core/ActivityInfoTree.cpp b/src/core/ActivityInfoTree.cpp
index a6b68ba32..aeb8f94fa 100644
--- a/src/core/ActivityInfoTree.cpp
+++ b/src/core/ActivityInfoTree.cpp
@@ -19,6 +19,7 @@
#include
QString ActivityInfoTree::m_startingActivity = "";
+ActivityInfoTree *ActivityInfoTree::m_instance = nullptr;
ActivityInfoTree::ActivityInfoTree(QObject *parent) :
QObject(parent),
@@ -256,7 +257,7 @@ QObject *ActivityInfoTree::menuTreeProvider(QQmlEngine
*engine, QJSEngine *scrip
{
Q_UNUSED(scriptEngine)
-ActivityInfoTree *menuTree = new ActivityInfoTree(nullptr);
+ActivityInfoTree *menuTree = getInstance();
QQmlComponent componentRoot(engine,
QUrl("qrc:/gcompris/src/activities/menu/ActivityInfo.qml"));
QObject *objectRoot = componentRoot.create();
@@ -351,12 +352,14 @@ void ActivityInfoTree::filterBySearch(const QString )
Q_EMIT menuTreeChanged();
}
-void ActivityInfoTree::minMaxFiltersChanged(quint32 levelMin, quint32
levelMax, bool emitChanged)
+void ActivityInfoTree::minMaxFiltersChanged(quint32 levelMin, quint32
levelMax, bool doSynchronize)
{
for (ActivityInfo *activity: qAsConst(m_menuTreeFull)) {
activity->enableDatasetsBetweenDifficulties(levelMin, levelMax);
}
-ApplicationSettings::getInstance()->sync();
+if (doSynchronize) {
+ApplicationSettings::getInstance()->sync();
+}
}
QVariantList ActivityInfoTree::allCharacters()
diff --git a/src/core/ActivityInfoTree.h b/src/core/ActivityInfoTree.h
index 25ffe64a5..fe9a9b1fe 100644
--- a/src/core/ActivityInfoTree.h
+++ b/src/core/ActivityInfoTree.h
@@ -28,6 +28,13 @@ class ActivityInfoTree : public QObject
Q_PROPERTY(QString startingActivity MEMBER m_startingActivity NOTIFY
startingActivityChanged)
public:
+static ActivityInfoTree *getInstance()
+{
+if (!m_instance) {
+m_instance = new ActivityInfoTree();
+}
+return m_instance;
+}
QQmlListProperty menuTree();
ActivityInfo *getRootMenu() const;
void setRootMenu(ActivityInfo *rootMenu);
@@ -42,15 +49,20 @@ public:
static void setStartingActivity(const QString ) {
m_startingActivity = startingActivity; }
-protected Q_SLOTS:
+protected:
+static ActivityInfoTree *m_instance;
+
+public Q_SLOTS:
+Q_INVOKABLE void minMaxFiltersChanged(quint32 levelMin, quint32 levelMax,
bool doSynchronize = true);
Q_INVOKABLE void
[education/gcompris/KDE/3.0] docs/docbook: docbook, add Timothée as author too
Git commit 16582b9053a917542434b2253be8d840f9c27d7e by Johnny Jazeix. Committed on 03/03/2023 at 14:18. Pushed by jjazeix into branch 'KDE/3.0'. docbook, add Timothée as author too M +8-2docs/docbook/index.docbook https://invent.kde.org/education/gcompris/commit/16582b9053a917542434b2253be8d840f9c27d7e diff --git a/docs/docbook/index.docbook b/docs/docbook/index.docbook index c3c2c7d41..3203a9fab 100644 --- a/docs/docbook/index.docbook +++ b/docs/docbook/index.docbook @@ -21,8 +21,14 @@ -Johnny Jazeix - +Johnny +Jazeix + + + + +Timothée +Giet
[education/gcompris] docs/docbook: docbook, add Timothée as author too
Git commit 0f6f8d9f57957b414670bcefed176d270ba12c41 by Johnny Jazeix. Committed on 03/03/2023 at 14:15. Pushed by jjazeix into branch 'master'. docbook, add Timothée as author too M +8-2docs/docbook/index.docbook https://invent.kde.org/education/gcompris/commit/0f6f8d9f57957b414670bcefed176d270ba12c41 diff --git a/docs/docbook/index.docbook b/docs/docbook/index.docbook index c3c2c7d41..3203a9fab 100644 --- a/docs/docbook/index.docbook +++ b/docs/docbook/index.docbook @@ -21,8 +21,14 @@ -Johnny Jazeix - +Johnny +Jazeix + + + + +Timothée +Giet
[education/gcompris/KDE/3.0] docs/docbook: docbook, add -l and --launch options in the doc
Git commit f8b55041f759827efb4f737aa118b08d0bce07a7 by Johnny Jazeix. Committed on 25/02/2023 at 09:18. Pushed by jjazeix into branch 'KDE/3.0'. docbook, add -l and --launch options in the doc M +18 -10 docs/docbook/index.docbook https://invent.kde.org/education/gcompris/commit/f8b55041f759827efb4f737aa118b08d0bce07a7 diff --git a/docs/docbook/index.docbook b/docs/docbook/index.docbook index d18636702..c3c2c7d41 100644 --- a/docs/docbook/index.docbook +++ b/docs/docbook/index.docbook @@ -40,12 +40,12 @@ Don't forget to include this last date. Please respect the format of the date (-MM-DD),it is used by scripts. --> -2022-01-21 +2023-02-25 -2.1 +3.1 @@ -81,12 +81,12 @@ It requires a 3D card with support of OpenGL 2.1 or higher Installation The software is delivered under several forms. Follow the process according to your case. -/: Use the packages delivered by your / distribution. +/: use the packages delivered by your / distribution. If is not packaged in your distribution, please contact them to ask for the inclusion of in your distribution. -: Delivered under a classic installer for or via the Microsoft Store. -MacOSX: Delivered under a classic installer. -Android: Distributed by the F-Droid store or Google Play Store. Apk file is also available. +: delivered under a classic installer for or via the Microsoft Store. +MacOSX: delivered under a classic installer. +Android: distributed by the F-Droid store or Google Play Store. Apk file is also available. @@ -133,7 +133,7 @@ there is section "Board games", which includes board games, like chess, tic tac not the child has completed the task. In this case, you have to click on this icon. You can also use the key on your keyboard. - Light - Display a hint for the activity. We can help the children on some activities to guide them to find the answers. + Light - Display a hint for the activity. We can help the children on some activities to guide them to find the answers. Arrows - The present level is displayed. Click on one of the arrows to select another level. @@ -146,7 +146,7 @@ In , it is possible to go to the next level without having completed t to be described easily in the description area. In this case, this function gives access to additional information. Tool box - Configuration menu. The configuration is saved in the user repository (folder) -under the name .config/gcompris/gcompris.conf. This is a text file which can be edited manually. +under the name .config/gcompris/gcompris-qt.conf. This is a text file which can be edited manually. List item - Display the activity settings menu. There are two possible tabs here. First one, "Dataset", allows to choose the levels of the activities depending on several objectives and the second one, "Options", allows to update the configuration of the activity if available. @@ -292,6 +292,14 @@ or make it show real car images instead of filled rectangles (traffic). Print the version of . +-l, --list-activities +Outputs all the available activities on the standard output. + + +--launch activity +Specify the activity when starting GCompris. + + --export-activities-as-sql Export activities as SQL. @@ -318,7 +326,7 @@ or make it show real car images instead of filled rectangles (traffic). Example You can add these switches in the desktop icon properties. Here is an example that runs in kiosk mode in full screen, without Configuration button and cursor: -"C:\Program Files\Gcompris\gcompris-qt.exe" --enable-kioskmode -f -C +"C:\Program Files\GCompris-Qt\bin\GCompris.exe" --enable-kioskmode -f -C @@ -338,7 +346,7 @@ or make it show real car images instead of filled rectangles (traffic). -Program copyright 2000-2022 Timothée Giet and others +Program copyright 2000-2023 Timothée Giet and others
[education/gcompris] docs/docbook: docbook, add -l and --launch options in the doc
Git commit 0997d1e31f1d71b12a98c0d1de7a6539d809d0b4 by Johnny Jazeix. Committed on 25/02/2023 at 09:17. Pushed by jjazeix into branch 'master'. docbook, add -l and --launch options in the doc M +18 -10 docs/docbook/index.docbook https://invent.kde.org/education/gcompris/commit/0997d1e31f1d71b12a98c0d1de7a6539d809d0b4 diff --git a/docs/docbook/index.docbook b/docs/docbook/index.docbook index d18636702..c3c2c7d41 100644 --- a/docs/docbook/index.docbook +++ b/docs/docbook/index.docbook @@ -40,12 +40,12 @@ Don't forget to include this last date. Please respect the format of the date (-MM-DD),it is used by scripts. --> -2022-01-21 +2023-02-25 -2.1 +3.1 @@ -81,12 +81,12 @@ It requires a 3D card with support of OpenGL 2.1 or higher Installation The software is delivered under several forms. Follow the process according to your case. -/: Use the packages delivered by your / distribution. +/: use the packages delivered by your / distribution. If is not packaged in your distribution, please contact them to ask for the inclusion of in your distribution. -: Delivered under a classic installer for or via the Microsoft Store. -MacOSX: Delivered under a classic installer. -Android: Distributed by the F-Droid store or Google Play Store. Apk file is also available. +: delivered under a classic installer for or via the Microsoft Store. +MacOSX: delivered under a classic installer. +Android: distributed by the F-Droid store or Google Play Store. Apk file is also available. @@ -133,7 +133,7 @@ there is section "Board games", which includes board games, like chess, tic tac not the child has completed the task. In this case, you have to click on this icon. You can also use the key on your keyboard. - Light - Display a hint for the activity. We can help the children on some activities to guide them to find the answers. + Light - Display a hint for the activity. We can help the children on some activities to guide them to find the answers. Arrows - The present level is displayed. Click on one of the arrows to select another level. @@ -146,7 +146,7 @@ In , it is possible to go to the next level without having completed t to be described easily in the description area. In this case, this function gives access to additional information. Tool box - Configuration menu. The configuration is saved in the user repository (folder) -under the name .config/gcompris/gcompris.conf. This is a text file which can be edited manually. +under the name .config/gcompris/gcompris-qt.conf. This is a text file which can be edited manually. List item - Display the activity settings menu. There are two possible tabs here. First one, "Dataset", allows to choose the levels of the activities depending on several objectives and the second one, "Options", allows to update the configuration of the activity if available. @@ -292,6 +292,14 @@ or make it show real car images instead of filled rectangles (traffic). Print the version of . +-l, --list-activities +Outputs all the available activities on the standard output. + + +--launch activity +Specify the activity when starting GCompris. + + --export-activities-as-sql Export activities as SQL. @@ -318,7 +326,7 @@ or make it show real car images instead of filled rectangles (traffic). Example You can add these switches in the desktop icon properties. Here is an example that runs in kiosk mode in full screen, without Configuration button and cursor: -"C:\Program Files\Gcompris\gcompris-qt.exe" --enable-kioskmode -f -C +"C:\Program Files\GCompris-Qt\bin\GCompris.exe" --enable-kioskmode -f -C @@ -338,7 +346,7 @@ or make it show real car images instead of filled rectangles (traffic). -Program copyright 2000-2022 Timothée Giet and others +Program copyright 2000-2023 Timothée Giet and others
[education/gcompris/KDE/1.0] /: docs, relicence GCompris executable as AGPLv3 due to analog electricity engine
Git commit 914363f5b648d83bde35a2018ec9cf6744a80911 by Johnny Jazeix. Committed on 30/01/2021 at 19:38. Pushed by jjazeix into branch 'KDE/1.0'. docs, relicence GCompris executable as AGPLv3 due to analog electricity engine M +67 -80 COPYING C +0-0COPYING-GPLv3 [from: COPYING - 100% similarity] M +1-1README.md M +1-1docs/docbook/index.docbook M +1-1docs/manual-general M +1-1org.kde.gcompris.appdata.xml M +1-1platforms/sailfishOS/harbour-gcompris-qt.spec.cmake M +1-1publiccode.yml M +2-2src/core/CMakeLists.txt https://invent.kde.org/education/gcompris/commit/914363f5b648d83bde35a2018ec9cf6744a80911 diff --git a/COPYING b/COPYING index e60008693..be3f7b28e 100644 --- a/COPYING +++ b/COPYING @@ -1,5 +1,5 @@ -GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 +GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/> Everyone is permitted to copy and distribute verbatim copies @@ -7,17 +7,15 @@ Preamble - The GNU General Public License is a free, copyleft license for -software and other kinds of works. + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to +our General Public Licenses are intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. +software for all its users. When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you @@ -26,44 +24,34 @@ them if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things. - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary b
[education/gcompris] /: docs, relicence GCompris executable as AGPLv3 due to analog electricity engine
Git commit 42f890cefab51ef675f3428c79d6e3d1887d73f3 by Johnny Jazeix. Committed on 30/01/2021 at 19:28. Pushed by jjazeix into branch 'master'. docs, relicence GCompris executable as AGPLv3 due to analog electricity engine M +67 -80 COPYING C +0-0COPYING-GPLv3 [from: COPYING - 100% similarity] M +1-1README.md M +1-1docs/docbook/index.docbook M +1-1docs/manual-general M +1-1org.kde.gcompris.appdata.xml M +1-1platforms/sailfishOS/harbour-gcompris-qt.spec.cmake M +1-1publiccode.yml M +2-2src/core/CMakeLists.txt https://invent.kde.org/education/gcompris/commit/42f890cefab51ef675f3428c79d6e3d1887d73f3 diff --git a/COPYING b/COPYING index e60008693..be3f7b28e 100644 --- a/COPYING +++ b/COPYING @@ -1,5 +1,5 @@ -GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 +GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/> Everyone is permitted to copy and distribute verbatim copies @@ -7,17 +7,15 @@ Preamble - The GNU General Public License is a free, copyleft license for -software and other kinds of works. + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to +our General Public Licenses are intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. +software for all its users. When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you @@ -26,44 +24,34 @@ them if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things. - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary b
[education/gcompris] docs/docbook: docs, fix typos
Git commit 3ca5bcc9151aa9f6a6b0696a46a6d06a6e768226 by Johnny Jazeix, on behalf of Antoni Bella Pérez. Committed on 30/08/2020 at 11:12. Pushed by jjazeix into branch 'master'. docs, fix typos M +19 -19 docs/docbook/index.docbook https://invent.kde.org/education/gcompris/commit/3ca5bcc9151aa9f6a6b0696a46a6d06a6e768226 diff --git a/docs/docbook/index.docbook b/docs/docbook/index.docbook index f9bd3cffc..a042f3fea 100644 --- a/docs/docbook/index.docbook +++ b/docs/docbook/index.docbook @@ -124,7 +124,7 @@ there is section "Board games", which includes board games, like chess, tic tac 1, 2 or 3 red stars - greater than 6 years old. -At the bottom of the screen there is a control bar for . The possible icons are: (the icons are only displayed if they are available in the activity): +At the bottom of the screen there is a control bar for . The possible icons are (the icons are only displayed if they are available in the activity): Home - Leaves the current activity, returns to the previous menu. @@ -162,7 +162,7 @@ under the name .config/gcompris/gcompris.conf. This is a te When you use with small children or on a self-service kiosk, you can disable a certain number of options: gcompris --enable-kioskmode : disable the Quit and Configuration buttons. -gcompris --diable-kioskmode : enable the Quit and Configuration buttons. +gcompris --disable-kioskmode : enable the Quit and Configuration buttons. gcompris -f : run in fullscreen mode gcompris -C : disable the cursor (touch screen mode) @@ -180,23 +180,23 @@ under the name .config/gcompris/gcompris.conf. This is a te or W -Quit the current activity or dialog then return to the main menu +Quit the current activity or dialog then return to the main menu. Q -Quit without further notice +Quit without further notice. F -Toggle fullscreen mode +Toggle fullscreen mode. M -Toggle sound mute +Toggle sound mute. B -Display or Hide the control bar +Display or Hide the control bar. @@ -265,51 +265,51 @@ or make it show real car images instead of filled rectangles (traffic). -f, --fullscreen -Run in fullscreen mode +Run in fullscreen mode. -w, --window -Run in window mode +Run in window mode. -s, --sound -Run with sound enabled +Run with sound enabled. -m, --mute -Run without sound +Run without sound. -c, --cursor -Run with the default system cursor +Run with the default system cursor. -C, --nocursor -Run without cursor (touch screen mode) +Run without cursor (touch screen mode). -v, --version -Print the version of +Print the version of . --export-activities-as-sql -Export activities as SQL +Export activities as SQL. --enable-kioskmode -Enable the kiosk mode (hides Quit and Configuration buttons) +Enable the kiosk mode (hides Quit and Configuration buttons). --disable-kioskmode -Disable the kiosk mode (default) +Disable the kiosk mode (default). --software-renderer -Use software renderer instead of openGL (should work with any graphical card) +Use software renderer instead of openGL (should work with any graphical card). --opengl-renderer -Use openGL renderer instead of software (faster and more graphical effects but can crash with some graphical cards) +Use openGL renderer instead of software (faster and more graphical effects but can crash with some graphical cards).
Re: Fixes to GCompris doc [patch]
Thank you, I'll update it! Johnny Le dim. 30 août 2020 à 12:27, Antoni Bella Pérez a écrit : > Hi, > > More easy add a diff, thank you. > > Regards > Toni > -- > Dubta que les estrelles siguin foc. > Dubta que el Sol es mogui. > Dubta que la veritat sigui mentida. > Però no dubtis mai que t'estimo. > - William Shakespeare >
[education/gcompris] docs/docbook: docs, fix some typos in last commit
Git commit 6f86a8cdc40bfce3135ffb47c450b5c82b983f52 by Johnny Jazeix. Committed on 29/08/2020 at 19:52. Pushed by jjazeix into branch 'master'. docs, fix some typos in last commit M +7-5docs/docbook/index.docbook https://invent.kde.org/education/gcompris/commit/6f86a8cdc40bfce3135ffb47c450b5c82b983f52 diff --git a/docs/docbook/index.docbook b/docs/docbook/index.docbook index d28cd35d5..f9bd3cffc 100644 --- a/docs/docbook/index.docbook +++ b/docs/docbook/index.docbook @@ -115,7 +115,7 @@ with a control bar at the bottom. about the activity. A simple click on the icon will lead you to an activity or a menu of activities. There are 8 sections (categories) of activities, which placed on the top or on the left (only if your orientation is portrait). For example, there is section "Board games", which includes board games, like chess, tic tac toe or align four. -Some categories have subcategories to better filter the activities. For math activities,we have three subcategories: numeration, arithmetic and measures. +Some categories have subcategories to better filter the activities. For math activities, we have three subcategories: numeration, arithmetic and measures. The stars indicate the age group for which each game is designed: @@ -148,7 +148,7 @@ to be described easily in the description area. In this case, this function give Tool box - Configuration menu. The configuration is saved in the user repository (folder) under the name .config/gcompris/gcompris.conf. This is a text file which can be edited manually. - List item - Display the activity settings menu. There are two possible information here. We can choose the levels of the activities depending on several objectives and we can update the configuration of the activity if available. + List item - Display the activity settings menu. There are two possible tabs here. First one, "Dataset", allows to choose the levels of the activities depending on several objectives and the second one, "Options", allows to update the configuration of the activity if available. Capital "G" - Information box on , presents the main contributors and the version of the software. @@ -226,6 +226,10 @@ in the configuration menu. Do not forget to download the optional audio modules Customizing activities +You can customize some activities using the configuration button in them. +For example, you can set the locale in some text activities (like wordsgame), +or make it show real car images instead of filled rectangles (traffic). + For multiple activities, you can choose several datasets in the configuration. Each one has a specific objective which is described. Dataset of activity "Count the items" @@ -239,9 +243,7 @@ in the configuration menu. Do not forget to download the optional audio modules -You can customize some activities using the configuration button in them. -For example, you can set the locale in some text activities (like wordsgame), -or make it show real car images instead of filled rectangles (traffic) +You can choose the options for this activity. Select mode of activity "Count the items"
[education/gcompris] docs: docs, update docbook
Git commit b07918a92c27ce49901cc2dacdcbb2928d84f442 by Johnny Jazeix. Committed on 29/08/2020 at 19:18. Pushed by jjazeix into branch 'master'. docs, update docbook A +---docs/docbook/activity-config.png A +133 -0docs/docbook/bar_activity_config.svg A +109 -0docs/docbook/bar_hint.svg A +105 -0docs/docbook/bar_reload.svg A +---docs/docbook/dataset.png M +---docs/docbook/gcompris-main-menu.png M +72 -69 docs/docbook/index.docbook D +---docs/docbook/traffic-select-mode.png M +19 -17 docs/manual-general https://invent.kde.org/education/gcompris/commit/b07918a92c27ce49901cc2dacdcbb2928d84f442 diff --git a/docs/docbook/activity-config.png b/docs/docbook/activity-config.png new file mode 100644 index 0..3c0786012 Binary files /dev/null and b/docs/docbook/activity-config.png differ diff --git a/docs/docbook/bar_activity_config.svg b/docs/docbook/bar_activity_config.svg new file mode 100644 index 0..4796ae054 --- /dev/null +++ b/docs/docbook/bar_activity_config.svg @@ -0,0 +1,133 @@ + + + +http://purl.org/dc/elements/1.1/; + xmlns:cc="http://creativecommons.org/ns#; + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#; + xmlns:svg="http://www.w3.org/2000/svg; + xmlns="http://www.w3.org/2000/svg; + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd; + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape; + sodipodi:docname="bar_activity_config.svg" + inkscape:version="0.92.4 (5da689c313, 2019-01-14)" + version="1.1" + id="svg4211" + height="66" + width="66"> + + + + + + + +image/svg+xml +http://purl.org/dc/dcmitype/StillImage; /> + +2019 + + +Timothée Giet + + +http://creativecommons.org/licenses/by-sa/4.0/; /> + + http://creativecommons.org/licenses/by-sa/4.0/;> +http://creativecommons.org/ns#Reproduction; /> +http://creativecommons.org/ns#Distribution; /> +http://creativecommons.org/ns#Notice; /> +http://creativecommons.org/ns#Attribution; /> +http://creativecommons.org/ns#DerivativeWorks; /> +http://creativecommons.org/ns#ShareAlike; /> + + + + + + + + + + + + + diff --git a/docs/docbook/bar_hint.svg b/docs/docbook/bar_hint.svg new file mode 100644 index 0..9da33 --- /dev/null +++ b/docs/docbook/bar_hint.svg @@ -0,0 +1,109 @@ + + + +http://purl.org/dc/elements/1.1/; + xmlns:cc="http://creativecommons.org/ns#; + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#; + xmlns:svg="http://www.w3.org/2000/svg; + xmlns="http://www.w3.org/2000/svg; + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd; + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape; + width="66" + height="66" + id="svg4211" + version="1.1" + inkscape:version="0.91 r13725" + sodipodi:docname="bar_hint.svg"> + + + + + +image/svg+xml +http://purl.org/dc/dcmitype/StillImage; /> + +2015 + + +Timothée Giet + + +http://creativecommons.org/licenses/by-sa/4.0/; /> + + http://creativecommons.org/licenses/by-sa/4.0/;> +http://creativecommons.org/ns#Reproduction; /> +http://creativecommons.org/ns#Distribution; /> +http://creativecommons.org/ns#Notice; /> +http://creativecommons.org/ns#Attribution; /> +http://creativecommons.org/ns#DerivativeWorks; /> +http://creativecommons.org/ns#ShareAlike; /> + + + + + + + + + + + diff --git a/docs/docbook/bar_reload.svg b/docs/docbook/bar_reload.svg new file mode 100644 index 0..377422d44 --- /dev/null +++ b/docs/docbook/bar_reload.svg @@ -0,0 +1,105 @@ + + + +http://purl.org/dc/elements/1.1/; + xmlns:cc="http://creativecommons.org/ns#; + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#; + xmlns:svg="http://www.w3.org/2000/svg; + xmlns="http://www.w3.org/2000/svg; + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd; + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape; + width="66" + height="66" + id="svg4211" + version="1.1" + inkscape:version="0.91 r13725" + sodipodi:docname="bar_reload.svg"> + + + + + +image/svg+xml +http://purl.org/dc/dcmitype/StillImage; /> + +2015 + + +Timothée Giet + + +http://creativecommons.org/lice
[gcompris] /: global, http to https for supported urls
Git commit 5f083bf9ffa93309e22aa039b0772095bc064421 by Johnny Jazeix. Committed on 17/09/2018 at 20:29. Pushed by jjazeix into branch 'master'. global, http to https for supported urls M +4-4COPYING M +1-1HACKING M +2-2README M +8-8README.rst M +2-2android/src/net/gcompris/GComprisActivity.java M +6-6docs/docbook/index.docbook M +2-2org.kde.gcompris.appdata.xml M +1-1platforms/ios/config.h M +1-1platforms/ios/createAppicon.py M +1-1platforms/ios/createLaunchImage.py M +1-1platforms/ios/icon_no_corner.svg M +1-1platforms/macosx/config.h M +1-1src/activities/advanced_colors/ActivityInfo.qml M +1-1src/activities/advanced_colors/AdvancedColors.qml M +2-2src/activities/advanced_colors/advanced_colors.js M +1-1src/activities/algebra_by/ActivityInfo.qml M +1-1src/activities/algebra_by/Algebra.qml M +1-1src/activities/algebra_by/AlgebraBy.qml M +1-1src/activities/algebra_by/AlgebraText.qml M +1-1src/activities/algebra_by/algebra.js M +1-1src/activities/algebra_div/ActivityInfo.qml M +1-1src/activities/algebra_div/AlgebraDiv.qml M +1-1src/activities/algebra_minus/ActivityInfo.qml M +1-1src/activities/algebra_minus/AlgebraMinus.qml M +1-1src/activities/algebra_plus/ActivityInfo.qml M +1-1src/activities/algebra_plus/AlgebraPlus.qml M +1-1src/activities/algorithm/ActivityInfo.qml M +1-1src/activities/algorithm/Algorithm.qml M +1-1src/activities/algorithm/algorithm.js M +1-1src/activities/align4-2players/ActivityInfo.qml M +1-1src/activities/align4-2players/Align42players.qml M +1-1src/activities/align4-2players/Piece.qml M +1-1src/activities/align4-2players/align4.js M +1-1src/activities/align4/ActivityInfo.qml M +1-1src/activities/align4/Align4.qml M +1-1src/activities/alphabet-sequence/ActivityInfo.qml M +1-1src/activities/alphabet-sequence/AlphabetSequence.qml M +1-1src/activities/baby_wordprocessor/ActivityInfo.qml M +1-1src/activities/baby_wordprocessor/BabyWordprocessor.qml M +1-1src/activities/babymatch/ActivityInfo.qml M +1-1src/activities/babymatch/Babymatch.qml M +1-1src/activities/babymatch/DragListItem.qml M +1-1src/activities/babymatch/DropAnswerItem.qml M +1-1src/activities/babymatch/ListWidget.qml M +1-1src/activities/babymatch/TextItem.qml M +1-1src/activities/babymatch/babymatch.js M +1-1src/activities/babymatch/resource/board/board1_0.qml M +1-1src/activities/babymatch/resource/board/board2_0.qml M +1-1src/activities/babymatch/resource/board/board3_0.qml M +1-1src/activities/babymatch/resource/board/board4_0.qml M +1-1src/activities/babymatch/resource/board/board5_0.qml M +1-1src/activities/babymatch/resource/board/board6_0.qml M +1-1src/activities/babymatch/resource/board/board7_0.qml M +1-1src/activities/babyshapes/ActivityInfo.qml M +1-1src/activities/babyshapes/Babyshapes.qml M +1-1src/activities/babyshapes/resource/board/board1_0.qml M +1-1src/activities/babyshapes/resource/board/board2_0.qml M +1-1src/activities/babyshapes/resource/board/board3_0.qml M +1-1src/activities/babyshapes/resource/board/board4_0.qml M +1-1src/activities/babyshapes/resource/board/board5_0.qml M +1-1src/activities/babyshapes/resource/board/board6_0.qml M +1-1src/activities/babyshapes/resource/board/board7_0.qml M +1-1src/activities/babyshapes/resource/board/board7_1.qml M +1-1src/activities/babyshapes/resource/board/board7_2.qml M +1-1src/activities/babyshapes/resource/board/board7_3.qml M +1-1src/activities/babyshapes/resource/board/board7_4.qml M +1-1src/activities/balancebox/ActivityInfo.qml M +1-1src/activities/balancebox/BalanceContact.qml M +1-1src/activities/balancebox/BalanceItem.qml M +1-1src/activities/balancebox/Balancebox.qml M +1-1src/activities/balancebox/Goal.qml M +1-1src/activities/balancebox/Wall.qml M +1-1src/activities/balancebox/balancebox.js M +1-1src/activities/balancebox/balancebox_common.js M +1-1src/activities/balancebox/editor/BalanceboxEditor.qml M +1-1src/activities/balancebox/editor/EditorTool.qml M +1-1src/activities/balancebox/editor/balanceboxeditor.js M +1-1src/activities/balancebox/editor/editor_worker.js M +1-1src/activities/ballcatch/ActivityInfo.qml M +1-1src/activities/ballcatch/Ball.qml M +1-1src/activities/ballcatch/Ballcatch.qml M +1-1src/activities/ballcatch/ballcatch.js M +1-1src/activities/bargame/ActivityInfo.qml M +1-1src
[kde-doc-english] [gcompris/KDE/0.40] /: Fix some incorrect GUI strings
Git commit f9cbd15dc26193717063bc8ad9ca1c2a146e14f7 by Johnny Jazeix, on behalf
of Burkhard Lück.
Committed on 15/06/2015 at 19:08.
Pushed by jjazeix into branch 'KDE/0.40'.
Fix some incorrect GUI strings
REVIEW:123879
M +1-1docs/docbook/index.docbook
M +3-2src/activities/menu/ActivityInfo.qml
http://commits.kde.org/gcompris/f9cbd15dc26193717063bc8ad9ca1c2a146e14f7
diff --git a/docs/docbook/index.docbook b/docs/docbook/index.docbook
index f87c546..c8280fb 100644
--- a/docs/docbook/index.docbook
+++ b/docs/docbook/index.docbook
@@ -73,7 +73,7 @@ activities such as memory and logic games, scientific
experiments etc;./para
suite of activities. Unfortunately, it is difficult to follow and maintain
them as each one offers different
graphic interfaces which vary widely in quality./para
paraThe purpose of gcompris; is to provide a development platform for
educational activities./para
-paragcompris; is part of GNU; project and is placed under the ulink
url=http://www.gnu.org/licenses/gpl.html;GPL license/ulink./para
+paragcompris; is part of kde; project and is placed under the ulink
url=http://www.gnu.org/licenses/gpl.html;GPL license/ulink./para
/sect1
sect1 id=minimal-configuration
diff --git a/src/activities/menu/ActivityInfo.qml
b/src/activities/menu/ActivityInfo.qml
index 49887e9..cb595ce 100644
--- a/src/activities/menu/ActivityInfo.qml
+++ b/src/activities/menu/ActivityInfo.qml
@@ -26,14 +26,15 @@ ActivityInfo {
prerequisite: qsTr(Some of the activities are game orientated, but
nonetheless still educational.)
manual: qsTr(Select an icon to enter an activity or to display a list of
activities in a category.
At the bottom of the screen is the GCompris control bar. Notice that you can
hide or show the bar by touching its anchor.
-The following icons are displayed from right to left.
+The following icons are displayed:
(note that each icon is displayed only if available in the current activity)
Home - Exit an activity, go back to menu (Ctrl+W and escape key)
Arrows - Display the current level. Click to select another level
Lips - Repeat the question
Question Mark - Help
+Reload - Start the activity from the beginning again
Tool - The configuration menu
-Tux Plane - About GCompris
+G - About GCompris
Quit - Quit GCompris (Ctrl+Q)
The stars show suitable age groups for each game:
1, 2 or 3 simple stars - from 2 to 6 years old
[kde-doc-english] Review Request 122965: Convert admin manual (http://gcompris.net/wiki/Manual) to docbook
--- This is an automatically generated e-mail. To reply, visit: https://git.reviewboard.kde.org/r/122965/#review77849 --- doc/index.docbook (line 16) https://git.reviewboard.kde.org/r/122965/#comment53395 gcomris - gcompris Can you push your changes to the devel branch? - Johnny Jazeix On March 15, 2015, 3:48 p.m., Burkhard Lück wrote: --- This is an automatically generated e-mail. To reply, visit: https://git.reviewboard.kde.org/r/122965/ --- (Updated March 15, 2015, 3:48 p.m.) Review request for Documentation and Bruno Coudoin. Repository: gcompris Description --- Conversion of http://gcompris.net/wiki/Manual to docbook Missing: New Screenshots Review + adapt content to gcompris-qt in kdereview A desktop file with an entry X-DocPath=gcompris/index.html to view the manual in KHelpcenter Diffs - doc/32px-About.png PRE-CREATION doc/32px-Button-exit.png PRE-CREATION doc/32px-Button-ok.png PRE-CREATION doc/32px-Config.png PRE-CREATION doc/32px-Help.png PRE-CREATION doc/32px-Home.png PRE-CREATION doc/32px-Level1.png PRE-CREATION doc/32px-Repeat.png PRE-CREATION doc/32px-difficulty_star1.png PRE-CREATION doc/32px-difficulty_star4.png PRE-CREATION doc/CMakeLists.txt PRE-CREATION doc/Stock_preferences_24.png PRE-CREATION doc/admin-activity.png PRE-CREATION doc/admin-class.png PRE-CREATION doc/admin-difficulty-filter.png PRE-CREATION doc/admin-group.png PRE-CREATION doc/admin-profil-edit.png PRE-CREATION doc/admin-report.png PRE-CREATION doc/gcompris-main-menu.png PRE-CREATION doc/index.docbook PRE-CREATION doc/login-list.png PRE-CREATION doc/login-text.png PRE-CREATION doc/missing-letter.png PRE-CREATION doc/reading-activity.png PRE-CREATION Diff: https://git.reviewboard.kde.org/r/122965/diff/ Testing --- Passes checkXML5 To generate the documentation in html format use meinproc5 index.docbook and open index.html in a browser Thanks, Burkhard Lück -- next part -- An HTML attachment was scrubbed... URL: http://mail.kde.org/pipermail/kde-doc-english/attachments/20150320/0b708537/attachment.html
