Scarlett Clark | 19 Dec 02:52 2014

[websites/build-kde-org/sok-work] docker: More scripts to automate docker related tasks.

Git commit 208cb4c75a1cbb348e9f2d28e61ec80e75560f50 by Scarlett Clark.
Committed on 19/12/2014 at 01:51.
Pushed by scarlettclark into branch 'sok-work'.

More scripts to automate docker related tasks.

M  +0    -1    docker/master-data-volumes/dependencies/README
M  +5    -4    docker/ubuntu-master/Dockerfile

http://commits.kde.org/websites/build-kde-org/208cb4c75a1cbb348e9f2d28e61ec80e75560f50

diff --git a/docker/master-data-volumes/dependencies/README b/docker/master-data-volumes/dependencies/README
index 4406110..a63cb21 100644
--- a/docker/master-data-volumes/dependencies/README
+++ b/docker/master-data-volumes/dependencies/README
 <at>  <at>  -10,4 +10,3  <at>  <at>  Then start the container

 docker run -i -t --name DEPENDENCIES kde-data/DEPENDENCIES 

-When running the jenkins-master you MUST add --volumes-from DEPENDENCIES to use this stored data.
diff --git a/docker/ubuntu-master/Dockerfile b/docker/ubuntu-master/Dockerfile
index 57948f3..45e6855 100644
--- a/docker/ubuntu-master/Dockerfile
+++ b/docker/ubuntu-master/Dockerfile
 <at>  <at>  -20,9 +20,9  <at>  <at>  RUN echo 'jenkins:1234' | chpasswd #please change this before run to desired pas
 ENV JENKINS_HOME /var/lib/jenkins
 RUN mkdir /opt/jenkins && chown jenkins.jenkins /opt/jenkins
 RUN usermod -u 1000 jenkins && groupmod -g 1000 jenkins
-RUN mkdir /srv/jenkins && chown jenkins.jenkins /srv/jenkins
-RUN usermod -u 1000 jenkins && groupmod -g 1000 jenkins
(Continue reading)

Bruno Coudoin | 19 Dec 02:42 2014
Picon

[gcompris/imageid] src/activities/target: targetitem, minor remove a log

Git commit 07f2eb6686f0236f75ca97dc7cec259680e5057e by Bruno Coudoin.
Committed on 16/12/2014 at 23:40.
Pushed by bcoudoin into branch 'imageid'.

targetitem, minor remove a log

M  +0    -1    src/activities/target/TargetItem.qml

http://commits.kde.org/gcompris/07f2eb6686f0236f75ca97dc7cec259680e5057e

diff --git a/src/activities/target/TargetItem.qml b/src/activities/target/TargetItem.qml
index b0d9585..4b77824 100644
--- a/src/activities/target/TargetItem.qml
+++ b/src/activities/target/TargetItem.qml
 <at>  <at>  -88,7 +88,6  <at>  <at>  Image {
         var dist = Math.sqrt(Math.pow(arrowCenterX - centerX, 2) +
                              Math.pow(arrowCenterY - centerY, 2))
         dist *= zoom / ApplicationInfo.ratio
-        console.log("dist", dist)
         var score = 0
         for(var i = targetModel.count - 1; i >= 0; --i) {
             if(dist < targetModel.get(i).size) {

Bruno Coudoin | 19 Dec 02:42 2014
Picon

[gcompris/imageid] src/activities/redraw: redraw, add a drop shadow

Git commit e70ae80b86a8b4a51b88c58e5cdc33a81d9357a4 by Bruno Coudoin.
Committed on 17/12/2014 at 19:44.
Pushed by bcoudoin into branch 'imageid'.

redraw, add a drop shadow

M  +35   -0    src/activities/redraw/Redraw.qml

http://commits.kde.org/gcompris/e70ae80b86a8b4a51b88c58e5cdc33a81d9357a4

diff --git a/src/activities/redraw/Redraw.qml b/src/activities/redraw/Redraw.qml
index f978cb3..32bd9ef 100644
--- a/src/activities/redraw/Redraw.qml
+++ b/src/activities/redraw/Redraw.qml
 <at>  <at>  -21,6 +21,7  <at>  <at> 
  */
 import QtQuick 2.1
 import GCompris 1.0
+import QtGraphicalEffects 1.0

 import "../../core"
 import "redraw.js" as Activity
 <at>  <at>  -114,6 +115,7  <at>  <at>  ActivityBase {
                             }
                         }
                         GCText {
+                            id: text
                             anchors.fill: parent
                             text: modelData
                             font.pointSize: 14
(Continue reading)

Bruno Coudoin | 19 Dec 02:42 2014
Picon

[gcompris/imageid] src/activities/imageid: imageid, layout follows the orientation

Git commit 0f9de809992855357286015e11d3bccc43fa346c by Bruno Coudoin.
Committed on 19/12/2014 at 00:29.
Pushed by bcoudoin into branch 'imageid'.

imageid, layout follows the orientation

M  +45   -59   src/activities/imageid/Imageid.qml

http://commits.kde.org/gcompris/0f9de809992855357286015e11d3bccc43fa346c

diff --git a/src/activities/imageid/Imageid.qml b/src/activities/imageid/Imageid.qml
index 0cb59e1..08f990d 100644
--- a/src/activities/imageid/Imageid.qml
+++ b/src/activities/imageid/Imageid.qml
 <at>  <at>  -42,6 +42,7  <at>  <at>  ActivityBase {
         fillMode: Image.PreserveAspectCrop
         sourceSize.width: parent.width

+        property bool horizontalLayout: background.width > background.height
         property Item dialog

         signal start
 <at>  <at>  -105,46 +106,60  <at>  <at>  ActivityBase {

             onError: console.error("Imageid: Error parsing json: " + msg);
         }
-        
-        Item {
-            id: wordListWrapper

(Continue reading)

Bruno Coudoin | 19 Dec 02:42 2014
Picon

[gcompris/imageid] tools/convertPoToTsFiles: convertPo, added instructions

Git commit 8db2d807b93ff17d5c0a02fa877046dd631ca041 by Bruno Coudoin.
Committed on 17/12/2014 at 01:38.
Pushed by bcoudoin into branch 'imageid'.

convertPo, added instructions

M  +14   -0    tools/convertPoToTsFiles/updateLocale.sh

http://commits.kde.org/gcompris/8db2d807b93ff17d5c0a02fa877046dd631ca041

diff --git a/tools/convertPoToTsFiles/updateLocale.sh b/tools/convertPoToTsFiles/updateLocale.sh
index 126a388..d987863 100755
--- a/tools/convertPoToTsFiles/updateLocale.sh
+++ b/tools/convertPoToTsFiles/updateLocale.sh
 <at>  <at>  -8,6 +8,20  <at>  <at>  function usage {
        "from the string of the Gtk+ version"
   echo "Put the input file in this directory under the name gcompris_input_[locale].ts"
   echo "The resulting file is in gcompris_[locale].ts"
+  echo ""
+  echo "Assuming:"
+  echo "  The current KDE po file is ~/kde/gcompris_fr.po"
+  echo "  The Gtk+ po file is ~/gcompris-gtk/po/fr.po"
+  echo "  lupdate and lconvert are the Qt5 ones"
+  echo ""
+  echo "Example for the fr locale:"
+  echo "  git clone git://anongit.kde.org/gcompris.git"
+  echo "  cd gcompris/tools/convertPoToTsFiles"
+  echo "  cp ~/kde/gcompris_fr.po gcompris_fr_input.po"
+  echo "  lupdate gcompris_fr_input.po -ts gcompris_fr_input.ts"
+  echo "  ./updateLocale.sh fr ~/gcompris-gtk/po/fr.po"
(Continue reading)

Bruno Coudoin | 19 Dec 02:42 2014
Picon

[gcompris/imageid] src: remove unused imports

Git commit 909dd9c0f5bc518a1bbcc9080bcf066873f28646 by Bruno Coudoin, on behalf of Johnny Jazeix.
Committed on 18/12/2014 at 19:38.
Pushed by bcoudoin into branch 'imageid'.

remove unused imports

M  +0    -1    src/activities/ballcatch/Ballcatch.qml
M  +0    -1    src/activities/braille_alphabets/BrailleMap.qml
M  +0    -2    src/activities/clickgame/Clickgame.qml
M  +0    -2    src/activities/erase/Erase.qml
M  +0    -1    src/activities/followline/Followline.qml
M  +0    -1    src/activities/gnumch-equality/CellDelegate.qml
M  +0    -1    src/activities/gnumch-equality/TopPanel.qml
M  +0    -1    src/activities/gnumch-equality/Warning.qml
M  +0    -2    src/activities/hexagon/Hexagon.qml
M  +0    -1    src/activities/menu/Menu.qml
M  +1    -1    src/core/ApplicationSettings.cpp
M  +0    -1    src/core/DialogHelp.qml
M  +0    -1    src/core/DominoNumber.qml
M  +0    -1    src/core/NumPad.qml

http://commits.kde.org/gcompris/909dd9c0f5bc518a1bbcc9080bcf066873f28646

diff --git a/src/activities/ballcatch/Ballcatch.qml b/src/activities/ballcatch/Ballcatch.qml
index 94278f9..f97a6e3 100644
--- a/src/activities/ballcatch/Ballcatch.qml
+++ b/src/activities/ballcatch/Ballcatch.qml
 <at>  <at>  -18,7 +18,6  <at>  <at> 
  along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
(Continue reading)

Bruno Coudoin | 19 Dec 02:42 2014
Picon

[gcompris/imageid] src/activities/clockgame: clockgame, add a drop shadow behind the question

Git commit 660119bcfbd00c340a5eb13ba7c9fe6688907e56 by Bruno Coudoin.
Committed on 16/12/2014 at 23:28.
Pushed by bcoudoin into branch 'imageid'.

clockgame, add a drop shadow behind the question

trying to make the text easier to read.

M  +15   -2    src/activities/clockgame/Clockgame.qml

http://commits.kde.org/gcompris/660119bcfbd00c340a5eb13ba7c9fe6688907e56

diff --git a/src/activities/clockgame/Clockgame.qml b/src/activities/clockgame/Clockgame.qml
index 3e370d3..807b241 100644
--- a/src/activities/clockgame/Clockgame.qml
+++ b/src/activities/clockgame/Clockgame.qml
 <at>  <at>  -20,6 +20,7  <at>  <at> 
 *   along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 import QtQuick 2.1
+import QtGraphicalEffects 1.0
 import GCompris 1.0

 import "../../core"
 <at>  <at>  -47,7 +48,6  <at>  <at>  ActivityBase {
         // Add here the QML items you need to access in javascript
         QtObject {
             id: items
-            property Item main: activity.main
             property alias background: background
(Continue reading)

Bruno Coudoin | 19 Dec 02:42 2014
Picon

[gcompris/imageid] /: translation, add missing javascript files

Git commit 416808b6b988d1ba56bac5de730492deebc3ae8e by Bruno Coudoin.
Committed on 17/12/2014 at 01:14.
Pushed by bcoudoin into branch 'imageid'.

translation, add missing javascript files

- updated the Messages.sh and the template to update the translations
  from the Gtk+ version.
- better documentation for the tool.

M  +1    -1    src/Messages.sh
M  +926  -0    tools/convertPoToTsFiles/gcompris_template.ts

http://commits.kde.org/gcompris/416808b6b988d1ba56bac5de730492deebc3ae8e

diff --git a/src/Messages.sh b/src/Messages.sh
index f5236f0..225b493 100755
--- a/src/Messages.sh
+++ b/src/Messages.sh
 <at>  <at>  -3,4 +3,4  <at>  <at> 
 # Extract strings from all source files.
 # EXTRACT_TR_STRINGS extracts strings with lupdate and convert them to .pot with
 # lconvert.
-$EXTRACT_TR_STRINGS `find . -name \*.cpp -o -name \*.h -o -name \*.qml` -o $podir/gcompris_qt.pot
+$EXTRACT_TR_STRINGS `find . -name \*.cpp -o -name \*.h -o -name \*.qml -o -name \*.js` -o $podir/gcompris_qt.pot
diff --git a/tools/convertPoToTsFiles/gcompris_template.ts b/tools/convertPoToTsFiles/gcompris_template.ts
index 6da047f..1ea4913 100644
--- a/tools/convertPoToTsFiles/gcompris_template.ts
+++ b/tools/convertPoToTsFiles/gcompris_template.ts
 <at>  <at>  -1736,6 +1736,449  <at>  <at>  From level 14 on, run-fast-mode will be enabled automatically. If you want to us
(Continue reading)

Bruno Coudoin | 19 Dec 02:42 2014
Picon

[gcompris/imageid] src/activities/sudoku: sudoku, add an animation on the selected color

Git commit 50c3f8a7bdc101792d50644073bff8940654498e by Bruno Coudoin.
Committed on 18/12/2014 at 21:55.
Pushed by bcoudoin into branch 'imageid'.

sudoku, add an animation on the selected color

Made the circle ovale so that the rotation animation is visible

M  +1    -0    src/activities/sudoku/Sudoku.qml
M  +77   -10   src/activities/sudoku/SudokuListWidget.qml
M  +10   -10   src/activities/sudoku/resource/circle.svg

http://commits.kde.org/gcompris/50c3f8a7bdc101792d50644073bff8940654498e

diff --git a/src/activities/sudoku/Sudoku.qml b/src/activities/sudoku/Sudoku.qml
index 5966139..6066e51 100644
--- a/src/activities/sudoku/Sudoku.qml
+++ b/src/activities/sudoku/Sudoku.qml
 <at>  <at>  -23,6 +23,7  <at>  <at>  import GCompris 1.0

 import "../../core"
 import "sudoku.js" as Activity
+import "."

 ActivityBase {
     id: activity
diff --git a/src/activities/sudoku/SudokuListWidget.qml b/src/activities/sudoku/SudokuListWidget.qml
index eb34597..48a65f9 100644
--- a/src/activities/sudoku/SudokuListWidget.qml
+++ b/src/activities/sudoku/SudokuListWidget.qml
(Continue reading)

Bruno Coudoin | 19 Dec 02:41 2014
Picon

[gcompris/imageid] /: code, no more compile the activation code unless requested

Git commit 6acdc656f29bd63b1a7a0d24aaba3c1b940042a1 by Bruno Coudoin.
Committed on 16/12/2014 at 00:17.
Pushed by bcoudoin into branch 'imageid'.

code, no more compile the activation code unless requested

Add the WITH_ACTIVATION_CODE option in the cmake which is OFF
by default.

M  +5    -0    CMakeLists.txt
M  +2    -1    src/core/ApplicationSettings.cpp
M  +0    -1    src/core/config.h.in

http://commits.kde.org/gcompris/6acdc656f29bd63b1a7a0d24aaba3c1b940042a1

diff --git a/CMakeLists.txt b/CMakeLists.txt
index de45ff1..a59cec4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
 <at>  <at>  -155,5 +155,10  <at>  <at>  else()
   option(BUILD_STANDALONE "Build a standalone package when typing 'make package'" ON)
 endif()

+option(WITH_ACTIVATION_CODE "Include the activation system" OFF)
+if(WITH_ACTIVATION_CODE)
+  message("ici")
+  add_definitions(-DWITH_ACTIVATION_CODE)
+endif()
 add_subdirectory(src)

(Continue reading)

Bruno Coudoin | 19 Dec 02:42 2014
Picon

[gcompris/imageid] src/activities/align4: align4, fix activity name

Git commit 4cf67d7971f817af6bdab2300898ed7d80e0c365 by Bruno Coudoin.
Committed on 17/12/2014 at 21:14.
Pushed by bcoudoin into branch 'imageid'.

align4, fix activity name

M  +1    -1    src/activities/align4/ActivityInfo.qml

http://commits.kde.org/gcompris/4cf67d7971f817af6bdab2300898ed7d80e0c365

diff --git a/src/activities/align4/ActivityInfo.qml b/src/activities/align4/ActivityInfo.qml
index b23fb8f..1b95181 100644
--- a/src/activities/align4/ActivityInfo.qml
+++ b/src/activities/align4/ActivityInfo.qml
 <at>  <at>  -6,7 +6,7  <at>  <at>  ActivityInfo {
   icon: "align4/align4.svg"
   author: "Bharath M S <brat.197 <at> gmail.com>"
   demo: false
-  title: qsTr("align4 activity")
+  title: qsTr("Align four")
   description: qsTr("Arrange four tokens in a row")
 //  intro: "Click on the column where you wish your token to fall and try to align of 4 tokens before Tux."
   goal: qsTr("Create a line of 4 tokens either horizontally (lying down), vertically (standing up) or diagonally.")


Gmane