Merge pull request #73 from Isayso/dev_ffprobe

1.7.4

KodiPlaylistEditorIPTV.sln

@@ -1,10 +1,11 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28307.168
+# Visual Studio Version 17
+VisualStudioVersion = 17.4.33205.214
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KodiPlaylistEditorIPTV", "KodiPlaylistEditorIPTV\KodiPlaylistEditorIPTV.csproj", "{8563684F-6C0A-4357-AFED-CA569E67F906}"
 EndProject
+Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "PlaylistEditorTVSetup", "PlaylistEditorTVSetup\PlaylistEditorTVSetup.vdproj", "{D0363779-E46C-4E34-9B9C-43F7B4CAAAE3}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -15,6 +16,8 @@ Global
 		{8563684F-6C0A-4357-AFED-CA569E67F906}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8563684F-6C0A-4357-AFED-CA569E67F906}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8563684F-6C0A-4357-AFED-CA569E67F906}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D0363779-E46C-4E34-9B9C-43F7B4CAAAE3}.Debug|Any CPU.ActiveCfg = Debug
+		{D0363779-E46C-4E34-9B9C-43F7B4CAAAE3}.Release|Any CPU.ActiveCfg = Release
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

KodiPlaylistEditorIPTV/AboutBox1.cs

@@ -128,7 +128,7 @@ public string AssemblyCompany
 
         private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
         {
-            System.Diagnostics.Process.Start("https://github.com/Isayso/PlaylistEditorTV/releases");
+            System.Diagnostics.Process.Start("https://codeberg.org/Isayso/PlaylistEditorTV/releases");
         }
 
         private void donateButton_Click(object sender, EventArgs e)

KodiPlaylistEditorIPTV/AboutBox1.resx

@@ -130,13 +130,13 @@
   </data>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="button1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>508, 368</value>
+    <value>508, 410</value>
   </data>
   <data name="button1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>4, 4, 4, 4</value>
   </data>
   <data name="button1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>112, 26</value>
+    <value>112, 29</value>
   </data>
   <data name="button1.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -172,7 +172,7 @@
     <value>True</value>
   </data>
   <data name="textBox1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>299, 390</value>
+    <value>299, 435</value>
   </data>
   <data name="textBox1.TabIndex" type="System.Int32, mscorlib">
     <value>27</value>
@@ -214,16 +214,16 @@ SPACE is AND in find box</value>
     <value>NoControl</value>
   </data>
   <data name="labelProductName.Location" type="System.Drawing.Point, System.Drawing">
-    <value>321, 40</value>
+    <value>321, 44</value>
   </data>
   <data name="labelProductName.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>9, 0, 4, 0</value>
   </data>
   <data name="labelProductName.MaximumSize" type="System.Drawing.Size, System.Drawing">
-    <value>0, 24</value>
+    <value>0, 27</value>
   </data>
   <data name="labelProductName.Size" type="System.Drawing.Size, System.Drawing">
-    <value>299, 24</value>
+    <value>299, 27</value>
   </data>
   <data name="labelProductName.TabIndex" type="System.Int32, mscorlib">
     <value>19</value>
@@ -253,16 +253,16 @@ SPACE is AND in find box</value>
     <value>NoControl</value>
   </data>
   <data name="labelVersion.Location" type="System.Drawing.Point, System.Drawing">
-    <value>321, 69</value>
+    <value>321, 77</value>
   </data>
   <data name="labelVersion.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>9, 0, 4, 0</value>
   </data>
   <data name="labelVersion.MaximumSize" type="System.Drawing.Size, System.Drawing">
-    <value>0, 24</value>
+    <value>0, 27</value>
   </data>
   <data name="labelVersion.Size" type="System.Drawing.Size, System.Drawing">
-    <value>299, 24</value>
+    <value>299, 27</value>
   </data>
   <data name="labelVersion.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -292,16 +292,16 @@ SPACE is AND in find box</value>
     <value>NoControl</value>
   </data>
   <data name="labelCopyright.Location" type="System.Drawing.Point, System.Drawing">
-    <value>321, 98</value>
+    <value>321, 110</value>
   </data>
   <data name="labelCopyright.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>9, 0, 4, 0</value>
   </data>
   <data name="labelCopyright.MaximumSize" type="System.Drawing.Size, System.Drawing">
-    <value>0, 24</value>
+    <value>0, 27</value>
   </data>
   <data name="labelCopyright.Size" type="System.Drawing.Size, System.Drawing">
-    <value>299, 24</value>
+    <value>299, 27</value>
   </data>
   <data name="labelCopyright.TabIndex" type="System.Int32, mscorlib">
     <value>21</value>
@@ -331,16 +331,16 @@ SPACE is AND in find box</value>
     <value>NoControl</value>
   </data>
   <data name="labelCompanyName.Location" type="System.Drawing.Point, System.Drawing">
-    <value>321, 127</value>
+    <value>321, 143</value>
   </data>
   <data name="labelCompanyName.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>9, 0, 4, 0</value>
   </data>
   <data name="labelCompanyName.MaximumSize" type="System.Drawing.Size, System.Drawing">
-    <value>0, 24</value>
+    <value>0, 27</value>
   </data>
   <data name="labelCompanyName.Size" type="System.Drawing.Size, System.Drawing">
-    <value>299, 24</value>
+    <value>299, 27</value>
   </data>
   <data name="labelCompanyName.TabIndex" type="System.Int32, mscorlib">
     <value>22</value>
@@ -367,7 +367,7 @@ SPACE is AND in find box</value>
     <value>Fill</value>
   </data>
   <data name="textBoxDescription.Location" type="System.Drawing.Point, System.Drawing">
-    <value>321, 160</value>
+    <value>321, 180</value>
   </data>
   <data name="textBoxDescription.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>9, 4, 4, 4</value>
@@ -379,7 +379,7 @@ SPACE is AND in find box</value>
     <value>Both</value>
   </data>
   <data name="textBoxDescription.Size" type="System.Drawing.Size, System.Drawing">
-    <value>299, 140</value>
+    <value>299, 158</value>
   </data>
   <data name="textBoxDescription.TabIndex" type="System.Int32, mscorlib">
     <value>23</value>
@@ -418,7 +418,7 @@ SPACE is AND in find box</value>
     <value>4, 0, 0, 0</value>
   </data>
   <data name="donateButton.Size" type="System.Drawing.Size, System.Drawing">
-    <value>112, 40</value>
+    <value>112, 44</value>
   </data>
   <data name="donateButton.TabIndex" type="System.Int32, mscorlib">
     <value>24</value>
@@ -442,10 +442,10 @@ SPACE is AND in find box</value>
     <value>NoControl</value>
   </data>
   <data name="linkLabel1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>315, 304</value>
+    <value>315, 342</value>
   </data>
   <data name="linkLabel1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>132, 18</value>
+    <value>148, 20</value>
   </data>
   <data name="linkLabel1.TabIndex" type="System.Int32, mscorlib">
     <value>25</value>
@@ -469,7 +469,7 @@ SPACE is AND in find box</value>
     <value>Fill</value>
   </data>
   <data name="tableLayoutPanel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>14, 12</value>
+    <value>14, 13</value>
   </data>
   <data name="tableLayoutPanel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>4, 4, 4, 4</value>
@@ -478,7 +478,7 @@ SPACE is AND in find box</value>
     <value>8</value>
   </data>
   <data name="tableLayoutPanel.Size" type="System.Drawing.Size, System.Drawing">
-    <value>624, 398</value>
+    <value>624, 443</value>
   </data>
   <data name="tableLayoutPanel.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -496,16 +496,16 @@ SPACE is AND in find box</value>
     <value>0</value>
   </data>
   <data name="tableLayoutPanel.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms">
-    <value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="button1" Row="7" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="textBox1" Row="0" RowSpan="8" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="labelProductName" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="labelVersion" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="labelCopyright" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="labelCompanyName" Row="3" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="textBoxDescription" Row="4" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="donateButton" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="linkLabel1" Row="5" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Percent,50,Percent,50" /&gt;&lt;Rows Styles="Absolute,40,Percent,11,11111,Percent,11,11111,Percent,11,11111,Percent,11,11111,Percent,55,55556,Absolute,50,Absolute,40" /&gt;&lt;/TableLayoutSettings&gt;</value>
+    <value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="button1" Row="7" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="textBox1" Row="0" RowSpan="8" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="labelProductName" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="labelVersion" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="labelCopyright" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="labelCompanyName" Row="3" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="textBoxDescription" Row="4" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="donateButton" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="linkLabel1" Row="5" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Percent,50,Percent,50" /&gt;&lt;Rows Styles="Absolute,44,Percent,11,11111,Percent,11,11111,Percent,11,11111,Percent,11,11111,Percent,55,55556,Absolute,56,Absolute,44" /&gt;&lt;/TableLayoutSettings&gt;</value>
   </data>
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
   <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
-    <value>9, 18</value>
+    <value>9, 20</value>
   </data>
   <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>652, 422</value>
+    <value>652, 469</value>
   </data>
   <data name="$this.Font" type="System.Drawing.Font, System.Drawing">
     <value>Microsoft Sans Serif, 9.818182pt</value>
@@ -514,7 +514,7 @@ SPACE is AND in find box</value>
     <value>4, 4, 4, 4</value>
   </data>
   <data name="$this.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>14, 12, 14, 12</value>
+    <value>14, 13, 14, 13</value>
   </data>
   <data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
     <value>CenterParent</value>

KodiPlaylistEditorIPTV/App.config

@@ -31,7 +31,7 @@ Sample
                 <value>1</value>
             </setting>
             <setting name="rpi" serializeAs="String">
-                <value>192.168.178.91</value>
+                <value />
             </setting>
             <setting name="port" serializeAs="String">
                 <value>8080</value>
@@ -136,6 +136,9 @@ Sample
             <setting name="colDupli2" serializeAs="String">
                 <value>0</value>
             </setting>
+            <setting name="enableKodi" serializeAs="String">
+                <value>False</value>
+            </setting>
         </PlaylistEditor.Properties.Settings>
     </userSettings>
 </configuration>

KodiPlaylistEditorIPTV/Changelog.txt

@@ -1,4 +1,12 @@
-1.7.2
+1.7.4
+- bugfix
+
+1.7.3
+- missing option on German
+- no Kodi IP disables button
+- Install Package
+
+1.7.2
 - ESC closes find box
 - support of vlc options #EXTVCLOPT
 

KodiPlaylistEditorIPTV/ClassKodi.cs

@@ -27,12 +27,17 @@ internal class ClassKodi
         public static async Task<bool> RunOnKodi(string link)
         {
             string kodiIP = Settings.Default.rpi;
+
+            if (string.IsNullOrEmpty(kodiIP) || !Settings.Default.enableKodi) return false;  //#68
+
             string kodiUser = Settings.Default.username.Trim();
             string kodiPort = Settings.Default.port;
             //  string kodiPass = Properties.Settings.Default.password; https://stackoverflow.com/questions/12657792/how-to-securely-save-username-password-local
             byte[] plaintext = null;
             string kodiPass = "";
 
+
+
             if (Settings.Default.cipher != null && Settings.Default.entropy != null)
             {
                 plaintext = ProtectedData.Unprotect(Settings.Default.cipher, Settings.Default.entropy,