Hello community, here is the log from the commit of package kiriki for openSUSE:Factory checked in at 2013-07-08 07:29:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kiriki (Old) and /work/SRC/openSUSE:Factory/.kiriki.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kiriki" Changes: -------- --- /work/SRC/openSUSE:Factory/kiriki/kiriki.changes 2013-06-11 09:32:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kiriki.new/kiriki.changes 2013-07-08 07:29:33.000000000 +0200 @@ -1,0 +2,14 @@ +Thu Jun 27 18:48:04 UTC 2013 - [email protected] + +- 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:49:49 UTC 2013 - [email protected] + +- Update to 4.10.80 + * KDE 4.11 Beta 1 release + * See http://www.kde.org/announcements/announce-4.11-beta1.php + +------------------------------------------------------------------- Old: ---- kiriki-4.10.4.tar.xz New: ---- kiriki-4.10.90.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiriki.spec ++++++ --- /var/tmp/diff_new_pack.sMogOy/_old 2013-07-08 07:29:34.000000000 +0200 +++ /var/tmp/diff_new_pack.sMogOy/_new 2013-07-08 07:29:34.000000000 +0200 @@ -23,7 +23,7 @@ License: GPL-2.0+ Group: Amusements/Games/Board/Other Url: http://www.kde.org -Version: 4.10.4 +Version: 4.10.90 Release: 0 Source0: kiriki-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ kiriki-4.10.4.tar.xz -> kiriki-4.10.90.tar.xz ++++++ Files old/kiriki-4.10.4/doc/index.cache.bz2 and new/kiriki-4.10.90/doc/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiriki-4.10.4/doc/index.docbook new/kiriki-4.10.90/doc/index.docbook --- old/kiriki-4.10.4/doc/index.docbook 2013-05-28 21:37:18.000000000 +0200 +++ new/kiriki-4.10.90/doc/index.docbook 2013-06-10 20:54:42.000000000 +0200 @@ -28,8 +28,8 @@ <holder>&Albert.Astals.Cid;</holder> </copyright> <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-06</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.--> <!--Short description of this document. Do not change unless necessary!--> <abstract> @@ -118,8 +118,9 @@ </chapter> <chapter id="interface"><title>Interface Overview</title> <!-- do not change this! --> -<sect1 id="game-menu"> - <title>The Game Menu</title> +<sect1 id="menu"> +<title>Menu Items</title> + <variablelist> <varlistentry id="game-menu-new"> <term><menuchoice> @@ -155,30 +156,31 @@ </menuchoice></term> <listitem><para><action>Quits</action> &kiriki;.</para></listitem> </varlistentry> - </variablelist> -</sect1> -<sect1 id="settings-menu"> - <title>The Settings Menu</title> - <variablelist> - <varlistentry id="settings-menu-shortcuts"> + <varlistentry> <term><menuchoice> - <guimenu>Settings</guimenu> - <guimenuitem>Configure Shortcuts...</guimenuitem> + <shortcut><keycap>H</keycap></shortcut> + <guimenu>Move</guimenu> + <guimenuitem>Hint</guimenuitem> </menuchoice></term> - <listitem><para><action>Displays a standard &kde; shortcut configuration dialog</action> to change the keyboard shortcuts for &kiriki;.</para></listitem> + <listitem><para>Give a hint by highlighting one or more dices to roll or a row on the score board. Using this feature the score will not be considered as a high score.</para></listitem> </varlistentry> - <varlistentry id="settings-menu-settings"> + <varlistentry> <term><menuchoice> - <guimenu>Settings</guimenu> - <guimenuitem>Configure &kiriki;...</guimenuitem> + <shortcut><keycap>D</keycap></shortcut> + <guimenu>Move</guimenu> + <guimenuitem>Demo</guimenuitem> </menuchoice></term> - <listitem><para><action>Opens a dialog to configure &kiriki;.</action>See <link linkend="configuration">Game Configuration</link> section for details.</para></listitem> + <listitem><para>Play a demo game. To stop the demo mode start a new game.</para></listitem> </varlistentry> + </variablelist> -</sect1> -<sect1 id="help"><!--This is a standard Help menubar entry. Only change if needed.--> -<title>The Help Menu</title> -&help.menu.documentation; +<para> +Additionally &kappname; 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> </chapter> @@ -221,8 +223,11 @@ <note><title>Note:</title><para>The number of players cannot be less than two.</para></note> <para><guilabel>1.</guilabel>-<guilabel>6.</guilabel> Numbered fields are the identities of the participating players. You can change their names as well as specify whether they will be human controlled, or driven by the Artificial Intelligence. To define who controls the player use a check box located on the right hand side, right next to the name entry box.</para> <note><title>Note:</title><para>The first player must always be human controlled.</para></note> +<para>Changes to number of participants and their identities will be applied on the next game.</para> <para><guilabel>Delay between computers move (msec):</guilabel> lets you specify the delay between Artificial Intelligence's turns. The value of this field is zero by default, meaning that the Artificial Intelligence reacts instantaneously.</para> <note><title>Note:</title><para>The maximum value for this field is 999 milliseconds.</para></note> +<para>Use <guilabel>Font Size</guilabel> and <guilabel>Row Height</guilabel> to adjust the score board to your liking.</para> +<para>If you want to play immediately at &kiriki; startup disable the default option <guilabel>Show demonstration game at startup</guilabel>.</para> </chapter> <chapter id="credits"><title>Credits and License</title> <!-- do not change this! --> @@ -234,6 +239,12 @@ <para> Program copyright 2005-2007 &Albert.Astals.Cid; &Albert.Astals.Cid.mail; </para> +<para> +Documentation copyright 2005 &Albert.Astals.Cid; &Albert.Astals.Cid.mail; +</para> +<para> +Documentation copyright 2007 Eugene Trounev <email>[email protected]</email> +</para> <!-- TRANS:CREDIT_FOR_TRANSLATORS --> &underFDL; &underGPL; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiriki-4.10.4/src/CMakeLists.txt new/kiriki-4.10.90/src/CMakeLists.txt --- old/kiriki-4.10.4/src/CMakeLists.txt 2013-05-28 21:37:18.000000000 +0200 +++ new/kiriki-4.10.90/src/CMakeLists.txt 2013-06-10 20:54:42.000000000 +0200 @@ -11,6 +11,7 @@ computer.cpp configwidget.cpp row.cpp + itemdelegate.cpp ) kde4_add_ui_files(kiriki_SRCS configPage.ui) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiriki-4.10.4/src/configPage.ui new/kiriki-4.10.90/src/configPage.ui --- old/kiriki-4.10.4/src/configPage.ui 2013-05-28 21:37:18.000000000 +0200 +++ new/kiriki-4.10.90/src/configPage.ui 2013-06-10 20:54:42.000000000 +0200 @@ -229,6 +229,27 @@ </layout> </item> <item> + <layout class="QHBoxLayout" name="horizontalLayout_2"> + <item> + <widget class="QLabel" name="label_4"> + <property name="text"> + <string>Row Height:</string> + </property> + </widget> + </item> + <item> + <widget class="KIntSpinBox" name="kcfg_rowHeight"> + <property name="minimumSize"> + <size> + <width>324</width> + <height>0</height> + </size> + </property> + </widget> + </item> + </layout> + </item> + <item> <widget class="QCheckBox" name="kcfg_startupDemoEnabled"> <property name="text"> <string>Show demonstration game at startup</string> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiriki-4.10.4/src/configwidget.cpp new/kiriki-4.10.90/src/configwidget.cpp --- old/kiriki-4.10.4/src/configwidget.cpp 2013-05-28 21:37:18.000000000 +0200 +++ new/kiriki-4.10.90/src/configwidget.cpp 2013-06-10 20:54:42.000000000 +0200 @@ -16,6 +16,7 @@ setupUi(this); KAcceleratorManager::setNoAccel(this); connect(kcfg_numberOfPlayers, SIGNAL(valueChanged(int)), this, SLOT(numberOfPlayersChanged(int))); + connect(kcfg_fontSize, SIGNAL(valueChanged(int)), this, SLOT(minimumRowHeightChanged(int))); } void configWidget::numberOfPlayersChanged(int numberOfPlayers) @@ -50,5 +51,10 @@ } } +void configWidget::minimumRowHeightChanged(int height) +{ + kcfg_rowHeight -> setMinimum(height); +} + #include "configwidget.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiriki-4.10.4/src/configwidget.h new/kiriki-4.10.90/src/configwidget.h --- old/kiriki-4.10.4/src/configwidget.h 2013-05-28 21:37:18.000000000 +0200 +++ new/kiriki-4.10.90/src/configwidget.h 2013-06-10 20:54:42.000000000 +0200 @@ -22,6 +22,7 @@ private slots: void numberOfPlayersChanged(int numberOfPlayers); + void minimumRowHeightChanged(int height); }; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiriki-4.10.4/src/itemdelegate.cpp new/kiriki-4.10.90/src/itemdelegate.cpp --- old/kiriki-4.10.4/src/itemdelegate.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/kiriki-4.10.90/src/itemdelegate.cpp 2013-06-10 20:54:42.000000000 +0200 @@ -0,0 +1,42 @@ +/*************************************************************************** + * Copyright (C) 2013 by Ian Simpson <[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. * + ***************************************************************************/ + +#include "itemdelegate.h" + +itemDelegate::itemDelegate(int height, QObject *parent) : + QItemDelegate(parent), + m_height(height), + m_grandTotalRow(19) +{ + m_emptyRows << 9 << 18; +} + +QSize itemDelegate::sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const +{ + if (index.row() == 0 || index.row() == m_grandTotalRow || m_emptyRows.contains(index.row())) + { + return QItemDelegate::sizeHint(option, index); + } + else + { + // Set the height to that of the font set at pointSize m_height + QSize size; + QFont font(index.data(Qt::FontRole).value<QFont>()); + font.setPointSize(m_height); + QFontMetrics fm(font); + size.setHeight(fm.height()); + size.setWidth(QItemDelegate::sizeHint(option, index).width()); + return size; + } +} + +void itemDelegate::setHeight(int height) +{ + m_height = height; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiriki-4.10.4/src/itemdelegate.h new/kiriki-4.10.90/src/itemdelegate.h --- old/kiriki-4.10.4/src/itemdelegate.h 1970-01-01 01:00:00.000000000 +0100 +++ new/kiriki-4.10.90/src/itemdelegate.h 2013-06-10 20:54:42.000000000 +0200 @@ -0,0 +1,31 @@ +/*************************************************************************** + * Copyright (C) 2013 by Ian Simpson <[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. * + ***************************************************************************/ + +#ifndef ITEMDELEGATE_H +#define ITEMDELEGATE_H + +#include <QItemDelegate> + +class itemDelegate : public QItemDelegate +{ +Q_OBJECT + public: + itemDelegate(int height, QObject *parent = 0); + QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const; + + void setHeight(int height); + + private: + QVector<int> m_emptyRows; + + int m_height; + const int m_grandTotalRow; +}; + +#endif // ITEMDELEGATE_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiriki-4.10.4/src/kiriki.cpp new/kiriki-4.10.90/src/kiriki.cpp --- old/kiriki-4.10.4/src/kiriki.cpp 2013-05-28 21:37:18.000000000 +0200 +++ new/kiriki-4.10.90/src/kiriki.cpp 2013-06-10 20:54:42.000000000 +0200 @@ -42,6 +42,7 @@ #include "lateralwidget.h" #include "scores.h" #include "settings.h" +#include "itemdelegate.h" kiriki::kiriki() : KXmlGuiWindow(), m_hintGiven(false) { @@ -55,7 +56,14 @@ m_delegateHighlighted = new QStyledItemDelegate(m_scoresWidget); - m_scoresWidget -> setItemDelegate(new QItemDelegate(m_scoresWidget)); + if (kirikiSettings::fontSize() > kirikiSettings::rowHeight()) + { + kirikiSettings::setRowHeight(kirikiSettings::fontSize()); + } + + m_itemDelegate = new itemDelegate(kirikiSettings::rowHeight(), m_scoresWidget); + + m_scoresWidget -> setItemDelegate(m_itemDelegate); m_scoresWidget -> setSelectionBehavior(QAbstractItemView::SelectRows); m_scoresWidget -> setRootIsDecorated(false); m_scoresWidget -> header() -> setResizeMode(QHeaderView::Stretch); @@ -253,6 +261,13 @@ m_scores->askForRedraw(); m_fontSize = kirikiSettings::fontSize(); } + + if (m_rowHeight != kirikiSettings::rowHeight()) + { + m_rowHeight = kirikiSettings::rowHeight(); + m_itemDelegate -> setHeight(m_rowHeight); + m_scores -> askForRedraw(); + } } void kiriki::endGame() @@ -306,6 +321,7 @@ bool player5IsHuman = kirikiSettings::player5IsHuman(); bool player6IsHuman = kirikiSettings::player6IsHuman(); m_fontSize = kirikiSettings::fontSize(); + m_rowHeight = kirikiSettings::rowHeight(); KConfigDialog *configDialog = new KConfigDialog(this, "settings", kirikiSettings::self()); configDialog->setFaceType(KConfigDialog::Plain); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiriki-4.10.4/src/kiriki.desktop new/kiriki-4.10.90/src/kiriki.desktop --- old/kiriki-4.10.4/src/kiriki.desktop 2013-05-28 21:37:18.000000000 +0200 +++ new/kiriki-4.10.90/src/kiriki.desktop 2013-06-10 20:54:42.000000000 +0200 @@ -56,7 +56,7 @@ Name[zh_TW]=Kiriki Icon=kiriki Type=Application -Exec=kiriki -caption "%c" +Exec=kiriki -caption %c X-DocPath=kiriki/index.html GenericName=Yahtzee-like Dice Game GenericName[ast]=Xuegu de daos asemeyáu al Yahtzee diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiriki-4.10.4/src/kiriki.h new/kiriki-4.10.90/src/kiriki.h --- old/kiriki-4.10.4/src/kiriki.h 2013-05-28 21:37:18.000000000 +0200 +++ new/kiriki-4.10.90/src/kiriki.h 2013-06-10 20:54:42.000000000 +0200 @@ -21,6 +21,7 @@ class lateralWidget; class scores; +class itemDelegate; class kiriki : public KXmlGuiWindow { @@ -57,6 +58,8 @@ bool m_hintGiven; KAction* m_hintAction; int m_fontSize; + itemDelegate *m_itemDelegate; + int m_rowHeight; }; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiriki-4.10.4/src/kiriki.kcfg new/kiriki-4.10.90/src/kiriki.kcfg --- old/kiriki-4.10.4/src/kiriki.kcfg 2013-05-28 21:37:18.000000000 +0200 +++ new/kiriki-4.10.90/src/kiriki.kcfg 2013-06-10 20:54:42.000000000 +0200 @@ -29,6 +29,10 @@ </code> <default code="true">defaultSize</default> </entry> + <entry key="rowHeight" type="Int"> + <max>20</max> + <default code="true">defaultSize</default> + </entry> <entry key="player1Name" type="String" > <code> QString playerName1 = i18nc("default name of first player", "Albert"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiriki-4.10.4/src/main.cpp new/kiriki-4.10.90/src/main.cpp --- old/kiriki-4.10.4/src/main.cpp 2013-05-28 21:37:18.000000000 +0200 +++ new/kiriki-4.10.90/src/main.cpp 2013-06-10 20:54:42.000000000 +0200 @@ -16,7 +16,7 @@ int main(int argc, char *argv[]) { - KAboutData about("kiriki", 0, ki18n("Kiriki"), "0.2", ki18n("A Yahtzee dice game for KDE"), KAboutData::License_GPL, ki18n("© 2005-2007 Albert Astals Cid"), KLocalizedString(), "http://games.kde.org/kiriki"; ); + KAboutData about("kiriki", 0, ki18n("Kiriki"), "0.2.1", ki18n("A Yahtzee dice game for KDE"), KAboutData::License_GPL, ki18n("© 2005-2007 Albert Astals Cid"), KLocalizedString(), "http://games.kde.org/kiriki"; ); about.addAuthor(ki18n("Albert Astals Cid"), KLocalizedString(), "[email protected]"); KCmdLineArgs::init(argc, argv, &about); KApplication app; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
