alpha-v2.0.0(Complete redesign of the settings)

1)All menu items have been completely redesigned 2)New theme 3)Saving the screen size 4)Bug fixes
GREBIAR-Git · Jun 17, 2024 · a1d67e0 · a1d67e0
1 parent af952d3
commit a1d67e0
Show file tree

Hide file tree

Showing 84 changed files with 6,567 additions and 3,588 deletions.
diff --git a/README.md b/README.md
@@ -326,7 +326,7 @@ WordKiller — значительно экономит время и усили
 <img width=600 height=800 src="https://github.com/GREBIAR-Git/WordKiller/assets/74742355/0bff717a-cd57-4d17-8ead-7087df5e2dd8">
 
 # Будущие нововведения
-* Переделать (улучшить) интерфейс;
+* Улучшить интерфейс главного экрана;
 * Возможность одновременной работы с документом с 2 или более устройств;
 * Найти способ создавать PDF и HTML без установленного приложения WORD;
 * Добавить возможность добавления новых типов документа;
@@ -343,5 +343,4 @@ WordKiller — значительно экономит время и усили
     * Внутри содержания не тот стиль.
 2. Не обновляется язык в заголовках GridView;
 3. Картинка не подстраиватеься под размер конца страницы;
-4. Таблицане не правильно переноситься на следующую страницу (оформление);
-5. Если подзаголовок начинается с новой странцы ставить \n.
+4. Таблицане не правильно переноситься на следующую страницу (оформление).
diff --git a/WordKiller/WordKiller/App.config b/WordKiller/WordKiller/App.config
@@ -25,9 +25,6 @@
             <setting name="Direction" serializeAs="String">
                 <value />
             </setting>
-            <setting name="Year" serializeAs="String">
-                <value>2024</value>
-            </setting>
             <setting name="CloseWindow" serializeAs="String">
                 <value>False</value>
             </setting>
@@ -55,7 +52,7 @@
             <setting name="AlternativeColor" serializeAs="String">
                 <value>#335e8f</value>
             </setting>
-            <setting name="HoverColor" serializeAs="String">
+            <setting name="HoverColor156" serializeAs="String">
                 <value>#b8860b</value>
             </setting>
             <setting name="ActiveColor" serializeAs="String">
@@ -82,6 +79,9 @@
             <setting name="AutoSave" serializeAs="String">
                 <value>False</value>
             </setting>
+            <setting name="Year" serializeAs="String">
+                <value>2024</value>
+            </setting>
         </WordKiller.Properties.Settings>
     </userSettings>
     <applicationSettings>

diff --git a/WordKiller/WordKiller/App.xaml b/WordKiller/WordKiller/App.xaml
diff --git a/WordKiller/WordKiller/Commands/HelpCommands.cs b/WordKiller/WordKiller/Commands/HelpCommands.cs
@@ -5,23 +5,8 @@ namespace WordKiller.Commands;
 
 public class HelpCommands
 {
-    ICommand aboutProgram;
-
     ICommand documentation;
 
-    public ICommand AboutProgram
-    {
-        get
-        {
-            return aboutProgram ??= new RelayCommand(
-                obj =>
-                {
-                    AboutProgram aboutProgram = new();
-                    aboutProgram.Show();
-                });
-        }
-    }
-
     public ICommand Documentation
     {
         get

diff --git a/WordKiller/WordKiller/Converters/BoolToVisibilityReverse.cs b/WordKiller/WordKiller/Converters/BoolToVisibilityReverse.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Globalization;
+using System.Windows;
+using System.Windows.Data;
+
+namespace WordKiller.Converters;
+
+internal class BoolToVisibilityReverse : IValueConverter
+{
+    public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+    {
+        if (value is bool boolean)
+        {
+            return boolean ? Visibility.Collapsed : Visibility.Visible;
+        }
+
+        return null;
+    }
+
+    public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+    {
+        return value;
+    }
+}
diff --git a/WordKiller/WordKiller/DataTypes/ParagraphData/Paragraphs/ParagraphH1.cs b/WordKiller/WordKiller/DataTypes/ParagraphData/Paragraphs/ParagraphH1.cs
@@ -1,6 +1,8 @@
-using System;
+using DocumentFormat.OpenXml.Wordprocessing;
+using System;
 using System.Windows;
 using WordKiller.DataTypes.ParagraphData.Sections;
+using WordKiller.ViewModels;
 
 namespace WordKiller.DataTypes.ParagraphData.Paragraphs;
 
@@ -24,13 +26,13 @@ public ParagraphH1()
     public string Data
     {
         get => data;
-        set => SetPropertyDocument(ref data, value.ToUpper(), "Description");
+        set => SetPropertyDocument(ref data, CapsLockHelper.ToCapsLockH1(value), "Description");
     }
 
     public string Description
     {
         get => data.Replace("\r\n", " ");
-        set => SetPropertyDocument(ref data, value.ToUpper(), "Data");
+        set => SetPropertyDocument(ref data, CapsLockHelper.ToCapsLockH1(value), "Data");
     }
 
     public Visibility DescriptionVisibility => Visibility.Collapsed;

diff --git a/WordKiller/WordKiller/DataTypes/ParagraphData/Paragraphs/ParagraphH2.cs b/WordKiller/WordKiller/DataTypes/ParagraphData/Paragraphs/ParagraphH2.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Windows;
 using WordKiller.DataTypes.ParagraphData.Sections;
+using WordKiller.ViewModels;
 
 namespace WordKiller.DataTypes.ParagraphData.Paragraphs;
 
@@ -24,13 +25,13 @@ public ParagraphH2()
     public string Data
     {
         get => data;
-        set => SetPropertyDocument(ref data, value, "Description");
+        set => SetPropertyDocument(ref data, CapsLockHelper.ToCapsLockH2(value), "Description");
     }
 
     public string Description
     {
         get => data.Replace("\r\n", " ");
-        set => SetPropertyDocument(ref data, value, "Data");
+        set => SetPropertyDocument(ref data, CapsLockHelper.ToCapsLockH2(value), "Data");
     }
 
     public Visibility DescriptionVisibility => Visibility.Collapsed;

diff --git a/WordKiller/WordKiller/Models/Template/TemplateType.cs b/WordKiller/WordKiller/Models/Template/TemplateType.cs
@@ -4,12 +4,16 @@
 using System.Linq;
 using System.Text.RegularExpressions;
 using System.Windows;
+using System.Windows.Input;
 using System.Xml.Serialization;
 using DocumentFormat.OpenXml.Packaging;
 using DocumentFormat.OpenXml.Wordprocessing;
 using Microsoft.Win32;
+using WordKiller.Commands;
 using WordKiller.DataTypes;
+using WordKiller.DataTypes.ParagraphData.Paragraphs;
 using WordKiller.Scripts;
+using WordKiller.ViewModels;
 using DocumentType = WordKiller.DataTypes.Enums.DocumentType;
 
 namespace WordKiller.Models.Template;
@@ -64,6 +68,156 @@ public TemplateType()
     public List<YellowFragment> YellowFragment { get; set; } = [];
 
 
+    public bool isContinuousNumberingPicture { get; set; }
+
+    public bool IsContinuousNumberingPicture
+    { 
+        get => isContinuousNumberingPicture; 
+        set
+        {
+            if (isContinuousNumberingPicture != value)
+            {
+                isContinuousNumberingPicture = value;
+                NumberingHelper.NeedUpdate = true;
+                TemplateHelper.NeedSave = true;
+            }
+
+        }
+    }
+
+    public bool isContinuousNumberingTable { get; set; }
+
+    public bool IsContinuousNumberingTable 
+    { 
+        get => isContinuousNumberingTable; 
+        set
+        {
+            if (isContinuousNumberingTable != value)
+            {
+                isContinuousNumberingTable = value;
+                NumberingHelper.NeedUpdate = true;
+                TemplateHelper.NeedSave = true;
+            }
+
+        }
+    }
+
+     public bool h1CapsLock { get; set; }
+
+    public bool H1CapsLock 
+    { 
+        get => h1CapsLock; 
+        set
+        {
+            if (h1CapsLock != value)
+            {
+                h1CapsLock = value;
+                CapsLockHelper.CapsLockH1 = h1CapsLock;
+                TemplateHelper.NeedSave = true;
+            }
+
+        }
+    }
+
+    public bool h2CapsLock { get; set; }
+
+    public bool H2CapsLock 
+    { 
+        get => h2CapsLock; 
+        set
+        {
+            if (h2CapsLock != value)
+            {
+                h2CapsLock = value;
+                CapsLockHelper.CapsLockH2 = h2CapsLock;
+                TemplateHelper.NeedSave = true;
+            }
+
+        }
+    }
+
+    public bool h1Point { get; set; }
+
+    public bool H1Point 
+    { 
+        get => h1Point; 
+        set
+        {
+            if (h1Point != value)
+            {
+                h1Point = value;
+                NumberingHelper.NeedUpdate = true;
+                TemplateHelper.NeedSave = true;
+            }
+
+        }
+    }
+
+    public bool h1Enter { get; set; }
+
+    public bool H1Enter 
+    { 
+        get => h1Enter; 
+        set
+        {
+            if (h1Enter != value)
+            {
+                h1Enter = value;
+                TemplateHelper.NeedSave = true;
+            }
+
+        }
+    }
+
+
+    public int numberingDesign { get; set; }
+
+    public int NumberingDesign 
+    { 
+        get => numberingDesign; 
+        set
+        {
+            if (numberingDesign != value)
+            {
+                numberingDesign = value;
+                TemplateHelper.NeedSave = true;
+            }
+
+        }
+    }
+
+    public int imageDesign  { get; set; }
+
+    public int ImageDesign 
+    { 
+        get => imageDesign; 
+        set
+        {
+            if (imageDesign != value)
+            {
+                imageDesign = value;
+                TemplateHelper.NeedSave = true;
+            }
+
+        }
+    }
+
+    public int tableDesign  { get; set; }
+
+    public int TableDesign 
+    { 
+        get => tableDesign; 
+        set
+        {
+            if (tableDesign != value)
+            {
+                tableDesign = value;
+                TemplateHelper.NeedSave = true;
+            }
+
+        }
+    }
+
     public bool nonStandard { get; set; }
 
     [XmlIgnore]
@@ -75,26 +229,38 @@ public bool NonStandard
             if (nonStandard != value)
             {
                 nonStandard = value;
-                if (nonStandard)
-                {
-                    if (!InitTitle())
+                TemplateHelper.NeedSave = true;
+            }
+        }
+    }
+
+    ICommand? openTitleTemplate;
+
+    public ICommand OpenTitleTemplate
+    {
+        get
+        {
+            return openTitleTemplate ??= new RelayCommand(
+                obj => 
+                { 
+                    if (nonStandard)
                     {
-                        nonStandard = false;
+                        InitTitle();
                     }
-                }
 
-                Update();
-                TemplateHelper.NeedSave = true;
-                if (!nonStandard)
-                {
-                    YellowFragment.Clear();
-                    Lines.Clear();
-                    Visibilities.Clear();
-                }
-            }
+                    Update();
+                    TemplateHelper.NeedSave = true;
+                    if (!nonStandard)
+                    {
+                        YellowFragment.Clear();
+                        Lines.Clear();
+                        Visibilities.Clear();
+                    }
+                });
         }
     }
 
+
     public bool manualPageNumbering { get; set; }
 
     [XmlIgnore]
@@ -111,6 +277,9 @@ public bool ManualPageNumbering
         }
     }
 
+
+
+
     public int startPageNumber { get; set; }
 
     [XmlIgnore]

diff --git a/WordKiller/WordKiller/Models/User.cs b/WordKiller/WordKiller/Models/User.cs
@@ -3,7 +3,7 @@
 namespace WordKiller.Models;
 
 [Serializable]
-public class User
+public class User : ICloneable
 {
     public User()
     {
@@ -27,4 +27,6 @@ public User()
     public string MiddleName { get; set; }
     public string Shifr { get; set; }
     public bool AutoSelected { get; set; }
+
+    public object Clone() => MemberwiseClone();
 }