GUI: cleanup About-Window

mnm-team · Feb 20, 2024 · 20f5630 · 20f5630
1 parent 091e61d
commit 20f5630
Show file tree

Hide file tree

Showing 9 changed files with 49 additions and 753 deletions.
diff --git a/LICENSE.txt → LICENSE b/LICENSE.txt → LICENSE
diff --git a/QuIDE/Directory.Build.props b/QuIDE/Directory.Build.props
@@ -0,0 +1,7 @@
+<Project>
+  <PropertyGroup>
+    <Version>2.1</Version>
+    <FileVersion>2.1</FileVersion>
+    <InformationalVersion>2.1-dev</InformationalVersion>
+  </PropertyGroup>
+</Project>
diff --git a/QuIDE/Properties/Resources.Designer.cs b/QuIDE/Properties/Resources.Designer.cs
diff --git a/QuIDE/Properties/Resources.resx b/QuIDE/Properties/Resources.resx
diff --git a/QuIDE/QuIDE.csproj b/QuIDE/QuIDE.csproj
@@ -3,7 +3,7 @@
         <OutputType>WinExe</OutputType>
         <TargetFramework>net8.0</TargetFramework>
         <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
-        <ApplicationManifest>app.manifest</ApplicationManifest>
+        <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
         <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
         <IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
         <!-- for Parser.cs we need an unsafe block for a pointer to get the assemblies in a single-file-app -->

diff --git a/QuIDE/ViewModels/Helpers/QubitViewModel.cs b/QuIDE/ViewModels/Helpers/QubitViewModel.cs
@@ -16,8 +16,6 @@ namespace QuIDE.ViewModels.Helpers;
 
 public class QubitViewModel : ViewModelBase
 {
-    #region Constructor
-
     public QubitViewModel(ComputerModel model, int registerIndex, int rowIndex, DialogManager dialogManager)
     {
         _model = model;
@@ -29,20 +27,12 @@ public QubitViewModel(ComputerModel model, int registerIndex, int rowIndex, Dial
         _dialogManager = dialogManager;
     }
 
-    #endregion // Constructor
-
-
-    #region Private Helpers
 
     private void _model_CurrentStepChanged(object sender, EventArgs eventArgs)
     {
         OnPropertyChanged(nameof(IsEnabled));
     }
 
-    #endregion // Private Helpers
-
-    #region Fields
-
     private readonly ComputerModel _model;
 
     private int _registerIndex;
@@ -58,10 +48,6 @@ private void _model_CurrentStepChanged(object sender, EventArgs eventArgs)
 
     private readonly DialogManager _dialogManager;
 
-    #endregion // Fields
-
-
-    #region Properties
 
     public ICommand ChangeValueCommand
     {
@@ -179,34 +165,30 @@ public VisualBrush QubitImage
 
     public bool IsEnabled => _model.CurrentStep == 0;
 
-    #endregion // Properties
-
-
-    #region Public Methods
 
     public void Refresh()
     {
         OnPropertyChanged(nameof(QubitImage));
     }
 
-    public void ChangeValue(object parameter)
+    private void ChangeValue(object parameter)
     {
         var old = Value;
         _model.Registers[_registerIndex].ResetQubit(Index, old);
         Value = old == QubitModel.Zero ? QubitModel.One : QubitModel.Zero;
     }
 
-    public void InsertQubitAbove(object parameter)
+    private void InsertQubitAbove(object parameter)
     {
         _model.InsertQubitAbove(_registerIndex, Index);
     }
 
-    public void InsertQubitBelow(object parameter)
+    private void InsertQubitBelow(object parameter)
     {
         _model.InsertQubitBelow(_registerIndex, Index);
     }
 
-    public async void EditRegister(object parameter)
+    private async void EditRegister(object parameter)
     {
         var vm = new NewRegisterInputViewModel();
         var input = new NewRegisterInput(vm);
@@ -237,7 +219,7 @@ await _dialogManager.ShowDialogAsync(input, () =>
         });
     }
 
-    public async void InsertRegisterAbove(object parameter)
+    private async void InsertRegisterAbove(object parameter)
     {
         var vm = new NewRegisterInputViewModel();
         var input = new NewRegisterInput(vm);
@@ -249,7 +231,7 @@ await _dialogManager.ShowDialogAsync(input, () =>
         });
     }
 
-    public async void InsertRegisterBelow(object parameter)
+    private async void InsertRegisterBelow(object parameter)
     {
         var vm = new NewRegisterInputViewModel();
         var input = new NewRegisterInput(vm);
@@ -261,12 +243,12 @@ await _dialogManager.ShowDialogAsync(input, () =>
         });
     }
 
-    public void DeleteQubit(object parameter)
+    private void DeleteQubit(object parameter)
     {
         _model.DeleteQubit(_registerIndex, Index);
     }
 
-    public void DeleteRegister(object parameter)
+    private void DeleteRegister(object parameter)
     {
         _model.DeleteRegister(_registerIndex);
     }
@@ -295,6 +277,4 @@ public void UpdateDeleteQubitCommand(bool canExecute)
         _deleteQubit = new DelegateCommand(DeleteQubit, x => canExecute);
         OnPropertyChanged(nameof(DeleteQubitCommand));
     }
-
-    #endregion // Public Methods
 }
diff --git a/QuIDE/Views/Controls/CircuitGrid.axaml b/QuIDE/Views/Controls/CircuitGrid.axaml
@@ -19,7 +19,7 @@
 
     <Grid x:Name="LayoutRoot" Background="White" PointerWheelChanged="LayoutRoot_PreviewMouseWheel">
         <Border Background="White" BorderBrush="{StaticResource BorderBrush}" BorderThickness="1">
-            <Grid x:Name="mainGrid" Background="White" ColumnDefinitions="Auto,*">
+            <Grid x:Name="MainGrid" Background="White" ColumnDefinitions="Auto,*">
 
                 <ScrollViewer x:Name="RegisterScroll"
                               HorizontalScrollBarVisibility="Disabled"
@@ -28,7 +28,7 @@
 
                     <!-- Qubit view -->
                     <StackPanel Orientation="Vertical">
-                        <ItemsControl x:Name="registerItemsControl" Background="White"
+                        <ItemsControl x:Name="RegisterItemsControl" Background="White"
                                       ItemsSource="{Binding Registers}"
                                       Margin="0,0,0,0"
                                       RenderTransformOrigin="0,0">

diff --git a/QuIDE/Views/Dialog/AboutWindow.axaml b/QuIDE/Views/Dialog/AboutWindow.axaml
@@ -8,29 +8,13 @@
         Title="AboutWindow"
         SizeToContent="WidthAndHeight"
         WindowStartupLocation="CenterOwner">
-    <!-- Icon="/Assets/avalonia-logo.ico"> -->
-    <!--<UserControl.Resources>
-        <Style x:Key="DefaultButton" Selector="Button" />
-        <Style x:Key="FlatButton" BasedOn="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Selector="Button" />
-    </UserControl.Resources>-->
 
     <DockPanel>
-        <TextBlock DockPanel.Dock="Top" Text="{x:Static p:Resources.AboutText}" Margin="10" />
+        <TextBlock DockPanel.Dock="Top" Text="{x:Static p:Resources.Name}" Margin="10" />
+        <TextBlock DockPanel.Dock="Top" Text="{x:Static p:Resources.Version}" Margin="10" />
+        <TextBlock DockPanel.Dock="Top" Text="{x:Static p:Resources.Copyright}" Margin="10" />
         <TextBlock DockPanel.Dock="Top"
                    Text="{x:Static p:Resources.Authors}" Margin="10" />
-        <DockPanel
-            VerticalAlignment="Stretch"
-            Margin="10">
-            <TextBlock DockPanel.Dock="Top" Text="{x:Static p:Resources.License}" Margin="0 5" />
-            <Border
-                Background="White"
-                BorderBrush="DimGray"
-                BorderThickness="1" Padding="0">
-                <ScrollViewer Height="700">
-                    <TextBlock
-                        Text="{x:Static p:Resources.GPLText}" Margin="10" />
-                </ScrollViewer>
-            </Border>
-        </DockPanel>
+        <TextBlock Text="{x:Static p:Resources.GPLText}" Margin="10" />
     </DockPanel>
 </Window>
diff --git a/QuIDE/app.manifest b/QuIDE/app.manifest