Skip to content

Commit bc3c91f

Browse files
committed
v2.5.4
1 parent 89bed6a commit bc3c91f

25 files changed

+83
-158
lines changed

.vs/QuickLibrary/v16/.suo

10.5 KB
Binary file not shown.
0 Bytes
Binary file not shown.

QuickLibrary/DialogMan.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ namespace QuickLibrary
66
public static class DialogMan
77
{
88
public static DialogResult ShowConfirm(
9+
Form owner,
910
string messageText,
1011
string yesBtnText = "",
1112
Image yesBtnImage = null,
@@ -17,16 +18,19 @@ public static DialogResult ShowConfirm(
1718
)
1819
{
1920
YesNoForm ynf = new YesNoForm(messageText, yesBtnText, yesBtnImage, showNoBtn, noBtnText, noBtnImage, windowTitle, darkMode);
21+
ynf.Owner = owner;
2022
return ynf.ShowDialog();
2123
}
2224

2325
public static DialogResult ShowInfo(
26+
Form owner,
2427
string messageText,
2528
string windowTitle = "",
2629
bool darkMode = false
2730
)
2831
{
2932
OkForm of = new OkForm(messageText, windowTitle, darkMode);
33+
of.Owner = owner;
3034
return of.ShowDialog();
3135
}
3236
}

QuickLibrary/DownloadForm.Designer.cs

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

QuickLibrary/DownloadForm.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,6 @@ public partial class DownloadForm : QlibFixedForm
2020

2121
public DownloadForm(string url, bool darkMode, string updating, string downloading, string readyToInstall, string failed, string install)
2222
{
23-
if (darkMode)
24-
{
25-
HandleCreated += new EventHandler(ThemeMan.formHandleCreated);
26-
}
27-
2823
fileName = Path.Combine(GetDownloadFolderPath(), System.IO.Path.GetFileName(url));
2924
this.downloading = downloading;
3025
this.readyToInstall = readyToInstall;

QuickLibrary/OkForm.Designer.cs

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

QuickLibrary/OkForm.cs

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,8 @@ namespace QuickLibrary
77
{
88
internal partial class OkForm : QlibFixedForm
99
{
10-
public OkForm(
11-
string messageText,
12-
string windowTitle,
13-
bool darkMode = false
14-
)
10+
public OkForm(string messageText, string windowTitle, bool darkMode = false)
1511
{
16-
17-
if (darkMode)
18-
{
19-
HandleCreated += new EventHandler(ThemeMan.formHandleCreated);
20-
}
21-
2212
InitializeComponent();
2313
(new DropShadow()).ApplyShadows(this);
2414
SetDraggableControls(new List<Control>() { titleLabel });

QuickLibrary/PluginMan.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,16 @@ namespace QuickLibrary
88
public class PluginMan
99
{
1010
public static string pluginsFolder = null;
11-
public static int apiVer = 0;
11+
public static int apiVer = 4;
1212
public static string inputType = null;
1313

1414
public delegate string[] RunFunction(
15-
Object input = null,
15+
object input = null,
1616
string path = null,
1717
bool darkMode = false,
1818
string language = "en",
19-
bool alwaysOnTop = false
19+
bool alwaysOnTop = false,
20+
object secondaryArg = null
2021
);
2122

2223
public delegate void PluginOutput(object sender, OutputEventArgs oea);

QuickLibrary/PluginMenuItem.cs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ public PluginMenuItem(
1818
PluginInfo.Function func,
1919
bool alwaysOnTop,
2020
string langCode,
21-
Form mainForm = null
21+
Form mainForm,
22+
object secondaryArg
2223
)
2324
{
2425
Text = func.title.Get(langCode);
@@ -47,7 +48,7 @@ public PluginMenuItem(
4748
IntPtr pluginPtr = NativeMan.LoadLibrary(dllPath);
4849
IntPtr funcPtr = NativeMan.GetProcAddressOrdinal(pluginPtr, func.name);
4950
var callback = Marshal.GetDelegateForFunctionPointer<PluginMan.RunFunction>(funcPtr);
50-
res = callback(input, path, darkMode, langCode, alwaysOnTop);
51+
res = callback(input, path, darkMode, langCode, alwaysOnTop, secondaryArg);
5152
}
5253
else if (pi.dllType == "csharp")
5354
{
@@ -59,7 +60,8 @@ public PluginMenuItem(
5960
path,
6061
darkMode,
6162
langCode,
62-
alwaysOnTop
63+
alwaysOnTop,
64+
secondaryArg
6365
}) as Object;
6466

6567
PluginMan.OutputEventArgs oea = new PluginMan.OutputEventArgs

QuickLibrary/Properties/AssemblyInfo.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
// set of attributes. Change these attribute values to modify the information
77
// associated with an assembly.
88
[assembly: AssemblyTitle("QuickLibrary")]
9-
[assembly: AssemblyDescription("WinForms control class library for \"Quick\" apps (.NET Framework)")]
9+
[assembly: AssemblyDescription("Windows Forms Control class library for for \"Quick\" apps (.NET Framework)")]
1010
[assembly: AssemblyConfiguration("")]
1111
[assembly: AssemblyCompany("Module Art")]
1212
[assembly: AssemblyProduct("QuickLibrary")]
13-
[assembly: AssemblyCopyright("Copyright © 2020 Module Art")]
13+
[assembly: AssemblyCopyright("Copyright © 2021 Module Art")]
1414
[assembly: AssemblyTrademark("")]
1515
[assembly: AssemblyCulture("")]
1616

@@ -32,6 +32,6 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("2.5.3")]
36-
[assembly: AssemblyFileVersion("2.5.3")]
35+
[assembly: AssemblyVersion("2.5.4")]
36+
[assembly: AssemblyFileVersion("2.5.4")]
3737
[assembly: NeutralResourcesLanguage("en")]

0 commit comments

Comments
 (0)