Skip to content
This repository was archived by the owner on Jan 30, 2020. It is now read-only.

Commit 554ab6e

Browse files
kkocdkokkocdko
committed
Rename
No other change
1 parent c35a0b7 commit 554ab6e

File tree

2 files changed

+40
-40
lines changed

2 files changed

+40
-40
lines changed

‎UniversalGUI/App.xaml.cs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public partial class MainWindow : Window
2020

2121
public void StartTask()
2222
{
23-
int threadCount = uiData.ThreadCount;
23+
int threadCount = UiData.ThreadCount;
2424
processIds = new int[threadCount];
2525
Task[] tasks = new Task[threadCount];
2626
for (int i = 0; i < threadCount; i++)
@@ -67,19 +67,19 @@ public async Task CreateThreadAsync(int threadIndex)
6767
break;
6868
}
6969
string appArgs = SumAppArgs(
70-
argsTemplet: uiData.ArgsTemplet,
70+
argsTemplet: UiData.ArgsTemplet,
7171
inputFile: currentFile,
72-
userArgs: uiData.UserArgs,
73-
outputSuffix: uiData.OutputSuffix,
74-
outputExtension: uiData.OutputExtension,
75-
outputFloder: uiData.OutputFloder
72+
userArgs: UiData.UserArgs,
73+
outputSuffix: UiData.OutputSuffix,
74+
outputExtension: UiData.OutputExtension,
75+
outputFloder: UiData.OutputFloder
7676
);
7777
Process process = CreateProcess(
78-
appPath: uiData.AppPath,
78+
appPath: UiData.AppPath,
7979
appArgs: appArgs,
80-
windowStyle: uiData.WindowStyle,
81-
priority: uiData.Priority,
82-
simulateCmd: uiData.SimulateCmd
80+
windowStyle: UiData.WindowStyle,
81+
priority: UiData.Priority,
82+
simulateCmd: UiData.SimulateCmd
8383
);
8484
processIds[threadIndex] = process.Id;
8585
await Task.Run(process.WaitForExit);

‎UniversalGUI/MainWindow.xaml.cs‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public MainWindow()
2020
{
2121
InitializeComponent();
2222

23-
this.DataContext = uiData = new MainWindowData();
23+
this.DataContext = UiData = new MainWindowData();
2424
DefaultTitle = this.Title;
2525
IniConfigManager = new IniManager(GetIniConfigFile());
2626
ImputIniConfig(IniConfigManager);
@@ -29,7 +29,7 @@ public MainWindow()
2929

3030
private readonly string DefaultTitle;
3131

32-
private MainWindowData uiData;
32+
private MainWindowData UiData;
3333

3434
private void MainWindow_Loaded(object sender, RoutedEventArgs e)
3535
{
@@ -69,13 +69,13 @@ private void SetLanguage()
6969

7070
private async void StartTaskButton_Click(object sender, RoutedEventArgs e)
7171
{
72-
if (uiData.TaskRunning)
72+
if (UiData.TaskRunning)
7373
{
7474
StopTask();
7575
return;
7676
}
7777
StartTaskButton.Content = QueryLangDict("Button_StartTask_Stop");
78-
uiData.TaskRunning = true;
78+
UiData.TaskRunning = true;
7979
SetProgress(0);
8080
taskFiles = new TaskFiles(FilesList.Items);
8181
bool settingLegal = CheckConfig();
@@ -92,7 +92,7 @@ private async void StartTaskButton_Click(object sender, RoutedEventArgs e)
9292
}
9393
await Task.Delay(3000); //Show result to user
9494
StartTaskButton.Content = QueryLangDict("Button_StartTask_Start");
95-
uiData.TaskRunning = false;
95+
UiData.TaskRunning = false;
9696
SetProgress();
9797
}
9898

@@ -183,8 +183,8 @@ private async void StartMonitorAsync()
183183
usedRam /= 1048576; //1024^2
184184
usedRam = Math.Round(usedRam, 0);
185185
}
186-
uiData.CpuUsage = cpuUseRatio + "%";
187-
uiData.RamUsage = usedRam + ramUnit + " (" + ramUseRatio + "%)";
186+
UiData.CpuUsage = cpuUseRatio + "%";
187+
UiData.RamUsage = usedRam + ramUnit + " (" + ramUseRatio + "%)";
188188
await Task.Delay(1000);
189189
}
190190
}
@@ -200,15 +200,15 @@ private bool CheckConfig()
200200
);
201201
return false;
202202
}
203-
else if (uiData.AppPath == "")
203+
else if (UiData.AppPath == "")
204204
{
205205
MessageBox.Show(
206206
QueryLangDict("Message_CommandAppUnspecified"),
207207
errorTitle
208208
);
209209
return false;
210210
}
211-
else if (uiData.OutputFloder == "" && uiData.OutputExtension == "" && uiData.OutputSuffix == "")
211+
else if (UiData.OutputFloder == "" && UiData.OutputExtension == "" && UiData.OutputSuffix == "")
212212
{
213213
var result = MessageBox.Show(
214214
QueryLangDict("Message_OutputSettingsDangerous"),
@@ -228,7 +228,7 @@ private bool CheckConfig()
228228
);
229229
return false;
230230
}
231-
else if (uiData.SimulateCmd == 2 && AppPath.Text.IndexOf(' ') != -1)
231+
else if (UiData.SimulateCmd == 2 && AppPath.Text.IndexOf(' ') != -1)
232232
{
233233
MessageBox.Show(
234234
QueryLangDict("Message_SimulateCmdIsIllegal"),
@@ -415,13 +415,13 @@ private void ImputIniConfig(IniManager ini)
415415
string windowHeight = ini.Read("Window", "Height");
416416
this.Height = Convert.ToDouble(windowHeight);
417417

418-
uiData.AppPath = ini.Read("Command", "AppPath");
419-
uiData.ArgsTemplet = ini.Read("Command", "ArgsTemplet");
420-
uiData.UserArgs = ini.Read("Command", "UserArgs");
421-
uiData.OutputExtension = ini.Read("Output", "Extension");
422-
uiData.OutputSuffix = ini.Read("Output", "Suffix");
423-
uiData.OutputFloder = ini.Read("Output", "Floder");
424-
uiData.Priority = Convert.ToInt32(ini.Read("Process", "Priority"));
418+
UiData.AppPath = ini.Read("Command", "AppPath");
419+
UiData.ArgsTemplet = ini.Read("Command", "ArgsTemplet");
420+
UiData.UserArgs = ini.Read("Command", "UserArgs");
421+
UiData.OutputExtension = ini.Read("Output", "Extension");
422+
UiData.OutputSuffix = ini.Read("Output", "Suffix");
423+
UiData.OutputFloder = ini.Read("Output", "Floder");
424+
UiData.Priority = Convert.ToInt32(ini.Read("Process", "Priority"));
425425
int threadCount = Convert.ToInt32(ini.Read("Process", "ThreadCount"));
426426
if (threadCount > 8)
427427
{
@@ -430,9 +430,9 @@ private void ImputIniConfig(IniManager ini)
430430
//CustomThreadCountItem.Tag = threadCount;
431431
//CustomThreadCountItem.IsSelected = true;
432432
}
433-
uiData.ThreadCount = threadCount;
434-
uiData.WindowStyle = Convert.ToInt32(ini.Read("Process", "WindowStyle"));
435-
uiData.SimulateCmd = Convert.ToInt32(ini.Read("Process", "SimulateCmd"));
433+
UiData.ThreadCount = threadCount;
434+
UiData.WindowStyle = Convert.ToInt32(ini.Read("Process", "WindowStyle"));
435+
UiData.SimulateCmd = Convert.ToInt32(ini.Read("Process", "SimulateCmd"));
436436

437437
string culture = ini.Read("Language", "Culture");
438438
if (culture != "")
@@ -481,16 +481,16 @@ private void SaveIniConfig(IniManager ini)
481481
ini.Write("Versions", "ConfigFile", IniConfigFileVersion);
482482
ini.Write("Window", "Width", this.Width);
483483
ini.Write("Window", "Height", this.Height);
484-
ini.Write("Command", "AppPath", uiData.AppPath);
485-
ini.Write("Command", "ArgsTemplet", uiData.ArgsTemplet);
486-
ini.Write("Command", "UserArgs", uiData.UserArgs);
487-
ini.Write("Output", "Extension", uiData.OutputExtension);
488-
ini.Write("Output", "Suffix", uiData.OutputSuffix);
489-
ini.Write("Output", "Floder", uiData.OutputFloder);
490-
ini.Write("Process", "Priority", uiData.Priority);
491-
ini.Write("Process", "ThreadCount", uiData.ThreadCount);
492-
ini.Write("Process", "WindowStyle", uiData.WindowStyle);
493-
ini.Write("Process", "SimulateCmd", uiData.SimulateCmd);
484+
ini.Write("Command", "AppPath", UiData.AppPath);
485+
ini.Write("Command", "ArgsTemplet", UiData.ArgsTemplet);
486+
ini.Write("Command", "UserArgs", UiData.UserArgs);
487+
ini.Write("Output", "Extension", UiData.OutputExtension);
488+
ini.Write("Output", "Suffix", UiData.OutputSuffix);
489+
ini.Write("Output", "Floder", UiData.OutputFloder);
490+
ini.Write("Process", "Priority", UiData.Priority);
491+
ini.Write("Process", "ThreadCount", UiData.ThreadCount);
492+
ini.Write("Process", "WindowStyle", UiData.WindowStyle);
493+
ini.Write("Process", "SimulateCmd", UiData.SimulateCmd);
494494
}
495495
else
496496
{

0 commit comments

Comments
 (0)