Git commit 52adbff59c3605429057ee21d088b1c004fee6ce by Ashwin Rajeev. Committed on 21/03/2013 at 08:47. Pushed by rajeev into branch 'master'.
Update docbook and change version of knetwalkui.rc Add entry playsounds in index.docbook Increment version number of knetwalkui.rc M +11 -9 doc/index.docbook M +3 -3 src/fielditem.cpp M +1 -1 src/knetwalkui.rc M +2 -2 src/mainwindow.cpp http://commits.kde.org/knetwalk/52adbff59c3605429057ee21d088b1c004fee6ce diff --git a/doc/index.docbook b/doc/index.docbook index 867ed4b..b264e43 100644 --- a/doc/index.docbook +++ b/doc/index.docbook @@ -32,7 +32,7 @@ <legalnotice>&FDLNotice;</legalnotice> <date>2007-11-13</date> -<releaseinfo>3.0.0</releaseinfo> +<releaseinfo>3.0.1</releaseinfo> <abstract> <para> @@ -219,6 +219,16 @@ Toggles on and off the display of the statusbar. <varlistentry> <term><menuchoice> <guimenu>Settings</guimenu> +<guimenuitem>Play Sounds...</guimenuitem> +</menuchoice></term> +<listitem><para> + <action>If checked, &knetwalk; game sounds are played.</action> +</para></listitem> +</varlistentry> + +<varlistentry> +<term><menuchoice> +<guimenu>Settings</guimenu> <guimenuitem>Configure Shortcuts...</guimenuitem> </menuchoice></term> <listitem><para> @@ -234,14 +244,6 @@ Toggles on and off the display of the statusbar. <listitem><para>Displays a &kde; standard dialog where you can configure the toolbar icons.</para></listitem> </varlistentry> -<varlistentry> -<term><menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure -Notifications...</guimenuitem></menuchoice></term> -<listitem><para>This item displays a standard &kde; notifications configuration -dialog, where you can change the notifications (sounds, visible messages, -&etc;) used by &knetwalk;.</para></listitem> -</varlistentry> - </variablelist> </sect1> diff --git a/src/fielditem.cpp b/src/fielditem.cpp index 8ddaa1a..3a4dcf1 100644 --- a/src/fielditem.cpp +++ b/src/fielditem.cpp @@ -30,9 +30,9 @@ FieldItem::FieldItem() { setAcceptHoverEvents(true); - m_soundTurn = new KgSound(KStandardDirs::locate("appdata", "sounds/turn.wav")); - m_soundClick = new KgSound(KStandardDirs::locate("appdata", "sounds/click.wav")); - m_soundConnect = new KgSound(KStandardDirs::locate("appdata", "sounds/connect.wav")); + m_soundTurn = new KgSound(KStandardDirs::locate("appdata", "sounds/turn.wav"), this); + m_soundClick = new KgSound(KStandardDirs::locate("appdata", "sounds/click.wav"), this); + m_soundConnect = new KgSound(KStandardDirs::locate("appdata", "sounds/connect.wav"), this); } void FieldItem::resize(const QSizeF& size) diff --git a/src/knetwalkui.rc b/src/knetwalkui.rc index ad33d95..e5c8063 100644 --- a/src/knetwalkui.rc +++ b/src/knetwalkui.rc @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <gui name="knetwalk" - version="1" + version="2" xmlns="http://www.kde.org/standards/kxmlgui/1.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://www.kde.org/standards/kxmlgui/1.0 diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 14d21ac..7c1e47f 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -90,8 +90,8 @@ MainWindow::MainWindow(QWidget *parent) m_gameClock = new KGameClock(this, KGameClock::MinSecOnly); connect(m_gameClock, SIGNAL(timeChanged(QString)), SLOT(updateStatusBar())); - m_soundStart = new KgSound(KStandardDirs::locate("appdata", "sounds/start.wav")); - m_soundWin = new KgSound(KStandardDirs::locate("appdata", "sounds/win.wav")); + m_soundStart = new KgSound(KStandardDirs::locate("appdata", "sounds/start.wav"), this); + m_soundWin = new KgSound(KStandardDirs::locate("appdata", "sounds/win.wav"), this); startNewGame(); }
