#20 Bold Merge. Stefan Westners version merged with Attracs Bold. Als…

…o removed some

C++ files

Bold.dproj

@@ -169,7 +169,6 @@
         <DCCReference Include="Source\BoldComObj.pas"/>
         <DCCReference Include="Source\BoldComPersistenceHandleReg.pas"/>
         <DCCReference Include="Source\BoldComReg.pas"/>
-        <DCCReference Include="Source\BoldComServer.pas"/>
         <DCCReference Include="Source\BoldComServerHandles.pas"/>
         <DCCReference Include="Source\BoldComThreads.pas"/>
         <DCCReference Include="Source\BoldComUtils.pas"/>

Source/Bold.inc

@@ -123,14 +123,17 @@ Illegal symbol combination
   // Use OXML instead of MSXML for XML operations (faster and can handle larger XML)
 {.$DEFINE OXML}
 
+  // Faster Display Queue - Simplified handling of (Most)Prioritized and less iteration of Display List
+{$DEFINE BoldQueue_Optimization}
+
   // When fetching an object which class list is loaded then search there instead of going to db.
 {$DEFINE FetchFromClassList}
 
   // Mechanism to automatically place subscriptions for all derivation code in .inc files
 {.$DEFINE NoAutoSubscription}
 
   // Mechanism for efficient fetching
-{$DEFINE SpanFetch}
+{.$DEFINE SpanFetch}
 
   // Turns off query mechanism
 {$DEFINE BOLD_NO_QUERIES}
@@ -200,9 +203,12 @@ Illegal symbol combination
 // IndexColumn creates an extra Index column in MemberMappingTable
 {.$DEFINE IndexColumn}
 
-//Adds brJson StringRepresentation via BoldObjectRepresentationJson unit
+//Includes BoldJson and BoldObjectRepresentationJson - includes LkJSON v1.07
 {$DEFINE BoldJson}
 
+// BoldSystem broadcasts member events - allows getting events from all objects and their members by only placing one subscription on system
+{$DEFINE BoldSystemBroadcastMemberEvents}
+
 // NoEnsureEnclosure skips EnsureEnclosure call in UpdateDatabase, use NoEnsureEnclosure if objects passed to UpdateDatabase are already enclosed
 {.$DEFINE NoEnsureEnclosure}
 
@@ -223,7 +229,7 @@ Illegal symbol combination
 {$ENDIF}
 
 // settings for design package
-
+(*
 {$IFNDEF Attracs}
   {$DEFINE NoAutoSubscription}
   {$UNDEF SpanFetch}
@@ -234,5 +240,6 @@ Illegal symbol combination
   {$UNDEF IDServer}
   {$UNDEF NoNegativeDates}
   {$UNDEF ConvertZeroDateToDateNil}
+  {$UNDEF BoldSystemBroadcastMemberEvents}
 {$ENDIF}
-
+*)

Source/BoldAFPDefault.pas

@@ -952,14 +952,14 @@ function TBoldDefaultObjectAutoFormProvider.GetGoodStringRepresentationForSingle
   ClassTypeInfo := (MemberRTInfo as TBoldRoleRTInfo).ClassTypeInfoOfOtherEnd;
   if ClassTypeInfo.DefaultStringRepresentation = '' then
   begin
-    for i := 0 to ClassTypeInfo.AllMembersCount - 1 do
+    for i := 0 to ClassTypeInfo.AllMembers.Count - 1 do
       if ClassTypeInfo.AllMembers[i].BoldType.ExpressionName = 'String' then  // do not localize
       begin
         Result := ClassTypeInfo.AllMembers[i].ExpressionName;
         exit;
       end;
 
-    for i := 0 to ClassTypeInfo.AllMembersCount - 1 do
+    for i := 0 to ClassTypeInfo.AllMembers.Count - 1 do
       if ClassTypeInfo.AllMembers[i] is TBoldAttributeRTInfo then
       begin
         Result := ClassTypeInfo.AllMembers[i].ExpressionName;

Source/BoldAbout.dfm

@@ -21,7 +21,7 @@ object frmAboutBold: TfrmAboutBold
     Top = 6
     Width = 385
     Height = 380
-    ActivePage = TabAbout
+    ActivePage = TabSheetRegistration
     MultiLine = True
     TabOrder = 0
     object TabAbout: TTabSheet
@@ -864,6 +864,7 @@ object frmAboutBold: TfrmAboutBold
         SortType = stText
         TabOrder = 0
         ViewStyle = vsReport
+        OnDblClick = ListViewRevisionDblClick
       end
     end
     object TabSheetRegistration: TTabSheet
@@ -3060,6 +3061,7 @@ object frmAboutBold: TfrmAboutBold
         StateImages = ImageList2
         TabOrder = 1
         ViewStyle = vsReport
+        OnDblClick = btnLicenseDetailsClick
       end
       object BtnSaveDeploymentKeys: TBitBtn
         Left = 196
@@ -3167,6 +3169,7 @@ object frmAboutBold: TfrmAboutBold
           Height = 25
           Caption = '&Open License Key...'
           TabOrder = 0
+          OnClick = btnLicenseDetailsClick
         end
       end
     end
@@ -3477,11 +3480,13 @@ object frmAboutBold: TfrmAboutBold
   end
   object PopupMenuRevision: TPopupMenu
     Images = ImageList1
+    OnPopup = PopupMenuRevisionPopup
     Left = 4
     Top = 392
     object PopupOpenModule: TMenuItem
       Caption = '&Open'
       ImageIndex = 0
+      OnClick = ListViewRevisionDblClick
     end
   end
   object SaveDialogRunLic: TSaveDialog

Source/BoldAbstractDequeuer.pas

@@ -1,4 +1,4 @@
-
+
 { Global compiler directives }
 {$include bold.inc}
 unit BoldAbstractDequeuer;

Source/BoldAbstractPartiallyExternalPC.pas

@@ -191,7 +191,7 @@ function TBoldAbstractPartiallyExternalPC.ExternalKeysToInternalSQL(
     raise EBold.CreateFmt(sNotSupportedWithNoKeys, [classname, MoldClass.ExpandedExpressionName]);
 
   result := format('%s.%s in (', [
-    BoldExpandName(ExternalKey.MoldClass.ExternalTableName, ExternalKey.MoldClass.Name, xtSQL, -1, nccFalse),
+    BoldExpandName(ExternalKey.MoldClass.Tablename, ExternalKey.MoldClass.Name, xtSQL, -1, nccFalse),
     BoldExpandName(ExternalKey.ColumnName, ExternalKey.name, xtSQL, -1, nccFalse)]);
   Mapping := TypeNameDictionary.MappingForModelName[ExternalKey.BoldType];
   KeyIsString := assigned(Mapping) and SameText(Mapping.ExpandedContentsName, BoldContentName_String);