Hello community, here is the log from the commit of package kbounce for openSUSE:Factory checked in at 2013-07-08 07:29:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kbounce (Old) and /work/SRC/openSUSE:Factory/.kbounce.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kbounce" Changes: -------- --- /work/SRC/openSUSE:Factory/kbounce/kbounce.changes 2013-06-11 09:28:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kbounce.new/kbounce.changes 2013-07-08 07:29:57.000000000 +0200 @@ -1,0 +2,14 @@ +Thu Jun 27 18:46:22 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:48:02 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: ---- kbounce-4.10.4.tar.xz New: ---- kbounce-4.10.90.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kbounce.spec ++++++ --- /var/tmp/diff_new_pack.zcp7Pd/_old 2013-07-08 07:29:58.000000000 +0200 +++ /var/tmp/diff_new_pack.zcp7Pd/_new 2013-07-08 07:29:58.000000000 +0200 @@ -23,7 +23,7 @@ License: LGPL-2.0+ Group: Amusements/Games/Action/Other Url: http://www.kde.org -Version: 4.10.4 +Version: 4.10.90 Release: 0 Source0: kbounce-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ kbounce-4.10.4.tar.xz -> kbounce-4.10.90.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbounce-4.10.4/board.cpp new/kbounce-4.10.90/board.cpp --- old/kbounce-4.10.4/board.cpp 2013-05-28 21:34:39.000000000 +0200 +++ new/kbounce-4.10.90/board.cpp 2013-06-10 20:54:33.000000000 +0200 @@ -38,7 +38,8 @@ KBounceBoard::KBounceBoard( KBounceRenderer* renderer ) - : QObject(), QGraphicsItemGroup(), m_renderer( renderer ) +: QGraphicsObject() +, m_renderer( renderer ) { m_tilesPix = new QGraphicsPixmapItem( this ); m_tilesPix->setPos( QPointF( 0, 0 ) ); @@ -99,8 +100,6 @@ foreach( KBounceWall* wall, m_walls ) wall->resize( m_tileSize ); - redraw(); - size.setWidth( minTileSize * TILE_NUM_W ); size.setHeight( minTileSize * TILE_NUM_H ); if (!alreadyPaused) @@ -109,54 +108,50 @@ } } -void KBounceBoard::redraw() +void KBounceBoard::paint(QPainter * p, const QStyleOptionGraphicsItem *, QWidget *) { - if ( m_tileSize.isEmpty() ) - { + if ( m_tileSize.isEmpty() ) { m_tilesPix->setPixmap( QPixmap() ); m_tilesPix->hide(); } - else - { - - QPixmap px( m_tileSize.width() * TILE_NUM_W, m_tileSize.height() * TILE_NUM_H ); + else { + QPixmap px( m_tileSize.width() * TILE_NUM_W, + m_tileSize.height() * TILE_NUM_H ); px.fill( QColor( 0, 0, 0, 0 ) ); + p->drawPixmap( 0, 0, px ); - QPainter p( &px ); - - for ( int i = 0; i < TILE_NUM_W; i++ ) - { - for ( int j = 0; j < TILE_NUM_H; j++ ) - { - switch ( m_tiles[i][j] ) - { + for ( int i = 0; i < TILE_NUM_W; i++ ) { + for ( int j = 0; j < TILE_NUM_H; j++ ) { + switch ( m_tiles[i][j] ) { case Free: - p.drawPixmap( i * m_tileSize.width(), j* m_tileSize.height(), m_renderer->spritePixmap( "gridTile", m_tileSize ) ); + p->drawPixmap( + i * m_tileSize.width(), + j * m_tileSize.height(), + m_renderer->spritePixmap( "gridTile", m_tileSize ) + ); break; + case Border: case Wall: - p.drawPixmap( i * m_tileSize.width(), j * m_tileSize.height(), m_renderer->spritePixmap( "wallTile", m_tileSize ) ); + p->drawPixmap( + i * m_tileSize.width(), + j * m_tileSize.height(), + m_renderer->spritePixmap( "wallTile", m_tileSize ) + ); break; + default: break; - } + } } } - p.end(); - m_tilesPix->setPixmap( px ); m_tilesPix->show(); } - /* foreach( KBounceBall* ball, m_balls ) - { - ball->resetPixmaps(); - }*/ foreach( KBounceWall* wall, m_walls ) - { wall->update(); - } } void KBounceBoard::newLevel( int level ) @@ -214,7 +209,7 @@ void KBounceBoard::buildWall( const QPointF& pos, bool vertical ) { - QPointF unmapped( pos.x() - 10, pos.y() - 10); + QPointF unmapped( pos.x() - x(), pos.y() - y()); int x = static_cast<int>( unmapped.x() / m_tileSize.width() ); int y = static_cast<int>( unmapped.y() / m_tileSize.height() ); @@ -364,9 +359,9 @@ static_cast<int>( m_tileSize.height() * pos.y() ) ); } -QRectF KBounceBoard::boardBoundingRect() const +QRectF KBounceBoard::boundingRect() const { - return QRectF( 10, 10, + return QRectF( x(), y(), TILE_NUM_W * m_tileSize.width(), TILE_NUM_H * m_tileSize.height() ); } @@ -424,8 +419,6 @@ if ( m_tiles[x][y] == Temp ) m_tiles[x][y] = Free; - redraw(); - int filled = 0; for ( int i = 1; i < TILE_NUM_W - 1; i++ ) for ( int j = 1; j < TILE_NUM_H - 1; j++ ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbounce-4.10.4/board.h new/kbounce-4.10.90/board.h --- old/kbounce-4.10.4/board.h 2013-05-28 21:34:39.000000000 +0200 +++ new/kbounce-4.10.90/board.h 2013-06-10 20:54:33.000000000 +0200 @@ -35,7 +35,7 @@ class KBounceBall; class KBounceWall; -class KBounceBoard: public QObject, public QGraphicsItemGroup +class KBounceBoard: public QGraphicsObject { Q_OBJECT @@ -46,7 +46,7 @@ ~KBounceBoard(); void resize( QSize& size ); - void redraw(); + void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *); void newLevel( int level ); void setPaused( bool ); @@ -61,7 +61,7 @@ void checkCollisions(); QPoint mapPosition( const QPointF& pos ) const; - QRectF boardBoundingRect() const; + QRectF boundingRect() const; void setBallVelocity(qreal velocity); void setWallVelocity(qreal velocity); Files old/kbounce-4.10.4/doc/index.cache.bz2 and new/kbounce-4.10.90/doc/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbounce-4.10.4/doc/index.docbook new/kbounce-4.10.90/doc/index.docbook --- old/kbounce-4.10.4/doc/index.docbook 2013-05-28 21:34:39.000000000 +0200 +++ new/kbounce-4.10.90/doc/index.docbook 2013-06-10 20:54:33.000000000 +0200 @@ -37,8 +37,8 @@ <legalnotice>&FDLNotice;</legalnotice> -<date>2012-08-06</date><!-- Date of (re)writing, or update.--> -<releaseinfo>&kappversion; (&kde; 4.9)</releaseinfo><!-- Application version number. Use the variable definitions within header to change this value.--> +<date>2013-05-05</date><!-- Date of (re)writing, or update.--> +<releaseinfo>&kappversion; (&kde; 4.11)</releaseinfo><!-- Application version number. Use the variable definitions within header to change this value.--> <abstract> <para>This documentation describes the game of &kbounce; version &kappversion;</para> @@ -392,26 +392,6 @@ <variablelist> -<varlistentry id="settings-toolbar"> -<term><menuchoice> -<guimenu>Settings</guimenu> -<guimenuitem>Show Toolbar</guimenuitem> -</menuchoice></term> -<listitem> -<para><action>Shows/hides the &kbounce; toolbar.</action></para> -</listitem> -</varlistentry> - -<varlistentry id="settings-statusbar"> -<term><menuchoice> -<guimenu>Settings</guimenu> -<guimenuitem>Show Statusbar</guimenuitem> -</menuchoice></term> -<listitem> -<para><action>Shows/hides the &kbounce; statusbar.</action></para> -</listitem> -</varlistentry> - <varlistentry id="settings-sounds"> <term><menuchoice> <guimenu>Settings</guimenu> @@ -422,55 +402,28 @@ </listitem> </varlistentry> -<varlistentry> +<varlistentry id="settings-difficulty"> <term><menuchoice> <guimenu>Settings</guimenu> -<guimenuitem>Configure Shortcuts...</guimenuitem> +<guisubmenu>Difficulty</guisubmenu> </menuchoice></term> <listitem> -<para><action>Opens a standard &kde; shortcut configuration dialog, in which -you can change the keyboard shortcuts used by &kbounce;.</action></para> -</listitem> -</varlistentry> - -<varlistentry> -<term><menuchoice> -<guimenu>Settings</guimenu> -<guimenuitem>Configure Toolbars...</guimenuitem> -</menuchoice></term> -<listitem> -<para><action>Opens the standard &kde; toolbar configuration dialog to customize the &kbounce; toolbar.</action></para> -</listitem> -</varlistentry> - -<varlistentry> -<term><menuchoice> -<guimenu>Settings</guimenu> -<guimenuitem>Configure &kbounce;...</guimenuitem> -</menuchoice></term> -<listitem> -<para><action>Opens a dialog to customize the game. It allows to -select themes.</action></para> +<para><action>Select a game difficulty. On higher difficulty levels the walls are build slower while balls move faster. +That makes it harder to fence an area in the board.</action></para> </listitem> </varlistentry> </variablelist> -</sect2> - -<sect2 id="help-menu"> -<title>The <guimenu>Help</guimenu> Menu</title> -<mediaobject> -<imageobject> -<imagedata format="PNG" fileref="menu-help.png"/> -</imageobject> -<textobject> -<phrase>Help Menu</phrase></textobject> -</mediaobject> - -&help.menu.documentation; +<para> +Additionally &kbounce; 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> </sect2> + </sect1> </chapter> @@ -506,13 +459,13 @@ </para> <para> Once you are satisfied with the theme you have selected you - can click the <guibutton>Close</guibutton> + can click the <guibutton>OK</guibutton> button, located at the bottom part of this dialog. </para> </chapter> -<chapter id="credits-and-licenses"> -<title>Credits and Licenses</title> +<chapter id="credits-and-license"> +<title>Credits and License</title> <para>&kbounce;</para> Files old/kbounce-4.10.4/doc/menu-help.png and new/kbounce-4.10.90/doc/menu-help.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbounce-4.10.4/gamewidget.cpp new/kbounce-4.10.90/gamewidget.cpp --- old/kbounce-4.10.4/gamewidget.cpp 2013-05-28 21:34:39.000000000 +0200 +++ new/kbounce-4.10.90/gamewidget.cpp 2013-06-10 20:54:33.000000000 +0200 @@ -28,6 +28,7 @@ #include <KgThemeProvider> #include <KColorScheme> +static const int MIN_MARGIN = 50; static const int GAME_TIME_DELAY = 1000; static const int MIN_FILL_PERCENT = 75; static const int POINTS_FOR_LIFE = 15; @@ -93,7 +94,6 @@ { m_clock->stop(); m_board->setPaused( true ); - unsetCursor(); m_state = GameOver; emit stateChanged( m_state ); emit gameOver(); @@ -106,7 +106,6 @@ void KBounceGameWidget::newGame() { closeGame(); - setCursor( m_vertical ? Qt::SizeVerCursor : Qt::SizeHorCursor ); m_level = 1; m_score = 0; @@ -170,7 +169,6 @@ m_renderer.setCustomBackgroundPath(QString()); } - renderBackground(); redraw(); } @@ -196,7 +194,7 @@ { setGameDifficulty( Kg::difficulty()->currentLevel() ); - if (m_state == Running) + if ( m_state == Running || m_state == Paused ) newGame(); } @@ -259,33 +257,29 @@ void KBounceGameWidget::resizeEvent( QResizeEvent* ev ) { kDebug() << "Size" << ev->size(); + m_renderer.setBackgroundSize( ev->size() ); - renderBackground(); - QSize boardSize( ev->size().width() , ev->size().height() ); - m_board->resize( boardSize ); - QRectF rect( 0, 0, m_board->boardBoundingRect().width() + 20, m_board->boardBoundingRect().height() + 20); + + QRectF rect( 0, 0, ev->size().width(), ev->size().height() ); m_scene.setSceneRect( rect ); - m_board->setPos( 10, 10 ); - fitInView( sceneRect(), Qt::KeepAspectRatio ); - redraw(); -} + QSize boardSize( sceneRect().width() - MIN_MARGIN, + sceneRect().height() - MIN_MARGIN ); + m_board->resize( boardSize ); -void KBounceGameWidget::renderBackground() -{ - QPalette palette; - palette.setBrush( backgroundRole(), m_renderer.renderBackground() ); - setPalette( palette ); - setAutoFillBackground( true ); -} + qreal x = ( sceneRect().width() - m_board->boundingRect().width() ) / 2; + qreal y = ( sceneRect().height() - m_board->boundingRect().height() ) / 2; + m_board->setPos( x, y ); + redraw(); +} void KBounceGameWidget::mouseReleaseEvent( QMouseEvent* event ) { if ( event->button() & Qt::RightButton ) { m_vertical = !m_vertical; - setCursor( m_vertical ? Qt::SizeVerCursor : Qt::SizeHorCursor ); + updateCursor(); } if ( event->button() & Qt::LeftButton ) @@ -294,6 +288,10 @@ { m_board->buildWall( mapToScene( event->pos() ), m_vertical ); } + else if ( m_state == Paused ) + { + setPaused( false ); + } else if ( m_state == BetweenLevels ) { newLevel(); @@ -337,10 +335,8 @@ emit timeChanged( m_time ); if (KBounceSettings::useRandomBackgroundPictures()) - { m_renderer.loadNewBackgroundPixmap(); - renderBackground(); - } + redraw(); } @@ -367,7 +363,9 @@ m_overlay->show(); break; } - m_board->redraw(); + + updateCursor(); + m_scene.setBackgroundBrush( m_renderer.renderBackground() ); update(); } @@ -411,7 +409,7 @@ text = i18n( "Welcome to KBounce.\n Click to start a game" ); break; case Paused: - text = i18n( "Paused" ); + text = i18n( "Paused\n Click to resume" ); break; case BetweenLevels: text = i18n( "You have successfully cleared more than %1% of the board\n", MIN_FILL_PERCENT ) + @@ -451,6 +449,21 @@ m_overlay->setPos( pos ); } +void KBounceGameWidget::focusOutEvent(QFocusEvent *event) +{ + if (event->reason() == Qt::ActiveWindowFocusReason) + { + setPaused( true ); + } +} + +void KBounceGameWidget::updateCursor() +{ + if ( m_state == Running ) + setCursor( m_vertical ? Qt::SizeVerCursor : Qt::SizeHorCursor ); + else + unsetCursor(); +} #include "gamewidget.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbounce-4.10.4/gamewidget.h new/kbounce-4.10.90/gamewidget.h --- old/kbounce-4.10.4/gamewidget.h 2013-05-28 21:34:39.000000000 +0200 +++ new/kbounce-4.10.90/gamewidget.h 2013-06-10 20:54:33.000000000 +0200 @@ -76,10 +76,10 @@ protected: virtual void resizeEvent( QResizeEvent* event ); virtual void mouseReleaseEvent( QMouseEvent* event ); - void renderBackground(); + void focusOutEvent(QFocusEvent *event); void closeLevel(); void newLevel(); - + void updateCursor(); void redraw(); void setGameDifficulty(const KgDifficultyLevel *); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbounce-4.10.4/kbounce.desktop new/kbounce-4.10.90/kbounce.desktop --- old/kbounce-4.10.4/kbounce.desktop 2013-05-28 21:34:39.000000000 +0200 +++ new/kbounce-4.10.90/kbounce.desktop 2013-06-10 20:54:33.000000000 +0200 @@ -56,7 +56,7 @@ Name[sr@ijekavian]=К‑одбој Name[sr@ijekavianlatin]=K‑odboj Name[sr@latin]=K‑odboj -Name[sv]=Kbounce +Name[sv]=Kstuds Name[ta]=கேபவுன்ஸ் Name[tg]=KТӯби ҷаҳанда Name[tr]=KBounce @@ -70,7 +70,7 @@ Name[zh_TW]=KBounce 彈力球 Type=Application -Exec=kbounce -caption "%c" +Exec=kbounce -caption %c X-DocPath=kbounce/index.html Icon=kbounce diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbounce-4.10.4/mainwindow.cpp new/kbounce-4.10.90/mainwindow.cpp --- old/kbounce-4.10.4/mainwindow.cpp 2013-05-28 21:34:39.000000000 +0200 +++ new/kbounce-4.10.90/mainwindow.cpp 2013-06-10 20:54:33.000000000 +0200 @@ -161,6 +161,10 @@ void KBounceMainWindow::highscore() { + if ( m_gameWidget->score() == 0 ) { + return; + } + kDebug() ; KScoreDialog ksdialog( KScoreDialog::Name | KScoreDialog::Score | KScoreDialog::Level, this ); ksdialog.initFromDifficulty(Kg::difficulty()); @@ -253,21 +257,12 @@ void KBounceMainWindow::focusOutEvent( QFocusEvent *ev ) { - // FIXME this event is triggered when right-clicking on QGraphicsView. Why? - // Need to find why :). - // Because it prevents a walls from being built. - // Commented for now - /* - if ( m_state==Running ) + if ( m_gameWidget->state() == KBounceGameWidget::Running && + focusWidget() != m_gameWidget ) { - stopLevel(); - m_state = Suspend; - m_pauseButton->setChecked(true); - statusBar()->showMessage( i18n("Game suspended") ); - // m_gameWidget->display( i18n("Game suspended") ); + m_gameWidget->setPaused( true ); } - */ KXmlGuiWindow::focusOutEvent( ev ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbounce-4.10.4/themes/default.desktop new/kbounce-4.10.90/themes/default.desktop --- old/kbounce-4.10.4/themes/default.desktop 2013-05-28 21:34:39.000000000 +0200 +++ new/kbounce-4.10.90/themes/default.desktop 2013-06-10 20:54:33.000000000 +0200 @@ -36,7 +36,7 @@ Name[sr@ijekavian]=Египатско одбијање Name[sr@ijekavianlatin]=Egipatsko odbijanje Name[sr@latin]=Egipatsko odbijanje -Name[sv]=Egyptisk Bounce +Name[sv]=Egyptisk studs Name[tr]=Egyptian Bounce Name[uk]=Єгипетський стрибок Name[x-test]=xxEgyptian Bouncexx @@ -79,7 +79,7 @@ Description[sr@ijekavian]=К‑одбој у египатском стилу Description[sr@ijekavianlatin]=K‑odboj u egipatskom stilu Description[sr@latin]=K‑odboj u egipatskom stilu -Description[sv]=Kbounce, egyptisk stil. +Description[sv]=Kstuds, egyptisk stil. Description[tr]=KBounce, Mısırlı stili. Description[uk]=KBounce, єгипетський стиль. Description[x-test]=xxKBounce, Egyptian style.xx -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
