From e12393e0aab37e054cfa7454b1252b8accef1a63 Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Thu, 11 May 2017 15:50:07 +0100 Subject: [PATCH] Refactor: Rename dialog classes from frm* to dlg*. --- osrepodbmgr/ChangeLog | 16 ++++++++++++++++ osrepodbmgr/{frmAdd.cs => dlgAdd.cs} | 4 ++-- osrepodbmgr/{frmHelp.cs => dlgHelp.cs} | 4 ++-- osrepodbmgr/{frmSettings.cs => dlgSettings.cs} | 4 ++-- osrepodbmgr/frmMain.cs | 16 ++++++++-------- osrepodbmgr/gtk-gui/{frmAdd.cs => dlgAdd.cs} | 10 +++++----- osrepodbmgr/gtk-gui/gui.stetic | 6 +++--- ...podbmgr.frmHelp.cs => osrepodbmgr.dlgHelp.cs} | 10 +++++----- ...frmSettings.cs => osrepodbmgr.dlgSettings.cs} | 10 +++++----- osrepodbmgr/osrepodbmgr.csproj | 12 ++++++------ 10 files changed, 54 insertions(+), 38 deletions(-) rename osrepodbmgr/{frmAdd.cs => dlgAdd.cs} (99%) rename osrepodbmgr/{frmHelp.cs => dlgHelp.cs} (96%) rename osrepodbmgr/{frmSettings.cs => dlgSettings.cs} (99%) rename osrepodbmgr/gtk-gui/{frmAdd.cs => dlgAdd.cs} (99%) rename osrepodbmgr/gtk-gui/{osrepodbmgr.frmHelp.cs => osrepodbmgr.dlgHelp.cs} (98%) rename osrepodbmgr/gtk-gui/{osrepodbmgr.frmSettings.cs => osrepodbmgr.dlgSettings.cs} (98%) diff --git a/osrepodbmgr/ChangeLog b/osrepodbmgr/ChangeLog index 568b93d..a8827f0 100644 --- a/osrepodbmgr/ChangeLog +++ b/osrepodbmgr/ChangeLog @@ -1,3 +1,19 @@ +2017-05-11 Natalia Portillo + + * dlgAdd.cs: + * dlgHelp.cs: + * frmMain.cs: + * dlgSettings.cs: + * gtk-gui/frmAdd.cs: + * gtk-gui/dlgAdd.cs: + * osrepodbmgr.csproj: + * gtk-gui/gui.stetic: + * gtk-gui/osrepodbmgr.frmHelp.cs: + * gtk-gui/osrepodbmgr.dlgHelp.cs: + * gtk-gui/osrepodbmgr.dlgSettings.cs: + * gtk-gui/osrepodbmgr.frmSettings.cs: + Refactor: Rename dialog classes from frm* to dlg*. + 2017-05-11 Natalia Portillo * frmAdd.cs: diff --git a/osrepodbmgr/frmAdd.cs b/osrepodbmgr/dlgAdd.cs similarity index 99% rename from osrepodbmgr/frmAdd.cs rename to osrepodbmgr/dlgAdd.cs index e39a404..44ffec5 100644 --- a/osrepodbmgr/frmAdd.cs +++ b/osrepodbmgr/dlgAdd.cs @@ -36,7 +36,7 @@ using osrepodbmgr; using osrepodbmgr.Core; using Schemas; -public partial class frmAdd : Dialog +public partial class dlgAdd : Dialog { Thread thdPulseProgress; Thread thdFindFiles; @@ -54,7 +54,7 @@ public partial class frmAdd : Dialog public delegate void OnAddedOSDelegate(DBEntry os, bool existsInRepo, string pathInRepo); public event OnAddedOSDelegate OnAddedOS; - public frmAdd() + public dlgAdd() { Build(); diff --git a/osrepodbmgr/frmHelp.cs b/osrepodbmgr/dlgHelp.cs similarity index 96% rename from osrepodbmgr/frmHelp.cs rename to osrepodbmgr/dlgHelp.cs index 7c0df20..24a91c1 100644 --- a/osrepodbmgr/frmHelp.cs +++ b/osrepodbmgr/dlgHelp.cs @@ -29,9 +29,9 @@ using System; namespace osrepodbmgr { - public partial class frmHelp : Gtk.Dialog + public partial class dlgHelp : Gtk.Dialog { - public frmHelp() + public dlgHelp() { Build(); } diff --git a/osrepodbmgr/frmSettings.cs b/osrepodbmgr/dlgSettings.cs similarity index 99% rename from osrepodbmgr/frmSettings.cs rename to osrepodbmgr/dlgSettings.cs index 4df2935..ba5052e 100644 --- a/osrepodbmgr/frmSettings.cs +++ b/osrepodbmgr/dlgSettings.cs @@ -34,11 +34,11 @@ using Ionic.Zip; namespace osrepodbmgr { - public partial class frmSettings : Dialog + public partial class dlgSettings : Dialog { string oldUnarPath; - public frmSettings() + public dlgSettings() { Build(); txtTmp.Text = Core.Settings.Current.TemporaryFolder; diff --git a/osrepodbmgr/frmMain.cs b/osrepodbmgr/frmMain.cs index f12adbd..463cfbd 100644 --- a/osrepodbmgr/frmMain.cs +++ b/osrepodbmgr/frmMain.cs @@ -221,16 +221,16 @@ namespace osrepodbmgr protected void OnBtnAddClicked(object sender, EventArgs e) { - frmAdd _frmAdd = new frmAdd(); - _frmAdd.OnAddedOS += (os, existsInRepo, pathInRepo) => + dlgAdd _dlgAdd = new dlgAdd(); + _dlgAdd.OnAddedOS += (os, existsInRepo, pathInRepo) => { string color = existsInRepo ? "green" : "red"; osView.AppendValues(os.developer, os.product, os.version, os.languages, os.architecture, os.machine, os.format, os.description, os.oem, os.upgrade, os.update, os.source, os.files, os.netinstall, color, "black", pathInRepo, os.id, os.mdid); }; - _frmAdd.Run(); - _frmAdd.Destroy(); + _dlgAdd.Run(); + _dlgAdd.Destroy(); } protected void OnBtnRemoveClicked(object sender, EventArgs e) @@ -534,16 +534,16 @@ namespace osrepodbmgr protected void OnBtnHelpClicked(object sender, EventArgs e) { - frmHelp _help = new frmHelp(); + dlgHelp _help = new dlgHelp(); _help.Run(); _help.Destroy(); } protected void OnBtnSettingsClicked(object sender, EventArgs e) { - frmSettings _frmSettings = new frmSettings(); - _frmSettings.Run(); - _frmSettings.Destroy(); + dlgSettings _dlgSettings = new dlgSettings(); + _dlgSettings.Run(); + _dlgSettings.Destroy(); } protected void OnBtnQuitClicked(object sender, EventArgs e) diff --git a/osrepodbmgr/gtk-gui/frmAdd.cs b/osrepodbmgr/gtk-gui/dlgAdd.cs similarity index 99% rename from osrepodbmgr/gtk-gui/frmAdd.cs rename to osrepodbmgr/gtk-gui/dlgAdd.cs index 74c21d8..6d8db40 100644 --- a/osrepodbmgr/gtk-gui/frmAdd.cs +++ b/osrepodbmgr/gtk-gui/dlgAdd.cs @@ -1,7 +1,7 @@ // This file has been generated by the GUI designer. Do not modify. -public partial class frmAdd +public partial class dlgAdd { private global::Gtk.HBox hbox15; @@ -118,11 +118,11 @@ public partial class frmAdd protected virtual void Build() { global::Stetic.Gui.Initialize(this); - // Widget frmAdd - this.Name = "frmAdd"; + // Widget dlgAdd + this.Name = "dlgAdd"; this.Title = global::Mono.Unix.Catalog.GetString("Add operating system"); this.WindowPosition = ((global::Gtk.WindowPosition)(4)); - // Internal child frmAdd.VBox + // Internal child dlgAdd.VBox global::Gtk.VBox w1 = this.VBox; w1.Name = "vbox1"; w1.Spacing = 6; @@ -658,7 +658,7 @@ public partial class frmAdd w59.Position = 12; w59.Expand = false; w59.Fill = false; - // Internal child frmAdd.ActionArea + // Internal child dlgAdd.ActionArea global::Gtk.HButtonBox w60 = this.ActionArea; w60.Name = "__gtksharp_108_Stetic_TopLevelDialog_ActionArea"; // Container child __gtksharp_108_Stetic_TopLevelDialog_ActionArea.Gtk.ButtonBox+ButtonBoxChild diff --git a/osrepodbmgr/gtk-gui/gui.stetic b/osrepodbmgr/gtk-gui/gui.stetic index b966b43..7f32c1a 100644 --- a/osrepodbmgr/gtk-gui/gui.stetic +++ b/osrepodbmgr/gtk-gui/gui.stetic @@ -7,7 +7,7 @@ - + Add operating system CenterOnParent @@ -755,7 +755,7 @@ - + Help Dialog @@ -949,7 +949,7 @@ QNX/QNX/20090229/source.zip - + Settings CenterOnParent diff --git a/osrepodbmgr/gtk-gui/osrepodbmgr.frmHelp.cs b/osrepodbmgr/gtk-gui/osrepodbmgr.dlgHelp.cs similarity index 98% rename from osrepodbmgr/gtk-gui/osrepodbmgr.frmHelp.cs rename to osrepodbmgr/gtk-gui/osrepodbmgr.dlgHelp.cs index caa8ad2..5c47522 100644 --- a/osrepodbmgr/gtk-gui/osrepodbmgr.frmHelp.cs +++ b/osrepodbmgr/gtk-gui/osrepodbmgr.dlgHelp.cs @@ -2,7 +2,7 @@ // This file has been generated by the GUI designer. Do not modify. namespace osrepodbmgr { - public partial class frmHelp + public partial class dlgHelp { private global::Gtk.ScrolledWindow GtkScrolledWindow; @@ -15,12 +15,12 @@ namespace osrepodbmgr protected virtual void Build() { global::Stetic.Gui.Initialize(this); - // Widget osrepodbmgr.frmHelp - this.Name = "osrepodbmgr.frmHelp"; + // Widget osrepodbmgr.dlgHelp + this.Name = "osrepodbmgr.dlgHelp"; this.Title = global::Mono.Unix.Catalog.GetString("Help"); this.TypeHint = ((global::Gdk.WindowTypeHint)(1)); this.WindowPosition = ((global::Gtk.WindowPosition)(4)); - // Internal child osrepodbmgr.frmHelp.VBox + // Internal child osrepodbmgr.dlgHelp.VBox global::Gtk.VBox w1 = this.VBox; w1.Name = "vbox4"; w1.Spacing = 6; @@ -50,7 +50,7 @@ namespace osrepodbmgr w4.Position = 1; w4.Expand = false; w4.Fill = false; - // Internal child osrepodbmgr.frmHelp.ActionArea + // Internal child osrepodbmgr.dlgHelp.ActionArea global::Gtk.HButtonBox w5 = this.ActionArea; w5.Name = "__gtksharp_108_Stetic_TopLevelDialog_ActionArea"; // Container child __gtksharp_108_Stetic_TopLevelDialog_ActionArea.Gtk.ButtonBox+ButtonBoxChild diff --git a/osrepodbmgr/gtk-gui/osrepodbmgr.frmSettings.cs b/osrepodbmgr/gtk-gui/osrepodbmgr.dlgSettings.cs similarity index 98% rename from osrepodbmgr/gtk-gui/osrepodbmgr.frmSettings.cs rename to osrepodbmgr/gtk-gui/osrepodbmgr.dlgSettings.cs index 01b75a8..ffc411c 100644 --- a/osrepodbmgr/gtk-gui/osrepodbmgr.frmSettings.cs +++ b/osrepodbmgr/gtk-gui/osrepodbmgr.dlgSettings.cs @@ -2,7 +2,7 @@ // This file has been generated by the GUI designer. Do not modify. namespace osrepodbmgr { - public partial class frmSettings + public partial class dlgSettings { private global::Gtk.HBox hbox26; @@ -55,11 +55,11 @@ namespace osrepodbmgr protected virtual void Build() { global::Stetic.Gui.Initialize(this); - // Widget osrepodbmgr.frmSettings - this.Name = "osrepodbmgr.frmSettings"; + // Widget osrepodbmgr.dlgSettings + this.Name = "osrepodbmgr.dlgSettings"; this.Title = global::Mono.Unix.Catalog.GetString("Settings"); this.WindowPosition = ((global::Gtk.WindowPosition)(4)); - // Internal child osrepodbmgr.frmSettings.VBox + // Internal child osrepodbmgr.dlgSettings.VBox global::Gtk.VBox w1 = this.VBox; w1.Name = "vbox5"; w1.Spacing = 6; @@ -296,7 +296,7 @@ namespace osrepodbmgr w28.Position = 6; w28.Expand = false; w28.Fill = false; - // Internal child osrepodbmgr.frmSettings.ActionArea + // Internal child osrepodbmgr.dlgSettings.ActionArea global::Gtk.HButtonBox w29 = this.ActionArea; w29.Name = "__gtksharp_108_Stetic_TopLevelDialog_ActionArea"; // Container child __gtksharp_108_Stetic_TopLevelDialog_ActionArea.Gtk.ButtonBox+ButtonBoxChild diff --git a/osrepodbmgr/osrepodbmgr.csproj b/osrepodbmgr/osrepodbmgr.csproj index 7184b54..254d191 100644 --- a/osrepodbmgr/osrepodbmgr.csproj +++ b/osrepodbmgr/osrepodbmgr.csproj @@ -64,13 +64,11 @@ - + - - - - + + @@ -79,9 +77,11 @@ - + + +