michal/tbf
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/task_5-new-app-icon' into develop/SLM-PT50

Browse Source
This commit is contained in:
marekf
2026-03-04 19:14:02 +01:00
parent 2bf00606d3 4a2d4772d7
commit 27072598cd
141 changed files with 521 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/UI/Bench/Components/ComponentParametersDlg.cs
+3
View File
@@ -40,6 +40,9 @@ namespace TBF.UI.Bench.Components
ComponentParametersDlg()
{
InitializeComponent();
this.Icon = Properties.Resources.TBF_icon;
}
/// <summary>
TBF/UI/Bench/Components/ComponentsManagerDlg.cs
+1 -1
View File
@@ -64,7 +64,7 @@ namespace TBF.UI.Bench.Components
InitializeComponent();
flags = CfgUpdateFlags.None;
flags = CfgUpdateFlags.None;
selectComponentTypeDlg = new SelectComponentClassDlg();
TBF/UI/Bench/Components/SelectComponentClassDlg.cs
-4
View File
@@ -24,10 +24,6 @@ namespace TBF.UI.Bench.Components
{
InitializeComponent();
/// SharedDlgSearchForListBox configuration
sharedSearchForListBox1.ParentForm = this;
sharedSearchForListBox1.ListBoxEx = availCmpntsLstBox;
classNamePrefix = (prefix != null) ? prefix : string.Empty;
foreach (var componentFactory in Rig.TbfComponents.Factories)
{
TBF/UI/Bench/EditSchDrawing/EditSchDrawingDlg.cs
+3
View File
@@ -47,6 +47,9 @@ namespace TBF.UI.Bench.EditSchDrawing
public EditSchDrawingDlg()
{
InitializeComponent();
this.Icon = Properties.Resources.TBF_icon;
Controls.Add(new TextBox() { Visible = false });
selectComponentTypeDlg = new SelectComponentClassDlg("Various.Drawing.");
TBF/UI/Bench/Metrology/MetrologyDlg.cs
+2
View File
@@ -26,6 +26,8 @@ namespace TBF.UI.Bench.Metrology
{
InitializeComponent();
this.Icon = Properties.Resources.TBF_icon;
/// SharedDlgButtons configuration
sharedButtons.ParentForm = this;
sharedButtons.RequiredGroupMembership = new GID[] { GID.Metrologists,
TBF/UI/Bench/Paths/PathsDlg.cs
+3 -1
View File
@@ -52,7 +52,9 @@ namespace TBF.UI.Bench.Paths
InitializeComponent();
/// SharedDlgButtons configuration
this.Icon = Properties.Resources.TBF_icon;
/// SharedDlgButtons configuration
sharedButtons.ParentForm = this;
sharedButtons.RequiredGroupMembership = new GID[] { GID.Metrologists };
sharedButtons.OptionalButtons = SharedButtons.Buttons.Add | SharedButtons.Buttons.Remove |
TBF/UI/Bench/TestProfiles/TestProfileDlg.cs
+2
View File
@@ -42,6 +42,8 @@ namespace TBF.UI.Bench.TestProfiles
{
InitializeComponent();
this.Icon = Properties.Resources.TBF_icon;
/// Detect display setting: 100% = 96dpi, 125% = 120dpi, 150% = 144dpi.
Dpi = (int)this.CreateGraphics().DpiX;
openUnlocked = false;
TBF/UI/Bench/TestProfiles/TestProfilesDlg.cs
+3 -1
View File
@@ -26,7 +26,9 @@ namespace TBF.UI.Bench.TestProfiles
InitializeComponent();
/// SharedDlgButtons configuration
this.Icon = Properties.Resources.TBF_icon;
/// SharedDlgButtons configuration
sharedButtons.ParentForm = this;
sharedButtons.RequiredGroupMembership = new GID[] { GID.MetrologicalAuthority };
TBF/UI/Bench/Transitions/TransitionsDlg.cs
+3 -1
View File
@@ -65,7 +65,9 @@ namespace TBF.UI.Bench.Transitions
InitializeComponent();
/// SharedDlgButtons configuration
this.Icon = Properties.Resources.TBF_icon;
/// SharedDlgButtons configuration
sharedButtons.ParentForm = this;
sharedButtons.RequiredGroupMembership = new GID[] { GID.Metrologists };
sharedButtons.OptionalButtons = SharedButtons.Buttons.Add | SharedButtons.Buttons.Remove |
TBF/UI/Bench/Uncertainties/UncertaintiesDlg.cs
+2
View File
@@ -26,6 +26,8 @@ namespace TBF.UI.Bench.Uncertainties
{
InitializeComponent();
this.Icon = Properties.Resources.TBF_icon;
/// SharedDlgButtons configuration
sharedButtons.ParentForm = this;
//#if LANG_PL
TBF/UI/Calendar/EventDetailsForm.cs
+3
View File
@@ -33,6 +33,9 @@ namespace TBF.UI.Calendar
public EventDetailsForm()
{
InitializeComponent();
this.Icon = Properties.Resources.TBF_icon;
Text = Strings.Event_details;
for (Frequency f = Frequency.Once; f < Frequency.Count; f++)
{
TBF/UI/DummyDlg.cs
+2
View File
@@ -10,6 +10,8 @@ namespace TBF.UI
public DummyDlg()
{
InitializeComponent();
this.Icon = Properties.Resources.TBF_icon;
}
}
}
TBF/UI/Help/AboutDlg.cs
+3 -1
View File
@@ -25,7 +25,9 @@ namespace TBF.UI.Help
{
InitializeComponent();
Text = Strings.About_Test_Bench_Framework;
this.Icon = Properties.Resources.TBF_icon;
Text = Strings.About_Test_Bench_Framework;
copyrightLabel.Text = string.Format(Strings.CopyrightStr, DateTime.Now.Year);
versionLabel.Text = String.Format(Strings.VersionStr, Program.Version);
buildDateLabel.Text = String.Format(Strings.BuildDateStr, Program.BuildDateTime.ToString(Constants.DateFormat));
TBF/UI/MainWnd.cs
+4 -1
View File
@@ -111,12 +111,15 @@ namespace TBF.UI
/// </summary>
public MainWnd()
{
this.Icon = Properties.Resources.TBF_icon;
/// Detect display setting: 100% = 96dpi, 125% = 120dpi, 150% = 144dpi.
Dpi = (int)this.CreateGraphics().DpiX;
InitializeComponent();
Text = string.Format("{0} ver. {1} - {2}{3}", Strings.Test_Bench_Framework, Program.Version,
this.Icon = Properties.Resources.TBF_icon;
Text = string.Format("{0} ver. {1} - {2}{3}", Strings.Test_Bench_Framework, Program.Version,
TBF.DB.CurrentBench.BenchName, TBF.DB.CurrentBench.IsRealBench ? "" : Strings._offline);
localProcedures = new List<Procedure>();
TBF/UI/MainWnd.resx
+6 -6
View File
@@ -739,7 +739,7 @@
<value>processTabPageCtrl</value>
</data>
<data name="&gt;&gt;processTabPageCtrl.Type" xml:space="preserve">
<value>TBF.UI.Process.ProcessTabPageCtrl, TBF, Version=3.9.2144.1, Culture=neutral, PublicKeyToken=null</value>
<value>TBF.UI.Process.ProcessTabPageCtrl, TBF, Version=3.9.2149.4, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;processTabPageCtrl.Parent" xml:space="preserve">
<value>processTabPage</value>
@@ -817,7 +817,7 @@
<value>resultsTabPageCtrl</value>
</data>
<data name="&gt;&gt;resultsTabPageCtrl.Type" xml:space="preserve">
<value>TBF.UI.ResultsMI.ResultsTabPageCtrl, TBF, Version=3.9.2144.1, Culture=neutral, PublicKeyToken=null</value>
<value>TBF.UI.ResultsMI.ResultsTabPageCtrl, TBF, Version=3.9.2149.4, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;resultsTabPageCtrl.Parent" xml:space="preserve">
<value>resultsTabPage</value>
@@ -871,7 +871,7 @@
<value>graphsTabPageCtrl</value>
</data>
<data name="&gt;&gt;graphsTabPageCtrl.Type" xml:space="preserve">
<value>TBF.UI.Graphs.GraphsTabPageCtrl, TBF, Version=3.9.2144.1, Culture=neutral, PublicKeyToken=null</value>
<value>TBF.UI.Graphs.GraphsTabPageCtrl, TBF, Version=3.9.2149.4, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;graphsTabPageCtrl.Parent" xml:space="preserve">
<value>graphsTabPage</value>
@@ -925,7 +925,7 @@
<value>eventLogsTabPageCtrl</value>
</data>
<data name="&gt;&gt;eventLogsTabPageCtrl.Type" xml:space="preserve">
<value>TBF.UI.EventLogs.EventLogsTabPageCtrl, TBF, Version=3.9.2144.1, Culture=neutral, PublicKeyToken=null</value>
<value>TBF.UI.EventLogs.EventLogsTabPageCtrl, TBF, Version=3.9.2149.4, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;eventLogsTabPageCtrl.Parent" xml:space="preserve">
<value>eventLogsTabPage</value>
@@ -979,7 +979,7 @@
<value>calendarTabPageCtrl</value>
</data>
<data name="&gt;&gt;calendarTabPageCtrl.Type" xml:space="preserve">
<value>TBF.UI.Calendar.CalendarTabPageCtrl, TBF, Version=3.9.2144.1, Culture=neutral, PublicKeyToken=null</value>
<value>TBF.UI.Calendar.CalendarTabPageCtrl, TBF, Version=3.9.2149.4, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;calendarTabPageCtrl.Parent" xml:space="preserve">
<value>calendarTabPage</value>
@@ -1033,7 +1033,7 @@
<value>picturesTabPageCtrl</value>
</data>
<data name="&gt;&gt;picturesTabPageCtrl.Type" xml:space="preserve">
<value>TBF.UI.Camera.PicturesTabPageCtrl, TBF, Version=3.9.2144.1, Culture=neutral, PublicKeyToken=null</value>
<value>TBF.UI.Camera.PicturesTabPageCtrl, TBF, Version=3.9.2149.4, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;picturesTabPageCtrl.Parent" xml:space="preserve">
<value>picturesTabPage</value>
TBF/UI/Procedures/ProcedureDlg.cs
+2
View File
@@ -72,6 +72,8 @@ namespace TBF.UI.Procedures
{
InitializeComponent();
this.Icon = Properties.Resources.TBF_icon;
/// Detect display setting: 100% = 96dpi, 125% = 120dpi, 150% = 144dpi.
Dpi = (int)this.CreateGraphics().DpiX;
}
TBF/UI/Procedures/ProceduresDlg.cs
+3 -1
View File
@@ -24,7 +24,9 @@ namespace TBF.UI.Procedures
InitializeComponent();
/// SharedDlgButtons configuration
this.Icon = Properties.Resources.TBF_icon;
/// SharedDlgButtons configuration
sharedButtons.ParentForm = this;
sharedButtons.RequiredGroupMembership = new GID[] { GID.TestingSpecialists, GID.Metrologists };
TBF/UI/Procedures/TestWizard/ConfirmUpdatingTests.cs
+2
View File
@@ -19,6 +19,8 @@ namespace TBF.UI.Procedures.TestWizard
InitializeComponent();
this.Icon = Properties.Resources.TBF_icon;
Text = Strings.Confirmation;
messageLabel.Text = Strings.Do_you_want_to_update_tests_QM;
backButton.Text = Strings.BackBtnText;
TBF/UI/Procedures/TestWizard/FlowSelection.cs
+2
View File
@@ -32,6 +32,8 @@ namespace TBF.UI.Procedures.TestWizard
{
InitializeComponent();
this.Icon = Properties.Resources.TBF_icon;
qSpec = QSpec.Qfrom_Qto;
Text = Strings.Flow_selection;
qFromLabel.Text = Strings.Q_from;
TBF/UI/Procedures/TestWizard/HeatMetersSelection.cs
+4 -2
View File
@@ -12,9 +12,11 @@ namespace TBF.UI.Procedures.TestWizard
public HeatMetersSelection()
{
InitializeComponent();
}
public HeatMetersSelection(bool first, bool last, Test test)
this.Icon = Properties.Resources.TBF_icon;
}
public HeatMetersSelection(bool first, bool last, Test test)
: this()
{
this.test = test;
TBF/UI/Procedures/TestWizard/MethodSelection.cs
+4 -2
View File
@@ -22,9 +22,11 @@ namespace TBF.UI.Procedures.TestWizard
public MethodSelection()
{
InitializeComponent();
}
public MethodSelection(bool first, bool last,
this.Icon = Properties.Resources.TBF_icon;
}
public MethodSelection(bool first, bool last,
Test test,
IList<Rig.GenericDevices.ITestMethod> methods)
: this()
TBF/UI/Procedures/TestWizard/OracleWZTypSelection.cs
+3 -1
View File
@@ -42,7 +42,9 @@ namespace TBF.UI.Procedures.TestWizard
this.testMethods = testMethods;
InitializeComponent();
this.Icon = Properties.Resources.TBF_icon;
Text = Strings.Method_selection;
backButton.Text = Strings.BackBtnText;
nextButton.Text = Strings.NextBtnText;
TBF/UI/Procedures/TestWizard/PressureSelection.cs
+4 -2
View File
@@ -18,9 +18,11 @@ namespace TBF.UI.Procedures.TestWizard
public PressureSelection()
{
InitializeComponent();
}
public PressureSelection(bool first, bool last, Test test)
this.Icon = Properties.Resources.TBF_icon;
}
public PressureSelection(bool first, bool last, Test test)
: this()
{
this.test = test;
TBF/UI/Procedures/TestWizard/Roi1.cs
+4 -2
View File
@@ -19,9 +19,11 @@ namespace TBF.UI.Procedures.TestWizard
public Roi1()
{
InitializeComponent();
}
public Roi1(bool first, bool last, RoiData roiData)
this.Icon = Properties.Resources.TBF_icon;
}
public Roi1(bool first, bool last, RoiData roiData)
: this()
{
this.roiData = roiData;
TBF/UI/Procedures/TestWizard/Roi2.cs
+4 -2
View File
@@ -15,9 +15,11 @@ namespace TBF.UI.Procedures.TestWizard
public Roi2()
{
InitializeComponent();
}
public Roi2(bool first, bool last, RoiData roiData)
this.Icon = Properties.Resources.TBF_icon;
}
public Roi2(bool first, bool last, RoiData roiData)
: this()
{
this.roiData = roiData;
TBF/UI/Procedures/TestWizard/Roi3.cs
+4 -2
View File
@@ -15,9 +15,11 @@ namespace TBF.UI.Procedures.TestWizard
public Roi3()
{
InitializeComponent();
}
public Roi3(bool first, bool last, RoiData roiData)
this.Icon = Properties.Resources.TBF_icon;
}
public Roi3(bool first, bool last, RoiData roiData)
: this()
{
this.roiData = roiData;
TBF/UI/Procedures/TestWizard/TestProfileSelection.cs
+2
View File
@@ -63,6 +63,8 @@ namespace TBF.UI.Procedures.TestWizard
InitializeComponent();
this.Icon = Properties.Resources.TBF_icon;
/// Find possible selector values
selectorVals = new List<string>();
foreach (var p in fPaths) if (!string.IsNullOrEmpty(p.Selector) && !selectorVals.Contains(p.Selector)) selectorVals.Add(p.Selector);
TBF/UI/Procedures/TestWizard/VolumeAndErrorSelection.cs
+2
View File
@@ -26,6 +26,8 @@ namespace TBF.UI.Procedures.TestWizard
{
InitializeComponent();
this.Icon = Properties.Resources.TBF_icon;
tabId = 0;
Text = Strings.Volume_and_error_selection;
TBF/UI/ResultsMI/DeleteFromOracleForm.cs
+2
View File
@@ -32,6 +32,8 @@ namespace TBF.UI.ResultsMI
{
InitializeComponent();
this.Icon = Properties.Resources.TBF_icon;
testBenchName = ProcessData.BenchInfo.TestBenchName;
testBenchId = ProcessData.BenchInfo.TestBenchId;
TBF/UI/ResultsMI/PreviousResultsDlg.cs
+4 -1
View File
@@ -47,7 +47,10 @@ namespace TBF.UI.ResultsMI
public PreviousResultsDlg(PreviousResultsMode mode)
{
InitializeComponent();
this.mode = mode;
this.Icon = Properties.Resources.TBF_icon;
this.mode = mode;
currentBatchNr = Program.LocalSettings.BatchNr;
PrintHandler += delegate(object sndr, PreviousResultIdEventArgs args)
TBF/UI/ResultsMI/PrintResultsSelectionDlg.cs
+2
View File
@@ -21,6 +21,8 @@ namespace TBF.UI.ResultsMI
InitializeComponent();
this.Icon = Properties.Resources.TBF_icon;
Localize();
if (printers != null)
TBF/UI/ResultsMI/ResultsArrangementDlg.cs
+4 -1
View File
@@ -48,7 +48,10 @@ namespace TBF.UI.ResultsMI
public ResultsArrangementDlg()
{
InitializeComponent();
resultsConfigCtrl.SupressTestIDColumn = true;
this.Icon = Properties.Resources.TBF_icon;
resultsConfigCtrl.SupressTestIDColumn = true;
Unlocked = false;
cancelButton.Visible = false;
TBF/UI/ResultsMI/SendAgainDBAndWMSelectionForm.cs
+2
View File
@@ -17,6 +17,8 @@ namespace TBF.UI.ResultsMI
{
InitializeComponent();
this.Icon = Properties.Resources.TBF_icon;
Localize();
databaseComboBox.Items.Add(DBUsed.Production);
TBF/UI/Settings/BenchesDlg.cs
+3
View File
@@ -30,6 +30,9 @@ namespace TBF.UI.Settings
if (localSettings == null) throw new Exception("Cannot load local settings");
InitializeComponent();
this.Icon = Properties.Resources.TBF_icon;
RedrawTestBenchesListBox();
CurrentDBChanged = false;
}
TBF/UI/Settings/DatabaseSettingsDlg.cs
+3 -1
View File
@@ -42,9 +42,11 @@ namespace TBF.UI.Settings
CurrentDBChanged = false;
InitializeComponent();
}
void Localize()
void Localize()
{
Text = Strings.Test_Bench_Databases_Specification;
label1.Text = Strings.Test_bench_name;
TBF/UI/Settings/LanguageDlg.cs
+2
View File
@@ -67,6 +67,8 @@ namespace TBF.UI.Settings
InitializeComponent();
this.Icon = Properties.Resources.TBF_icon;
// Initialize the list box with langauges
for (int i = 0; i < LanguageName.Length; i++)
{
TBF/UI/Settings/UpgradeSelectionDlg.cs
+2
View File
@@ -30,6 +30,8 @@ namespace TBF.UI.Settings
{
InitializeComponent();
this.Icon = Properties.Resources.TBF_icon;
upgradeConfigDBCheckBox.Checked = true;
upgradeResultsDBCheckBox.Checked = true;
}
TBF/UI/Shared/ClosingTbfForm.cs
+3
View File
@@ -14,6 +14,9 @@ namespace TBF.UI.Shared
public ClosingTbfForm()
{
InitializeComponent();
this.Icon = Properties.Resources.TBF_icon;
ShutDownPC = false;
Text = Strings.Closing_the_program;
messageLabel.Text = Strings.Do_you_want_to_exit_TBF;
TBF/UI/Shared/ErrorDlg.cs
+4 -1
View File
@@ -21,9 +21,12 @@ namespace TBF.UI.Shared
public ErrorDlg()
{
InitializeComponent();
this.Icon = Properties.Resources.TBF_icon;
}
public ErrorDlg(string ErrorDescription)
public ErrorDlg(string ErrorDescription)
: this()
{
textBoxMessage.Text = ErrorDescription;
TBF/UI/Shared/LoginDlgWithBenchSelection.cs
+3 -1
View File
@@ -45,7 +45,9 @@ namespace TBF.UI.Shared
public LoginDlgWithBenchSelection()
{
InitializeComponent();
}
this.Icon = Properties.Resources.TBF_icon;
}
/// <summary>
/// Constructor with a predefined bench.
TBF/UI/Shared/ModelessActivityForm.cs
+3
View File
@@ -38,6 +38,9 @@ namespace TBF.UI.Shared
public ModelessActivityForm()
{
InitializeComponent();
this.Icon = Properties.Resources.TBF_icon;
ControlBox = false;
CloseFormHandler += HandleCloseFormCommand;
TBF/UI/Shared/NoBenchOrDatabaseDlg.cs
+2
View File
@@ -21,6 +21,8 @@ namespace TBF.UI.Shared
public NoBenchOrDatabaseDlg()
{
InitializeComponent();
this.Icon = Properties.Resources.TBF_icon;
}
private void NoDatabaseMsgDlg_Load(object sender, EventArgs e)
TBF/UI/Shared/PrintOrderForm.cs
+4 -2
View File
@@ -23,9 +23,11 @@ namespace TBF.UI.Shared
public PrintOrderForm()
{
InitializeComponent();
}
private void PrintOrderForm_Load(object sender, EventArgs e)
this.Icon = Properties.Resources.TBF_icon;
}
private void PrintOrderForm_Load(object sender, EventArgs e)
{
Localize();
TBF/UI/Shared/RemarkDlg.cs
+3
View File
@@ -11,6 +11,9 @@ namespace TBF.UI.Shared
public RemarkDlg()
{
InitializeComponent();
this.Icon = Properties.Resources.TBF_icon;
Text = Strings.Remark;
textBox1.Text = Remark;
}
TBF/UI/Shared/TabNameDlg.cs
+3 -1
View File
@@ -17,7 +17,9 @@ namespace TBF.UI.Shared
{
InitializeComponent();
TabNameLabel = string.Empty;
this.Icon = Properties.Resources.TBF_icon;
TabNameLabel = string.Empty;
TabName = string.Empty;
IsVirtualBenchSeq = false;
}