marge

.gitignore

@@ -5,6 +5,5 @@ INT63DC_ImageDll/obj/Release/INT63DC_ImageDll.csproj.FileListAbsolute.txt
 INT63DC_ImageDll/obj/Release/INT63DC_ImageDll.csproj.GenerateResource.Cache
 INT63DC_ImageDll/obj/Release/INT63DC_ImageDll.dll
 INT63DC_ImageDll/obj/Release/INT63DC_ImageDll.pdb
-INT63DC_2C.suo
 INT63DC_ImageDll/bin/Release/INT63DC_ImageDll.dll
 INT63DC_ImageDll/obj/

INT63DC_2C/Forms/FormMenu.cs

@@ -826,7 +826,7 @@ namespace INT63DC_2C.Forms
             {
                 if (this.ParentForm.SystemConfig.CurrentUser.Group == DataStore.UserGroup.Developer)
                 {
-                    this.ParentForm.SystemConfig.CurrentUser.Group = DataStore.UserGroup.Level4Developer;
+                    this.ParentForm.SystemConfig.CurrentUser.Group = DataStore.UserGroup.Developer;
                     
                     if (this.buttonEquipmentTest.Visible != true)
                         this.buttonEquipmentTest.Visible = true;

INT63DC_2C/INT63DC_2C.csproj

@@ -335,6 +335,12 @@
     <Compile Include="Controls\ControlMainDisplayTable15.Designer.cs">
       <DependentUpon>ControlMainDisplayTable15.cs</DependentUpon>
     </Compile>
+    <Compile Include="Controls\ControlUserSetting.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Controls\ControlUserSetting.Designer.cs">
+      <DependentUpon>ControlUserSetting.cs</DependentUpon>
+    </Compile>
     <Compile Include="DataStore.cs" />
     <Compile Include="DialogForms\DialogFormDataStatistics.cs">
       <SubType>Form</SubType>
@@ -342,6 +348,18 @@
     <Compile Include="DialogForms\DialogFormDataStatistics.designer.cs">
       <DependentUpon>DialogFormDataStatistics.cs</DependentUpon>
     </Compile>
+    <Compile Include="DialogForms\DialogFormDataViewerFilter.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="DialogForms\DialogFormDataViewerFilter.Designer.cs">
+      <DependentUpon>DialogFormDataViewerFilter.cs</DependentUpon>
+    </Compile>
+    <Compile Include="DialogForms\DialogFormHistoryData.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="DialogForms\DialogFormHistoryData.designer.cs">
+      <DependentUpon>DialogFormHistoryData.cs</DependentUpon>
+    </Compile>
     <Compile Include="DialogForms\DialogFormLogOn.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -372,6 +390,12 @@
     <Compile Include="DialogForms\DialogFormPasswordKeyPad.Designer.cs">
       <DependentUpon>DialogFormPasswordKeyPad.cs</DependentUpon>
     </Compile>
+    <Compile Include="DialogForms\DialogFormUserEditorKeyboard.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="DialogForms\DialogFormUserEditorKeyboard.designer.cs">
+      <DependentUpon>DialogFormUserEditorKeyboard.cs</DependentUpon>
+    </Compile>
     <Compile Include="DialogForms\DialogFormYesNo.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -396,12 +420,24 @@
     <Compile Include="Forms\FormDataBackup.Designer.cs">
       <DependentUpon>FormDataBackup.cs</DependentUpon>
     </Compile>
+    <Compile Include="Forms\FormDataBackup_Part11.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Forms\FormDataBackup_Part11.Designer.cs">
+      <DependentUpon>FormDataBackup_Part11.cs</DependentUpon>
+    </Compile>
     <Compile Include="Forms\FormDataStatistics.cs">
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="Forms\FormDataStatistics.designer.cs">
       <DependentUpon>FormDataStatistics.cs</DependentUpon>
     </Compile>
+    <Compile Include="Forms\FormDataViewer.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Forms\FormDataViewer.Designer.cs">
+      <DependentUpon>FormDataViewer.cs</DependentUpon>
+    </Compile>
     <Compile Include="Forms\FormEquipmentSetting.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -480,18 +516,20 @@
     <Compile Include="Forms\FormTimeSetting.Designer.cs">
       <DependentUpon>FormTimeSetting.cs</DependentUpon>
     </Compile>
+    <Compile Include="Forms\FormUserEditor.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Forms\FormUserEditor.designer.cs">
+      <DependentUpon>FormUserEditor.cs</DependentUpon>
+    </Compile>
     <Compile Include="Forms\FormUserGroupEditor.cs">
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="Forms\FormUserGroupEditor.designer.cs">
       <DependentUpon>FormUserGroupEditor.cs</DependentUpon>
     </Compile>
-    <Compile Include="Forms\FormUserSetting.cs">
-    </Compile>
-    <Compile Include="Forms\FormUserSetting.Designer.cs">
-      <DependentUpon>FormUserSetting.cs</DependentUpon>
-    </Compile>
     <Compile Include="Helper.cs" />
+    <Compile Include="IniFile.cs" />
     <Compile Include="IntechGraphics.cs" />
     <Compile Include="Part11_Encryption\Encryption.cs" />
     <Compile Include="Part11_Encryption\Encryption.Define.cs" />
@@ -722,10 +760,16 @@
       <DependentUpon>FormDataBackup.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
+    <EmbeddedResource Include="Forms\FormDataBackup_Part11.resx">
+      <DependentUpon>FormDataBackup_Part11.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Forms\FormDataStatistics.resx">
       <DependentUpon>FormDataStatistics.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
+    <EmbeddedResource Include="Forms\FormDataViewer.resx">
+      <DependentUpon>FormDataViewer.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Forms\FormEquipmentSetting.resx">
       <DependentUpon>FormEquipmentSetting.cs</DependentUpon>
       <SubType>Designer</SubType>
@@ -778,14 +822,13 @@
       <DependentUpon>FormTimeSetting.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
+    <EmbeddedResource Include="Forms\FormUserEditor.resx">
+      <DependentUpon>FormUserEditor.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Forms\FormUserGroupEditor.resx">
       <DependentUpon>FormUserGroupEditor.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="Forms\FormUserSetting.resx">
-      <DependentUpon>FormUserSetting.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>