Hello community, here is the log from the commit of package ksirk for openSUSE:Factory checked in at 2013-04-18 10:33:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ksirk (Old) and /work/SRC/openSUSE:Factory/.ksirk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ksirk", Maintainer is "ksirk" Changes: -------- --- /work/SRC/openSUSE:Factory/ksirk/ksirk.changes 2013-03-14 15:36:31.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ksirk.new/ksirk.changes 2013-04-18 10:33:41.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Apr 1 19:43:30 UTC 2013 - [email protected] + +- Update to 4.10.2 \n * Bugfixes + +------------------------------------------------------------------- Old: ---- ksirk-4.10.1.tar.xz New: ---- ksirk-4.10.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ksirk.spec ++++++ --- /var/tmp/diff_new_pack.4l2Dfc/_old 2013-04-18 10:33:42.000000000 +0200 +++ /var/tmp/diff_new_pack.4l2Dfc/_new 2013-04-18 10:33:42.000000000 +0200 @@ -21,7 +21,7 @@ License: GPL-2.0+ and LGPL-2.0+ Group: Amusements/Games/Strategy/Turn Based Url: http://www.kde.org -Version: 4.10.1 +Version: 4.10.2 Release: 0 Source0: ksirk-%{version}.tar.xz BuildRequires: libkdegames-devel ++++++ ksirk-4.10.1.tar.xz -> ksirk-4.10.2.tar.xz ++++++ Files old/ksirk-4.10.1/doc/index.cache.bz2 and new/ksirk-4.10.2/doc/index.cache.bz2 differ Files old/ksirk-4.10.1/doc/ksirkskineditor/index.cache.bz2 and new/ksirk-4.10.2/doc/ksirkskineditor/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksirk-4.10.1/ksirk/Dialogs/newGameSummaryWidget.cpp new/ksirk-4.10.2/ksirk/Dialogs/newGameSummaryWidget.cpp --- old/ksirk-4.10.1/ksirk/Dialogs/newGameSummaryWidget.cpp 2013-03-01 08:16:50.000000000 +0100 +++ new/ksirk-4.10.2/ksirk/Dialogs/newGameSummaryWidget.cpp 2013-03-29 08:08:50.000000000 +0100 @@ -66,7 +66,9 @@ kDebug() << "player" << player->name(); QTableWidgetItem *nameItem = new QTableWidgetItem(player->name()); playersTable->setItem(row, 0, nameItem); - QTableWidgetItem *nationItem = new QTableWidgetItem(player->nation()); + // Bug 308530 - Untranslatable strings in "New Game Summary". + // NewPlayerData's fields are not translated (KPlayerSetupWidget). Do that here when populating table. + QTableWidgetItem *nationItem = new QTableWidgetItem(i18n(player->nation().toUtf8().data())); playersTable->setItem(row, 1, nationItem); QTableWidgetItem *computerItem = new QTableWidgetItem(player->computer()?i18n("Yes"):i18n("No")); playersTable->setItem(row, 2, computerItem); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksirk-4.10.1/ksirk/GameLogic/gameautomaton.cpp new/ksirk-4.10.2/ksirk/GameLogic/gameautomaton.cpp --- old/ksirk-4.10.1/ksirk/GameLogic/gameautomaton.cpp 2013-03-01 08:16:50.000000000 +0100 +++ new/ksirk-4.10.2/ksirk/GameLogic/gameautomaton.cpp 2013-03-29 08:08:50.000000000 +0100 @@ -2650,6 +2650,14 @@ // playerList()->clear(); } +// Bug 308527. +void GameAutomaton::removeAllGoals() +{ + kDebug(); + while (!goals().isEmpty()) + delete goals().takeFirst(); +} + void GameAutomaton::newGameNext() { kDebug(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksirk-4.10.1/ksirk/GameLogic/gameautomaton.h new/ksirk-4.10.2/ksirk/GameLogic/gameautomaton.h --- old/ksirk-4.10.1/ksirk/GameLogic/gameautomaton.h 2013-03-01 08:16:51.000000000 +0100 +++ new/ksirk-4.10.2/ksirk/GameLogic/gameautomaton.h 2013-03-29 08:08:50.000000000 +0100 @@ -403,6 +403,8 @@ bool joinJabberGame(const QString& nick); void removeAllPlayers(); + // Bug 308527. + void removeAllGoals(); void newGameNext(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksirk-4.10.1/ksirk/GameLogic/onu.cpp new/ksirk-4.10.2/ksirk/GameLogic/onu.cpp --- old/ksirk-4.10.1/ksirk/GameLogic/onu.cpp 2013-03-01 08:16:50.000000000 +0100 +++ new/ksirk-4.10.2/ksirk/GameLogic/onu.cpp 2013-03-29 08:08:50.000000000 +0100 @@ -324,10 +324,16 @@ else if (goalType == "continents" ) { goal->type(Goal::Continents); - QList<QString> continentsList = goalGroup.readEntry("continents",QList<QString>()); - foreach(const QString& continentId, continentsList) + QList<QString> contList = goalGroup.readEntry("continents",QList<QString>()); + foreach(const QString& continentId, contList) { - goal->continents().push_back(continentId); + // Bug 308527. Use only known continents. + if (continentsList.contains(continentId)) + goal->continents().push_back(continentId); + else + { + kDebug() << "Unknown continent " << continentId << " in skin " << m_skin << endl; + } } } else if (goalType == "player" ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksirk-4.10.1/ksirk/kgamewin.cpp new/ksirk-4.10.2/ksirk/kgamewin.cpp --- old/ksirk-4.10.1/ksirk/kgamewin.cpp 2013-03-01 08:16:51.000000000 +0100 +++ new/ksirk-4.10.2/ksirk/kgamewin.cpp 2013-03-29 08:08:50.000000000 +0100 @@ -364,15 +364,18 @@ action = KStandardGameAction::load(this, SLOT(slotOpenGame()), this); actionCollection()->addAction(action->objectName(), action); m_saveGameAction = KStandardGameAction::save(this, SLOT(slotSaveGame()), this); + m_saveGameAction->setEnabled(false); actionCollection()->addAction(m_saveGameAction->objectName(), m_saveGameAction); action = KStandardGameAction::quit(this, SLOT(close()), this); actionCollection()->addAction(action->objectName(), action); - action = KStandardAction::zoomIn(this, SLOT(slotZoomIn()), this); - actionCollection()->addAction(action->objectName(), action); - - action = KStandardAction::zoomOut(this, SLOT(slotZoomOut()), this); - actionCollection()->addAction(action->objectName(), action); + m_zoomInAction = KStandardAction::zoomIn(this, SLOT(slotZoomIn()), this); + m_zoomInAction->setEnabled(false); + actionCollection()->addAction(m_zoomInAction->objectName(), m_zoomInAction); + + m_zoomOutAction = KStandardAction::zoomOut(this, SLOT(slotZoomOut()), this); + m_zoomOutAction->setEnabled(false); + actionCollection()->addAction(m_zoomOutAction->objectName(), m_zoomOutAction); KStandardAction::preferences( this, SLOT(optionsConfigure()), actionCollection() ); @@ -433,6 +436,7 @@ m_goalAction->setShortcut(Qt::CTRL+Qt::Key_G); m_goalAction->setStatusTip(i18n("Display the current player's goal")); connect(m_goalAction,SIGNAL(triggered(bool)),this,SLOT(slotShowGoal())); + m_goalAction->setVisible(false); kDebug() << "Adding action game_goal"; actionCollection()->addAction("game_goal", m_goalAction); @@ -448,6 +452,7 @@ i18n("Next Player"), this); connect(m_nextPlayerAction, SIGNAL(triggered(bool)), this, SLOT(slotNextPlayer())); contextualHelpAction->setStatusTip(i18n("Lets the next player play")); + m_nextPlayerAction->setEnabled(false); actionCollection()->addAction("game_nextplayer", m_nextPlayerAction); KAction* finishMovesAction = new KAction(KIcon(), @@ -582,6 +587,8 @@ i18n("World definition file not found - Verify your installation<br>Program cannot continue"), i18n("Error!")); exit(2); } + // Bug 308527. Need to remove all goals on new game. Only goals for selected skin will be loaded. + m_automaton->removeAllGoals(); kDebug() << "Got World definition file name: " << onuDefinitionFileName; m_theWorld = new ONU(m_automaton, onuDefinitionFileName); if (m_theWorld->skin().isEmpty()) @@ -1300,6 +1307,8 @@ if (currentPlayer() && currentPlayer()-> getFlag()) { + if (!m_goalAction->isVisible()) + m_goalAction->setVisible(true); m_goalAction-> setIcon(KIcon(currentPlayer()->getFlag()-> image(0))); m_goalAction-> setIconText(i18n("Goal")); m_barFlag-> setPixmap(currentPlayer()->getFlag()-> image(0)); @@ -1310,6 +1319,8 @@ { if (player-> getFlag()) { + if (!m_goalAction->isVisible()) + m_goalAction->setVisible(true); m_goalAction-> setIcon(KIcon(player-> getFlag()-> image(0))); m_goalAction-> setIconText(i18n("Goal")); m_barFlag-> setPixmap(player->getFlag()-> image(0)); @@ -2464,6 +2475,8 @@ if (m_firstCountry-> owner() && m_firstCountry-> owner()-> getFlag()) { + if (!m_goalAction->isVisible()) + m_goalAction->setVisible(true); m_goalAction-> setIcon(KIcon(m_firstCountry-> owner()->getFlag()-> image(0))); m_goalAction-> setIconText(i18n("Goal")); m_barFlag-> setPixmap(m_firstCountry-> owner()->getFlag()-> image(0)); @@ -2637,6 +2650,8 @@ m_automaton->setGameStatus(KGame::End); m_reinitializingGame = true; m_automaton->removeAllPlayers(); + // Bug 308527. Need to remove all goals on new game. + m_automaton->removeAllGoals(); m_automaton->state(GameLogic::GameAutomaton::INIT); m_automaton->savedState(GameLogic::GameAutomaton::INVALID); QObject::disconnect((QObject*)m_automaton->messageServer(),SIGNAL(connectionLost(KMessageIO*)), @@ -2996,6 +3011,8 @@ m_centralWidget->setCurrentIndex(MAP_INDEX); m_currentDisplayedWidget = Map; statusBar()->show(); + m_zoomInAction->setEnabled(true); + m_zoomOutAction->setEnabled(true); } void KGameWindow::showMainMenu() @@ -3119,6 +3136,10 @@ m_automaton->state(GameAutomaton::STARTING_GAME); m_rightDock->hide(); statusBar()->hide(); + m_zoomInAction->setEnabled(false); + m_zoomOutAction->setEnabled(false); + m_nextPlayerAction->setEnabled(false); + m_goalAction->setVisible(false);; m_newGameDialog->init(skin, netGameType); m_stackWidgetBeforeNewGame = m_centralWidget->currentIndex(); m_centralWidget->setCurrentIndex(NEWGAME_INDEX); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksirk-4.10.1/ksirk/kgamewin.h new/ksirk-4.10.2/ksirk/kgamewin.h --- old/ksirk-4.10.1/ksirk/kgamewin.h 2013-03-01 08:16:51.000000000 +0100 +++ new/ksirk-4.10.2/ksirk/kgamewin.h 2013-03-29 08:08:50.000000000 +0100 @@ -1098,6 +1098,8 @@ QAction* m_nextPlayerAction; KAction* m_saveGameAction; + KAction* m_zoomInAction; + KAction* m_zoomOutAction; Sprites::ArrowSprite* m_uparrow; Sprites::ArrowSprite* m_downarrow; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksirk-4.10.1/ksirk/ksirk.desktop new/ksirk-4.10.2/ksirk/ksirk.desktop --- old/ksirk-4.10.1/ksirk/ksirk.desktop 2013-03-01 08:16:50.000000000 +0100 +++ new/ksirk-4.10.2/ksirk/ksirk.desktop 2013-03-29 08:08:50.000000000 +0100 @@ -30,6 +30,7 @@ Name[km]=KsirK Name[lt]=KsirK Name[lv]=KsirK +Name[mr]=के-सिर्क Name[nb]=KSirK Name[nds]=KsirK Name[nl]=KsirK @@ -77,6 +78,7 @@ GenericName[kk]=Әлем үстемдігі үшін стратегия ойны GenericName[km]=ល្បែងយុទ្ធសាស្ត្រគ្រប់គ្រងពិភពលោក GenericName[lv]=Pasaules pārvaldīšanas stratēģiskā spēle +GenericName[mr]=विश्व प्रभुत्व रणनीतिक खेळ GenericName[nb]=Kamp om verdensherredømme GenericName[nds]=Weltherrschop-Strategiespeel GenericName[nl]=Werelddominatie-strategiespel diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksirk-4.10.1/ksirk/main.cpp new/ksirk-4.10.2/ksirk/main.cpp --- old/ksirk-4.10.1/ksirk/main.cpp 2013-03-01 08:16:50.000000000 +0100 +++ new/ksirk-4.10.2/ksirk/main.cpp 2013-03-29 08:08:50.000000000 +0100 @@ -38,15 +38,15 @@ kDebug() << "Hello World!"; KAboutData aboutData( "ksirk", 0, ki18n("KsirK"), KDE_VERSION_STRING, ki18n(description), KAboutData::License_GPL, - ki18n("(c) 2002-2005, Gaël de Chalendar\n"), + ki18n("(c) 2002-2013, Gaël de Chalendar\n"), ki18n("For help and user manual, please see\nthe KsirK web site."), "http://games.kde.org/game.php?game=ksirk";); aboutData.addAuthor(ki18n("Gael de Chalendar aka Kleag"),KLocalizedString(), "[email protected]"); + aboutData.addAuthor(ki18n("Nemanja Hirsl"),ki18n("Current maintainer"), "[email protected]"); aboutData.addAuthor(ki18n("Robin Doer")); aboutData.addAuthor(ki18n("Albert Astals Cid")); aboutData.addAuthor(ki18n("Michal Golunski (Polish translation)"),KLocalizedString(), "[email protected]"); aboutData.addAuthor(ki18n("French students of the 'IUP ISI 2007-2008':")); - aboutData.addAuthor(ki18n(" Anthony Rey<br/> Benjamin Lucas<br/> Benjamin Moreau<br/> Gaël Clouet<br/> Guillaume Pelouas<br/> Joël Marco<br/> Laurent Dang<br/> Nicolas Linard<br/> Vincent Sac")); KCmdLineArgs::init( argc, argv, &aboutData ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksirk-4.10.1/ksirk/skins/legacy/Data/world.desktop new/ksirk-4.10.2/ksirk/skins/legacy/Data/world.desktop --- old/ksirk-4.10.1/ksirk/skins/legacy/Data/world.desktop 2013-03-01 08:16:50.000000000 +0100 +++ new/ksirk-4.10.2/ksirk/skins/legacy/Data/world.desktop 2013-03-29 08:08:50.000000000 +0100 @@ -521,7 +521,7 @@ type=countries [goal3] -continents=0,Europe,Pacific +continents=Europe,Pacific desc=%1, you'll have to conquer %2, %3 and another continent at your choice. type=continents diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksirk-4.10.1/ksirk/skins/static/Data/world.desktop new/ksirk-4.10.2/ksirk/skins/static/Data/world.desktop --- old/ksirk-4.10.1/ksirk/skins/static/Data/world.desktop 2013-03-01 08:16:51.000000000 +0100 +++ new/ksirk-4.10.2/ksirk/skins/static/Data/world.desktop 2013-03-29 08:08:50.000000000 +0100 @@ -521,7 +521,7 @@ type=countries [goal3] -continents=0,Europe,Pacific +continents=Europe,Pacific desc=%1, you'll have to conquer %2, %3 and another continent at your choice. type=continents diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksirk-4.10.1/ksirkskineditor/ksirkskineditor.desktop new/ksirk-4.10.2/ksirkskineditor/ksirkskineditor.desktop --- old/ksirk-4.10.1/ksirkskineditor/ksirkskineditor.desktop 2013-03-01 08:16:51.000000000 +0100 +++ new/ksirk-4.10.2/ksirkskineditor/ksirkskineditor.desktop 2013-03-29 08:08:50.000000000 +0100 @@ -29,6 +29,7 @@ Name[kk]=KsirK көрінісін өңдеу Name[km]=កម្មវិធីនិពន្ធស្បែករបស់ KsirK Name[lv]=KsirK apdaru redaktors +Name[mr]=के-सिर्क स्किन संपादक Name[nb]=KsirK-temaredigering Name[nds]=KsirK-Böversieteditor Name[nl]=KsirK skinbewerker @@ -37,7 +38,7 @@ Name[pt]=Editor de Visuais do KsirK Name[pt_BR]=Editor de visuais do KsirK Name[ro]=Editor de fațete KsirK -Name[ru]=Редактор оформления для KsirK +Name[ru]=Редактор игрового поля KsirK Name[sk]=Editor tém KSirK Name[sl]=Urejevalnik preoblek za KsirK Name[sr]=Уређивач маски за К‑сирк @@ -75,6 +76,7 @@ GenericName[kk]=Әлем үстемдігі үшін стратегия ойынның көрінісін өңдеу GenericName[km]=កម្មវិធីនិពន្ធស្បែកសម្រាប់ល្បែងយុទ្ធសាស្ត្រគ្រប់គ្រងពិភពលោក GenericName[lv]=Pasaules pārvaldīšanas stratēģiskās spēles apdaru redaktors +GenericName[mr]=विश्व प्रभुत्व रणनीतिक खेळाकरिता स्किन संपादक GenericName[nb]=Temaredigering for KsirK GenericName[nds]=Böversieteditor för't Strategiespeel "World Domination" GenericName[nl]=Skinbewerker voor het werelddominatie-strategiespel @@ -82,7 +84,7 @@ GenericName[pl]=Edytor motywów do gra we władzę nad światem GenericName[pt]=Editor de Gráficos do Jogo Estratégico de Conquista do Mundo GenericName[pt_BR]=Editor de visuais para o jogo de estratégias de dominação mundial -GenericName[ru]=Создайте своё оформление для KSirK +GenericName[ru]=Редактор игрового поля для стратегической игры KsirK GenericName[sk]=Editor skinov pre strategickú hru na ovládnutie sveta GenericName[sl]=Urejevalnik preoblek za strateško igro osvajanja ozemlja GenericName[sr]=Уређивач маски за стратешку игру светске превласти -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
