Removed dependency on RC.exe, it is no longer needed.

Author: Joachim Marder

Designer/Bin/RibbonDesigner.exe

@@ -14,7 +14,7 @@   TSettings = class
   strict private
     FSettingsFilename: String;
     FRibbonCompilerPath: String;
-    FResourceCompilerPath: String;
+    _FResourceCompilerPath: String; // No longer needed
     FDelphiCompilerPath: String;
   private
     constructor Create(const Dummy: Integer); overload;
@@ -32,7 +32,6 @@   TSettings = class
     class property Instance: TSettings read FInstance;
 
     property RibbonCompilerPath: String read FRibbonCompilerPath write FRibbonCompilerPath;
-    property ResourceCompilerPath: String read FResourceCompilerPath write FResourceCompilerPath;
     property DelphiCompilerPath: String read FDelphiCompilerPath write FDelphiCompilerPath;
   end;
 
@@ -87,10 +86,6 @@ constructor TSettings.Create(const Dummy: Integer);
         FRibbonCompilerPath := TPath.Combine(SdkPath, 'UICC.exe');
         if (not TFile.Exists(FRibbonCompilerPath)) then
           FRibbonCompilerPath := '';
-
-        FResourceCompilerPath := TPath.Combine(SdkPath, 'RC.exe');
-        if (not TFile.Exists(FResourceCompilerPath)) then
-          FResourceCompilerPath := '';
       end;
     end;
 
@@ -114,13 +109,6 @@ constructor TSettings.Create(const Dummy: Integer);
         if (BdsPath <> '') then
         begin
           BdsPath := TPath.Combine(BdsPath, 'bin');
-          if (FResourceCompilerPath = '') then
-          begin
-            FResourceCompilerPath := TPath.Combine(BdsPath, 'RC.exe');
-            if (not TFile.Exists(FResourceCompilerPath)) then
-              FResourceCompilerPath := '';
-          end;
-
           if (FDelphiCompilerPath = '') then
           begin
             FDelphiCompilerPath := TPath.Combine(BdsPath, 'DCC32.exe');
@@ -182,8 +170,6 @@ procedure TSettings.Load;
         begin
           if (Name = SN_RIBBON_COMPILER) and FileExists(Value) then
             FRibbonCompilerPath := Value
-          else if (Name = SN_RESOURCE_COMPILER) and FileExists(Value) then
-            FResourceCompilerPath := Value
           else if (Name = SN_DELPHI_COMPILER) and FileExists(Value) then
             FDelphiCompilerPath := Value;
         end;
@@ -217,7 +203,7 @@ procedure TSettings.Save;
     Writer.Indent := True;
     Writer.WriteStartElement(EN_SETTINGS);
     SaveSetting(SN_RIBBON_COMPILER, FRibbonCompilerPath);
-    SaveSetting(SN_RESOURCE_COMPILER, FResourceCompilerPath);
+    SaveSetting(SN_RESOURCE_COMPILER, _FResourceCompilerPath);
     SaveSetting(SN_DELPHI_COMPILER, FDelphiCompilerPath);
     Writer.WriteEndElement;
     Xml := Writer.AsXml;
@@ -236,8 +222,7 @@ procedure TSettings.Save;
 
 function TSettings.ToolsAvailable: Boolean;
 begin
-  Result := (FRibbonCompilerPath <> '') and (FResourceCompilerPath <> '')
-    and (FDelphiCompilerPath <> '');
+  Result := (FRibbonCompilerPath <> '') and (FDelphiCompilerPath <> '');
 end;
 
 end.

Designer/Classes/Settings.pas

@@ -30,23 +30,16 @@ object FormSettings: TFormSettings
       Height = 13
       Caption = 'Ribbon Compiler'
     end
-    object Label2: TLabel
-      Left = 12
-      Top = 51
-      Width = 89
-      Height = 13
-      Caption = 'Resource Compiler'
-    end
     object Label3: TLabel
       Left = 12
-      Top = 78
+      Top = 63
       Width = 145
       Height = 13
       Caption = 'Delphi Command Line Compiler'
     end
-    object EditRibbonCompiler: TButtonedEdit
+    object EditDelphiCompiler: TButtonedEdit
       Left = 163
-      Top = 21
+      Top = 60
       Width = 370
       Height = 21
       Images = ImageList
@@ -56,33 +49,21 @@ object FormSettings: TFormSettings
       RightButton.Visible = True
       TabOrder = 0
       OnChange = EditPathChange
-      OnRightButtonClick = EditRibbonCompilerRightButtonClick
-    end
-    object EditResourceCompiler: TButtonedEdit
-      Left = 163
-      Top = 48
-      Width = 370
-      Height = 21
-      Enabled = False
-      RightButton.HotImageIndex = 1
-      RightButton.ImageIndex = 0
-      RightButton.PressedImageIndex = 1
-      RightButton.Visible = True
-      TabOrder = 1
+      OnRightButtonClick = EditDelphiCompilerRightButtonClick
     end
-    object EditDelphiCompiler: TButtonedEdit
+    object EditRibbonCompiler: TButtonedEdit
       Left = 163
-      Top = 75
+      Top = 22
       Width = 370
       Height = 21
       Images = ImageList
       RightButton.HotImageIndex = 1
       RightButton.ImageIndex = 0
       RightButton.PressedImageIndex = 1
       RightButton.Visible = True
-      TabOrder = 2
+      TabOrder = 1
       OnChange = EditPathChange
-      OnRightButtonClick = EditDelphiCompilerRightButtonClick
+      OnRightButtonClick = EditRibbonCompilerRightButtonClick
     end
   end
   object ButtonOk: TButton

Designer/FSettings.dfm

@@ -21,15 +21,13 @@ interface
   TFormSettings = class(TForm)
     GroupBoxPaths: TGroupBox;
     Label1: TLabel;
-    EditRibbonCompiler: TButtonedEdit;
-    Label2: TLabel;
-    EditResourceCompiler: TButtonedEdit;
     EditDelphiCompiler: TButtonedEdit;
     Label3: TLabel;
     ImageList: TImageList;
     ButtonOk: TButton;
     ButtonCancel: TButton;
     OpenDialog: TOpenDialog;
+    EditRibbonCompiler: TButtonedEdit;
     procedure EditPathChange(Sender: TObject);
     procedure EditRibbonCompilerRightButtonClick(Sender: TObject);
     procedure EditDelphiCompilerRightButtonClick(Sender: TObject);
@@ -57,7 +55,6 @@ constructor TFormSettings.Create(const Settings: TSettings);
   inherited Create(nil);
   FSettings := Settings;
   EditRibbonCompiler.Text := FSettings.RibbonCompilerPath;
-  EditResourceCompiler.Text := FSettings.ResourceCompilerPath;
   EditDelphiCompiler.Text := FSettings.DelphiCompilerPath;
   UpdateControls;
 end;
@@ -90,18 +87,15 @@ procedure TFormSettings.FormClose(Sender: TObject; var Action: TCloseAction);
   if (ModalResult = mrOk) then
   begin
     FSettings.RibbonCompilerPath := EditRibbonCompiler.Text;
-    FSettings.ResourceCompilerPath := EditResourceCompiler.Text;
     FSettings.DelphiCompilerPath := EditDelphiCompiler.Text;
     FSettings.Save;
   end;
 end;
 
 procedure TFormSettings.UpdateControls;
 begin
-  EditResourceCompiler.Text := IncludeTrailingPathDelimiter(ExtractFilePath(EditRibbonCompiler.Text)) + 'RC.exe';
   ButtonOk.Enabled :=
     TFile.Exists(EditRibbonCompiler.Text) and
-    TFile.Exists(EditResourceCompiler.Text) and
     TFile.Exists(EditDelphiCompiler.Text);
 end;
 

Designer/FSettings.pas

@@ -30,14 +30,15 @@
         <Base>true</Base>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base)'!=''">
+        <VerInfo_Release>2</VerInfo_Release>
         <VerInfo_MajorVer>2</VerInfo_MajorVer>
         <Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
-        <VerInfo_Build>70</VerInfo_Build>
+        <VerInfo_Build>72</VerInfo_Build>
         <DCC_Namespace>Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;Winapi;System.Win;$(DCC_Namespace)</DCC_Namespace>
         <VerInfo_Locale>1033</VerInfo_Locale>
         <SanitizedProjectName>RibbonDesigner</SanitizedProjectName>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
-        <VerInfo_Keys>CompanyName=Erik van Bilsen AudioVisuality;FileDescription=Ribbon Designer;FileVersion=2.0.0.70;InternalName=;LegalCopyright=© 2011 Erik van Bilsen, Joachim Marder e.K.;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=2.0;Comments=</VerInfo_Keys>
+        <VerInfo_Keys>CompanyName=;FileDescription=Ribbon Designer;FileVersion=2.0.2.72;InternalName=;LegalCopyright=© 2011 Erik van Bilsen, Joachim Marder e.K.;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=2.0;Comments=</VerInfo_Keys>
         <DCC_UnitSearchPath>..\Lib;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
         <DCC_DependencyCheckOutputName>RibbonDesigner.exe</DCC_DependencyCheckOutputName>
         <DCC_ImageBase>00400000</DCC_ImageBase>