[playonlinux] 27/230: New upstream version 3.4

Bertrand Marc bmarc at moszumanska.debian.org
Sun Jul 9 17:41:34 UTC 2017 

This is an automated email from the git hooks/post-receive script.

bmarc pushed a commit to branch master
in repository playonlinux.

commit d5cab7b64d61225d1be77ec0ee493e41f87ac887
Author: Bertrand Marc <bmarc at debian.org>
Date:   Sun Jul 9 18:50:39 2017 +0200

    New upstream version 3.4
---
 CHANGELOG                         |   9 +++++++++
 bash/LiveInstall                  |  13 ++++++++++---
 bash/check_maj                    |   3 +--
 bash/check_maj_                   |  22 +++++++++++++++++++---
 etc/emotes/face-angel.png         | Bin 992 -> 0 bytes
 etc/emotes/face-crying.png        | Bin 936 -> 0 bytes
 etc/emotes/face-devilish.png      | Bin 855 -> 0 bytes
 etc/emotes/face-glasses.png       | Bin 949 -> 0 bytes
 etc/emotes/face-grin.png          | Bin 905 -> 0 bytes
 etc/emotes/face-kiss.png          | Bin 919 -> 0 bytes
 etc/emotes/face-monkey.png        | Bin 784 -> 0 bytes
 etc/emotes/face-plain.png         | Bin 894 -> 0 bytes
 etc/emotes/face-sad.png           | Bin 918 -> 0 bytes
 etc/emotes/face-smile-big.png     | Bin 896 -> 0 bytes
 etc/emotes/face-smile.png         | Bin 919 -> 0 bytes
 etc/emotes/face-surprise.png      | Bin 917 -> 0 bytes
 etc/emotes/face-wink.png          | Bin 914 -> 0 bytes
 etc/menu/cdrom.png                | Bin 0 -> 934 bytes
 etc/snd/snd.wav                   | Bin 60766 -> 0 bytes
 lang/locale/fr/LC_MESSAGES/pol.mo | Bin 34572 -> 34753 bytes
 lang/po/fr.po                     |   3 +++
 lib/interface_v3                  |  35 ++++++++++++-----------------------
 lib/main                          |   6 +-----
 lib/variables                     |   2 +-
 python/mainwindow.py              |  28 ++++++----------------------
 25 files changed, 62 insertions(+), 59 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 599229e..c182c0a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,12 @@
+-> 3.4
+- Changelog removed when a new version is installed
+- Possibility to configure the prefix before manual install
+- Repository is automaticaly updated when needed
+- POL_SetupWindow_prefixcreate use POL_SetupWindow_normalprefixcreate to avoid bugs
+- POL_SetupWindow_specificprefixcreate and POL_SetupWindow_oldprefixcreate are made
+- Autorun is moved on tools menu
+- Refresh the repository should no more be needed. Therefor, it has been removed from the toolbar
+
 -> 3.3.1
 - An important bug corrected in wine version manager
 - lzma is no more asked by check_depend
diff --git a/bash/LiveInstall b/bash/LiveInstall
index d7b8887..e6611bf 100755
--- a/bash/LiveInstall
+++ b/bash/LiveInstall
@@ -100,7 +100,7 @@ LNG_LI_EXIST=$(eval_gettext "This codename already exists in PlayOnLinux.")
 LNG_LI_INSTALLFILE=$(eval_gettext "Please choose the file to execute")
 LNG_LI_CHOOSEFILE=$(eval_gettext "You have to choose a file !")
 LNG_LI_EXEC=$(eval_gettext "Choose the file to exec the game.")
-
+LNG_WC_EXEC=$(eval_gettext "Do you want to configure your prefix before installing your application ?")
 LNG_LI_GIVENAME=$(eval_gettext "Please type a name for your shortcut.")
 LNG_MAIN_INSTALL_LIVE=$(eval_gettext "Manual installation")
 
@@ -141,9 +141,16 @@ fi
 
 select_prefixe "$REPERTOIRE/wineprefix/$GAMENAME"
 POL_SetupWindow_prefixcreate
-
+POL_SetupWindow_question "$LNG_WC_EXEC" "$LNG_MAIN_INSTALL_LIVE"
+if [ "$APP_ANSWER" = "TRUE" ]
+then
+	LNG_CONFIGURE=$(eval_gettext "Configure wine")
+	POL_SetupWindow_wait_next_signal "$LNG_CONFIGURE" "$LNG_MAIN_INSTALL_LIVE"
+	winecfg
+	POL_SetupWindow_detect_exit
+fi
 cd $HOME
-POL_SetupWindow_browse "$LNG_LI_INSTALLFILE" "$LNG_MAIN_INSTALL_LIVE"
+POL_SetupWindow_browse "$LNG_LI_INSTALLFILE" "$LNG_MAIN_INSTALL_LIVE" 
 INSTALLDIR="$APP_ANSWER"
 if [ "$INSTALLDIR" = "" ]
 then
diff --git a/bash/check_maj b/bash/check_maj
index c6ebba0..3fa773a 100755
--- a/bash/check_maj
+++ b/bash/check_maj
@@ -1,7 +1,6 @@
 #!/bin/bash
 
-# Copyright (C) 2007 Pâris Quentin
-#  		     Cassarin-Grand Arthur
+# Copyright (C) 2009 Pâris Quentin
 
 # 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
diff --git a/bash/check_maj_ b/bash/check_maj_
index ee19675..ecb8d5e 100755
--- a/bash/check_maj_
+++ b/bash/check_maj_
@@ -1,7 +1,6 @@
 #!/bin/bash
 
-# Copyright (C) 2007 Pâris Quentin
-#  		     Cassarin-Grand Arthur
+# Copyright (C) 2009 Pâris Quentin
 
 # 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
@@ -24,4 +23,21 @@ fi
 
 source "$PLAYONLINUX/lib/sources" 
 
-maj_check
+touch "$REPERTOIRE/configurations/last_string"
+sleep 2
+if [ ! "$OFFLINE" == "1" ]
+then
+	local_string=$(cat "$REPERTOIRE/configurations/last_string")
+	if ( ! wget "$SITE/update_mark.txt" -O- -q 2> /dev/null > /dev/null)
+	then
+		echo "No internet access"
+		exit
+	fi
+	remote_string=$(wget "$SITE/update_mark.txt" -O- -q 2> /dev/null)
+	if [ ! "$local_string" = "$remote_string" ]
+	then
+		echo "$remote_string" > "$REPERTOIRE/configurations/last_string"
+		echo "PlayOnLinux repository need to be updated"
+		maj_check
+	fi
+fi
diff --git a/etc/emotes/face-angel.png b/etc/emotes/face-angel.png
deleted file mode 100644
index d2c5e94..0000000
Binary files a/etc/emotes/face-angel.png and /dev/null differ
diff --git a/etc/emotes/face-crying.png b/etc/emotes/face-crying.png
deleted file mode 100644
index a7e3f49..0000000
Binary files a/etc/emotes/face-crying.png and /dev/null differ
diff --git a/etc/emotes/face-devilish.png b/etc/emotes/face-devilish.png
deleted file mode 100644
index 8e2cd45..0000000
Binary files a/etc/emotes/face-devilish.png and /dev/null differ
diff --git a/etc/emotes/face-glasses.png b/etc/emotes/face-glasses.png
deleted file mode 100644
index d13f2c8..0000000
Binary files a/etc/emotes/face-glasses.png and /dev/null differ
diff --git a/etc/emotes/face-grin.png b/etc/emotes/face-grin.png
deleted file mode 100644
index d15cf2d..0000000
Binary files a/etc/emotes/face-grin.png and /dev/null differ
diff --git a/etc/emotes/face-kiss.png b/etc/emotes/face-kiss.png
deleted file mode 100644
index 809c1cf..0000000
Binary files a/etc/emotes/face-kiss.png and /dev/null differ
diff --git a/etc/emotes/face-monkey.png b/etc/emotes/face-monkey.png
deleted file mode 100644
index 69db8fa..0000000
Binary files a/etc/emotes/face-monkey.png and /dev/null differ
diff --git a/etc/emotes/face-plain.png b/etc/emotes/face-plain.png
deleted file mode 100644
index a6761bd..0000000
Binary files a/etc/emotes/face-plain.png and /dev/null differ
diff --git a/etc/emotes/face-sad.png b/etc/emotes/face-sad.png
deleted file mode 100644
index fa25895..0000000
Binary files a/etc/emotes/face-sad.png and /dev/null differ
diff --git a/etc/emotes/face-smile-big.png b/etc/emotes/face-smile-big.png
deleted file mode 100644
index 4cebcff..0000000
Binary files a/etc/emotes/face-smile-big.png and /dev/null differ
diff --git a/etc/emotes/face-smile.png b/etc/emotes/face-smile.png
deleted file mode 100644
index 01e0117..0000000
Binary files a/etc/emotes/face-smile.png and /dev/null differ
diff --git a/etc/emotes/face-surprise.png b/etc/emotes/face-surprise.png
deleted file mode 100644
index 863f304..0000000
Binary files a/etc/emotes/face-surprise.png and /dev/null differ
diff --git a/etc/emotes/face-wink.png b/etc/emotes/face-wink.png
deleted file mode 100644
index 46be685..0000000
Binary files a/etc/emotes/face-wink.png and /dev/null differ
diff --git a/etc/menu/cdrom.png b/etc/menu/cdrom.png
new file mode 100644
index 0000000..3f65839
Binary files /dev/null and b/etc/menu/cdrom.png differ
diff --git a/etc/snd/snd.wav b/etc/snd/snd.wav
deleted file mode 100644
index b274bfe..0000000
Binary files a/etc/snd/snd.wav and /dev/null differ
diff --git a/lang/locale/fr/LC_MESSAGES/pol.mo b/lang/locale/fr/LC_MESSAGES/pol.mo
index 4a417d2..f97e552 100644
Binary files a/lang/locale/fr/LC_MESSAGES/pol.mo and b/lang/locale/fr/LC_MESSAGES/pol.mo differ
diff --git a/lang/po/fr.po b/lang/po/fr.po
index 0063f0c..5dc410f 100644
--- a/lang/po/fr.po
+++ b/lang/po/fr.po
@@ -1423,3 +1423,6 @@ msgstr "Ouverture du configurateur spécifique de wine"
 
 msgid "Killing process in the prefix .."
 msgstr "Fermeture des processus du préfixe"
+
+msgid "Do you want to configure your prefix before installing your application ?"
+msgstr "Voulez-vous configurer votre prefixe avant d'installer votre application ?"
diff --git a/lib/interface_v3 b/lib/interface_v3
index 266d3f4..184d732 100644
--- a/lib/interface_v3
+++ b/lib/interface_v3
@@ -36,28 +36,7 @@ GenId() # On génère un ID unique pour notre fenêtre
 	exit 0
 }
 export POL_SetupWindow_ID=$(GenId)
-#POL_SetupWindow_presentation ()
-#{
-#	echo "MsgIn" > "$REPERTOIRE/configurations/guis/$POL_SetupWindow_ID"
-#	echo "presentation" >> "$REPERTOIRE/configurations/guis/$POL_SetupWindow_ID"
-#	echo "$1" >> "$REPERTOIRE/configurations/guis/$POL_SetupWindow_ID"
-#	echo "$2" >> "$REPERTOIRE/configurations/guis/$POL_SetupWindow_ID"
-#	echo "$3" >> "$REPERTOIRE/configurations/guis/$POL_SetupWindow_ID"
-#	echo "$4" >> "$REPERTOIRE/configurations/guis/$POL_SetupWindow_ID"
-#	echo "$5" >> "$REPERTOIRE/configurations/guis/$POL_SetupWindow_ID"
-#	MESSAGE=$(cat "$REPERTOIRE/configurations/guis/$POL_SetupWindow_ID" | grep '^MsgOut$') 
-#	while [ ! "$MESSAGE" = "MsgOut" ]
-#	do
-#		MESSAGE=$(cat "$REPERTOIRE/configurations/guis/$POL_SetupWindow_ID" | grep '^MsgOut$') 
-#		sleep 0.1
-#	done
-#	MESSAGE_BIS=$(cat "$REPERTOIRE/configurations/guis/$POL_SetupWindow_ID" | grep '^MSG_RECEIVED=')
-#	if [ "$MESSAGE_BIS" = "MSG_RECEIVED=Cancel" ]
-#	then
-#		rm "$REPERTOIRE/configurations/guis/$POL_SetupWindow_ID"
-#		exit 
-#	fi
-#}
+
 POL_SetupWindow_presentation ()
 {
 	TEXTE="$(eval_gettext 'This assistant will help you to install ')$1$(eval_gettext ' on your computer.')\n\n$(eval_gettext 'This program is made by ')$2\n($3)\n\n$(eval_gettext 'This installation program is provided by ')$4\n\n$1$(eval_gettext ' will be installed in ')$REPERTOIRE/wineprefix/$5\n\n$(eval_gettext 'PlayOnLinux is not responsible of your way to use these scripts')\n\n$(eval_gettext 'Click on next to start')"
@@ -453,7 +432,7 @@ POL_SetupWindow_games ()
 		export APP_ANSWER="$MESSAGE_TER"
 	fi
 }
-POL_SetupWindow_prefixcreate ()
+POL_SetupWindow_specialprefixcreate ()
 {
 	POL_SetupWindow_wait_next_signal "$(eval_gettext 'Please wait while the wine prefix is created...')" "$(eval_gettext 'Wine prefix configuration')"
 	wineprefixcreate
@@ -462,6 +441,16 @@ POL_SetupWindow_prefixcreate ()
 	set_programfile_dir
 	POL_SetupWindow_detect_exit
 }
+POL_SetupWindow_oldprefixcreate ()
+{
+	POL_SetupWindow_wait_next_signal "$(eval_gettext 'Please wait while the wine prefix is created...')" "$(eval_gettext 'Wine prefix configuration')"
+	wineprefixcreate
+	POL_SetupWindow_detect_exit
+}
+POL_SetupWindow_prefixcreate ()
+{
+	POL_SetupWindow_normalprefixcreate
+}
 POL_SetupWindow_normalprefixcreate()
 {
 	POL_SetupWindow_wait_next_signal "$(eval_gettext 'Please wait while the wine prefix is created...')" "$(eval_gettext 'Wine prefix configuration')"
diff --git a/lib/main b/lib/main
index 634b210..ca1c8da 100644
--- a/lib/main
+++ b/lib/main
@@ -227,11 +227,7 @@ start_pol ()
 		lancer "$2" "$Arg"
 		exit 0
 	fi
-	if [ ! "$LAST_VERSION" = "$VERSION" ]
-	then
-		echo "$VERSION" > "$REPERTOIRE/configurations/last_version"
-		browser "$URL/changelog.html" &
-	fi
+	bash "$PLAYONLINUX/bash/check_maj_" &
 	check_new_pol
 	if [ ! "$NEW_VERSION" = "" ]
 	then
diff --git a/lib/variables b/lib/variables
index a6d131a..40d8e8c 100644
--- a/lib/variables
+++ b/lib/variables
@@ -18,7 +18,7 @@ export TITRE="PlayOnLinux"
 export URL="http://www.playonlinux.com"
 export SITE="http://www.playonlinux.com/script_files/"
 export REPERTOIRE="$HOME/.PlayOnLinux"
-export VERSION="3.3.1"
+export VERSION="3.4"
 export LAST_VERSION=$(cat "$REPERTOIRE/configurations/last_version" 2> /dev/null)
 export PYTHON="python"
 if [ "$VRAIPATH" = "" ]
diff --git a/python/mainwindow.py b/python/mainwindow.py
index 409b640..1b3b3df 100755
--- a/python/mainwindow.py
+++ b/python/mainwindow.py
@@ -27,7 +27,7 @@ import lib.Variables as Variables, lib.lng as lng
 
 class MainWindow(wx.Frame):
   def __init__(self,parent,id,title):
-    wx.Frame.__init__(self, parent, -1, title, size = (720, 565))
+    wx.Frame.__init__(self, parent, -1, title, size = (600, 565))
     self.SetIcon(wx.Icon(Variables.playonlinux_env+"/etc/playonlinux.png", wx.BITMAP_TYPE_ANY))
     self.timer = wx.Timer(self, 1)
 
@@ -89,6 +89,10 @@ class MainWindow(wx.Frame):
     self.polshell_item.SetBitmap(wx.Bitmap(Variables.playonlinux_env+"/etc/menu/polshell.png"))
     self.expertmenu.AppendItem(self.polshell_item)
 
+    self.cdrom_item = wx.MenuItem(self.expertmenu, 120, _("Autorun"))
+    self.cdrom_item.SetBitmap(wx.Bitmap(Variables.playonlinux_env+"/etc/menu/cdrom.png"))
+    self.expertmenu.AppendItem(self.cdrom_item)
+
     self.optionmenu = wx.Menu()
 
     self.option_item = wx.MenuItem(self.expertmenu, 210, _("General"))
@@ -163,8 +167,7 @@ class MainWindow(wx.Frame):
     self.toolbar.AddLabelTool(wx.ID_OPEN, _("Run"), wx.ArtProvider.GetBitmap("gtk-open", wx.ART_TOOLBAR))
     self.toolbar.AddLabelTool(wx.ID_ADD, _("Install"), wx.ArtProvider.GetBitmap("gtk-add", wx.ART_TOOLBAR))
     self.toolbar_remove = self.toolbar.AddLabelTool(wx.ID_DELETE, _("Remove"), wx.ArtProvider.GetBitmap("gtk-delete", wx.ART_TOOLBAR))
-    self.toolbar.AddLabelTool(wx.ID_REFRESH, _("Refresh the repository"), wx.ArtProvider.GetBitmap("gtk-refresh", wx.ART_TOOLBAR))
-    self.toolbar.AddLabelTool(120, _("Autorun"), wx.ArtProvider.GetBitmap("gtk-cdrom", wx.ART_TOOLBAR))
+    #self.toolbar.AddLabelTool(wx.ID_REFRESH, _("Refresh the repository"), wx.ArtProvider.GetBitmap("gtk-refresh", wx.ART_TOOLBAR))
     self.toolbar.AddLabelTool(121, _("Configure this application"), wx.ArtProvider.GetBitmap("gtk-edit", wx.ART_TOOLBAR))
     self.Reload(self)
     wx.EVT_MENU(self, wx.ID_OPEN,  self.Run)
@@ -247,32 +250,13 @@ class MainWindow(wx.Frame):
     except : 
 	print("bash \""+Variables.playonlinux_rep+"/plugins/"+plugin+"/scripts/menu\" "+game_exec+"&")
 
-  def Lng_choose(self, event):
-    print("Running lng_choose")
-    os.system("bash \""+Variables.playonlinux_env+"/bash/options/lng_choose\"&")
-
-  def Repository(self, event):
-    print("Running repository")
-    os.system("bash \""+Variables.playonlinux_env+"/bash/options/repository\"&")
-  
-  def Panels(self, event):
-    print("Running panel")
-    os.system("bash \""+Variables.playonlinux_env+"/bash/options/panel\"&")
-
-  def Informations(self, event):
-    print("Running informations menu")
-    os.system("bash \""+Variables.playonlinux_env+"/bash/options/infos\"&")
-
   def killwineserver(self, event):
-    print("Running kill wineserver")
     os.system("bash \""+Variables.playonlinux_env+"/bash/expert/kill_wineserver\"&")
 
   def Executer(self, event):
-    print("Running exec")
     os.system("bash \""+Variables.playonlinux_env+"/bash/expert/Executer\"&")
 
   def PolShell(self, event):
-    print("unning PolShell")
     os.system("bash \""+Variables.playonlinux_env+"/bash/expert/PolShell\"&")
 
   def Configure(self, event):

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/playonlinux.git

More information about the Pkg-games-commits mailing list