diff options
| -rw-r--r-- | UConfig.pas | 5 | ||||
| -rw-r--r-- | UMain.pas | 3 | ||||
| -rw-r--r-- | UPreferences.pas | 11 |
3 files changed, 3 insertions, 16 deletions
diff --git a/UConfig.pas b/UConfig.pas index 7001216..836c107 100644 --- a/UConfig.pas +++ b/UConfig.pas @@ -88,7 +88,7 @@ var ConfPanelSep, ConfRowHeight, ConfRowHeightReal, ConfNumHistoryItems, ConfDiffCommand, ConfDiffDirCommand: string; ParamDebug, ConfShowDotFiles, ConfClearReadOnlyAttr, ConfDisableMouseRename, ConfUseSystemFont, ConfUseFileTypeIcons, - ConfFocusRefresh, ConfNewStyleAltO, ConfDirsInBold, ConfDisableDirectoryBrackets, ParamDisableGnome, ConfWMCompatMode, + ConfFocusRefresh, ConfNewStyleAltO, ConfDirsInBold, ConfDisableDirectoryBrackets, ParamDisableGnome, ConfUseLibcSystem, ConfUseInternalViewer, ParamDisablePlugins: boolean; ConfNormalItemDefaultColors, ConfCursorDefaultColors, ConfInactiveItemDefaultColors, ConfSelectedItemDefaultColors, ConfLinkItemDefaultColors, ConfDotFileItemDefaultColors, ConfLynxLikeMotion, ConfSizeGroupRequestZeroDigits, @@ -213,7 +213,6 @@ begin ConfDirsInBold := False; ConfDisableDirectoryBrackets := False; ParamDisableGnome := False; - ConfWMCompatMode := False; ConfDisableFileTips := False; ConfInsMoveDown := True; ConfSpaceMovesDown := False; @@ -480,7 +479,6 @@ begin ConfLynxLikeMotion := IniFile.ReadBool(ConfProfileName, 'LynxLikeMotion', ConfLynxLikeMotion); ConfDirsInBold := IniFile.ReadBool(ConfProfileName, 'DirsInBold', ConfDirsInBold); ConfNewStyleAltO := IniFile.ReadBool(ConfProfileName, 'NewStyleAltO', ConfNewStyleAltO); - ConfWMCompatMode := IniFile.ReadBool(ConfProfileName, 'WMCompatibilityMode', ConfWMCompatMode); ConfDisableFileTips := IniFile.ReadBool(ConfProfileName, 'DisableFileTips', ConfDisableFileTips); ConfDisableDirectoryBrackets := IniFile.ReadBool(ConfProfileName, 'DisableDirectoryBrackets', ConfDisableDirectoryBrackets); ConfInsMoveDown := IniFile.ReadBool(ConfProfileName, 'InsMoveDown', ConfInsMoveDown); @@ -586,7 +584,6 @@ begin IniFile.WriteBool(ConfProfileName, 'NewStyleAltO', ConfNewStyleAltO); IniFile.WriteBool(ConfProfileName, 'DirsInBold', ConfDirsInBold); IniFile.WriteBool(ConfProfileName, 'DisableDirectoryBrackets', ConfDisableDirectoryBrackets); - IniFile.WriteBool(ConfProfileName, 'WMCompatibilityMode', ConfWMCompatMode); IniFile.WriteBool(ConfProfileName, 'DisableFileTips', ConfDisableFileTips); IniFile.WriteBool(ConfProfileName, 'InsMoveDown', ConfInsMoveDown); IniFile.WriteBool(ConfProfileName, 'SpaceMovesDown', ConfSpaceMovesDown); @@ -1305,12 +1305,11 @@ begin SetDefaultSize(ConfMainWindowWidth, ConfMainWindowHeight); if (ConfMainWindowPosLeft > -1) and (ConfMainWindowPosTop > -1) then WindowMove(ConfMainWindowPosLeft, ConfMainWindowPosTop); - if ConfWMCompatMode then Show; case integer(ConfMainWindowState) of Ord(wsMaximized) : Maximize; Ord(wsMinimized) : Minimize; end; - if not ConfWMCompatMode then Show; + Show; StartUp := False; // Set the flag to process Splitter repositioning diff --git a/UPreferences.pas b/UPreferences.pas index 81eecdb..deee0f0 100644 --- a/UPreferences.pas +++ b/UPreferences.pas @@ -43,7 +43,7 @@ type ExperimentalWarningLabel: TGTKLabel; ExperimentalWarningIcon: TGTKImage; ClearROAttr, DisableMouseRename, ShowFiletypeIcons, DefaultFontCheckBox, DefaultRowHeightCheckBox, LynxLikeMotionCheckBox, - DirsInBoldCheckBox, NewStyleAltOCheckBox, WMCompatModeCheckBox, DisableFileTipsCheckBox, DisableDirectoryBracketsCheckBox, + DirsInBoldCheckBox, NewStyleAltOCheckBox, DisableFileTipsCheckBox, DisableDirectoryBracketsCheckBox, InsertMovesDownCheckBox, SpaceMovesDownCheckBox, SelectAllDirectoriesCheckBox, ShowFuncButtonsCheckBox, OctalPermissionsCheckBox, FocusRefreshCheckBox, CompatUseLibcSystemCheckBox: TGTKCheckButton; NormalItemFGColorDefault, ActiveItemFGColorDefault, InactiveItemFGColorDefault, @@ -1013,13 +1013,6 @@ begin FocusRefreshCheckBox.MarginTop := 2; FocusRefreshCheckBox.MarginBottom := 2; Grid6.AddControl(0, 0, 1, 1, FocusRefreshCheckBox); - WMCompatModeCheckBox := TGTKCheckButton.CreateWithLabel(Self, LANGPreferencesWMCompatModeCheckBox_Caption); - WMCompatModeCheckBox.Tooltip := LANGPreferencesWMCompatModeCheckBox_Tooltip; - WMCompatModeCheckBox.MarginStart := 30; - WMCompatModeCheckBox.MarginEnd := 30; - WMCompatModeCheckBox.MarginTop := 2; - WMCompatModeCheckBox.MarginBottom := 2; - Grid6.AddControl(0, 1, 1, 1, WMCompatModeCheckBox); CompatUseLibcSystemCheckBox := TGTKCheckButton.CreateWithLabel(Self, LANGPreferencesCompatUseLibcSystemCheckBox_Caption); CompatUseLibcSystemCheckBox.Tooltip := LANGPreferencesCompatUseLibcSystemCheckBox_Tooltip; CompatUseLibcSystemCheckBox.MarginStart := 30; @@ -1181,7 +1174,6 @@ begin ViewerX11AppComboBox.ItemIndex := ConfViewerTerminalBehaviour; EditorX11AppComboBox.ItemIndex := ConfEditorTerminalBehaviour; FocusRefreshCheckBox.Checked := ConfFocusRefresh; - WMCompatModeCheckBox.Checked := ConfWMCompatMode; CompatUseLibcSystemCheckBox.Checked := ConfUseLibcSystem; CustomTimeFormatEntry.Text := ConfCustomTimeFormat; @@ -1253,7 +1245,6 @@ begin ConfViewerTerminalBehaviour := ViewerX11AppComboBox.ItemIndex; ConfEditorTerminalBehaviour := EditorX11AppComboBox.ItemIndex; ConfFocusRefresh := FocusRefreshCheckBox.Checked; - ConfWMCompatMode := WMCompatModeCheckBox.Checked; ConfUseLibcSystem := CompatUseLibcSystemCheckBox.Checked; ConfDisableFileTips := DisableFileTipsCheckBox.Checked; ConfShowFuncButtons := ShowFuncButtonsCheckBox.Checked; |