Skip to content

Commit 65a683f

Browse files
EmptyKeysEmptyKeys
committed
Rebuild for new UI version
1 parent d8c04e4 commit 65a683f

File tree

3 files changed

+13
-36
lines changed

3 files changed

+13
-36
lines changed

‎BasicUI_SunBurn/BasicUI_Pro/GameLibrary/GeneratedUI/BasicUI.xaml.cs‎

Lines changed: 6 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ namespace EmptyKeys.UserInterface.Generated {
2020
using EmptyKeys.UserInterface.Themes;
2121

2222

23-
[GeneratedCodeAttribute("Empty Keys UI Generator", "1.7.0.0")]
23+
[GeneratedCodeAttribute("Empty Keys UI Generator", "1.7.5.0")]
2424
public partial class BasicUI : UIRoot {
2525

2626
private Grid e_0;
@@ -80,7 +80,6 @@ public BasicUI(int width, int height) :
8080
}
8181

8282
private void InitializeComponent() {
83-
FontManager.Instance.AddFont("Segoe UI", 13.33333F, FontStyle.Regular, "Segoe_UI_10_Regular");
8483
this.FontSize = 13.33333F;
8584
this.SetResourceReference(SoundManager.SoundsProperty, "Sounds");
8685
InitializeElementResources(this);
@@ -110,7 +109,6 @@ private void InitializeComponent() {
110109
this.logo.HorizontalAlignment = HorizontalAlignment.Center;
111110
BitmapImage logo_bm = new BitmapImage();
112111
logo_bm.TextureAsset = "Images/EmptyKeysLogoTextSmall";
113-
ImageManager.Instance.AddImage("Images/EmptyKeysLogoTextSmall");
114112
this.logo.Source = logo_bm;
115113
this.logo.Stretch = Stretch.None;
116114
this.logo.SetResourceReference(Image.SourceProperty, "logoEmptyKeys");
@@ -122,7 +120,6 @@ private void InitializeComponent() {
122120
this.e_2.VerticalAlignment = VerticalAlignment.Center;
123121
this.e_2.Foreground = new SolidColorBrush(new ColorW(211, 211, 211, 255));
124122
this.e_2.TextWrapping = TextWrapping.Wrap;
125-
FontManager.Instance.AddFont("Segoe UI", 20F, FontStyle.Bold, "Segoe_UI_15_Bold");
126123
this.e_2.FontFamily = new FontFamily("Segoe UI");
127124
this.e_2.FontSize = 20F;
128125
this.e_2.FontStyle = FontStyle.Bold;
@@ -138,7 +135,6 @@ private void InitializeComponent() {
138135
this.combo.Name = "combo";
139136
this.combo.Width = 200F;
140137
this.combo.Margin = new Thickness(5F, 5F, 5F, 5F);
141-
FontManager.Instance.AddFont("Segoe UI", 13.33333F, FontStyle.Regular, "Segoe_UI_10_Regular");
142138
Func<UIElement, UIElement> combo_dtFunc = combo_dtMethod;
143139
this.combo.ItemTemplate = new DataTemplate(combo_dtFunc);
144140
Binding binding_combo_ItemsSource = new Binding("ComboBoxSource");
@@ -155,7 +151,6 @@ private void InitializeComponent() {
155151
ToolTip tt_button1 = new ToolTip();
156152
this.button1.ToolTip = tt_button1;
157153
tt_button1.Content = "Click Me!";
158-
FontManager.Instance.AddFont("Segoe UI", 13.33333F, FontStyle.Regular, "Segoe_UI_10_Regular");
159154
this.button1.Content = "1";
160155
this.button1.CommandParameter = "Click Button 1";
161156
Binding binding_button1_Command = new Binding("ButtonCommand");
@@ -166,7 +161,6 @@ private void InitializeComponent() {
166161
this.button2.Name = "button2";
167162
this.button2.Height = 30F;
168163
this.button2.Margin = new Thickness(5F, 5F, 5F, 5F);
169-
FontManager.Instance.AddFont("Segoe UI", 13.33333F, FontStyle.Regular, "Segoe_UI_10_Regular");
170164
this.button2.Content = "2";
171165
this.button2.CommandParameter = "Click Button 2";
172166
Binding binding_button2_Command = new Binding("ButtonCommand");
@@ -179,7 +173,6 @@ private void InitializeComponent() {
179173
this.button3.Height = 30F;
180174
this.button3.Width = 200F;
181175
this.button3.Margin = new Thickness(5F, 5F, 5F, 5F);
182-
FontManager.Instance.AddFont("Segoe UI", 20F, FontStyle.Bold, "Segoe_UI_15_Bold");
183176
this.button3.FontFamily = new FontFamily("Segoe UI");
184177
this.button3.FontSize = 20F;
185178
this.button3.FontStyle = FontStyle.Bold;
@@ -193,15 +186,13 @@ private void InitializeComponent() {
193186
this.e_3.Children.Add(this.buttonResult);
194187
this.buttonResult.Name = "buttonResult";
195188
this.buttonResult.HorizontalAlignment = HorizontalAlignment.Center;
196-
FontManager.Instance.AddFont("Segoe UI", 13.33333F, FontStyle.Regular, "Segoe_UI_10_Regular");
197189
Binding binding_buttonResult_Text = new Binding("ButtonResult");
198190
this.buttonResult.SetBinding(TextBlock.TextProperty, binding_buttonResult_Text);
199191
// slider element
200192
this.slider = new Slider();
201193
this.e_3.Children.Add(this.slider);
202194
this.slider.Name = "slider";
203195
this.slider.Width = 200F;
204-
FontManager.Instance.AddFont("Segoe UI", 13.33333F, FontStyle.Regular, "Segoe_UI_10_Regular");
205196
this.slider.Minimum = 5F;
206197
this.slider.Maximum = 20F;
207198
Binding binding_slider_Value = new Binding("SliderValue");
@@ -212,7 +203,6 @@ private void InitializeComponent() {
212203
this.textBox.Name = "textBox";
213204
this.textBox.Width = 200F;
214205
this.textBox.Margin = new Thickness(5F, 5F, 5F, 5F);
215-
FontManager.Instance.AddFont("Segoe UI", 13.33333F, FontStyle.Regular, "Segoe_UI_10_Regular");
216206
Binding binding_textBox_Text = new Binding("TextBoxText");
217207
this.textBox.SetBinding(TextBox.TextProperty, binding_textBox_Text);
218208
// checkBox element
@@ -221,15 +211,13 @@ private void InitializeComponent() {
221211
this.checkBox.Name = "checkBox";
222212
this.checkBox.Margin = new Thickness(5F, 5F, 5F, 5F);
223213
this.checkBox.HorizontalAlignment = HorizontalAlignment.Center;
224-
FontManager.Instance.AddFont("Segoe UI", 13.33333F, FontStyle.Regular, "Segoe_UI_10_Regular");
225214
this.checkBox.Content = "Check Box";
226215
// e_5 element
227216
this.e_5 = new TabControl();
228217
this.e_3.Children.Add(this.e_5);
229218
this.e_5.Name = "e_5";
230219
this.e_5.Height = 150F;
231220
this.e_5.Width = 400F;
232-
FontManager.Instance.AddFont("Segoe UI", 13.33333F, FontStyle.Regular, "Segoe_UI_10_Regular");
233221
this.e_5.ItemsSource = Get_e_5_Items();
234222
// e_18 element
235223
this.e_18 = new ProgressBar();
@@ -238,7 +226,6 @@ private void InitializeComponent() {
238226
this.e_18.Height = 30F;
239227
this.e_18.Width = 400F;
240228
this.e_18.Margin = new Thickness(5F, 5F, 5F, 5F);
241-
FontManager.Instance.AddFont("Segoe UI", 13.33333F, FontStyle.Regular, "Segoe_UI_10_Regular");
242229
this.e_18.Value = 39F;
243230
// imageButton element
244231
this.imageButton = new Button();
@@ -249,11 +236,9 @@ private void InitializeComponent() {
249236
ImageBrush imageButton_Background = new ImageBrush();
250237
BitmapImage imageButton_Background_bm = new BitmapImage();
251238
imageButton_Background_bm.TextureAsset = "Images/SunBurn";
252-
ImageManager.Instance.AddImage("Images/SunBurn");
253239
imageButton_Background.ImageSource = imageButton_Background_bm;
254240
imageButton_Background.Stretch = Stretch.None;
255241
this.imageButton.Background = imageButton_Background;
256-
FontManager.Instance.AddFont("Segoe UI", 13.33333F, FontStyle.Regular, "Segoe_UI_10_Regular");
257242
// e_19 element
258243
this.e_19 = new StackPanel();
259244
this.e_0.Children.Add(this.e_19);
@@ -264,28 +249,24 @@ private void InitializeComponent() {
264249
this.animButton1 = new Button();
265250
this.e_19.Children.Add(this.animButton1);
266251
this.animButton1.Name = "animButton1";
267-
FontManager.Instance.AddFont("Segoe UI", 13.33333F, FontStyle.Regular, "Segoe_UI_10_Regular");
268252
this.animButton1.Content = "Mouse Over me!";
269253
this.animButton1.SetResourceReference(Button.StyleProperty, "buttonAnimStyle");
270254
// animButton2 element
271255
this.animButton2 = new Button();
272256
this.e_19.Children.Add(this.animButton2);
273257
this.animButton2.Name = "animButton2";
274-
FontManager.Instance.AddFont("Segoe UI", 13.33333F, FontStyle.Regular, "Segoe_UI_10_Regular");
275258
this.animButton2.Content = "Mouse Over me!";
276259
this.animButton2.SetResourceReference(Button.StyleProperty, "buttonAnimStyle");
277260
// animButton3 element
278261
this.animButton3 = new Button();
279262
this.e_19.Children.Add(this.animButton3);
280263
this.animButton3.Name = "animButton3";
281-
FontManager.Instance.AddFont("Segoe UI", 13.33333F, FontStyle.Regular, "Segoe_UI_10_Regular");
282264
this.animButton3.Content = "Mouse Over me!";
283265
this.animButton3.SetResourceReference(Button.StyleProperty, "buttonAnimStyle");
284266
// animButton4 element
285267
this.animButton4 = new Button();
286268
this.e_19.Children.Add(this.animButton4);
287269
this.animButton4.Name = "animButton4";
288-
FontManager.Instance.AddFont("Segoe UI", 13.33333F, FontStyle.Regular, "Segoe_UI_10_Regular");
289270
this.animButton4.Content = "Mouse Over me!";
290271
this.animButton4.SetResourceReference(Button.StyleProperty, "buttonAnimStyle");
291272
// e_20 element
@@ -356,6 +337,11 @@ private void InitializeComponent() {
356337
Storyboard.SetTargetName(animBorder2_ET_0_AC_0_SB_TL_1, "animBorder2");
357338
Storyboard.SetTargetProperty(animBorder2_ET_0_AC_0_SB_TL_1, Border.OpacityProperty);
358339
animBorder2_ET_0_AC_0_SB.Children.Add(animBorder2_ET_0_AC_0_SB_TL_1);
340+
ImageManager.Instance.AddImage("Images/EmptyKeysLogoTextSmall");
341+
ImageManager.Instance.AddImage("Images/SunBurn");
342+
FontManager.Instance.AddFont("Segoe UI", 13.33333F, FontStyle.Regular, "Segoe_UI_10_Regular");
343+
FontManager.Instance.AddFont("Segoe UI", 20F, FontStyle.Bold, "Segoe_UI_15_Bold");
344+
FontManager.Instance.AddFont("Segoe UI", 12F, FontStyle.Regular, "Segoe_UI_9_Regular");
359345
}
360346

361347
private static void InitializeElementResources(UIElement elem) {
@@ -369,7 +355,6 @@ private static UIElement combo_dtMethod(UIElement parent) {
369355
e_4.Name = "e_4";
370356
e_4.Margin = new Thickness(2F, 2F, 2F, 2F);
371357
e_4.HorizontalAlignment = HorizontalAlignment.Center;
372-
FontManager.Instance.AddFont("Segoe UI", 12F, FontStyle.Regular, "Segoe_UI_9_Regular");
373358
Binding binding_e_4_Text = new Binding("Name");
374359
e_4.SetBinding(TextBlock.TextProperty, binding_e_4_Text);
375360
return e_4;
@@ -381,14 +366,12 @@ private static System.Collections.ObjectModel.ObservableCollection<object> Get_e
381366
TabItem e_6 = new TabItem();
382367
e_6.Name = "e_6";
383368
e_6.HorizontalContentAlignment = HorizontalAlignment.Stretch;
384-
FontManager.Instance.AddFont("Segoe UI", 13.33333F, FontStyle.Regular, "Segoe_UI_10_Regular");
385369
e_6.Header = "Tab 1";
386370
// e_7 element
387371
ListBox e_7 = new ListBox();
388372
e_6.Content = e_7;
389373
e_7.Name = "e_7";
390374
e_7.Height = 100F;
391-
FontManager.Instance.AddFont("Segoe UI", 13.33333F, FontStyle.Regular, "Segoe_UI_10_Regular");
392375
Func<UIElement, UIElement> e_7_dtFunc = e_7_dtMethod;
393376
e_7.ItemTemplate = new DataTemplate(e_7_dtFunc);
394377
Binding binding_e_7_ItemsSource = new Binding("ComboBoxSource");
@@ -399,7 +382,6 @@ private static System.Collections.ObjectModel.ObservableCollection<object> Get_e
399382
// e_9 element
400383
TabItem e_9 = new TabItem();
401384
e_9.Name = "e_9";
402-
FontManager.Instance.AddFont("Segoe UI", 13.33333F, FontStyle.Regular, "Segoe_UI_10_Regular");
403385
e_9.Header = "Tab 2";
404386
// e_10 element
405387
StackPanel e_10 = new StackPanel();
@@ -410,20 +392,17 @@ private static System.Collections.ObjectModel.ObservableCollection<object> Get_e
410392
e_10.Children.Add(e_11);
411393
e_11.Name = "e_11";
412394
e_11.Height = 100F;
413-
FontManager.Instance.AddFont("Segoe UI", 13.33333F, FontStyle.Regular, "Segoe_UI_10_Regular");
414395
e_11.ItemsSource = Get_e_11_Items();
415396
items.Add(e_9);
416397
// e_16 element
417398
TabItem e_16 = new TabItem();
418399
e_16.Name = "e_16";
419-
FontManager.Instance.AddFont("Segoe UI", 13.33333F, FontStyle.Regular, "Segoe_UI_10_Regular");
420400
e_16.Content = "Tab 3 Content";
421401
e_16.Header = "Tab 3";
422402
items.Add(e_16);
423403
// e_17 element
424404
TabItem e_17 = new TabItem();
425405
e_17.Name = "e_17";
426-
FontManager.Instance.AddFont("Segoe UI", 13.33333F, FontStyle.Regular, "Segoe_UI_10_Regular");
427406
e_17.Content = "Tab 4 Content";
428407
e_17.Header = "Tab 4";
429408
items.Add(e_17);
@@ -437,7 +416,6 @@ private static UIElement e_7_dtMethod(UIElement parent) {
437416
e_8.Name = "e_8";
438417
e_8.Margin = new Thickness(2F, 2F, 2F, 2F);
439418
e_8.HorizontalAlignment = HorizontalAlignment.Center;
440-
FontManager.Instance.AddFont("Segoe UI", 12F, FontStyle.Regular, "Segoe_UI_9_Regular");
441419
Binding binding_e_8_Text = new Binding("Name");
442420
e_8.SetBinding(TextBlock.TextProperty, binding_e_8_Text);
443421
return e_8;
@@ -448,25 +426,21 @@ private static System.Collections.ObjectModel.ObservableCollection<object> Get_e
448426
// e_12 element
449427
ListBoxItem e_12 = new ListBoxItem();
450428
e_12.Name = "e_12";
451-
FontManager.Instance.AddFont("Segoe UI", 13.33333F, FontStyle.Regular, "Segoe_UI_10_Regular");
452429
e_12.Content = "Selection 1";
453430
items.Add(e_12);
454431
// e_13 element
455432
ListBoxItem e_13 = new ListBoxItem();
456433
e_13.Name = "e_13";
457-
FontManager.Instance.AddFont("Segoe UI", 13.33333F, FontStyle.Regular, "Segoe_UI_10_Regular");
458434
e_13.Content = "Selection 2";
459435
items.Add(e_13);
460436
// e_14 element
461437
ListBoxItem e_14 = new ListBoxItem();
462438
e_14.Name = "e_14";
463-
FontManager.Instance.AddFont("Segoe UI", 13.33333F, FontStyle.Regular, "Segoe_UI_10_Regular");
464439
e_14.Content = "Selection 3";
465440
items.Add(e_14);
466441
// e_15 element
467442
ListBoxItem e_15 = new ListBoxItem();
468443
e_15.Name = "e_15";
469-
FontManager.Instance.AddFont("Segoe UI", 13.33333F, FontStyle.Regular, "Segoe_UI_10_Regular");
470444
e_15.Content = "Selection 4";
471445
items.Add(e_15);
472446
return items;

‎BasicUI_SunBurn/BasicUI_Pro/GameLibrary/GeneratedUI/Dictionary.xaml.cs‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ namespace EmptyKeys.UserInterface.Generated {
2020
using EmptyKeys.UserInterface.Themes;
2121

2222

23-
[GeneratedCodeAttribute("Empty Keys UI Generator", "1.7.0.0")]
23+
[GeneratedCodeAttribute("Empty Keys UI Generator", "1.7.5.0")]
2424
public sealed class Dictionary : ResourceDictionary {
2525

2626
private static Dictionary singleton = new Dictionary();
@@ -43,7 +43,6 @@ private void InitializeResources() {
4343
// Resource - [logoSunburn] BitmapImage
4444
BitmapImage r_2_bm = new BitmapImage();
4545
r_2_bm.TextureAsset = "Images/SunBurn";
46-
ImageManager.Instance.AddImage("Images/SunBurn");
4746
this.Add("logoSunburn", r_2_bm);
4847
// Resource - [buttonStyle] Style
4948
var r_3_s_bo = this[typeof(Button)];
@@ -58,7 +57,6 @@ private void InitializeResources() {
5857
// Resource - [logoEmptyKeys] BitmapImage
5958
BitmapImage r_4_bm = new BitmapImage();
6059
r_4_bm.TextureAsset = "Images/EmptyKeysLogoTextSmall";
61-
ImageManager.Instance.AddImage("Images/EmptyKeysLogoTextSmall");
6260
this.Add("logoEmptyKeys", r_4_bm);
6361
// Resource - [buttonAnimStyle] Style
6462
var r_5_s_bo = this[typeof(Button)];
@@ -133,6 +131,11 @@ private void InitializeResources() {
133131
r_7_sounds.Add(new SoundSource { SoundType = SoundType.TabControlSelect, SoundAsset = "Select" });
134132
SoundManager.Instance.AddSound("Select");
135133
this.Add("Sounds", r_7_sounds);
134+
ImageManager.Instance.AddImage("Images/SunBurn");
135+
ImageManager.Instance.AddImage("Images/EmptyKeysLogoTextSmall");
136+
FontManager.Instance.AddFont("Segoe UI", 13.33333F, FontStyle.Regular, "Segoe_UI_10_Regular");
137+
FontManager.Instance.AddFont("Segoe UI", 20F, FontStyle.Bold, "Segoe_UI_15_Bold");
138+
FontManager.Instance.AddFont("Segoe UI", 12F, FontStyle.Regular, "Segoe_UI_9_Regular");
136139
}
137140
}
138141
}

‎BasicUI_SunBurn/BasicUI_Pro/GameLibrary/ViewModels/BasicUIViewModel.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ private void OnOpenMessageBox(object obj)
144144
if (messageBoxService != null)
145145
{
146146
RelayCommand result = new RelayCommand(new Action<object>(OnMessageBoxResult));
147-
messageBoxService.Show("Message box text", "Caption", MessageBoxButton.YesNoCancel, result);
147+
messageBoxService.Show("Message box text", "Caption", MessageBoxButton.YesNoCancel, result, false);
148148
}
149149
}
150150

0 commit comments

Comments
 (0)