Skip to content

Commit cce4cc1

Browse files
small changes
1 parent 3c25476 commit cce4cc1

7 files changed

Lines changed: 34 additions & 5 deletions

File tree

.idea/.idea.MoSpeedUI/.idea/avalonia.xml

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

Assets/Text/LicenseText.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,3 +127,9 @@ INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
127127
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
128128
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
129129
OTHER DEALINGS IN THE FONT SOFTWARE.
130+
131+
---
132+
133+
The themed logos use the following icons
134+
https://www.flaticon.com/free-icons/christmas - Christmas icons created by Vectors Market - Flaticon
135+
https://www.flaticon.com/free-icons/pumpkin - Pumpkin icons created by Vectors Market - Flaticon

Lang/Resources.Designer.cs

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

Lang/Resources.de.resx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@
144144
<value>Kompilieren!</value>
145145
</data>
146146
<data name="Advanced" xml:space="preserve">
147-
<value>Erweiterte Einstellungen</value>
147+
<value>Erweiterte Kompiliereinstellungen</value>
148148
</data>
149149
<data name="Welcome" xml:space="preserve">
150150
<value>Willkommen!</value>
@@ -293,4 +293,7 @@
293293
<data name="JavaFoundWrongVerWin" xml:space="preserve">
294294
<value>Obwohl Java Installationen gefunden wurden, scheint keiner dieser die benötigte Version zu haben (&gt;= 11). Das Programm wird auf 'java' zurückfallen und die Java-Executable verwenden, welche das System unter diesem Namen bereitstellt. Es ist wahrscheinlich, dass dies beim Kompilieren fehlschlagen wird. Bitte passe &lt;javapath&gt; in der Konfigurationsdatei an.</value>
295295
</data>
296+
<data name="Settings" xml:space="preserve">
297+
<value>App Einstellungen</value>
298+
</data>
296299
</root>

Lang/Resources.resx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@
151151
<value>Compile!</value>
152152
</data>
153153
<data name="Advanced" xml:space="preserve">
154-
<value>Advanced Settings</value>
154+
<value>Advanced Compile Settings</value>
155155
</data>
156156
<data name="Welcome" xml:space="preserve">
157157
<value>Welcome!</value>
@@ -300,4 +300,7 @@
300300
<data name="JavaFoundWrongVerWin" xml:space="preserve">
301301
<value>While there were java installations found, they don't quite seem to fit the needed version (&gt;= 11). The Configuration will call 'java' and use the java executable that the system provides under this name. This will likely fail. Please change the &lt;javapath&gt; parameter in the config file to a suitable java installation.</value>
302302
</data>
303+
<data name="Settings" xml:space="preserve">
304+
<value>App Setttings</value>
305+
</data>
303306
</root>

MainWindow.axaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,8 @@
120120
<StackPanel x:Name="Step4" Margin="0,16,0,0">
121121
<Button x:Name="CompileBtn" Click="CompileBtn_OnClick" Margin="0,0,0,4" HorizontalAlignment="Stretch" HorizontalContentAlignment="Center" Content="{x:Static lang:Resources.Compile}"/>
122122
<Button Margin="0,0,0,4" x:Name="AdvSettings" Click="AdvSettings_OnClick" HorizontalAlignment="Stretch" HorizontalContentAlignment="Center" Content="{x:Static lang:Resources.Advanced}"/>
123-
<TextBlock Text="{x:Static lang:Resources.About}" x:Name="AboutLink" HorizontalAlignment="Center" TextDecorations="Underline" Foreground="Blue" PointerPressed="AboutLink_OnPointerPressed"/>
123+
<TextBlock Cursor="Hand" Text="{x:Static lang:Resources.About}" x:Name="AboutLink" HorizontalAlignment="Center" TextDecorations="Underline" Foreground="Blue" PointerPressed="AboutLink_OnPointerPressed"/>
124+
<TextBlock Cursor="Hand" Text="{x:Static lang:Resources.Settings}" x:Name="SettingsLink" HorizontalAlignment="Center" TextDecorations="Underline" Foreground="Blue" PointerPressed="SettingsLink_OnPointerPressed"/>
124125
</StackPanel>
125126
</StackPanel>
126127
</StackPanel>

MainWindow.axaml.cs

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,8 @@ public MainWindow()
7575
{
7676
ReadConfig();
7777
}
78+
79+
ApplyConfig();
7880
};
7981
DragBox.Cursor = new Cursor(StandardCursorType.Hand);
8082
DragDrop.SetAllowDrop(this, true);
@@ -134,6 +136,11 @@ public MainWindow()
134136
}
135137
};
136138
AboutLink.Cursor = new Cursor(StandardCursorType.Hand);
139+
PlatformSelect.SelectedIndex = 0;
140+
}
141+
142+
private void ApplyConfig()
143+
{
137144
if (AppConfiguration.LogoDecoration)
138145
{
139146
DateTime dt = DateTime.Today;
@@ -153,9 +160,7 @@ public MainWindow()
153160
new Bitmap(AssetLoader.Open(new Uri("avares://MoSpeedUI/Assets/Images/mospeed_halloween.png")));
154161
}
155162
}
156-
PlatformSelect.SelectedIndex = 0;
157163
}
158-
159164
private void ReadConfig()
160165
{
161166
try
@@ -551,4 +556,8 @@ private void AboutLink_OnPointerPressed(object? sender, PointerPressedEventArgs
551556
AboutWindow aW = new();
552557
aW.ShowDialog(this);
553558
}
559+
560+
private void SettingsLink_OnPointerPressed(object? sender, PointerPressedEventArgs e)
561+
{
562+
}
554563
}

0 commit comments

Comments
 (0)