From 54e998d579f2c1ffcb3d11579a46d72bcd516855 Mon Sep 17 00:00:00 2001
From: angelblue05 <tamara.angel05@gmail.com>
Date: Fri, 12 Feb 2016 16:30:20 -0600
Subject: [PATCH] Update skip delete message

Github wiki updated accordingly
---
 resources/language/English/strings.xml | 7 +++++--
 resources/lib/kodimonitor.py           | 9 ++++++---
 resources/lib/player.py                | 2 +-
 resources/settings.xml                 | 6 ++++--
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/resources/language/English/strings.xml b/resources/language/English/strings.xml
index 6effb2c2..21b92ce4 100644
--- a/resources/language/English/strings.xml
+++ b/resources/language/English/strings.xml
@@ -279,14 +279,14 @@
     <string id="30510">Direct stream music library</string>
     <string id="30511">Playback Mode</string>
     <string id="30512">Force artwork caching</string>
-    <string id="30513">Limit artwork cache threads</string>
+    <string id="30513">Limit artwork cache threads (recommended for rpi)</string>
     <string id="30514">Enable fast startup (requires server plugin)</string>
     <string id="30515">Maximum items to request from the server at once</string>
     <string id="30516">Playback</string>
     <string id="30517">Network credentials</string>
     <string id="30518">Enable Emby cinema mode</string>
     <string id="30519">Ask to play trailers</string>
-    <string id="30520">Skip delete confirmation</string>
+    <string id="30520">Skip Emby delete confirmation</string>
     <string id="30521">Jump back on resume (in seconds)</string>
     <string id="30522">Force transcode H265</string>
     <string id="30523">Music metadata options (not compatible with direct stream)</string>
@@ -300,6 +300,9 @@
     <string id="30531">Enable new content notification</string>
     <string id="30532">Duration of the video library pop up (in seconds)</string>
     <string id="30533">Duration of the music library pop up (in seconds)</string>
+    <string id="30534">For the context menu</string>
+    <string id="30535">After playback (Caution!)</string>
+    <string id="30536">Server messages</string>
 
     <!-- service add-on -->
     <string id="33000">Welcome</string>
diff --git a/resources/lib/kodimonitor.py b/resources/lib/kodimonitor.py
index ac781e5a..76420092 100644
--- a/resources/lib/kodimonitor.py
+++ b/resources/lib/kodimonitor.py
@@ -179,17 +179,20 @@ class KodiMonitor(xbmc.Monitor):
                 except TypeError:
                     self.logMsg("Could not find itemid in emby database.", 1)
                 else:
-                    if utils.settings('skipConfirmDelete') != "true":
-                        resp = xbmcgui.Dialog().yesno(
+                    if utils.settings('skipContextMenu') != "true":
+                        self.logMsg("BAM!")
+                        '''resp = xbmcgui.Dialog().yesno(
                                                 heading="Confirm delete",
                                                 line1="Delete file on Emby Server?")
                         if not resp:
                             self.logMsg("User skipped deletion.", 1)
                             embycursor.close()
                             return
+
                     url = "{server}/emby/Items/%s?format=json" % itemid
                     self.logMsg("Deleting request: %s" % itemid)
-                    doUtils.downloadUrl(url, type="DELETE")
+                    doUtils.downloadUrl(url, type="DELETE")'''
+                    self.logMsg("BAm!")
                 finally:
                     embycursor.close()
 
diff --git a/resources/lib/player.py b/resources/lib/player.py
index 354b8984..ecc6ac64 100644
--- a/resources/lib/player.py
+++ b/resources/lib/player.py
@@ -482,7 +482,7 @@ class Player(xbmc.Player):
                         offerDelete = False
 
                     if percentComplete >= markPlayedAt and offerDelete:
-                        if utils.settings('skipConfirmDelete') != "true":
+                        if utils.settings('skipPlayback') != "true":
                             resp = xbmcgui.Dialog().yesno(
                                                     heading="Confirm delete",
                                                     line1="Delete file on Emby Server?")
diff --git a/resources/settings.xml b/resources/settings.xml
index 3889f837..40ce0a7d 100644
--- a/resources/settings.xml
+++ b/resources/settings.xml
@@ -49,7 +49,6 @@
         <setting id="offerDelete" type="bool" label="30114" default="false" />
 		<setting id="deleteTV" type="bool" label="30115" visible="eq(-1,true)" default="false" subsetting="true" />
 		<setting id="deleteMovies" type="bool" label="30116" visible="eq(-2,true)" default="false" subsetting="true" />
-		<setting id="skipConfirmDelete" type="bool" label="30520" visible="eq(-3,true)" default="false" subsetting="true" />
 		<setting id="resumeJumpBack" type="slider" label="30521" default="10" range="0,1,120" option="int" />
 		<setting type="sep" />
 	    <setting id="playFromStream" type="bool" label="30002" default="false" />
@@ -64,7 +63,10 @@
 	    <setting id="enableCoverArt" type="bool" label="30157" default="true" />
 	    <setting id="ignoreSpecialsNextEpisodes" type="bool" label="30527" default="false" />
 		<setting id="additionalUsers" type="text" label="30528" default="" />
-		<setting type="sep" />
+		<setting type="lsep" label="30520" />
+	    <setting id="skipContextMenu" type="bool" label="30534" default="false" />
+	    <setting id="skipPlayback" type="bool" label="30535" default="false" />
+		<setting type="lsep" label="30536" />
 		<setting id="connectMsg" type="bool" label="30249" default="true" />
         <setting id="restartMsg" type="bool" label="30530" default="false" />
         <setting id="newContent" type="bool" label="30531" default="false" />