Browse Source

Turning off underlining of accelerator character for labels that do not serve as focus labels

(for most this should be noop, but for few of these, it can actually prevent underlining of characters after literal ampersand - such as in case of FileLabel on Properties.dfm)

Source commit: f82c3b66444d8fd56f698f9ccb636105de4fbdc3
Martin Prikryl 7 years ago
parent
commit
1f5f6bef3e

+ 9 - 0
source/forms/About.dfm

@@ -69,6 +69,7 @@ object AboutDialog: TAboutDialog
       Width = 52
       Height = 13
       Caption = 'Application'
+      ShowAccelChar = False
     end
     object VersionLabel: TLabel
       Left = 62
@@ -76,6 +77,7 @@ object AboutDialog: TAboutDialog
       Width = 127
       Height = 13
       Caption = 'Version 2.0.0 (Build 12) XX'
+      ShowAccelChar = False
     end
     object WinSCPCopyrightLabel: TLabel
       Left = 62
@@ -83,6 +85,7 @@ object AboutDialog: TAboutDialog
       Width = 180
       Height = 13
       Caption = 'Copyright '#169' 2000-2003 Martin Prikryl'
+      ShowAccelChar = False
     end
     object ProductSpecificMessageLabel: TLabel
       Left = 62
@@ -90,6 +93,7 @@ object AboutDialog: TAboutDialog
       Width = 277
       Height = 13
       Caption = 'To send comments and report bugs use support forum at:'
+      ShowAccelChar = False
     end
     object Label3: TLabel
       Left = 62
@@ -97,6 +101,7 @@ object AboutDialog: TAboutDialog
       Width = 91
       Height = 13
       Caption = 'Portions copyright:'
+      ShowAccelChar = False
     end
     object RegistrationLabel: TLabel
       Left = 62
@@ -104,6 +109,7 @@ object AboutDialog: TAboutDialog
       Width = 127
       Height = 13
       Caption = 'This product is licensed to:'
+      ShowAccelChar = False
     end
     object IconPaintBox: TPaintBox
       Left = 8
@@ -163,6 +169,7 @@ object AboutDialog: TAboutDialog
         Anchors = [akLeft, akTop, akRight]
         AutoSize = False
         Caption = 'Someone'#13#10'Somewhere, some city'
+        ShowAccelChar = False
         WordWrap = True
       end
       object RegistrationLicensesLabel: TLabel
@@ -171,6 +178,7 @@ object AboutDialog: TAboutDialog
         Width = 106
         Height = 13
         Caption = 'Number of Licenses: X'
+        ShowAccelChar = False
       end
       object RegistrationProductIdLabel: TStaticText
         Left = 8
@@ -178,6 +186,7 @@ object AboutDialog: TAboutDialog
         Width = 148
         Height = 17
         Caption = 'Product ID: xxxx-xxxx-xxxxx'
+        ShowAccelChar = False
         TabOrder = 0
         OnClick = RegistrationProductIdLabelClick
       end

+ 1 - 0
source/forms/Cleanup.dfm

@@ -31,6 +31,7 @@ object CleanupDialog: TCleanupDialog
       'tance of application is running, please close it before cleaning' +
       ' data.'#13#10#13#10'Notice: Opening session and/or next execution of appli' +
       'cation will recreate some of data.'
+    ShowAccelChar = False
     WordWrap = True
   end
   object OKButton: TButton

+ 2 - 0
source/forms/Console.dfm

@@ -1386,6 +1386,7 @@ object ConsoleDialog: TConsoleDialog
     Width = 87
     Height = 13
     Caption = 'Current directory:'
+    ShowAccelChar = False
   end
   object Label4: TLabel
     Left = 51
@@ -1395,6 +1396,7 @@ object ConsoleDialog: TConsoleDialog
     Anchors = [akLeft, akTop, akRight]
     AutoSize = False
     Caption = 'Do not execute commands that require user-input or data transfer'
+    ShowAccelChar = False
   end
   object DirectoryLabel: TPathLabel
     Left = 158

+ 2 - 0
source/forms/Copy.dfm

@@ -146,6 +146,7 @@ object CopyDialog: TCopyDialog
       Anchors = [akLeft, akTop, akRight, akBottom]
       AutoSize = False
       Caption = 'CopyParamLabel'
+      ShowAccelChar = False
       WordWrap = True
       OnClick = CopyParamGroupClick
     end
@@ -169,6 +170,7 @@ object CopyDialog: TCopyDialog
         'In Commander interface a keyboard shortcut F5 is used to transfe' +
         'r files. Should you want to use it to refresh a file panel, clic' +
         'k here to go to preferences.'
+      ShowAccelChar = False
       WordWrap = True
       OnClick = ShortCutHintLabelClick
     end

+ 1 - 0
source/forms/FullSynchronize.dfm

@@ -271,6 +271,7 @@ object FullSynchronizeDialog: TFullSynchronizeDialog
       Anchors = [akLeft, akTop, akRight, akBottom]
       AutoSize = False
       Caption = 'CopyParamLabel'
+      ShowAccelChar = False
       WordWrap = True
       OnClick = CopyParamGroupClick
     end

+ 2 - 0
source/forms/GenerateUrl.dfm

@@ -121,6 +121,7 @@ object GenerateUrlDialog: TGenerateUrlDialog
         Height = 42
         AutoSize = False
         Caption = 'ScriptDescriptionLabel'
+        ShowAccelChar = False
         WordWrap = True
       end
       object ScriptFormatCombo: TComboBox
@@ -156,6 +157,7 @@ object GenerateUrlDialog: TGenerateUrlDialog
         Height = 42
         AutoSize = False
         Caption = 'AssemblyDescriptionLabel'
+        ShowAccelChar = False
         WordWrap = True
       end
       object AssemblyLanguageCombo: TComboBox

+ 1 - 0
source/forms/ImportSessions.dfm

@@ -123,6 +123,7 @@ object ImportSessionsDialog: TImportSessionsDialog
       Align = alClient
       Alignment = taCenter
       Caption = 'ErrorLabel'
+      ShowAccelChar = False
       Layout = tlCenter
       WordWrap = True
     end

+ 1 - 0
source/forms/Login.dfm

@@ -55,6 +55,7 @@ object LoginDialog: TLoginDialog
           Width = 31
           Height = 13
           Caption = 'Name:'
+          ShowAccelChar = False
         end
         object ContentsNameEdit: TEdit
           Left = 66

+ 12 - 0
source/forms/Preferences.dfm

@@ -224,6 +224,7 @@ object PreferencesDialog: TPreferencesDialog
             Height = 13
             Anchors = [akTop, akRight]
             Caption = 's'
+            ShowAccelChar = False
           end
           object BeepOnFinishCheck: TCheckBox
             Left = 16
@@ -288,6 +289,7 @@ object PreferencesDialog: TPreferencesDialog
             Height = 13
             Caption = 'files'
             FocusControl = LogMaxSizeCountEdit
+            ShowAccelChar = False
           end
           object LogFileNameLabel: TLabel
             Left = 40
@@ -507,6 +509,7 @@ object PreferencesDialog: TPreferencesDialog
           Width = 177
           Height = 13
           Caption = 'Changes will apply on the next start.'
+          ShowAccelChar = False
         end
         object InterfaceGroup: TGroupBox
           Left = 8
@@ -814,6 +817,7 @@ object PreferencesDialog: TPreferencesDialog
             Caption = 'PanelFontLabel'
             Color = clWindow
             ParentColor = False
+            ShowAccelChar = False
             Transparent = False
             WordWrap = True
             OnDblClick = PanelFontLabelDblClick
@@ -856,6 +860,7 @@ object PreferencesDialog: TPreferencesDialog
           Anchors = [akLeft, akTop, akRight]
           AutoSize = False
           Caption = 'Preferences on this page applies to Commander interface only.'
+          ShowAccelChar = False
           WordWrap = True
         end
         object PanelsGroup: TGroupBox
@@ -1006,6 +1011,7 @@ object PreferencesDialog: TPreferencesDialog
           Anchors = [akLeft, akTop, akRight]
           AutoSize = False
           Caption = 'Preferences on this page applies to Explorer interface only.'
+          ShowAccelChar = False
           WordWrap = True
         end
         object GroupBox2: TGroupBox
@@ -1413,6 +1419,7 @@ object PreferencesDialog: TPreferencesDialog
             Height = 13
             Anchors = [akLeft, akTop, akRight]
             Caption = 'DragExtStatusLabel'
+            ShowAccelChar = False
             OnClick = DDLabelClick
           end
           object DDDrivesLabel: TLabel
@@ -1736,6 +1743,7 @@ object PreferencesDialog: TPreferencesDialog
             Anchors = [akLeft, akTop, akRight]
             AutoSize = False
             Caption = 'Specify where to temporarily store edited and downloaded files.'
+            ShowAccelChar = False
             WordWrap = True
           end
           object DDSystemTemporaryDirectoryButton: TRadioButton
@@ -2323,6 +2331,7 @@ object PreferencesDialog: TPreferencesDialog
             Anchors = [akLeft, akRight, akBottom]
             AutoSize = False
             Caption = 'CopyParamLabel'
+            ShowAccelChar = False
             WordWrap = True
             OnClick = CopyParamLabelClick
           end
@@ -2857,6 +2866,7 @@ object PreferencesDialog: TPreferencesDialog
             Width = 5
             Height = 13
             Caption = 's'
+            ShowAccelChar = False
           end
           object ShowInaccesibleDirectoriesCheck: TCheckBox
             Left = 16
@@ -2982,6 +2992,7 @@ object PreferencesDialog: TPreferencesDialog
             Height = 13
             Anchors = [akLeft, akBottom]
             Caption = 'Changes will apply on the next start.'
+            ShowAccelChar = False
           end
           object LanguagesView: TListView
             Left = 16
@@ -3109,6 +3120,7 @@ object PreferencesDialog: TPreferencesDialog
             Caption = 'EditorFontLabel'
             Color = clWhite
             ParentColor = False
+            ShowAccelChar = False
             Transparent = False
             OnDblClick = EditorFontLabelDblClick
           end

+ 12 - 0
source/forms/Progress.dfm

@@ -44,6 +44,7 @@ object ProgressForm: TProgressForm
       Width = 26
       Height = 13
       Caption = 'FileX:'
+      ShowAccelChar = False
     end
     object FileLabel: TPathLabel
       Left = 56
@@ -62,6 +63,7 @@ object ProgressForm: TProgressForm
       Width = 36
       Height = 13
       Caption = 'Target:'
+      ShowAccelChar = False
     end
     object TargetPathLabel: TPathLabel
       Left = 56
@@ -105,6 +107,7 @@ object ProgressForm: TProgressForm
       Alignment = taRightJustify
       AutoSize = False
       Caption = '00:00:00'
+      ShowAccelChar = False
     end
     object TimeLeftLabel: TLabel
       Left = 88
@@ -114,6 +117,7 @@ object ProgressForm: TProgressForm
       Alignment = taRightJustify
       AutoSize = False
       Caption = '00:00:00'
+      ShowAccelChar = False
     end
     object TimeLeftLabelLabel: TLabel
       Left = 0
@@ -121,6 +125,7 @@ object ProgressForm: TProgressForm
       Width = 45
       Height = 13
       Caption = 'Time left:'
+      ShowAccelChar = False
     end
     object CPSLabel: TLabel
       Left = 237
@@ -131,6 +136,7 @@ object ProgressForm: TProgressForm
       Anchors = [akTop, akRight]
       AutoSize = False
       Caption = '0 KB/s'
+      ShowAccelChar = False
     end
     object TimeElapsedLabel: TLabel
       Left = 237
@@ -141,6 +147,7 @@ object ProgressForm: TProgressForm
       Anchors = [akTop, akRight]
       AutoSize = False
       Caption = '00:00:00'
+      ShowAccelChar = False
     end
     object BytesTransferredLabel: TLabel
       Left = 88
@@ -150,6 +157,7 @@ object ProgressForm: TProgressForm
       Alignment = taRightJustify
       AutoSize = False
       Caption = '0 KB'
+      ShowAccelChar = False
     end
     object Label3: TLabel
       Left = 165
@@ -158,6 +166,7 @@ object ProgressForm: TProgressForm
       Height = 13
       Anchors = [akTop, akRight]
       Caption = 'Time elapsed:'
+      ShowAccelChar = False
     end
     object StartTimeLabelLabel: TLabel
       Left = 0
@@ -165,6 +174,7 @@ object ProgressForm: TProgressForm
       Width = 51
       Height = 13
       Caption = 'Start time:'
+      ShowAccelChar = False
     end
     object Label4: TLabel
       Left = 0
@@ -172,6 +182,7 @@ object ProgressForm: TProgressForm
       Width = 89
       Height = 13
       Caption = 'Bytes transferred:'
+      ShowAccelChar = False
     end
     object Label12: TLabel
       Left = 165
@@ -180,6 +191,7 @@ object ProgressForm: TProgressForm
       Height = 13
       Anchors = [akTop, akRight]
       Caption = 'Speed:'
+      ShowAccelChar = False
     end
     object FileProgress: TProgressBar
       Left = 0

+ 6 - 0
source/forms/Properties.dfm

@@ -69,6 +69,7 @@ object PropertiesDialog: TPropertiesDialog
         Width = 44
         Height = 13
         Caption = 'Location:'
+        ShowAccelChar = False
       end
       object LocationLabel: TPathLabel
         Left = 85
@@ -89,6 +90,7 @@ object PropertiesDialog: TPropertiesDialog
         Height = 13
         AutoSize = False
         Caption = 'FileLabel'
+        ShowAccelChar = False
       end
       object Label2: TLabel
         Left = 8
@@ -96,6 +98,7 @@ object PropertiesDialog: TPropertiesDialog
         Width = 23
         Height = 13
         Caption = 'Size:'
+        ShowAccelChar = False
       end
       object SizeLabel: TLabel
         Left = 85
@@ -105,6 +108,7 @@ object PropertiesDialog: TPropertiesDialog
         Anchors = [akLeft, akTop, akRight]
         AutoSize = False
         Caption = 'SizeLabel'
+        ShowAccelChar = False
       end
       object LinksToLabelLabel: TLabel
         Left = 8
@@ -112,6 +116,7 @@ object PropertiesDialog: TPropertiesDialog
         Width = 40
         Height = 13
         Caption = 'Links to:'
+        ShowAccelChar = False
       end
       object LinksToLabel: TPathLabel
         Left = 85
@@ -314,6 +319,7 @@ object PropertiesDialog: TPropertiesDialog
           Width = 117
           Height = 13
           Caption = 'ChecksumUnknownLabel'
+          ShowAccelChar = False
         end
         object ChecksumEdit: TEdit
           Left = 10

+ 3 - 0
source/forms/SelectMask.dfm

@@ -47,6 +47,7 @@ object SelectMaskDialog: TSelectMaskDialog
       Caption = 'about.html'#13#10'index.html'#13#10'photo.jpg'
       Color = clWindow
       ParentColor = False
+      ShowAccelChar = False
       Transparent = False
       WordWrap = True
     end
@@ -61,6 +62,7 @@ object SelectMaskDialog: TSelectMaskDialog
       Caption = 'ColorSizesLabel'
       Color = clWindow
       ParentColor = False
+      ShowAccelChar = False
       Transparent = False
       WordWrap = True
     end
@@ -74,6 +76,7 @@ object SelectMaskDialog: TSelectMaskDialog
       AutoSize = False
       Color = clWindow
       ParentColor = False
+      ShowAccelChar = False
       Transparent = False
       WordWrap = True
     end

+ 1 - 0
source/forms/SiteAdvanced.dfm

@@ -257,6 +257,7 @@ object SiteAdvancedDialog: TSiteAdvancedDialog
             Width = 241
             Height = 13
             Caption = 'Local directory is not used with Explorer interface.'
+            ShowAccelChar = False
           end
           object LocalDirectoryEdit: TDirectoryEdit
             Left = 12

+ 1 - 0
source/forms/Synchronize.dfm

@@ -245,6 +245,7 @@ object SynchronizeDialog: TSynchronizeDialog
       Anchors = [akLeft, akTop, akRight, akBottom]
       AutoSize = False
       Caption = 'CopyParamLabel'
+      ShowAccelChar = False
       WordWrap = True
       OnClick = CopyParamGroupClick
     end

+ 6 - 0
source/forms/SynchronizeProgress.dfm

@@ -21,6 +21,7 @@ object SynchronizeProgressForm: TSynchronizeProgressForm
     Width = 28
     Height = 13
     Caption = 'Local:'
+    ShowAccelChar = False
   end
   object Label2: TLabel
     Left = 49
@@ -28,6 +29,7 @@ object SynchronizeProgressForm: TSynchronizeProgressForm
     Width = 41
     Height = 13
     Caption = 'Remote:'
+    ShowAccelChar = False
   end
   object RemoteDirectoryLabel: TPathLabel
     Left = 141
@@ -59,6 +61,7 @@ object SynchronizeProgressForm: TSynchronizeProgressForm
     Height = 13
     AutoSize = False
     Caption = '00:00:00'
+    ShowAccelChar = False
   end
   object Label4: TLabel
     Left = 49
@@ -66,6 +69,7 @@ object SynchronizeProgressForm: TSynchronizeProgressForm
     Width = 51
     Height = 13
     Caption = 'Start time:'
+    ShowAccelChar = False
   end
   object Label3: TLabel
     Left = 49
@@ -73,6 +77,7 @@ object SynchronizeProgressForm: TSynchronizeProgressForm
     Width = 66
     Height = 13
     Caption = 'Time elapsed:'
+    ShowAccelChar = False
   end
   object TimeElapsedLabel: TLabel
     Left = 141
@@ -81,6 +86,7 @@ object SynchronizeProgressForm: TSynchronizeProgressForm
     Height = 13
     AutoSize = False
     Caption = '00:00:00'
+    ShowAccelChar = False
   end
   object AnimationPaintBox: TPaintBox
     Left = 8