From 2489e7c8b00ad712a5fcd78e2ffb088792868b16 Mon Sep 17 00:00:00 2001 From: balazs Date: Mon, 19 Feb 2018 12:35:36 +0000 Subject: [PATCH] Opkman: Extend package state list. git-svn-id: trunk@57329 - --- .../onlinepackagemanager/opkman_const.pas | 3 ++- .../opkman_visualtree.pas | 24 ++++++++++++------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/components/onlinepackagemanager/opkman_const.pas b/components/onlinepackagemanager/opkman_const.pas index 4aa55af756..2311bb9587 100644 --- a/components/onlinepackagemanager/opkman_const.pas +++ b/components/onlinepackagemanager/opkman_const.pas @@ -105,7 +105,8 @@ resourcestring rsMainFrm_VSTText_PackageState3 = 'Installed'; rsMainFrm_VSTText_PackageState4 = 'Up to date'; rsMainFrm_VSTText_PackageState5 = 'New version available (repository)'; - rsMainFrm_VSTText_PackageState6 = 'New updates available'; + rsMainFrm_VSTText_PackageState6 = 'New version available'; + rsMainFrm_VSTText_PackageState7 = 'Ahead of OPM'; rsMainFrm_VSTText_PackageCategory0 = 'Charts and Graphs'; rsMainFrm_VSTText_PackageCategory1 = 'Cryptography'; rsMainFrm_VSTText_PackageCategory2 = 'DataControls'; diff --git a/components/onlinepackagemanager/opkman_visualtree.pas b/components/onlinepackagemanager/opkman_visualtree.pas index 0f3837208a..b2f795b60c 100644 --- a/components/onlinepackagemanager/opkman_visualtree.pas +++ b/components/onlinepackagemanager/opkman_visualtree.pas @@ -1489,25 +1489,31 @@ begin begin if (Data^.UpdateVersion = '') then begin - if Data^.InstalledVersion >= Data^.Version then + if Data^.InstalledVersion < Data^.Version then + CellText := rsMainFrm_VSTText_PackageState6 + else if Data^.InstalledVersion = Data^.Version then CellText := rsMainFrm_VSTText_PackageState4 - else - CellText := rsMainFrm_VSTText_PackageState5 + else if Data^.InstalledVersion > Data^.Version then + CellText := rsMainFrm_VSTText_PackageState7 end else begin - if (Data^.InstalledVersion >= Data^.UpdateVersion) then - CellText := rsMainFrm_VSTText_PackageState4 - else + if Data^.InstalledVersion < Data^.UpdateVersion then CellText := rsMainFrm_VSTText_PackageState6 + else if (Data^.InstalledVersion = Data^.UpdateVersion) then + CellText := rsMainFrm_VSTText_PackageState4 + else if (Data^.InstalledVersion > Data^.UpdateVersion) then + CellText := rsMainFrm_VSTText_PackageState7 end; end else begin - if (Data^.InstalledVersion >= Data^.UpdateVersion) then - CellText := rsMainFrm_VSTText_PackageState4 - else + if Data^.InstalledVersion < Data^.UpdateVersion then CellText := rsMainFrm_VSTText_PackageState6 + else if Data^.InstalledVersion = Data^.UpdateVersion then + CellText := rsMainFrm_VSTText_PackageState4 + else if Data^.InstalledVersion > Data^.UpdateVersion then + CellText := rsMainFrm_VSTText_PackageState7 end; Data^.IsUpdated := CellText = rsMainFrm_VSTText_PackageState4; end;