Hello community, here is the log from the commit of package klickety for openSUSE:Factory checked in at 2016-03-29 09:58:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/klickety (Old) and /work/SRC/openSUSE:Factory/.klickety.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "klickety" Changes: -------- --- /work/SRC/openSUSE:Factory/klickety/klickety.changes 2016-02-23 16:56:17.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.klickety.new/klickety.changes 2016-03-29 09:58:43.000000000 +0200 @@ -1,0 +2,9 @@ +Sun Mar 13 15:46:22 UTC 2016 - [email protected] + +- Update to KDE Applications 15.12.3 + * KDE Applications 15.12.3 + * https://www.kde.org/announcements/announce-applications-15.12.3.php + * boo#970855 + + +------------------------------------------------------------------- Old: ---- klickety-15.12.2.tar.xz New: ---- klickety-15.12.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ klickety.spec ++++++ --- /var/tmp/diff_new_pack.NlcGvg/_old 2016-03-29 09:58:44.000000000 +0200 +++ /var/tmp/diff_new_pack.NlcGvg/_new 2016-03-29 09:58:44.000000000 +0200 @@ -38,7 +38,7 @@ License: GPL-2.0+ Group: Amusements/Games/Board/Other Url: http://www.kde.org -Version: 15.12.2 +Version: 15.12.3 Release: 0 Source0: klickety-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ klickety-15.12.2.tar.xz -> klickety-15.12.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/klickety-15.12.2/bgselector.ui new/klickety-15.12.3/bgselector.ui --- old/klickety-15.12.2/bgselector.ui 2016-02-08 16:01:21.000000000 +0100 +++ new/klickety-15.12.3/bgselector.ui 2016-02-28 12:59:10.000000000 +0100 @@ -28,24 +28,24 @@ <widget class="QGroupBox" name="kcfg_BgType"> <layout class="QGridLayout" name="gridLayout1"> <item row="0" column="0"> - <widget class="QRadioButton" name="theme"> + <widget class="QRadioButton" name="kcfg_RadioTheme"> <property name="text"> <string>&Theme</string> </property> + <property name="checked"> + <bool>true</bool> + </property> </widget> </item> <item row="1" column="0"> - <widget class="QRadioButton" name="color"> + <widget class="QRadioButton" name="kcfg_RadioColor"> <property name="text"> <string>&Color</string> </property> - <property name="checked"> - <bool>true</bool> - </property> </widget> </item> <item row="2" column="0"> - <widget class="QRadioButton" name="image"> + <widget class="QRadioButton" name="kcfg_RadioImage"> <property name="text"> <string>Ima&ge</string> </property> @@ -59,7 +59,11 @@ </widget> </item> <item row="1" column="1"> - <widget class="KColorButton" name="kcfg_BgColor"/> + <widget class="KColorButton" name="kcfg_BgColor"> + <property name="enabled"> + <bool>false</bool> + </property> + </widget> </item> </layout> </widget> @@ -80,5 +84,38 @@ </customwidget> </customwidgets> <resources/> - <connections/> + <connections> + <connection> + <sender>kcfg_RadioColor</sender> + <signal>toggled(bool)</signal> + <receiver>kcfg_BgColor</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>84</x> + <y>58</y> + </hint> + <hint type="destinationlabel"> + <x>231</x> + <y>58</y> + </hint> + </hints> + </connection> + <connection> + <sender>kcfg_RadioImage</sender> + <signal>toggled(bool)</signal> + <receiver>kcfg_BgImage</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>84</x> + <y>92</y> + </hint> + <hint type="destinationlabel"> + <x>231</x> + <y>92</y> + </hint> + </hints> + </connection> + </connections> </ui> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/klickety-15.12.2/gamescene.cpp new/klickety-15.12.3/gamescene.cpp --- old/klickety-15.12.2/gamescene.cpp 2016-02-08 16:01:21.000000000 +0100 +++ new/klickety-15.12.3/gamescene.cpp 2016-02-28 12:59:10.000000000 +0100 @@ -687,49 +687,38 @@ void GameScene::drawBackground( QPainter* painter, const QRectF& rect ) { - switch ( m_backgroundType ) { - case Settings::EnumBgType::theme: { - // NOTE: the following is a workaround for https://bugs.kde.org/show_bug.cgi?id=243573 - // cache the background pixmap locally in order to reduce the spritePixmap traffic when resizing - static QByteArray theme_pre( m_renderer.theme()->identifier() ); - static QSize size_pre( rect.toRect().size() ); - static QPixmap pix( m_renderer.spritePixmap( QStringLiteral( "BACKGROUND" ), size_pre ) ); - QSize size_offset = size_pre - rect.toRect().size(); - if ( size_offset.width() < -100 || size_offset.height() < -100 || theme_pre != m_renderer.theme()->identifier() ) { - qWarning() << "export"; - theme_pre = m_renderer.theme()->identifier(); - size_pre = rect.toRect().size(); - pix = m_renderer.spritePixmap( QStringLiteral( "BACKGROUND" ), size_pre ); - painter->drawPixmap( rect.topLeft(), pix ); - } - else { - painter->drawPixmap( rect.topLeft(), pix.scaled( rect.toRect().size() ) ); - } - break; + if ( Settings::radioTheme() == true ) { + // NOTE: the following is a workaround for https://bugs.kde.org/show_bug.cgi?id=243573 + // cache the background pixmap locally in order to reduce the spritePixmap traffic when resizing + static QByteArray theme_pre( m_renderer.theme()->identifier() ); + static QSize size_pre( rect.toRect().size() ); + static QPixmap pix( m_renderer.spritePixmap( QStringLiteral( "BACKGROUND" ), size_pre ) ); + QSize size_offset = size_pre - rect.toRect().size(); + if ( size_offset.width() < -100 || size_offset.height() < -100 || theme_pre != m_renderer.theme()->identifier() ) { + qWarning() << "export"; + theme_pre = m_renderer.theme()->identifier(); + size_pre = rect.toRect().size(); + pix = m_renderer.spritePixmap( QStringLiteral( "BACKGROUND" ), size_pre ); + painter->drawPixmap( rect.topLeft(), pix ); } - case 3: // the color button - case Settings::EnumBgType::color: { - painter->fillRect( rect, Settings::bgColor() ); - break; + else { + painter->drawPixmap( rect.topLeft(), pix.scaled( rect.toRect().size() ) ); } - case 4: // the image url requester - case Settings::EnumBgType::image: { - // cache the background image locally in order to reduce the file opening traffic when resizing - static QString img_filepath( Settings::bgImage().path() ); - static QImage img( img_filepath ); - if ( img_filepath != Settings::bgImage().path() ) { - img_filepath = Settings::bgImage().path(); - img = QImage( img_filepath ); - } - if ( !img.isNull() ) - painter->drawImage( rect, img ); - else - qWarning() << "Null background image " << Settings::bgImage(); - break; - } - default: { - // Unexpected background type, no action - break; + } + if ( Settings::radioColor() == true ) { + painter->fillRect( rect, Settings::bgColor() ); + } + if ( Settings::radioImage() == true ) { + // cache the background image locally in order to reduce the file opening traffic when resizing + static QString img_filepath( Settings::bgImage().path() ); + static QImage img( img_filepath ); + if ( img_filepath != Settings::bgImage().path() ) { + img_filepath = Settings::bgImage().path(); + img = QImage( img_filepath ); } + if ( !img.isNull() ) + painter->drawImage( rect, img ); + else + qWarning() << "Null background image " << Settings::bgImage(); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/klickety-15.12.2/klickety.kcfg new/klickety-15.12.3/klickety.kcfg --- old/klickety-15.12.2/klickety.kcfg 2016-02-08 16:01:21.000000000 +0100 +++ new/klickety-15.12.3/klickety.kcfg 2016-02-28 12:59:10.000000000 +0100 @@ -20,15 +20,15 @@ </entry> </group> <group name="Background"> - <entry name="BgType" type="Enum" key="Background Type"> - <label>The background type to be used.</label> - <choices> - <choice name="theme"/> - <choice name="color"/> - <choice name="image"/> - </choices> - <default>theme</default> - </entry> + <entry name="RadioTheme" type="Bool"> + <default>true</default> + </entry> + <entry name="RadioColor" type="Bool"> + <default>false</default> + </entry> + <entry name="RadioImage" type="Bool"> + <default>false</default> + </entry> <entry name="BgColor" type="Color" key="Background Color"> <label>The background color to be used.</label> <default>#000000</default> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/klickety-15.12.2/klickety.notifyrc new/klickety-15.12.3/klickety.notifyrc --- old/klickety-15.12.2/klickety.notifyrc 2016-02-08 16:01:21.000000000 +0100 +++ new/klickety-15.12.3/klickety.notifyrc 2016-02-28 12:59:10.000000000 +0100 @@ -138,10 +138,10 @@ Comment[sk]=Zvuky hrajúce počas hry Comment[sl]=Zvoki, ki so predvajani med igro Comment[sq]=Zërat që shfaqen gjatë lojës -Comment[sr]=Звуци који се оглашавају током игре -Comment[sr@ijekavian]=Звуци који се оглашавају током игре -Comment[sr@ijekavianlatin]=Zvuci koji se oglašavaju tokom igre -Comment[sr@latin]=Zvuci koji se oglašavaju tokom igre +Comment[sr]=Звукови који се оглашавају током игре +Comment[sr@ijekavian]=Звукови који се оглашавају током игре +Comment[sr@ijekavianlatin]=Zvukovi koji se oglašavaju tokom igre +Comment[sr@latin]=Zvukovi koji se oglašavaju tokom igre Comment[sv]=Ljud som hörs under spelet Comment[tr]=Oyun esnasında çıkan sesler Comment[uk]=Звуки, що відтворюватимуться під час гри diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/klickety-15.12.2/mainwindow.cpp new/klickety-15.12.3/mainwindow.cpp --- old/klickety-15.12.2/mainwindow.cpp 2016-02-08 16:01:21.000000000 +0100 +++ new/klickety-15.12.3/mainwindow.cpp 2016-02-28 12:59:10.000000000 +0100 @@ -121,7 +121,14 @@ m_scene->setShowBoundLines( Settings::showBoundLines() ); m_scene->setEnableAnimation( Settings::enableAnimation() ); m_scene->setEnableHighlight( Settings::enableHighlight() ); - m_scene->setBackgroundType( Settings::bgType() ); + + int bgType = 0; // Theme Radio Button + if ( Settings::radioColor() == true ) { + bgType = 1; + } else if ( Settings::radioImage() == true ) { + bgType = 2; + } + m_scene->setBackgroundType( bgType ); } void MainWindow::newGame( int gameId )
