Hello community, here is the log from the commit of package katomic for openSUSE:Factory checked in at 2016-05-29 03:09:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/katomic (Old) and /work/SRC/openSUSE:Factory/.katomic.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "katomic" Changes: -------- --- /work/SRC/openSUSE:Factory/katomic/katomic.changes 2016-03-29 09:57:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.katomic.new/katomic.changes 2016-05-29 03:09:26.000000000 +0200 @@ -1,0 +2,24 @@ +Sat May 7 10:17:38 UTC 2016 - [email protected] + +- Update to KDE Applications 16.04.1 + * KDE Applications 16.04.1 + * https://www.kde.org/announcements/announce-applications-16.04.1.php + + +------------------------------------------------------------------- +Sun Apr 17 05:56:50 UTC 2016 - [email protected] + +- Update to KDE Applications 16.04.0 + * KDE Applications 16.04.0 + * https://www.kde.org/announcements/announce-applications-16.04.0.php + + +------------------------------------------------------------------- +Mon Apr 11 06:34:22 UTC 2016 - [email protected] + +- Update to KDE Applications 16.03.90 + * KDE Applications 16.04.0 RC + * https://www.kde.org/announcements/announce-applications-16.04-rc.php + + +------------------------------------------------------------------- Old: ---- katomic-15.12.3.tar.xz New: ---- katomic-16.04.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ katomic.spec ++++++ --- /var/tmp/diff_new_pack.Wx0bIt/_old 2016-05-29 03:09:27.000000000 +0200 +++ /var/tmp/diff_new_pack.Wx0bIt/_new 2016-05-29 03:09:27.000000000 +0200 @@ -39,7 +39,7 @@ License: GPL-2.0+ Group: Amusements/Games/Board/Puzzle Url: http://www.kde.org -Version: 15.12.3 +Version: 16.04.1 Release: 0 Source0: katomic-%{version}.tar.xz Obsoletes: %{name}5 < %{version} @@ -77,7 +77,7 @@ %{_kf5_configdir}/katomic.knsrc %{_kf5_applicationsdir}/org.kde.katomic.desktop %dir %_datadir/appdata -%_datadir/appdata/katomic.appdata.xml +%_datadir/appdata/org.kde.katomic.appdata.xml %_datadir/kxmlgui5/katomic/ %changelog ++++++ katomic-15.12.3.tar.xz -> katomic-16.04.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/katomic-15.12.3/CMakeLists.txt new/katomic-16.04.1/CMakeLists.txt --- old/katomic-15.12.3/CMakeLists.txt 2016-01-14 12:36:16.000000000 +0100 +++ new/katomic-16.04.1/CMakeLists.txt 2016-01-29 14:30:14.000000000 +0100 @@ -1,22 +1,23 @@ project(katomic) -cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR) -set (QT_MIN_VERSION "5.3.0") +cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) +set(QT_MIN_VERSION "5.3.0") +set (KF5_MIN_VERSION "5.15.0") find_package(ECM 1.7.0 REQUIRED CONFIG) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) -find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Widgets ) -find_package(KF5 REQUIRED COMPONENTS - CoreAddons - Config - WidgetsAddons - I18n +find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Widgets) +find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS + CoreAddons + Config + Crash + WidgetsAddons + I18n XmlGui NewStuff DocTools - DBusAddons - ) + DBusAddons) find_package(KF5KDEGames 4.9.0 REQUIRED) @@ -30,8 +31,8 @@ add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS) -add_subdirectory( levels ) -add_subdirectory( doc ) +add_subdirectory(levels) +add_subdirectory(doc) ########### next target ############### @@ -45,7 +46,7 @@ gamewidget.cpp levelset.cpp levelsetdelegate.cpp - chooselevelsetdialog.cpp ) + chooselevelsetdialog.cpp) kconfig_add_kcfg_files(katomic_SRCS prefs.kcfgc) ki18n_wrap_ui(katomic_SRCS levelsetwidget.ui) @@ -54,24 +55,31 @@ ecm_add_app_icon(katomic_SRCS ICONS ${ICONS_SRCS}) add_executable(katomic ${katomic_SRCS}) -target_link_libraries(katomic KF5::NewStuff KF5KDEGames KF5::I18n KF5::DBusAddons KF5::NewStuff) +target_link_libraries(katomic + KF5::NewStuff + KF5KDEGames + KF5::I18n + KF5::DBusAddons + KF5::Crash + KF5::NewStuff) -install(TARGETS katomic ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} ) +install(TARGETS katomic ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) ########### install files ############### -install( PROGRAMS org.kde.katomic.desktop DESTINATION ${KDE_INSTALL_APPDIR} ) -install( FILES katomic.appdata.xml DESTINATION ${KDE_INSTALL_DATADIR}/appdata ) -install( FILES katomicui.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/katomic ) -install( FILES default_theme.svgz DESTINATION ${KDE_INSTALL_DATADIR}/katomic/pics/ ) -# ^^^ default_theme.desktop is not installed at the moment -install( FILES katomic.knsrc DESTINATION ${KDE_INSTALL_CONFDIR} ) +install(PROGRAMS org.kde.katomic.desktop DESTINATION ${KDE_INSTALL_APPDIR}) +install(FILES org.kde.katomic.appdata.xml DESTINATION ${KDE_INSTALL_DATADIR}/appdata) +install(FILES katomicui.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/katomic) +# default theme is installed without .desktop file since KgTheme does not need it +# when only one theme is available. See: 30a1cadd20 +install(FILES default_theme.svgz DESTINATION ${KDE_INSTALL_DATADIR}/katomic/pics/) +install(FILES katomic.knsrc DESTINATION ${KDE_INSTALL_CONFDIR}) -ecm_install_icons(ICONS 128-apps-katomic.png 16-apps-katomic.png 22-apps-katomic.png 32-apps-katomic.png 48-apps-katomic.png 64-apps-katomic.png DESTINATION ${KDE_INSTALL_ICONDIR} THEME hicolor ) +ecm_install_icons(ICONS 128-apps-katomic.png 16-apps-katomic.png 22-apps-katomic.png 32-apps-katomic.png 48-apps-katomic.png 64-apps-katomic.png DESTINATION ${KDE_INSTALL_ICONDIR} THEME hicolor) if(NOT WIN32) - install( PROGRAMS katomic-levelset-upd.pl DESTINATION ${KDE_INSTALL_KCONFUPDATEDIR} ) - install( FILES katomic-levelset.upd DESTINATION ${KDE_INSTALL_KCONFUPDATEDIR} ) + install(PROGRAMS katomic-levelset-upd.pl DESTINATION ${KDE_INSTALL_KCONFUPDATEDIR}) + install(FILES katomic-levelset.upd DESTINATION ${KDE_INSTALL_KCONFUPDATEDIR}) endif(NOT WIN32) feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/katomic-15.12.3/atom.h new/katomic-16.04.1/atom.h --- old/katomic-15.12.3/atom.h 2016-01-14 12:36:16.000000000 +0100 +++ new/katomic-16.04.1/atom.h 2016-01-29 14:30:14.000000000 +0100 @@ -26,44 +26,44 @@ #define MAX_CONNS_PER_ATOM 8 class atom { - public: +public: char obj; char conn[MAX_CONNS_PER_ATOM + 1]; bool operator==(const atom& rhs) const { return (rhs.obj == obj && !strcmp(rhs.conn,conn)); } bool isEmpty() const { return (obj == 0 || obj == '.'); } double weight() const { - switch (obj) { - case '1': return 1.00797; // H - case '2': return 12.0107; // C - case '3': return 15.9994; // O - case '4': return 14.0067; // N - case '5': return 32.065; // S - case '6': return 18.9984; // Fl - case '7': return 35.453; // Cl - case '9': return 30.97; // P - default: return 0.0; - } + switch (obj) { + case '1': return 1.00797; // H + case '2': return 12.0107; // C + case '3': return 15.9994; // O + case '4': return 14.0067; // N + case '5': return 32.065; // S + case '6': return 18.9984; // Fl + case '7': return 35.453; // Cl + case '9': return 30.97; // P + default: return 0.0; + } } }; inline char int2atom(int i) { if (!i) - return '.'; + return '.'; if (i == 254) - return '#'; + return '#'; if (i <= 9) - return i + '0'; + return i + '0'; return i + 'a' - 10; } inline int atom2int(char ch) { if (ch == '.' || ch == 0) - return 0; + return 0; if (ch == '#') - return 254; + return 254; if (ch >= '0' && ch <= '9') - return ch - '0'; + return ch - '0'; return ch - 'a' + 10; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/katomic-15.12.3/chooselevelsetdialog.cpp new/katomic-16.04.1/chooselevelsetdialog.cpp --- old/katomic-15.12.3/chooselevelsetdialog.cpp 2016-01-14 12:36:16.000000000 +0100 +++ new/katomic-16.04.1/chooselevelsetdialog.cpp 2016-01-29 14:30:14.000000000 +0100 @@ -142,7 +142,7 @@ { QString levelSetName = item->data(KAtomic::LevelSetNameRole).toString(); emit levelSetChanged(levelSetName); - + m_gameCurrentLevelSetName = levelSetName; updateApplyButton(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/katomic-15.12.3/chooselevelsetdialog.h new/katomic-16.04.1/chooselevelsetdialog.h --- old/katomic-15.12.3/chooselevelsetdialog.h 2016-01-14 12:36:16.000000000 +0100 +++ new/katomic-16.04.1/chooselevelsetdialog.h 2016-01-29 14:30:14.000000000 +0100 @@ -33,7 +33,7 @@ Q_OBJECT public: - ChooseLevelSetDialog(QWidget* parent=0); + explicit ChooseLevelSetDialog(QWidget* parent=0); void setCurrentLevelSet(const QString& levelSetName); void loadData(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/katomic-15.12.3/clean_kconf_upd.pl new/katomic-16.04.1/clean_kconf_upd.pl --- old/katomic-15.12.3/clean_kconf_upd.pl 2016-01-14 12:36:16.000000000 +0100 +++ new/katomic-16.04.1/clean_kconf_upd.pl 1970-01-01 01:00:00.000000000 +0100 @@ -1,45 +0,0 @@ -#!/usr/bin/perl -w - -# I wrote this little script to make kconf_update "forget" that it did apply .upd file to katomicrc -# and also some other nifty things i used while testing -# -# It contains some hardcoded paths, need to be adapted. I commit it because i might need it to do additional testing -# if something fails. -# -# It can be safely removed after sometime I guess :) -# - dimsuz - -use File::Copy; - -copy("/home/archuser/tmp/katomicrc", "/home/archuser/.kde4/share/config/katomicrc") or die $!; - -my $file1="/home/archuser/.kde4/share/config/kconf_updaterc"; -my $file2="/home/archuser/.kde4/share/config/kconf_updaterc_tmp"; -open FILE, "<$file1"; -open FILE1, ">$file2"; - -my $groupstart =0; -while(<FILE>) -{ - chomp; - if(not $groupstart and $_ =~ /^\[katomic.*/) - { - $groupstart=1; - } - elsif($groupstart and $_ =~/^\[/) - { - $groupstart = 0; - } - - if(not $groupstart) - { - print FILE1 $_."\n" - } -} -close FILE1; -close FILE; - -move($file2,$file1); - -#copy("/home/archuser/kdesvn/kdegames/katomic/katomic-levelset.upd", "/home/archuser/.kde4/share/apps/kconf_update/") or die $!; -#copy("/home/archuser/kdesvn/kdegames/katomic/katomic-levelset-upd.pl", "/home/archuser/.kde4/share/apps/kconf_update/") or die $!; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/katomic-15.12.3/commondefs.h new/katomic-16.04.1/commondefs.h --- old/katomic-15.12.3/commondefs.h 2016-01-14 12:36:16.000000000 +0100 +++ new/katomic-16.04.1/commondefs.h 2016-01-29 14:30:14.000000000 +0100 @@ -1,20 +1,20 @@ /* - Copyright (C) 2006-2009 Dmitry Suzdalev ([email protected]) + Copyright (C) 2006-2009 Dmitry Suzdalev ([email protected]) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ #ifndef KATOMIC_COMMONDEFS_H #define KATOMIC_COMMONDEFS_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/katomic-15.12.3/default_theme.desktop new/katomic-16.04.1/default_theme.desktop --- old/katomic-15.12.3/default_theme.desktop 2016-01-14 12:36:16.000000000 +0100 +++ new/katomic-16.04.1/default_theme.desktop 1970-01-01 01:00:00.000000000 +0100 @@ -1,90 +0,0 @@ - -[KGameTheme] -VersionFormat=1 -Name=KAtomic Default Theme -Name[bs]=Podrazumijevana tema K‑atomike -Name[ca]=Tema predeterminat del KAtomic -Name[ca@valencia]=Tema predeterminat del KAtomic -Name[cs]=Výchozí motiv KAtomic -Name[da]=KAtomics standardtema -Name[de]=Standard -Name[el]=Προκαθορισμένο θέμα KAtomic -Name[en_GB]=KAtomic Default Theme -Name[es]=Tema predeterminado de KAtomic -Name[et]=KAtomicu vaiketeema -Name[fi]=KAtomic-pelin oletusteema -Name[fr]=Thème par défaut pour KAtomic -Name[ga]=Téama Réamhshocraithe KAtomic -Name[gl]=Tema visual por omisión do KAtomic -Name[hu]=Alapértelmezett KAtomic-téma -Name[it]=Tema predefinito per KAtomic -Name[kk]=KAtomic-тың әдетті нақышы -Name[km]=ស្បែកលំនាំដើមរបស់ KAtomic -Name[ko]=KAtomic 기본 테마 -Name[lv]=KAtomic noklusējuma tēma -Name[mr]=के-एटोमिक मूलभूत शैली -Name[nb]=KAtomic standardtema -Name[nds]=KAtomic-Standardmuster -Name[nl]=Standaardthema van KAtomic -Name[nn]=Standardtema for KAtomic -Name[pl]=Domyślny wystrój KAtomic -Name[pt]=Tema Predefinido do KAtomic -Name[pt_BR]=Tema padrão do KAtomic -Name[ru]=Оформление по умолчанию для KAtomic -Name[sk]=Štandardná téma KTAtomic -Name[sl]=Privzeta tema za KAtomic -Name[sr]=Подразумевана тема К‑атомике -Name[sr@ijekavian]=Подразумијевана тема К‑атомике -Name[sr@ijekavianlatin]=Podrazumijevana tema K‑atomike -Name[sr@latin]=Podrazumevana tema K‑atomike -Name[sv]=Katom standardtema -Name[tr]=KAtomic Öntanımlı Teması -Name[uk]=Типова тема KAtomic -Name[x-test]=xxKAtomic Default Themexx -Name[zh_CN]=KAtomic 默认主题 -Name[zh_TW]=KAtomic 預設主題 -Description=KAtomic Default Theme. -Description[bs]=Podrazumijevana tema K‑atomike -Description[ca]=Tema predeterminat del KAtomic. -Description[ca@valencia]=Tema predeterminat del KAtomic. -Description[cs]=Výchozí motiv KAtomic. -Description[da]=KAtomic standardtema. -Description[de]=Das Standard-Design von KAtomic. -Description[el]=Προκαθορισμένο θέμα KAtomic. -Description[en_GB]=KAtomic Default Theme. -Description[es]=Tema predeterminado de KAtomic -Description[et]=KAtomicu vaiketeema. -Description[fi]=KAtomic-pelin oletusteema. -Description[fr]=Thème par défaut pour KAtomic. -Description[ga]=Téama Réamhshocraithe KAtomic. -Description[gl]=Tema visual por omisión do KAtomic. -Description[hu]=Alapértelmezett KAtomic-téma. -Description[it]=Tema predefinito per KAtomic. -Description[kk]=KAtomic ойынның әдетті нақышы. -Description[km]=ស្បែកលំនាំដើមរបស់ KAtomic ។ -Description[ko]=KAtomic 기본 테마입니다. -Description[lv]=KAtomic noklusējuma tēma. -Description[mr]=के-एटोमिक मूलभूत शैली. -Description[nb]=KAtomic standardtema. -Description[nds]=KAtomic-Standardmuster -Description[nl]=Standaardthema van KAtomic. -Description[nn]=Standardtema for KAtomic. -Description[pl]=Domyślny wystrój KAtomic. -Description[pt]=Tema Predefinido do KAtomic. -Description[pt_BR]=Tema padrão do KAtomic. -Description[ru]=Оформление по умолчанию для KAtomic. -Description[sk]=Štandardná téma KAtomic. -Description[sl]=Privzeta tema za KAtomic. -Description[sr]=Подразумевана тема К‑атомике -Description[sr@ijekavian]=Подразумијевана тема К‑атомике -Description[sr@ijekavianlatin]=Podrazumijevana tema K‑atomike -Description[sr@latin]=Podrazumevana tema K‑atomike -Description[sv]=Katom standardtema -Description[tr]=KAtomic Öntanımlı Teması. -Description[uk]=Типова тема KAtomic. -Description[x-test]=xxKAtomic Default Theme.xx -Description[zh_CN]=KAtomic 默认主题。 -Description[zh_TW]=KAtomic 預設主題 -FileName=default_theme.svgz - -[Desktop Entry] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/katomic-15.12.3/fielditem.cpp new/katomic-16.04.1/fielditem.cpp --- old/katomic-15.12.3/fielditem.cpp 2016-01-14 12:36:16.000000000 +0100 +++ new/katomic-16.04.1/fielditem.cpp 2016-01-29 14:30:14.000000000 +0100 @@ -198,9 +198,9 @@ MoleculePreviewItem::MoleculePreviewItem( PlayField* scene ) : QGraphicsItem( 0 ), m_renderer(scene->renderer()), m_width(0), - m_atomSize(20), m_maxAtomSize(30), m_mol( 0 ) + m_atomSize(20), m_maxAtomSize(30), m_mol( 0 ) { - scene->addItem(this); + scene->addItem(this); } MoleculePreviewItem::~MoleculePreviewItem() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/katomic-15.12.3/fielditem.h new/katomic-16.04.1/fielditem.h --- old/katomic-15.12.3/fielditem.h 2016-01-14 12:36:16.000000000 +0100 +++ new/katomic-16.04.1/fielditem.h 2016-01-29 14:30:14.000000000 +0100 @@ -87,8 +87,6 @@ // from molecule int m_atomNum; - KGameRenderedItem* m_bond; - static QHash<char, QString> s_names; // cryptic_char -> elemName static QHash<char, QString> s_bondNames; // cryptic_char -> bondName diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/katomic-15.12.3/gamewidget.cpp new/katomic-16.04.1/gamewidget.cpp --- old/katomic-15.12.3/gamewidget.cpp 2016-01-14 12:36:16.000000000 +0100 +++ new/katomic-16.04.1/gamewidget.cpp 2016-01-29 14:30:14.000000000 +0100 @@ -1,22 +1,22 @@ /* - Copyright (C) 1998 Andreas Wüst ([email protected]) - Copyright (C) 2006-2009 Dmitry Suzdalev ([email protected]) + Copyright (C) 1998 Andreas Wüst ([email protected]) + Copyright (C) 2006-2009 Dmitry Suzdalev ([email protected]) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ #include "gamewidget.h" #include "highscores.h" @@ -60,8 +60,8 @@ // fixed (darktears promised it will get fixed in 4.6.0 release). Bug is about wrong coordinates // for QPainter passed to QGS::drawForeground() function m_view->setOptimizationFlags( QGraphicsView::DontClipPainter | - //QGraphicsView::DontSavePainterState | - QGraphicsView::DontAdjustForAntialiasing ); + //QGraphicsView::DontSavePainterState | + QGraphicsView::DontAdjustForAntialiasing ); top->addWidget(m_view, 1); @@ -144,7 +144,7 @@ void GameWidget::gameOver(int moves) { // writing this info only in normal mode if ( !m_allowAnyLevelSwitch && - maxAccessibleLevel() < m_level+1 ) + maxAccessibleLevel() < m_level+1 ) { saveMaxAccessibleLevel( m_level+1 ); } @@ -311,7 +311,7 @@ bool GameWidget::isNextLevelAvailable() const { bool avail = m_allowAnyLevelSwitch ? true : - (m_level != maxAccessibleLevel() && m_level <= m_levelSet.levelCount()); + (m_level != maxAccessibleLevel() && m_level <= m_levelSet.levelCount()); return avail; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/katomic-15.12.3/gamewidget.h new/katomic-16.04.1/gamewidget.h --- old/katomic-15.12.3/gamewidget.h 2016-01-14 12:36:16.000000000 +0100 +++ new/katomic-16.04.1/gamewidget.h 2016-01-29 14:30:14.000000000 +0100 @@ -1,22 +1,22 @@ /* - Copyright (C) 1998 Andreas Wüst ([email protected]) + Copyright (C) 1998 Andreas Wüst ([email protected]) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ +*/ #ifndef GAMEWIDGET_H #define GAMEWIDGET_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/katomic-15.12.3/highscores.cpp new/katomic-16.04.1/highscores.cpp --- old/katomic-15.12.3/highscores.cpp 2016-01-14 12:36:16.000000000 +0100 +++ new/katomic-16.04.1/highscores.cpp 2016-01-29 14:30:14.000000000 +0100 @@ -1,20 +1,20 @@ /* - Copyright (C) 2007-2009 Dmitry Suzdalev ([email protected]) + Copyright (C) 2007-2009 Dmitry Suzdalev ([email protected]) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -*/ + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ #include "highscores.h" #include <kuser.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/katomic-15.12.3/highscores.h new/katomic-16.04.1/highscores.h --- old/katomic-15.12.3/highscores.h 2016-01-14 12:36:16.000000000 +0100 +++ new/katomic-16.04.1/highscores.h 2016-01-29 14:30:14.000000000 +0100 @@ -1,20 +1,20 @@ /* - Copyright (C) 2007 Dmitry Suzdalev ([email protected]) + Copyright (C) 2007 Dmitry Suzdalev ([email protected]) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -*/ + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ #ifndef KATOMIC_HIGHSCORES_H #define KATOMIC_HIGHSCORES_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/katomic-15.12.3/katomic.appdata.xml new/katomic-16.04.1/katomic.appdata.xml --- old/katomic-15.12.3/katomic.appdata.xml 2016-01-14 12:36:16.000000000 +0100 +++ new/katomic-16.04.1/katomic.appdata.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,109 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<component type="desktop"> - <id>org.kde.katomic.desktop</id> - <metadata_license>CC0-1.0</metadata_license> - <project_license>GPL-2.0+</project_license> - <name>KAtomic</name> - <name xml:lang="ast">KAtomic</name> - <name xml:lang="ca">KAtomic</name> - <name xml:lang="ca-valencia">KAtomic</name> - <name xml:lang="cs">KAtomic</name> - <name xml:lang="da">KAtomic</name> - <name xml:lang="de">KAtomic</name> - <name xml:lang="en-GB">KAtomic</name> - <name xml:lang="es">KAtomic</name> - <name xml:lang="et">KAtomic</name> - <name xml:lang="fi">KAtomic</name> - <name xml:lang="gl">KAtomic</name> - <name xml:lang="it">KAtomic</name> - <name xml:lang="ko">KAtomic</name> - <name xml:lang="nl">KAtomic</name> - <name xml:lang="nn">KAtomic</name> - <name xml:lang="pl">Atomy</name> - <name xml:lang="pt">KAtomic</name> - <name xml:lang="pt-BR">KAtomic</name> - <name xml:lang="ru">KAtomic</name> - <name xml:lang="sk">KAtomic</name> - <name xml:lang="sl">KAtomic</name> - <name xml:lang="sr">К‑атомика</name> - <name xml:lang="sr-Latn">K‑atomika</name> - <name xml:lang="sr-ijekavian">К‑атомика</name> - <name xml:lang="sr-ijekavianlatin">K‑atomika</name> - <name xml:lang="sv">Katom</name> - <name xml:lang="uk">KAtomic</name> - <name xml:lang="x-test">xxKAtomicxx</name> - <name xml:lang="zh-CN">KAtomic</name> - <name xml:lang="zh-TW">KAtomic</name> - <summary>Sokoban-like Logic Game</summary> - <summary xml:lang="ast">Xuegu de llóxica como Sokoban</summary> - <summary xml:lang="ca">Joc de lògica similar al Sokoban</summary> - <summary xml:lang="ca-valencia">Joc de lògica similar al Sokoban</summary> - <summary xml:lang="cs">Logická hra jako Sokoban</summary> - <summary xml:lang="de">„Sokoban“-Spiel</summary> - <summary xml:lang="en-GB">Sokoban-like Logic Game</summary> - <summary xml:lang="es">Juego de lógica parecido al Sokoban</summary> - <summary xml:lang="et">Sokobani moodi loogikamäng</summary> - <summary xml:lang="fi">Sokoban-tyylinen logiikkapeli</summary> - <summary xml:lang="gl">Xogo de lóxica ao estilo do Sokoban</summary> - <summary xml:lang="it">Gioco di logica simile a Sokoban</summary> - <summary xml:lang="ko">소코반 같은 전략 게임</summary> - <summary xml:lang="nl">Sokoban-achtig logisch spel</summary> - <summary xml:lang="nn">Sokoban-liknande logikkspel</summary> - <summary xml:lang="pl">Gra logiczna typu Sokoban</summary> - <summary xml:lang="pt">Jogo de Lógica Semelhante ao Sokoban</summary> - <summary xml:lang="pt-BR">Jogo Lógico parecido com Sokoban</summary> - <summary xml:lang="ru">Логическая игра, произошедшая от игры Sokoban</summary> - <summary xml:lang="sk">Logická hra ako Sokoban</summary> - <summary xml:lang="sl">Logična igra podobna Sokobanu</summary> - <summary xml:lang="sr">Логичка игра налик на Сокобан</summary> - <summary xml:lang="sr-Latn">Logička igra nalik na Sokoban</summary> - <summary xml:lang="sr-ijekavian">Логичка игра налик на Сокобан</summary> - <summary xml:lang="sr-ijekavianlatin">Logička igra nalik na Sokoban</summary> - <summary xml:lang="sv">Sokoban-liknande logiskt spel</summary> - <summary xml:lang="uk">Логічна гра, подібна до гри «Сокобан»</summary> - <summary xml:lang="x-test">xxSokoban-like Logic Gamexx</summary> - <summary xml:lang="zh-CN">类似推箱子的逻辑游戏</summary> - <summary xml:lang="zh-TW">倉庫番(sokoban)式的智力遊戲</summary> - <description> - <p> - KAtomic is a fun educational game built around molecular geometry. - It employs simplistic two-dimensional looks at different chemical elements. - </p> - <p xml:lang="ast">KAtomic ye un xuegu edicativu y divertíu construyíu alredor de la xeometría molecular. Emplega miraes cencielles en dos dimensiones n'elementos químicos diferentes</p> - <p xml:lang="ca">El KAtomic és un joc educatiu divertit construït al voltant de la geometria molecular. Fa servir aparences bidimensionals simplificades d'elements químics diferents.</p> - <p xml:lang="ca-valencia">El KAtomic és un joc educatiu divertit construït al voltant de la geometria molecular. Fa servir aparences bidimensionals simplificades d'elements químics diferents.</p> - <p xml:lang="de">KAtomic ist sowohl ein unterhaltsames als auch lehrreiches Spiel über molekulare Strukturen. Es verwendet eine vereinfachte zweidimensionale Ansicht der zum Molekül gehörenden Elemente.</p> - <p xml:lang="en-GB">KAtomic is a fun educational game built around molecular geometry. It employs simplistic two-dimensional looks at different chemical elements.</p> - <p xml:lang="es">KAtomic es un divertido juego educativo basado en la geometría molecular. Emplea vistas bidimensionales simplificadas de diferentes elementos químicos.</p> - <p xml:lang="et">KAtomic on lõbus ja õpetlik molekulaargeomeetriat puudutav mäng. Siin näeb mitmesuguseid keemilisi elemente lihtsalt kahemõõtmelisel kujul.</p> - <p xml:lang="fi">KAtomic on hauska ja opettavainen peli, joka perustuu molekyylien avaruusrakenteeseen. Se näyttää kemiallisia aineita kaksiulotteisesti ja pelkistetysti.</p> - <p xml:lang="gl">KAtomic é un xogo divertido e educativo sobre xeometría molecular. Nel óllanse visións simplistas en dúas dimensións de varios elementos químicos.</p> - <p xml:lang="it">KAtomic è un gioco divertente ed educativo, basato sulla geometria molecolare. Impiega una rappresentazione bidimensionale semplificata per gli elementi chimici.</p> - <p xml:lang="ko">KAtomic은 분자 구조를 기반으로 하는 교육용 게임입니다. 서로 다른 화합물의 간단한 2차원 모형을 보여 줍니다.</p> - <p xml:lang="nl">KAtomic is een leuk educatief spel gebouwd rond moleculaire geometrie. Het gebruikt simplistische tweedimensionale beelden van verschillende chemische elementen.</p> - <p xml:lang="nn">KAtomic er eit morosamt og lærerikt spel basert på molekylærgeometri. Det brukar ein forenkla, todimensjonell modell av dei kjemiske molekyla.</p> - <p xml:lang="pl">KAtomic jest grą edukującą poprzez zabawę stworzoną wokół geometrii cząsteczek. Gra wykorzystuje proste dwuwymiarowe widoki różnych pierwiastków chemicznych.</p> - <p xml:lang="pt">O KAtomic é um jogo educativo divertido, construído em torno da geometria molecular. Ele aplica vistas simplistas bidimensionais para os diferentes elementos químicos.</p> - <p xml:lang="pt-BR">KAtomic é um jogo educativo divertido, construído em torno da geometria molecular. Ele aplica visuais simplistas bidimensionais para os diferentes elementos químicos.</p> - <p xml:lang="ru">KAtomic — развивающая игра, каждый уровень которой основан на схематическом представлении молекулы химического соединения.</p> - <p xml:lang="sk">KAtomic je zábavná výuková hra založená na molekulárnej geometrii. Používa jednoduchý dvojrozmerný pohľad na rôzne chemické prvky.</p> - <p xml:lang="sl">KAtomic je zabavna in poučna igra, temelječa na geometriji molekul. Predstavlja preprosti dvodimenzionalni pogled na različne kemijske molekule.</p> - <p xml:lang="sr">К‑атомика је забавна образовна игра која се бави молекуларном геометријом. Служи се поједностављеним дводимензионалним приказима разноврсних хемијских једињења.</p> - <p xml:lang="sr-Latn">K‑atomika je zabavna obrazovna igra koja se bavi molekularnom geometrijom. Služi se pojednostavljenim dvodimenzionalnim prikazima raznovrsnih hemijskih jedinjenja.</p> - <p xml:lang="sr-ijekavian">К‑атомика је забавна образовна игра која се бави молекуларном геометријом. Служи се поједностављеним дводимензионалним приказима разноврсних хемијских једињења.</p> - <p xml:lang="sr-ijekavianlatin">K‑atomika je zabavna obrazovna igra koja se bavi molekularnom geometrijom. Služi se pojednostavljenim dvodimenzionalnim prikazima raznovrsnih hemijskih jedinjenja.</p> - <p xml:lang="sv">Katom är ett roligt och lärorikt spel byggt omkring molekylgeometri. Det använder ett förenklat tvådimensionellt utseende för olika kemiska element.</p> - <p xml:lang="uk">KAtomic — цікава навчальна гра у побудову молекул з атомів. У грі ви матимете справу зі спрощеними двовимірними моделями різних хімічних сполук.</p> - <p xml:lang="x-test">xxKAtomic is a fun educational game built around molecular geometry. It employs simplistic two-dimensional looks at different chemical elements.xx</p> - <p xml:lang="zh-TW">KAtomic 是一款教育類的遊戲，以原子模型為背景。</p> - </description> - <url type="homepage">http://games.kde.org/game.php?game=katomic</url> - <url type="bugtracker">https://bugs.kde.org/enter_bug.cgi?format=guided&product=katomic</url> - <url type="help">http://docs.kde.org/stable/en/kdegames/katomic/index.html</url> - <screenshots> - <screenshot type="default"> - <image>http://kde.org/images/screenshots/katomic.png</image> - </screenshot> - </screenshots> - <project_group>KDE</project_group> -</component> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/katomic-15.12.3/levelset.cpp new/katomic-16.04.1/levelset.cpp --- old/katomic-15.12.3/levelset.cpp 2016-01-14 12:36:16.000000000 +0100 +++ new/katomic-16.04.1/levelset.cpp 2016-01-29 14:30:14.000000000 +0100 @@ -244,8 +244,8 @@ strncpy(current.conn, value.toLatin1(), sizeof(current.conn)); if (mol->m_atoms.indexOf(current) != -1) - qWarning() - << "OOOPS, duplicate atom definition in" << key; + qWarning() + << "OOOPS, duplicate atom definition in" << key; mol->m_atoms.append(current); atom_index++; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/katomic-15.12.3/levelsetdelegate.cpp new/katomic-16.04.1/levelsetdelegate.cpp --- old/katomic-15.12.3/levelsetdelegate.cpp 2016-01-14 12:36:16.000000000 +0100 +++ new/katomic-16.04.1/levelsetdelegate.cpp 2016-01-29 14:30:14.000000000 +0100 @@ -58,16 +58,15 @@ else p->setPen(option.palette.color(QPalette::Normal, QPalette::Text)); - // - // Draw text - // + // + // Draw text + // int marginH = style->pixelMetric( QStyle::PM_FocusFrameHMargin ); int marginV = style->pixelMetric( QStyle::PM_FocusFrameVMargin ); int innerSpacing = 9; int textStartX = option.decorationSize.width() + innerSpacing; - QRect r = opt.rect.adjusted(textStartX, marginV*2, - 0, 0); + QRect r = opt.rect.adjusted(textStartX, marginV*2, 0, 0); QFontMetrics fm(opt.font); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/katomic-15.12.3/levelsetdelegate.h new/katomic-16.04.1/levelsetdelegate.h --- old/katomic-15.12.3/levelsetdelegate.h 2016-01-14 12:36:16.000000000 +0100 +++ new/katomic-16.04.1/levelsetdelegate.h 2016-01-29 14:30:14.000000000 +0100 @@ -28,7 +28,7 @@ class LevelSetDelegate : public QStyledItemDelegate { public: - LevelSetDelegate(QObject* parent = 0); + explicit LevelSetDelegate(QObject* parent = 0); virtual void paint(QPainter* p, const QStyleOptionViewItem& option, const QModelIndex& index) const; virtual QSize sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index) const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/katomic-15.12.3/main.cpp new/katomic-16.04.1/main.cpp --- old/katomic-15.12.3/main.cpp 2016-01-14 12:36:16.000000000 +0100 +++ new/katomic-16.04.1/main.cpp 2016-01-29 14:30:14.000000000 +0100 @@ -1,22 +1,22 @@ /* main.cpp - Copyright (C) 1998 Andreas Wüst ([email protected]) + Copyright (C) 1998 Andreas Wüst ([email protected]) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ +*/ #include "toplevel.h" @@ -25,6 +25,7 @@ #include <KLocalizedString> #include <KAboutData> +#include <KCrash> #include <kmessagebox.h> #include <qtimer.h> #include <QCommandLineParser> @@ -35,7 +36,7 @@ static const char description[] = - I18N_NOOP("KDE Atomic Entertainment Game"); +I18N_NOOP("KDE Atomic Entertainment Game"); static const char version[] = "4.0"; @@ -51,27 +52,28 @@ migrate.setConfigFiles(QStringList() << QStringLiteral("katomicrc")); migrate.setUiFiles(QStringList() << QStringLiteral("katomicui.rc")); migrate.migrate(); - KLocalizedString::setApplicationDomain("katomic"); - KAboutData aboutData( QStringLiteral("katomic"), i18n("KAtomic"), - version, i18n(description), KAboutLicense::GPL, - i18n("(c) 1998, Andreas Wuest\n(c) 2007-2009 Dmitry Suzdalev")); - aboutData.addAuthor(i18n("Andreas Wuest"), i18n("Original author"), QStringLiteral("[email protected]")); - aboutData.addAuthor(i18n("Dmitry Suzdalev"), i18n("Porting to KDE4. Current maintainer"), QStringLiteral("[email protected]")); - aboutData.addAuthor(i18n("Stephan Kulow"), QString(), QStringLiteral("[email protected]")); - aboutData.addAuthor(i18n("Cristian Tibirna"), QString(), QStringLiteral("[email protected]")); - aboutData.addCredit(i18n("Carsten Pfeiffer"), QString(), QStringLiteral("[email protected]")); - aboutData.addCredit(i18n("Dave Corrie"), QString(), QStringLiteral("[email protected]")); - aboutData.addCredit(i18n("Kai Jung"), i18n("6 new levels"), QStringLiteral("[email protected]")); - aboutData.addCredit(i18n("Danny Allen"), i18n("Game graphics and application icon"), QStringLiteral("[email protected]")); - aboutData.addCredit(i18n("Johann Ollivier Lapeyre"), i18n("New great SVG artwork for KDE4"), QStringLiteral("[email protected]")); - aboutData.addCredit(i18n("Brian Croom"), i18n("Port to use KGameRenderer"), QStringLiteral("[email protected]")); - aboutData.setHomepage(QStringLiteral("http://games.kde.org/katomic";)); + KLocalizedString::setApplicationDomain("katomic"); + KAboutData aboutData( QStringLiteral("katomic"), i18n("KAtomic"), + version, i18n(description), KAboutLicense::GPL, + i18n("(c) 1998, Andreas Wuest\n(c) 2007-2009 Dmitry Suzdalev")); + aboutData.addAuthor(i18n("Andreas Wuest"), i18n("Original author"), QStringLiteral("[email protected]")); + aboutData.addAuthor(i18n("Dmitry Suzdalev"), i18n("Porting to KDE4. Current maintainer"), QStringLiteral("[email protected]")); + aboutData.addAuthor(i18n("Stephan Kulow"), QString(), QStringLiteral("[email protected]")); + aboutData.addAuthor(i18n("Cristian Tibirna"), QString(), QStringLiteral("[email protected]")); + aboutData.addCredit(i18n("Carsten Pfeiffer"), QString(), QStringLiteral("[email protected]")); + aboutData.addCredit(i18n("Dave Corrie"), QString(), QStringLiteral("[email protected]")); + aboutData.addCredit(i18n("Kai Jung"), i18n("6 new levels"), QStringLiteral("[email protected]")); + aboutData.addCredit(i18n("Danny Allen"), i18n("Game graphics and application icon"), QStringLiteral("[email protected]")); + aboutData.addCredit(i18n("Johann Ollivier Lapeyre"), i18n("New great SVG artwork for KDE4"), QStringLiteral("[email protected]")); + aboutData.addCredit(i18n("Brian Croom"), i18n("Port to use KGameRenderer"), QStringLiteral("[email protected]")); + aboutData.setHomepage(QStringLiteral("http://games.kde.org/katomic";)); QCommandLineParser parser; KAboutData::setApplicationData(aboutData); + KCrash::initialize(); parser.addVersionOption(); parser.addHelpOption(); - parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("hackmode"), i18n( "Enable access to all levels" ))); + parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("hackmode"), i18n( "Enable access to all levels" ))); aboutData.setupCommandLine(&parser); parser.process(app); @@ -79,25 +81,25 @@ app.setWindowIcon(QIcon::fromTheme(QStringLiteral("katomic"))); - KDBusService service; - if (!LevelSet::isDefaultLevelsAvailable()) - { - KMessageBox::error(0, i18n("KAtomic failed to find its default level set and will quit. Please check your installation.")); - QTimer::singleShot(0, &app, SLOT(quit())); - } - else - { - if ( app.isSessionRestored() ) - RESTORE(AtomTopLevel) - else { - AtomTopLevel *top = new AtomTopLevel; - if ( parser.isSet( QStringLiteral("hackmode") ) ) - top->enableHackMode(); - - top->show(); - } - } + KDBusService service; + if (!LevelSet::isDefaultLevelsAvailable()) + { + KMessageBox::error(0, i18n("KAtomic failed to find its default level set and will quit. Please check your installation.")); + QTimer::singleShot(0, &app, SLOT(quit())); + } + else + { + if ( app.isSessionRestored() ) + RESTORE(AtomTopLevel) + else { + AtomTopLevel *top = new AtomTopLevel; + if ( parser.isSet( QStringLiteral("hackmode") ) ) + top->enableHackMode(); + + top->show(); + } + } - return app.exec(); + return app.exec(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/katomic-15.12.3/molecule.h new/katomic-16.04.1/molecule.h --- old/katomic-15.12.3/molecule.h 2016-01-14 12:36:16.000000000 +0100 +++ new/katomic-16.04.1/molecule.h 2016-01-29 14:30:14.000000000 +0100 @@ -36,8 +36,8 @@ #define MOLECULE_SIZE 15 /** - this class represents one molecule -*/ + this class represents one molecule + */ class Molecule { public: @@ -55,13 +55,13 @@ int height() const { return m_height; } /** - * @return the name of the molecule - */ + * @return the name of the molecule + */ QString moleculeName() const { return m_name; } /** - * @return the molecule weight of the molecule - */ + * @return the molecule weight of the molecule + */ double molecularWeight() const { return m_weight; } private: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/katomic-15.12.3/org.kde.katomic.appdata.xml new/katomic-16.04.1/org.kde.katomic.appdata.xml --- old/katomic-15.12.3/org.kde.katomic.appdata.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/katomic-16.04.1/org.kde.katomic.appdata.xml 2016-01-29 14:30:14.000000000 +0100 @@ -0,0 +1,106 @@ +<?xml version="1.0" encoding="utf-8"?> +<component type="desktop"> + <id>org.kde.katomic.desktop</id> + <metadata_license>CC0-1.0</metadata_license> + <project_license>GPL-2.0+</project_license> + <name>KAtomic</name> + <name xml:lang="ast">KAtomic</name> + <name xml:lang="ca">KAtomic</name> + <name xml:lang="ca-valencia">KAtomic</name> + <name xml:lang="cs">KAtomic</name> + <name xml:lang="da">KAtomic</name> + <name xml:lang="de">KAtomic</name> + <name xml:lang="en-GB">KAtomic</name> + <name xml:lang="es">KAtomic</name> + <name xml:lang="fi">KAtomic</name> + <name xml:lang="gl">KAtomic</name> + <name xml:lang="it">KAtomic</name> + <name xml:lang="ko">KAtomic</name> + <name xml:lang="nl">KAtomic</name> + <name xml:lang="nn">KAtomic</name> + <name xml:lang="pl">Atomy</name> + <name xml:lang="pt">KAtomic</name> + <name xml:lang="pt-BR">KAtomic</name> + <name xml:lang="ru">KAtomic</name> + <name xml:lang="sk">KAtomic</name> + <name xml:lang="sl">KAtomic</name> + <name xml:lang="sr">К‑атомика</name> + <name xml:lang="sr-Latn">K‑atomika</name> + <name xml:lang="sr-ijekavian">К‑атомика</name> + <name xml:lang="sr-ijekavianlatin">K‑atomika</name> + <name xml:lang="sv">Katom</name> + <name xml:lang="uk">KAtomic</name> + <name xml:lang="x-test">xxKAtomicxx</name> + <name xml:lang="zh-CN">KAtomic</name> + <name xml:lang="zh-TW">KAtomic</name> + <summary>Sokoban-like Logic Game</summary> + <summary xml:lang="ast">Xuegu de llóxica como Sokoban</summary> + <summary xml:lang="ca">Joc de lògica similar al Sokoban</summary> + <summary xml:lang="ca-valencia">Joc de lògica similar al Sokoban</summary> + <summary xml:lang="cs">Logická hra jako Sokoban</summary> + <summary xml:lang="de">„Sokoban“-Spiel</summary> + <summary xml:lang="en-GB">Sokoban-like Logic Game</summary> + <summary xml:lang="es">Juego de lógica parecido al Sokoban</summary> + <summary xml:lang="fi">Sokoban-tyylinen logiikkapeli</summary> + <summary xml:lang="gl">Xogo de lóxica ao estilo do Sokoban</summary> + <summary xml:lang="it">Gioco di logica simile a Sokoban</summary> + <summary xml:lang="ko">소코반 같은 전략 게임</summary> + <summary xml:lang="nl">Sokoban-achtig logisch spel</summary> + <summary xml:lang="nn">Sokoban-liknande logikkspel</summary> + <summary xml:lang="pl">Gra logiczna typu Sokoban</summary> + <summary xml:lang="pt">Jogo de Lógica Semelhante ao Sokoban</summary> + <summary xml:lang="pt-BR">Jogo Lógico parecido com Sokoban</summary> + <summary xml:lang="ru">Логическая игра, произошедшая от игры Sokoban</summary> + <summary xml:lang="sk">Logická hra ako Sokoban</summary> + <summary xml:lang="sl">Logična igra podobna Sokobanu</summary> + <summary xml:lang="sr">Логичка игра налик на Сокобан</summary> + <summary xml:lang="sr-Latn">Logička igra nalik na Sokoban</summary> + <summary xml:lang="sr-ijekavian">Логичка игра налик на Сокобан</summary> + <summary xml:lang="sr-ijekavianlatin">Logička igra nalik na Sokoban</summary> + <summary xml:lang="sv">Sokoban-liknande logiskt spel</summary> + <summary xml:lang="uk">Логічна гра, подібна до гри «Сокобан»</summary> + <summary xml:lang="x-test">xxSokoban-like Logic Gamexx</summary> + <summary xml:lang="zh-CN">类似推箱子的逻辑游戏</summary> + <summary xml:lang="zh-TW">倉庫番(sokoban)式的智力遊戲</summary> + <description> + <p> + KAtomic is a fun educational game built around molecular geometry. + It employs simplistic two-dimensional looks at different chemical elements. + </p> + <p xml:lang="ast">KAtomic ye un xuegu edicativu y divertíu construyíu alredor de la xeometría molecular. Emplega miraes cencielles en dos dimensiones n'elementos químicos diferentes</p> + <p xml:lang="ca">El KAtomic és un joc educatiu divertit construït al voltant de la geometria molecular. Fa servir aparences bidimensionals simplificades d'elements químics diferents.</p> + <p xml:lang="ca-valencia">El KAtomic és un joc educatiu divertit construït al voltant de la geometria molecular. Fa servir aparences bidimensionals simplificades d'elements químics diferents.</p> + <p xml:lang="de">KAtomic ist sowohl ein unterhaltsames als auch lehrreiches Spiel über molekulare Strukturen. Es verwendet eine vereinfachte zweidimensionale Ansicht der zum Molekül gehörenden Elemente.</p> + <p xml:lang="en-GB">KAtomic is a fun educational game built around molecular geometry. It employs simplistic two-dimensional looks at different chemical elements.</p> + <p xml:lang="es">KAtomic es un divertido juego educativo basado en la geometría molecular. Emplea vistas bidimensionales simplificadas de diferentes elementos químicos.</p> + <p xml:lang="fi">KAtomic on hauska ja opettavainen peli, joka perustuu molekyylien avaruusrakenteeseen. Se näyttää kemiallisia aineita kaksiulotteisesti ja pelkistetysti.</p> + <p xml:lang="gl">KAtomic é un xogo divertido e educativo sobre xeometría molecular. Nel óllanse visións simplistas en dúas dimensións de varios elementos químicos.</p> + <p xml:lang="it">KAtomic è un gioco divertente ed educativo, basato sulla geometria molecolare. Impiega una rappresentazione bidimensionale semplificata per gli elementi chimici.</p> + <p xml:lang="ko">KAtomic은 분자 구조를 기반으로 하는 교육용 게임입니다. 서로 다른 화합물의 간단한 2차원 모형을 보여 줍니다.</p> + <p xml:lang="nl">KAtomic is een leuk educatief spel gebouwd rond moleculaire geometrie. Het gebruikt simplistische tweedimensionale beelden van verschillende chemische elementen.</p> + <p xml:lang="nn">KAtomic er eit morosamt og lærerikt spel basert på molekylærgeometri. Det brukar ein forenkla, todimensjonell modell av dei kjemiske molekyla.</p> + <p xml:lang="pl">KAtomic jest grą edukującą poprzez zabawę stworzoną wokół geometrii cząsteczek. Gra wykorzystuje proste dwuwymiarowe widoki różnych pierwiastków chemicznych.</p> + <p xml:lang="pt">O KAtomic é um jogo educativo divertido, construído em torno da geometria molecular. Ele aplica vistas simplistas bidimensionais para os diferentes elementos químicos.</p> + <p xml:lang="pt-BR">KAtomic é um jogo educativo divertido, construído em torno da geometria molecular. Ele aplica visuais simplistas bidimensionais para os diferentes elementos químicos.</p> + <p xml:lang="ru">KAtomic — развивающая игра, каждый уровень которой основан на схематическом представлении молекулы химического соединения.</p> + <p xml:lang="sk">KAtomic je zábavná výuková hra založená na molekulárnej geometrii. Používa jednoduchý dvojrozmerný pohľad na rôzne chemické prvky.</p> + <p xml:lang="sl">KAtomic je zabavna in poučna igra, temelječa na geometriji molekul. Predstavlja preprosti dvodimenzionalni pogled na različne kemijske molekule.</p> + <p xml:lang="sr">К‑атомика је забавна образовна игра која се бави молекуларном геометријом. Служи се поједностављеним дводимензионалним приказима разноврсних хемијских једињења.</p> + <p xml:lang="sr-Latn">K‑atomika je zabavna obrazovna igra koja se bavi molekularnom geometrijom. Služi se pojednostavljenim dvodimenzionalnim prikazima raznovrsnih hemijskih jedinjenja.</p> + <p xml:lang="sr-ijekavian">К‑атомика је забавна образовна игра која се бави молекуларном геометријом. Служи се поједностављеним дводимензионалним приказима разноврсних хемијских једињења.</p> + <p xml:lang="sr-ijekavianlatin">K‑atomika je zabavna obrazovna igra koja se bavi molekularnom geometrijom. Služi se pojednostavljenim dvodimenzionalnim prikazima raznovrsnih hemijskih jedinjenja.</p> + <p xml:lang="sv">Katom är ett roligt och lärorikt spel byggt omkring molekylgeometri. Det använder ett förenklat tvådimensionellt utseende för olika kemiska element.</p> + <p xml:lang="uk">KAtomic — цікава навчальна гра у побудову молекул з атомів. У грі ви матимете справу зі спрощеними двовимірними моделями різних хімічних сполук.</p> + <p xml:lang="x-test">xxKAtomic is a fun educational game built around molecular geometry. It employs simplistic two-dimensional looks at different chemical elements.xx</p> + <p xml:lang="zh-TW">KAtomic 是一款教育類的遊戲，以原子模型為背景。</p> + </description> + <url type="homepage">http://games.kde.org/game.php?game=katomic</url> + <url type="bugtracker">https://bugs.kde.org/enter_bug.cgi?format=guided&product=katomic</url> + <url type="help">http://docs.kde.org/stable/en/kdegames/katomic/index.html</url> + <screenshots> + <screenshot type="default"> + <image>http://kde.org/images/screenshots/katomic.png</image> + </screenshot> + </screenshots> + <project_group>KDE</project_group> +</component> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/katomic-15.12.3/org.kde.katomic.desktop new/katomic-16.04.1/org.kde.katomic.desktop --- old/katomic-15.12.3/org.kde.katomic.desktop 2016-01-14 12:36:16.000000000 +0100 +++ new/katomic-16.04.1/org.kde.katomic.desktop 2016-01-29 14:30:14.000000000 +0100 @@ -1,6 +1,7 @@ [Desktop Entry] Name=KAtomic Name[af]=Katomic +Name[ast]=KAtomic Name[be]=KAtomic Name[bn]=কে-অ্যাটমিক Name[br]=KAtomic diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/katomic-15.12.3/playfield.cpp new/katomic-16.04.1/playfield.cpp --- old/katomic-15.12.3/playfield.cpp 2016-01-14 12:36:16.000000000 +0100 +++ new/katomic-16.04.1/playfield.cpp 2016-01-29 14:30:14.000000000 +0100 @@ -41,14 +41,12 @@ #include "fielditem.h" #include "levelset.h" -static const int MIN_INFO_SIZE=10; - struct Theme : public KgTheme { - Theme() : KgTheme("pics/default_theme.desktop") - { - setGraphicsPath(QStandardPaths::locate(QStandardPaths::DataLocation, QStringLiteral("pics/default_theme.svgz"))); - } + Theme() : KgTheme("pics/default_theme.desktop") + { + setGraphicsPath(QStandardPaths::locate(QStandardPaths::DataLocation, QStringLiteral("pics/default_theme.svgz"))); + } }; PlayField::PlayField( QObject* parent ) @@ -595,7 +593,7 @@ minY = atom->fieldY(); } // so origin is (minX,minY) - // we'll substract this origin from each atom's coords and check + // we'll subtract this origin from each atom's coords and check // if the resulting position is the same as this atom has in molecule foreach( AtomFieldItem* atom, m_atoms ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/katomic-15.12.3/playfield.h new/katomic-16.04.1/playfield.h --- old/katomic-15.12.3/playfield.h 2016-01-14 12:36:16.000000000 +0100 +++ new/katomic-16.04.1/playfield.h 2016-01-29 14:30:14.000000000 +0100 @@ -48,13 +48,7 @@ Q_OBJECT public: enum Direction { Up=0, Down, Left, Right }; - /** - * Constructor - */ explicit PlayField( QObject *parent ); - /** - * Destructor - */ virtual ~PlayField(); /** * Resizes playfield to width,height @@ -115,7 +109,7 @@ * Redoes one movement */ void redo(); - /** + /** * Undoes all movements */ void undoAll(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/katomic-15.12.3/toplevel.cpp new/katomic-16.04.1/toplevel.cpp --- old/katomic-15.12.3/toplevel.cpp 2016-01-14 12:36:16.000000000 +0100 +++ new/katomic-16.04.1/toplevel.cpp 2016-01-29 14:30:14.000000000 +0100 @@ -1,24 +1,24 @@ /* toplevel.cpp - Copyright (C) 1998 Andreas Wüst <[email protected]> - Copyright (C) 2006 Dmitry Suzdalev <[email protected]> - Copyright (C) 2007 Simon Hürlimann <[email protected]> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + Copyright (C) 1998 Andreas Wüst <[email protected]> + Copyright (C) 2006 Dmitry Suzdalev <[email protected]> + Copyright (C) 2007 Simon Hürlimann <[email protected]> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ +*/ #include "toplevel.h" @@ -89,7 +89,7 @@ KStandardGameAction::restart(m_gameWid, SLOT(restartLevel()), actionCollection()); // FIXME: comment this until highscore dialog will be implemented. // (katomic needs spesial one) -// KStandardGameAction::highscores(m_gameWid, SLOT(showHighscores()), actionCollection()); + // KStandardGameAction::highscores(m_gameWid, SLOT(showHighscores()), actionCollection()); KStandardGameAction::load(m_gameWid, SLOT(loadGame()), actionCollection()); KStandardGameAction::save(m_gameWid, SLOT(saveGame()), actionCollection()); KStandardGameAction::quit(this, SLOT(close()), actionCollection()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/katomic-15.12.3/toplevel.h new/katomic-16.04.1/toplevel.h --- old/katomic-15.12.3/toplevel.h 2016-01-14 12:36:16.000000000 +0100 +++ new/katomic-16.04.1/toplevel.h 2016-01-29 14:30:14.000000000 +0100 @@ -1,22 +1,22 @@ /* toplevel.h - Copyright (C) 1998 Andreas Wüst ([email protected]) + Copyright (C) 1998 Andreas Wüst ([email protected]) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ +*/ #ifndef TOPLEVEL_H #define TOPLEVEL_H
