From f271e7b72775d6ae5a92a636d38f22e5bc939fa6 Mon Sep 17 00:00:00 2001 From: binarymaster Date: Fri, 29 Sep 2017 19:28:56 +0300 Subject: [PATCH] Forms: Fix tab order --- src/editor/f_activationtype.lfm | 8 ++++---- src/editor/f_addresource.lfm | 10 +++++----- src/editor/f_addresource_sky.lfm | 4 +++- src/editor/f_addresource_sound.lfm | 10 ++++++++-- src/editor/f_addresource_texture.lfm | 7 +++++-- src/editor/f_keys.lfm | 6 +++--- src/editor/f_mapoptions.lfm | 8 ++++---- src/editor/f_maptest.lfm | 16 +++++++-------- src/editor/f_options.lfm | 30 ++++++++++++++-------------- src/editor/f_savemap.lfm | 4 ++-- 10 files changed, 57 insertions(+), 46 deletions(-) diff --git a/src/editor/f_activationtype.lfm b/src/editor/f_activationtype.lfm index d72cd6d..56ede2f 100644 --- a/src/editor/f_activationtype.lfm +++ b/src/editor/f_activationtype.lfm @@ -46,7 +46,7 @@ object ActivationTypeForm: TActivationTypeForm Caption = 'OK' Default = True ModalResult = 1 - TabOrder = 3 + TabOrder = 6 end object cbMonsterPress: TCheckBox Left = 2 @@ -54,7 +54,7 @@ object ActivationTypeForm: TActivationTypeForm Top = 48 Width = 91 Caption = 'Монстр нажал' - TabOrder = 4 + TabOrder = 3 end object cbShot: TCheckBox Left = 2 @@ -62,7 +62,7 @@ object ActivationTypeForm: TActivationTypeForm Top = 64 Width = 62 Caption = 'Выстрел' - TabOrder = 5 + TabOrder = 4 end object cbNoMonster: TCheckBox Left = 2 @@ -70,6 +70,6 @@ object ActivationTypeForm: TActivationTypeForm Top = 80 Width = 88 Caption = 'Монстров нет' - TabOrder = 6 + TabOrder = 5 end end diff --git a/src/editor/f_addresource.lfm b/src/editor/f_addresource.lfm index 2726ba2..d1c799c 100644 --- a/src/editor/f_addresource.lfm +++ b/src/editor/f_addresource.lfm @@ -40,7 +40,7 @@ object AddResourceForm: TAddResourceForm Default = True ModalResult = 1 OnClick = bOKClick - TabOrder = 0 + TabOrder = 3 end object bCancel: TButton Left = 124 @@ -50,7 +50,7 @@ object AddResourceForm: TAddResourceForm Cancel = True Caption = 'Отмена' ModalResult = 2 - TabOrder = 1 + TabOrder = 4 end object cbWADList: TComboBox Left = 4 @@ -60,7 +60,7 @@ object AddResourceForm: TAddResourceForm ItemHeight = 13 OnChange = cbWADListChange Style = csDropDownList - TabOrder = 2 + TabOrder = 0 end object lbResourcesList: TListBox Left = 4 @@ -70,7 +70,7 @@ object AddResourceForm: TAddResourceForm ItemHeight = 0 MultiSelect = True OnClick = lbResourcesListClick - TabOrder = 3 + TabOrder = 2 end object cbSectionsList: TComboBox Left = 4 @@ -81,6 +81,6 @@ object AddResourceForm: TAddResourceForm OnChange = cbSectionsListChange Sorted = True Style = csDropDownList - TabOrder = 4 + TabOrder = 1 end end diff --git a/src/editor/f_addresource_sky.lfm b/src/editor/f_addresource_sky.lfm index d6e6dc9..0c323fc 100644 --- a/src/editor/f_addresource_sky.lfm +++ b/src/editor/f_addresource_sky.lfm @@ -8,9 +8,11 @@ inherited AddSkyForm: TAddSkyForm ClientWidth = 529 inherited bOK: TButton Top = 220 + TabOrder = 4 end inherited bCancel: TButton Top = 220 + TabOrder = 5 end inherited lbResourcesList: TListBox Height = 127 @@ -23,7 +25,7 @@ inherited AddSkyForm: TAddSkyForm BevelOuter = bvLowered ClientHeight = 242 ClientWidth = 322 - TabOrder = 5 + TabOrder = 3 object iPreview: TImage Left = 0 Height = 240 diff --git a/src/editor/f_addresource_sound.lfm b/src/editor/f_addresource_sound.lfm index 5627fd6..56073da 100644 --- a/src/editor/f_addresource_sound.lfm +++ b/src/editor/f_addresource_sound.lfm @@ -7,6 +7,12 @@ inherited AddSoundForm: TAddSoundForm OnClose = FormClose OnCreate = FormCreate OnDestroy = FormDestroy + inherited bOK: TButton + TabOrder = 6 + end + inherited bCancel: TButton + TabOrder = 7 + end object pSpectrum: TPanel[7] Left = 204 Height = 61 @@ -36,7 +42,7 @@ inherited AddSoundForm: TAddSoundForm } NumGlyphs = 2 OnClick = bbPlayClick - TabOrder = 6 + TabOrder = 3 end object bbStop: TBitBtn[9] Left = 229 @@ -59,7 +65,7 @@ inherited AddSoundForm: TAddSoundForm } NumGlyphs = 2 OnClick = bbStopClick - TabOrder = 7 + TabOrder = 4 end object bEmpty: TButton[10] Left = 216 diff --git a/src/editor/f_addresource_texture.lfm b/src/editor/f_addresource_texture.lfm index 866889a..2c4fa54 100644 --- a/src/editor/f_addresource_texture.lfm +++ b/src/editor/f_addresource_texture.lfm @@ -13,6 +13,7 @@ inherited AddTextureForm: TAddTextureForm Width = 22 Default = False OnClick = nil + TabOrder = 4 Visible = False end inherited bCancel: TButton @@ -20,11 +21,13 @@ inherited AddTextureForm: TAddTextureForm Height = 18 Top = 271 Width = 22 + TabOrder = 5 Visible = False end inherited lbResourcesList: TListBox Height = 150 Top = 112 + TabOrder = 3 end object PanelTexPreview: TPanel[7] Left = 204 @@ -34,7 +37,7 @@ inherited AddTextureForm: TAddTextureForm BevelOuter = bvLowered ClientHeight = 258 ClientWidth = 258 - TabOrder = 5 + TabOrder = 6 object iPreview: TImage Left = 0 Height = 256 @@ -48,7 +51,7 @@ inherited AddTextureForm: TAddTextureForm Top = 88 Width = 193 OnChange = eTextureNameChange - TabOrder = 6 + TabOrder = 2 end object bAddTexture: TButton[9] Left = 160 diff --git a/src/editor/f_keys.lfm b/src/editor/f_keys.lfm index 2cb59bc..3ba02fb 100644 --- a/src/editor/f_keys.lfm +++ b/src/editor/f_keys.lfm @@ -46,7 +46,7 @@ object KeysForm: TKeysForm Caption = 'OK' Default = True ModalResult = 1 - TabOrder = 3 + TabOrder = 5 end object cbRedTeam: TCheckBox Left = 2 @@ -54,7 +54,7 @@ object KeysForm: TKeysForm Top = 48 Width = 108 Caption = 'Красная команда' - TabOrder = 4 + TabOrder = 3 end object cbBlueTeam: TCheckBox Left = 2 @@ -62,6 +62,6 @@ object KeysForm: TKeysForm Top = 64 Width = 96 Caption = 'Синяя команда' - TabOrder = 5 + TabOrder = 4 end end diff --git a/src/editor/f_mapoptions.lfm b/src/editor/f_mapoptions.lfm index c4dd343..d1fa014 100644 --- a/src/editor/f_mapoptions.lfm +++ b/src/editor/f_mapoptions.lfm @@ -664,7 +664,7 @@ object MapOptionsForm: TMapOptionsForm Width = 23 Caption = '...' OnClick = bSelectBackClick - TabOrder = 5 + TabOrder = 6 end object bSelectMusic: TButton Left = 311 @@ -674,7 +674,7 @@ object MapOptionsForm: TMapOptionsForm Width = 23 Caption = '...' OnClick = bSelectMusicClick - TabOrder = 8 + TabOrder = 9 end object eAuthor: TEdit Left = 3 @@ -692,7 +692,7 @@ object MapOptionsForm: TMapOptionsForm Top = 146 Width = 23 OnClick = bRemoveBackClick - TabOrder = 6 + TabOrder = 5 end object bRemoveMusic: TButton Left = 285 @@ -701,6 +701,6 @@ object MapOptionsForm: TMapOptionsForm Top = 186 Width = 23 OnClick = bRemoveMusicClick - TabOrder = 9 + TabOrder = 8 end end diff --git a/src/editor/f_maptest.lfm b/src/editor/f_maptest.lfm index 9e84297..6e5fa1e 100644 --- a/src/editor/f_maptest.lfm +++ b/src/editor/f_maptest.lfm @@ -24,7 +24,7 @@ object MapTestForm: TMapTestForm Caption = 'OK' Default = True OnClick = bOKClick - TabOrder = 0 + TabOrder = 1 end object bCancel: TButton Left = 286 @@ -34,7 +34,7 @@ object MapTestForm: TMapTestForm Cancel = True Caption = 'Отмена' OnClick = bCancelClick - TabOrder = 1 + TabOrder = 2 end object GroupBox1: TGroupBox Left = 8 @@ -43,7 +43,7 @@ object MapTestForm: TMapTestForm Width = 353 ClientHeight = 215 ClientWidth = 349 - TabOrder = 2 + TabOrder = 0 object LabelTime: TLabel Left = 14 Height = 13 @@ -177,7 +177,7 @@ object MapTestForm: TMapTestForm Max = 1000 Min = 0 Position = 0 - TabOrder = 11 + TabOrder = 12 Wrap = False end object UpDown1: TUpDown @@ -189,7 +189,7 @@ object MapTestForm: TMapTestForm Max = 28800 Min = 0 Position = 0 - TabOrder = 12 + TabOrder = 11 Wrap = False end object edD2dexe: TEdit @@ -197,7 +197,7 @@ object MapTestForm: TMapTestForm Height = 21 Top = 186 Width = 297 - TabOrder = 13 + TabOrder = 14 Text = 'Doom2DF.exe' end object bChooseD2d: TButton @@ -212,7 +212,7 @@ object MapTestForm: TMapTestForm Font.Style = [fsBold] OnClick = bChooseD2dClick ParentFont = False - TabOrder = 14 + TabOrder = 15 end object cbMapOnce: TCheckBox Left = 14 @@ -220,7 +220,7 @@ object MapTestForm: TMapTestForm Top = 146 Width = 209 Caption = 'Закрыть игру после выхода из карты' - TabOrder = 15 + TabOrder = 13 end end object FindD2dDialog: TOpenDialog diff --git a/src/editor/f_options.lfm b/src/editor/f_options.lfm index 028286e..97ef8e2 100644 --- a/src/editor/f_options.lfm +++ b/src/editor/f_options.lfm @@ -127,7 +127,7 @@ object OptionsForm: TOptionsForm Max = 255 Min = 2 Position = 16 - TabOrder = 6 + TabOrder = 4 Wrap = False end object eDotStepOne: TEdit @@ -135,7 +135,7 @@ object OptionsForm: TOptionsForm Height = 21 Top = 74 Width = 57 - TabOrder = 1 + TabOrder = 3 Text = '16' end object bGrid: TButton @@ -145,7 +145,7 @@ object OptionsForm: TOptionsForm Width = 11 Caption = '..' OnClick = bGridClick - TabOrder = 2 + TabOrder = 10 end object bBack: TButton Left = 402 @@ -154,7 +154,7 @@ object OptionsForm: TOptionsForm Width = 11 Caption = '..' OnClick = bBackClick - TabOrder = 3 + TabOrder = 11 end object bPreview: TButton Left = 402 @@ -163,7 +163,7 @@ object OptionsForm: TOptionsForm Width = 11 Caption = '..' OnClick = bPreviewClick - TabOrder = 4 + TabOrder = 12 end object cbScale: TComboBox Left = 344 @@ -177,7 +177,7 @@ object OptionsForm: TOptionsForm '2x' ) Style = csDropDownList - TabOrder = 5 + TabOrder = 13 Text = '1x' end object cbShowTexture: TCheckBox @@ -186,7 +186,7 @@ object OptionsForm: TOptionsForm Top = 18 Width = 167 Caption = 'Показывать текстуру панели' - TabOrder = 7 + TabOrder = 1 end object cbShowSize: TCheckBox Left = 6 @@ -194,14 +194,14 @@ object OptionsForm: TOptionsForm Top = 34 Width = 169 Caption = 'Показывать размеры панели' - TabOrder = 8 + TabOrder = 2 end object eRecent: TEdit Left = 344 Height = 21 Top = 184 Width = 57 - TabOrder = 9 + TabOrder = 14 Text = '5' end object UpDown3: TUpDown @@ -213,7 +213,7 @@ object OptionsForm: TOptionsForm Max = 10 Min = 2 Position = 5 - TabOrder = 10 + TabOrder = 15 Wrap = False end object eDotStepTwo: TEdit @@ -221,7 +221,7 @@ object OptionsForm: TOptionsForm Height = 21 Top = 98 Width = 57 - TabOrder = 11 + TabOrder = 5 Text = '8' end object UpDown2: TUpDown @@ -233,7 +233,7 @@ object OptionsForm: TOptionsForm Max = 255 Min = 2 Position = 8 - TabOrder = 12 + TabOrder = 6 Wrap = False end object rbRussian: TRadioButton @@ -243,7 +243,7 @@ object OptionsForm: TOptionsForm Width = 60 Caption = 'Русский' Checked = True - TabOrder = 13 + TabOrder = 8 TabStop = True end object rbEnglish: TRadioButton @@ -252,7 +252,7 @@ object OptionsForm: TOptionsForm Top = 186 Width = 52 Caption = 'English' - TabOrder = 14 + TabOrder = 9 end object cbDotSize: TComboBox Left = 82 @@ -265,7 +265,7 @@ object OptionsForm: TOptionsForm '1' '2' ) - TabOrder = 15 + TabOrder = 7 Text = '1' end end diff --git a/src/editor/f_savemap.lfm b/src/editor/f_savemap.lfm index 035f420..9dbd41b 100644 --- a/src/editor/f_savemap.lfm +++ b/src/editor/f_savemap.lfm @@ -24,7 +24,7 @@ object SaveMapForm: TSaveMapForm ItemHeight = 0 OnClick = lbMapListClick Sorted = True - TabOrder = 0 + TabOrder = 1 end object Panel2: TPanel Left = 0 @@ -35,7 +35,7 @@ object SaveMapForm: TSaveMapForm BevelOuter = bvNone ClientHeight = 25 ClientWidth = 152 - TabOrder = 1 + TabOrder = 0 object eMapName: TEdit Left = 0 Height = 21 -- 2.29.2