Hello community, here is the log from the commit of package pairs for openSUSE:Factory checked in at 2013-07-08 07:30:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pairs (Old) and /work/SRC/openSUSE:Factory/.pairs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pairs" Changes: -------- --- /work/SRC/openSUSE:Factory/pairs/pairs.changes 2013-06-11 09:35:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.pairs.new/pairs.changes 2013-07-08 07:30:39.000000000 +0200 @@ -1,0 +2,14 @@ +Thu Jun 27 18:41:01 UTC 2013 - [email protected] + +- Update to 4.10.90 + * KDE 4.11 Beta 1 release + * See http://www.kde.org/announcements/announce-4.11-beta2.php + +------------------------------------------------------------------- +Thu Jun 13 20:28:24 UTC 2013 - [email protected] + +- Update to 4.10.80 + * KDE 4.11 Beta 1 release + * See http://www.kde.org/announcements/announce-4.11-beta1.php + +------------------------------------------------------------------- Old: ---- pairs-4.10.4.tar.xz New: ---- pairs-4.10.90.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pairs.spec ++++++ --- /var/tmp/diff_new_pack.OzJxOt/_old 2013-07-08 07:30:40.000000000 +0200 +++ /var/tmp/diff_new_pack.OzJxOt/_new 2013-07-08 07:30:40.000000000 +0200 @@ -17,7 +17,7 @@ Name: pairs -Version: 4.10.4 +Version: 4.10.90 Release: 0 Summary: Memory and Pairs Game License: GPL-2.0+ @@ -78,5 +78,8 @@ %{_kde4_iconsdir}/hicolor/*/apps/pairseditor.png %{_kde4_iconsdir}/hicolor/scalable/apps/pairs.svgz %{_kde4_iconsdir}/hicolor/scalable/apps/pairseditor.svgz +%{_kde4_htmldir}/en/pairseditor/* +%dir %{_kde4_htmldir}/en/pairseditor +%{_kde4_htmldir}/en/pairseditor/* %changelog ++++++ pairs-4.10.4.tar.xz -> pairs-4.10.90.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pairs-4.10.4/CMakeLists.txt new/pairs-4.10.90/CMakeLists.txt --- old/pairs-4.10.4/CMakeLists.txt 2013-05-28 21:04:27.000000000 +0200 +++ new/pairs-4.10.90/CMakeLists.txt 2013-06-10 20:52:36.000000000 +0200 @@ -35,3 +35,4 @@ add_subdirectory( players ) add_subdirectory( gameicons ) add_subdirectory( themes ) +add_subdirectory( doc ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pairs-4.10.4/doc/CMakeLists.txt new/pairs-4.10.90/doc/CMakeLists.txt --- old/pairs-4.10.4/doc/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/pairs-4.10.90/doc/CMakeLists.txt 2013-06-10 20:52:36.000000000 +0200 @@ -0,0 +1 @@ +kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR pairseditor) Files old/pairs-4.10.4/doc/Icon-list-add.png and new/pairs-4.10.90/doc/Icon-list-add.png differ Files old/pairs-4.10.4/doc/index.cache.bz2 and new/pairs-4.10.90/doc/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pairs-4.10.4/doc/index.docbook new/pairs-4.10.90/doc/index.docbook --- old/pairs-4.10.4/doc/index.docbook 1970-01-01 01:00:00.000000000 +0100 +++ new/pairs-4.10.90/doc/index.docbook 2013-06-25 20:31:03.000000000 +0200 @@ -0,0 +1,198 @@ +<?xml version="1.0" ?> +<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ + <!ENTITY % addindex "IGNORE"> + <!ENTITY % English "INCLUDE"> +]> +<book id="pairseditor" lang="&language;"> +<bookinfo> +<title>The Pairs Editor Handbook</title> +<authorgroup> +<author> +<personname> + <firstname>This documentation was converted from the KDE UserBase <ulink url="http://userbase.kde.org/Pairs/Editor";>Pairs/Editor</ulink> page.</firstname> +<surname></surname> +</personname> + </author> +<!-- TRANS:ROLES_OF_TRANSLATORS --> + </authorgroup> +<legalnotice>&FDLNotice;</legalnotice> +<date>2012-12-30</date> + <releaseinfo>1.0.0 (&kde; SC 4.10)</releaseinfo> +<abstract> +<para><application>Pairs</application> editor is a part of <application>Pairs</application> Project. It can be used to make and edit themes for <application>Pairs</application>.</para> + </abstract> + <keywordset> +<keyword>KDE</keyword> +<keyword>Pairs</keyword> +<keyword>Education</keyword> +<keyword>Sound</keyword> +<keyword>Image</keyword> +<keyword>theme</keyword> +<keyword>editor</keyword> +</keywordset> +</bookinfo> +<!--userbase <timestamp>2012-12-30T14:09:02Z</timestamp>--> + +<!--userbase-content--> +<chapter id="pairs-editor"><title>Pairs Editor</title> +<para><application>Pairs</application> editor is a part of <application>Pairs</application> Project. It can be used to make and edit themes for <application>Pairs</application>. +</para> +<para> +<screenshot> +<screeninfo></screeninfo> + <mediaobject> + <imageobject> + <imagedata fileref="pairseditor.png" format="PNG"/> + </imageobject> + <textobject> + <phrase></phrase> + </textobject> + </mediaobject> +</screenshot> +</para> +<sect1 id="main-toolbar"><title>Main Toolbar</title> +<para>It consists of 5 buttons which can be resized or whose text can be altered. +</para> +<sect2 id="new"><title>New</title> +<para>The button can be used to create a new theme. +</para> +</sect2> +<sect2 id="open"><title>Open</title> +<para>This button can be used to open an existing theme. +</para> +</sect2> +<sect2 id="save-save-as"><title>Save/Save as</title> +<para>These two buttons are used to save the created theme. +</para> +</sect2> +<sect2 id="try"><title>Try</title> +<para><guilabel>Try</guilabel> button is used for trying the theme that is created. It will launch <application>Pairs</application> with the new theme. +</para> +</sect2> +</sect1> +<sect1 id="creating-a-new-theme"><title>Creating a new theme</title> +<para>Creating a new theme is quite easy and can be done using the following steps: +</para> +<itemizedlist> +<listitem><para>Assign a Title, Description, Author, Date and version to the theme</para></listitem> +<listitem><para>The <guilabel>Main Type</guilabel> describes the type of a theme. For example, <guilabel>Image</guilabel> type is used if the theme is for pairing the images.</para></listitem> +<listitem><para>Include a back image. This image will be used in <application>Pairs</application> as the image that would be displayed on the back of the cards.</para></listitem> +</itemizedlist> +<para> +<screenshot> +<screeninfo></screeninfo> + <mediaobject> + <imageobject> + <imagedata fileref="pairseditor1.png" format="PNG"/> + </imageobject> + <textobject> + <phrase></phrase> + </textobject> + </mediaobject> +</screenshot> +</para> +<itemizedlist> +<listitem><para>Add elements to the theme by pressing <inlinemediaobject> <imageobject> <imagedata fileref="Icon-list-add.png" format="PNG"/> </imageobject> </inlinemediaobject> and add images, words or sound to the elements. Elements are used for defining relation between two images, words or sounds. For example: Adding two images in one element will make those a pair. In case of sounds, Two sounds are added in an element to make them a pair. And two words can also be added to make them a pair. Adding a sound and an image together in an element will make them a pair too.</para></listitem> +</itemizedlist> +<para> +<screenshot> +<screeninfo></screeninfo> + <mediaobject> + <imageobject> + <imagedata fileref="pairseditor2.png" format="PNG"/> + </imageobject> + <textobject> + <phrase></phrase> + </textobject> + </mediaobject> +</screenshot> +</para> +<itemizedlist> +<listitem><para>Include <guilabel>Found Sound</guilabel>. Found sound is a sound that is played when the element is correctly matched in <application>Pairs</application>. There should be only one found sound for one element.</para></listitem> +</itemizedlist> +<para> +<screenshot> +<screeninfo></screeninfo> + <mediaobject> + <imageobject> + <imagedata fileref="pairseditor3.png" format="PNG"/> + </imageobject> + <textobject> + <phrase></phrase> + </textobject> + </mediaobject> +</screenshot> +</para> +<itemizedlist> +<listitem><para>Add more Elements. Adding elements increases the number of pairs in the game which can be useful when more number of outcomes are needed.</para></listitem> +</itemizedlist> +<para> +<screenshot> +<screeninfo></screeninfo> + <mediaobject> + <imageobject> + <imagedata fileref="pairseditor4.png" format="PNG"/> + </imageobject> + <textobject> + <phrase></phrase> + </textobject> + </mediaobject> +</screenshot> +</para> +<itemizedlist> + <listitem><para>After doing the mentioned steps, save your theme and hit the <guilabel>Try</guilabel> button. It will launch <application>Pairs</application> with your theme.</para></listitem> +</itemizedlist> +<para> +<informaltable> + <tgroup cols="2"> + <tbody> + <row> +<entry> +<para> +<screenshot> +<screeninfo></screeninfo> + <mediaobject> + <imageobject> + <imagedata fileref="pairseditor5.png" format="PNG"/> + </imageobject> + <textobject> + <phrase></phrase> + </textobject> + </mediaobject> +</screenshot> +</para> +</entry> +<entry> +<para> +<screenshot> +<screeninfo></screeninfo> + <mediaobject> + <imageobject> + <imagedata fileref="pairseditor6.png" format="PNG"/> + </imageobject> + <textobject> + <phrase></phrase> + </textobject> + </mediaobject> +</screenshot> +</para> +</entry> + </row> + </tbody> + </tgroup> +</informaltable> +</para> +</sect1> +</chapter> + +<!--userbase-content--> +<chapter id="credits"> +<title>Credits and License</title> + <para> +Documentation Copyright see the UserBase + <ulink url="http://userbase.kde.org/index.php?title=Pairs/Editor&action=history";>Pairs/Editor page history</ulink></para> + <!-- TRANS:CREDIT_FOR_TRANSLATORS --> +&underFDL; +</chapter> +&documentation.index; +</book> Files old/pairs-4.10.4/doc/pairseditor.png and new/pairs-4.10.90/doc/pairseditor.png differ Files old/pairs-4.10.4/doc/pairseditor1.png and new/pairs-4.10.90/doc/pairseditor1.png differ Files old/pairs-4.10.4/doc/pairseditor2.png and new/pairs-4.10.90/doc/pairseditor2.png differ Files old/pairs-4.10.4/doc/pairseditor3.png and new/pairs-4.10.90/doc/pairseditor3.png differ Files old/pairs-4.10.4/doc/pairseditor4.png and new/pairs-4.10.90/doc/pairseditor4.png differ Files old/pairs-4.10.4/doc/pairseditor5.png and new/pairs-4.10.90/doc/pairseditor5.png differ Files old/pairs-4.10.4/doc/pairseditor6.png and new/pairs-4.10.90/doc/pairseditor6.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pairs-4.10.4/game/main.cpp new/pairs-4.10.90/game/main.cpp --- old/pairs-4.10.4/game/main.cpp 2013-05-28 21:04:27.000000000 +0200 +++ new/pairs-4.10.90/game/main.cpp 2013-06-10 20:52:36.000000000 +0200 @@ -36,7 +36,7 @@ static const char description[] = I18N_NOOP("A game to enhance your memory for KDE!"); -static const char version[] = "1.1.0"; +static const char version[] = "1.2.0"; int main(int argc, char **argv) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pairs-4.10.4/game/pairs.desktop new/pairs-4.10.90/game/pairs.desktop --- old/pairs-4.10.4/game/pairs.desktop 2013-05-30 11:15:05.000000000 +0200 +++ new/pairs-4.10.90/game/pairs.desktop 2013-06-10 20:52:36.000000000 +0200 @@ -2,6 +2,7 @@ Name=Pairs Name[bs]=Parovi Name[ca]=Pairs +Name[ca@valencia]=Pairs Name[cs]=Pexeso Name[da]=Pairs Name[de]=Paare @@ -28,16 +29,18 @@ Name[sk]=Páry Name[sl]=Pairs Name[sv]=Par +Name[tr]=Pairs Name[uk]=Pairs Name[x-test]=xxPairsxx Name[zh_CN]=Pairs Name[zh_TW]=Pairs -Exec=pairs %i -caption "%c" +Exec=pairs %i -caption %c Icon=pairs Type=Application GenericName=A game to enhance your memory GenericName[bs]=Igra za poboljšanje memorije GenericName[ca]=Un joc per millorar la teva memòria +GenericName[ca@valencia]=Un joc per millorar la teva memòria GenericName[cs]=Hra pro zlepšení vaší paměti GenericName[da]=Et spil der forbedrer din hukommelse GenericName[de]=Ein Spiel zum Gedächtnistraining @@ -64,6 +67,7 @@ GenericName[sk]=Hra na zlepšenie pamäte GenericName[sl]=Igra za izboljšanje spomina GenericName[sv]=Ett spel för att förbättra minnet +GenericName[tr]=Hafıza geliştirmek için bir oyun GenericName[uk]=Гра для удосконалення пам’яті GenericName[x-test]=xxA game to enhance your memoryxx GenericName[zh_CN]=增强记忆力的游戏 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pairs-4.10.4/game/pairstheme.cpp new/pairs-4.10.90/game/pairstheme.cpp --- old/pairs-4.10.4/game/pairstheme.cpp 2013-05-28 21:04:27.000000000 +0200 +++ new/pairs-4.10.90/game/pairstheme.cpp 2013-06-10 20:52:36.000000000 +0200 @@ -35,9 +35,7 @@ bool b = m_archive.open(QIODevice::ReadOnly); Q_ASSERT(b); QStringList files(m_archive.directory()->entries()); - qDebug() << files; files = files.filter(QRegExp("*.game", Qt::CaseSensitive, QRegExp::Wildcard)); - qDebug() << files; Q_ASSERT(files.count()>=1 && "no games in the theme!"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pairs-4.10.4/game/pairsthemebase.cpp new/pairs-4.10.90/game/pairsthemebase.cpp --- old/pairs-4.10.4/game/pairsthemebase.cpp 2013-05-28 21:04:27.000000000 +0200 +++ new/pairs-4.10.90/game/pairsthemebase.cpp 2013-06-10 20:52:36.000000000 +0200 @@ -181,7 +181,7 @@ break; case CARD_FOUND: item.found[lang] = src; - qDebug() << lang << src << item.found[lang] << item.foundSound("en"); +// qDebug() << lang << src << item.found[lang] << item.foundSound("en"); break; case CARD_WORD: QString src = reader.readElementText().trimmed(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pairs-4.10.4/game/qml/Button.qml new/pairs-4.10.90/game/qml/Button.qml --- old/pairs-4.10.4/game/qml/Button.qml 2013-05-28 21:04:27.000000000 +0200 +++ new/pairs-4.10.90/game/qml/Button.qml 2013-06-10 20:52:36.000000000 +0200 @@ -27,7 +27,6 @@ height: icon.height + caption.height + icon.anchors.margins * 2 + caption.anchors.bottomMargin signal clicked; - signal overlayClicked; property alias text: caption.text property alias source: icon.source diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pairs-4.10.4/game/qml/FancyBackground.qml new/pairs-4.10.90/game/qml/FancyBackground.qml --- old/pairs-4.10.4/game/qml/FancyBackground.qml 2013-05-28 21:04:27.000000000 +0200 +++ new/pairs-4.10.90/game/qml/FancyBackground.qml 2013-06-10 20:52:36.000000000 +0200 @@ -25,5 +25,4 @@ { source: playersModel.iconsDir("gameicons/background.svg") fillMode: Image.PreserveAspectCrop - sourceSize.width: (width * 768 / 1366 < height) ? height * 1366 / 768 : width } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pairs-4.10.4/game/qml/InfoPage.qml new/pairs-4.10.90/game/qml/InfoPage.qml --- old/pairs-4.10.4/game/qml/InfoPage.qml 2013-05-28 21:04:27.000000000 +0200 +++ new/pairs-4.10.90/game/qml/InfoPage.qml 2013-06-10 20:52:36.000000000 +0200 @@ -34,7 +34,7 @@ anchors.horizontalCenter: parent.horizontalCenter color: "white" font.bold: true - text: i18n("Pairs 1.1.0") + text: i18n("Pairs 1.2.0") height: font.pixelSize*2 } delegate: Column { @@ -87,6 +87,7 @@ text: i18n("Go back") font.pixelSize: 30 font.bold: true + height: 40 } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pairs-4.10.4/game/qml/Main.qml new/pairs-4.10.90/game/qml/Main.qml --- old/pairs-4.10.4/game/qml/Main.qml 2013-05-28 21:04:27.000000000 +0200 +++ new/pairs-4.10.90/game/qml/Main.qml 2013-06-10 20:52:36.000000000 +0200 @@ -20,6 +20,7 @@ */ import QtQuick 1.0 +import org.kde.plasma.components 0.1 as PlasmaComponents FancyBackground { @@ -82,7 +83,7 @@ Row { anchors.fill: parent id: tools - property real buttonWidth: Math.min(tools.width/3, 100) + property real buttonWidth: 90 Button { width: tools.buttonWidth @@ -123,67 +124,58 @@ Page { id: playersView - clip: true anchors { left: parent.left right: main.left top: toolbar.bottom bottom: playersControl.top - leftMargin: 20 - rightMargin: 20 + margins: 20 + bottomMargin: playersControl.visible ? 20 : 0 } - Flickable { - anchors.fill: parent - contentHeight: playersLabel.height+playersFlow.height - Text { - id: playersLabel - anchors { - right: parent.right - rightMargin: 5 - } + + GridView { + anchors { + fill: parent + leftMargin: 20 + rightMargin: 20 + } + cellHeight: 130 + cellWidth: 110 + header: Text { + width: parent.width + horizontalAlignment: Text.AlignRight font.pointSize: 14 color : "white" text: i18n("Players") } - Flow { - id: playersFlow - anchors { - top: playersLabel.bottom - left: parent.left - right: parent.right - margins: 5 - } - spacing: 10 + model: playersModel + delegate: TogglableButton { + text: game.state!="playing" ? display : i18nc("name. found/tries, time seconds", "%1<br/>%2/%3, %4s", display, found, missed+found, time) + source: decoration + overlaySource: playersModel.iconsDir("gameicons/removeUser.svg") + visible: game.state=="newgame" || selected + overlayVisible: game.state=="newgame" + opacity: game.state!="playing" || fgame.currentPlayer==index ? 1 : 0.3 + width: 100 - Repeater { - model: playersModel - delegate: TogglableButton { - text: game.state!="playing" ? display : i18nc("name. found/tries, time seconds", "%1<br/>%2/%3, %4s", display, found, missed+found, time) - source: decoration - overlaySource: playersModel.iconsDir("gameicons/removeUser.svg") - visible: game.state=="newgame" || selected - overlayVisible: game.state=="newgame" - opacity: game.state!="playing" || fgame.currentPlayer==index ? 1 : 0.3 - width: Math.min(100, parent.width) - - enabled: selected - onClicked: if(game.state=="newgame") playersModel.toggleSelection(index) - onOverlayClicked: playersModel.removePlayer(index) - } - } + enabled: selected + onClicked: if(game.state=="newgame") playersModel.toggleSelection(index) + onOverlayClicked: playersModel.removePlayer(index) } } } Page { id: playersControl - visible: game.state=='newgame' - height: visible ? addPlayer.height + label.height : 0 + height: game.state=='newgame' || game.state == "" ? 130 : 0 + visible: height>0 + anchors { left: parent.left right: main.left bottom: parent.bottom + topMargin: 30 margins: 20 } @@ -201,6 +193,7 @@ Item { id: controls + visible: height>0 anchors { fill: parent topMargin: label.height @@ -212,9 +205,10 @@ left: parent.left top: parent.top bottom: parent.bottom - right: playerNameControls.left margins: 3 + bottomMargin: label.height } + width: height fillMode: Image.PreserveAspectFit source: playersModel.randomIcon() MouseArea { @@ -233,10 +227,9 @@ text: i18n("Player Name:") } - TextInput { + PlasmaComponents.TextField { id: playerName width: 100 - color: "white" text: i18n("Player") focus: true @@ -253,16 +246,19 @@ bottom: parent.bottom bottomMargin: -10 } - width: 100 - text: i18n("Add"); + height: parent.height + text: i18n("Add") source: playersModel.iconsDir("gameicons/addUser.svg") onClicked: playersControl.addPlayer() } - function addPlayer() { - playersModel.addPlayer(playerName.text, newUserPicture.source) - newUserPicture.source=playersModel.randomIcon() - playerName.selectAll() - } + + function addPlayer() { + playersModel.addPlayer(playerName.text, newUserPicture.source) + newUserPicture.source=playersModel.randomIcon() + playerName.selectAll() + } + + Behavior on height { NumberAnimation { duration: 200; easing.type: Easing.InQuad } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pairs-4.10.4/game/qml/OptionsPage.qml new/pairs-4.10.90/game/qml/OptionsPage.qml --- old/pairs-4.10.4/game/qml/OptionsPage.qml 2013-05-28 21:04:27.000000000 +0200 +++ new/pairs-4.10.90/game/qml/OptionsPage.qml 2013-06-10 20:52:36.000000000 +0200 @@ -30,55 +30,53 @@ Column { id: games width: parent.width - anchors.margins: 10 - spacing: 30 + spacing: 20 Page { height: gameTypes.height width: parent.width Flow { id: gameTypes - height: childrenRect.height spacing: 20 anchors.margins: 10 width: parent.width - property real buttonWidth: Math.max((width - 120) / 6, 100) + property real buttonWidth: 107 TogglableButton { - width: parent.buttonWidth - source: playersModel.iconsDir("gameicons/pairs.svg") + width: parent.buttonWidth + source: playersModel.iconsDir("gameicons/pairs.svg") text: i18n("Pairs") onClicked: gameType = 'image' enabled: gameType == 'image' } TogglableButton { - width: parent.buttonWidth + width: parent.buttonWidth source: playersModel.iconsDir("gameicons/relations.svg") text: i18n("Relations") onClicked: gameType = 'image2' enabled: gameType == 'image2' } TogglableButton { - width: parent.buttonWidth + width: parent.buttonWidth source: playersModel.iconsDir("gameicons/logic.svg") text: i18n("Logic") onClicked: gameType = 'logic' enabled: gameType == 'logic' } TogglableButton { - width: parent.buttonWidth + width: parent.buttonWidth source: playersModel.iconsDir("gameicons/sound.svg") text: i18n("Sound") onClicked: gameType = 'sound' enabled: gameType == 'sound' } TogglableButton { - width: parent.buttonWidth + width: parent.buttonWidth source: playersModel.iconsDir("gameicons/soundLogic.svg") text: i18n("SoundLogic") onClicked: gameType = 'soundlogic' enabled: gameType == 'soundlogic' } TogglableButton { - width: parent.buttonWidth + width: parent.buttonWidth source: playersModel.iconsDir("gameicons/words.svg") text: i18n("Words") onClicked: gameType = 'word' @@ -100,7 +98,7 @@ model: themesModel delegate: Button { - width: Math.max((parent.width - 120) / 6, 100) + width: Math.max((themesView.width - 120) / 6, 100) visible: themesModel.isPertinent(index, gameType, fgame.language()) source: "image://theme/"+display+"/"+decoration text: display diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pairs-4.10.4/game/qml/Page.qml new/pairs-4.10.90/game/qml/Page.qml --- old/pairs-4.10.4/game/qml/Page.qml 2013-05-28 21:04:27.000000000 +0200 +++ new/pairs-4.10.90/game/qml/Page.qml 2013-06-10 20:52:36.000000000 +0200 @@ -19,19 +19,20 @@ */ import QtQuick 1.1 +import org.kde.plasma.core 0.1 as PlasmaCore + Item { - property alias backgroundOpacity: bg.opacity - Rectangle - { - id: bg - anchors.fill: parent - opacity: 0.1 - radius: 10 - smooth: true - - gradient: Gradient { - GradientStop { position: 0; color: "#FFFFFFFF" } - GradientStop { position: 1; color: "#00FFFFFF" } + PlasmaCore.FrameSvgItem { + id: pageDecoration + imagePath: "widgets/translucentbackground" + prefix: "translucent" + clip: true + anchors { + fill: parent + leftMargin: -margins.left + rightMargin: -margins.right + topMargin: -margins.top + bottomMargin: -margins.bottom } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pairs-4.10.4/game/qml/TogglableButton.qml new/pairs-4.10.90/game/qml/TogglableButton.qml --- old/pairs-4.10.4/game/qml/TogglableButton.qml 2013-05-28 21:04:27.000000000 +0200 +++ new/pairs-4.10.90/game/qml/TogglableButton.qml 2013-06-10 20:52:36.000000000 +0200 @@ -23,6 +23,7 @@ Item { id: container + width: 70 height: button.height property bool enabled: true property alias text: button.text @@ -37,6 +38,7 @@ radius: 20 smooth: true anchors.fill: parent + anchors.margins: 3 opacity: container.enabled ? 0.7 : 0 Behavior on opacity { NumberAnimation { duration: 200 } } gradient: Gradient { @@ -45,38 +47,27 @@ } } - MouseArea { - id: mouse + Button { + id: button width: parent.width - height: parent.height - hoverEnabled: true - onClicked: button.clicked() - onEntered: button.state="hovered" - onExited: button.state="default" + anchors.verticalCenterOffset: -10 - Button { - id: button - width: parent.width - anchors.verticalCenterOffset: -10 - - onClicked: container.clicked() - onOverlayClicked: container.overlayClicked() - } + onClicked: container.clicked() + } + + Image { + id: overlay + + opacity: !container.enabled && overlayVisible ? 1 : 0 + width: parent.width/3 + height: parent.height/3 + anchors.top: parent.top + anchors.right: parent.right + Behavior on opacity { NumberAnimation { duration: 200; easing.type: Easing.InQuad } } - Image { - id: overlay - - opacity: !container.enabled && overlayVisible ? 1 : 0 - width: parent.width/3 - height: parent.height/3 - anchors.top: parent.top - anchors.right: parent.right - Behavior on opacity { NumberAnimation { duration: 200; easing.type: Easing.InQuad } } - - MouseArea { - anchors.fill: parent - onClicked: button.overlayClicked() - } + MouseArea { + anchors.fill: parent + onClicked: button.overlayClicked() } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pairs-4.10.4/game/themesmodel.cpp new/pairs-4.10.90/game/themesmodel.cpp --- old/pairs-4.10.4/game/themesmodel.cpp 2013-05-28 21:04:27.000000000 +0200 +++ new/pairs-4.10.90/game/themesmodel.cpp 2013-06-10 20:52:36.000000000 +0200 @@ -28,14 +28,13 @@ #include <krandom.h> #include <QDebug> - ThemesModel::ThemesModel(QObject* parent, const QString &filePath): QStandardItemModel(parent) { QHash<int, QByteArray> names=QStandardItemModel::roleNames(); names.insert(PairsTheme::CardTypeRole, "type"); names.insert(PairsTheme::LanguagesRole, "languages"); setRoleNames(names); - qDebug() << "file path:"<< filePath; +// qDebug() << "file path:"<< filePath; if(filePath.isEmpty()) { QStringList themesdirs=KGlobal::dirs()->findDirs("appdata", "themes"); @@ -57,7 +56,7 @@ iNumber++; theme->setTitle(theme->title() + '(' + QString::number(iNumber) + ')' ); } // namespace ) - qDebug()<< theme->title(); +// qDebug()<< theme->title(); appendRow(theme); } } @@ -81,7 +80,7 @@ iNumber++; theme->setTitle(theme->title() + '(' + QString::number(iNumber) + ')' ); } // namespace ) - qDebug()<< theme->title(); +// qDebug()<< theme->title(); appendRow(theme); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pairs-4.10.4/pairseditor/mainwindow.cpp new/pairs-4.10.90/pairseditor/mainwindow.cpp --- old/pairs-4.10.4/pairseditor/mainwindow.cpp 2013-05-28 21:04:27.000000000 +0200 +++ new/pairs-4.10.90/pairseditor/mainwindow.cpp 2013-06-10 20:52:36.000000000 +0200 @@ -63,8 +63,7 @@ KStandardAction::quit(this, SLOT(close()), actionCollection()); m_mainWidget->widgetsHide(); createGUI(); - actionCollection()->action("help_contents")->setVisible(false); - actionCollection()->action("help_whats_this")->setVisible(false); + actionCollection()->action("help_whats_this"); } MainWindow::~MainWindow() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pairs-4.10.4/pairseditor/mainwindowview.cpp new/pairs-4.10.90/pairseditor/mainwindowview.cpp --- old/pairs-4.10.4/pairseditor/mainwindowview.cpp 2013-05-28 21:04:27.000000000 +0200 +++ new/pairs-4.10.90/pairseditor/mainwindowview.cpp 2013-06-10 20:52:36.000000000 +0200 @@ -299,9 +299,21 @@ case CARD_IMAGE: case CARD_LOGIC: if(type == CARD_LOGIC) + { m_ui->imageLabel->setText(i18n("Logic image file")); + m_ui->comboBox_2->setToolTip(i18n("Language of the logic image")); + m_ui->fileKurl->setToolTip(i18n("Logic image file")); + m_ui->comboBox_2->setWhatsThis(i18n("Language of the logic image")); + m_ui->fileKurl->setWhatsThis(i18n("Logic image file")); + } else + { m_ui->imageLabel->setText(i18n("Image file")); + m_ui->comboBox_2->setToolTip(i18n("Language of the image")); + m_ui->fileKurl->setToolTip(i18n("Image file")); + m_ui->comboBox_2->setWhatsThis(i18n("Language of the image")); + m_ui->fileKurl->setWhatsThis(i18n("Image file")); + } m_ui->imageLabel->show(); m_ui->itemLabel->show(); m_ui->fileKurl->show(); @@ -312,14 +324,30 @@ case CARD_SOUNDLOGIC: case CARD_FOUND: if(type == CARD_FOUND) + { m_ui->imageLabel->setText(i18n("Found sound file")); + m_ui->comboBox_2->setToolTip(i18n("Language of the found sound file")); + m_ui->fileKurl->setToolTip(i18n("Found sound file")); + m_ui->comboBox_2->setWhatsThis(i18n("Language of the found sound file")); + m_ui->fileKurl->setWhatsThis(i18n("Found sound file")); + } else + { m_ui->imageLabel->setText(i18n("Sound file")); + m_ui->comboBox_2->setToolTip(i18n("Language of the sound file")); + m_ui->fileKurl->setToolTip(i18n("Sound file")); + m_ui->comboBox_2->setWhatsThis(i18n("Language of the sound file")); + m_ui->fileKurl->setWhatsThis(i18n("Sound file")); + } m_ui->imageLabel->show(); m_ui->playButton->show(); m_ui->fileKurl->show(); break; case CARD_WORD: + m_ui->comboBox_2->setToolTip(i18n("Language of the word")); + m_ui->wordEdit->setToolTip(i18n("Word")); + m_ui->comboBox_2->setWhatsThis(i18n("Language of the word")); + m_ui->wordEdit->setWhatsThis(i18n("Word")); m_ui->wordEdit->show(); m_ui->wordLabel->show(); break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pairs-4.10.4/pairseditor/mainwindowview.ui new/pairs-4.10.90/pairseditor/mainwindowview.ui --- old/pairs-4.10.4/pairseditor/mainwindowview.ui 2013-05-28 21:04:27.000000000 +0200 +++ new/pairs-4.10.90/pairseditor/mainwindowview.ui 2013-06-10 20:52:36.000000000 +0200 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>511</width> - <height>352</height> + <height>409</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout_5"> @@ -30,43 +30,83 @@ </property> <item row="0" column="0"> <widget class="QLabel" name="titleLabel"> + <property name="toolTip"> + <string/> + </property> <property name="text"> <string>Title:</string> </property> </widget> </item> <item row="0" column="1"> - <widget class="KLineEdit" name="titleEdit"/> + <widget class="KLineEdit" name="titleEdit"> + <property name="toolTip"> + <string>The title of the theme</string> + </property> + <property name="whatsThis"> + <string>The title of the theme</string> + </property> + </widget> </item> <item row="1" column="0"> <widget class="QLabel" name="descriptionLabel"> + <property name="toolTip"> + <string/> + </property> <property name="text"> <string>Description:</string> </property> </widget> </item> <item row="1" column="1"> - <widget class="KLineEdit" name="descriptionEdit"/> + <widget class="KLineEdit" name="descriptionEdit"> + <property name="toolTip"> + <string>Description to the theme</string> + </property> + <property name="whatsThis"> + <string>Description of the theme</string> + </property> + </widget> </item> <item row="3" column="0"> <widget class="QLabel" name="authorLabel"> + <property name="toolTip"> + <string/> + </property> <property name="text"> <string>Author:</string> </property> </widget> </item> <item row="3" column="1"> - <widget class="KLineEdit" name="authorEdit"/> + <widget class="KLineEdit" name="authorEdit"> + <property name="toolTip"> + <string>Author (your) name</string> + </property> + <property name="whatsThis"> + <string>Author (your) name</string> + </property> + </widget> </item> <item row="4" column="0"> <widget class="QLabel" name="versionLabel"> + <property name="toolTip"> + <string/> + </property> <property name="text"> <string>Version:</string> </property> </widget> </item> <item row="4" column="1"> - <widget class="KLineEdit" name="versionEdit"/> + <widget class="KLineEdit" name="versionEdit"> + <property name="toolTip"> + <string>Theme version</string> + </property> + <property name="whatsThis"> + <string>Theme version</string> + </property> + </widget> </item> </layout> </item> @@ -77,6 +117,9 @@ </property> <item row="0" column="0"> <widget class="QLabel" name="dateLabel"> + <property name="toolTip"> + <string/> + </property> <property name="text"> <string>Date:</string> </property> @@ -84,6 +127,12 @@ </item> <item row="0" column="1"> <widget class="QDateEdit" name="dateEdit"> + <property name="toolTip"> + <string>Today's date</string> + </property> + <property name="whatsThis"> + <string>Today's date</string> + </property> <property name="displayFormat"> <string>d/M/yyyy</string> </property> @@ -91,6 +140,9 @@ </item> <item row="1" column="0"> <widget class="QLabel" name="maintypeLabel"> + <property name="toolTip"> + <string/> + </property> <property name="text"> <string>Main Type:</string> </property> @@ -98,6 +150,12 @@ </item> <item row="1" column="1"> <widget class="KComboBox" name="maintypeBox"> + <property name="toolTip"> + <string>The main game of the theme</string> + </property> + <property name="whatsThis"> + <string>The main game of the theme</string> + </property> <item> <property name="text"> <string>image</string> @@ -142,13 +200,23 @@ </item> <item row="2" column="0"> <widget class="QLabel" name="backLabel"> + <property name="toolTip"> + <string/> + </property> <property name="text"> <string>Back Image:</string> </property> </widget> </item> <item row="2" column="1"> - <widget class="KUrlRequester" name="backKurl"/> + <widget class="KUrlRequester" name="backKurl"> + <property name="toolTip"> + <string>The back image component</string> + </property> + <property name="whatsThis"> + <string>The back image component</string> + </property> + </widget> </item> </layout> </item> @@ -228,6 +296,12 @@ <height>24</height> </size> </property> + <property name="toolTip"> + <string>Add a new element</string> + </property> + <property name="whatsThis"> + <string>Add a new element</string> + </property> <property name="text"> <string/> </property> @@ -252,6 +326,12 @@ <height>24</height> </size> </property> + <property name="toolTip"> + <string>Remove an element</string> + </property> + <property name="whatsThis"> + <string>Remove an element</string> + </property> <property name="text"> <string/> </property> @@ -270,6 +350,12 @@ <height>16777215</height> </size> </property> + <property name="toolTip"> + <string>Add a sub-element</string> + </property> + <property name="whatsThis"> + <string>Add a sub-element</string> + </property> <property name="currentIndex"> <number>-1</number> </property> @@ -389,13 +475,20 @@ </property> <item row="0" column="0"> <widget class="QLabel" name="imageLabel"> + <property name="toolTip"> + <string/> + </property> <property name="text"> <string>Image:</string> </property> </widget> </item> <item row="0" column="1"> - <widget class="KUrlRequester" name="fileKurl"/> + <widget class="KUrlRequester" name="fileKurl"> + <property name="toolTip"> + <string/> + </property> + </widget> </item> <item row="9" column="1"> <widget class="QLabel" name="itemLabel"> @@ -409,6 +502,12 @@ </item> <item row="2" column="1"> <widget class="QPushButton" name="playButton"> + <property name="toolTip"> + <string>Play the sound file</string> + </property> + <property name="whatsThis"> + <string>Play the sound file</string> + </property> <property name="text"> <string/> </property> @@ -421,6 +520,9 @@ </item> <item row="4" column="1"> <widget class="KComboBox" name="comboBox_2"> + <property name="toolTip"> + <string/> + </property> <item> <property name="text"> <string>any</string> @@ -465,6 +567,9 @@ </item> <item row="4" column="0"> <widget class="QLabel" name="langLabel"> + <property name="toolTip"> + <string/> + </property> <property name="text"> <string>Language:</string> </property> @@ -472,13 +577,20 @@ </item> <item row="3" column="0"> <widget class="QLabel" name="wordLabel"> + <property name="toolTip"> + <string/> + </property> <property name="text"> <string>Word:</string> </property> </widget> </item> <item row="3" column="1"> - <widget class="KLineEdit" name="wordEdit"/> + <widget class="KLineEdit" name="wordEdit"> + <property name="toolTip"> + <string/> + </property> + </widget> </item> </layout> </widget> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pairs-4.10.4/pairseditor/pairseditor.desktop new/pairs-4.10.90/pairseditor/pairseditor.desktop --- old/pairs-4.10.4/pairseditor/pairseditor.desktop 2013-05-30 11:15:05.000000000 +0200 +++ new/pairs-4.10.90/pairseditor/pairseditor.desktop 2013-06-10 20:52:36.000000000 +0200 @@ -1,7 +1,7 @@ [Desktop Entry] Name=Pairs Theme Editor -Name[bs]=Uređivač tema za igru parova Name[ca]=Editor de temes del Pairs +Name[ca@valencia]=Editor de temes del Pairs Name[cs]=Editor motivu Pexesa Name[da]=Temaeditor til Pairs Name[de]=Pairs-Designeditor @@ -10,12 +10,11 @@ Name[et]=Paaride teemaredaktor Name[fi]=Pairs-teemamuokkain Name[fr]=Thème des pairs -Name[ga]=Eagarthóir Téamaí Pairs Name[gl]=Editor de temas do Parellas Name[hu]=Pairs témaszerkesztő Name[it]=Editor dei temi di Coppie Name[kk]=Pairs нақыш редакторы -Name[km]=គូកម្មវិធីកែសម្រួលរូបរាង +Name[km]=ការផ្គូផ្គងកម្មវិធីកែសម្រួលរូបរាង Name[lt]=Pairs temos redaktorius Name[mr]=पेयर्स शैली संपादक Name[nb]=Temaeedigering for Pairs @@ -23,20 +22,22 @@ Name[pl]=Edytor motywów par Name[pt]=Editor de Temas do Pairs Name[pt_BR]=Editor de temas do Pairs -Name[ru]=Редактор оформления игры Pairs +Name[ru]=Редактор карточек Pairs Name[sk]=Editor tém Pairs Name[sl]=Urejevalnik tem Pairs Name[sv]=Temaeditor för Par +Name[tr]=Pairs Tema Düzenleyici Name[uk]=Редактор тем Pairs Name[x-test]=xxPairs Theme Editorxx Name[zh_CN]=Pairs 主题编辑器 Name[zh_TW]=Pairs 主題編輯器 -Exec=pairseditor %i -caption "%c" +Exec=pairseditor %i -caption %c Icon=pairseditor +X-DocPath=pairseditor/index.html Type=Application GenericName=A Pairs theme editor -GenericName[bs]=Uređivač tema za igru parova GenericName[ca]=Un editor de temes pel Pairs +GenericName[ca@valencia]=Un editor de temes pel Pairs GenericName[cs]=Editor motivu Pexesa GenericName[da]=En temaeditor til Pairs GenericName[de]=Ein Designeditor für Pairs @@ -45,12 +46,11 @@ GenericName[et]=Paaride teemaredaktor GenericName[fi]=Pairs-teemamuokkain GenericName[fr]=Un éditeur de thème de pairs -GenericName[ga]=Eagarthóir téamaí Pairs GenericName[gl]=Un editor de temas do Parellas GenericName[hu]=Egy Pairs témaszerkesztő GenericName[it]=Un editor per i temi di Coppie GenericName[kk]=Pairs нақыш редакторы -GenericName[km]=គូកម្មវិធីកែសម្រួលរូបរាង +GenericName[km]=ការផ្គូផ្គងកម្មវិធីកែសម្រួលរូបរាង GenericName[lt]=Pairs temos redaktorius GenericName[mr]=पेयर्स शैली संपादक GenericName[nb]=En temaeedigerer for Pairs @@ -58,10 +58,11 @@ GenericName[pl]=Edytor motywów par GenericName[pt]=Um editor de temas do Pairs GenericName[pt_BR]=Um editor de temas para o Pairs -GenericName[ru]=Редактор оформления игры Pairs +GenericName[ru]=Редактор карточек игры Pairs GenericName[sk]=Editor tém Pairs GenericName[sl]=Urejevalnik tem za Pairs GenericName[sv]=En temaeditor för Par +GenericName[tr]=Bir Pairs Tema Düzenleyici GenericName[uk]=Програма для редагування тем Pairs GenericName[x-test]=xxA Pairs theme editorxx GenericName[zh_CN]=Pairs 主题编辑器 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
