浏览代码

glsviewer expanded

glscene 1 年之前
父节点
当前提交
fcc723eb96

+ 4 - 4
Examples/AdvDemos/GLSViewer/GLSViewerD.dpr

@@ -7,7 +7,7 @@ uses
   fGLSViewer in 'Source\fGLSViewer.pas' {FormGLSViewer},
   fGLSViewer in 'Source\fGLSViewer.pas' {FormGLSViewer},
   uGlobals in 'Source\uGlobals.pas',
   uGlobals in 'Source\uGlobals.pas',
   uSettings in 'Source\uSettings.pas',
   uSettings in 'Source\uSettings.pas',
-  dImages in 'Source\dImages.pas' {DataModuleImages: TDataModule},
+  dImages in 'Source\dImages.pas' {dmImages: TDataModule},
   fGLAbout in 'Source\fGLAbout.pas' {GLAbout},
   fGLAbout in 'Source\fGLAbout.pas' {GLAbout},
   fGLOptions in 'Source\fGLOptions.pas' {FormOptions},
   fGLOptions in 'Source\fGLOptions.pas' {FormOptions},
   dDialogs in 'Source\dDialogs.pas' {dmDialogs: TDataModule};
   dDialogs in 'Source\dDialogs.pas' {dmDialogs: TDataModule};
@@ -15,10 +15,10 @@ uses
 {$R *.res}
 {$R *.res}
 
 
 begin
 begin
-  Application.Initialize;
-  Application.Title := 'GLSViewer';
+ // Application.Initialize;
+ // Application.Title := 'GLSViewer';
   Application.CreateForm(TFormGLSViewer, FormGLSViewer);
   Application.CreateForm(TFormGLSViewer, FormGLSViewer);
-  Application.CreateForm(TDataModuleImages, DataModuleImages);
+  Application.CreateForm(TdmImages, dmImages);
   Application.CreateForm(TdmDialogs, dmDialogs);
   Application.CreateForm(TdmDialogs, dmDialogs);
   Application.Run;
   Application.Run;
 end.
 end.

+ 1 - 1
Examples/AdvDemos/GLSViewer/GLSViewerD.dproj

@@ -137,7 +137,7 @@
         <DCCReference Include="Source\uGlobals.pas"/>
         <DCCReference Include="Source\uGlobals.pas"/>
         <DCCReference Include="Source\uSettings.pas"/>
         <DCCReference Include="Source\uSettings.pas"/>
         <DCCReference Include="Source\dImages.pas">
         <DCCReference Include="Source\dImages.pas">
-            <Form>DataModuleImages</Form>
+            <Form>dmImages</Form>
             <DesignClass>TDataModule</DesignClass>
             <DesignClass>TDataModule</DesignClass>
         </DCCReference>
         </DCCReference>
         <DCCReference Include="Source\fGLAbout.pas">
         <DCCReference Include="Source\fGLAbout.pas">

+ 1 - 1
Examples/AdvDemos/GLSViewer/GLSViewerD.ini

@@ -1,4 +1,4 @@
 [FormOptions]
 [FormOptions]
 CheckBoxAxis=1
 CheckBoxAxis=1
-rgLanguage=0
+rgLanguage=9
 PanelBackground=0
 PanelBackground=0

+ 0 - 546
Examples/AdvDemos/GLSViewer/Locale/es/LC_MESSAGES/default.po

@@ -1,546 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr "Project-Id-Version: \n"
-"POT-Creation-Date: 2012-12-20 07:34\n"
-"PO-Revision-Date: 2024-05-29 17:38+0300\n"
-"Last-Translator: Somebody <[email protected]>\n"
-"Language-Team: \n"
-"Language: es\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 3.4.4\n"
-
-#. FormAbout..Caption
-#: fAbout.dfm:8
-msgid "About"
-msgstr ""
-
-#. FormAbout..Font.Name
-#: fAbout.dfm:15
-#. FormColorwheel..Font.Name
-#: fColorwheel.dfm:15
-#. FormStellarfon..Font.Name
-#: fStellarfon.dfm:15
-msgid "Segoe UI"
-msgstr ""
-
-#. FormAbout..PageControl..tsDevelopers..Caption
-#: fAbout.dfm:173
-msgid "Developers"
-msgstr ""
-
-#. FormAbout..PageControl..tsOpenGL..Caption
-#: fAbout.dfm:228
-msgid "OpenGL"
-msgstr ""
-
-#. FormAbout..Scene..Background..GLPlane1..Material.LibMaterialName
-#: fAbout.dfm:282
-#. FormInfos..Scene..Background..GLPlane1..Material.LibMaterialName
-#: fGLInfosD.dfm:76
-msgid "Background"
-msgstr ""
-
-#. FormAbout..Scene..DriverInfo..HUDText_Vendor..Text
-#: fAbout.dfm:299
-#. FormInfos..Scene..DriverInfo..HUDText_Vendor..Text
-#: fGLInfosD.dfm:93
-msgid "Vendor    :"
-msgstr ""
-
-#. FormAbout..Scene..DriverInfo..HUDText_Renderer..Text
-#: fAbout.dfm:306
-#. FormInfos..Scene..DriverInfo..HUDText_Renderer..Text
-#: fGLInfosD.dfm:100
-msgid "Renderer :"
-msgstr ""
-
-#. FormAbout..Scene..DriverInfo..HUDText_Version..Text
-#: fAbout.dfm:313
-#. FormInfos..Scene..DriverInfo..HUDText_Version..Text
-#: fGLInfosD.dfm:107
-msgid "Version   :"
-msgstr ""
-
-#. FormAbout..Scene..DriverInfo..HUDText_ExtVersion..Text
-#: fAbout.dfm:320
-#. FormInfos..Scene..DriverInfo..HUDText_ExtVersion..Text
-#: fGLInfosD.dfm:114
-msgid "Extension Version   :"
-msgstr ""
-
-#. FormAbout..Scene..DriverInfo..HUDText_GLSLVersion..Text
-#: fAbout.dfm:327
-#. FormInfos..Scene..DriverInfo..HUDText_GLSLVersion..Text
-#: fGLInfosD.dfm:121
-msgid "GLSL Version   :"
-msgstr ""
-
-#. FormAbout..Scene..DriverInfo..HUDText_NBExt..Text
-#: fAbout.dfm:334
-#. FormInfos..Scene..DriverInfo..HUDText_NBExt..Text
-#: fGLInfosD.dfm:128
-msgid "Extensions supported   :"
-msgstr ""
-
-#. FormAbout..Scene..DriverInfo..HUDText_Counter..Text
-#: fAbout.dfm:341
-#. FormInfos..Scene..DriverInfo..HUDText_Counter..Text
-#: fGLInfosD.dfm:135
-msgid "Counter"
-msgstr ""
-
-#. FormAbout..Scene..ForeGround..HUDLogo..Material.LibMaterialName
-#: fAbout.dfm:353
-#. FormInfos..Scene..ForeGround..HUDLogo..Material.LibMaterialName
-#: fGLInfosD.dfm:148
-msgid "Logo"
-msgstr ""
-
-#. FormAbout..Scene..Extra..HUDHelp..Text
-#: fAbout.dfm:368
-#. FormInfos..Scene..Extra..HUDHelp..Text
-#: fGLInfosD.dfm:163
-msgid "Press Up,Down to Scroll. Space Toggle Sound. ESC to "
-"Exit."
-msgstr ""
-
-#. FormAbout..WindowsBitmapFont..Font.Name
-#: fAbout.dfm:1966
-#. FormInfos..WindowsBitmapFont..Font.Name
-#: fGLInfosD.dfm:1763
-msgid "Courier New"
-msgstr ""
-
-#. FormAbout..SoundLibrary......Name
-#: fAbout.dfm:2192
-#. FormAbout..FMODPlayer......SoundName
-#: fAbout.dfm:22179
-#. FormInfos..SoundLibrary......Name
-#: fGLInfosD.dfm:1990
-#. FormInfos..FMODPlayer......SoundName
-#: fGLInfosD.dfm:21974
-msgid "Music"
-msgstr ""
-
-#. FormAbout..WindowsBitmapFont2..Font.Name
-#: fAbout.dfm:22204
-#. FormInfos..WindowsBitmapFont2..Font.Name
-#: fGLInfosD.dfm:22000
-msgid "Verdana"
-msgstr ""
-
-#. FormColorwheel..Caption
-#: fColorwheel.dfm:8
-msgid "Colorwheel"
-msgstr ""
-
-#. FormColorwheel..GLSimpleNavigation1..FormCaption
-#: fColorwheel.dfm:62
-msgid "Colorwheel - %FPS"
-msgstr ""
-
-#. FormInfos..Caption
-#: fGLInfosD.dfm:9
-msgid "GLScene OpenGL Information"
-msgstr ""
-
-#. FormInfos..Font.Name
-#: fGLInfosD.dfm:16
-msgid "Tahoma"
-msgstr ""
-
-#. FormOptions..Caption
-#: fOptions.dfm:2
-msgid "Options"
-msgstr ""
-
-#. FormOptions..PageControl..tsGeneral..Caption
-#: fOptions.dfm:44
-#. Items:
-#: fOptions.pas:107
-msgid "General"
-msgstr ""
-
-#. FormOptions..PageControl..tsGeneral..Label1..Caption
-#: fOptions.dfm:54
-msgid "Label1"
-msgstr ""
-
-#. FormOptions..PageControl..tsGeneral..Label2..Caption
-#: fOptions.dfm:65
-msgid "Label2"
-msgstr ""
-
-#. FormOptions..PageControl..tsGeneral..Label3..Caption
-#: fOptions.dfm:76
-msgid "Label3"
-msgstr ""
-
-#. FormOptions..PageControl..tsGeneral..Button1..Caption
-#: fOptions.dfm:87
-msgid "Button1"
-msgstr ""
-
-#. FormOptions..PageControl..tsGeneral..Button2..Caption
-#: fOptions.dfm:112
-msgid "Button2"
-msgstr ""
-
-#. FormOptions..PageControl..tsGeneral..Button3..Caption
-#: fOptions.dfm:161
-msgid "TabSheet"
-msgstr ""
-
-#. FormOptions..PageControl..tsInterface..Caption
-#: fOptions.dfm:179
-#: fOptions.pas:108
-msgid "Interface"
-msgstr ""
-
-#. FormOptions..PageControl..tsInterface..rgLanguage..Caption
-#: fOptions.dfm:186
-msgid "Language"
-msgstr ""
-
-#. FormOptions..PageControl..tsInterface..rgLanguage....Items.Strings
-#: fOptions.dfm:190
-msgid "English"
-msgstr ""
-
-#. FormOptions..PageControl..tsInterface..rgLanguage....Items.Strings
-#: fOptions.dfm:191
-msgid "Russian"
-msgstr ""
-
-#. FormOptions..PageControl..tsInterface..rgLanguage....Items.Strings
-#: fOptions.dfm:192
-msgid "Spanish"
-msgstr ""
-
-#. FormOptions..PageControl..tsConstellations..Caption
-#: fOptions.dfm:198
-#: fOptions.pas:109
-msgid "Constellations"
-msgstr ""
-
-#. FormOptions..PageControl..tsColorwheels..Caption
-#: fOptions.dfm:202
-#: fOptions.pas:110
-msgid "Colorwheels"
-msgstr ""
-
-#. FormOptions..PageControl..tsSounds..Caption
-#: fOptions.dfm:206
-#: fOptions.pas:111
-msgid "Sounds"
-msgstr ""
-
-#. FormOptions..PanelBottom..ButtonOk..Caption
-#: fOptions.dfm:232
-msgid "Ok"
-msgstr ""
-
-#. FormStellarfon..Caption
-#: fStellarfon.dfm:8
-msgid "Stellarfon"
-msgstr ""
-
-#. FormStellarfon..PanelRight..rgKeyboardColors..Caption
-#: fStellarfon.dfm:162
-msgid "Keyboard"
-msgstr ""
-
-#. FormStellarfon..PanelRight..rgKeyboardColors....Items.Strings
-#: fStellarfon.dfm:165
-msgid "Sonochromatic"
-msgstr ""
-
-#. FormStellarfon..PanelRight..rgKeyboardColors....Items.Strings
-#: fStellarfon.dfm:166
-msgid "Black and White"
-msgstr ""
-
-#. FormStellarfon..PanelRight..chbKeyboard..Caption
-#: fStellarfon.dfm:179
-msgid "Show keyboards"
-msgstr ""
-
-#. FormStellarfon..MainMenu..miFile..Caption
-#: fStellarfon.dfm:190
-msgid "&File"
-msgstr ""
-
-#. FormStellarfon..MainMenu..miFile..miNew..Caption
-#: fStellarfon.dfm:192
-msgid "New"
-msgstr ""
-
-#. FormStellarfon..MainMenu..miFile..miOpen..Caption
-#: fStellarfon.dfm:196
-msgid "Open..."
-msgstr ""
-
-#. FormStellarfon..MainMenu..miFile..miSave..Caption
-#: fStellarfon.dfm:200
-msgid "Save"
-msgstr ""
-
-#. FormStellarfon..MainMenu..miFile..miSaveAs..Caption
-#: fStellarfon.dfm:204
-msgid "Save as..."
-msgstr ""
-
-#. FormStellarfon..MainMenu..miFile..N1..Caption
-#: fStellarfon.dfm:208
-#. FormStellarfon..MainMenu..Edit1..N5..Caption
-#: fStellarfon.dfm:224
-#. FormStellarfon..MainMenu..Edit1..N4..Caption
-#: fStellarfon.dfm:239
-#. FormStellarfon..MainMenu..Edit1..N3..Caption
-#: fStellarfon.dfm:245
-#. FormStellarfon..MainMenu..Window1..N6..Caption
-#: fStellarfon.dfm:271
-#. FormStellarfon..MainMenu..Help1..N2..Caption
-#: fStellarfon.dfm:297
-msgid "-"
-msgstr ""
-
-#. FormStellarfon..MainMenu..miFile..miExit..Caption
-#: fStellarfon.dfm:211
-msgid "Exit"
-msgstr ""
-
-#. FormStellarfon..MainMenu..Edit1..Caption
-#: fStellarfon.dfm:218
-msgid "&Edit"
-msgstr ""
-
-#. FormStellarfon..MainMenu..Edit1..Undo1..Caption
-#: fStellarfon.dfm:220
-msgid "Undo"
-msgstr ""
-
-#. FormStellarfon..MainMenu..Edit1..Cut1..Caption
-#: fStellarfon.dfm:227
-msgid "Cut"
-msgstr ""
-
-#. FormStellarfon..MainMenu..Edit1..Copy1..Caption
-#: fStellarfon.dfm:231
-msgid "Copy"
-msgstr "Copia"
-
-#. FormStellarfon..MainMenu..Edit1..Paste1..Caption
-#: fStellarfon.dfm:235
-msgid "Insert"
-msgstr ""
-
-#. FormStellarfon..MainMenu..Edit1..GoTo1..Caption
-#: fStellarfon.dfm:242
-msgid "Go to..."
-msgstr ""
-
-#. FormStellarfon..MainMenu..Window1..Caption
-#: fStellarfon.dfm:249
-msgid "&View"
-msgstr ""
-
-#. FormStellarfon..MainMenu..Window1..miColorwheel..Caption
-#: fStellarfon.dfm:251
-msgid "Quint circle..."
-msgstr ""
-
-#. FormStellarfon..MainMenu..Window1..miChangeFPS..Caption
-#: fStellarfon.dfm:255
-msgid "Change FPS"
-msgstr ""
-
-#. FormStellarfon..MainMenu..Window1..miChangeFPS..miMaxFPS..Caption
-#: fStellarfon.dfm:257
-msgid "Max"
-msgstr ""
-
-#. FormStellarfon..MainMenu..Window1..miChangeFPS..miMiddleFPS..Caption
-#: fStellarfon.dfm:262
-msgid "Middle"
-msgstr ""
-
-#. FormStellarfon..MainMenu..Window1..miChangeFPS..miMinFPS..Caption
-#: fStellarfon.dfm:266
-msgid "Min"
-msgstr ""
-
-#. FormStellarfon..MainMenu..Window1..Hide1..Caption
-#: fStellarfon.dfm:274
-msgid "Hide"
-msgstr ""
-
-#. FormStellarfon..MainMenu..Window1..Show1..Caption
-#: fStellarfon.dfm:277
-msgid "Show..."
-msgstr ""
-
-#. FormStellarfon..MainMenu..miTools..Caption
-#: fStellarfon.dfm:281
-msgid "&Tools"
-msgstr ""
-
-#. FormStellarfon..MainMenu..miTools..miOptions..Caption
-#: fStellarfon.dfm:283
-msgid "Options..."
-msgstr ""
-
-#. FormStellarfon..MainMenu..miTools..miCalculate..Caption
-#: fStellarfon.dfm:287
-msgid "Calculate"
-msgstr ""
-
-#. FormStellarfon..MainMenu..Help1..Caption
-#: fStellarfon.dfm:291
-msgid "&Help"
-msgstr ""
-
-#. FormStellarfon..MainMenu..Help1..miContents..Caption
-#: fStellarfon.dfm:293
-msgid "Ruwiki"
-msgstr ""
-
-#. FormStellarfon..MainMenu..Help1..miAbout..Caption
-#: fStellarfon.dfm:300
-msgid "About..."
-msgstr ""
-
-#. FormStellarfon..GLScene..SkyBox..MatNameTop
-#: fStellarfon.dfm:309
-msgid "Top"
-msgstr ""
-
-#. FormStellarfon..GLScene..SkyBox..MatNameBottom
-#: fStellarfon.dfm:310
-msgid "Bottom"
-msgstr ""
-
-#. FormStellarfon..GLScene..SkyBox..MatNameLeft
-#: fStellarfon.dfm:311
-msgid "Left"
-msgstr ""
-
-#. FormStellarfon..GLScene..SkyBox..MatNameRight
-#: fStellarfon.dfm:312
-msgid "Right"
-msgstr ""
-
-#. FormStellarfon..GLScene..SkyBox..MatNameFront
-#: fStellarfon.dfm:313
-msgid "Front"
-msgstr ""
-
-#. FormStellarfon..GLScene..SkyBox..MatNameBack
-#: fStellarfon.dfm:314
-msgid "Back"
-msgstr ""
-
-#. FormStellarfon..GLScene..SkyBox..MatNameClouds
-#: fStellarfon.dfm:315
-msgid "Clouds"
-msgstr ""
-
-#. FormStellarfon..GLScene..HUDTextGuitar..Text
-#: fStellarfon.dfm:387
-msgid "Guitar ColorFretboard"
-msgstr ""
-
-#. FormStellarfon..GLScene..HUDTextPiano..Text
-#: fStellarfon.dfm:394
-msgid "Piano ColorKeyboard"
-msgstr ""
-
-#. FormStellarfon..GLScene..dcCircleOfFifths..dcMajor..C..Material.LibMaterialName
-#: fStellarfon.dfm:409
-#. FormStellarfon..GLScene..dcScene..dcEdges..EdgeZc..Material.LibMaterialName
-#: fStellarfon.dfm:853
-msgid "c"
-msgstr ""
-
-#. FormStellarfon..GLScene..dcCircleOfFifths..dcMinor..Am..Material.LibMaterialName
-#: fStellarfon.dfm:486
-#. FormStellarfon..GLScene..dcScene..dcEdges..EdgeXa..Material.LibMaterialName
-#: fStellarfon.dfm:965
-msgid "a"
-msgstr ""
-
-#. FormStellarfon..GLScene..dcCircleOfFifths..dcDim..dimB..Material.LibMaterialName
-#: fStellarfon.dfm:563
-#. FormStellarfon..GLScene..dcCircleOfFifths..dcNdb..db0..Material.LibMaterialName
-#: fStellarfon.dfm:640
-#. FormStellarfon..GLScene..dcScene..dcEdges..EdgeXb..Material.LibMaterialName
-#: fStellarfon.dfm:993
-msgid "b"
-msgstr ""
-
-#. FormStellarfon..GLScene..dcCircleOfFifths..dcNdb..d1..Material.LibMaterialName
-#: fStellarfon.dfm:648
-#. FormStellarfon..GLScene..dcScene..dcEdges..EdgeZd..Material.LibMaterialName
-#: fStellarfon.dfm:879
-msgid "d"
-msgstr ""
-
-#. FormStellarfon..GLScene..dcCircleOfFifths..dcNdb..b1..Material.LibMaterialName
-#: fStellarfon.dfm:710
-#. FormStellarfon..GLScene..dcScene..dcEdges..EdgeYgs..Material.LibMaterialName
-#: fStellarfon.dfm:950
-msgid "gs"
-msgstr ""
-
-#. FormStellarfon..GLScene..dcScene..dcEdges..EdgeZcs..Material.LibMaterialName
-#: fStellarfon.dfm:866
-msgid "cs"
-msgstr ""
-
-#. FormStellarfon..GLScene..dcScene..dcEdges..EdgeZds..Material.LibMaterialName
-#: fStellarfon.dfm:892
-msgid "ds"
-msgstr ""
-
-#. FormStellarfon..GLScene..dcScene..dcEdges..EdgeYf..Material.LibMaterialName
-#: fStellarfon.dfm:905
-msgid "f"
-msgstr ""
-
-#. FormStellarfon..GLScene..dcScene..dcEdges..EdgeYfs..Material.LibMaterialName
-#: fStellarfon.dfm:920
-msgid "fs"
-msgstr ""
-
-#. FormStellarfon..GLScene..dcScene..dcEdges..EdgeYg..Material.LibMaterialName
-#: fStellarfon.dfm:935
-msgid "g"
-msgstr ""
-
-#. FormStellarfon..GLScene..dcScene..dcEdges..EdgeXas..Material.LibMaterialName
-#: fStellarfon.dfm:979
-msgid "as"
-msgstr ""
-
-#. FormStellarfon..GLScene..dcScene..dcEdges..EdgeXe..Material.LibMaterialName
-#: fStellarfon.dfm:1007
-msgid "e"
-msgstr ""
-
-#. FormStellarfon..GLWindowsBitmapFont..Font.Name
-#: fStellarfon.dfm:1047
-msgid "Arial"
-msgstr ""
-
-#. ----------------------------------------------------------------
-#: fOptions.pas:248
-msgid "Reload to change language"
-msgstr ""
-

+ 0 - 546
Examples/AdvDemos/GLSViewer/Locale/es/LC_MESSAGES/glsviewer.po

@@ -1,546 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr "Project-Id-Version: \n"
-"POT-Creation-Date: 2012-12-20 07:34\n"
-"PO-Revision-Date: 2024-05-29 17:38+0300\n"
-"Last-Translator: Somebody <[email protected]>\n"
-"Language-Team: \n"
-"Language: es\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 3.4.4\n"
-
-#. FormAbout..Caption
-#: fAbout.dfm:8
-msgid "About"
-msgstr ""
-
-#. FormAbout..Font.Name
-#: fAbout.dfm:15
-#. FormColorwheel..Font.Name
-#: fColorwheel.dfm:15
-#. FormStellarfon..Font.Name
-#: fStellarfon.dfm:15
-msgid "Segoe UI"
-msgstr ""
-
-#. FormAbout..PageControl..tsDevelopers..Caption
-#: fAbout.dfm:173
-msgid "Developers"
-msgstr ""
-
-#. FormAbout..PageControl..tsOpenGL..Caption
-#: fAbout.dfm:228
-msgid "OpenGL"
-msgstr ""
-
-#. FormAbout..Scene..Background..GLPlane1..Material.LibMaterialName
-#: fAbout.dfm:282
-#. FormInfos..Scene..Background..GLPlane1..Material.LibMaterialName
-#: fGLInfosD.dfm:76
-msgid "Background"
-msgstr ""
-
-#. FormAbout..Scene..DriverInfo..HUDText_Vendor..Text
-#: fAbout.dfm:299
-#. FormInfos..Scene..DriverInfo..HUDText_Vendor..Text
-#: fGLInfosD.dfm:93
-msgid "Vendor    :"
-msgstr ""
-
-#. FormAbout..Scene..DriverInfo..HUDText_Renderer..Text
-#: fAbout.dfm:306
-#. FormInfos..Scene..DriverInfo..HUDText_Renderer..Text
-#: fGLInfosD.dfm:100
-msgid "Renderer :"
-msgstr ""
-
-#. FormAbout..Scene..DriverInfo..HUDText_Version..Text
-#: fAbout.dfm:313
-#. FormInfos..Scene..DriverInfo..HUDText_Version..Text
-#: fGLInfosD.dfm:107
-msgid "Version   :"
-msgstr ""
-
-#. FormAbout..Scene..DriverInfo..HUDText_ExtVersion..Text
-#: fAbout.dfm:320
-#. FormInfos..Scene..DriverInfo..HUDText_ExtVersion..Text
-#: fGLInfosD.dfm:114
-msgid "Extension Version   :"
-msgstr ""
-
-#. FormAbout..Scene..DriverInfo..HUDText_GLSLVersion..Text
-#: fAbout.dfm:327
-#. FormInfos..Scene..DriverInfo..HUDText_GLSLVersion..Text
-#: fGLInfosD.dfm:121
-msgid "GLSL Version   :"
-msgstr ""
-
-#. FormAbout..Scene..DriverInfo..HUDText_NBExt..Text
-#: fAbout.dfm:334
-#. FormInfos..Scene..DriverInfo..HUDText_NBExt..Text
-#: fGLInfosD.dfm:128
-msgid "Extensions supported   :"
-msgstr ""
-
-#. FormAbout..Scene..DriverInfo..HUDText_Counter..Text
-#: fAbout.dfm:341
-#. FormInfos..Scene..DriverInfo..HUDText_Counter..Text
-#: fGLInfosD.dfm:135
-msgid "Counter"
-msgstr ""
-
-#. FormAbout..Scene..ForeGround..HUDLogo..Material.LibMaterialName
-#: fAbout.dfm:353
-#. FormInfos..Scene..ForeGround..HUDLogo..Material.LibMaterialName
-#: fGLInfosD.dfm:148
-msgid "Logo"
-msgstr ""
-
-#. FormAbout..Scene..Extra..HUDHelp..Text
-#: fAbout.dfm:368
-#. FormInfos..Scene..Extra..HUDHelp..Text
-#: fGLInfosD.dfm:163
-msgid "Press Up,Down to Scroll. Space Toggle Sound. ESC to "
-"Exit."
-msgstr ""
-
-#. FormAbout..WindowsBitmapFont..Font.Name
-#: fAbout.dfm:1966
-#. FormInfos..WindowsBitmapFont..Font.Name
-#: fGLInfosD.dfm:1763
-msgid "Courier New"
-msgstr ""
-
-#. FormAbout..SoundLibrary......Name
-#: fAbout.dfm:2192
-#. FormAbout..FMODPlayer......SoundName
-#: fAbout.dfm:22179
-#. FormInfos..SoundLibrary......Name
-#: fGLInfosD.dfm:1990
-#. FormInfos..FMODPlayer......SoundName
-#: fGLInfosD.dfm:21974
-msgid "Music"
-msgstr ""
-
-#. FormAbout..WindowsBitmapFont2..Font.Name
-#: fAbout.dfm:22204
-#. FormInfos..WindowsBitmapFont2..Font.Name
-#: fGLInfosD.dfm:22000
-msgid "Verdana"
-msgstr ""
-
-#. FormColorwheel..Caption
-#: fColorwheel.dfm:8
-msgid "Colorwheel"
-msgstr ""
-
-#. FormColorwheel..GLSimpleNavigation1..FormCaption
-#: fColorwheel.dfm:62
-msgid "Colorwheel - %FPS"
-msgstr ""
-
-#. FormInfos..Caption
-#: fGLInfosD.dfm:9
-msgid "GLScene OpenGL Information"
-msgstr ""
-
-#. FormInfos..Font.Name
-#: fGLInfosD.dfm:16
-msgid "Tahoma"
-msgstr ""
-
-#. FormOptions..Caption
-#: fOptions.dfm:2
-msgid "Options"
-msgstr ""
-
-#. FormOptions..PageControl..tsGeneral..Caption
-#: fOptions.dfm:44
-#. Items:
-#: fOptions.pas:107
-msgid "General"
-msgstr ""
-
-#. FormOptions..PageControl..tsGeneral..Label1..Caption
-#: fOptions.dfm:54
-msgid "Label1"
-msgstr ""
-
-#. FormOptions..PageControl..tsGeneral..Label2..Caption
-#: fOptions.dfm:65
-msgid "Label2"
-msgstr ""
-
-#. FormOptions..PageControl..tsGeneral..Label3..Caption
-#: fOptions.dfm:76
-msgid "Label3"
-msgstr ""
-
-#. FormOptions..PageControl..tsGeneral..Button1..Caption
-#: fOptions.dfm:87
-msgid "Button1"
-msgstr ""
-
-#. FormOptions..PageControl..tsGeneral..Button2..Caption
-#: fOptions.dfm:112
-msgid "Button2"
-msgstr ""
-
-#. FormOptions..PageControl..tsGeneral..Button3..Caption
-#: fOptions.dfm:161
-msgid "TabSheet"
-msgstr ""
-
-#. FormOptions..PageControl..tsInterface..Caption
-#: fOptions.dfm:179
-#: fOptions.pas:108
-msgid "Interface"
-msgstr ""
-
-#. FormOptions..PageControl..tsInterface..rgLanguage..Caption
-#: fOptions.dfm:186
-msgid "Language"
-msgstr ""
-
-#. FormOptions..PageControl..tsInterface..rgLanguage....Items.Strings
-#: fOptions.dfm:190
-msgid "English"
-msgstr ""
-
-#. FormOptions..PageControl..tsInterface..rgLanguage....Items.Strings
-#: fOptions.dfm:191
-msgid "Russian"
-msgstr ""
-
-#. FormOptions..PageControl..tsInterface..rgLanguage....Items.Strings
-#: fOptions.dfm:192
-msgid "Spanish"
-msgstr ""
-
-#. FormOptions..PageControl..tsConstellations..Caption
-#: fOptions.dfm:198
-#: fOptions.pas:109
-msgid "Constellations"
-msgstr ""
-
-#. FormOptions..PageControl..tsColorwheels..Caption
-#: fOptions.dfm:202
-#: fOptions.pas:110
-msgid "Colorwheels"
-msgstr ""
-
-#. FormOptions..PageControl..tsSounds..Caption
-#: fOptions.dfm:206
-#: fOptions.pas:111
-msgid "Sounds"
-msgstr ""
-
-#. FormOptions..PanelBottom..ButtonOk..Caption
-#: fOptions.dfm:232
-msgid "Ok"
-msgstr ""
-
-#. FormStellarfon..Caption
-#: fStellarfon.dfm:8
-msgid "Stellarfon"
-msgstr ""
-
-#. FormStellarfon..PanelRight..rgKeyboardColors..Caption
-#: fStellarfon.dfm:162
-msgid "Keyboard"
-msgstr ""
-
-#. FormStellarfon..PanelRight..rgKeyboardColors....Items.Strings
-#: fStellarfon.dfm:165
-msgid "Sonochromatic"
-msgstr ""
-
-#. FormStellarfon..PanelRight..rgKeyboardColors....Items.Strings
-#: fStellarfon.dfm:166
-msgid "Black and White"
-msgstr ""
-
-#. FormStellarfon..PanelRight..chbKeyboard..Caption
-#: fStellarfon.dfm:179
-msgid "Show keyboards"
-msgstr ""
-
-#. FormStellarfon..MainMenu..miFile..Caption
-#: fStellarfon.dfm:190
-msgid "&File"
-msgstr ""
-
-#. FormStellarfon..MainMenu..miFile..miNew..Caption
-#: fStellarfon.dfm:192
-msgid "New"
-msgstr ""
-
-#. FormStellarfon..MainMenu..miFile..miOpen..Caption
-#: fStellarfon.dfm:196
-msgid "Open..."
-msgstr ""
-
-#. FormStellarfon..MainMenu..miFile..miSave..Caption
-#: fStellarfon.dfm:200
-msgid "Save"
-msgstr ""
-
-#. FormStellarfon..MainMenu..miFile..miSaveAs..Caption
-#: fStellarfon.dfm:204
-msgid "Save as..."
-msgstr ""
-
-#. FormStellarfon..MainMenu..miFile..N1..Caption
-#: fStellarfon.dfm:208
-#. FormStellarfon..MainMenu..Edit1..N5..Caption
-#: fStellarfon.dfm:224
-#. FormStellarfon..MainMenu..Edit1..N4..Caption
-#: fStellarfon.dfm:239
-#. FormStellarfon..MainMenu..Edit1..N3..Caption
-#: fStellarfon.dfm:245
-#. FormStellarfon..MainMenu..Window1..N6..Caption
-#: fStellarfon.dfm:271
-#. FormStellarfon..MainMenu..Help1..N2..Caption
-#: fStellarfon.dfm:297
-msgid "-"
-msgstr ""
-
-#. FormStellarfon..MainMenu..miFile..miExit..Caption
-#: fStellarfon.dfm:211
-msgid "Exit"
-msgstr ""
-
-#. FormStellarfon..MainMenu..Edit1..Caption
-#: fStellarfon.dfm:218
-msgid "&Edit"
-msgstr ""
-
-#. FormStellarfon..MainMenu..Edit1..Undo1..Caption
-#: fStellarfon.dfm:220
-msgid "Undo"
-msgstr ""
-
-#. FormStellarfon..MainMenu..Edit1..Cut1..Caption
-#: fStellarfon.dfm:227
-msgid "Cut"
-msgstr ""
-
-#. FormStellarfon..MainMenu..Edit1..Copy1..Caption
-#: fStellarfon.dfm:231
-msgid "Copy"
-msgstr "Copia"
-
-#. FormStellarfon..MainMenu..Edit1..Paste1..Caption
-#: fStellarfon.dfm:235
-msgid "Insert"
-msgstr ""
-
-#. FormStellarfon..MainMenu..Edit1..GoTo1..Caption
-#: fStellarfon.dfm:242
-msgid "Go to..."
-msgstr ""
-
-#. FormStellarfon..MainMenu..Window1..Caption
-#: fStellarfon.dfm:249
-msgid "&View"
-msgstr ""
-
-#. FormStellarfon..MainMenu..Window1..miColorwheel..Caption
-#: fStellarfon.dfm:251
-msgid "Quint circle..."
-msgstr ""
-
-#. FormStellarfon..MainMenu..Window1..miChangeFPS..Caption
-#: fStellarfon.dfm:255
-msgid "Change FPS"
-msgstr ""
-
-#. FormStellarfon..MainMenu..Window1..miChangeFPS..miMaxFPS..Caption
-#: fStellarfon.dfm:257
-msgid "Max"
-msgstr ""
-
-#. FormStellarfon..MainMenu..Window1..miChangeFPS..miMiddleFPS..Caption
-#: fStellarfon.dfm:262
-msgid "Middle"
-msgstr ""
-
-#. FormStellarfon..MainMenu..Window1..miChangeFPS..miMinFPS..Caption
-#: fStellarfon.dfm:266
-msgid "Min"
-msgstr ""
-
-#. FormStellarfon..MainMenu..Window1..Hide1..Caption
-#: fStellarfon.dfm:274
-msgid "Hide"
-msgstr ""
-
-#. FormStellarfon..MainMenu..Window1..Show1..Caption
-#: fStellarfon.dfm:277
-msgid "Show..."
-msgstr ""
-
-#. FormStellarfon..MainMenu..miTools..Caption
-#: fStellarfon.dfm:281
-msgid "&Tools"
-msgstr ""
-
-#. FormStellarfon..MainMenu..miTools..miOptions..Caption
-#: fStellarfon.dfm:283
-msgid "Options..."
-msgstr ""
-
-#. FormStellarfon..MainMenu..miTools..miCalculate..Caption
-#: fStellarfon.dfm:287
-msgid "Calculate"
-msgstr ""
-
-#. FormStellarfon..MainMenu..Help1..Caption
-#: fStellarfon.dfm:291
-msgid "&Help"
-msgstr ""
-
-#. FormStellarfon..MainMenu..Help1..miContents..Caption
-#: fStellarfon.dfm:293
-msgid "Ruwiki"
-msgstr ""
-
-#. FormStellarfon..MainMenu..Help1..miAbout..Caption
-#: fStellarfon.dfm:300
-msgid "About..."
-msgstr ""
-
-#. FormStellarfon..GLScene..SkyBox..MatNameTop
-#: fStellarfon.dfm:309
-msgid "Top"
-msgstr ""
-
-#. FormStellarfon..GLScene..SkyBox..MatNameBottom
-#: fStellarfon.dfm:310
-msgid "Bottom"
-msgstr ""
-
-#. FormStellarfon..GLScene..SkyBox..MatNameLeft
-#: fStellarfon.dfm:311
-msgid "Left"
-msgstr ""
-
-#. FormStellarfon..GLScene..SkyBox..MatNameRight
-#: fStellarfon.dfm:312
-msgid "Right"
-msgstr ""
-
-#. FormStellarfon..GLScene..SkyBox..MatNameFront
-#: fStellarfon.dfm:313
-msgid "Front"
-msgstr ""
-
-#. FormStellarfon..GLScene..SkyBox..MatNameBack
-#: fStellarfon.dfm:314
-msgid "Back"
-msgstr ""
-
-#. FormStellarfon..GLScene..SkyBox..MatNameClouds
-#: fStellarfon.dfm:315
-msgid "Clouds"
-msgstr ""
-
-#. FormStellarfon..GLScene..HUDTextGuitar..Text
-#: fStellarfon.dfm:387
-msgid "Guitar ColorFretboard"
-msgstr ""
-
-#. FormStellarfon..GLScene..HUDTextPiano..Text
-#: fStellarfon.dfm:394
-msgid "Piano ColorKeyboard"
-msgstr ""
-
-#. FormStellarfon..GLScene..dcCircleOfFifths..dcMajor..C..Material.LibMaterialName
-#: fStellarfon.dfm:409
-#. FormStellarfon..GLScene..dcScene..dcEdges..EdgeZc..Material.LibMaterialName
-#: fStellarfon.dfm:853
-msgid "c"
-msgstr ""
-
-#. FormStellarfon..GLScene..dcCircleOfFifths..dcMinor..Am..Material.LibMaterialName
-#: fStellarfon.dfm:486
-#. FormStellarfon..GLScene..dcScene..dcEdges..EdgeXa..Material.LibMaterialName
-#: fStellarfon.dfm:965
-msgid "a"
-msgstr ""
-
-#. FormStellarfon..GLScene..dcCircleOfFifths..dcDim..dimB..Material.LibMaterialName
-#: fStellarfon.dfm:563
-#. FormStellarfon..GLScene..dcCircleOfFifths..dcNdb..db0..Material.LibMaterialName
-#: fStellarfon.dfm:640
-#. FormStellarfon..GLScene..dcScene..dcEdges..EdgeXb..Material.LibMaterialName
-#: fStellarfon.dfm:993
-msgid "b"
-msgstr ""
-
-#. FormStellarfon..GLScene..dcCircleOfFifths..dcNdb..d1..Material.LibMaterialName
-#: fStellarfon.dfm:648
-#. FormStellarfon..GLScene..dcScene..dcEdges..EdgeZd..Material.LibMaterialName
-#: fStellarfon.dfm:879
-msgid "d"
-msgstr ""
-
-#. FormStellarfon..GLScene..dcCircleOfFifths..dcNdb..b1..Material.LibMaterialName
-#: fStellarfon.dfm:710
-#. FormStellarfon..GLScene..dcScene..dcEdges..EdgeYgs..Material.LibMaterialName
-#: fStellarfon.dfm:950
-msgid "gs"
-msgstr ""
-
-#. FormStellarfon..GLScene..dcScene..dcEdges..EdgeZcs..Material.LibMaterialName
-#: fStellarfon.dfm:866
-msgid "cs"
-msgstr ""
-
-#. FormStellarfon..GLScene..dcScene..dcEdges..EdgeZds..Material.LibMaterialName
-#: fStellarfon.dfm:892
-msgid "ds"
-msgstr ""
-
-#. FormStellarfon..GLScene..dcScene..dcEdges..EdgeYf..Material.LibMaterialName
-#: fStellarfon.dfm:905
-msgid "f"
-msgstr ""
-
-#. FormStellarfon..GLScene..dcScene..dcEdges..EdgeYfs..Material.LibMaterialName
-#: fStellarfon.dfm:920
-msgid "fs"
-msgstr ""
-
-#. FormStellarfon..GLScene..dcScene..dcEdges..EdgeYg..Material.LibMaterialName
-#: fStellarfon.dfm:935
-msgid "g"
-msgstr ""
-
-#. FormStellarfon..GLScene..dcScene..dcEdges..EdgeXas..Material.LibMaterialName
-#: fStellarfon.dfm:979
-msgid "as"
-msgstr ""
-
-#. FormStellarfon..GLScene..dcScene..dcEdges..EdgeXe..Material.LibMaterialName
-#: fStellarfon.dfm:1007
-msgid "e"
-msgstr ""
-
-#. FormStellarfon..GLWindowsBitmapFont..Font.Name
-#: fStellarfon.dfm:1047
-msgid "Arial"
-msgstr ""
-
-#. ----------------------------------------------------------------
-#: fOptions.pas:248
-msgid "Reload to change language"
-msgstr ""
-

+ 0 - 62
Examples/AdvDemos/GLSViewer/Locale/es/LC_MESSAGES/languages.po

@@ -1,62 +0,0 @@
-# GLScene Languages.
-#
-# This file is distributed under the same license as GLScene
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-# Translators:
-# Pavel Vassiliev <[email protected]>, 2023
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: GLScene Languages\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: es\n"
-"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
-"X-Generator: Poedit 1.8.6\n"
-
-msgid "Arabic"
-msgstr "Árabe"
-
-msgid "Chinese"
-msgstr ""
-
-msgid "English"
-msgstr "Inglés"
-
-#. Language of France
-msgid "French"
-msgstr "Francés"
-
-#. Language of Germany
-msgid "German"
-msgstr "Alemán"
-
-#. Language of Greece
-msgid "Greek"
-msgstr "Griego"
-
-#. Language of Italy
-msgid "Italian"
-msgstr "Italiano"
-
-#. Language of Iran
-msgid "Persian"
-msgstr "Persa"
-
-#. Language of Japan
-msgid "Japanese"
-msgstr "Japonés"
-
-#. Language of Portugal
-msgid "Portuguese"
-msgstr "Portugués"
-
-#. Language of Russia
-msgid "Russian"
-msgstr "Ruso"
-
-#. Language of Spain
-msgid "Spanish"
-msgstr "Español"

二进制
Examples/AdvDemos/GLSViewer/Locale/ru/LC_MESSAGES/default.mo


+ 34 - 36
Examples/AdvDemos/GLSViewer/Locale/ru/LC_MESSAGES/default.po

@@ -3,7 +3,7 @@
 msgid ""
 msgid ""
 msgstr "Project-Id-Version: \n"
 msgstr "Project-Id-Version: \n"
 "POT-Creation-Date: 2023-01-02 19:19+0300\n"
 "POT-Creation-Date: 2023-01-02 19:19+0300\n"
-"PO-Revision-Date: 2024-06-20 13:48+0300\n"
+"PO-Revision-Date: 2024-06-20 22:36+0300\n"
 "Last-Translator: \n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language-Team: \n"
 "Language: ru\n"
 "Language: ru\n"
@@ -182,13 +182,11 @@ msgstr ""
 #. FormViewer..amMenuBar..Font.Name
 #. FormViewer..amMenuBar..Font.Name
 #: fcGLSViewer.dfm:178
 #: fcGLSViewer.dfm:178
 #. GLAbout..PanelTop..LabelVersion..Font.Name
 #. GLAbout..PanelTop..LabelVersion..Font.Name
-#: fGLAbout.dfm:141
+#: fGLAbout.dfm:144
 #. GLAbout..PanelMiddle..LabelCopyright..Font.Name
 #. GLAbout..PanelMiddle..LabelCopyright..Font.Name
-#: fGLAbout.dfm:187
+#: fGLAbout.dfm:188
 #. GLAbout..PanelMiddle..FreeAndOpenSource..Font.Name
 #. GLAbout..PanelMiddle..FreeAndOpenSource..Font.Name
-#: fGLAbout.dfm:2408
-#. FormOptions..PanelMiddle..rgLanguage..Font.Name
-#: fGLOptions.dfm:72
+#: fGLAbout.dfm:2409
 #. FormGLSViewer..Font.Name
 #. FormGLSViewer..Font.Name
 #: fGLSViewer.dfm:15
 #: fGLSViewer.dfm:15
 #. FormGLSViewer..amMenuBar..Font.Name
 #. FormGLSViewer..amMenuBar..Font.Name
@@ -715,7 +713,7 @@ msgstr ""
 #. FormGLSViewer..ActionManager..............Caption
 #. FormGLSViewer..ActionManager..............Caption
 #: fGLSViewer.dfm:1211
 #: fGLSViewer.dfm:1211
 msgid "&Antialiasing"
 msgid "&Antialiasing"
-msgstr ""
+msgstr "&Антиалиасинг"
 
 
 #. FormViewer..ActionManager..............Caption
 #. FormViewer..ActionManager..............Caption
 #: fcGLSViewer.dfm:949
 #: fcGLSViewer.dfm:949
@@ -1440,52 +1438,52 @@ msgid "About"
 msgstr "&О программе"
 msgstr "&О программе"
 
 
 #. GLAbout..PanelTop..LabelVersion..Caption
 #. GLAbout..PanelTop..LabelVersion..Caption
-#: fGLAbout.dfm:137
+#: fGLAbout.dfm:140
 msgid "version"
 msgid "version"
 msgstr "версия"
 msgstr "версия"
 
 
 #. GLAbout..PanelTop..LabelGeoblock..Caption
 #. GLAbout..PanelTop..LabelGeoblock..Caption
-#: fGLAbout.dfm:151
+#: fGLAbout.dfm:154
 msgid "GLScene Viewer"
 msgid "GLScene Viewer"
 msgstr ""
 msgstr ""
 
 
 #. GLAbout..PanelTop..LabelGeoblock..Font.Name
 #. GLAbout..PanelTop..LabelGeoblock..Font.Name
-#: fGLAbout.dfm:155
+#: fGLAbout.dfm:158
 msgid "Times New Roman"
 msgid "Times New Roman"
 msgstr ""
 msgstr ""
 
 
 #. GLAbout..PanelMiddle..LabelCopyright..Caption
 #. GLAbout..PanelMiddle..LabelCopyright..Caption
-#: fGLAbout.dfm:183
+#: fGLAbout.dfm:184
 msgid "Copyright"
 msgid "Copyright"
 msgstr ""
 msgstr ""
 
 
 #. GLAbout..PanelMiddle..imgOpenGL..Hint
 #. GLAbout..PanelMiddle..imgOpenGL..Hint
-#: fGLAbout.dfm:197
+#: fGLAbout.dfm:198
 msgid "www.opengl.org"
 msgid "www.opengl.org"
 msgstr ""
 msgstr ""
 
 
 #. GLAbout..PanelMiddle..imgSourceForge..Hint
 #. GLAbout..PanelMiddle..imgSourceForge..Hint
-#: fGLAbout.dfm:382
+#: fGLAbout.dfm:383
 msgid "www.sourceforge.net/projects/glscene"
 msgid "www.sourceforge.net/projects/glscene"
 msgstr ""
 msgstr ""
 
 
 #. GLAbout..PanelMiddle..imgGLScene..Hint
 #. GLAbout..PanelMiddle..imgGLScene..Hint
-#: fGLAbout.dfm:547
+#: fGLAbout.dfm:548
 msgid "www.glscene.org"
 msgid "www.glscene.org"
 msgstr ""
 msgstr ""
 
 
 #. GLAbout..PanelMiddle..Label1..Caption
 #. GLAbout..PanelMiddle..Label1..Caption
-#: fGLAbout.dfm:2390
+#: fGLAbout.dfm:2391
 msgid "GLScene Team"
 msgid "GLScene Team"
 msgstr ""
 msgstr ""
 
 
 #. GLAbout..PanelMiddle..Label3..Caption
 #. GLAbout..PanelMiddle..Label3..Caption
-#: fGLAbout.dfm:2397
+#: fGLAbout.dfm:2398
 msgid "3D view, 3D file formats support:"
 msgid "3D view, 3D file formats support:"
 msgstr ""
 msgstr ""
 
 
 #. GLAbout..PanelMiddle..FreeAndOpenSource..Caption
 #. GLAbout..PanelMiddle..FreeAndOpenSource..Caption
-#: fGLAbout.dfm:2404
+#: fGLAbout.dfm:2405
 msgid "Open source software"
 msgid "Open source software"
 msgstr ""
 msgstr ""
 
 
@@ -1509,36 +1507,36 @@ msgstr "Отмена"
 msgid "Options"
 msgid "Options"
 msgstr "Опции"
 msgstr "Опции"
 
 
-#. FormOptions..PanelMiddle..Label1..Caption
-#: fGLOptions.dfm:30
-msgid "Background"
-msgstr "Фон"
-
-#. FormOptions..PanelMiddle..CheckBoxAxis..Caption
-#: fGLOptions.dfm:45
-msgid "Show Axes"
-msgstr "Показать оси"
-
-#. FormOptions..PanelMiddle..rgLanguage..Caption
-#: fGLOptions.dfm:67
+#. FormOptions..rgLanguage..Caption
+#: fGLOptions.dfm:24
 msgid "Language"
 msgid "Language"
 msgstr "Язык"
 msgstr "Язык"
 
 
-#. FormOptions..PanelMiddle..rgLanguage....Items.Strings
-#: fGLOptions.dfm:76
+#. FormOptions..rgLanguage....Items.Strings
+#: fGLOptions.dfm:28
 msgid "English"
 msgid "English"
 msgstr "Английский"
 msgstr "Английский"
 
 
-#. FormOptions..PanelMiddle..rgLanguage....Items.Strings
-#: fGLOptions.dfm:77
+#. FormOptions..rgLanguage....Items.Strings
+#: fGLOptions.dfm:29
 msgid "Russian"
 msgid "Russian"
 msgstr "Русский"
 msgstr "Русский"
 
 
-#. FormOptions..PanelMiddle..rgLanguage....Items.Strings
-#: fGLOptions.dfm:78
+#. FormOptions..rgLanguage....Items.Strings
+#: fGLOptions.dfm:30
 msgid "Spanish"
 msgid "Spanish"
 msgstr "Испанский"
 msgstr "Испанский"
 
 
+#. FormOptions..CheckBoxAxis..Caption
+#: fGLOptions.dfm:43
+msgid "Axis"
+msgstr ""
+
+#. FormOptions..ButtonOk..Caption
+#: fGLOptions.dfm:69
+msgid "Ok"
+msgstr ""
+
 #. FormGLSViewer..Scene..dcWorld..Tree..LeafMaterialName
 #. FormGLSViewer..Scene..dcWorld..Tree..LeafMaterialName
 #: fGLSViewer.dfm:717
 #: fGLSViewer.dfm:717
 msgid "LeafFront"
 msgid "LeafFront"
@@ -1589,7 +1587,7 @@ msgstr "Случайные сферы"
 #. FormGLSViewer..ActionManager..acClear..Caption
 #. FormGLSViewer..ActionManager..acClear..Caption
 #: fGLSViewer.dfm:1781
 #: fGLSViewer.dfm:1781
 msgid "Clear"
 msgid "Clear"
-msgstr ""
+msgstr "Очситить"
 
 
 #. FormGLSViewer..ActionManager..acLandscape..Caption
 #. FormGLSViewer..ActionManager..acLandscape..Caption
 #: fGLSViewer.dfm:1785
 #: fGLSViewer.dfm:1785

二进制
Examples/AdvDemos/GLSViewer/Locale/ru/LC_MESSAGES/glsviewer.mo


+ 33 - 35
Examples/AdvDemos/GLSViewer/Locale/ru/LC_MESSAGES/glsviewer.po

@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 msgstr ""
 "Project-Id-Version: \n"
 "Project-Id-Version: \n"
 "POT-Creation-Date: 2023-01-02 19:19+0300\n"
 "POT-Creation-Date: 2023-01-02 19:19+0300\n"
-"PO-Revision-Date: 2024-06-20 13:50+0300\n"
+"PO-Revision-Date: 2024-06-20 22:36+0300\n"
 "Last-Translator: \n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language-Team: \n"
 "Language: ru\n"
 "Language: ru\n"
@@ -138,12 +138,10 @@ msgstr ""
 #. GLAbout..PanelTop..LabelVersion..Font.Name
 #. GLAbout..PanelTop..LabelVersion..Font.Name
 #. GLAbout..PanelMiddle..LabelCopyright..Font.Name
 #. GLAbout..PanelMiddle..LabelCopyright..Font.Name
 #. GLAbout..PanelMiddle..FreeAndOpenSource..Font.Name
 #. GLAbout..PanelMiddle..FreeAndOpenSource..Font.Name
-#. FormOptions..PanelMiddle..rgLanguage..Font.Name
 #. FormGLSViewer..Font.Name
 #. FormGLSViewer..Font.Name
 #. FormGLSViewer..amMenuBar..Font.Name
 #. FormGLSViewer..amMenuBar..Font.Name
-#: fcGLSViewer.dfm:178 fGLAbout.dfm:141 fGLAbout.dfm:187
-#: fGLAbout.dfm:2408 fGLOptions.dfm:72 fGLSViewer.dfm:15
-#: fGLSViewer.dfm:295
+#: fcGLSViewer.dfm:178 fGLAbout.dfm:144 fGLAbout.dfm:188
+#: fGLAbout.dfm:2409 fGLSViewer.dfm:15 fGLSViewer.dfm:295
 msgid "MS Sans Serif"
 msgid "MS Sans Serif"
 msgstr ""
 msgstr ""
 
 
@@ -545,7 +543,7 @@ msgstr ""
 #. FormGLSViewer..ActionManager..............Caption
 #. FormGLSViewer..ActionManager..............Caption
 #: fcGLSViewer.dfm:945 fGLSViewer.dfm:1211
 #: fcGLSViewer.dfm:945 fGLSViewer.dfm:1211
 msgid "&Antialiasing"
 msgid "&Antialiasing"
-msgstr ""
+msgstr "&Антиалиасинг"
 
 
 #. FormViewer..ActionManager..............Caption
 #. FormViewer..ActionManager..............Caption
 #. FormGLSViewer..ActionManager..............Caption
 #. FormGLSViewer..ActionManager..............Caption
@@ -1147,52 +1145,52 @@ msgid "About"
 msgstr "&О программе"
 msgstr "&О программе"
 
 
 #. GLAbout..PanelTop..LabelVersion..Caption
 #. GLAbout..PanelTop..LabelVersion..Caption
-#: fGLAbout.dfm:137
+#: fGLAbout.dfm:140
 msgid "version"
 msgid "version"
 msgstr "версия"
 msgstr "версия"
 
 
 #. GLAbout..PanelTop..LabelGeoblock..Caption
 #. GLAbout..PanelTop..LabelGeoblock..Caption
-#: fGLAbout.dfm:151
+#: fGLAbout.dfm:154
 msgid "GLScene Viewer"
 msgid "GLScene Viewer"
 msgstr ""
 msgstr ""
 
 
 #. GLAbout..PanelTop..LabelGeoblock..Font.Name
 #. GLAbout..PanelTop..LabelGeoblock..Font.Name
-#: fGLAbout.dfm:155
+#: fGLAbout.dfm:158
 msgid "Times New Roman"
 msgid "Times New Roman"
 msgstr ""
 msgstr ""
 
 
 #. GLAbout..PanelMiddle..LabelCopyright..Caption
 #. GLAbout..PanelMiddle..LabelCopyright..Caption
-#: fGLAbout.dfm:183
+#: fGLAbout.dfm:184
 msgid "Copyright"
 msgid "Copyright"
 msgstr ""
 msgstr ""
 
 
 #. GLAbout..PanelMiddle..imgOpenGL..Hint
 #. GLAbout..PanelMiddle..imgOpenGL..Hint
-#: fGLAbout.dfm:197
+#: fGLAbout.dfm:198
 msgid "www.opengl.org"
 msgid "www.opengl.org"
 msgstr ""
 msgstr ""
 
 
 #. GLAbout..PanelMiddle..imgSourceForge..Hint
 #. GLAbout..PanelMiddle..imgSourceForge..Hint
-#: fGLAbout.dfm:382
+#: fGLAbout.dfm:383
 msgid "www.sourceforge.net/projects/glscene"
 msgid "www.sourceforge.net/projects/glscene"
 msgstr ""
 msgstr ""
 
 
 #. GLAbout..PanelMiddle..imgGLScene..Hint
 #. GLAbout..PanelMiddle..imgGLScene..Hint
-#: fGLAbout.dfm:547
+#: fGLAbout.dfm:548
 msgid "www.glscene.org"
 msgid "www.glscene.org"
 msgstr ""
 msgstr ""
 
 
 #. GLAbout..PanelMiddle..Label1..Caption
 #. GLAbout..PanelMiddle..Label1..Caption
-#: fGLAbout.dfm:2390
+#: fGLAbout.dfm:2391
 msgid "GLScene Team"
 msgid "GLScene Team"
 msgstr ""
 msgstr ""
 
 
 #. GLAbout..PanelMiddle..Label3..Caption
 #. GLAbout..PanelMiddle..Label3..Caption
-#: fGLAbout.dfm:2397
+#: fGLAbout.dfm:2398
 msgid "3D view, 3D file formats support:"
 msgid "3D view, 3D file formats support:"
 msgstr ""
 msgstr ""
 
 
 #. GLAbout..PanelMiddle..FreeAndOpenSource..Caption
 #. GLAbout..PanelMiddle..FreeAndOpenSource..Caption
-#: fGLAbout.dfm:2404
+#: fGLAbout.dfm:2405
 msgid "Open source software"
 msgid "Open source software"
 msgstr ""
 msgstr ""
 
 
@@ -1216,36 +1214,36 @@ msgstr "Отмена"
 msgid "Options"
 msgid "Options"
 msgstr "Опции"
 msgstr "Опции"
 
 
-#. FormOptions..PanelMiddle..Label1..Caption
-#: fGLOptions.dfm:30
-msgid "Background"
-msgstr "Фон"
-
-#. FormOptions..PanelMiddle..CheckBoxAxis..Caption
-#: fGLOptions.dfm:45
-msgid "Show Axes"
-msgstr "Показать оси"
-
-#. FormOptions..PanelMiddle..rgLanguage..Caption
-#: fGLOptions.dfm:67
+#. FormOptions..rgLanguage..Caption
+#: fGLOptions.dfm:24
 msgid "Language"
 msgid "Language"
 msgstr "Язык"
 msgstr "Язык"
 
 
-#. FormOptions..PanelMiddle..rgLanguage....Items.Strings
-#: fGLOptions.dfm:76
+#. FormOptions..rgLanguage....Items.Strings
+#: fGLOptions.dfm:28
 msgid "English"
 msgid "English"
 msgstr "Английский"
 msgstr "Английский"
 
 
-#. FormOptions..PanelMiddle..rgLanguage....Items.Strings
-#: fGLOptions.dfm:77
+#. FormOptions..rgLanguage....Items.Strings
+#: fGLOptions.dfm:29
 msgid "Russian"
 msgid "Russian"
 msgstr "Русский"
 msgstr "Русский"
 
 
-#. FormOptions..PanelMiddle..rgLanguage....Items.Strings
-#: fGLOptions.dfm:78
+#. FormOptions..rgLanguage....Items.Strings
+#: fGLOptions.dfm:30
 msgid "Spanish"
 msgid "Spanish"
 msgstr "Испанский"
 msgstr "Испанский"
 
 
+#. FormOptions..CheckBoxAxis..Caption
+#: fGLOptions.dfm:43
+msgid "Axis"
+msgstr ""
+
+#. FormOptions..ButtonOk..Caption
+#: fGLOptions.dfm:69
+msgid "Ok"
+msgstr ""
+
 #. FormGLSViewer..Scene..dcWorld..Tree..LeafMaterialName
 #. FormGLSViewer..Scene..dcWorld..Tree..LeafMaterialName
 #: fGLSViewer.dfm:717
 #: fGLSViewer.dfm:717
 msgid "LeafFront"
 msgid "LeafFront"
@@ -1295,7 +1293,7 @@ msgstr "Случайные сферы"
 #. FormGLSViewer..ActionManager..acClear..Caption
 #. FormGLSViewer..ActionManager..acClear..Caption
 #: fGLSViewer.dfm:1781
 #: fGLSViewer.dfm:1781
 msgid "Clear"
 msgid "Clear"
-msgstr ""
+msgstr "Очситить"
 
 
 #. FormGLSViewer..ActionManager..acLandscape..Caption
 #. FormGLSViewer..ActionManager..acLandscape..Caption
 #: fGLSViewer.dfm:1785
 #: fGLSViewer.dfm:1785

+ 1 - 1
Examples/AdvDemos/GLSViewer/Source/dImages.dfm

@@ -1,4 +1,4 @@
-object DataModuleImages: TDataModuleImages
+object dmImages: TdmImages
   Height = 623
   Height = 623
   Width = 955
   Width = 955
   PixelsPerInch = 168
   PixelsPerInch = 168

+ 2 - 2
Examples/AdvDemos/GLSViewer/Source/dImages.pas

@@ -20,7 +20,7 @@ uses
   GLS.Material, Vcl.Controls;
   GLS.Material, Vcl.Controls;
 
 
 type
 type
-  TDataModuleImages = class(TDataModule)
+  TdmImages = class(TDataModule)
     VirtualImageList: TVirtualImageList;
     VirtualImageList: TVirtualImageList;
     ImageCollection: TImageCollection;
     ImageCollection: TImageCollection;
     LightmapLib: TGLMaterialLibrary;
     LightmapLib: TGLMaterialLibrary;
@@ -32,7 +32,7 @@ type
   end;
   end;
 
 
 var
 var
-  DataModuleImages: TDataModuleImages;
+  dmImages: TdmImages;
 
 
 implementation
 implementation
 
 

+ 21 - 31
Examples/AdvDemos/GLSViewer/Source/fGLAbout.dfm

@@ -122,14 +122,17 @@ inherited GLAbout: TGLAbout
   ExplicitWidth = 522
   ExplicitWidth = 522
   ExplicitHeight = 422
   ExplicitHeight = 422
   TextHeight = 24
   TextHeight = 24
-  inherited PanelTop: TPanel
+  object PanelTop: TPanel
+    Left = 0
+    Top = 0
     Width = 506
     Width = 506
     Height = 89
     Height = 89
-    StyleElements = [seFont, seClient, seBorder]
-    ExplicitWidth = 498
-    ExplicitHeight = 89
+    TabOrder = 0
+    DesignSize = (
+      506
+      89)
     object LabelVersion: TLabel
     object LabelVersion: TLabel
-      Left = 94
+      Left = 86
       Top = 63
       Top = 63
       Width = 50
       Width = 50
       Height = 20
       Height = 20
@@ -166,15 +169,13 @@ inherited GLAbout: TGLAbout
       TabOrder = 0
       TabOrder = 0
     end
     end
   end
   end
-  inherited PanelMiddle: TPanel
+  object PanelMiddle: TPanel
+    Left = 0
     Top = 89
     Top = 89
     Width = 506
     Width = 506
     Height = 249
     Height = 249
-    StyleElements = [seFont, seClient, seBorder]
-    ExplicitTop = 89
-    ExplicitWidth = 498
-    ExplicitHeight = 224
-    object LabelCopyright: TLabel [0]
+    TabOrder = 1
+    object LabelCopyright: TLabel
       Left = 102
       Left = 102
       Top = 159
       Top = 159
       Width = 57
       Width = 57
@@ -188,7 +189,7 @@ inherited GLAbout: TGLAbout
       Font.Style = []
       Font.Style = []
       ParentFont = False
       ParentFont = False
     end
     end
-    object imgOpenGL: TImage [1]
+    object imgOpenGL: TImage
       Left = 40
       Left = 40
       Top = 83
       Top = 83
       Width = 100
       Width = 100
@@ -373,7 +374,7 @@ inherited GLAbout: TGLAbout
       ShowHint = True
       ShowHint = True
       OnDblClick = imgOpenGLDblClick
       OnDblClick = imgOpenGLDblClick
     end
     end
-    object imgSourceForge: TImage [2]
+    object imgSourceForge: TImage
       Left = 159
       Left = 159
       Top = 61
       Top = 61
       Width = 136
       Width = 136
@@ -538,7 +539,7 @@ inherited GLAbout: TGLAbout
       Transparent = True
       Transparent = True
       OnDblClick = imgSourceForgeDblClick
       OnDblClick = imgSourceForgeDblClick
     end
     end
-    object imgGLScene: TImage [3]
+    object imgGLScene: TImage
       Left = 308
       Left = 308
       Top = 83
       Top = 83
       Width = 100
       Width = 100
@@ -2382,21 +2383,21 @@ inherited GLAbout: TGLAbout
       Stretch = True
       Stretch = True
       OnDblClick = imgGLSceneDblClick
       OnDblClick = imgGLSceneDblClick
     end
     end
-    object Label1: TLabel [4]
+    object Label1: TLabel
       Left = 288
       Left = 288
       Top = 159
       Top = 159
       Width = 133
       Width = 133
       Height = 24
       Height = 24
       Caption = 'GLScene Team'
       Caption = 'GLScene Team'
     end
     end
-    object Label3: TLabel [5]
+    object Label3: TLabel
       Left = 123
       Left = 123
       Top = 28
       Top = 28
       Width = 265
       Width = 265
       Height = 24
       Height = 24
       Caption = '3D view, 3D file formats support:'
       Caption = '3D view, 3D file formats support:'
     end
     end
-    object FreeAndOpenSource: TLabel [6]
+    object FreeAndOpenSource: TLabel
       Left = 123
       Left = 123
       Top = 6
       Top = 6
       Width = 130
       Width = 130
@@ -2409,15 +2410,6 @@ inherited GLAbout: TGLAbout
       Font.Style = []
       Font.Style = []
       ParentFont = False
       ParentFont = False
     end
     end
-    inherited Memo: TMemo
-      Width = 504
-      Height = 247
-      TabOrder = 1
-      Visible = False
-      StyleElements = [seFont, seClient, seBorder]
-      ExplicitWidth = 496
-      ExplicitHeight = 222
-    end
     object PanelYears: TPanel
     object PanelYears: TPanel
       Left = 187
       Left = 187
       Top = 200
       Top = 200
@@ -2428,13 +2420,11 @@ inherited GLAbout: TGLAbout
       TabOrder = 0
       TabOrder = 0
     end
     end
   end
   end
-  inherited PanelBottom: TPanel
+  object PanelBottom: TPanel
+    Left = 0
     Top = 338
     Top = 338
     Width = 506
     Width = 506
     Height = 45
     Height = 45
-    StyleElements = [seFont, seClient, seBorder]
-    ExplicitTop = 313
-    ExplicitWidth = 498
-    ExplicitHeight = 45
+    TabOrder = 2
   end
   end
 end
 end

+ 2 - 2
Examples/AdvDemos/GLSViewer/Source/fGLAbout.pas

@@ -17,10 +17,10 @@ uses
   Vcl.ExtCtrls,
   Vcl.ExtCtrls,
   Vcl.Imaging.jpeg,
   Vcl.Imaging.jpeg,
   //
   //
-  fGLDialog;
+  fGLForm;
 
 
 type
 type
-  TGLAbout = class(TGLDialog)
+  TGLAbout = class(TGLForm)
     LabelCopyright: TLabel;
     LabelCopyright: TLabel;
     PanelYears: TPanel;
     PanelYears: TPanel;
     imgOpenGL: TImage;
     imgOpenGL: TImage;

+ 7 - 24
Examples/AdvDemos/GLSViewer/Source/fGLForm.pas

@@ -63,37 +63,25 @@ begin
     AddDomainForResourceString('language');
     AddDomainForResourceString('language');
     BindTextDomain ('language', LocalePath);
     BindTextDomain ('language', LocalePath);
 
 
-    //TP_GlobalIgnoreClass(TTable);
-    //TP_GlobalIgnoreClass(TFields);
-    //TP_GlobalIgnoreClass(TFont);
     //TP_GlobalIgnoreClass(TListBox);
     //TP_GlobalIgnoreClass(TListBox);
     //TP_GlobalIgnoreClass(TStaticText);
     //TP_GlobalIgnoreClass(TStaticText);
     //TP_GlobalIgnoreClass(TGLLibMaterial);
     //TP_GlobalIgnoreClass(TGLLibMaterial);
     //TP_GlobalIgnoreClass(TGLMaterialLibrary);
     //TP_GlobalIgnoreClass(TGLMaterialLibrary);
-    TP_IgnoreClass(TFont);
-    TP_GlobalIgnoreClassProperty(TAction, 'Category');
+    // TP_IgnoreClass(TFont);
+    // TP_GlobalIgnoreClassProperty(TAction, 'Category');
     // Removing the upper line will cause long loading but Action.Category translation
     // Removing the upper line will cause long loading but Action.Category translation
 
 
     case LangID of
     case LangID of
       LANG_RUSSIAN:
       LANG_RUSSIAN:
       begin
       begin
         UseLanguage('ru');
         UseLanguage('ru');
-        Application.HelpFile := UpperCase(LocalePath + 'ru'+ PathDelim+'GLSViewer.chm');
-      end;
-      LANG_SPANISH:
-      begin
-        UseLanguage('es');
-        Application.HelpFile := UpperCase(LocalePath + 'es'+ PathDelim+'GLSViewer.chm');
-      end;
-      LANG_PORTUGUESE:
-      begin
-        UseLanguage('it');
-        Application.HelpFile := UpperCase(LocalePath + 'it'+ PathDelim+'GLSViewer.chm');
+        // Help based on demos.htm
+        Application.HelpFile := UpperCase(LocalePath + 'ru'+ PathDelim+'Demos.chm');
       end
       end
       else
       else
       begin
       begin
         UseLanguage('en');
         UseLanguage('en');
-        Application.HelpFile := UpperCase(LocalePath + 'en'+ PathDelim+'GLSViewer.chm');
+        Application.HelpFile := UpperCase(LocalePath + 'en'+ PathDelim+'Demos.chm');
       end;
       end;
     end;
     end;
   end
   end
@@ -103,20 +91,15 @@ begin
     Application.HelpFile := UpperCase(LocalePath + 'en'+ PathDelim+'GLSViewer.chm');
     Application.HelpFile := UpperCase(LocalePath + 'en'+ PathDelim+'GLSViewer.chm');
   end;
   end;
   TranslateComponent(Self);
   TranslateComponent(Self);
-  //TP_GlobalIgnoreClass(TGLLibMaterial);
-  //TP_GlobalIgnoreClass(TGLMaterialLibrary);
-  //TP_GlobalIgnoreClass(TListBox);
-  //TP_GlobalIgnoreClassProperty(TAction, 'Category');
 end;
 end;
 
 
-
-
 procedure TGLForm.ReadIniFile;
 procedure TGLForm.ReadIniFile;
 begin
 begin
   IniFile := TIniFile.Create(ChangeFileExt(ParamStr(0), '.ini'));
   IniFile := TIniFile.Create(ChangeFileExt(ParamStr(0), '.ini'));
   with IniFile do
   with IniFile do
     try
     try
-      LangID := ReadInteger('FormOptions', 'RadioGroupLanguage', 0);
+      // use correct argument names
+      LangID := ReadInteger('FormOptions', 'rgLanguage', 0);
     finally
     finally
       IniFile.Free;
       IniFile.Free;
     end;
     end;

+ 58 - 91
Examples/AdvDemos/GLSViewer/Source/fGLOptions.dfm

@@ -2,105 +2,72 @@ inherited FormOptions: TFormOptions
   HelpContext = 0
   HelpContext = 0
   Caption = 'Options'
   Caption = 'Options'
   ClientHeight = 313
   ClientHeight = 313
-  ClientWidth = 521
+  ClientWidth = 460
   Font.Height = -21
   Font.Height = -21
   StyleElements = [seFont, seClient, seBorder]
   StyleElements = [seFont, seClient, seBorder]
+  OnClick = rgLanguageClick
   OnClose = FormClose
   OnClose = FormClose
   ExplicitLeft = 4
   ExplicitLeft = 4
   ExplicitTop = 4
   ExplicitTop = 4
-  ExplicitWidth = 537
+  ExplicitWidth = 476
   ExplicitHeight = 352
   ExplicitHeight = 352
   TextHeight = 25
   TextHeight = 25
-  inherited PanelTop: TPanel
-    Width = 521
-    StyleElements = [seFont, seClient, seBorder]
-    ExplicitWidth = 513
+  object rgLanguage: TRadioGroup
+    Left = 56
+    Top = 98
+    Width = 351
+    Height = 155
+    Margins.Left = 5
+    Margins.Top = 5
+    Margins.Right = 5
+    Margins.Bottom = 5
+    Caption = 'Language'
+    Columns = 2
+    ItemIndex = 0
+    Items.Strings = (
+      'English'
+      'Russian')
+    TabOrder = 0
+    OnClick = rgLanguageClick
   end
   end
-  inherited PanelMiddle: TPanel
-    Width = 521
-    Height = 237
-    StyleElements = [seFont, seClient, seBorder]
-    ExplicitWidth = 513
-    ExplicitHeight = 212
-    object Label1: TLabel [0]
-      Left = 296
-      Top = 33
-      Width = 105
-      Height = 25
-      Caption = 'Background'
-    end
-    inherited Memo: TMemo
-      Width = 519
-      Height = 235
-      TabOrder = 2
-      StyleElements = [seFont, seClient, seBorder]
-      ExplicitWidth = 511
-      ExplicitHeight = 210
-    end
-    object CheckBoxAxis: TCheckBox
-      Left = 96
-      Top = 32
-      Width = 113
-      Height = 17
-      Caption = 'Show Axes'
-      TabOrder = 0
-      OnClick = CheckBoxAxisClick
-    end
-    object PanelBackground: TPanel
-      Left = 375
-      Top = 27
-      Width = 25
-      Height = 25
-      Hint = 'Click to change background colour'
-      BevelInner = bvLowered
-      BevelOuter = bvLowered
-      Color = clWhite
-      ParentBackground = False
-      TabOrder = 1
-      OnClick = PanelBackgroundClick
-    end
-    object rgLanguage: TRadioGroup
-      Left = 28
-      Top = 84
-      Width = 463
-      Height = 127
-      Caption = 'Language'
-      Columns = 3
-      Font.Charset = DEFAULT_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -21
-      Font.Name = 'MS Sans Serif'
-      Font.Style = []
-      ItemIndex = 0
-      Items.Strings = (
-        'English'
-        'Russian'
-        'Spanish')
-      ParentFont = False
-      TabOrder = 3
-      OnClick = rgLanguageClick
-    end
+  object CheckBoxAxis: TCheckBox
+    Left = 56
+    Top = 28
+    Width = 183
+    Height = 29
+    Margins.Left = 5
+    Margins.Top = 5
+    Margins.Right = 5
+    Margins.Bottom = 5
+    Caption = 'Axis'
+    TabOrder = 1
+    OnClick = CheckBoxAxisClick
   end
   end
-  inherited PanelBottom: TPanel
-    Top = 272
-    Width = 521
-    StyleElements = [seFont, seClient, seBorder]
-    ExplicitTop = 247
-    ExplicitWidth = 513
-    inherited ButtonOK: TButton
-      OnClick = ButtonOKClick
-    end
-    inherited ButtonCancel: TButton
-      Left = 252
-      Width = 99
-      ExplicitLeft = 252
-      ExplicitWidth = 99
-    end
-    inherited ButtonHelp: TButton
-      Left = 393
-      Top = 5
-      ExplicitLeft = 393
-      ExplicitTop = 5
-    end
+  object PanelBackground: TPanel
+    Left = 294
+    Top = 22
+    Width = 57
+    Height = 40
+    Margins.Left = 5
+    Margins.Top = 5
+    Margins.Right = 5
+    Margins.Bottom = 5
+    Color = clBlack
+    ParentBackground = False
+    TabOrder = 2
+    OnClick = PanelBackgroundClick
+  end
+  object ButtonOk: TButton
+    Left = 318
+    Top = 278
+    Width = 75
+    Height = 25
+    Margins.Left = 5
+    Margins.Top = 5
+    Margins.Right = 5
+    Margins.Bottom = 5
+    Caption = 'Ok'
+    TabOrder = 3
+    OnClick = ButtonOKClick
   end
   end
 end
 end

+ 5 - 7
Examples/AdvDemos/GLSViewer/Source/fGLOptions.pas

@@ -20,15 +20,14 @@ uses
   //
   //
   dImages,
   dImages,
   dDialogs,
   dDialogs,
-  fGLForm, 
-  fGLDialog;
+  fGLForm;
 
 
 type
 type
-  TFormOptions = class(TGLDialog)
+  TFormOptions = class(TGLForm)
+    rgLanguage: TRadioGroup;
     CheckBoxAxis: TCheckBox;
     CheckBoxAxis: TCheckBox;
-    Label1: TLabel;
     PanelBackground: TPanel;
     PanelBackground: TPanel;
-    rgLanguage: TRadioGroup;
+    ButtonOk: TButton;
     procedure FormCreate(Sender: TObject);
     procedure FormCreate(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure rgLanguageClick(Sender: TObject);
     procedure rgLanguageClick(Sender: TObject);
@@ -59,6 +58,7 @@ procedure TFormOptions.FormCreate(Sender: TObject);
 begin
 begin
   inherited;
   inherited;
   ReadIniFile;
   ReadIniFile;
+  SetLanguage;
 end;
 end;
 
 
 procedure TFormOptions.FormClose(Sender: TObject; var Action: TCloseAction);
 procedure TFormOptions.FormClose(Sender: TObject; var Action: TCloseAction);
@@ -79,7 +79,6 @@ begin
       case LangID of
       case LangID of
         LANG_ENGLISH : rgLanguage.ItemIndex := 0;
         LANG_ENGLISH : rgLanguage.ItemIndex := 0;
         LANG_RUSSIAN : rgLanguage.ItemIndex := 1;
         LANG_RUSSIAN : rgLanguage.ItemIndex := 1;
-        LANG_SPANISH : rgLanguage.ItemIndex := 2;
         else
         else
           rgLanguage.ItemIndex := 0;
           rgLanguage.ItemIndex := 0;
       end;
       end;
@@ -93,7 +92,6 @@ begin
   case rgLanguage.ItemIndex of
   case rgLanguage.ItemIndex of
     0: CurLangID := LANG_ENGLISH;
     0: CurLangID := LANG_ENGLISH;
     1: CurLangID := LANG_RUSSIAN;
     1: CurLangID := LANG_RUSSIAN;
-    2: CurLangID := LANG_SPANISH;
     else
     else
       CurLangID := LANG_ENGLISH;
       CurLangID := LANG_ENGLISH;
   end;
   end;

+ 1 - 1
Examples/AdvDemos/GLSViewer/Source/fGLSViewer.dfm

@@ -317,7 +317,7 @@ object FormGLSViewer: TFormGLSViewer
       Margins.Right = 5
       Margins.Right = 5
       Margins.Bottom = 5
       Margins.Bottom = 5
       Align = alClient
       Align = alClient
-      Images = DataModuleImages.ImageListObjects
+      Images = dmImages.ImageListObjects
       Indent = 33
       Indent = 33
       ParentShowHint = False
       ParentShowHint = False
       ShowHint = True
       ShowHint = True

+ 2 - 2
Examples/AdvDemos/GLSViewer/Source/fGLSViewer.pas

@@ -70,9 +70,9 @@ uses
   GLS.Tree,
   GLS.Tree,
 
 
   fGLForm,
   fGLForm,
+  fGLDialog,
   fGLAbout,
   fGLAbout,
   fGLOptions,
   fGLOptions,
-  fGLDialog,
   dImages,
   dImages,
   dDialogs,
   dDialogs,
 
 
@@ -356,7 +356,6 @@ end;
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
 procedure TFormGLSViewer.FormCreate(Sender: TObject);
 procedure TFormGLSViewer.FormCreate(Sender: TObject);
 begin
 begin
-  inherited;
   AssetPath := GetCurrentAssetPath();
   AssetPath := GetCurrentAssetPath();
   TextureDir := AssetPath + '\texture';
   TextureDir := AssetPath + '\texture';
   SetCurrentDir(TextureDir);
   SetCurrentDir(TextureDir);
@@ -372,6 +371,7 @@ begin
   tvScene.FullExpand;
   tvScene.FullExpand;
   tvScene.Select(tvScene.Items[9]);  // goto to Cube
   tvScene.Select(tvScene.Items[9]);  // goto to Cube
   tvSceneClick(Self);
   tvSceneClick(Self);
+  inherited;
 end;
 end;
 
 
 procedure TFormGLSViewer.FormShow(Sender: TObject);
 procedure TFormGLSViewer.FormShow(Sender: TObject);

+ 2 - 6
Examples/AdvDemos/GLSViewer/Source/uSettings.pas

@@ -43,20 +43,16 @@ begin
         WriteString(GeneralSection, 'ExePath', ExePath);  //Don't translate the strings
         WriteString(GeneralSection, 'ExePath', ExePath);  //Don't translate the strings
         WriteInteger(GeneralSection, 'FileVersion', FileVersion);
         WriteInteger(GeneralSection, 'FileVersion', FileVersion);
         WriteString(GeneralSection, 'License', 'MPL');
         WriteString(GeneralSection, 'License', 'MPL');
-        WriteInteger(GeneralSection, 'Language', LANG_ENGLISH); //9, Default installation
-        Language := LANG_ENGLISH;
       end
       end
       else
       else
       begin
       begin
         ExePath  := ReadString(GeneralSection, 'ExePath', ExePath);
         ExePath  := ReadString(GeneralSection, 'ExePath', ExePath);
-        Language := ReadInteger(GeneralSection, 'Language', LANG_ENGLISH);
-        //9, LANG_ENGLISH - Default
       end;
       end;
     end;
     end;
   finally
   finally
     RegIni.Free;
     RegIni.Free;
   end;
   end;
-{
+(*
   if RegIni.ValueExists(GeneralSection,'SplashStart') then
   if RegIni.ValueExists(GeneralSection,'SplashStart') then
     SplashStart := RegIni.ReadBool(GeneralSection,'SplashStart',False)
     SplashStart := RegIni.ReadBool(GeneralSection,'SplashStart',False)
   else
   else
@@ -66,7 +62,7 @@ begin
     TipOfTheDay := RegIni.ReadBool(GeneralSection,'TipOfTheDay', True)
     TipOfTheDay := RegIni.ReadBool(GeneralSection,'TipOfTheDay', True)
   else
   else
     TipOfTheDay := False;
     TipOfTheDay := False;
-}
+*)
 end;
 end;
 
 
 initialization
 initialization