diff --git a/TBF/MainWnd.pl.resx b/TBF/MainWnd.pl.resx index ce909144b..daf4a248a 100644 --- a/TBF/MainWnd.pl.resx +++ b/TBF/MainWnd.pl.resx @@ -147,33 +147,73 @@ Pomiar + + + 108, 17 + + + Użytkownik: admin + + + 154, 17 + + + Proszę rozpocząć procedurę + Pasek stanu 1 - - Badanie + + 132, 22 Elementy + + 132, 22 + Ścieżki + + 132, 22 + Przejścia + + 132, 22 + Metrologia + + 129, 6 + + + 132, 22 + Wyjście + + 61, 20 + + + Badanie + + + 59, 20 + Główna Wyniki + + 42, 20 + Logi @@ -192,43 +232,46 @@ Aktualizacja + + 79, 20 + Ustawienia - - Pomoc + + 83, 22 O + + 57, 20 + + + Pomoc + + + 86, 20 + - Procedury + Wodomierzy + + + 70, 20 Czynność + + 55, 20 + Wyniki - - Drukuj - Nagłówek głównego menu Framework stanowiska pomiarowego - - Proszę rozpocząć procedurę - - - Pomiar - - - Obrazy - - - Użytkownik: admin - \ No newline at end of file diff --git a/TBF/MainWnd.resx b/TBF/MainWnd.resx index 5fe745fac..28ec63adc 100644 --- a/TBF/MainWnd.resx +++ b/TBF/MainWnd.resx @@ -121,21 +121,16 @@ 1012, 523 - - verticalSplitContainer + + + Fill - - Progress - - - mainTabControl + + helpTSMenuItem 1 - - Microsoft Sans Serif, 8.25pt - 0, 0 @@ -143,10 +138,12 @@ 65 - Fill + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -156,8 +153,8 @@ Clear Counters - - NoControl + + 2 Verdana, 15.75pt @@ -171,8 +168,11 @@ 1012, 523 - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + topHorizontalSplitContainer 1020 @@ -195,6 +195,9 @@ passwortToolStripMenuItem + + Upgrade + 0, 0 @@ -204,6 +207,9 @@ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + graphsTabPage + 152, 22 @@ -213,8 +219,8 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 0 Logs @@ -225,6 +231,9 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + True @@ -234,20 +243,17 @@ 0 - - 1012, 523 + + 1 - - 0, 680 + + 0 True - - Fill - - - splitContainer1.Panel1 + + benchComponentsTSMenuItem picturesTabPageCtrl @@ -255,21 +261,18 @@ picturesTabPage - - System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 1 0, 0 - + + logsTSMenuItem + + 0 - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - upgradeTSMenuItem - topVerticalSplitContainer.Panel1 @@ -282,26 +285,29 @@ 1012, 523 + + System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + 1012, 523 - - 0 + + 1 exitToolStripMenuItem - TBF.Screens.LogsTabPageCtrl, TBF, Version=2.18.1274.0, Culture=neutral, PublicKeyToken=null + TBF.Screens.LogsTabPageCtrl, TBF, Version=2.22.1306.0, Culture=neutral, PublicKeyToken=null System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 5 + + TopDown - - descriptionGroupBox + + MainWnd 52, 20 @@ -324,12 +330,12 @@ 340 + + Fill + 0 - - 0, 0 - 1012, 523 @@ -342,9 +348,6 @@ 1 - - True - 0, 25 @@ -360,8 +363,8 @@ 0 - - Fill + + proceduresToolStripMenuItem 140, 6 @@ -369,6 +372,9 @@ activityGroupBox + + 671, 65 + True @@ -378,11 +384,8 @@ horizontalSplitContainer - - messageLabel - - - 0 + + 1012, 523 0 @@ -390,17 +393,14 @@ Fill - - 1 + + processTabPageCtrl 143, 22 - - Transitions - - - splitContainer1 + + mainMenuStrip 0 @@ -414,18 +414,21 @@ rightHorizSplitContainer.Panel1 - - topHorizontalSplitContainer - - - Verdana, 15.75pt + + 0, 17 benchPathsTSMenuItem + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + 143, 22 + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + horizontalSplitContainer @@ -447,6 +450,9 @@ 0 + + 0 + activityStatusLabel @@ -471,8 +477,14 @@ topHorizontalSplitContainer - - 61, 20 + + 2 + + + 0 + + + Fill topHorizontalSplitContainer.Panel1 @@ -489,35 +501,35 @@ 1 - - System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + verticalSplitContainer - - splitContainer1 + + 1 + + + 143, 22 topHorizontalSplitContainer.Panel1 - - System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Insert - - 4 + + 61, 20 System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - NoControl - 252, 65 0, 25 - - mainMenuStrip + + 0, 680 4, 5 @@ -528,11 +540,11 @@ System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 0, 17 + + measurementTabPage 148, 22 @@ -543,20 +555,26 @@ 20 + + 152, 22 + 1254, 24 Microsoft Sans Serif, 8.25pt + + Procedures + procedureGroupBox - - 0 + + NoControl - TBF.Screens.ResultsTabPageCtrl, TBF, Version=2.18.1274.0, Culture=neutral, PublicKeyToken=null + TBF.Screens.ResultsTabPageCtrl, TBF, Version=2.22.1306.0, Culture=neutral, PublicKeyToken=null activityLabel @@ -567,17 +585,20 @@ activityGroupBox - + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 1012, 523 + verticalSplitContainer - - 4, 4, 4, 4 - - - Upgrade + + 1020, 532 routeStatusLabel @@ -588,23 +609,17 @@ 0, 0 - - 1012, 523 - processTabPage - - 1012, 523 - Fill splitContainer1 - - 2 + + 0 progressFlowLayoutPanel @@ -624,9 +639,15 @@ 1 + + iPerl Heads + 0, 0 + + 1020, 120 + System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -636,23 +657,26 @@ 143, 22 - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - Bench - - NoControl - System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 0 + resultsTabPageCtrl - - benchComponentsTSMenuItem + + 0 + + + iPerlHeadsToolStripMenuItem System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -660,8 +684,11 @@ 143, 22 - - System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 23, 3, 3, 3 + + + processToolStripMenuItem backUpToolStripMenuItem @@ -672,29 +699,23 @@ 1012, 523 + + 78, 20 + 0 15 - - mainTabControl + + 6, 13 picturesTabPage - - topVerticalSplitContainer.Panel1 - - - resultsTSMenuItem - - - 19 - - - verticalSplitContainer + + 152, 22 logsTabPage @@ -702,12 +723,15 @@ resultsTabPage - - 32 + + 0, 17 Graphs + + 0, 1 + Fill @@ -729,12 +753,18 @@ System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + Metrology splitContainer1.Panel1 + + System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -747,14 +777,11 @@ descriptionGroupBox - - 240 - 56, 20 - - 23, 3, 3, 3 + + NoControl 4, 5 @@ -780,12 +807,18 @@ ctrlBrdComponent + + resultsTSMenuItem + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 0 + + Back up + 0 @@ -798,20 +831,20 @@ topVerticalSplitContainer + + Fill + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 6, 28 - - 1254, 702 - - TBF.Screens.GraphsTabPageCtrl, TBF, Version=2.18.1274.0, Culture=neutral, PublicKeyToken=null + TBF.Screens.GraphsTabPageCtrl, TBF, Version=2.22.1306.0, Culture=neutral, PublicKeyToken=null - - topVerticalSplitContainer.Panel2 + + 671, 115 Fill @@ -825,9 +858,6 @@ 2 - - 4, 5 - rightHorizSplitContainer.Panel2 @@ -837,8 +867,8 @@ editTSMenuItem - - logsTSMenuItem + + 152, 22 backUpResultsToolStripMenuItem @@ -846,29 +876,32 @@ Paths - - 0 - Fill + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + 52, 20 verticalSplitContainer.Panel2 - - 1020, 120 + + 4, 5 - - 0, 0 + + 5 + + + Home 5, 5 - - 143, 22 + + 0 topHorizontalSplitContainer.Panel2 @@ -879,23 +912,20 @@ 0 - - measurementTabPage - Verdana, 11.25pt - - 1 - graphsToolStripMenuItem - - 671, 65 + + 22 - - proceduresToolStripMenuItem + + 0 + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 Process @@ -915,14 +945,17 @@ 671, 46 + + 1254, 656 + + + upgradeTSMenuItem + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 389, 33 - - - graphsTabPage + + 25 0 @@ -946,10 +979,13 @@ 3 - TBF.Screens.ProcessTabPageCtrl6, TBF, Version=2.18.1274.0, Culture=neutral, PublicKeyToken=null + TBF.Screens.ProcessTabPageCtrl24, TBF, Version=2.22.1306.0, Culture=neutral, PublicKeyToken=null - - Fill + + 19 + + + Results databaseSettingsTSMenuItem @@ -960,11 +996,8 @@ Graphs - - TopDown - - - System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 4, 5 Microsoft Sans Serif, 8.25pt @@ -972,11 +1005,11 @@ localSettingsTSMenuItem - - 0, 13 + + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - topVerticalSplitContainer + + 0, 0 rightHorizSplitContainer @@ -993,9 +1026,6 @@ System.Windows.Forms.ProgressBar, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 0, 17 - 0 @@ -1006,7 +1036,7 @@ 6, 68 - TBF.Screens.PicturesTabPageCtrl, TBF, Version=2.18.1274.0, Culture=neutral, PublicKeyToken=null + TBF.Screens.PicturesTabPageCtrl, TBF, Version=2.22.1306.0, Culture=neutral, PublicKeyToken=null 4, 5 @@ -1023,23 +1053,23 @@ 230, 240 - - progressGroupBox - topVerticalSplitContainer + + 6 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 Test results - - 78, 20 + + 0 - - 1020, 532 + + Microsoft Sans Serif, 8.25pt 152, 22 @@ -1047,6 +1077,9 @@ 230, 656 + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + 1 @@ -1056,32 +1089,26 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - MainWnd + + Help topVerticalSplitContainer.Panel2 - - 22 - 6, 23 System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - activityGroupBox - - - Procedure + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 18 - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 56, 20 mainTabControl @@ -1107,23 +1134,23 @@ System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 0 + + topVerticalSplitContainer.Panel1 0 - - 0 + + aboutTSMenuItem + + + 4 rightHorizSplitContainer.Panel1 - - Horizontal - - - 25 + + mainTabControl mainProgressBar @@ -1134,18 +1161,15 @@ 152, 22 - - Pictures - 0, 0 - - Back up - - + graphsTabPage + + Verdana, 15.75pt + Logs @@ -1161,9 +1185,6 @@ Microsoft Sans Serif, 8.25pt - - Insert - descriptionLabel @@ -1176,20 +1197,17 @@ 5, 5, 0, 0 - - 0 - - - 0, 1 + + 389, 33 0, 0 - - 152, 22 + + topVerticalSplitContainer.Panel2 - - 1012, 523 + + 0, 0 0 @@ -1203,8 +1221,8 @@ Fill - - 671, 115 + + Pictures System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -1212,8 +1230,8 @@ Fill - - topHorizontalSplitContainer + + Fill Settings @@ -1224,23 +1242,23 @@ procedureComboBox - - helpTSMenuItem + + System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 1 + + 0, 0 True - + 0 resultsTabPage - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Transitions 1 @@ -1254,47 +1272,50 @@ graphsTabPageCtrl - - Fill + + False About - - Procedures + + Progress System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 2 - - iPerl Heads + + 13, 3, 13, 3 1 - - 6, 13 - - - 1254, 656 - Horizontal + + 0, 0 + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + 5, 5, 0, 0 - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Fill - - 30 + + statusPStatusLabel + + + 415 statusStrip1 @@ -1302,50 +1323,47 @@ homeTabPage - - mainTabControl + + splitContainer1 - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - processToolStripMenuItem + + 0, 13 107, 22 - - 4, 5 + + 17 measurementTabPage - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + topHorizontalSplitContainer - - 0, 0 + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 Components - - processTabPageCtrl + + messageLabel - - Fill + + mainTabControl - - Help - - - mainMenuStrip + + 1012, 523 0 - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Verdana, 12pt Fill @@ -1357,25 +1375,19 @@ 0, 0 - ControlComponent3Munich.UserControl1, ControlComponent3Munich, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + ControlComponent_Torino2015.UserControl1, ControlComponent3U, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - 415 + + 30 System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - splitContainer1.Panel2 + + System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - statusPStatusLabel - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 152, 22 + + splitContainer1 0 @@ -1383,14 +1395,14 @@ 1020, 656 - - aboutTSMenuItem + + 1254, 702 415, 65 - - iPerlHeadsToolStripMenuItem + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 5, 5 @@ -1398,11 +1410,11 @@ System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 13, 3, 13, 3 + + 4, 4, 4, 4 - - 56, 20 + + progressGroupBox True @@ -1422,26 +1434,26 @@ 31 - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 240 $this - TBF.Screens.MeasurementTabPageCtrl, TBF, Version=2.18.1274.0, Culture=neutral, PublicKeyToken=null + TBF.Screens.MeasurementTabPageCtrl, TBF, Version=2.22.1306.0, Culture=neutral, PublicKeyToken=null resultsToolStripMenuItem - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Procedure - - Fill + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 0 + + topVerticalSplitContainer System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -1449,8 +1461,8 @@ $this - - System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + splitContainer1.Panel2 237, 33 @@ -1458,35 +1470,29 @@ Horizontal - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 29 - - 17 - - - 56, 20 - 0 - - 2 + + NoControl Users - - Home + + 32 - - 0 + + 1012, 523 - - False + + verticalSplitContainer benchTransitionsToolStripMenuItem @@ -1503,8 +1509,8 @@ 0 - - Results + + 0, 17 0 @@ -1512,26 +1518,20 @@ 0 - - System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 0 - - Verdana, 12pt - - - System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 152, 22 + + splitContainer1.Panel1 System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 0 + + 56, 20 - - 1 + + mainTabControl usersTSMenuItem @@ -1548,23 +1548,23 @@ 152, 22 - - 0 + + activityGroupBox clearCountersToolStripMenuItem - - 0, 17 + + mainMenuStrip - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + descriptionGroupBox - + 1012, 523 - - 0, 0 + + True Fill @@ -1575,9 +1575,12 @@ 1012, 523 - - 6 + + Horizontal + + pl + True diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs index f59d35751..6b796ef16 100644 --- a/TBF/Properties/AssemblyInfo.cs +++ b/TBF/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("2.18.1303.0")] -[assembly: AssemblyFileVersion("2.18.1303.0")] +[assembly: AssemblyVersion("2.18.1305.0")] +[assembly: AssemblyFileVersion("2.18.1305.0")] diff --git a/TBF/Resources/Strings.pl.resx b/TBF/Resources/Strings.pl.resx index 554e1008a..d94060023 100644 --- a/TBF/Resources/Strings.pl.resx +++ b/TBF/Resources/Strings.pl.resx @@ -472,7 +472,7 @@ Wybór metody sprawdzania - Klasa metrologiczna + Klasa obciążeń Legalizator @@ -634,7 +634,7 @@ Procedura - Procedury + Wodomierzy Producent