Przeglądaj źródła

UPD: preparing for modern Form style i18n

rich2014 1 rok temu
rodzic
commit
1a136c7754

+ 1 - 0
src/doublecmd.lpr

@@ -226,6 +226,7 @@ begin
 
       InitPasswordStore;
       LoadPixMapManager;
+      initCocoaModernFormConfig;
       Application.CreateForm(TfrmMain, frmMain); // main form
       Application.CreateForm(TdmComData, dmComData); // common data
       Application.CreateForm(TdmHelpManager, dmHelpMgr); // help manager

+ 9 - 8
src/platform/unix/darwin/ucocoamodernformconfig.inc

@@ -8,10 +8,12 @@ interface
 uses
   Classes, SysUtils,
   LCLType, Forms, Menus,
-  fMain, uMyDarwin, uDCUtils,
+  fMain, uMyDarwin, uDCUtils, uLng,
   uFileView, uBriefFileView, uColumnsFileView, uThumbFileView,
   CocoaAll, CocoaConfig, CocoaToolBar, Cocoa_Extra;
 
+procedure initCocoaModernFormConfig;
+
 implementation
 
 procedure toggleTreeViewAction( const Sender: id );
@@ -513,7 +515,7 @@ const
     );
   );
 
-procedure initCocoaModernFormConfig;
+procedure doInitConfig;
 begin
   showModeItemConfig.subitems:= [
     TCocoaToolBarUtils.toClass(showBriefItemConfig),
@@ -542,16 +544,15 @@ begin
   CocoaConfigForms:= [ mainFormConfig ];
 end;
 
-procedure init;
+procedure initCocoaModernFormConfig;
 begin
+  if NSAppKitVersionNumber < NSAppKitVersionNumber11_0 then
+    Exit;
+
   fMain.onFileViewUpdated:= @onFileViewUpdated;
   toolBarMenuHandler:= TToolBarMenuHandler.Create;
-  initCocoaModernFormConfig;
+  doInitConfig;
 end;
 
-initialization
-  if NSAppKitVersionNumber >= NSAppKitVersionNumber11_0 then
-    init;
-
 end.