Reintroduced string costants as resourceString

Author: salvadorbs

ASuite.ico

@@ -17,7 +17,6 @@
       <ResourceType Value="res"/>
       <UseXPManifest Value="True"/>
       <XPManifest>
-        <DpiAware Value="True/PM_V2"/>
         <TextName Value="ASuite"/>
         <TextDesc Value="Portable Launcher"/>
       </XPManifest>
@@ -31,7 +30,7 @@
       <UseVersionInfo Value="True"/>
       <AutoIncrementBuild Value="True"/>
       <MajorVersionNr Value="3"/>
-      <BuildNr Value="14"/>
+      <BuildNr Value="20"/>
     </VersionInfo>
     <BuildModes Count="3">
       <Item1 Name="Default" Default="True"/>
@@ -67,7 +66,6 @@
           <Linking>
             <Debugging>
               <DebugInfoType Value="dsDwarf2Set"/>
-              <UseHeaptrc Value="True"/>
               <TrashVariables Value="True"/>
               <UseExternalDbgSyms Value="True"/>
             </Debugging>

ASuite.lpi

@@ -139,7 +139,7 @@ implementation
   DataModules.Icons, Forms.Main, AppConfig.Main, VirtualTree.Methods,
   Utility.System, Forms.GraphicMenu, Kernel.Types, NodeDataTypes.Files,
   NodeDataTypes.Custom, NodeDataTypes.Base, Kernel.Consts, Kernel.Logger,
-  Utility.Misc, Utility.FileFolder, Windows;
+  Utility.Misc, Utility.FileFolder, Windows, Kernel.ResourceStrings;
 
 {$R *.lfm}
 
@@ -221,7 +221,7 @@ procedure TdmTrayMenu.SearchAddDirectory(AMI: TMenuItem; FolderPath: string);
           AddSub(NMI);
         end
         else begin
-          //NMI.Caption := DKLangConstW('msgCMOpenFolder');
+          NMI.Caption := msgCMOpenFolder;
           NMI.OnClick := OpenFile;
           //TODO: NewBottomLine ???
           //AMI.NewBottomLine;
@@ -381,14 +381,14 @@ procedure TdmTrayMenu.UpdateClassicMenu(Menu: TPopUpMenu);
     if Config.SubMenuMFU then
     begin
       CreateSeparator(Menu);
-      //CreateSpecialList(Menu, Config.ListManager.MFUList, Config.MFUNumber, DKLangConstW('msgLongMFU'));
+      CreateSpecialList(Menu, Config.ListManager.MFUList, Config.MFUNumber, msgLongMFU);
     end
     else begin
-      //CreateSeparator(Menu, DKLangConstW('msgLongMFU'));
+      CreateSeparator(Menu, msgLongMFU);
       CreateSpecialList(Menu, Config.ListManager.MFUList, Config.MFUNumber);
     end;
   end;
-  //CreateSeparator(Menu,DKLangConstW('msgList'));
+  CreateSeparator(Menu,msgList);
   //List
   PopulateCategoryItems(nil);
   //MRU
@@ -397,10 +397,10 @@ procedure TdmTrayMenu.UpdateClassicMenu(Menu: TPopUpMenu);
     if Config.SubMenuMRU then
     begin
       CreateSeparator(Menu);
-      //CreateSpecialList(Menu, Config.ListManager.MRUList, Config.MRUNumber, DKLangConstW('msgLongMRU'));
+      CreateSpecialList(Menu, Config.ListManager.MRUList, Config.MRUNumber, msgLongMRU);
     end
     else begin
-      //CreateSeparator(Menu,DKLangConstW('msgLongMRU'));
+      CreateSeparator(Menu,msgLongMRU);
       CreateSpecialList(Menu, Config.ListManager.MRUList, Config.MRUNumber,'');
     end;
   end;
@@ -423,14 +423,14 @@ procedure TdmTrayMenu.CreateHeaderItems(Menu: TPopupMenu);
     case I of
       0:
         begin
-          //MenuItem.Caption := DKLangConstW('msgShowASuite');
+          MenuItem.Caption := msgShowASuite;
           MenuItem.ImageIndex := Config.IconsManager.GetIconIndex('asuite');
           MenuItem.OnClick := ShowMainForm;
           MenuItem.Default := true;
         end;
       1:
         begin
-          //MenuItem.Caption := DKLangConstW('msgOpenOptions');
+          MenuItem.Caption := msgOpenOptions;
           MenuItem.ImageIndex := Config.IconsManager.GetIconIndex('options');
           MenuItem.OnClick := frmMain.miOptionsClick;
           MenuItem.Enabled := Not(Config.ReadOnlyMode);
@@ -481,12 +481,12 @@ procedure TdmTrayMenu.CreateFooterItems(Menu: TPopupMenu);
     case I of
       0:
         begin
-          //MenuItem.Caption := DKLangConstW('msgEjectHardware');
+          MenuItem.Caption := msgEjectHardware;
           MenuItem.OnClick := EjectDialog;
         end;
       1:
         begin
-          //MenuItem.Caption := DKLangConstW('msgExit');
+          MenuItem.Caption := msgExit;
           MenuItem.OnClick := frmMain.miExitClick;
         end;
     end;

ASuite.res

@@ -83,7 +83,7 @@ function TfrmDialogBase.AddFrameNode(Tree: TBaseVirtualTree;
   if Assigned(NodeData) then
   begin
     NodeData.Frame := FramePage;
-    //NodeData.Title := TfrmBaseEntityPage(FramePage).Title;
+    NodeData.Title := TfrmBaseEntityPage(FramePage).Title;
     //NodeData.ImageIndex := TfrmBaseEntityPage(FramePage).ImageIndex;
   end;
 end;

DataModules/DataModules.TrayMenu.pas

@@ -111,7 +111,7 @@   TfrmGraphicMenu = class(TForm)
   end;
 
 var
-	frmGraphicMenu : TfrmGraphicMenu;
+  frmGraphicMenu : TfrmGraphicMenu;
 
 implementation
 
@@ -121,7 +121,8 @@ implementation
   Forms.Main, Utility.System, Kernel.Consts, AppConfig.Main, DataModules.Icons,
   Forms.About, NodeDataTypes.Base, Kernel.Enumerations, Forms.Options,
   Utility.Misc, VirtualTree.Events, VirtualTree.Methods, Kernel.Types,
-  NodeDataTypes.Custom, GraphicMenu.ThemeEngine;
+  NodeDataTypes.Custom, GraphicMenu.ThemeEngine, Kernel.ResourceStrings,
+  Windows;
 
 procedure TfrmGraphicMenu.ApplicationEvents1Deactivate(Sender: TObject);
 begin
@@ -213,7 +214,7 @@ procedure TfrmGraphicMenu.UpdateDriveStats;
   dblDriveSize := DiskSize(Ord(Drive) - 64);
   dblDriveUsed := dblDriveSize - DiskFree(Ord(Drive) - 64);
   imgDriveSpace.Width := Round(dblDriveUsed / dblDriveSize * (imgDriveBackground.Width - 4));
-  //lblDriveSpace.Caption := Format(DKLangConstW('msgGMHardDiskSpace'), [DiskFreeString(Drive, True), DiskSizeString(Drive, True)]);
+  lblDriveSpace.Caption := Format(msgGMHardDiskSpace, [DiskFreeString(Drive, True), DiskSizeString(Drive, True)]);
 
   edtSearch.Images := dmImages.ilSmallIcons;
 end;
@@ -227,7 +228,7 @@ procedure TfrmGraphicMenu.OpenFolder(FolderPath: string);
   ErrorCode := OpenDocument(PChar(sPath));
   if ErrorCode then
   begin
-  //  ShowMessageFmtEx(DKLangConstW('msgErrGeneric'), ['', SysErrorMessage(GetLastError)], True);
+    ShowMessageFmtEx(msgErrGeneric, ['', SysErrorMessage(GetLastError)], True);
   end;
 end;
 
@@ -378,7 +379,7 @@ procedure TfrmGraphicMenu.imgPersonalPictureClick(Sender: TObject);
   TempString : string;
 begin
   TempString := '';
-  //OpenDialog1.Filter     := DKLangConstW('msgFilterPicture');
+  OpenDialog1.Filter     := msgFilterPicture;
   OpenDialog1.InitialDir := ExtractFileDir(Config.Paths.RelativeToAbsolute(Config.GMPersonalPicture));
   if OpenDialog1.Execute then
   begin

Forms/Forms.Dialog.BaseEntity.pas

@@ -79,7 +79,7 @@ implementation
 uses
   Forms.Main, AppConfig.Main, VirtualTree.Events, VirtualTree.Methods,
   Utility.FileFolder, Utility.XML, Database.Manager, NodeDataTypes.Base,
-  Kernel.Logger;
+  Kernel.Logger, Kernel.ResourceStrings;
 
 procedure TfrmImportList.btnBackClick(Sender: TObject);
 begin
@@ -125,15 +125,15 @@ procedure TfrmImportList.FormClose(Sender: TObject; var Action: TCloseAction);
     try
       if TreeImpToTree(vstListImp, Config.MainTree) then
       begin
-        ShowMessageFmtEx(DKLangConstW('msgItemsImported'), [GetNumberNodeImp(vstListImp)]);
-        TASuiteLogger.Info(DKLangConstW('msgItemsImported'), [GetNumberNodeImp(vstListImp)]);
+        ShowMessageFmtEx(msgItemsImported, [GetNumberNodeImp(vstListImp)]);
+        TASuiteLogger.Info(msgItemsImported, [GetNumberNodeImp(vstListImp)]);
       end;
       TVirtualTreeMethods.Create.GetAllIcons(Config.MainTree, nil);
     except
       on E : Exception do
       begin
-        ShowMessageEx(DKLangConstW('msgImportFailed'), True);
-        TASuiteLogger.Error(DKLangConstW('msgErrGeneric'), [E.ClassName,E.Message]);
+        ShowMessageEx(msgImportFailed, True);
+        TASuiteLogger.Error(msgErrGeneric, [E.ClassName,E.Message]);
       end;
     end;
     }
@@ -172,8 +172,8 @@ class procedure TfrmImportList.Execute(AOwner: TComponent);
 
 procedure TfrmImportList.tsListShow(Sender: TObject);
 begin
-  //lblTitle.Caption := DKLangConstW('msgImportTitle3');
-  //btnNext.Caption  := DKLangConstW('msgImport');
+  lblTitle.Caption := msgImportTitle3;
+  btnNext.Caption  := msgImport;
   btnNext.Enabled  := vstListImp.CheckedCount > 0;
   //Import list in temporary vst
   try
@@ -192,9 +192,9 @@ procedure TfrmImportList.vstListImpChecked(Sender: TBaseVirtualTree;
 procedure TfrmImportList.tsAskFileListShow(Sender: TObject);
 begin
   vstListImp.Clear;
-  //lblTitle.Caption := DKLangConstW('msgImportTitle2');
+  lblTitle.Caption := msgImportTitle2;
   btnNext.Enabled  := (edtPathList.Text <> '') and FileExists(edtPathList.Text);
-  //btnNext.Caption  := DKLangConstW('msgNext');
+  btnNext.Caption  := msgNext;
 end;
 
 function TfrmImportList.GetNumberNodeImp(Sender: TBaseVirtualTree): Integer;

Forms/Forms.GraphicMenu.pas

@@ -24,9 +24,11 @@
 interface
 
 uses
-  LCLIntf, LCLType, SysUtils, Classes, Graphics, Controls, Forms, Dialogs, Menus,
-  ComCtrls, VirtualTrees, Kernel.Consts, DataModules.Icons, Kernel.BaseMainForm,
-  StdCtrls, Kernel.Enumerations, ExtCtrls, ActnList, EditBtn, DefaultTranslator;
+  LCLIntf, LCLType, LMessages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs, Menus,
+  ComCtrls, VirtualTrees, ActiveX, Kernel.Consts, DataModules.Icons,
+  Kernel.BaseMainForm, StdCtrls, Buttons, UITypes,
+  Kernel.Enumerations, ExtCtrls, {XMLDoc,} Lists.Manager,
+  Database.Manager, {Actions,} ActnList, Themes, EditBtn;
 
 type
 
@@ -159,7 +161,7 @@ implementation
   DataModules.TrayMenu, Forms.ImportList, AppConfig.Main, Utility.System,
   VirtualTree.Methods, Frame.Options.Stats, NodeDataTypes.Base, Kernel.Scheduler,
   Kernel.Types, NodeDataTypes.Files, VirtualTree.Events, Utility.Process,
-  Kernel.Logger, SynLog, FileUtil;
+  Kernel.Logger, SynLog, FileUtil, Kernel.ResourceStrings;
 
 {$R *.lfm}
 
@@ -201,7 +203,7 @@ procedure TfrmMain.actDeleteExecute(Sender: TObject);
   Config.ASuiteState := lsDeleting;
   try
     Tree := GetActiveTree;
-    if (Tree.GetFirstSelected <> nil) and (Config.TVDisableConfirmDelete {or (MessageDlg((DKLangConstW('msgConfirmDeleteItem')), mtWarning, [mbYes,mbNo], 0) = mrYes)}) then
+    if (Tree.GetFirstSelected <> nil) and (Config.TVDisableConfirmDelete or (MessageDlg((msgConfirmDeleteItem), mtWarning, [mbYes,mbNo], 0) = mrYes)) then
     begin
       Nodes := Tree.GetSortedSelection(true);
       //Delete items
@@ -377,11 +379,11 @@ procedure TfrmMain.btnedtSearchRightButtonClick(Sender: TObject);
 end;
 
 procedure TfrmMain.miSaveListClick(Sender: TObject);
-begin;
-  {if Config.SaveList(True) then
-    ShowMessageEx(DKLangConstW('msgSaveCompleted'))
+begin
+  if Config.SaveList(True) then
+    ShowMessageEx(msgSaveCompleted)
   else
-    ShowMessageEx(DKLangConstW('msgErrSave'),true);}
+    ShowMessageEx(msgErrSave,true);
 end;
 
 procedure TfrmMain.ChangeSearchTextHint(Sender: TObject);

Forms/Forms.ImportList.pas

@@ -110,7 +110,7 @@ procedure TfrmScanFolder.btnCancelClick(Sender: TObject);
   {
   if (vfsScan.IsRunning) then
   begin
-    if MessageDlg((DKLangConstW('msgCancelScanFolder')), mtWarning, [mbYes,mbNo], 0) = mrYes then
+    if MessageDlg((msgCancelScanFolder), mtWarning, [mbYes,mbNo], 0) = mrYes then
     begin
       vfsScan.Stop;
       Close;
@@ -178,11 +178,11 @@ procedure TfrmScanFolder.btnScanClick(Sender: TObject);
       btnScan.Enabled := False;
     end
     else begin
-      ShowMessageEx(DKLangConstW('msgErrScanFolderEmptyPath'), True);
+      ShowMessageEx(msgErrScanFolderEmptyPath, True);
     end;
   end
   else
-    ShowMessageEx(DKLangConstW('msgErrScanFolderMissingTypes'), True);
+    ShowMessageEx(msgErrScanFolderMissingTypes, True);
   }
 end;
 
@@ -403,7 +403,7 @@ procedure TfrmScanFolder.vstTypesRemoveFromSelection(Sender: TBaseVirtualTree;
 
   pbScan.Style := pbstNormal;
   pbScan.Position := pbScan.Max;
-  ShowMessageFmtEx(DKLangConstW('msgFoundNumFiles'), [Results.Count]);
+  ShowMessageFmtEx(msgFoundNumFiles, [Results.Count]);
 
   //Select and expanded ScanFolder node
   Config.MainTree.ClearSelection;

Forms/Forms.Main.pas

@@ -74,7 +74,7 @@ implementation
 
 uses
   Kernel.Logger, Utility.Misc, AppConfig.Main, Kernel.Consts,
-  Utility.System, Utility.Hotkey;
+  Utility.System, Utility.Hotkey, Kernel.ResourceStrings;
 
 {$R *.lfm}
 
@@ -114,20 +114,17 @@ procedure TfrmShortcutGrabber.btnOkClick(Sender: TObject);
 
         if FCanClose then
           FHotkey := NewHotkey
-        else begin
-          //ShowMessageEx(DKLangConstW('msgHotkeyNotAvailable'), True);
-        end;
+        else
+          ShowMessageEx(msgHotkeyNotAvailable, True);
       end
       else
         FCanClose := True;
     end
-    else begin
-      //ShowMessageEx(DKLangConstW('msgHotkeyNoMod'));
-    end
+    else
+      ShowMessageEx(msgHotkeyNoMod);
   end
-  else begin
-    //ShowMessageEx(DKLangConstW('msgHotkeyNoKey'));
-  end;
+  else
+    ShowMessageEx(msgHotkeyNoKey);
 
   if NewHotkey = '' then
     hkKeys.SetFocus;

Forms/Forms.ScanFolder.pas

@@ -83,7 +83,8 @@ implementation
 
 uses
   AppConfig.Main, Utility.FileFolder, Kernel.Consts, VirtualTree.Methods,
-  NodeDataTypes.Files, NodeDataTypes.Custom, Kernel.Enumerations;
+  NodeDataTypes.Files, NodeDataTypes.Custom, Kernel.Enumerations, Kernel.ResourceStrings,
+  Utility.Misc;
 
 {$R *.lfm}
 
@@ -120,7 +121,7 @@ procedure TfrmAdvancedOptionsPage.btnClearClick(Sender: TObject);
       cbClearCache.Checked := False;
     end;
   finally
-    //ShowMessageEx(DKLangConstW('msgOperationCompleted'));
+    ShowMessageEx(msgOperationCompleted);
     //Save list
     TVirtualTreeMethods.Create.RefreshList(nil);
   end;
@@ -179,7 +180,7 @@ function TfrmAdvancedOptionsPage.GetImageIndex: Integer;
 
 function TfrmAdvancedOptionsPage.GetTitle: string;
 begin
-  //Result := DKLangConstW('msgAdvanced');
+  Result := msgAdvanced;
 end;
 
 function TfrmAdvancedOptionsPage.InternalLoadData: Boolean;