diff --git a/Text Editor/AboutForm.Designer.cs b/Text Editor/AboutForm.Designer.cs index 3af591d..2611a9d 100644 --- a/Text Editor/AboutForm.Designer.cs +++ b/Text Editor/AboutForm.Designer.cs @@ -63,7 +63,7 @@ private void InitializeComponent() this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(69, 13); this.label2.TabIndex = 2; - this.label2.Text = "Version 1.1.2"; + this.label2.Text = "Version 1.1.3"; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // label3 diff --git a/Text Editor/App.config b/Text Editor/App.config index 9ea3d01..86db754 100644 --- a/Text Editor/App.config +++ b/Text Editor/App.config @@ -13,6 +13,9 @@ False + + Consolas, 11.25pt + \ No newline at end of file diff --git a/Text Editor/Form1.Designer.cs b/Text Editor/Form1.Designer.cs index 43f1133..a6f6cbd 100644 --- a/Text Editor/Form1.Designer.cs +++ b/Text Editor/Form1.Designer.cs @@ -61,6 +61,7 @@ private void InitializeComponent() this.menuItem24 = new System.Windows.Forms.MenuItem(); this.panel1 = new System.Windows.Forms.Panel(); this.mainEditor = new System.Windows.Forms.RichTextBox(); + this.menuItem29 = new System.Windows.Forms.MenuItem(); this.panel1.SuspendLayout(); this.SuspendLayout(); // @@ -208,7 +209,8 @@ private void InitializeComponent() // this.menuItem17.Index = 2; this.menuItem17.MenuItems.AddRange(new System.Windows.Forms.MenuItem[] { - this.menuItem18}); + this.menuItem18, + this.menuItem29}); this.menuItem17.Text = "View"; // // menuItem18 @@ -293,6 +295,12 @@ private void InitializeComponent() this.mainEditor.Text = ""; this.mainEditor.TextChanged += new System.EventHandler(this.mainEditor_TextChanged); // + // menuItem29 + // + this.menuItem29.Index = 1; + this.menuItem29.Text = "Change Font..."; + this.menuItem29.Click += new System.EventHandler(this.menuItem29_Click); + // // Form1 // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -342,6 +350,7 @@ private void InitializeComponent() private System.Windows.Forms.MenuItem menuItem26; private System.Windows.Forms.MenuItem menuItem27; private System.Windows.Forms.MenuItem menuItem28; + private System.Windows.Forms.MenuItem menuItem29; } } diff --git a/Text Editor/Form1.cs b/Text Editor/Form1.cs index 465759e..ff70417 100644 --- a/Text Editor/Form1.cs +++ b/Text Editor/Form1.cs @@ -21,6 +21,7 @@ public Form1() InitializeComponent(); menuItem18.Checked = Properties.Settings.Default.EnableWordWrap; mainEditor.WordWrap = Properties.Settings.Default.EnableWordWrap; + mainEditor.Font = Properties.Settings.Default.Font; } public Form1(string fileName) : this() @@ -274,5 +275,19 @@ private void Form1_FormClosing(object sender, FormClosingEventArgs e) } } } + + private void menuItem29_Click(object sender, EventArgs e) + { + using (FontDialog fd = new FontDialog() { Font = Properties.Settings.Default.Font }) + { + if (fd.ShowDialog() == DialogResult.OK) + { + Properties.Settings.Default.Font = fd.Font; + Properties.Settings.Default.Save(); + mainEditor.Font = Properties.Settings.Default.Font; + this.Text = this.Text.Replace("*", ""); + } + } + } } } diff --git a/Text Editor/Inno/Text_Editor_1_1_3_Setup.exe b/Text Editor/Inno/Text_Editor_1_1_3_Setup.exe new file mode 100644 index 0000000..dc3979a Binary files /dev/null and b/Text Editor/Inno/Text_Editor_1_1_3_Setup.exe differ diff --git a/Text Editor/Inno/installer.iss b/Text Editor/Inno/installer.iss index b2682dd..d622402 100644 --- a/Text Editor/Inno/installer.iss +++ b/Text Editor/Inno/installer.iss @@ -2,7 +2,7 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "Text Editor" -#define MyAppVersion "1.1.2" +#define MyAppVersion "1.1.3" #define MyAppPublisher "Zach, Inc." #define MyAppExeName "Text Editor.exe" #define MyAppAssocName "Text File" @@ -17,14 +17,15 @@ AppName={#MyAppName} AppVersion={#MyAppVersion} ;AppVerName={#MyAppName} {#MyAppVersion} AppPublisher={#MyAppPublisher} -DefaultDirName=C:\Program Files (x86)\{#MyAppName} +DefaultDirName={autopf}\{#MyAppName} ChangesAssociations=yes DisableProgramGroupPage=yes +DisableWelcomePage=no LicenseFile=C:\Users\zacha\Documents\License Agreement.rtf ; Uncomment the following line to run in non administrative install mode (install for current user only.) ;PrivilegesRequired=lowest OutputDir=C:\Users\zacha\source\repos\Text Editor\Text Editor\Inno -OutputBaseFilename=Text_Editor_1_1_2_Setup +OutputBaseFilename=Text_Editor_1_1_3_Setup Compression=lzma SolidCompression=yes WizardStyle=modern @@ -45,6 +46,7 @@ Root: HKCR; Subkey: "{#MyAppAssocExt}\OpenWithProgids"; ValueType: string; Value Root: HKCR; Subkey: "{#MyAppAssocKey}"; ValueType: string; ValueName: ""; ValueData: "{#MyAppAssocName}"; Flags: uninsdeletekey Root: HKCR; Subkey: "{#MyAppAssocKey}\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "C:\Windows\System32\imageres.dll,246" Root: HKCR; Subkey: "{#MyAppAssocKey}\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#MyAppExeName}"" ""%1""" +Root: HKCR; Subkey: "{#MyAppAssocKey}\shell\edit\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#MyAppExeName}"" ""%1""" Root: HKCR; Subkey: "Applications\{#MyAppExeName}\SupportedTypes"; ValueType: string; ValueName: ".txt"; ValueData: "" [Icons] diff --git a/Text Editor/Properties/Settings.Designer.cs b/Text Editor/Properties/Settings.Designer.cs index 2399abb..57acf60 100644 --- a/Text Editor/Properties/Settings.Designer.cs +++ b/Text Editor/Properties/Settings.Designer.cs @@ -34,5 +34,17 @@ public bool EnableWordWrap { this["EnableWordWrap"] = value; } } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("Consolas, 11.25pt")] + public global::System.Drawing.Font Font { + get { + return ((global::System.Drawing.Font)(this["Font"])); + } + set { + this["Font"] = value; + } + } } } diff --git a/Text Editor/Properties/Settings.settings b/Text Editor/Properties/Settings.settings index 5ccf3fd..72c53c4 100644 --- a/Text Editor/Properties/Settings.settings +++ b/Text Editor/Properties/Settings.settings @@ -5,5 +5,8 @@ False + + Consolas, 11.25pt + \ No newline at end of file