Opkman: Merge "Install" and "Update" buttons.

git-svn-id: trunk@57328 -

components/onlinepackagemanager/opkman_const.pas

@@ -68,7 +68,7 @@ resourcestring
   rsMainFrm_VSTHeaderColumn_LazarusPackage = 'Lazarus Package (.lpk)';
   rsMainFrm_VSTHeaderColumn_Repository = 'Repository';
   rsMainFrm_VSTHeaderColumn_Installed = 'Installed';
-  rsMainFrm_VSTHeaderColumn_Update = 'Update';
+  rsMainFrm_VSTHeaderColumn_Update = 'External';
   rsMainFrm_VSTHeaderColumn_Data = 'Status/Data';
   rsMainFrm_VSTHeaderColumn_Button = '';
   rsMainFrm_VSTHeaderColumn_Rating = 'Rating';
@@ -90,7 +90,7 @@ resourcestring
   rsMainFrm_VSTText_RepositoryFileHash = 'Repository filehash';
   rsMainFrm_VSTText_RepositoryFileDate = 'Available since';
   rsMainFrm_VSTText_HomePageURL = 'Home page';
-  rsMainFrm_VSTText_DownloadURL = 'Update link (JSON)';
+  rsMainFrm_VSTText_DownloadURL = 'External link (JSON)';
   rsMainFrm_VSTText_SVNURL = 'SVN';
   rsMainFrm_VSTText_Install0 = 'No';
   rsMainFrm_VSTText_Install1 = 'Yes';
@@ -164,6 +164,8 @@ resourcestring
   rsMainFrm_TBOptions_Hint = 'Show options dialog';
   rsMainFrm_TBHelp_Caption = 'Help';
   rsMainFrm_TBHelp_Hint = 'Help (' + cHelpPage + ')';
+  rsMainFrm_miFromRepository = 'From repository';
+  rsMainFrm_miFromExternalSource = 'From external source';
   rsMainFrm_miCreateRepositoryPackage = 'Create repository package';
   rsMainFrm_miCreateJSONForUpdates = 'Create JSON for updates';
   rsMainFrm_miCreateRepository = 'Create private repository';
@@ -182,9 +184,9 @@ resourcestring
   rsMainFrm_PackagenameAlreadyExists = 'A package with the same name already exists!';
   rsMainFrm_PackageAlreadyInstalled = 'The following packages are already installed. Continue anyway?';
   rsMainFrm_PackageAlreadyDownloaded = 'The following repository packages already exist in the target folder. Continue?';
-  rsMainFrm_PackageUpdateWarning = 'Updating packages from external link is not without a risk!' + sLineBreak + 'Only update if you trust the package maintainer. Continue?';
-  rsMainFrm_PackageUpdate0 = 'The following repository packages are not installed or don''t have a valid external download link. The packages will be skipped. Continue?';
-  rsMainFrm_PackageUpdate1 = 'None of the checked repository packages is installed or has a valid external download link.';
+  rsMainFrm_PackageUpdateWarning = 'Installing packages from external link is not without a risk!' + sLineBreak + 'Only install if you trust the package maintainer. Continue?';
+  rsMainFrm_PackageUpdate0 = 'The following repository packages are not available externally. The packages will be skipped. Continue?';
+  rsMainFrm_PackageUpdate1 = 'None of the checked repository packages are available externally.';
   rsMainFrm_rsMessageNoPackage = 'No packages to show.';
   rsMainFrm_rsMessageParsingJSON = 'Parsing JSON. Please wait...';
   rsMainFrm_rsMessageDownload = 'Downloading package list. Please wait...';

components/onlinepackagemanager/opkman_mainfrm.lfm

@@ -374,7 +374,7 @@ object MainFrm: TMainFrm
       TabOrder = 0
       Transparent = True
       object tbOptions: TToolButton
-        Left = 573
+        Left = 585
         Top = 0
         AutoSize = True
         Caption = 'Options'
@@ -394,7 +394,7 @@ object MainFrm: TMainFrm
         ShowHint = True
       end
       object tbCleanUp: TToolButton
-        Left = 421
+        Left = 433
         Top = 0
         AutoSize = True
         Caption = 'Clean up'
@@ -418,13 +418,15 @@ object MainFrm: TMainFrm
         Top = 0
         AutoSize = True
         Caption = 'Install'
+        DropdownMenu = pmInstall
         ImageIndex = 2
         OnClick = tbInstallClick
         ParentShowHint = False
         ShowHint = True
+        Style = tbsDropDown
       end
       object tbCreate: TToolButton
-        Left = 491
+        Left = 503
         Top = 0
         AutoSize = True
         Caption = 'Create'
@@ -435,7 +437,7 @@ object MainFrm: TMainFrm
         Style = tbsDropDown
       end
       object tbUpdate: TToolButton
-        Left = 211
+        Left = 223
         Top = 0
         AutoSize = True
         Caption = 'Update'
@@ -443,9 +445,10 @@ object MainFrm: TMainFrm
         OnClick = tbUpdateClick
         ParentShowHint = False
         ShowHint = True
+        Visible = False
       end
       object tbHelp: TToolButton
-        Left = 643
+        Left = 655
         Top = 0
         AutoSize = True
         Caption = 'Help'
@@ -455,7 +458,7 @@ object MainFrm: TMainFrm
         ShowHint = True
       end
       object tbUninstall: TToolButton
-        Left = 281
+        Left = 293
         Top = 0
         AutoSize = True
         Caption = 'Uninstall'
@@ -465,7 +468,7 @@ object MainFrm: TMainFrm
         ShowHint = True
       end
       object tbOpenRepo: TToolButton
-        Left = 351
+        Left = 363
         Top = 0
         AutoSize = True
         Caption = 'Open'
@@ -568,7 +571,7 @@ object MainFrm: TMainFrm
   end
   object pmCreate: TPopupMenu
     left = 144
-    top = 224
+    top = 288
     object miCreateRepositoryPackage: TMenuItem
       Caption = 'Create repository package'
       OnClick = miCreateRepositoryPackageClick
@@ -4018,4 +4021,16 @@ object MainFrm: TMainFrm
     left = 312
     top = 288
   end
+  object pmInstall: TPopupMenu
+    left = 144
+    top = 232
+    object miFromRepository: TMenuItem
+      Caption = 'From repository'
+      OnClick = miFromRepositoryClick
+    end
+    object miFromExteranlSource: TMenuItem
+      Caption = 'From external source'
+      OnClick = miFromExteranlSourceClick
+    end
+  end
 end

components/onlinepackagemanager/opkman_mainfrm.pas

@@ -54,6 +54,8 @@ type
     cbPackageState: TComboBox;
     cbPackageType: TComboBox;
     imTBDis: TImageList;
+    miFromExteranlSource: TMenuItem;
+    miFromRepository: TMenuItem;
     miSep2: TMenuItem;
     miSep3: TMenuItem;
     miSep1: TMenuItem;
@@ -73,6 +75,7 @@ type
     miCreateJSONForUpdates: TMenuItem;
     miCreateRepositoryPackage: TMenuItem;
     OD: TOpenDialog;
+    pmInstall: TPopupMenu;
     SD: TSaveDialog;
     tbCleanUp1: TToolButton;
     tbInstall1: TToolButton;
@@ -111,6 +114,8 @@ type
     procedure miCreateJSONForUpdatesClick(Sender: TObject);
     procedure miCreateRepositoryClick(Sender: TObject);
     procedure miCreateRepositoryPackageClick(Sender: TObject);
+    procedure miFromExteranlSourceClick(Sender: TObject);
+    procedure miFromRepositoryClick(Sender: TObject);
     procedure miLoadChecksClick(Sender: TObject);
     procedure miNameAscClick(Sender: TObject);
     procedure miResetRatingClick(Sender: TObject);
@@ -188,6 +193,7 @@ begin
   FHintTimeOut := Application.HintHidePause;
   Application.HintHidePause := 1000000;
  {$IF LCL_FULLVERSION >= 1070000}
+  tbInstall.Style := tbsButtonDrop;
   tbCreate.Style := tbsButtonDrop;
  {$ENDIF}
 end;
@@ -956,6 +962,17 @@ begin
   end;
 end;
 
+procedure TMainFrm.miFromRepositoryClick(Sender: TObject);
+begin
+  tbInstallClick(tbInstall);
+end;
+
+procedure TMainFrm.miFromExteranlSourceClick(Sender: TObject);
+begin
+  tbUpdateClick(tbUpdate);
+end;
+
+
 procedure TMainFrm.tbOpenRepoClick(Sender: TObject);
 begin
   OpenDocument(Options.LocalRepositoryPackages);
@@ -1284,6 +1301,8 @@ begin
   tbHelp.Caption := rsMainFrm_TBHelp_Caption;
   tbHelp.Hint := rsMainFrm_TBHelp_Hint;
 
+  miFromRepository.Caption := rsMainFrm_miFromRepository;
+  miFromExteranlSource.Caption := rsMainFrm_miFromExternalSource;
   miCreateRepositoryPackage.Caption := rsMainFrm_miCreateRepositoryPackage;
   miCreateJSONForUpdates.Caption := rsMainFrm_miCreateJSONForUpdates;
   miCreateRepository.Caption := rsMainFrm_miCreateRepository;

components/onlinepackagemanager/opkman_packagelistfrm.pas

@@ -114,7 +114,7 @@ begin
   case ATyp of
     0: Caption := rsPackageListFrm_Caption0;
     1: Caption := rsPackageListFrm_Caption1;
-    2: Caption := rsPackageListFrm_Caption2;
+    2: Caption := rsPackageListFrm_Caption0;
   end;
   bYes.Caption := rsPackageListFrm_bYes_Caption;
   bNo.Caption := rsPackageListFrm_bNo_Caption;

components/onlinepackagemanager/opkman_showhintbase.pas

@@ -79,7 +79,6 @@ var
   R: TRect;
   Increase: Integer;
   MH: Integer;
-  LH: Integer;
 begin
   R := Rect(0, 0, AMemo.Width, 0);
   TPanel(AMemo.Parent).Font.Assign(AMemo.Font);