Refactor: Rename dialog classes from frm* to dlg*.

This commit is contained in:
2017-05-11 15:50:07 +01:00
parent 8e794c8364
commit e12393e0aa
10 changed files with 54 additions and 38 deletions

View File

@@ -1,3 +1,19 @@
2017-05-11 Natalia Portillo <claunia@claunia.com>
* 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 <claunia@claunia.com>
* frmAdd.cs:

View File

@@ -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();

View File

@@ -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();
}

View File

@@ -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;

View File

@@ -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)

View File

@@ -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

View File

@@ -7,7 +7,7 @@
<widget-library name="glade-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
<widget-library name="../bin/Debug/osrepodbmgr.exe" internal="true" />
</import>
<widget class="Gtk.Dialog" id="frmAdd" design-size="857 544">
<widget class="Gtk.Dialog" id="dlgAdd" design-size="857 544">
<property name="MemberName" />
<property name="Title" translatable="yes">Add operating system</property>
<property name="WindowPosition">CenterOnParent</property>
@@ -755,7 +755,7 @@
</widget>
</child>
</widget>
<widget class="Gtk.Dialog" id="osrepodbmgr.frmHelp" design-size="400 300">
<widget class="Gtk.Dialog" id="osrepodbmgr.dlgHelp" design-size="400 300">
<property name="MemberName" />
<property name="Title" translatable="yes">Help</property>
<property name="TypeHint">Dialog</property>
@@ -949,7 +949,7 @@ QNX/QNX/20090229/source.zip</property>
</widget>
</child>
</widget>
<widget class="Gtk.Dialog" id="osrepodbmgr.frmSettings" design-size="400 250">
<widget class="Gtk.Dialog" id="osrepodbmgr.dlgSettings" design-size="400 250">
<property name="MemberName" />
<property name="Title" translatable="yes">Settings</property>
<property name="WindowPosition">CenterOnParent</property>

View File

@@ -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

View File

@@ -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

View File

@@ -64,13 +64,11 @@
</ItemGroup>
<ItemGroup>
<Compile Include="gtk-gui\generated.cs" />
<Compile Include="frmAdd.cs" />
<Compile Include="dlgAdd.cs" />
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="frmHelp.cs" />
<Compile Include="gtk-gui\osrepodbmgr.frmHelp.cs" />
<Compile Include="frmSettings.cs" />
<Compile Include="gtk-gui\osrepodbmgr.frmSettings.cs" />
<Compile Include="dlgHelp.cs" />
<Compile Include="dlgSettings.cs" />
<Compile Include="dlgMetadata.cs" />
<Compile Include="gtk-gui\osrepodbmgr.dlgMetadata.cs" />
<Compile Include="dlgBlockMedia.cs" />
@@ -79,9 +77,11 @@
<Compile Include="gtk-gui\osrepodbmgr.dlgFilesystem.cs" />
<Compile Include="dlgOpticalDisc.cs" />
<Compile Include="gtk-gui\osrepodbmgr.dlgOpticalDisc.cs" />
<Compile Include="gtk-gui\frmAdd.cs" />
<Compile Include="frmMain.cs" />
<Compile Include="gtk-gui\osrepodbmgr.frmMain.cs" />
<Compile Include="gtk-gui\dlgAdd.cs" />
<Compile Include="gtk-gui\osrepodbmgr.dlgHelp.cs" />
<Compile Include="gtk-gui\osrepodbmgr.dlgSettings.cs" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />