Git commit 2128820355ecf3758b9006c036dc1886bdc3e261 by Wolfgang Rohdewald. Committed on 24/02/2014 at 22:51. Pushed by wrohdewald into branch 'master'.
more krazy2 related fixes M +5 -3 cmake-modules/FindTwisted.py M +9 -9 doc/index.docbook M +19 -1 setup.py M +1 -1 src/client.py M +1 -1 src/genericdelegates.py M +20 -3 src/qt4reactor.py M +18 -1 src/winprep.py http://commits.kde.org/kajongg/2128820355ecf3758b9006c036dc1886bdc3e261 diff --git a/cmake-modules/FindTwisted.py b/cmake-modules/FindTwisted.py index 0e46bcb..42af760 100644 --- a/cmake-modules/FindTwisted.py +++ b/cmake-modules/FindTwisted.py @@ -1,6 +1,8 @@ -# Copyright (c) 2010 Wolfgang Rohdewald <wolfgang at rohdewald.de> -# Redistribution and use is allowed according to the terms of the BSD license. -# For details see the accompanying COPYING-CMAKE-SCRIPTS file. +""" +Copyright (c) 2010 Wolfgang Rohdewald <wolfgang at rohdewald.de> +Redistribution and use is allowed according to the terms of the BSD license. +For details see the accompanying COPYING-CMAKE-SCRIPTS file. +""" try: from twisted.spread import pb diff --git a/doc/index.docbook b/doc/index.docbook index c5665eb..af3bb57 100644 --- a/doc/index.docbook +++ b/doc/index.docbook @@ -423,7 +423,7 @@ <guimenu>Game</guimenu> <guimenuitem>Quit &kajongg;</guimenuitem> </menuchoice></term> - <listitem><para><action>Quits</action> &kappname;.</para></listitem> + <listitem><para><action>Quits</action> &kajongg;.</para></listitem> </varlistentry> <varlistentry id="view-scoring"> @@ -554,7 +554,7 @@ </variablelist> <para> -Additionally &kappname; has the common &kde; <guimenu>Settings</guimenu> and <guimenu>Help</guimenu> +Additionally &kajongg; 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. @@ -577,7 +577,7 @@ of the &kde; Fundamentals. </mediaobject> </screenshot> -<para>The menu entry <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure &kappname;...</guimenuitem></menuchoice> opens the <guilabel>Configure - &kappname;</guilabel> dialog.</para> +<para>The menu entry <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure &kajongg;...</guimenuitem></menuchoice> opens the <guilabel>Configure - &kajongg;</guilabel> dialog.</para> <para>If you press the <guibutton>Cancel</guibutton> button here, all of your configuration changes will be reverted, including everything you did with the ruleset editor.</para> <para> You can also select the different tabs with the keyboard: <keycombo action="simul">&Ctrl;<keycap>1</keycap></keycombo> selects @@ -664,22 +664,22 @@ of the &kde; Fundamentals. </para> <para> </para><itemizedlist><listitem><para> - This is how you can generate voices yourself. There is a separate directory for every voice. There are two groups of voices + This is how you can generate voices yourself. There is a separate folder for every voice. There are two groups of voices with different places in the file system: <itemizedlist><listitem><para> - Predefined voices for every language. They live in a directory like <filename class="directory">/usr/share/kde4/apps/kajongg/voices/LANG</filename> where + Predefined voices for every language. They live in a folder like <filename class="directory">/usr/share/kde4/apps/kajongg/voices/LANG</filename> where LANG is the code for your language. The voice directories directly under <filename class="directory">.../kajongg/voices/</filename> are the US-english versions. Predefined voices are randomly assigned to players. Those voices have names like <literal>"male1 male2 female1 female2"</literal> but those names do not matter, the user will never see them. Also, it makes no sense to define more than four predefined voices per language. </para></listitem><listitem><para> User voices can be defined for a specific user. If &kajongg; makes use of such a voice, it can automatically be transferred to other players over the internet. - Those voices live in a directory like <filename class="directory">~/.kde/share/apps/kajongg/voices/</filename>. + Those voices live in a folder like <filename class="directory">~/.kde/share/apps/kajongg/voices/</filename>. So if your login name is joe, this might be <filename class="directory">/home/joe/.kde/share/apps/kajongg/voices/joe/</filename>. - The directory <filename class="directory">voices/</filename> might not yet exist - if so, create it. + The folder <filename class="directory">voices/</filename> might not yet exist - if so, create it. </para></listitem></itemizedlist> </para></listitem><listitem><para> - Now that you know where to place your new voice, generate a new directory for it. + Now that you know where to place your new voice, generate a new folder for it. </para></listitem><listitem><para> In that subfolder, you can place the sound files. They have to be encoded with the <ulink url="http://xiph.org/vorbis/";>Ogg Vorbis</ulink> audio compressor, the file names need to have the extension <filename class="extension">.ogg</filename>. @@ -688,7 +688,7 @@ of the &kde; Fundamentals. to other voices or languages only works for entire voices, not for single sound files. </para></listitem><listitem><para> After having defined all sound files for a predefined voice, please make sure that the &kajongg; process has write permission in - the new voice directory. Start &kajongg; and test the voice. After everything is OK, you can revoke write permission (and you should + the new voice folder. Start &kajongg; and test the voice. After everything is OK, you can revoke write permission (and you should do so for predefined voices). &kajongg; will automatically generate a file named <filename>md5sum</filename> containing a checksum over all sound files. Whenever you change, add or delete a sound file for a voice, &kajongg; will try to rewrite that file. </para></listitem></itemizedlist> diff --git a/setup.py b/setup.py index 062c441..70f287b 100755 --- a/setup.py +++ b/setup.py @@ -1,7 +1,25 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -"""Start this in the installation directory of kajongg: That +""" +Copyright (C) 2008-2014 Wolfgang Rohdewald <wolfgang at rohdewald.de> + +kajongg 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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + +Start this in the installation directory of kajongg: That is where this program resides. Below you find a code block that might have to be adapted. """ diff --git a/src/client.py b/src/client.py index 5dbf2cd..753b75a 100644 --- a/src/client.py +++ b/src/client.py @@ -353,7 +353,7 @@ class Client(object, pb.Referenceable): return self.exec_move(move).addCallback(self.__jellyMessage) def exec_move(self, move): - """mirror the move of a player as told by the the game server""" + """mirror the move of a player as told by the game server""" message = move.message if message.needsGame and not self.game: # server already disconnected, see HumanClient.remote_ServerDisconnects diff --git a/src/genericdelegates.py b/src/genericdelegates.py index c4b48b1..082d0fc 100644 --- a/src/genericdelegates.py +++ b/src/genericdelegates.py @@ -1,5 +1,5 @@ """ -Copyright (c) 2007-2008 Qtrac Ltd. All rights reserved. +Copyright (c) 2007-2008 Qtrac Ltd <mark at qtrac.eu> Copyright (C) 2008-2014 Wolfgang Rohdewald <wolfgang at rohdewald.de> This program or module is free software: you can redistribute it and/or diff --git a/src/qt4reactor.py b/src/qt4reactor.py index 17e7e3a..6260464 100644 --- a/src/qt4reactor.py +++ b/src/qt4reactor.py @@ -1,9 +1,26 @@ -# Copyright (c) 2001-2011 Twisted Matrix Laboratories <twisted-python at twistedmatrix.com> -# See LICENSE for details. - +# -*- coding: utf-8 -*- # pylint: skip-file """ +Copyright (c) 2001-2011 Twisted Matrix Laboratories <twisted-python at twistedmatrix.com> +Copyright (C) 2008-2014 Wolfgang Rohdewald <wolfgang at rohdewald.de> + +kajongg 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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +""" + +""" This module provides support for Twisted to be driven by the Qt mainloop. In order to use this support, simply do the following:: diff --git a/src/winprep.py b/src/winprep.py index 72152a5..5363864 100755 --- a/src/winprep.py +++ b/src/winprep.py @@ -1,7 +1,24 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -"""Start this in the installation directory of kajongg: That +""" +Copyright (C) 2008-2014 Wolfgang Rohdewald <wolfgang at rohdewald.de> + +kajongg 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, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +Start this in the installation directory of kajongg: That is where this program resides. Below you find a code block that might have to be adapted. """
