Compare commits

...

1 Commits
0.2.5 ... 0.2.6

Author SHA1 Message Date
Frank Skare
6022809080 - 2019-03-08 22:51:34 +01:00
7 changed files with 10 additions and 21 deletions

View File

@@ -43,7 +43,7 @@
// //
this.AllowDrop = true; this.AllowDrop = true;
this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 25F); this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 25F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.BackColor = System.Drawing.Color.Black; this.BackColor = System.Drawing.Color.Black;
this.ClientSize = new System.Drawing.Size(1553, 1000); this.ClientSize = new System.Drawing.Size(1553, 1000);
this.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
@@ -52,7 +52,6 @@
this.Name = "MainForm"; this.Name = "MainForm";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "mpv.net"; this.Text = "mpv.net";
this.Activated += new System.EventHandler(this.MainForm_Activated);
this.Load += new System.EventHandler(this.MainForm_Load); this.Load += new System.EventHandler(this.MainForm_Load);
this.ResumeLayout(false); this.ResumeLayout(false);

View File

@@ -33,7 +33,6 @@ namespace mpvnet
Instance = this; Instance = this;
Hwnd = Handle; Hwnd = Handle;
ChangeFullscreen((mpv.mpvConv.ContainsKey("fullscreen") && mpv.mpvConv["fullscreen"] == "yes") || (mpv.mpvConv.ContainsKey("fs") && mpv.mpvConv["fs"] == "yes")); ChangeFullscreen((mpv.mpvConv.ContainsKey("fullscreen") && mpv.mpvConv["fullscreen"] == "yes") || (mpv.mpvConv.ContainsKey("fs") && mpv.mpvConv["fs"] == "yes"));
ToolStripManager.Renderer = new ToolStripRendererEx(ToolStripRenderModeEx.SystemDefault);
CMS = new ContextMenuStripEx(components); CMS = new ContextMenuStripEx(components);
CMS.Opened += CMS_Opened; CMS.Opened += CMS_Opened;
ContextMenuStrip = CMS; ContextMenuStrip = CMS;
@@ -303,10 +302,5 @@ namespace mpvnet
mpv.VideoSizeChanged += Mpv_VideoSizeChanged; mpv.VideoSizeChanged += Mpv_VideoSizeChanged;
mpv.PlaybackRestart += mpv_PlaybackRestart; mpv.PlaybackRestart += mpv_PlaybackRestart;
} }
private void MainForm_Activated(object sender, EventArgs ea)
{
}
} }
} }

View File

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.2.5.0")] [assembly: AssemblyVersion("0.2.6.0")]
[assembly: AssemblyFileVersion("0.2.5.0")] [assembly: AssemblyFileVersion("0.2.6.0")]

View File

@@ -27,8 +27,8 @@ m cycle mute #menu: M ; Volume | Mute
KP6 add audio-delay 0.100 #menu: Numpad 6 ; Audio | Delay +0.1 KP6 add audio-delay 0.100 #menu: Numpad 6 ; Audio | Delay +0.1
KP9 add audio-delay -0.100 #menu: Numpad 9 ; Audio | Delay -0.1 KP9 add audio-delay -0.100 #menu: Numpad 9 ; Audio | Delay -0.1
Right no-osd seek 10 #menu: Right ; Seek | 7 sec forward Right no-osd seek 7 #menu: Right ; Seek | 7 sec forward
Left no-osd seek -10 #menu: Left ; Seek | 7 sec backward Left no-osd seek -7 #menu: Left ; Seek | 7 sec backward
_ ignore #menu: _ ; Seek | - _ ignore #menu: _ ; Seek | -
Up no-osd seek 40 #menu: Up ; Seek | 1 min forward Up no-osd seek 40 #menu: Up ; Seek | 1 min forward
Down no-osd seek -40 #menu: Down ; Seek | 1 min backward Down no-osd seek -40 #menu: Down ; Seek | 1 min backward

View File

@@ -66,6 +66,7 @@ namespace mpvnet
SetIntProp("input-ar-rate", 20); SetIntProp("input-ar-rate", 20);
SetIntProp("volume", 50); SetIntProp("volume", 50);
SetStringProp("hwdec", "yes"); SetStringProp("hwdec", "yes");
SetStringProp("vo", "direct3d");
SetStringProp("input-default-bindings", "yes"); SetStringProp("input-default-bindings", "yes");
SetStringProp("osd-playing-msg", "'${filename}'"); SetStringProp("osd-playing-msg", "'${filename}'");
SetStringProp("screenshot-directory", "~~desktop/"); SetStringProp("screenshot-directory", "~~desktop/");

View File

@@ -1,8 +1,8 @@
using namespace System.Diagnostics using namespace System.Diagnostics
$exePath = "C:\Users\frank\Desktop\Projekte\mpvnet\mpvnet\bin\Debug\mpvnet.exe" $exePath = "C:\Users\frank\C-Daten\Projekte\VS\CS\mpvnet\mpvnet\bin\Debug\mpvnet.exe"
$version = [FileVersionInfo]::GetVersionInfo($exePath).FileVersion $version = [FileVersionInfo]::GetVersionInfo($exePath).FileVersion
$targetDir = "C:\Users\Frank\Desktop\mpv.net-" + $version $targetDir = "C:\Users\Frank\Desktop\mpv.net-" + $version
Copy-Item C:\Users\frank\Desktop\Projekte\mpvnet\mpvnet\bin\Debug $targetDir -recurse Copy-Item C:\Users\frank\C-Daten\Projekte\VS\CS\mpvnet\mpvnet\bin\Debug $targetDir -recurse
$addonDir = $targetDir + "\Addons" $addonDir = $targetDir + "\Addons"
remove-item $addonDir -Recurse -Include *vbnet.pdb, *mpvnet.exe, *mpvnet.exe.config, *mpvnet.pdb, *vbnet.dll remove-item $addonDir -Recurse -Include *vbnet.pdb, *mpvnet.exe, *mpvnet.exe.config, *mpvnet.pdb, *vbnet.dll
D:\Projekte\VS\VB\util\bin\util.exe -pack $targetDir C:\Users\frank\C-Daten\Projekte\VS\VB\util\bin\util.exe -pack $targetDir

View File

@@ -254,14 +254,9 @@ Namespace UI
MyBase.New(container) MyBase.New(container)
End Sub End Sub
Protected Overrides Sub OnOpening(e As CancelEventArgs)
MyBase.OnOpening(e)
MenuHelp.SetRenderer(Me)
End Sub
Protected Overrides Sub OnHandleCreated(e As EventArgs) Protected Overrides Sub OnHandleCreated(e As EventArgs)
MyBase.OnHandleCreated(e) MyBase.OnHandleCreated(e)
Font = New Font("Segoe UI", 9) MenuHelp.SetRenderer(Me)
End Sub End Sub
<DefaultValue(GetType(Form), Nothing)> <DefaultValue(GetType(Form), Nothing)>