Skip to content

Commit

Permalink
Version 1.5.2
Browse files Browse the repository at this point in the history
  • Loading branch information
Viruzober committed Jul 16, 2020
1 parent dbe73bc commit bca4605
Show file tree
Hide file tree
Showing 12 changed files with 77 additions and 28 deletions.
5 changes: 5 additions & 0 deletions Changelog.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
16.07.2020
1. При закрытии Kontakt из списка библиотек клавиши освобождаются правильно.
2. При переходе в окно Serum нет постоянного сообщения о необходимых действиях.
3. Доступна регистрация Omnisphere.
4. Этот релиз только для исправления мелких багов.
09.07.2020
1. Исправлена справка по Ctrl+Shift+F3. Иногда выбивала исключения.
2. Теперь все клавиши освобождаются как надо. Устроить дрель на клавиатуре больше не получится.
Expand Down
2 changes: 1 addition & 1 deletion Core/VUIManager/VUILoader.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ public partial class MagicKeys

public static void VUILoader(string File)
{
InvokeFromString("KeyUnReg");
SoundPlay("ChangeVUI.ogg", 0);
string VUIFile = @"VUI\"+File;
PluginsList[0]["VUI"] = @File;
Expand Down Expand Up @@ -42,7 +43,6 @@ public static void VUILoader(string File)
}
}
VUIObjectsUpdate(true);
InvokeFromString("KeyUnReg");
InvokeFromString("KeyReg");
}

Expand Down
2 changes: 1 addition & 1 deletion Core/Variable.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ namespace MagicKeys
{
public partial class MagicKeys
{
public static string Version = "1.5.1";
public static string Version = "1.5.2";
public static bool RegUser = true;
public static Size Display = System.Windows.Forms.Screen.PrimaryScreen.Bounds.Size;
public static int Width = Display.Width;
Expand Down
Binary file added Images/Omnisphere/FullEnd.bmp
Binary file not shown.
Binary file added Images/Omnisphere/FullHome.bmp
Binary file not shown.
6 changes: 0 additions & 6 deletions Plugins/Kontakt/KontaktKey.cs
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,12 @@ public static void KeyReg()
public static void KeyUnReg()
{
KeyNavigatorUnReg();
if (API.GetVUIName() != "LibList")
{
UnregisterHotKey(KontaktKeyHandle.Handle, 4);
UnregisterHotKey(KontaktKeyHandle.Handle, 5);
UnregisterHotKey(KontaktKeyHandle.Handle, 6);
UnregisterHotKey(KontaktKeyHandle.Handle, 7);
UnregisterHotKey(KontaktKeyHandle.Handle, 8);
}
if (API.GetVUIName() != "Kontakt")
{
UnregisterHotKey(KontaktKeyHandle.Handle, 9);
}
UnregisterHotKey(KontaktKeyHandle.Handle, 10);
}

Expand Down
31 changes: 31 additions & 0 deletions Plugins/Omnisphere/Omnisphere.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System;
using System.Threading;
using static MagicKeys.MagicKeys;

namespace MagicKeys
Expand All @@ -11,5 +12,35 @@ public static void Search()
MouseClick("Left", P[1]+30, P[2]+70, 1, 0, 0, 10);
}

public static void Category()
{
MouseClick("Left", P[1]+35, P[2]+125, 1, 0, 0, 10);
Thread.Sleep(100);
MouseClick("Left", P[1]+185, P[2]+140, 2, 0, 0, 10);
Thread.Sleep(100);
MouseClick("Left", P[1]+185, P[2]+325, 2, 0, 0, 10);
Speak("OK");
}

public static void Type()
{
MouseClick("Left", P[1]+85, P[2]+125, 1, 0, 0, 10);
Thread.Sleep(100);
MouseClick("Left", P[1]+185, P[2]+140, 2, 0, 0, 10);
Thread.Sleep(100);
MouseClick("Left", P[1]+185, P[2]+325, 2, 0, 0, 10);
Speak("OK");
}

public static void Genre()
{
MouseClick("Left", P[1]+135, P[2]+125, 1, 0, 0, 10);
Thread.Sleep(100);
MouseClick("Left", P[1]+185, P[2]+140, 2, 0, 0, 10);
Thread.Sleep(100);
MouseClick("Left", P[1]+185, P[2]+325, 2, 0, 0, 10);
Speak("OK");
}

}
}
6 changes: 1 addition & 5 deletions Plugins/Omnisphere/OmnisphereLoader.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,7 @@ public static void PluginLoad()
}
if (ImgSearch(@"Images\Omnisphere\Reg.bmp", true)[0] == 1)
{
VUIObjectSwitcher(true, "false", 1, 1);
}
else if (ImgSearch(@"Images\Omnisphere\Logo.bmp", true)[0] == 1)
{
VUIObjectSwitcher(true, "false", 2, 4);
VUILoader(@"VUI\Omnisphere\OmnisphereReg.vui");
}
KeyReg();
}
Expand Down
10 changes: 9 additions & 1 deletion Plugins/Serum/SerumLoader.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,15 @@ public static partial class Serum
public static void PluginLoad()
{
MouseClick("Left", P[1]+150, P[2]+20, 1, 0, 0, 10);
Thread.Sleep(200);
while(
ImgSearch(@"Images\Serum\SerumLogo.bmp")[0] == 0 &
ImgSearch(@"Images\Serum\SerumReg.bmp")[0] == 0)
{
if (WinActive(API.GetWTitle(), API.GetWClass()) == false)
{
return;
}
}
if (ImgSearch(@"Images\Serum\SerumLogo.bmp")[0] == 1)
{
VUIObjectSwitcher(true, "false", 6, 6);
Expand Down
18 changes: 9 additions & 9 deletions VUI/Omnisphere/Omnisphere.vui
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@ ObjectType=Button
Help=Поиск пресетов
Func=Search
[2]
Text=Copy serial code
Text=Category
ObjectType=Button
Help=Скопировать серийный номер в буфер обмена
Func=CopySerial
Help=Help not found
Func=Category
[3]
Text=Paste activation code
Text=Type
ObjectType=Button
Help=Вставить код активации из буфера обмена
Func=PasteCode
Help=Help not found
Func=Type
[4]
Text=Continue
Text=Genre
ObjectType=Button
Help=Продолжить активацию
Func=ActiveCode
Help=Help not found
Func=Genre
15 changes: 15 additions & 0 deletions VUI/Omnisphere/OmnisphereReg.vui
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
[1]
Text=Copy serial code
ObjectType=Button
Help=Скопировать серийный номер в буфер обмена
Func=CopySerial
[2]
Text=Paste activation code
ObjectType=Button
Help=Вставить код активации из буфера обмена
Func=PasteCode
[3]
Text=Continue
ObjectType=Button
Help=Продолжить активацию
Func=ActiveCode
10 changes: 5 additions & 5 deletions VUI/PluginsList.vui
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ VUI=Kontakt\Kontakt.vui
VUIName=Kontakt
Module=Kontakt.dll
[2]
WTitle=bridged
WTitle=bridge
WClass=REAPERb32host
PClass=Kontakt
BClass=None
Expand All @@ -31,23 +31,23 @@ VUI=Kontakt\Progress.vui
VUIName=Progress
Module=Kontakt.dll
[5]
WTitle=bridged
WTitle=bridge
WClass=REAPERb32host
PClass=Nexus
BClass=None
VUI=Nexus\Nexus.vui
VUIName=Nexus
Module=Nexus.dll
[6]
WTitle=bridged
WTitle=bridge
WClass=REAPERb32host
PClass=PlugSound
BClass=None
VUI=PlugSound\PlugSound.vui
VUIName=PlugSound
Module=PS0
[7]
WTitle=bridged
WTitle=bridge
WClass=REAPERb32host
PClass=PlugSound
BClass=None
Expand All @@ -63,7 +63,7 @@ VUI=Serum\Serum.vui
VUIName=Serum
Module=Serum_
[9]
WTitle=bridged
WTitle=bridge
WClass=REAPERb32host
PClass=Serum
BClass=None
Expand Down

0 comments on commit bca4605

Please sign in to comment.