MS1901

app/DD-Record-Organiser/frmMain.vb

@@ -119,16 +119,17 @@ Public Class frmMain
             Catch ex As Exception
                 MsgBox("Error in Load Form:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
             End Try
-            If ClassProxy.MyPROXYConnectionString <> "" Then
-                itemRefreshProxy.Visibility = BarItemVisibility.Always
-            Else
-                itemRefreshProxy.Visibility = BarItemVisibility.Never
-
-            End If
+            Proxy_Server_Controls()
+        End If
+    End Sub
+    Sub Proxy_Server_Controls()
+        If LICENSE_SITE_PROXY = True And ClassProxy.MyPROXYConnectionString <> "" Then
+            itemRefreshProxy.Visibility = BarItemVisibility.Always
+            LabelProxyServer.Visibility = BarItemVisibility.Always
+        Else
+            itemRefreshProxy.Visibility = BarItemVisibility.Never
+            LabelProxyServer.Visibility = BarItemVisibility.Never
         End If
-
-
-
     End Sub
     Sub Load_Connection_Dep_Data()
         SetBackground()
@@ -612,13 +613,19 @@ Public Class frmMain
     End Sub
     Private Sub itemRefreshProxy_ItemClick(sender As Object, e As ItemClickEventArgs) Handles itemRefreshProxy.ItemClick
         Me.Cursor = Cursors.WaitCursor
-        ClassProxy.Refresh_Object_Data()
-        ClassProxy.PRPROXY_SYNC_DOC_OBJECTS()
-        Dim msg = "Die Proxydaten wurden erfolgreich synchronisiert!"
-        If USER_LANGUAGE <> "de-DE" Then
-            msg = "All proxydata was refreshed successfully!"
+        If ClassProxy.Refresh_Object_Data() = True Then
+            If ClassProxy.PRPROXY_SYNC_DOC_OBJECTS() = True Then
+                Dim msg = "Die Proxydaten wurden erfolgreich synchronisiert!"
+                If USER_LANGUAGE <> "de-DE" Then
+                    msg = "All proxydata was refreshed successfully!"
+                End If
+                MessageBox.Show(msg, "", MessageBoxButtons.OK, MessageBoxIcon.Information)
+            Else
+                MessageBox.Show("Error while refreshing proxy-data (Doc)!", "", MessageBoxButtons.OK, MessageBoxIcon.Error)
+            End If
+        Else
+            MessageBox.Show("Error while refreshing proxy-data (objects)!", "", MessageBoxButtons.OK, MessageBoxIcon.Error)
         End If
-        MsgBox(msg, MsgBoxStyle.Information)
         Me.Cursor = Cursors.Default
     End Sub
     Sub Load_ConfigBasic()
@@ -640,6 +647,7 @@ Public Class frmMain
             TimerTasks.Enabled = False
             TimerTasks.Stop()
         End If
+        Proxy_Server_Controls()
         RUN_TIMER()
 
     End Sub