Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Windows GUI: Layout improvements #949

Merged
merged 1 commit into from
Nov 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Source/GUI/VCL/GUI_About.dfm
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ object AboutF: TAboutF
Font.Height = -11
Font.Name = 'Arial'
Font.Style = []
Position = poScreenCenter
Position = poOwnerFormCenter
OnShow = FormShow
TextHeight = 14
object Translator: TLabel
Expand Down
2 changes: 1 addition & 1 deletion Source/GUI/VCL/GUI_Export.dfm
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ object ExportF: TExportF
Font.Height = -11
Font.Name = 'Arial'
Font.Style = []
Position = poScreenCenter
Position = poOwnerFormCenter
TextHeight = 14
object Cancel: TButton
Left = 373
Expand Down
4 changes: 1 addition & 3 deletions Source/GUI/VCL/GUI_Main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,7 @@ void __fastcall TMainF::GUI_Configure()
//Translation
Translate();

//Set window size and position
//Set window size
float ScaledScreenWidth=Screen->Width/ScaleFactor;
float ScaledScreenHeight=Screen->Height/ScaleFactor;
Width=500;
Expand All @@ -474,8 +474,6 @@ void __fastcall TMainF::GUI_Configure()
Height=600;
Width*=ScaleFactor;
Height*=ScaleFactor;
Left=(Screen->Width-Width)/2;
Top=(Screen->Height-Height)/2;
}

//---------------------------------------------------------------------------
Expand Down
1 change: 1 addition & 0 deletions Source/GUI/VCL/GUI_Main.dfm
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ object MainF: TMainF
Font.Name = 'Tahoma'
Font.Style = []
Menu = MainMenu
Position = poScreenCenter
OnClose = FormClose
OnDestroy = FormDestroy
OnResize = FormResize
Expand Down
2 changes: 1 addition & 1 deletion Source/GUI/VCL/GUI_Plugin.dfm
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ object PluginF: TPluginF
Font.Height = -11
Font.Name = 'Arial'
Font.Style = []
Position = poScreenCenter
Position = poOwnerFormCenter
OnShow = FormShow
TextHeight = 14
object InfoLabel: TLabel
Expand Down
2 changes: 1 addition & 1 deletion Source/GUI/VCL/GUI_Preferences.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -612,7 +612,7 @@ void __fastcall TPreferencesF::FormShow(TObject *Sender)
Page->Height=Page->Height+(Page->TabHeight*1.15); //Required with above line
Cancel->Top=Page->Top+Page->Height+(Cancel->Height*0.15);
OK->Top=Cancel->Top;
ClientHeight=OK->Top+(OK->Height*1.15);
ClientHeight=OK->Top+(OK->Height*1.2);

//Make them same size after DPI scaling
General_Language_More->Height=General_Language_Sel->Height;
Expand Down
128 changes: 64 additions & 64 deletions Source/GUI/VCL/GUI_Preferences.dfm
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,20 @@ object PreferencesF: TPreferencesF
BorderIcons = []
BorderStyle = bsDialog
Caption = 'Preferences'
ClientHeight = 194
ClientWidth = 667
ClientHeight = 200
ClientWidth = 850
Color = clBtnFace
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
Font.Height = -11
Font.Name = 'Arial'
Font.Style = []
Position = poDesigned
Position = poOwnerFormCenter
OnShow = FormShow
TextHeight = 14
object OK: TButton
Left = 540
Top = 163
Left = 720
Top = 166
Width = 122
Height = 27
Caption = 'OK'
Expand Down Expand Up @@ -53,8 +53,8 @@ object PreferencesF: TPreferencesF
084C0061006E0067007500610067006500}
end
object Cancel: TButton
Left = 415
Top = 163
Left = 593
Top = 166
Width = 121
Height = 27
Cancel = True
Expand All @@ -65,8 +65,8 @@ object PreferencesF: TPreferencesF
object Page: TPageControl
Left = 176
Top = 0
Width = 490
Height = 158
Width = 666
Height = 160
ActivePage = Setup
MultiLine = True
TabHeight = 22
Expand All @@ -75,32 +75,32 @@ object PreferencesF: TPreferencesF
Caption = 'General'
OnShow = Setup_GeneralShow
object Langue_C: TLabel
Left = 0
Top = 3
Left = 2
Top = 7
Width = 54
Height = 14
Caption = 'Language :'
end
object Output_C: TLabel
Left = 0
Top = 29
Left = 2
Top = 33
Width = 38
Height = 14
Caption = 'Output :'
end
object General_Language_Sel: TComboBox
Left = 124
Top = 0
Width = 113
Left = 164
Top = 4
Width = 182
Height = 22
Style = csDropDownList
TabOrder = 0
OnChange = General_Language_SelChange
end
object General_Output_Sel: TComboBox
Left = 124
Top = 26
Width = 113
Left = 164
Top = 30
Width = 182
Height = 22
Style = csDropDownList
DropDownCount = 10
Expand All @@ -115,9 +115,9 @@ object PreferencesF: TPreferencesF
'Custom')
end
object CB_CheckUpdate: TCheckBox
Left = 0
Top = 52
Width = 506
Left = 2
Top = 56
Width = 655
Height = 18
Caption = 'Check for newest versions (require Internet connection)'
Checked = True
Expand All @@ -126,27 +126,27 @@ object PreferencesF: TPreferencesF
OnClick = CB_CheckUpdateClick
end
object General_Language_More: TButton
Left = 239
Top = 0
Width = 57
Left = 352
Top = 4
Width = 105
Height = 23
Caption = 'More...'
TabOrder = 6
OnClick = General_Language_MoreClick
end
object General_Output_More: TButton
Left = 239
Top = 26
Width = 57
Left = 352
Top = 30
Width = 105
Height = 22
Caption = 'More...'
TabOrder = 7
OnClick = General_Output_MoreClick
end
object CB_InfoTip: TCheckBox
Left = 0
Top = 100
Width = 506
Left = 2
Top = 104
Width = 655
Height = 18
Caption =
'Shell InfoTip (in explorer, move the mouse on file, info will be' +
Expand All @@ -155,9 +155,9 @@ object PreferencesF: TPreferencesF
OnClick = CB_InfoTipClick
end
object CB_InscrireShell: TCheckBox
Left = 0
Top = 68
Width = 506
Left = 2
Top = 72
Width = 655
Height = 18
Caption =
'Shell extension (in explorer, righ click, there will be a "Media' +
Expand All @@ -168,9 +168,9 @@ object PreferencesF: TPreferencesF
OnClick = CB_InscrireShellClick
end
object CB_InscrireShell_Folder: TCheckBox
Left = 16
Top = 84
Width = 369
Left = 18
Top = 88
Width = 639
Height = 17
Caption = 'For folders too'
TabOrder = 4
Expand All @@ -182,70 +182,70 @@ object PreferencesF: TPreferencesF
ImageIndex = 1
OnShow = Setup_AdvancedShow
object Advanced_DisplayCaptions_Caption: TLabel
Left = 0
Left = 2
Top = 105
Width = 141
Height = 14
Caption = 'Handling of 608/708 streams:'
end
object CB_ShowToolBar: TCheckBox
Left = 0
Top = 0
Width = 268
Left = 2
Top = 1
Width = 658
Height = 18
Caption = 'Show toolbar'
TabOrder = 0
OnClick = CB_ShowToolBarClick
end
object Advanced_CloseAllAuto: TCheckBox
Left = 0
Top = 33
Width = 268
Left = 2
Top = 34
Width = 658
Height = 18
Caption = 'Close all before open'
TabOrder = 5
OnClick = Advanced_CloseAllAutoClick
end
object CB_ShowMenu: TCheckBox
Left = 0
Top = 16
Width = 268
Left = 2
Top = 17
Width = 658
Height = 18
Caption = 'Show menu'
TabOrder = 2
OnClick = CB_ShowMenuClick
end
object Advanced_InformVersion: TCheckBox
Left = 0
Top = 50
Width = 268
Left = 2
Top = 51
Width = 658
Height = 18
Caption = 'Add version to text output'
TabOrder = 3
OnClick = Advanced_InformVersionClick
end
object Advanced_InformTimestamp: TCheckBox
Left = 0
Top = 67
Width = 268
Left = 2
Top = 68
Width = 658
Height = 18
Caption = 'Add creation date to text output'
TabOrder = 6
OnClick = Advanced_InformTimestampClick
end
object Advanced_EnableFfmpeg: TCheckBox
Left = 0
Top = 84
Width = 268
Left = 2
Top = 85
Width = 658
Height = 18
Caption = 'Enable FFmpeg plugin'
TabOrder = 4
OnClick = Advanced_EnableFfmpegClick
end
object Advanced_DisplayCaptions_Sel: TComboBox
Left = 193
Left = 303
Top = 102
Width = 285
Width = 352
Height = 22
Style = csDropDownList
DropDownCount = 10
Expand Down Expand Up @@ -369,18 +369,18 @@ object PreferencesF: TPreferencesF
ImageIndex = 8
OnShow = Customize_GraphShow
object Graph_Adm_ShowTrackUIDs: TCheckBox
Left = 0
Top = 0
Width = 268
Left = 2
Top = 3
Width = 658
Height = 18
Caption = 'ADM: Show TrackUIDs'
TabOrder = 0
OnClick = Graph_Adm_ShowTrackUIDsClick
end
object Graph_Adm_ShowChannelFormats: TCheckBox
Left = 0
Top = 16
Width = 268
Left = 2
Top = 19
Width = 658
Height = 18
Caption = 'ADM: Show ChannelFormats'
TabOrder = 1
Expand Down
4 changes: 1 addition & 3 deletions Source/GUI/VCL/GUI_Preferences_Custom.dfm
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,8 @@ object Preferences_CustomF: TPreferences_CustomF
Font.Height = -11
Font.Name = 'Arial'
Font.Style = []
OldCreateOrder = False
Position = poScreenCenter
Position = poOwnerFormCenter
OnResize = FormResize
PixelsPerInch = 96
TextHeight = 14
object Liste: TComboBox
Left = 9
Expand Down
4 changes: 1 addition & 3 deletions Source/GUI/VCL/GUI_Preferences_Language.dfm
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,8 @@ object Preferences_LanguageF: TPreferences_LanguageF
Font.Height = -11
Font.Name = 'Arial'
Font.Style = []
OldCreateOrder = False
Position = poScreenCenter
Position = poOwnerFormCenter
OnResize = FormResize
PixelsPerInch = 96
TextHeight = 14
object Grille: TStringGrid
Left = 0
Expand Down
4 changes: 1 addition & 3 deletions Source/GUI/VCL/GUI_Preferences_Output.dfm
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@ object Preferences_OutputF: TPreferences_OutputF
Font.Height = -11
Font.Name = 'Arial'
Font.Style = []
OldCreateOrder = False
Position = poScreenCenter
PixelsPerInch = 96
Position = poOwnerFormCenter
TextHeight = 14
object Liste: TComboBox
Left = 9
Expand Down
Loading
Loading