source: diffs/smtube_1.7.diff@ 149

diff -Naur -x .svn vendor\current/build_os2.cmd trunk/build_os2.cmd
--- vendor\current/build_os2.cmd        1970-01-01 01:00:00.000000000 +0100
+++ trunk/build_os2.cmd 2013-06-05 16:22:26.000000000 +0200
@@ -0,0 +1,272 @@
+/* SMTube Build Script */
+/* root done by Herwig Bauernfeind, enhanced by Silvan Scherrer */
+
+/* version history */
+/* version 0.1.0 from 23.05.2013 Silvan (first edition) */
+/* version 0.1.1 from 05.06.2013 Silvan renamed readme files (happy birthday Justin) */
+
+/* init the version string (don't forget to change) */
+version = "0.1.1"
+version_date = "05.06.2013"
+'@echo off'
+
+parse arg command option
+parse source . . scriptFile
+
+/* init the required vars */
+qRC = 0
+mRC = 0
+buildDir    = strip(directory(),'T','\') /* Make sure we have no trailing backslash */
+sourceDir = FixDir(filespec('D', scriptFile) || filespec('P', scriptFile))
+os2Dir     = sourceDir || '\os2'
+srcDir     = sourceDir || '\src'
+installDir = buildDir || '\install'
+installDirT= installDir || '\translations'
+qErrorFile = buildDir||'\qmake.err'
+qOutFile   = buildDir||'\qmake.out'
+mErrorFile = buildDir||'\make.err'
+mOutFile   = buildDir||'\make.out'
+
+/* get the SMTube version */
+SMTube_version = '0.0.0'
+call version
+internal_build = translate(SMTube_version, '_', '.')
+
+title = "SMTube for eCS (OS/2) build script v" || version || " from " || version_date
+say title
+say
+say "Build directory:" buildDir
+say "Source directory:" sourceDir
+say
+say "SMTube version:" SMTube_version
+say
+
+/* translate command to all upercase */
+command = translate(command)
+
+if command = "" then signal help
+
+if command = "INSTALL" then do
+    SMTube_build = option
+    select
+       when SMTube_build \== "" then do
+         zipFile = installDir || '\SMTube-' || internal_build || '-' || SMTube_build || '.zip'
+       end
+       otherwise do
+         signal help
+       end
+    end 
+end
+
+/* now we translate also the options */
+option = translate(option)
+
+if sourceDir \== buildDir then do
+    say "Shadow build in progress ..."
+    say
+end
+
+select
+    when command = "MAKE" & option = "CLEAN" then do
+        say "Executing command: "command option
+
+        say "cleaning the tree"
+        call make 'distclean'
+
+        say "please execute this script again with 'make' to build SMTube"
+
+    end
+    when command = "MAKE" then do
+        say "Executing command: "command option
+
+        say "building svn_revision"
+       ok = SysMkDir(buildDir||'\src')
+        address cmd 'sh ' sourceDir||'\get_svn_revision.sh ' sourceDir ' "eCS(OS/2) build"'
+
+        say "creating SMTube makefile"
+        call qmake
+
+        if qRC = 0 then do
+            say "building SMTube"
+           if option = "" then do
+               call make
+           end
+           else do
+               call make 'debug'
+           end
+        end
+
+    end
+
+    when command = "INSTALL" then do
+        say "Executing command: "command
+
+/* first delete everything */
+       call deleteall
+
+/* create the installDir,and the translation subdir */
+       ok = SysMkDir(installDir)
+       ok = SysMkDir(installDirT)
+
+/* copy the exe */
+       ok = SysCopyObject(buildDir||'\src\smtube.exe',installDir)
+
+/* copy the readme */
+       rm.0 = 3
+       rm.1 = 'smtube_en.txt'
+       rm.2 = 'smtube_de.txt'
+       rm.3 = 'smtube_fr.txt'
+       do i = 1 to rm.0
+       cmdtorun = 'sed "s;_VERSION_;' || SMTube_version || ';g" ' || os2Dir || '\' || rm.i || ' | sed "s;_BUILD_;' || SMTube_build || ';g" >' || installDir || '\' || rm.i
+        address cmd cmdtorun
+       end
+
+/* create the qm files from ts files */
+       ok = SysFileTree(srcDir||'\translations\*.ts', rm.,'FO')
+        do i = 1 to rm.0
+           fileName = filespec('N',rm.i)
+           fileName = left(fileName,lastpos('.', fileName)-1) || '.qm'
+            cmdtorun = 'lrelease ' || rm.i || ' -qm ' || installDir || '\translations\' || fileName
+           address cmd cmdtorun
+        end
+
+/* zip all dynamic stuff */
+       ok = directory(installDir)
+       cmdtorun = 'zip -r ' || zipFile || ' * -x *.zip'
+       address cmd cmdtorun
+        ok = directory(buildDir)
+
+/* zip all icons */
+       ok = directory(os2Dir)
+       cmdtorun = 'zip ' || zipFile || ' *.ico'
+       address cmd cmdtorun
+       ok = directory(buildDir)
+
+    end
+
+    when command = "UNINSTALL" then do
+        say "Executing command: "command
+
+       call deleteall
+       
+    end
+
+    otherwise do
+        say 'Unknown parameter "'command'" - aborting...'
+        exit 1
+    end
+end
+
+/* cleanup the mess */
+error:
+
+if qRC = 0 & mRC = 0 then do
+    ok = SysFileDelete(mOutFile)
+    ok = SysFileDelete(mErrorFile)
+    ok = SysFileDelete(qOutFile)
+    ok = SysFileDelete(qErrorFile)
+end
+else do
+    if mRC <> 0 then do
+        say "Alarm! Make errors occured! Look at "mOutFile" and "mErrorFile
+    end
+    if qRC <> 0 then do
+        say "Alarm! qMake errors occured! Look at "qOutFile" and "qErrorFile
+    end
+end
+
+exit 0
+
+qmake:
+    address cmd 'qmake ' sourceDir ' 2>'qErrorFile' 1>'qOutFile
+    qRC = RC
+    if qRC <> 0 then do
+        call beep 880, 20
+        say "Alarm! qmake RC="RC
+    end
+return
+
+make:
+    makeparm = arg(1)
+    address cmd 'make 'makeparm' 2>'mErrorFile' 1>'mOutFile
+    mRC = RC
+    if mRC <> 0 then do
+        call beep 880, 20
+        say "Alarm! make RC="RC
+    end
+return
+
+
+deleteall: /* delete installDir (including subdirs) except zip files */
+
+    say "Delete all files except *zip in " installDir
+    ok = SysFileTree(installDir||'\*', rm.,'FOS')
+    do i = 1 to rm.0
+       if translate(right(rm.i, 3)) \== 'ZIP' then do
+          ok = SysFileDelete(rm.i)
+       end
+    end
+
+    say "Delete zip file " zipFile
+    ok = SysFileDelete(zipFile)
+
+    say "Removing subdirs from " || installDir
+    ok = SysFileTree(installDir||'\*', rm.,'OS')
+    do i = 1 to rm.0
+       ok = SysRmDir(rm.i)
+    end
+
+    call SysSleep(5)
+return
+
+/**
+ *  Fixes the directory path by a) converting all slashes to back
+ *  slashes and b) ensuring that the trailing slash is present if
+ *  the directory is the root directory, and absent otherwise.
+ *
+ *  @param dir      the directory path
+ *  @param noslash
+ *      optional argument. If 1, the path returned will not have a
+ *      trailing slash anyway. Useful for concatenating it with a
+ *      file name.
+ */
+FixDir: procedure expose (Globals)
+    parse arg dir, noslash
+    noslash = (noslash = 1)
+    dir = translate(dir, '\', '/')
+    if (right(dir, 1) == '\' &,
+        (noslash | \(length(dir) == 3 & (substr(dir, 2, 1) == ':')))) then
+        dir = substr(dir, 1, length(dir) - 1)
+    return dir
+
+/**
+ *  reads the version.cpp and gets the SMTube version from there
+ */ 
+version: procedure expose SMTube_version srcDir
+
+    SMTubeVer = ' '
+    /* SMTube Version file */
+    Version = srcDir || "\version.cpp"
+
+    do until lines(Version) = 0
+        verline = linein(Version)
+        if left(Verline,15) = "#define VERSION" then do
+            parse var verline . ' '. ' ' SMTubeVer
+        end
+    end
+
+    ok = stream(Version,'c','close')
+    if SMTubeVer \== ' ' then do
+       SMTube_version = strip(SMTubeVer,,'"')
+    end
+
+    return
+
+help:
+    say "Parameters:"
+    say "    make"
+    say "    make debug"
+    say "    make clean"
+    say "    install version"
+    say "    uninstall"
+exit 255
diff -Naur -x .svn vendor\current/get_svn_revision.sh trunk/get_svn_revision.sh
--- vendor\current/get_svn_revision.sh  2012-02-24 23:23:26.000000000 +0100
+++ trunk/get_svn_revision.sh   2013-05-23 18:29:44.000000000 +0200
@@ -7,10 +7,14 @@
 test "$1" && extra="-$1"
 
 svn_revision=`LC_ALL=C svn info 2> /dev/null | grep Revision | cut -d' ' -f2`
+test $svn_revision || svn_revision=`cd "$1" && LC_ALL=C svn info 2> /dev/null | grep Revision | cut -d' ' -f2`
 test $svn_revision || svn_revision=`cd "$1" && grep revision .svn/entries 2>/dev/null | cut -d '"' -f2`
 test $svn_revision || svn_revision=`cd "$1" && sed -n -e '/^dir$/{n;p;q}' .svn/entries 2>/dev/null`
 test $svn_revision || svn_revision=0UNKNOWN
 
+if test "$2"; then
+extra="-$2"
+fi
 NEW_REVISION="#define SVN_REVISION \"SVN-r${svn_revision}${extra}\""
 OLD_REVISION=`cat src/svn_revision.h 2> /dev/null`
 
diff -Naur -x .svn vendor\current/os2/smtube_de.txt trunk/os2/smtube_de.txt
--- vendor\current/os2/smtube_de.txt    1970-01-01 01:00:00.000000000 +0100
+++ trunk/os2/smtube_de.txt     2013-05-27 16:30:32.000000000 +0200
@@ -0,0 +1,95 @@
+SMTube _VERSION_ _BUILD_ README
+
+(W) Silvan Scherrer, Mai 27, 2013
+zuletzt ge„ndert am 27.05.2013
+
+0. INHALT DIESER DATEI
+======================
+
+1. ERFORDERNISSE
+
+2. INSTALLATION
+
+3. LIZENZ, URHEBERRECHT, HAFTUNGSAUSSCHLUSS
+
+4. KONTAKT
+
+5. UNTERSTšTZUNG UND SPENDEN
+
+6. ENTWICKLUNGSGESCHICHTE
+
+
+1. ERFORDERNISSE
+================
+
+Folgende Voraussetzungen mssen installiert werden.
+
+
+1.1 SMPlayer
+------------
+
+  1. Download SMPlayer 0.8.5 oder neuer (unter http://svn.netlabs.org/qtapps
+     befinden sich weitere Informationen)
+  2. Installieren gem„ss Anleitung des SMPlayer
+
+
+2. INSTALLATION
+===============
+         
+Zur Installation von SMTube fhren Sie folgende Schritte aus:
+
+  1. Entpacken Sie das SMTube-Paket in das selbe Verzeichnis wie SMPlayer.
+  2. Mittels F11 im SMPlayer k”nnen nun YouTube Videos gesucht und abgespielt
+     werden.
+
+3. LIZENZ, URHEBERRECHT, HAFTUNGSAUSSCHLUSS
+===========================================
+
+SMTube ist (c) 2012-2013 RVM <rvm@users.sourceforge.net>.
+
+Das Urheberrecht der OS/2-Portierung ist (c) 2013 Silvan Scherrer.
+
+Dieses Programm ist freie Software; Sie k”nnen es unter den Bedingungen
+der GNU General Public License, wie in der Datei COPYING im
+Installationsverzeichnis enthalten, weiterverbreiten und/oder
+modifizieren.
+
+Der Original-Quelltext ist erh„ltlich unter:
+
+  http://smplayer.sourceforge.net
+
+Dieses Programm wird in der Hoffnung vertrieben, daá es ntzlich ist,
+aber OHNE JEDWEDE HAFTUNG und ohne implizite Garantie der
+MARKFŽHIGKEIT oder der BENUTZBARKEIT FšR EINEN BESTIMMTEN ZWECK.
+
+Einzelheiten entnehmen Sie bitte der Datei COPYING.
+
+
+4. KONTAKT
+==========
+
+Wenn Sie einen Fehler entdecken, dann erstellen Sie bitte ein Ticket unter
+http://svn.netlabs.org/qtapps
+
+Es werden nur Meldungen reproduzierbarer Fehler akzeptiert. :-)
+
+
+5. UNTERSTšTZUNG UND SPENDEN
+============================
+
+SMTube basiert auf freiwilliger, ehrenamtlicher Arbeit. Wenn Sie die weitere
+Entwicklung untersttzen m”chten, haben Sie folgende M”glichkeiten:
+
+  * Spenden ans QT4 Projekt: meht Informationen unter http://qt.netlabs.org
+    
+  * Mitarbeit am Projekt: Neben der eigentlichen Entwicklung geh”rt hierzu
+    auch die Pflege der Dokumentation und der Projekt-Web-Site sowie Hilfe fr
+    Anwender.
+
+
+6. ENTWICKLUNGSGESCHICHTE
+=========================
+
+2013-05-23
+  * erste Version
+
diff -Naur -x .svn vendor\current/os2/smtube_en.txt trunk/os2/smtube_en.txt
--- vendor\current/os2/smtube_en.txt    1970-01-01 01:00:00.000000000 +0100
+++ trunk/os2/smtube_en.txt     2013-05-27 16:30:54.000000000 +0200
@@ -0,0 +1,94 @@
+SMTube _VERSION_ _BUILD_ README
+
+(W) Silvan Scherrer, May 27, 2013
+last update May 27, 2013
+
+
+0. CONTENTS OF THIS FILE
+========================
+
+1. REQUIREMENTS
+
+2. INSTALLATION
+
+3. LICENSE, COPYRIGHT, DISCLAIMER
+
+4. CONTACT
+
+5. SUPPORT AND DONATIONS
+
+6. HISTORY
+
+
+1. REQUIREMENTS
+===============
+
+The following requirements need to be installed.
+
+
+1.1 SMPlayer
+------------
+
+  1. Download SMPlayer 0.8.5 or better (see http://svn.netlabs.org/qtapps for
+     more information)
+  2. Install the files according to the readme
+
+
+2. INSTALLATION
+===============
+       
+To install SMTube, do the following:
+
+  1. Extract the SMTube package into the same directory as SMPlayer is.
+  2. With F11 in SMPlayer you can play and search for YouTube videos
+
+
+3. LICENSE, COPYRIGHT, DISCLAIMER
+=================================
+
+SMTube is copyright (C) 2012-2012 RVM <rvm@users.sourceforge.net>.
+
+The OS/2 port is copyright (c) 2013 Silvan Scherrer.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as contained in
+the file COPYING in the installation directory.
+
+The original source code is available at:
+
+  http://smplayer.sourceforge.net
+
+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.
+
+For details, refer to the file COPYING.
+
+
+4. CONTACT
+==========
+
+If you find a bug, then add a ticket to the trac at
+http://svn.netlabs.org/qtapps
+
+Only bug reports with a reproducable bug are accepted. :-)
+
+
+5. SUPPORT AND DONATIONS
+========================
+
+SMTube is based on volunteer work. If you would like to support further
+development, you can do so in one of the following ways:
+
+  * Donate to the Qt4 project: see http://qt.netlabs.org for more information
+
+  * Contribute to the project: Besides actual development, this also includes
+    maintaining the documentation and the project web site as well as help
+    for users.
+
+
+6. HISTORY
+==========
+
+2013-05-23
+  * first version
diff -Naur -x .svn vendor\current/os2/smtube_fr.txt trunk/os2/smtube_fr.txt
--- vendor\current/os2/smtube_fr.txt    1970-01-01 01:00:00.000000000 +0100
+++ trunk/os2/smtube_fr.txt     2013-05-28 12:53:00.000000000 +0200
@@ -0,0 +1,101 @@
+SMTube _VERSION_ _BUILD_ LISEZMOI
+
+Document original....: (W) Silvan Scherrer, May 27, 2013
+DerniŠre mise …
 jour.: 2013-05-27
+Traduction fran‡aise.: Guillaume Gay <guillaume.gay@bigfoot.com>
+Version..............: 2013-05-27
+
+
+0. CONTENU DU FICHIER
+=====================
+
+1. PRREQUIS
+
+2. INSTALLATION
+
+3. LICENCE, COPYRIGHT, MENTIONS LGALES
+
+4. CONTACT
+
+5. SOUTIEN ET DONS
+
+6. HISTORIQUE DES VERSIONS
+
+
+1. PRREQUIS
+============
+
+Le produit suivant n‚cessite d'ˆtre install‚ au pr‚alable. 
+
+1.1 SMPlayer
+------------
+
+  1. T‚l‚charger SMPlayer version 0.8.5 ou ult‚rieure 
+     (voir http://svn.netlabs.org/qtapps pour plus d'information)
+  2. Installer les fichiers selon les instructions figurant dans
+     le fichier lisezmoi
+
+
+2. INSTALLATION
+===============
+       
+Pour installer SMTube :
+
+  1. Extrayez le contenu du paquetage dans le mˆme r‚pertoire
+     que celui de SMPlayer.
+  2. En appuyant sur la touche F11 dans SMPlayer, vous pouvez
+     rechercher et lire les vid‚os YouTube. 
+
+
+3. LICENCE, COPYRIGHT, MENTIONS LGALES
+=======================================
+
+SMTube est un copyright (C) 2006-2013 de RVM <rvm@users.sourceforge.net>.
+
+Le portage pour OS/2 est un copyright (C) 2013 de Silvan Scherrer.
+
+Ce programme est un gratuiciel ; vous pouvez le redistribuer et/ou
+le modifier selon les termes de la licence Publique G‚n‚rale GNU
+contenue dans le fichier COPYING situ‚ dans r‚pertoire d'installation. 
+
+Le code source original est disponible sur : 
+
+  http://smplayer.sourceforge.net
+
+Ce programme est distribu‚ dans l'espoir qu'il sera utile …
 quelque
+chose, mais SANS AUCUNE GARANTIE ; sans mˆme la garantie implicite de
+COMMERCIALISATION ou d'ADQUATION · UN BUT PARTICULIER. 
+
+Pour plus de d‚tails, veuillez vous r‚f‚rer au fichier COPYING. 
+
+
+4. CONTACT
+==========
+
+Si vous rencontrez un problŠme, ouvrez un ticket dans le systŠme
+trac sur http://svn.netlabs.org/qtapps. 
+
+Seuls les rapports de bogues reproductibles seront accept‚s, bien
+entendu ! :-)
+
+
+5. SOUTIEN ET DONS
+==================
+
+SMTube est bas‚ sur le volontariat. Si vous voulez soutenir les
+d‚veloppements futurs, vous pouvez le faire de l'une des maniŠres
+suivantes : 
+
+  * Faites un don pour le projet Qt4 : consultez http://qt.netlabs.org 
+    pour plus d'informations.
+
+  * Contribuez au projet : outre le d‚veloppement pur, il y a aussi la
+    maintenance de la documentation, la maintenance du site web du
+    projet, ainsi que l'aide aux utilisateurs. 
+
+
+6. HISTORIQUE DES VERSIONS
+==========================
+
+2013-05-23
+  * Version initiale
diff -Naur -x .svn vendor\current/os2/smtube.ico trunk/os2/smtube.ico
--- vendor\current/os2/smtube.ico       1970-01-01 01:00:00.000000000 +0100
+++ trunk/os2/smtube.ico        2013-05-23 19:53:18.000000000 +0200
@@ -0,0 +1,62 @@
+CI  :
@€ÿÿÿCI  :
@@ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþ¿ÿÿÿÿÿÿÀ¿ÿÿÿÿ|?ÿÿÿÿøÿÿÿÿÀÿÿÿþ€ÿÿÿþÿÿþÿÿøÿÿøÿÿðÿÿàÿÿÀÿÿÀÿÿ€ÿÿÿÿ?þ?þ?üøìü
üøüøüøüüüüüþþ?þ?ÿÿÿ€ÿÿ€ÿÿÀÿÿàÿÿðÿÿðÿÿøÿÿüÿÿþ?ÿÿÿ€ÿÿÿÀÿÿÿÿðÿÿÿÿüÿÿÿÿÿ€ÿÿÿÿÿú¯ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ  2X
}
o
H)          2­.îVý[ÿZÿ`ÿbúlè]Ž:`4       H+BÜWÿtÿyÿvÿvÿwÿzÿ|ÿyÿxýtÈb
„o+zsd‰hZ²•c³¬£¶«Š•w\yqpiVGC9*'



++p­9ÜZî^úoéXËP~-"2    ÜXÿ{ÿyÿxÿwÿwÿuþwüzþ}  þ
þŽ!ÿ§QÿˊûسÿÞžÿàŸýâÈÿæÊÿäÉÿëÒýèÐôàÉçˬ߷kèŽÿqÿtÿyÿyÿvÿyÿyÿvÖHB    ®>ÿwÿyÿwÿvÿyþ|÷‡$ò–;÷Hú€Qü¥QüŸGü±fû̘ùÔ¬úÙ¶üÝŒüàÂýáÅüâÈûäËüæÎýæÌÿà¹ÿʈÿ¬Nÿ!ÿ|ÿyÿxÿwÿwÿxÿzÿvÜH2Kökÿxÿxÿwýuô‡ õŠSð¯nòžvõŒ{öŸ÷ŠøƏüȌüÖ€ýÛ®ýàŽþä»þçÁþéÆþêËþêÏþêÓýéÒýãÃþͅ
ÿ¬IÿžBÿ¥Qþ£Rþ—>ÿ‰#ÿ}
+ÿyÿzÿvÿnº4š6ÿvÿwÿwýyõ„(ïžYó­gò°kó¶vöÀúƂýÉÿ́ÿσÿЂÿӅ
ÿۖÿãŠÿè¯ÿïŒÿïŒÿòÁÿ÷ÏÿñÁÿ؄ÿÐlÿ۞ÿáÁÿáÂþÝ»ÿسÿÍ¢ÿžzþœ<ÿ
ÿvÿtÿg‹!ÍSÿyÿxþzù…
"ó˜Kñ¡Zð§dö²jü¶aÿŽTÿ·VÿŒ]ÿŒ]ÿŒ^ÿÀbÿÆlÿ׎ÿà¡ÿç¯ÿêŽÿê²ÿç©ÿތÿÎ^ÿ܂ÿòœÿùÓÿ÷ÖÿñÕþêÒþçÐþæËþãÆýÚŽþµuÿ†
ÿuÿtëW2<
ódýwþxüƒõ;ð™Rô£Xü¥Kÿ¡:ÿ¡7ÿªAÿ«Bÿ©=ÿ¬@ÿ°GÿµOÿÄjÿۗÿãšÿç¯ÿè±ÿæ©ÿÊaÿÂHÿفÿë°ÿòÀÿóÅÿõÈÿõÈÿòÈÿìÊþæËüáÅüàÀýÙ¶þ°nÿ‚ÿvÿsrY"ývþ|þ{ö‡,ó•Iû›Eÿ—4ÿ–.ÿ™/ÿ¡7ÿ€7ÿ£5ÿš<ÿ­Cÿ±Iÿ·SÿԌÿæ¯ÿêžÿëºÿè­ÿÏgÿÅQÿهÿà›ÿá›ÿã ÿæ¥ÿå£ÿç©ÿìµÿé±ÿèµÿæÀýàÀüÜžýСüŠUþ€
ÿ|š:
ÂmÿŒþü€ø’Aþ“8ÿŒ)ÿ‹$ÿ'ÿ˜0ÿ–(ÿ™)ÿ¡1ÿ©>ÿ±KÿµPÿÁgÿä®ÿìŸÿîÁÿæªÿÍbÿÕxÿޘÿӁÿՄÿ׈ÿًÿېÿߙÿܓÿݕÿܕÿޙÿߝÿá­ýß¹ûÕ­ûÀ„ý“1ÿŠÕU
šMÿ•;ÿ1þ'ÿƒÿ~ÿyÿyÿÿ%ÿ‹ÿ!ÿš,ÿ¡3ÿ€6ÿ¥7ÿš;ÿ̀ÿê»ÿðÇÿç­ÿÍ`ÿكÿóÉÿé¶ÿҀÿҀÿҀÿӀÿӀÿՅ
ÿُÿ׋ÿÐ|ÿÎyÿ҃ÿՉÿژýÛ¬ú˛üŠRþŠJï-C"
•)þw"ÿ„0ÿ‘Aÿ…
(ÿrÿn
ÿq
ÿwÿ…
 ÿˆ ÿ$ÿ”*ÿ•'ÿ–$ÿœ+ÿ¥9ÿ·Zÿä±ÿòÌÿè®ÿË^ÿڇÿòËÿõÑÿêžÿËtÿÍwÿÐ}ÿÑ~ÿÐ|ÿÍwÿÏ{ÿ҂ÿÎ{ÿÇkÿÃeÿÆmÿÌxÿ҇þәû¶hûžiúºs·€Q
týYÿqÿy$ÿ|'ÿhÿmÿjÿo
+ÿ}ÿˆ#ÿ‰"ÿ‰
ÿŠÿŽ
ÿšFÿыÿá§ÿí¿ÿöÑÿí¶ÿÐdÿߎÿøÓÿúØÿûÛÿç¯ÿÄcÿÅeÿÇhÿÉlÿËqÿÍuÿÍtÿÐzÿÉmÿÈlÿÁ`ÿŒUÿÁbÿÎÿÎþÀd÷…
ö‚𜈒i>
+NñAÿ^        ÿdÿmÿe
ÿaÿløeÌ`Æo*Çn'ÆiÆkÆo"Æ}5Æšƹ›Æœ¢ÆŸ¥ÅŒ¡ÅŠaŧbÅŸ¥ÅÀ«ÅÀ«ÅÁ¬Å·–Ä™VĕOĖQėRĘRĘSĘUĜ]ÚZÖQÖRÏG˞ZùÊ~ÿЃÿœTü˅
õˆõÁƒì­tjC$
Ì(ÿSÿWÿ\
+ÿZÿa  ÿ^ÿkå`
B.!)(&*'%)'%)&$)&$('&(('''&&&&&&%&%$%$!%%$$$$#####"#""""""!!
 
 
 











=7-çœyÿÉtÿ»Sÿ¿dúƂóº|÷žzߖa2
+
ÿAÿNÿRÿQÿQÿ`
ÿ^ÿläi:*  !!!!       




















51*æŋÿËvÿŒTÿ¹[ÿ·[õ¹xó°nõ­lžj7 6ë,ÿFÿIÿLÿIÿNÿXÿe
ÿoäf:) !!      

















42,æÎ ÿՆÿÄgÿž]ÿªFý°Yñ«jî£a܎UH)šÿ>ÿAÿEÿDÿGÿKÿSÿfÿoäa     9&
 !   




















42,æÕ¬ÿܒÿ҇ÿÃtÿ¥CÿŸ:õŠ[ç–Uè”T­W*6ë#ÿ>ÿ?ÿ?ÿ@ÿFÿNÿ`ÿiÿu
äg 9'

 






















32.æÞÅÿìºÿá¬ÿ͈ÿ­RÿŸ?ýžCäPæŽKÜx:GŠÿ7ÿ@ÿ<ÿDÿXÿ[ÿ~3ÿCÿœCÿ˜ äx8)






















222ææåÿÿûÿóÛÿןÿ°\ÿŸBÿ Dñ•JãˆFêŠEšF
"Û.ÿFÿBÿIÿeÿr"ÿ{
ÿ“'ÿ•ÿŽÿxä|
7.






























222ææçÿÿÿÿõÜÿ҅
ÿºgÿ”5ÿš@ýšEë‹EñFÌk.$›,ÿUÿTÿKÿUÿj
+ÿy
ÿŠÿ–2ÿ§Xÿz,ÿSäh6+

















777iiiWWW444!!!


221ææãÿÿþÿìÄÿÈbÿš*ÿ‰ÿ€ÿ0ö“GóŒ>ñ~3w$#ž5þjÿhÿfÿ[ÿbÿpÿ‡5ÿ—Rÿ¥hÿšnÿbÿJãU6%







###eeeèèèää䯯¯ooo>>>###





+
+
+1-&æÕ¬ÿñÓÿâ·ÿÙ¥ÿ«Tÿzÿsÿy
ü6÷‡0ü„ Ü\C>ÎCÿqÿtþpÿiÿTÿ\
ÿs,ÿŽLÿ˜Wÿ©nÿ·ÿŠLÿO
+ãK6$




%%%pppñññÿÿÿÿÿÿïïïÁÁÁIII'''








             
+0*æ͞ÿä»ÿاÿˑÿ“=ÿrÿqÿqÿ{  üþÿwäUc&Ì@ÿuÿwÿvþoüRþEÿ]ÿ}9ÿŒIÿ›]ÿ¬tÿŸÿÍ£ÿ¢nãV5"
%%%pppñññÿÿÿþþþÿÿÿÿÿÿöööÒÒҔ””VVV---











/,(æάÿÞ°ÿӟÿćÿ9ÿz
ÿuÿoÿqÿ‚ÿzþzÿyêSO
¶:ÿqÿyÿyþpûVûEýIÿe
ÿ€=ÿ‹Jÿžbÿ°zÿÁ“ÿÒ¬ÿڷ㞘4-($$$oooñññÿÿÿþþþþþþþþþþþþÿÿÿûûûàà১§eee555












+
+
+                       /,(æÍ«ÿÚ¬ÿѝÿŊÿžOÿtÿmÿf
+ÿlÿ‚,ÿyÿxÿxÿußPÿrÿxÿyÿwü_ø@ø@ýO   ÿm)ÿ}:ÿMÿ gÿ²~ÿĘÿÔ°ÿàÁãÔÁ320###oooñññÿÿÿþþþþþþþþþþþþþþþþþþÿÿÿþþþëëë¹¹¹ttt444






+
+
+                                               .,)æήÿÙ¬ÿўÿÉÿ¯iÿ}(ÿ\ÿ[ÿlÿu ÿrÿuÿxÿwÿwÿxÿyÿzÿqùHó/ö:ý[ÿo,ÿz9ÿQÿ¢jÿ³ÿǝÿ׶ÿçÌãÙÈ320###oooñññÿÿÿþþþþþþþþþþþþþþþþþþþþþþþþÿÿÿÿÿÿêêêsss



+
+
+                                               -+(æÑŽÿÝŽÿÒ¢ÿˆÿµtÿŸXÿd
ÿhÿjÿdÿgÿnÿvÿxÿvÿzÿ{ÿ{ýfô4ð)ô4ü_
ÿn+ÿ{:ÿSÿ£mÿµ„ÿÉ¡ÿÛŒÿí×ãÛÎ220"""oooñññÿÿÿþþþþþþþþþþþþþþþþþþÿÿÿÿÿÿðððÂÂÂ}}}777
+
+
+                                               -+'æÑŽÿÞ¶ÿÕ©ÿŏÿŸ…
ÿ³tÿ{)ÿb
ÿ[ÿZÿ\        ÿcÿtÿyÿzÿ|ÿ{ÿ|÷Xí&î(ò5ú]þs2ÿ}>ÿTÿ€nÿ¶ˆÿË¥ÿßÃÿñÜãÞÑ110"""nnnñññÿÿÿþþþþþþþþþþþþÿÿÿýýýåå寯¯lll888
+
+
+                       ,+(çÖŸÿåÃÿØ®ÿȗÿ¬mÿ¯qÿv&ÿPÿRÿQÿSÿYÿpÿxÿzÿ{ÿ|ÿ}óPê#ë$ñ7ùZük*ÿ…
Iÿ‘Wÿ¥pÿž‹ÿ̧ÿáÈÿïÛãÝÑ110!!!nnnñññÿÿÿþþþÿÿÿÿÿÿùùùÙÙٜœœ[[[---


+
+
+                                               ,)&æÔŒÿåÄÿÑŠÿ•Oÿ‡;ÿ“KÿbÿIÿGÿJÿLÿPÿlÿyÿyÿÿÿzõOê%é&ð9÷Vúc!þ€CÿšdÿªyÿŸ“ÿЮÿâÉÿïÛãÜÐ00.   mmmñññÿÿÿÿÿÿóóóÉÉɈˆˆKKK%%%


+
+
+                                                                       +(%æÓ»ÿÜžÿšZÿ›Yÿ³yÿ¡`ÿbÿDÿCÿEÿGÿLÿiÿzÿ{ÿwÿƒÿ€õ^ê/è(î:õSùg'þ‚Gÿœgÿ³†ÿÀ˜ÿÏ­ÿàÆÿëÕãа0,#


bbbëëëéé鶶¶ttt>>>






+
+
+                                               *(%æϵÿº†ÿµÿÁÿ¶}ÿ§iÿŒFÿVÿ@ÿBÿCÿMÿjÿ}ÿzáFÿƒÿ…
ùsëCæ,ì;õYøl-ü{>ÿ‘Yÿ«{ÿÁ›ÿÓ³ÿàÈÿçÍãœx/(444nnnZZZ222









+
+
+                                               *$æ€vÿ»ˆÿÏ€ÿÁÿ±yÿŸ^ÿ‰Aÿo%ÿBÿ@ÿDþUÿtÿ|û^rúqÿˆü‚ò]è9ê<      óUõ^
ùt6þ’\ÿ¬}ÿ¿—ÿϯþ¹“ÿȓâ³X/)










+
+
+
+
+
+                                               *
橀ÿײÿʟÿœ‹ÿ­tÿŸ`ÿ‡@ÿk
ÿKÿCýIýeÿ{ÿv®.
¢0ÿ}þ„ùwîTéAïLó\øs6üVüYû‰Qû}Bûo/ÿ¶bâŒs.,*















+
+
+                                                                       +'$æζÿÖ±ÿƚÿ¹†ÿ©oÿž`ÿ‰DÿbÿW
úEõVõeývÌC& œ7ÿzùuóiìQíIñZ÷s6ù|AóR öYø^úg ÿ²MâÉ¡-,+












+
+
+                                               ,)&æ˱ÿÑ«ÿ”ÿŽ€ÿ€iÿ™[ÿ…
Aÿj
ÿ_â>ÜEçVÑ_@ €9ölí[êS
ëGðW
õr4û\õi&öd!÷e$úw$ÿÃjâк/-+





























                       ,(%æÆ«ÿÍ¥ÿœŽÿ®zÿžcÿ•Vÿ:ÿeþY
+Î7Ï;Á2I¹+êI
æFç;íSôr1ú–eú[öq2÷l-ü/ÿ՘ãÒÄ1/,555}}}ŽŽŽggg   


fff‘‘‘ŽŽŽsss'''VVV‰‰‰‹‹‹ˆˆ‰–’ŽñαÿǞÿžˆÿ©sÿ™]ÿQÿx1ÿ`õQÄ4Ê7„^ä'å=ä0êGñq.ø”bý¬‚ùŠU÷w4ý'ÿŽ~ñŒŸrhbMMMºººõõõúúúúúúñññ§§§555(((–––ñññÿÿÿÿÿÿúúúœœœMMM





'''€€€ÞÞÞ÷÷÷ëçãùÒµÿ˜ÿ²‚ÿ¢kÿ“Vÿ‹Kþp$ÿa
áDÄ7Ã-V%Ï
å:ã9êV
ðl#ôHüš~ûš~øƒ6þ«MÿϯøÖ¿ÔÐͧ§§GGG


vvvØØØ÷÷÷÷÷÷ûûûßßßyyyJJJŸŸŸûûûÿÿÿÿÿÿìì쑑‘***                  


>>>§ššãÞÛùÍ®ÿœ’ÿ¬zÿœcÿŒOÿ„Dýo"û]Ê4É:¯/ç3äHæHí]í]
õŠQüµû7ýEÿØÂøçÚÓÒÐØØØÐÐЉ‰‰,,,@@@¬¬¬ðððõõõøøøöööœœœLLL


###‚‚‚èèèüüüûûûûûûÐÐÐccc$$$rmiñ¿žÿžŒÿŠrÿ—]ÿ‹Mþ„BüjêDÂ3É6ˆ
     GÝ
åKã?êVïmøžlýÀžþ±]þčÿàÍ÷ä×ÎÌÊÐÐÐÔÔÔ¥¥¥666


   ˆˆˆéééñññóóó÷÷÷ÙÙÙfff


+
+
+


WWWÙÙÙúúúùùùûûûèè肂‚TNJíž—ÿ·‹ÿŠrÿ˜`þOûv&÷VÎ4Ç:À&O £ç7ßNâNð{,÷ŸmþÊšÿÆ{ÿÖ³ÿÙÄöÑŒÐÊÇžžžfff


MMMžžžíííñññöööííí¡¡¡000)))˜˜˜ïïïþþþþþþùùùžžžHHH








%%%‚‚ƒÔÎÊùƧÿ³‡þœfü‰Kû€;øhèFÁ3Ì5¢
EÔÚXÐFír3òˆ9ùªkþ¿süÁžýŸœòŒŸ‡~)++'''‰ŠŠÚÚÚêëëëëëëëëÁÁÁTTTgghÔÕÖýþþûüüùùù×××ppp
+

VWWÀÁÂñòóêãßùŒ˜ÿ«|ü‘Wù<øy+ôXÌ6Ê=à \†ÝAàb äN!ï{
õ’$ü·jû£þ˯ꌣdRHJ>7MD>LEAnmlÈÇÆìëêíèäïìéòòñÅÅÅhhhGFDIDAIB=VKD°š£øðéþí×üíãýöñÝÜÛxwuMJHOHDQD;WKCŸ˜”íäÞúïçöéâñÚÌû³‹ü múQø.ömÝ@Ç<Î4–*»ä_ä_'éc)õ— ûž`ü˲ü̱ýÑžúÒŒúÔ¿úÜËúìâþúõÿþúÿúõÿîãÿöîÿÿþúúúøøùúôïúêÞúäÔüÞÊÿãÏÿÝ­ÿ̔ÿϲÿíàûøôøòìúôìúáÏúÊ­úÉ«ÿßÊÿàËÿןÿѵÿÀœû§wù“XøŒDö}"éRÆ8ÑAŒ<BÕ+érçe$ñ‰ù³OûËŽüѺýÕ¿ÿÚÇÿßÍÿçØÿ÷ñÿû÷ÿüùÿü÷ÿóêÿöîÿýúÿÿÿÿúîÿñÕÿòçÿêÜÿäÓÿÛ±ÿØšÿ׿ÿÔºÿãÑÿõíÿúóÿøïÿãÑÿâÏÿåÔÿßÊÿÜÆÿÖœÿ̯ý¶Žù›c÷Š4ö‡+ïhÌ:ÏIÉ$ahæ_îŽ#ñ%ô ;øŒ›ü×ÂýÜÊÿàÏÿçÙÿíãÿ÷òÿüøÿüùÿþûÿúõÿ÷ïÿùóÿûöÿõãÿå©ÿëËÿíâÿâ¿ÿÝ°ÿáÍÿàÍÿßËÿæÕÿìßÿøðÿôëÿîâÿëÝÿèÙÿâÏÿÚÄÿÕœýÅ€ú©x÷“;õ…

+òxÓCÏQÐ4‹

ªR÷£
ø¯5ò—GóŠ…
üÕÀþäÕÿçÚÿòéÿ÷òÿùõÿûøÿüúÿþûÿþûÿùôÿùôÿùôÿùôÿïÍÿà•ÿç¶ÿæÃÿéÚÿæ×ÿäÓÿãÒÿèÚÿêÜÿôìÿòéÿïäÿëßÿåÕÿÜÈÿØÁþÑ·ú¶÷IõŒóÛSÒ[×JŠ
+
YAù¶û¿÷¶Yðœ‡öŒ©ýßÏÿðçÿõïÿ÷òÿùõÿûùÿüûÿýûÿÿüÿþûÿüøÿûöÿûöÿøñÿæ›ÿÞsÿí×ÿîåÿìáÿéÜÿäÕÿäÔÿéÝÿðæÿïåÿìàÿéÛÿâÒþÛÇüϲúŸ–ø©bõ–ñÛ^ÖhÛ\°2:.ñºþÇûÅ>õµ—ò®ž÷Á²ýáÔÿôîÿùôÿúöÿûùÿüúÿþüÿÿýÿÿýÿþüÿüúÿúòÿóÚÿóÛÿêŽÿæ¡ÿñàÿðèÿìáÿèÛÿåÖþå×þçÙþèÛÿêÝÿæØþàÏýÙÁùŒl÷¯fö¥6ñ‡Ý`ÛtÝdŽ2ÖšÿÌþËùÁwõŒªóµªõœ±ûÜÑÿôíÿûøÿüúÿüûÿþüÿÿýÿÿþÿÿþÿûóÿõÜÿ÷éÿú÷ÿ÷ïÿê³ÿç£ÿïÞÿîæÿìáþéÝþæØþçÚýäÕýáÒýÝËûЯø¹[ö«!õš
ïx
êê”å}¹!4–vÿÍÿÍýÊ÷Átõ¿±ôŸ¶ô»±ùÐÇýìåÿú÷ÿþüÿÿýÿÿÿÿÿýÿúíÿøãÿûôÿüúÿúöÿøôÿõíÿëŽÿç¡ÿíØÿìãþêÞýçÚüäÖüáÑûÖ²ùȄø»Sö§ó†îqîŠ
ö²ó¬Ïm7?1ñŒÿÌÿÍýËùÂ\õÀ©öÆ¿õºöÆŸúÚÓýðíÿýúÿýôÿùçÿûíÿþüÿýýÿüúÿûøÿùõÿ÷óÿôìÿë¹ÿæÿëÆÿïèþìâüå×úԜùÅk÷ºoô™Bñz.ï~
+ñ˜õ¯ûÂö»iF‰hùÁÿÍÿÎþÍúÅ3÷Ê÷ɹöÌÁöɺøʵûضüåÎþõîÿüüÿÿþÿÿýÿýüÿüúÿû÷ÿùôÿöñÿóíÿë¹ÿä|ÿæœüßÆúÓŸ÷Ÿƒô¡UòŠTñŒSò 'òšõ±üÅþËŒ“^IשÿÍÿÐÿÐÿÌûËIûÎfûҎûÑ«øͺöÊÂ÷ÌÄúÕÊúÜ×ûãÞüåàüçáüèàýçßüãØûÛÍúÓÂù˕ûÍCûÏM÷Á|ó³ió«oõµ\õº$÷œúÄüËÿΛ}#qY§ƒŒ–ß³÷ÈúËóÅ7áŽqî¿¥÷ÊÁúÍÆùÍÄöÉÄõÉÃõÂŒõÂŒôÁ¹õÅŒõúö÷öÁ°öÀ®ùŝüÎvýÓEýÓ2ûÏ/ûÍ üÎþÐÿÐÿÐÛ D7I<C6'
A1!pUN­„vÔ¢™é·¯ï¿¹ôÄœøÇ¿ùÈŸùÈÀùÇœùÄžøÀ­òžœó»vûÈ@ÿÑÿÕÿÔÿÔÿÒÿÑÿÏܬ;.9*#G42`IFuVUzZWy]Xz[WzZVsU:K7 E3
+cLsË£âµá¶âŽË¡‰l1&





\ No newline at end of file
diff -Naur -x .svn vendor\current/smtube.pro trunk/smtube.pro
--- vendor\current/smtube.pro   1970-01-01 01:00:00.000000000 +0100
+++ trunk/smtube.pro    2013-05-23 18:30:40.000000000 +0200
@@ -0,0 +1,5 @@
+TEMPLATE = subdirs
+
+SUBDIRS += src
+
+src.file=src/smtube.pro
\ No newline at end of file
diff -Naur -x .svn vendor\current/src/main.cpp trunk/src/main.cpp
--- vendor\current/src/main.cpp 2013-01-12 01:03:30.000000000 +0100
+++ trunk/src/main.cpp  2013-05-23 19:40:56.000000000 +0200
@@ -43,7 +43,7 @@
 }
 
 QString translationsPath() {
-       QString path = "translations";
+       QString path = QString(qApp->applicationDirPath() + "/translations");
 #if !defined(Q_OS_WIN)
 #ifdef TRANSLATION_PATH
         QString s = QString(TRANSLATION_PATH);
diff -Naur -x .svn vendor\current/src/players.cpp trunk/src/players.cpp
--- vendor\current/src/players.cpp      2013-01-12 01:03:30.000000000 +0100
+++ trunk/src/players.cpp       2013-05-23 18:40:32.000000000 +0200
@@ -25,11 +25,11 @@
        if (found) *found = true;
 
        QString bin = qApp->applicationDirPath() + "/" + player_bin;
-       #ifdef Q_OS_WIN
+       #if defined(Q_OS_WIN) || defined(Q_OS_OS2)
        bin += ".exe";
        #endif
 
-#ifndef Q_OS_WIN
+#if !defined(Q_OS_WIN) && !defined(Q_OS_OS2)
        QFileInfo fi(bin);
        if (!fi.exists() || !fi.isExecutable() || fi.isDir()) {
                qDebug("Player::exec: command: '%s' is not a valid executable", bin.toUtf8().constData());
diff -Naur -x .svn vendor\current/src/qtsingleapplication/qtlocalpeer.cpp trunk/src/qtsingleapplication/qtlocalpeer.cpp
--- vendor\current/src/qtsingleapplication/qtlocalpeer.cpp      2012-03-05 14:25:32.000000000 +0100
+++ trunk/src/qtsingleapplication/qtlocalpeer.cpp       2013-05-23 18:23:28.000000000 +0200
@@ -48,7 +48,7 @@
 typedef BOOL(WINAPI*PProcessIdToSessionId)(DWORD,DWORD*);
 static PProcessIdToSessionId pProcessIdToSessionId = 0;
 #endif
-#if defined(Q_OS_UNIX)
+#if defined(Q_OS_UNIX) || defined(Q_OS_OS2)
 #include <time.h>
 #include <unistd.h>
 #endif
diff -Naur -x .svn vendor\current/src/smtube_os2.rc trunk/src/smtube_os2.rc
--- vendor\current/src/smtube_os2.rc    1970-01-01 01:00:00.000000000 +0100
+++ trunk/src/smtube_os2.rc     2013-05-23 19:46:54.000000000 +0200
@@ -0,0 +1 @@
+ICON   1    DISCARDABLE     "..\os2\smtube.ico"
diff -Naur -x .svn vendor\current/src/smtube.pro trunk/src/smtube.pro
--- vendor\current/src/smtube.pro       2013-05-03 23:03:38.000000000 +0200
+++ trunk/src/smtube.pro        2013-05-23 19:47:44.000000000 +0200
@@ -91,3 +91,7 @@
 win32 {
     RC_FILE = smtube.rc
 }
+
+os2 {
+    RC_FILE = smtube_os2.rc
+}