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

Commit 1c4f582

Browse files
kkocdkokkocdko
committed
1.0.1.1
What's Update? * More steady. * Faster arguments concatenate. * Lighter performance monitor. Bug Fix: * Missed check for custom thread count. * Some ui mistakes.
1 parent 681eb9b commit 1c4f582

File tree

7 files changed

+352
-376
lines changed

7 files changed

+352
-376
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
![001](https://kkocdko.github.io/src/img/20180726-010059-001.webp)
44

5-
* 此为`0.7.1.1`版本的截图。
5+
* 此为`1.0.1.1`版本的截图。
66

77
#### What does it do?
88

‎UniversalGUI/App.xaml.cs‎

Lines changed: 20 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -86,87 +86,43 @@ public async Task CreateThreadAsync(int threadIndex)
8686
}
8787
}
8888

89-
private void RemoveQuotationMasks(ref string sourceString)
90-
{
91-
sourceString = new Regex("(^\")|(\"$)").Replace(sourceString, "");
92-
}
93-
94-
private void AddQuotationMasks(ref string sourceString)
95-
{
96-
sourceString = "\"" + sourceString + "\"";
97-
}
98-
9989
private string SumAppArgs(string argsTemplet, string inputFile, string userArgs, string outputSuffix, string outputExtension, string outputFloder)
10090
{
101-
// Remove quotation mask
102-
RemoveQuotationMasks(ref inputFile);
103-
RemoveQuotationMasks(ref argsTemplet);
104-
RemoveQuotationMasks(ref outputSuffix);
105-
RemoveQuotationMasks(ref outputExtension);
106-
RemoveQuotationMasks(ref outputFloder);
107-
91+
RegexUtility.RemoveQuotationMasks(ref inputFile);
92+
RegexUtility.RemoveQuotationMasks(ref argsTemplet);
93+
RegexUtility.RemoveQuotationMasks(ref outputSuffix);
94+
RegexUtility.RemoveQuotationMasks(ref outputExtension);
95+
RegexUtility.RemoveQuotationMasks(ref outputFloder);
10896
string args = argsTemplet;
109-
11097
//{UserArgs}
11198
{
112-
//替换模板中的标记
113-
args = new Regex(@"\{UserArgs\}").Replace(args, userArgs);
114-
}
115-
116-
//{InputFile}
99+
args = new Regex("{UserArgs}").Replace(args, userArgs);
100+
}
101+
//{InputFile}
117102
{
118-
//加前后引号
119-
string inputFile2 = "\"" + inputFile + "\"";
120-
//替换模板中的标记
121-
args = new Regex(@"\{InputFile\}").Replace(args, inputFile2);
103+
args = new Regex("{InputFile}").Replace(args, RegexUtility.AddQuotationMasks(inputFile));
122104
}
123-
124105
//{OutputFile}
125106
{
126107
string outputFile;
127-
//获得主文件名
128-
string mainName = new Regex(@"\..[^.]+?$").Replace(inputFile, "");
129-
130-
//后缀
131-
if (outputSuffix != "")
132-
{
133-
mainName += outputSuffix;
134-
}
135-
136-
//拓展名
137-
string extension;
138-
if (outputExtension != "")
139-
{
140-
//新拓展名
141-
extension = outputExtension;
142-
}
143-
else
144-
{
145-
//原拓展名
146-
extension = new Regex(@"\..[^.]+?$").Match(inputFile).ToString();
147-
}
148-
//去除拓展名前的点
149-
extension = new Regex(@"\.").Replace(extension, "");
150-
//组合
108+
string mainName = new Regex(@"\..[^.]+?$").Replace(inputFile, "");
109+
mainName += outputSuffix;
110+
string extension = outputExtension == ""
111+
? new Regex(@"\..[^.]+?$").Match(inputFile).ToString() //Source extension
112+
: new Regex(@"\.").Replace(outputExtension, ""); //Remove dot before the extension
151113
outputFile = mainName + "." + extension;
152-
153-
//输出文件夹
154114
if (outputFloder != "")
155115
{
156-
//去路径后正反斜杠
116+
//Remove "/" or "\"
157117
outputFloder = new Regex(@"[\\/]$").Replace(outputFloder, "");
158-
//加路径后反斜杠
159-
outputFloder += "\\";
160-
//替换输出路径
118+
//Add "\"
119+
outputFloder += @"\";
120+
//Replace the output path
161121
outputFile = new Regex(@"^.+\\").Replace(outputFile, outputFloder);
162122
}
163-
164-
//加前后引号
165-
AddQuotationMasks(ref outputFile);
166-
//替换模板中的标记
167-
args = new Regex(@"\{OutputFile\}").Replace(args, outputFile);
123+
RegexUtility.AddQuotationMasks(ref outputFile);
124+
args = new Regex("{OutputFile}").Replace(args, outputFile);
168125
}
169-
170126
return args;
171127
}
172128

‎UniversalGUI/MainWindow.xaml‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@
66
xmlns:local="clr-namespace:UniversalGUI"
77
x:Class="UniversalGUI.MainWindow"
88
mc:Ignorable="d"
9-
Title="{DynamicResource Window_MainWindow_Title}" Height="430" Width="650" MinWidth="550" MinHeight="425" Closing="MainWindow_WindowClosing" Loaded="MainWindow_Loaded">
9+
Title="{DynamicResource Window_MainWindow_Title}" Width="650" Height="430" MinWidth="550" MinHeight="425" Closing="MainWindow_WindowClosing" Loaded="MainWindow_Loaded">
1010

1111
<Window.DataContext>
1212
<local:MainWindowData/>
1313
</Window.DataContext>
1414

15-
<Grid Margin="15">
15+
<Grid Margin="15,10,15,15">
1616
<Grid.ColumnDefinitions>
1717
<ColumnDefinition/>
1818
<ColumnDefinition Width="10"/>
19-
<ColumnDefinition Width="130"/>
20-
<ColumnDefinition Width="100"/>
19+
<ColumnDefinition Width="105"/>
20+
<ColumnDefinition Width="110"/>
2121
</Grid.ColumnDefinitions>
2222
<Grid.RowDefinitions>
2323
<RowDefinition Height="7*"/>
@@ -64,20 +64,20 @@
6464
</Grid.Resources>
6565

6666
<Label Grid.Column="0" Grid.Row="0" Content="{DynamicResource Label_AppPath}"/>
67-
<TextBox Grid.Column="0" Grid.Row="2" x:Name="AppPath" Text="{Binding AppPath}" PreviewDragOver="DropFileTextBox_PreviewDragOver" PreviewDrop="DropFileTextBox_PreviewDrop"/>
68-
<Button Grid.Column="0" Grid.Row="2" Content="..." Width="20" HorizontalAlignment="Right" Style="{StaticResource TextBoxButton}" Click="SwitchAppPath"/>
67+
<TextBox Grid.Column="0" Grid.Row="2" Text="{Binding AppPath}" Padding="0,0,20,0" PreviewDragOver="DropFileTextBox_PreviewDragOver" PreviewDrop="DropFileTextBox_PreviewDrop"/>
68+
<Button Grid.Column="0" Grid.Row="2" Content="..." Width="20" HorizontalAlignment="Right" Style="{StaticResource ButtonBehindTextBox}" Click="SwitchAppPath"/>
6969

7070
<Label Grid.Column="0" Grid.Row="4" Content="{DynamicResource Label_ArgsTemplet}"/>
71-
<TextBox Grid.Column="0" Grid.Row="6" x:Name="ArgsTemplet" Text="{Binding ArgsTemplet}"/>
72-
<Button Grid.Column="0" Grid.Row="6" Content="＞" Width="20" HorizontalAlignment="Right" Style="{StaticResource TextBoxButton}"/>
73-
<Menu Grid.Column="0" Grid.Row="6" HorizontalAlignment="Right" Width="20" Height="20" Opacity="0">
71+
<TextBox Grid.Column="0" Grid.Row="6" x:Name="ArgsTemplet" Text="{Binding ArgsTemplet}" Padding="0,0,20,0"/>
72+
<Button Grid.Column="0" Grid.Row="6" Content="＞" Width="20" HorizontalAlignment="Right" Style="{StaticResource ButtonBehindTextBox}"/>
73+
<Menu Grid.Column="0" Grid.Row="6" HorizontalAlignment="Right" Opacity="0">
7474
<MenuItem Width="20" Height="20">
75-
<MenuItem Header="{DynamicResource MenuItem_ArgsTemplet_InsertMark}" Foreground="Black">
75+
<MenuItem Header="{DynamicResource MenuItem_ArgsTemplet_InsertMark}">
7676
<MenuItem Header="{}{UserArgs}" Click="InsertArgsTempletMark"/>
7777
<MenuItem Header="{}{InputFile}" Click="InsertArgsTempletMark"/>
7878
<MenuItem Header="{}{OutputFile}" Click="InsertArgsTempletMark"/>
7979
</MenuItem>
80-
<MenuItem Header="{DynamicResource MenuItem_ArgsTemplet_Help}" Click="ShowArgsTempletHelp" Foreground="Black"/>
80+
<MenuItem Header="{DynamicResource MenuItem_ArgsTemplet_Help}" Click="ShowArgsTempletHelp"/>
8181
</MenuItem>
8282
</Menu>
8383

@@ -118,8 +118,8 @@
118118
<TextBox Grid.Column="2" Grid.Row="2" Text="{Binding OutputSuffix}" PreviewMouseDown="AutoSelectTextBox_PreviewMouseDown" GotFocus="AutoSelectTextBox_GotFocus"/>
119119

120120
<Label Grid.Column="0" Grid.Row="4" Content="{DynamicResource Label_OutputFloder}"/>
121-
<TextBox Grid.Column="2" Grid.Row="4" x:Name="OutputFloder" Text="{Binding OutputFloder}" PreviewDragOver="DropFileTextBox_PreviewDragOver" PreviewDrop="DropFileTextBox_PreviewDrop" GotFocus="AutoSelectTextBox_GotFocus" PreviewMouseDown="AutoSelectTextBox_PreviewMouseDown" Padding="0,0,20,0"/>
122-
<Button Grid.Column="2" Grid.Row="4" Content="..." HorizontalAlignment="Right" Width="20" Style="{StaticResource TextBoxButton}" Click="SwitchOutputFloder"/>
121+
<TextBox Grid.Column="2" Grid.Row="4" Text="{Binding OutputFloder}" Padding="0,0,20,0" PreviewDragOver="DropFileTextBox_PreviewDragOver" PreviewDrop="DropFileTextBox_PreviewDrop" GotFocus="AutoSelectTextBox_GotFocus" PreviewMouseDown="AutoSelectTextBox_PreviewMouseDown"/>
122+
<Button Grid.Column="2" Grid.Row="4" Content="..." HorizontalAlignment="Right" Width="20" Style="{StaticResource ButtonBehindTextBox}" Click="SwitchOutputFloder"/>
123123

124124
<Label Grid.Column="0" Grid.Row="6" Grid.ColumnSpan="3" Content="{DynamicResource Label_OutputConfigTips}" Foreground="#FF707070" FontSize="10"/>
125125
</Grid>
@@ -161,7 +161,7 @@
161161
</ComboBox>
162162

163163
<Label Grid.Column="0" Grid.Row="2" Content="{DynamicResource Label_ThreadCount}"/>
164-
<ComboBox Grid.Column="2" Grid.Row="2" x:Name="ThreadCount" SelectedValue="{Binding ThreadCount}" SelectedValuePath="Tag">
164+
<ComboBox Grid.Column="2" Grid.Row="2" SelectedValue="{Binding ThreadCount}" SelectedValuePath="Tag">
165165
<ComboBoxItem Tag="1" Content="1" IsSelected="True"/>
166166
<ComboBoxItem Tag="2" Content="2"/>
167167
<ComboBoxItem Tag="3" Content="3"/>
@@ -171,7 +171,7 @@
171171
<ComboBoxItem Tag="7" Content="7"/>
172172
<ComboBoxItem Tag="8" Content="8"/>
173173
<ComboBoxItem x:Name="CustomThreadCountItem">
174-
<TextBox x:Name="CustomThreadCountTextBox" MinWidth="40" Margin="-2,0" Padding="-1" BorderBrush="{x:Null}" LostFocus="CustomThreadCountTextBox_LostFocus" TextChanged="CustomThreadCountTextBox_TextChanged"/>
174+
<TextBox x:Name="CustomThreadCountTextBox" IsEnabled="{Binding ConfigVariable}" MinWidth="40" Margin="-2,0" Padding="-1" Style="{DynamicResource TextBoxInComboBox}" LostFocus="CustomThreadCountTextBox_LostFocus" TextChanged="CustomThreadCountTextBox_TextChanged"/>
175175
</ComboBoxItem>
176176
</ComboBox>
177177

@@ -192,11 +192,11 @@
192192
</GroupBox>
193193

194194
<GroupBox Grid.Column="2" Grid.Row="4" Header="{DynamicResource GroupBox_Monitor}">
195-
<Grid Margin="0,3">
195+
<Grid Margin="0,2">
196196
<Grid.ColumnDefinitions>
197197
<ColumnDefinition Width="4*"/>
198198
<ColumnDefinition Width="3"/>
199-
<ColumnDefinition Width="7*"/>
199+
<ColumnDefinition Width="5*"/>
200200
</Grid.ColumnDefinitions>
201201
<Grid.RowDefinitions>
202202
<RowDefinition/>
@@ -221,7 +221,7 @@
221221

222222
<Grid Grid.Column="4" Grid.Row="4" Margin="11,9,0,1">
223223
<Button x:Name="StartTaskButton" FontSize="16" Padding="0" Content="{DynamicResource Button_StartTask_Start}" Click="StartTaskButton_Click"/>
224-
<ProgressBar x:Name="TaskProgressBar" Height="5" Margin="1" BorderBrush="{x:Null}" Background="{x:Null}" Foreground="#FFDD0000" VerticalAlignment="Bottom" Visibility="{Binding TaskRunning}"/>
224+
<ProgressBar x:Name="TaskProgressBar" Height="5" Margin="1" BorderBrush="{x:Null}" Background="{x:Null}" Foreground="#FF999999" VerticalAlignment="Bottom" Visibility="{Binding TaskRunning}"/>
225225
</Grid>
226226
</Grid>
227227
</Window>

0 commit comments

Comments
 (0)