Hello community, here is the log from the commit of package pairs for openSUSE:Factory checked in at 2013-12-02 12:34:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-10-03 16:06:30.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.pairs.new/pairs.changes 2013-12-02 12:34:25.000000000 +0100 @@ -1,0 +2,21 @@ +Sat Nov 16 18:18:37 UTC 2013 - [email protected] + +- Update to 4.11.90 + * KDE 4.12 Beta 2 release + * See http://www.kde.org/announcements/announce-4.12-beta2.php + +------------------------------------------------------------------- +Sat Nov 9 23:20:49 UTC 2013 - [email protected] + +- Update to 4.11.80 + * KDE 4.12 Beta 1 release + * See http://www.kde.org/announcements/announce-4.12-beta1.php + +------------------------------------------------------------------- +Sat Nov 2 15:36:19 UTC 2013 - [email protected] + +- Update to 4.11.3 + * KDE 4.11.3 bugfix release + * See http://www.kde.org/announcements/announce-4.11.3.php + +------------------------------------------------------------------- Old: ---- pairs-4.11.2.tar.xz New: ---- pairs-4.11.90.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pairs.spec ++++++ --- /var/tmp/diff_new_pack.4F2cbM/_old 2013-12-02 12:34:26.000000000 +0100 +++ /var/tmp/diff_new_pack.4F2cbM/_new 2013-12-02 12:34:26.000000000 +0100 @@ -17,7 +17,7 @@ Name: pairs -Version: 4.11.2 +Version: 4.11.90 Release: 0 Summary: Memory and Pairs Game License: GPL-2.0+ ++++++ pairs-4.11.2.tar.xz -> pairs-4.11.90.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pairs-4.11.2/game/main.cpp new/pairs-4.11.90/game/main.cpp --- old/pairs-4.11.2/game/main.cpp 2013-08-28 19:04:06.000000000 +0200 +++ new/pairs-4.11.90/game/main.cpp 2013-08-25 06:16:46.000000000 +0200 @@ -43,7 +43,7 @@ KAboutData about("pairs", 0, ki18n("pairs"), version, ki18n(description), KAboutData::License_GPL, ki18n("(C) 2011 Aleix Pol Gonzalez"), KLocalizedString(), 0); about.addAuthor( ki18n("Aleix Pol Gonzalez"), ki18n("Initial implementation and maintainer"), "[email protected]" ); - about.addAuthor( ki18n("Marco Calignano"), ki18n("Theme support enhancement and general feature development"), "[email protected]"); + about.addAuthor( ki18n("Marco Calignano"), ki18n("Theme support enhancement and general feature development"), "[email protected]"); about.addAuthor( ki18n("Albert Astals Cid"), ki18n("Initial project setup and ideas"), "[email protected]" ); KCmdLineArgs::init(argc, argv, &about); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pairs-4.11.2/game/pairs.desktop new/pairs-4.11.90/game/pairs.desktop --- old/pairs-4.11.2/game/pairs.desktop 2013-08-28 19:04:06.000000000 +0200 +++ new/pairs-4.11.90/game/pairs.desktop 2013-08-25 06:16:46.000000000 +0200 @@ -1,5 +1,6 @@ [Desktop Entry] Name=Pairs +Name[bg]=Двойки Name[bs]=Parovi Name[ca]=Pairs Name[ca@valencia]=Pairs @@ -30,6 +31,7 @@ Name[sl]=Pari Name[sv]=Par Name[tr]=Pairs +Name[ug]=جۈپلەر Name[uk]=Pairs Name[x-test]=xxPairsxx Name[zh_CN]=Pairs @@ -38,6 +40,7 @@ Icon=pairs Type=Application GenericName=A game to enhance your memory +GenericName[bg]=Игра за подобряване на паметта ви 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pairs-4.11.2/game/qml/InfoPage.qml new/pairs-4.11.90/game/qml/InfoPage.qml --- old/pairs-4.11.2/game/qml/InfoPage.qml 2013-08-28 19:04:06.000000000 +0200 +++ new/pairs-4.11.90/game/qml/InfoPage.qml 2013-08-25 06:16:46.000000000 +0200 @@ -68,7 +68,7 @@ }, Author { name: "Marco Calignano" - email: "[email protected]" + email: "[email protected]" description: i18n("Theme support enhancement and general feature development") }, Author { @@ -82,12 +82,5 @@ description: i18n("Graphic design and icons") } ] - footer: Button { - width: parent.width - 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.11.2/game/qml/Main.qml new/pairs-4.11.90/game/qml/Main.qml --- old/pairs-4.11.2/game/qml/Main.qml 2013-08-28 19:04:06.000000000 +0200 +++ new/pairs-4.11.90/game/qml/Main.qml 2013-08-25 06:16:46.000000000 +0200 @@ -119,6 +119,15 @@ fgame.stopGame() } } + Button { + width: tools.buttonWidth + source: "image://icon/go-previous" + text: i18n("Go Back") + visible: game.state=="info" + onClicked: { + game.state="newgame" + } + } } } @@ -132,7 +141,7 @@ margins: 20 bottomMargin: playersControl.visible ? 20 : 0 } - + visible: game.state!="info" GridView { anchors { fill: parent diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pairs-4.11.2/pairseditor/mainwindow.cpp new/pairs-4.11.90/pairseditor/mainwindow.cpp --- old/pairs-4.11.2/pairseditor/mainwindow.cpp 2013-08-28 19:04:06.000000000 +0200 +++ new/pairs-4.11.90/pairseditor/mainwindow.cpp 2013-08-25 06:16:46.000000000 +0200 @@ -40,15 +40,15 @@ #include <KTar> #include <KActionCollection> -MainWindow::MainWindow(QWidget *parent) : KXmlGuiWindow(parent) +MainWindow::MainWindow(QWidget *parent) + : KXmlGuiWindow(parent) + , m_pt(0) + , m_selectedItem(0) + , m_model(0) + , m_tmpDir(0) + , m_process(0) + , m_fileSaved(true) { - - m_selectedItem = 0; - m_pt = 0; - m_model = 0; - m_tmpDir = 0; - m_process = 0; - m_fileSaved = true; setMinimumSize (900, 400); m_mainWidget = new MainWindowView(this); connect(m_mainWidget, SIGNAL(changed()), this, SLOT(doChange())); @@ -196,7 +196,6 @@ m_mainWidget->widgetsHide(); m_fileSaved = true; setCaption(m_mainWidget->title(), !m_fileSaved); - } void MainWindow::doOpen() @@ -224,7 +223,7 @@ return newFile; } -void MainWindow::extract(QString path) +void MainWindow::extract(const QString& path) { KTar archive(path); newTmpDir(QDir::tempPath() + '/' + QFileInfo(path).fileName()); @@ -240,7 +239,7 @@ archive.close(); } -void MainWindow::compress(QString path) +void MainWindow::compress(const QString& path) { KTar archive(path); const bool opened = archive.open(QIODevice::WriteOnly); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pairs-4.11.2/pairseditor/mainwindow.h new/pairs-4.11.90/pairseditor/mainwindow.h --- old/pairs-4.11.2/pairseditor/mainwindow.h 2013-08-28 19:04:06.000000000 +0200 +++ new/pairs-4.11.90/pairseditor/mainwindow.h 2013-08-25 06:16:46.000000000 +0200 @@ -72,8 +72,8 @@ bool m_fileSaved; void newTmpDir(const QString &path); - void extract(QString path); - void compress(QString path); + void extract(const QString& path); + void compress(const QString& path); bool askToSave(); }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pairs-4.11.2/pairseditor/mainwindowview.cpp new/pairs-4.11.90/pairseditor/mainwindowview.cpp --- old/pairs-4.11.2/pairseditor/mainwindowview.cpp 2013-08-28 19:04:06.000000000 +0200 +++ new/pairs-4.11.90/pairseditor/mainwindowview.cpp 2013-08-25 06:16:46.000000000 +0200 @@ -28,6 +28,7 @@ #include "thememodel.h" #include "elementitem.h" #include "featureitem.h" +#include <QMenu> #include <QtGui/QTreeView> #include <QtXml/QXmlStreamWriter> #include <QtCore/QDebug> @@ -42,13 +43,22 @@ { m_ui->setupUi(this); m_ui->splitter->setStretchFactor(1, 3); + + QMenu* moreButtonMenu = new QMenu(m_ui->moreButton); + moreButtonMenu->addAction(QIcon::fromTheme("view-preview"), i18n("New Image"))->setProperty("type", int(CARD_IMAGE)); + moreButtonMenu->addAction(QIcon::fromTheme("preferences-plugin"), i18n("New Logic Relation"))->setProperty("type", int(CARD_LOGIC)); + moreButtonMenu->addAction(QIcon::fromTheme("preferences-desktop-text-to-speech"), i18n("New Sound"))->setProperty("type", int(CARD_SOUND)); + moreButtonMenu->addAction(QIcon::fromTheme("preferences-desktop-font"), i18n("New Word"))->setProperty("type", int(CARD_WORD)); + moreButtonMenu->addAction(QIcon::fromTheme("dialog-ok-apply"), i18n("New Found Sound"))->setProperty("type", int(CARD_FOUND)); + connect(moreButtonMenu, SIGNAL(triggered(QAction*)), this, SLOT(addFeature(QAction*))); + m_ui->moreButton->setMenu(moreButtonMenu); + connect(m_ui->fileKurl, SIGNAL(urlSelected(KUrl)), this, SLOT(fileSelected())); connect(m_ui->backKurl, SIGNAL(urlSelected(KUrl)), this, SLOT(backSelected())); connect(m_ui->wordEdit, SIGNAL(textChanged(QString)), this, SLOT(wordChanged(QString))); connect(m_ui->playButton, SIGNAL(clicked()), this, SLOT(playSound())); connect(m_ui->delButton, SIGNAL(clicked()), this, SLOT(deleteElement())); connect(m_ui->addButton, SIGNAL(clicked()), this, SLOT(addElement())); - connect(m_ui->moreButton, SIGNAL(currentIndexChanged(int)), this, SLOT(addFeature(int))); connect(m_ui->titleEdit, SIGNAL(textEdited(QString)), this, SIGNAL(changed())); connect(m_ui->descriptionEdit, SIGNAL(textEdited(QString)), this, SIGNAL(changed())); @@ -116,14 +126,14 @@ void MainWindowView::clearUi(const QString &path) { m_path = path; - m_ui->titleEdit->setText(""); - m_ui->authorEdit->setText(""); - m_ui->versionEdit->setText(""); + m_ui->titleEdit->clear(); + m_ui->authorEdit->clear(); + m_ui->versionEdit->clear(); m_ui->dateEdit->setDate(QDate::currentDate()); m_ui->maintypeBox->setCurrentIndex(0); - m_ui->descriptionEdit->setText(""); - m_ui->backKurl->setText(""); - m_ui->pixLabel->setPixmap(QPixmap()); + m_ui->descriptionEdit->clear(); + m_ui->backKurl->clear(); + m_ui->pixLabel->clear(); m_ui->fileKurl->setStartDir(KUrl(QDir::currentPath())); m_ui->backKurl->setStartDir(KUrl(QDir::currentPath())); } @@ -205,35 +215,14 @@ return true; } -void MainWindowView::addFeature(int index) +void MainWindowView::addFeature(QAction* triggeredFeature) { - if(!m_model || m_model->rowCount() == 0 || !m_ui->treeView->selectionModel()->hasSelection() || index == -1) + if(!m_model || !m_ui->treeView->selectionModel()->hasSelection()) return; QModelIndex paren = m_ui->treeView->selectionModel()->selectedIndexes().first(); - m_ui->moreButton->setCurrentIndex(-1); if(paren.parent().isValid()) paren = paren.parent(); - qDebug() << "addFeature called" << index; - CardType newType; - switch(index) - { - case 0: - default: - newType = CARD_IMAGE; - break; - case 1: - newType = CARD_LOGIC; - break; - case 2: - newType = CARD_SOUND; - break; - case 3: - newType = CARD_WORD; - break; - case 4: - newType = CARD_FOUND; - break; - } + CardType newType = CardType(triggeredFeature->property("type").toInt()); FeatureItem *fi = new FeatureItem(newType, "any", ""); m_model->insertFeature(fi, m_model->itemFromIndex(paren)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pairs-4.11.2/pairseditor/mainwindowview.h new/pairs-4.11.90/pairseditor/mainwindowview.h --- old/pairs-4.11.2/pairseditor/mainwindowview.h 2013-08-28 19:04:06.000000000 +0200 +++ new/pairs-4.11.90/pairseditor/mainwindowview.h 2013-08-25 06:16:46.000000000 +0200 @@ -60,7 +60,7 @@ signals: void changed(); -public slots: +private slots: void elementSelected(const QModelIndex & item); void backSelected(); void fileSelected(); @@ -68,7 +68,7 @@ void wordChanged(const QString &word); void addElement(); void deleteElement(); - void addFeature(int index); + void addFeature(QAction* triggeredFeature); void playSound(); private: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pairs-4.11.2/pairseditor/mainwindowview.ui new/pairs-4.11.90/pairseditor/mainwindowview.ui --- old/pairs-4.11.2/pairseditor/mainwindowview.ui 2013-08-28 19:04:06.000000000 +0200 +++ new/pairs-4.11.90/pairseditor/mainwindowview.ui 2013-08-25 06:16:46.000000000 +0200 @@ -343,81 +343,6 @@ </widget> </item> <item> - <widget class="KComboBox" name="moreButton"> - <property name="maximumSize"> - <size> - <width>16777215</width> - <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> - <property name="sizeAdjustPolicy"> - <enum>QComboBox::AdjustToContents</enum> - </property> - <property name="minimumContentsLength"> - <number>0</number> - </property> - <item> - <property name="text"> - <string>New Image</string> - </property> - <property name="icon"> - <iconset theme="view-preview"> - <normaloff/> - </iconset> - </property> - </item> - <item> - <property name="text"> - <string>New Logic</string> - </property> - <property name="icon"> - <iconset theme="preferences-plugin"> - <normaloff/> - </iconset> - </property> - </item> - <item> - <property name="text"> - <string>New Sound</string> - </property> - <property name="icon"> - <iconset theme="preferences-desktop-text-to-speech"> - <normaloff/> - </iconset> - </property> - </item> - <item> - <property name="text"> - <string>New Word</string> - </property> - <property name="icon"> - <iconset theme="preferences-desktop-font"> - <normaloff/> - </iconset> - </property> - </item> - <item> - <property name="text"> - <string>New Found Sound</string> - </property> - <property name="icon"> - <iconset theme="dialog-ok-apply"> - <normaloff/> - </iconset> - </property> - </item> - </widget> - </item> - <item> <spacer name="horizontalSpacer"> <property name="orientation"> <enum>Qt::Horizontal</enum> @@ -433,6 +358,13 @@ </property> </spacer> </item> + <item> + <widget class="QPushButton" name="moreButton"> + <property name="text"> + <string>Add Feature</string> + </property> + </widget> + </item> </layout> </item> <item> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pairs-4.11.2/pairseditor/pairseditor.desktop new/pairs-4.11.90/pairseditor/pairseditor.desktop --- old/pairs-4.11.2/pairseditor/pairseditor.desktop 2013-08-28 19:04:06.000000000 +0200 +++ new/pairs-4.11.90/pairseditor/pairseditor.desktop 2013-08-25 06:16:46.000000000 +0200 @@ -1,5 +1,6 @@ [Desktop Entry] Name=Pairs Theme Editor +Name[bg]=Редактор на изгледа на "Двойки" Name[bs]=Uređivač tema za igru parova Name[ca]=Editor de temes del Pairs Name[ca@valencia]=Editor de temes del Pairs @@ -28,6 +29,7 @@ Name[sl]=Urejevalnik tem za Pare Name[sv]=Temaeditor för Par Name[tr]=Pairs Tema Düzenleyici +Name[ug]=جۈپلەر ئۆرنەك تەھرىرلىگۈچ Name[uk]=Редактор тем Pairs Name[x-test]=xxPairs Theme Editorxx Name[zh_CN]=Pairs 主题编辑器 @@ -37,6 +39,7 @@ X-DocPath=pairseditor/index.html Type=Application GenericName=A Pairs theme editor +GenericName[bg]=Редактор на изгледа на играта "Двойки" 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 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
