From ee2332638280ecb755bc2c0c8efed1d0e531057e Mon Sep 17 00:00:00 2001
From: juha <juha@lazarus-ide.org>
Date: Fri, 25 Nov 2016 13:18:43 +0000
Subject: [PATCH] OPK: Use the new Version to read RemoteRepository also from
 old configuration.

git-svn-id: trunk@53455 -
---
 components/onlinepackagemanager/opkman_options.pas    | 11 ++++++++---
 components/onlinepackagemanager/opkman_optionsfrm.lfm |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/components/onlinepackagemanager/opkman_options.pas b/components/onlinepackagemanager/opkman_options.pas
index f075fed622..343dc7c1fb 100644
--- a/components/onlinepackagemanager/opkman_options.pas
+++ b/components/onlinepackagemanager/opkman_options.pas
@@ -30,7 +30,7 @@ uses
   Classes, SysUtils, LazIDEIntf, Laz2_XMLCfg, LazFileUtils;
 
 const
-  Version = 1;
+  OpkVersion = 1;
 
 type
   { TOptions }
@@ -46,6 +46,7 @@ type
    private
      FProxySettings: TProxySettings;
      FXML: TXMLConfig;
+     FVersion: Integer;
      FRemoteRepository: String;
      FForceDownloadAndExtract: Boolean;
      FDeleteZipAfterInstall: Boolean;
@@ -113,7 +114,11 @@ end;
 
 procedure TOptions.Load;
 begin
-  FRemoteRepository := FXML.GetValue('General/RemoteRepository/Value', '');
+  FVersion := FXML.GetValue('Version/Value', 0);
+  if FVersion = 0 then
+    FRemoteRepository := FXML.GetValue('RemoteRepository/Value', '')
+  else
+    FRemoteRepository := FXML.GetValue('General/RemoteRepository/Value', '');
   FForceDownloadAndExtract := FXML.GetValue('General/ForceDownloadAndExtract/Value', True);
   FDeleteZipAfterInstall := FXML.GetValue('General/DeleteZipAfterInstall/Value', True);
   FLastDownloadDir := FXML.GetValue('General/LastDownloadDir/Value', '');
@@ -133,7 +138,7 @@ end;
 
 procedure TOptions.Save;
 begin
-  FXML.SetDeleteValue('Version/Value', Version, 0);
+  FXML.SetDeleteValue('Version/Value', OpkVersion, 0);
   FXML.SetDeleteValue('General/RemoteRepository/Value', FRemoteRepository, '');
   FXML.SetDeleteValue('General/ForceDownloadAndExtract/Value', FForceDownloadAndExtract, True);
   FXML.SetDeleteValue('General/DeleteZipAfterInstall/Value', FDeleteZipAfterInstall, True);
diff --git a/components/onlinepackagemanager/opkman_optionsfrm.lfm b/components/onlinepackagemanager/opkman_optionsfrm.lfm
index dde1c8933b..42ff94bc92 100644
--- a/components/onlinepackagemanager/opkman_optionsfrm.lfm
+++ b/components/onlinepackagemanager/opkman_optionsfrm.lfm
@@ -47,7 +47,7 @@ object OptionsFrm: TOptionsFrm
       Left = 8
       Height = 25
       Top = 8
-      Width = 100
+      Width = 162
       Caption = 'Restore defaults'
       OnClick = bRestoreClick
       TabOrder = 2