Revert "IDE, Packager: harmonize some string constants"

git-svn-id: trunk@40960 -

debugger/historydlg.lfm

@@ -1,14 +1,11 @@
-object HistoryDialog: THistoryDialog
+inherited HistoryDialog: THistoryDialog
   Left = 1060
-  Height = 240
   Top = 216
   Width = 422
   BorderStyle = bsSizeToolWin
   Caption = 'HistoryDialog'
-  ClientHeight = 240
   ClientWidth = 422
-  LCLVersion = '1.1'
-  object lvHistory: TListView
+  object lvHistory: TListView[0]
     Left = 0
     Height = 214
     Top = 26
@@ -31,7 +28,7 @@ object HistoryDialog: THistoryDialog
     OnDblClick = lvHistoryDblClick
     OnSelectItem = lvHistorySelectItem
   end
-  object ToolBar1: TToolBar
+  object ToolBar1: TToolBar[1]
     Left = 0
     Height = 26
     Top = 0
@@ -129,7 +126,7 @@ object HistoryDialog: THistoryDialog
       OnClick = tbImportClick
     end
   end
-  object OpenDialog1: TOpenDialog
+  object OpenDialog1: TOpenDialog[2]
     Title = 'Import from'
     DefaultExt = '.xml'
     Filter = 'xml|*.xml|all|*.*'
@@ -137,7 +134,7 @@ object HistoryDialog: THistoryDialog
     left = 49
     top = 106
   end
-  object SaveDialog1: TSaveDialog
+  object SaveDialog1: TSaveDialog[3]
     Title = 'Export to'
     DefaultExt = '.xml'
     Filter = 'xml|*.xml|all|*.*'

debugger/historydlg.pp

@@ -351,10 +351,10 @@ begin
   tbRemove.Hint  := histdlgBtnRemoveHint;
 
   tbImport.ImageIndex := IDEImages.LoadImage(16, 'laz_open');
-  tbImport.Hint  := lisImport;
+  tbImport.Hint  := histdlgBtnImport;
 
   tbExport.ImageIndex := IDEImages.LoadImage(16, 'laz_save');
-  tbExport.Hint  := lisExport;
+  tbExport.Hint  := histdlgBtnExport;
 
   tbPowerClick(nil);
   tbHistorySelectedClick(nil);

ide/codebrowser.pas

@@ -466,7 +466,7 @@ begin
   CollapseAllUnitsMenuItem.Caption:=lisCollapseAllUnits;
   ExpandAllClassesMenuItem.Caption:=lisExpandAllClasses;
   CollapseAllClassesMenuItem.Caption:=lisCollapseAllClasses;
-  ExportMenuItem.Caption:=lisDlgExport;
+  ExportMenuItem.Caption:=lisExport;
   OpenMenuItem.Caption:=lisOpen;
   // UsePkgInProjectMenuItem.Caption: see PopupMenu1Popup
   // UsePkgInCurUnitMenuItem.Caption: see PopupMenu1Popup

ide/editormacrolistviewer.pas

@@ -1397,8 +1397,8 @@ begin
 
   SaveDialog1.Title := lisSaveMacroAs;
   OpenDialog1.Title := lisLoadMacroFrom;
-  mnImport.Caption := lisDlgImport;
-  mnExport.Caption := lisDlgExport;
+  mnImport.Caption := lisImport;
+  mnExport.Caption := lisExport;
 
   lbRecordedView.SmallImages := IDEImages.Images_16;
   FImageRec := IDEImages.LoadImage(16, 'Record');  // red dot

ide/frames/editor_color_options.lfm

@@ -18,13 +18,13 @@ object EditorColorOptionsFrame: TEditorColorOptionsFrame
     AnchorSideBottom.Control = Owner
     AnchorSideBottom.Side = asrBottom
     Left = 0
-    Height = 200
-    Top = 243
+    Height = 192
+    Top = 251
     Width = 640
     Anchors = [akLeft, akRight, akBottom]
     AutoSize = True
     BevelOuter = bvNone
-    ClientHeight = 200
+    ClientHeight = 192
     ClientWidth = 640
     Constraints.MinHeight = 192
     TabOrder = 1
@@ -65,7 +65,7 @@ object EditorColorOptionsFrame: TEditorColorOptionsFrame
       end
       object tbtnLocal: TToolButton
         Tag = 1
-        Left = 74
+        Left = 65
         Top = 0
         AutoSize = True
         Caption = 'tbtnLocal'
@@ -74,13 +74,13 @@ object EditorColorOptionsFrame: TEditorColorOptionsFrame
         Style = tbsCheck
       end
       object SetAttributeToDefaultButton: TToolButton
-        Left = 150
+        Left = 133
         Top = 0
         OnClick = SetAttributeToDefaultButtonClick
         ShowCaption = False
       end
       object ToolButton3: TToolButton
-        Left = 140
+        Left = 123
         Top = 0
         Width = 10
         Caption = 'ToolButton3'
@@ -95,165 +95,18 @@ object EditorColorOptionsFrame: TEditorColorOptionsFrame
       AnchorSideRight.Side = asrBottom
       AnchorSideBottom.Control = pnlElementAttributes
       AnchorSideBottom.Side = asrBottom
-      Height = 159
+      Height = 151
       Top = 41
       Width = 640
       Anchors = [akTop, akLeft, akRight, akBottom]
-      ClientHeight = 159
+      ClientHeight = 151
       ClientWidth = 640
       TabOrder = 1
-      inherited ForeGroundLabel: TLabel
-        Top = 8
-        Width = 107
-      end
-      inherited BackGroundLabel: TLabel
-        Top = 35
-        Width = 109
-      end
       inherited ForeGroundUseDefaultCheckBox: TCheckBox
         AnchorSideLeft.Control = SynColorAttrEditor1
-        Height = 21
-        Width = 228
       end
       inherited ForegroundColorBox: TColorBox
         AnchorSideTop.Control = SynColorAttrEditor1
-        AnchorSideRight.Control = SynColorAttrEditor1
-        Left = 240
-        Height = 24
-      end
-      inherited BackGroundColorBox: TColorBox
-        AnchorSideRight.Control = SynColorAttrEditor1
-        Left = 240
-        Height = 24
-        Top = 30
-      end
-      inherited BackGroundUseDefaultCheckBox: TCheckBox
-        Height = 21
-        Top = 32
-        Width = 230
-      end
-      inherited FrameColorBox: TColorBox
-        AnchorSideRight.Control = SynColorAttrEditor1
-        Left = 240
-        Height = 24
-        Top = 57
-      end
-      inherited FrameColorUseDefaultCheckBox: TCheckBox
-        Height = 21
-        Top = 59
-        Width = 224
-      end
-      inherited pnlUnderline: TPanel
-        Height = 44
-        Top = 111
-        Width = 169
-        ClientHeight = 44
-        ClientWidth = 169
-        inherited TextUnderlineRadioPanel: TPanel
-          Height = 23
-          Top = 21
-          Width = 155
-          ClientHeight = 23
-          ClientWidth = 155
-          inherited TextUnderlineRadioOn: TRadioButton
-            Height = 21
-            Width = 42
-          end
-          inherited TextUnderlineRadioOff: TRadioButton
-            Left = 49
-            Height = 21
-            Width = 42
-          end
-          inherited TextUnderlineRadioInvert: TRadioButton
-            Left = 94
-            Height = 21
-            Width = 60
-          end
-        end
-        inherited TextUnderlineCheckBox: TCheckBox
-          Height = 21
-          Width = 169
-        end
-      end
-      inherited pnlBold: TPanel
-        Left = 181
-        Height = 44
-        Top = 111
-        Width = 155
-        ClientHeight = 44
-        ClientWidth = 155
-        inherited TextBoldRadioPanel: TPanel
-          Height = 23
-          Top = 21
-          Width = 155
-          ClientHeight = 23
-          ClientWidth = 155
-          inherited TextBoldRadioInvert: TRadioButton
-            Left = 94
-            Height = 21
-            Width = 60
-          end
-          inherited TextBoldRadioOn: TRadioButton
-            Height = 21
-            Width = 42
-          end
-          inherited TextBoldRadioOff: TRadioButton
-            Left = 49
-            Height = 21
-            Width = 42
-          end
-        end
-        inherited TextBoldCheckBox: TCheckBox
-          Height = 21
-          Width = 136
-        end
-      end
-      inherited pnlItalic: TPanel
-        Left = 342
-        Height = 44
-        Top = 111
-        Width = 155
-        ClientHeight = 44
-        ClientWidth = 155
-        inherited TextItalicRadioPanel: TPanel
-          Height = 23
-          Top = 21
-          Width = 155
-          ClientHeight = 23
-          ClientWidth = 155
-          inherited TextItalicRadioInvert: TRadioButton
-            Left = 94
-            Height = 21
-            Width = 60
-          end
-          inherited TextItalicRadioOn: TRadioButton
-            Height = 21
-            Width = 42
-          end
-          inherited TextItalicRadioOff: TRadioButton
-            Left = 49
-            Height = 21
-            Width = 42
-          end
-        end
-        inherited TextItalicCheckBox: TCheckBox
-          Height = 21
-          Width = 138
-        end
-      end
-      inherited FrameStyleBox: TComboBox
-        Left = 343
-        Height = 24
-        Top = 84
-      end
-      inherited FrameEdgesBox: TComboBox
-        Left = 240
-        Height = 24
-        Top = 84
-      end
-      inherited ColumnPosBevel: TPanel
-        Left = 240
-        Top = 158
       end
     end
   end
@@ -283,17 +136,17 @@ object EditorColorOptionsFrame: TEditorColorOptionsFrame
     AnchorSideRight.Side = asrBottom
     AnchorSideBottom.Control = pnlElementAttributes
     Left = 0
-    Height = 218
+    Height = 226
     Top = 25
     Width = 640
     Anchors = [akTop, akLeft, akRight, akBottom]
     BevelOuter = bvNone
-    ClientHeight = 218
+    ClientHeight = 226
     ClientWidth = 640
     TabOrder = 2
     object ColorElementTree: TTreeView
       Left = 0
-      Height = 212
+      Height = 220
       Top = 6
       Width = 200
       Align = alLeft
@@ -322,7 +175,7 @@ object EditorColorOptionsFrame: TEditorColorOptionsFrame
       AnchorSideBottom.Control = ColorElementTree
       AnchorSideBottom.Side = asrBottom
       Left = 207
-      Height = 212
+      Height = 220
       Top = 6
       Width = 433
       BorderSpacing.Left = 1
@@ -338,7 +191,7 @@ object EditorColorOptionsFrame: TEditorColorOptionsFrame
       TabStop = False
       OnMouseUp = ColorPreviewMouseUp
       BookMarkOptions.Xoffset = 30
-      Gutter.Width = 61
+      Gutter.Width = 59
       Gutter.MouseActions = <      
         item
           ClickCount = ccAny
@@ -776,7 +629,7 @@ object EditorColorOptionsFrame: TEditorColorOptionsFrame
           MouseActions = <>
         end
         object TSynGutterLineNumber
-          Width = 21
+          Width = 19
           MouseActions = <>
           MarkupInfo.Background = clBtnFace
           MarkupInfo.Foreground = clNone
@@ -794,8 +647,6 @@ object EditorColorOptionsFrame: TEditorColorOptionsFrame
         object TSynGutterSeparator
           Width = 2
           MouseActions = <>
-          MarkupInfo.Background = clWhite
-          MarkupInfo.Foreground = clGray
         end
         object TSynGutterCodeFolding
           MouseActions = <          
@@ -852,7 +703,7 @@ object EditorColorOptionsFrame: TEditorColorOptionsFrame
     end
     object Splitter1: TSplitter
       Left = 201
-      Height = 218
+      Height = 226
       Top = 0
       Width = 5
     end
@@ -904,7 +755,7 @@ object EditorColorOptionsFrame: TEditorColorOptionsFrame
       Top = 0
       Width = 139
       BorderSpacing.Top = 3
-      ItemHeight = 0
+      ItemHeight = 15
       Items.Strings = (
         'pp;pas;inc;lpr;lrs;dpr;dpk'
         'pp;pas;inc;lpr;lrs'

ide/frames/editor_color_options.pas

@@ -883,7 +883,7 @@ begin
   SetAllAttributesToDefaultButton.ImageIndex := IDEImages.LoadImage(16, 'laz_set_colors_default');
   SetAllAttributesToDefaultButton.Hint := dlgSetAllElementDefault;
   btnExport.ImageIndex := IDEImages.LoadImage(16, 'laz_save');
-  btnExport.Hint := lisExport;
+  btnExport.Hint := dlgColorExportButton;
 
   tbtnGlobal.Caption := dlgUseSchemeDefaults;
   tbtnLocal.Caption := dlgUseSchemeLocal;

ide/frames/editor_mouseaction_options_advanced.lfm

@@ -1,16 +1,13 @@
-object EditorMouseOptionsAdvFrame: TEditorMouseOptionsAdvFrame
-  Left = 0
+inherited EditorMouseOptionsAdvFrame: TEditorMouseOptionsAdvFrame
   Height = 420
-  Top = 0
   Width = 610
   Anchors = [akTop]
   ClientHeight = 420
   ClientWidth = 610
-  TabOrder = 0
   Visible = False
   DesignLeft = 246
   DesignTop = 209
-  object ActionGrid: TStringGrid
+  object ActionGrid: TStringGrid[0]
     Left = 135
     Height = 243
     Top = 46
@@ -35,7 +32,7 @@ object EditorMouseOptionsAdvFrame: TEditorMouseOptionsAdvFrame
     OnResize = ActionGridResize
     OnSelection = ActionGridSelection
   end
-  object ContextTree: TTreeView
+  object ContextTree: TTreeView[1]
     Left = 0
     Height = 243
     Top = 46
@@ -51,14 +48,14 @@ object EditorMouseOptionsAdvFrame: TEditorMouseOptionsAdvFrame
     OnChange = ContextTreeChange
     Options = [tvoAutoExpand, tvoAutoItemHeight, tvoHideSelection, tvoKeepCollapsedNodes, tvoReadOnly, tvoShowLines, tvoToolTips, tvoNoDoubleClickExpand, tvoThemedDraw]
   end
-  object Splitter1: TSplitter
+  object Splitter1: TSplitter[2]
     Left = 130
     Height = 243
     Top = 46
     Width = 5
     AutoSnap = False
   end
-  object ToolBar1: TToolBar
+  object ToolBar1: TToolBar[3]
     Left = 0
     Height = 46
     Top = 0
@@ -76,38 +73,38 @@ object EditorMouseOptionsAdvFrame: TEditorMouseOptionsAdvFrame
       OnClick = BtnImportClick
     end
     object BtnExport: TToolButton
-      Left = 70
+      Left = 63
       Top = 0
       Caption = 'BtnExport'
       OnClick = BtnExportClick
     end
     object ToolButton3: TToolButton
-      Left = 139
+      Left = 122
       Top = 0
       Width = 5
       Caption = 'ToolButton3'
       Style = tbsDivider
     end
     object UpdateButton: TToolButton
-      Left = 144
+      Left = 127
       Top = 0
       Caption = 'UpdateButton'
       OnClick = UpdateButtonClick
     end
     object AddNewButton: TToolButton
-      Left = 240
+      Left = 209
       Top = 0
       Caption = 'AddNewButton'
       OnClick = AddNewButtonClick
     end
     object DelButton: TToolButton
-      Left = 340
+      Left = 299
       Top = 0
       Caption = 'DelButton'
       OnClick = DelButtonClick
     end
   end
-  object OtherActionPanel: TPanel
+  object OtherActionPanel: TPanel[4]
     Left = 0
     Height = 126
     Top = 294
@@ -118,19 +115,19 @@ object EditorMouseOptionsAdvFrame: TEditorMouseOptionsAdvFrame
     TabOrder = 4
     object Panel1: TPanel
       Left = 1
-      Height = 26
+      Height = 21
       Top = 1
       Width = 608
       Align = alTop
       AutoSize = True
-      ClientHeight = 26
+      ClientHeight = 21
       ClientWidth = 608
       TabOrder = 0
       object OtherActionLabel: TLabel
         Left = 1
-        Height = 24
+        Height = 19
         Top = 1
-        Width = 107
+        Width = 94
         Align = alLeft
         Caption = 'OtherActionLabel'
         ParentColor = False
@@ -140,10 +137,10 @@ object EditorMouseOptionsAdvFrame: TEditorMouseOptionsAdvFrame
       object OtherActToggleBox: TToggleBox
         AnchorSideRight.Control = Panel1
         AnchorSideRight.Side = asrBottom
-        Left = 477
-        Height = 24
+        Left = 483
+        Height = 19
         Top = 0
-        Width = 130
+        Width = 124
         Anchors = [akTop, akRight]
         AutoSize = True
         Caption = 'OtherActToggleBox'
@@ -155,8 +152,8 @@ object EditorMouseOptionsAdvFrame: TEditorMouseOptionsAdvFrame
     end
     object OtherActionGrid: TStringGrid
       Left = 1
-      Height = 98
-      Top = 27
+      Height = 103
+      Top = 22
       Width = 608
       Align = alClient
       AutoEdit = False
@@ -180,7 +177,7 @@ object EditorMouseOptionsAdvFrame: TEditorMouseOptionsAdvFrame
       OnSelectCell = OtherActionGridSelectCell
     end
   end
-  object Splitter2: TSplitter
+  object Splitter2: TSplitter[5]
     Cursor = crVSplit
     Left = 0
     Height = 5
@@ -190,14 +187,14 @@ object EditorMouseOptionsAdvFrame: TEditorMouseOptionsAdvFrame
     MinSize = 40
     ResizeAnchor = akBottom
   end
-  object SaveDialog1: TSaveDialog
+  object SaveDialog1: TSaveDialog[6]
     DefaultExt = '.xml'
     Filter = 'xml|*.xml|any|*.*'
     Options = [ofOverwritePrompt, ofPathMustExist, ofEnableSizing, ofViewDetail]
     left = 24
     top = 184
   end
-  object OpenDialog1: TOpenDialog
+  object OpenDialog1: TOpenDialog[7]
     DefaultExt = '.xml'
     Options = [ofPathMustExist, ofFileMustExist, ofEnableSizing, ofViewDetail]
     left = 72

ide/frames/editor_mouseaction_options_advanced.pas

@@ -693,8 +693,8 @@ begin
   FOtherSort[3] := 4; // CCount
   FOtherSort[4] := 5; // CDir
 
-  BtnImport.Caption := lisImport;
-  BtnExport.Caption := lisExport;
+  BtnImport.Caption := dlgMouseOptBtnImport;
+  BtnExport.Caption := dlgMouseOptBtnExport;
   UpdateButton.Caption := lisChange;
   AddNewButton.Caption := lisAdd;
   DelButton.Caption := lisDelete;
@@ -709,8 +709,8 @@ begin
   AddNewButton.ImageIndex := IDEImages.LoadImage(16, 'laz_add');
   DelButton.ImageIndex := IDEImages.LoadImage(16, 'laz_delete');
 
-  OpenDialog1.Title := lisImport;
-  SaveDialog1.Title := lisExport;
+  OpenDialog1.Title := dlgMouseOptBtnImport;
+  SaveDialog1.Title := dlgMouseOptBtnExport;
 end;
 
 procedure TEditorMouseOptionsAdvFrame.ReadSettings(

ide/lazarusidestrconsts.pas

@@ -1563,6 +1563,8 @@ resourcestring
   dlgMouseOptOtherAct  = 'Other actions using the same button';
   dlgMouseOptOtherActHint  = 'They may be executed depending on the Modifier Keys, Fallthrough settings, Single/Double, Up/Down ...';
   dlgMouseOptOtherActToggle = 'Filter Mod-Keys';
+  dlgMouseOptBtnImport = 'Import';
+  dlgMouseOptBtnExport = 'Export';
   lisDoNotShowThisMessageAgain = 'Do not show this message again';
   dlgMouseOptBtnModDef = 'Make Fallback';
   dlgMouseOptPriorLabel = 'Priority';
@@ -1635,6 +1637,7 @@ resourcestring
   dlgFileExts = 'File extensions';
   dlgSetElementDefault = 'Set element to default';
   dlgSetAllElementDefault = 'Set all elements to default';
+  dlgColorExportButton = 'Export';
   dlgUseSchemeDefaults = 'Use (and edit) global scheme settings';
   dlgUseSchemeLocal    = 'Use local scheme settings';
   dlgColor = 'Color';
@@ -4229,10 +4232,12 @@ resourcestring
   lisPckEditAddAnItem = 'Add an item';
   lisPckEditRemoveSelectedItem = 'Remove selected item';
   lisPckEditInstallPackageInTheIDE = 'Install package in the IDE';
-  lisUseSub = 'Use >>';
+  lisUse = 'Use >>';
   lisClickToSeeThePossibleUses = 'Click to see the possible uses';
   lisPckEditEditGeneralOptions = 'Edit General Options';
-  lisPkgEdThereAreMoreFunctionsInThePopupmenu = 'There are more functions in the popupmenu';
+  lisPkgEdThereAreMoreFunctionsInThePopupmenu = 'There are more functions in '
+    +'the popupmenu';
+  lisPckEditMore = 'More >>';
   lisPckEditEditOptionsToCompilePackage = 'Edit Options to compile package';
   lisPckEditRequiredPackages = 'Required Packages';
   lisPckEditFileProperties = 'File Properties';
@@ -4949,6 +4954,8 @@ resourcestring
   histdlgBtnShowSnapHint = 'View Snapshots';
   histdlgBtnMakeSnapHint = 'Take Snapshot';
   histdlgBtnRemoveHint   = 'Remove selected entry';
+  histdlgBtnImport   = 'Import';
+  histdlgBtnExport   = 'Export';
 
   // Exception Dialog
   lisExceptionDialog = 'Debugger Exception Notification';

packager/packageeditor.pas

@@ -1345,7 +1345,7 @@ begin
   CreateDivider;
   OptionsBitBtn := CreateToolButton('OptionsBitBtn', dlgFROpts, lisPckEditEditGeneralOptions, 'pkg_properties', @OptionsBitBtnClick);
   HelpBitBtn    := CreateToolButton('HelpBitBtn', GetButtonCaption(idButtonHelp), lisPkgEdThereAreMoreFunctionsInThePopupmenu, 'menu_help', @HelpBitBtnClick);
-  MoreBitBtn    := CreateToolButton('MoreBitBtn', lisMoreSub, lisPkgEdThereAreMoreFunctionsInThePopupmenu, '', nil);
+  MoreBitBtn    := CreateToolButton('MoreBitBtn', lisPckEditMore, lisPkgEdThereAreMoreFunctionsInThePopupmenu, '', nil);
 
   MoreBitBtn.DropdownMenu := MorePopupMenu;
 
@@ -1662,7 +1662,7 @@ begin
            or (FilesTreeView.Selected.Parent=FRequiredPackagesNode));
   OpenButton.Enabled:=(FilesTreeView.Selected<>nil)
      and (TObject(FilesTreeView.Selected.Data) is TFileNameItem);
-  UseBitBtn.Caption:=lisUseSub;
+  UseBitBtn.Caption:=lisUse;
   UseBitBtn.Hint:=lisClickToSeeThePossibleUses;
   UseBitBtn.OnClick:=nil;
   UseBitBtn.DropdownMenu:=UsePopupMenu;