Skip to content

Commit

Permalink
Merge pull request #64 from Isayso/dev_ffprobe
Browse files Browse the repository at this point in the history
Dev ffprobe
  • Loading branch information
Isayso authored Mar 14, 2022
2 parents a726a16 + 35cb690 commit 109cf13
Show file tree
Hide file tree
Showing 10 changed files with 1,023 additions and 968 deletions.
4 changes: 0 additions & 4 deletions KodiPlaylistEditorIPTV/AboutBox1.cs
Original file line number Diff line number Diff line change
Expand Up @@ -138,10 +138,6 @@ private void donateButton_Click(object sender, EventArgs e)
a.ShowDialog();
}

//MessageBox.Show("Thank You for considering a donation. " + Environment.NewLine +
// "Paypal fee from 1$ donation is 40 ct." + Environment.NewLine +
// "Small money donation doesn't make sense, Bigtec is making money and screw elections with it. " + Environment.NewLine + "So enjoy my small program!"
// + Environment.NewLine + "If you want to donate money, you find my donate link on th Github page, Thanks!");
}
}
}
1 change: 1 addition & 0 deletions KodiPlaylistEditorIPTV/AboutBox1.resx
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,7 @@ Ctrl + S save
Ctrl + P send link to Kodi
Ctrl + T move line to top of list
Ctrl + B move line to bottom of list
Ctrl + Z undo
Ctrl + +/- change font size
Ctrl + 1/2 move line up/down
del delete selected row
Expand Down
7 changes: 0 additions & 7 deletions KodiPlaylistEditorIPTV/AboutBox2.cs
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;

namespace PlaylistEditor
Expand Down
7 changes: 6 additions & 1 deletion KodiPlaylistEditorIPTV/Changelog.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
1.7.0
1.7.1
- D&D with right mouse button
- bug file header
- bug grey links

1.7.0
- more columns
- all known elements
- udp support
Expand Down
82 changes: 41 additions & 41 deletions KodiPlaylistEditorIPTV/ClassHelp.cs
Original file line number Diff line number Diff line change
Expand Up @@ -362,47 +362,47 @@ public static bool CheckClipboard()
return false;
}

public static bool CheckClipboard3(List<string> cols)
{
DataObject o = (DataObject)Clipboard.GetDataObject();

if (Clipboard.ContainsText())
{
try
{
string[] pastedRows = System.Text.RegularExpressions.Regex
.Split(o.GetData(DataFormats.UnicodeText).ToString()
.TrimEnd("\r\n".ToCharArray()), "\r\n");

pastedRows[0] = pastedRows[0].Trim('\t');

string[] pastedRowCells = pastedRows[0].Split(new char[] { '\t' }); //TODO 0 or 1

if (cols.Count.Equals(0))
{
List<ColList> elements = new List<ColList>();
elements = ClassHelp.SeekFileElements(pastedRows[0]);

if (pastedRowCells.Length == elements.Count + 2) return true; //TODO more columns

}
else
{
if (pastedRowCells.Length == cols.Count) return true;
}

// if (pastedRowCells.Length == 6) return true; //TODO more columns
// if (pastedRowCells.Length == cols.Count) return true; //TODO more columns
// check for visible rows
}
catch (Exception ex)
{
MessageBox.Show("Paste operation failed. (check clip) " + ex.Message, "Copy/Paste", MessageBoxButtons.OK, MessageBoxIcon.Warning);
}
}

return false;
}
//public static bool CheckClipboard3(List<string> cols)
//{
// DataObject o = (DataObject)Clipboard.GetDataObject();

// if (Clipboard.ContainsText())
// {
// try
// {
// string[] pastedRows = System.Text.RegularExpressions.Regex
// .Split(o.GetData(DataFormats.UnicodeText).ToString()
// .TrimEnd("\r\n".ToCharArray()), "\r\n");

// pastedRows[0] = pastedRows[0].Trim('\t');

// string[] pastedRowCells = pastedRows[0].Split(new char[] { '\t' }); //TODO 0 or 1

// if (cols.Count.Equals(0))
// {
// List<ColList> elements = new List<ColList>();
// elements = ClassHelp.SeekFileElements(pastedRows[0]);

// if (pastedRowCells.Length == elements.Count + 2) return true; //TODO more columns

// }
// else
// {
// if (pastedRowCells.Length == cols.Count) return true;
// }

// // if (pastedRowCells.Length == 6) return true; //TODO more columns
// // if (pastedRowCells.Length == cols.Count) return true; //TODO more columns
// // check for visible rows
// }
// catch (Exception ex)
// {
// MessageBox.Show("Paste operation failed. (check clip) " + ex.Message, "Copy/Paste", MessageBoxButtons.OK, MessageBoxIcon.Warning);
// }
// }

// return false;
//}


/// <summary>
Expand Down
12 changes: 6 additions & 6 deletions KodiPlaylistEditorIPTV/EditHeader.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 109cf13

Please sign in to comment.