Hello community, here is the log from the commit of package ksnakeduel for openSUSE:Factory checked in at 2013-07-08 07:28:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ksnakeduel (Old) and /work/SRC/openSUSE:Factory/.ksnakeduel.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ksnakeduel" Changes: -------- --- /work/SRC/openSUSE:Factory/ksnakeduel/ksnakeduel.changes 2013-06-11 09:32:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ksnakeduel.new/ksnakeduel.changes 2013-07-08 07:28:46.000000000 +0200 @@ -1,0 +2,14 @@ +Thu Jun 27 18:50:32 UTC 2013 - tittiatc...@gmail.com + +- 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:53:24 UTC 2013 - tittiatc...@gmail.com + +- Update to 4.10.80 + * KDE 4.11 Beta 1 release + * See http://www.kde.org/announcements/announce-4.11-beta1.php + +------------------------------------------------------------------- Old: ---- ksnakeduel-4.10.4.tar.xz New: ---- ksnakeduel-4.10.90.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ksnakeduel.spec ++++++ --- /var/tmp/diff_new_pack.GpLjSF/_old 2013-07-08 07:28:46.000000000 +0200 +++ /var/tmp/diff_new_pack.GpLjSF/_new 2013-07-08 07:28:46.000000000 +0200 @@ -23,7 +23,7 @@ License: GPL-2.0+ Group: Amusements/Games/Board/Puzzle Url: http://www.kde.org -Version: 4.10.4 +Version: 4.10.90 Release: 0 Source0: ksnakeduel-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ ksnakeduel-4.10.4.tar.xz -> ksnakeduel-4.10.90.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksnakeduel-4.10.4/CMakeLists.txt new/ksnakeduel-4.10.90/CMakeLists.txt --- old/ksnakeduel-4.10.4/CMakeLists.txt 2013-05-28 21:50:35.000000000 +0200 +++ new/ksnakeduel-4.10.90/CMakeLists.txt 2013-06-10 20:55:06.000000000 +0200 @@ -18,7 +18,6 @@ ########### next target ############### set(ktron_SRCS - fontutils.cpp renderer.cpp object.cpp snakepart.cpp Files old/ksnakeduel-4.10.4/doc/index.cache.bz2 and new/ksnakeduel-4.10.90/doc/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksnakeduel-4.10.4/doc/index.docbook new/ksnakeduel-4.10.90/doc/index.docbook --- old/ksnakeduel-4.10.4/doc/index.docbook 2013-05-28 21:50:35.000000000 +0200 +++ new/ksnakeduel-4.10.90/doc/index.docbook 2013-06-10 20:55:06.000000000 +0200 @@ -56,8 +56,8 @@ <legalnotice>&FDLNotice;</legalnotice> -<date>2009-01-22</date> -<releaseinfo>2.0</releaseinfo> +<date>2013-05-05</date> +<releaseinfo>2.0 (&kde; 4.11)</releaseinfo> <abstract> <para> @@ -182,9 +182,8 @@ </para> <note><para> -You can alter the keys using the shortcuts option in the <link -linkend="settings-menu"><guimenu>Settings</guimenu> -Menu</link>. +You can alter the keys using the shortcuts option in the <ulink +url="help:/fundamentals/shortcuts.html"><guimenu>Settings</guimenu> menu</ulink>. </para></note> </sect1> </chapter> @@ -245,21 +244,20 @@ </para> <note><para> -You can alter the keys using the shortcuts option in the <link -linkend="settings-menu"><guimenu>Settings</guimenu> -Menu</link>. +You can alter the keys using the shortcuts option in the <ulink +url="help:/fundamentals/shortcuts.html"><guimenu>Settings</guimenu> menu</ulink>. </para></note> </sect1> </chapter> -<chapter id="command"> -<title>Command Reference</title> +<chapter id="interface-overview"> +<title>Interface Overview</title> -<para>The following sections briefly describe each menubar option.</para> - -<sect1 id="game-menu"> -<title>The <guimenu>Game</guimenu> Menu</title> +<sect1 id="menu-items"> +<title>Menu Items</title> + +<para>The following list briefly describes each menubar option.</para> <variablelist> <varlistentry> @@ -306,21 +304,6 @@ </menuchoice></term> <listitem><para><action>Quits.</action></para></listitem> </varlistentry> -</variablelist> -</sect1> - - -<sect1 id="settings-menu"> -<title>The <guimenu>Settings</guimenu> Menu</title> - -<variablelist> -<varlistentry> -<term><menuchoice> -<guimenu>Settings</guimenu> -<guimenuitem>Show Statusbar</guimenuitem> -</menuchoice></term> -<listitem><para><action>Shows or hides the Statusbar.</action></para></listitem> -</varlistentry> <varlistentry> <term><menuchoice> @@ -334,14 +317,6 @@ <varlistentry> <term><menuchoice> <guimenu>Settings</guimenu> -<guimenuitem>Configure Shortcuts...</guimenuitem> -</menuchoice></term> -<listitem><para><action>Displays a standard &kde; shortcuts configurator.</action></para></listitem> -</varlistentry> - -<varlistentry> -<term><menuchoice> -<guimenu>Settings</guimenu> <guimenuitem>Configure &kappname;...</guimenuitem> </menuchoice></term> <listitem><para><action>Opens a <link linkend="configuration">comprehensive dialog</link> @@ -349,12 +324,12 @@ </varlistentry> </variablelist> -</sect1> - -<sect1 id="help"> -<title>The <guimenu>Help</guimenu> Menu</title> - -&help.menu.documentation; +<para> +Additionally &ksnake; has the common &kde; <guimenu>Settings</guimenu> and <guimenu>Help</guimenu> +menu items, for more information read the sections about the +<ulink url="help:/fundamentals/ui.html#menus-settings">Settings Menu</ulink> and +<ulink url="help:/fundamentals/ui.html#menus-help">Help Menu</ulink> of the &kde; Fundamentals. +</para> </sect1> @@ -470,7 +445,7 @@ </table> <para> -These shortcuts can be changed by selecting <menuchoice> +These shortcuts <ulink url="help:/fundamentals/shortcuts.html">can be changed</ulink> by selecting <menuchoice> <guimenu>Settings</guimenu> <guimenuitem>Configure Shortcuts...</guimenuitem> </menuchoice> from the menubar. </para> Files old/ksnakeduel-4.10.4/doc/settings-general.png and new/ksnakeduel-4.10.90/doc/settings-general.png differ Files old/ksnakeduel-4.10.4/doc/settings-theme.png and new/ksnakeduel-4.10.90/doc/settings-theme.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksnakeduel-4.10.4/fontutils.cpp new/ksnakeduel-4.10.90/fontutils.cpp --- old/ksnakeduel-4.10.4/fontutils.cpp 2013-05-28 21:50:35.000000000 +0200 +++ new/ksnakeduel-4.10.90/fontutils.cpp 1970-01-01 01:00:00.000000000 +0100 @@ -1,50 +0,0 @@ -/* - Copyright 2005-2006 by Albert Astals Cid <aa...@kde.org> - - 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, see <http://www.gnu.org/licenses/>. -*/ - -#include "fontutils.h" - -#include <QPainter> - -int fontUtils::fontSize(QPainter &p, const QString &str, - int w, int h, Flags flags) -{ - int size; - QRect rect; - bool done = false; - - size = 28; - - while (!done && size > 1) { - QFont f = p.font(); - f.setPointSize(size); - p.setFont(f); - int qtFlags = Qt::AlignCenter | Qt::TextWordWrap; - if (flags & DoNotAllowWordWrap) { - qtFlags = qtFlags & ~Qt::TextWordWrap; - } - rect = p.boundingRect(QRect(0, 0, w, h), qtFlags, str); - - if (rect.width() == 0 || rect.height() == 0) { - return -1; - } else if (rect.width() > w || rect.height() > h) { - size = qMin(w * size / rect.width(), h * size / rect.height()); - } - else done = true; - } - - return size; -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksnakeduel-4.10.4/fontutils.h new/ksnakeduel-4.10.90/fontutils.h --- old/ksnakeduel-4.10.4/fontutils.h 2013-05-28 21:50:35.000000000 +0200 +++ new/ksnakeduel-4.10.90/fontutils.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,28 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2005 by Albert Astals Cid <aa...@kde.org> * - * * - * 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. * - ***************************************************************************/ - -#ifndef FONTUTILS_H -#define FONTUTILS_H - -class QPainter; -class QString; - -namespace fontUtils -{ - enum Flags - { - NoFlags = 1, - DoNotAllowWordWrap = 2 - }; - - int fontSize(QPainter &p, const QString &s1, int w, int h, - Flags flags=NoFlags); -} - -#endif //FONTUTILS_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksnakeduel-4.10.4/kdesnake.desktop new/ksnakeduel-4.10.90/kdesnake.desktop --- old/ksnakeduel-4.10.4/kdesnake.desktop 2013-05-28 21:50:35.000000000 +0200 +++ new/ksnakeduel-4.10.90/kdesnake.desktop 2013-06-10 20:55:06.000000000 +0200 @@ -1,6 +1,6 @@ [Desktop Entry] Type=Application -Exec=ktron -snake -caption "%c" %i +Exec=ktron -snake -caption %c %i Icon=kdesnake X-DocPath=ktron/index.html GenericName=Snake-like Game diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksnakeduel-4.10.4/ktron.desktop new/ksnakeduel-4.10.90/ktron.desktop --- old/ksnakeduel-4.10.4/ktron.desktop 2013-05-28 21:50:35.000000000 +0200 +++ new/ksnakeduel-4.10.90/ktron.desktop 2013-06-10 20:55:06.000000000 +0200 @@ -1,6 +1,6 @@ [Desktop Entry] Type=Application -Exec=ktron -caption "%c" %i +Exec=ktron -caption %c %i Icon=ktron X-DocPath=ktron/index.html Terminal=false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksnakeduel-4.10.4/renderer.cpp new/ksnakeduel-4.10.90/renderer.cpp --- old/ksnakeduel-4.10.4/renderer.cpp 2013-05-28 21:50:35.000000000 +0200 +++ new/ksnakeduel-4.10.90/renderer.cpp 2013-06-10 20:55:06.000000000 +0200 @@ -24,7 +24,6 @@ #include "renderer.h" #include "settings.h" #include "object.h" -#include "fontutils.h" #include <QPainter> #include <QPixmap> @@ -33,6 +32,7 @@ #include <KPixmapCache> #include <QSvgRenderer> #include <KDebug> +#include <kfontutils.h> #define USE_UNSTABLE_LIBKDEGAMESPRIVATE_API #include <libkdegamesprivate/kgametheme.h> @@ -115,12 +115,12 @@ return true; } -QPixmap Renderer::getPart(QString frameSvgName) +QPixmap Renderer::getPart(const QString &frameSvgName) { return getPartOfSize(frameSvgName, p->m_partSize); } -QPixmap Renderer::getPartOfSize(QString frameSvgName, QSize &partSize) +QPixmap Renderer::getPartOfSize(const QString &frameSvgName, const QSize &partSize) { QString framePixName = frameSvgName + sizeSuffix.arg(partSize.width()).arg(partSize.height()); QPixmap pix; @@ -279,7 +279,7 @@ return p->m_playField; } -QPixmap Renderer::messageBox(QString &message) { +QPixmap Renderer::messageBox(const QString &message) { int w = p->m_sceneSize.width() / 2; int h = p->m_sceneSize.height() / 3; @@ -288,7 +288,7 @@ QPainter painter(&pixmap); - int fontSize = fontUtils::fontSize(painter, message, w * 0.9, h, fontUtils::DoNotAllowWordWrap); + const int fontSize = KFontUtils::adaptFontSize(painter, message, w * 0.9, h, 28, 1, KFontUtils::DoNotAllowWordWrap); painter.setPen(QColor(255, 255, 255, 220)); painter.setFont(QFont(QLatin1String( "Helvetica" ), fontSize, QFont::Bold)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksnakeduel-4.10.4/renderer.h new/ksnakeduel-4.10.90/renderer.h --- old/ksnakeduel-4.10.4/renderer.h 2013-05-28 21:50:35.000000000 +0200 +++ new/ksnakeduel-4.10.90/renderer.h 2013-06-10 20:55:06.000000000 +0200 @@ -47,10 +47,10 @@ int calculateOffsetX(int x); int calculateOffsetY(int y); - QPixmap getPart(QString partName); - QPixmap getPartOfSize(QString partName, QSize &partSize); + QPixmap getPart(const QString &partName); + QPixmap getPartOfSize(const QString &partName, const QSize &partSize); QPixmap background(); - QPixmap messageBox(QString &message); + QPixmap messageBox(const QString &message); void resetPlayField(); void drawPart(QPainter & painter, int x, int y, QString svgName); -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
