diff --git a/components/anchordocking/anchordockstr.pas b/components/anchordocking/anchordockstr.pas index 4f40a55078..d5fd069a52 100644 --- a/components/anchordocking/anchordockstr.pas +++ b/components/anchordocking/anchordockstr.pas @@ -103,8 +103,6 @@ resourcestring +'shown in the normal window title'; adrsErrorWritingWindowLayoutToFile = 'Error writing window layout to file "%' +'s"%s%s'; - adrsDockingEnabledRequiresARestartOfTheIDE = 'Docking enabled (Requires a ' - +'restart of the IDE)'; adrsToUseAnchordockingYouMustFirstUninstall = 'To use anchordocking you ' +'must first uninstall %s'; adrsThereIsAnotherDockMasterInstalledOnlyOneDockingPac = 'There is another ' diff --git a/components/anchordocking/design/registeranchordocking.lfm b/components/anchordocking/design/registeranchordocking.lfm index 1ed42e6be9..645bff376c 100644 --- a/components/anchordocking/design/registeranchordocking.lfm +++ b/components/anchordocking/design/registeranchordocking.lfm @@ -1,26 +1,16 @@ -inherited AnchorDockIDEFrame: TAnchorDockIDEFrame +object AnchorDockIDEFrame: TAnchorDockIDEFrame + Left = 0 Height = 388 + Top = 0 Width = 495 ClientHeight = 388 ClientWidth = 495 TabOrder = 0 DesignLeft = 407 DesignTop = 295 - object EnableCheckBox: TCheckBox[0] - AnchorSideLeft.Control = Owner - AnchorSideTop.Control = NoteLabel - AnchorSideTop.Side = asrBottom + object NoteLabel: TLabel Left = 6 - Height = 22 - Top = 30 - Width = 133 - BorderSpacing.Around = 6 - Caption = 'EnableCheckBox' - TabOrder = 0 - end - object NoteLabel: TLabel[1] - Left = 6 - Height = 18 + Height = 15 Top = 6 Width = 483 Align = alTop diff --git a/components/anchordocking/design/registeranchordocking.pas b/components/anchordocking/design/registeranchordocking.pas index 43586fe139..2ae2171b99 100644 --- a/components/anchordocking/design/registeranchordocking.pas +++ b/components/anchordocking/design/registeranchordocking.pas @@ -26,15 +26,6 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - - ToDo: - - save settings after options dialog - - bug: opening a package editor does not put it to front - - close source editor and show again - - qt: focus on close page - - gtk2: focus on cancel completion box - - gtk2: focus on execute completion box - - gtk2: restore fails for mainidebar } unit RegisterAnchorDocking; @@ -66,7 +57,6 @@ type TIDEAnchorDockMaster = class(TIDEDockMaster) private FChangeStamp: int64; - FEnabled: boolean; FSavedChangeStamp: int64; FSavedDMChangeStamp: int64; FUserLayoutLoaded: boolean; @@ -75,7 +65,6 @@ type procedure GetDefaultBounds(AForm: TCustomForm; out Creator: TIDEWindowCreator; out NewBounds: TRect; out DockSiblingName: string; out DockAlign: TAlign); function GetModified: boolean; - procedure SetEnabled(const AValue: boolean); procedure SetModified(const AValue: boolean); procedure SetUserLayoutLoaded(const AValue: boolean); public @@ -94,7 +83,6 @@ type procedure LoadLayoutFromFile(Filename: string); procedure SaveLayoutToFile(Filename: string); property UserLayoutLoaded: boolean read FUserLayoutLoaded write SetUserLayoutLoaded; - property Enabled: boolean read FEnabled write SetEnabled; // events procedure MakeIDEWindowDockSite(AForm: TCustomForm; ASides: TDockSides = [alBottom]); override; procedure MakeIDEWindowDockable(AControl: TWinControl); override; @@ -113,7 +101,6 @@ type { TAnchorDockIDEFrame } TAnchorDockIDEFrame = class(TAbstractIDEOptionsEditor) - EnableCheckBox: TCheckBox; NoteLabel: TLabel; private FSettings: TAnchorDockSettings; @@ -216,13 +203,6 @@ begin Result:=false; end; -procedure TIDEAnchorDockMaster.SetEnabled(const AValue: boolean); -begin - if FEnabled=AValue then exit; - FEnabled:=AValue; - IncreaseChangeStamp; -end; - procedure TIDEAnchorDockMaster.SetModified(const AValue: boolean); begin if AValue then @@ -242,7 +222,6 @@ end; constructor TIDEAnchorDockMaster.Create; begin inherited Create; - fEnabled:=true; IDEAnchorDockMaster:=Self; DockMaster.OnCreateControl:=@DockMasterCreateControl; DockMaster.OnShowOptions:=@ShowAnchorDockOptions; @@ -652,11 +631,8 @@ begin if ADialog=nil then ; if IDEDockMaster=IDEAnchorDockMaster then begin NoteLabel.Visible:=false; - EnableCheckBox.AnchorParallel(akTop,6,Self); - OptionsFrame.Align:=alBottom; - OptionsFrame.AnchorToNeighbour(akTop,6,EnableCheckBox); + OptionsFrame.Align:=alClient; OptionsFrame.Parent:=Self; - EnableCheckBox.Caption:=adrsDockingEnabledRequiresARestartOfTheIDE; end else begin NoteLabel.Visible:=true; NoteLabel.Caption:=Format(adrsToUseAnchordockingYouMustFirstUninstall, [ @@ -664,7 +640,6 @@ begin NoteLabel.Hint:=Format( adrsThereIsAnotherDockMasterInstalledOnlyOneDockingPac, [DbgSName( IDEDockMaster)]); - EnableCheckBox.Visible:=false; OptionsFrame.Parent:=nil; end; end; @@ -672,7 +647,6 @@ end; procedure TAnchorDockIDEFrame.ReadSettings(AOptions: TAbstractIDEOptions); begin if not (AOptions is SupportedOptionsClass) then exit; - EnableCheckBox.Checked:=IDEAnchorDockMaster.Enabled; DockMaster.SaveSettings(FSettings); OptionsFrame.LoadFromSettings(FSettings); end; @@ -680,7 +654,6 @@ end; procedure TAnchorDockIDEFrame.WriteSettings(AOptions: TAbstractIDEOptions); begin if not (AOptions is SupportedOptionsClass) then exit; - IDEAnchorDockMaster.Enabled:=EnableCheckBox.Checked; OptionsFrame.SaveToSettings(FSettings); if (not DockMaster.SettingsAreEqual(FSettings)) or (not FileExistsUTF8(IDEAnchorDockMaster.GetDefaultLayoutFilename(true))) diff --git a/components/anchordocking/languages/anchordockstr.ar.po b/components/anchordocking/languages/anchordockstr.ar.po index fb8c8c83ba..52ebc3ff8a 100644 --- a/components/anchordocking/languages/anchordockstr.ar.po +++ b/components/anchordocking/languages/anchordockstr.ar.po @@ -1,7 +1,3 @@ - Arabic translation of Free Pascal Lazarus Project. - Copyright (C) 2012 Lazarus Project - This file is distributed under the same license as the Lazarus package. - Khaled Shagrouni , 2012. msgid "" msgstr "" "Project-Id-Version: Free Pascal Lazarus Project.\n" @@ -73,10 +69,6 @@ msgstr "موقع إرساء مخصّص %s%s%s يمكنه امتلاك موقع msgid "Docking / Anchordocking" msgstr "الإرساء / تعليق الإرساء" -#: anchordockstr.adrsdockingenabledrequiresarestartoftheide -msgid "Docking enabled (Requires a restart of the IDE)" -msgstr "تمكين الإرساء (يتطلّب إعادة تشغيل بيئة التطوير)" - #: anchordockstr.adrsdockingoptions msgid "Docking options" msgstr "خيارات التعشيق " diff --git a/components/anchordocking/languages/anchordockstr.cs.po b/components/anchordocking/languages/anchordockstr.cs.po index a5e2c9cfe1..19abbf811c 100644 --- a/components/anchordocking/languages/anchordockstr.cs.po +++ b/components/anchordocking/languages/anchordockstr.cs.po @@ -65,10 +65,6 @@ msgstr "" msgid "Docking / Anchordocking" msgstr "" -#: anchordockstr.adrsdockingenabledrequiresarestartoftheide -msgid "Docking enabled (Requires a restart of the IDE)" -msgstr "Ukotvení povoleno (Vyžaduje restart IDE)" - #: anchordockstr.adrsdockingoptions msgid "Docking options" msgstr "Volby ukotvení" diff --git a/components/anchordocking/languages/anchordockstr.de.po b/components/anchordocking/languages/anchordockstr.de.po index adb2251dad..e598ff0a04 100644 --- a/components/anchordocking/languages/anchordockstr.de.po +++ b/components/anchordocking/languages/anchordockstr.de.po @@ -65,10 +65,6 @@ msgstr "" msgid "Docking / Anchordocking" msgstr "" -#: anchordockstr.adrsdockingenabledrequiresarestartoftheide -msgid "Docking enabled (Requires a restart of the IDE)" -msgstr "" - #: anchordockstr.adrsdockingoptions msgid "Docking options" msgstr "Docking-Einstellungen" diff --git a/components/anchordocking/languages/anchordockstr.es.po b/components/anchordocking/languages/anchordockstr.es.po index 74f134f90b..d15a6c774e 100644 --- a/components/anchordocking/languages/anchordockstr.es.po +++ b/components/anchordocking/languages/anchordockstr.es.po @@ -65,10 +65,6 @@ msgstr "Sitio de anclaje personalizado %s%s%s puede tener sólo un sitio." msgid "Docking / Anchordocking" msgstr "Acoplamiento / Anclaje de acoplamiento" -#: anchordockstr.adrsdockingenabledrequiresarestartoftheide -msgid "Docking enabled (Requires a restart of the IDE)" -msgstr "Acoplamiento habilitado (requiere un reinicio del IDE)" - #: anchordockstr.adrsdockingoptions msgid "Docking options" msgstr "Opciones de acoplamiento" diff --git a/components/anchordocking/languages/anchordockstr.it.po b/components/anchordocking/languages/anchordockstr.it.po index c3401c7858..8987047428 100644 --- a/components/anchordocking/languages/anchordockstr.it.po +++ b/components/anchordocking/languages/anchordockstr.it.po @@ -1,4 +1,3 @@ - Massimo Soricetti , 2011. msgid "" msgstr "" "PO-Revision-Date: 2011-04-21 23:43+0200\n" @@ -67,10 +66,6 @@ msgstr "Il sito di docking personalizzato %s%s%s può avere un solo sito." msgid "Docking / Anchordocking" msgstr "" -#: anchordockstr.adrsdockingenabledrequiresarestartoftheide -msgid "Docking enabled (Requires a restart of the IDE)" -msgstr "docking abilitato (richiede il riavvio dell'IDE)" - #: anchordockstr.adrsdockingoptions msgid "Docking options" msgstr "Opzioni di docking" diff --git a/components/anchordocking/languages/anchordockstr.lt.po b/components/anchordocking/languages/anchordockstr.lt.po index fbb54767c0..7297bbb9b1 100644 --- a/components/anchordocking/languages/anchordockstr.lt.po +++ b/components/anchordocking/languages/anchordockstr.lt.po @@ -1,4 +1,3 @@ - Valdas Jankunas , 2012. msgid "" msgstr "" "Content-Type: text/plain; charset=UTF-8\n" @@ -68,10 +67,6 @@ msgstr "Savoje pritvirtinimo vietoje %s%s%s gali būti tik viena vieta pritvirti msgid "Docking / Anchordocking" msgstr "Pritvirtinimas / Prieraišų pritvirtinimas" -#: anchordockstr.adrsdockingenabledrequiresarestartoftheide -msgid "Docking enabled (Requires a restart of the IDE)" -msgstr "Pritvirtinimas įgalintas (IKA būtina paleisti iš naujo)" - #: anchordockstr.adrsdockingoptions msgid "Docking options" msgstr "Pritvirtinimo parinktys" diff --git a/components/anchordocking/languages/anchordockstr.po b/components/anchordocking/languages/anchordockstr.po index a02dc9eb28..f763eebcd5 100644 --- a/components/anchordocking/languages/anchordockstr.po +++ b/components/anchordocking/languages/anchordockstr.po @@ -57,10 +57,6 @@ msgstr "" msgid "Docking / Anchordocking" msgstr "" -#: anchordockstr.adrsdockingenabledrequiresarestartoftheide -msgid "Docking enabled (Requires a restart of the IDE)" -msgstr "" - #: anchordockstr.adrsdockingoptions msgid "Docking options" msgstr "" diff --git a/components/anchordocking/languages/anchordockstr.pt_BR.po b/components/anchordocking/languages/anchordockstr.pt_BR.po index 015d2232a5..f6e5b0e63f 100644 --- a/components/anchordocking/languages/anchordockstr.pt_BR.po +++ b/components/anchordocking/languages/anchordockstr.pt_BR.po @@ -67,10 +67,6 @@ msgstr "Local de ancoragem customizado %s%s%s só pode ter um local." msgid "Docking / Anchordocking" msgstr "Docking / Anchordocking" -#: anchordockstr.adrsdockingenabledrequiresarestartoftheide -msgid "Docking enabled (Requires a restart of the IDE)" -msgstr "Ancoragem habilitada (Requer reinicio da IDE)" - #: anchordockstr.adrsdockingoptions msgid "Docking options" msgstr "Opções Ancoragem" diff --git a/components/anchordocking/languages/anchordockstr.ru.po b/components/anchordocking/languages/anchordockstr.ru.po index 18072f8cbf..e8bf680877 100644 --- a/components/anchordocking/languages/anchordockstr.ru.po +++ b/components/anchordocking/languages/anchordockstr.ru.po @@ -65,10 +65,6 @@ msgstr "Пользовательская область стыковки %s%s%s msgid "Docking / Anchordocking" msgstr "Стыковка / Anchordocking" -#: anchordockstr.adrsdockingenabledrequiresarestartoftheide -msgid "Docking enabled (Requires a restart of the IDE)" -msgstr "Включить стыковку (требует перезапуска IDE)" - #: anchordockstr.adrsdockingoptions msgid "Docking options" msgstr "Параметры стыковки" diff --git a/components/anchordocking/languages/anchordockstr.uk.po b/components/anchordocking/languages/anchordockstr.uk.po index 7731e48206..9be58d3bbd 100644 --- a/components/anchordocking/languages/anchordockstr.uk.po +++ b/components/anchordocking/languages/anchordockstr.uk.po @@ -1,4 +1,3 @@ - Igor Paliychuk , 2012. msgid "" msgstr "" "Project-Id-Version: \n" @@ -69,10 +68,6 @@ msgstr "Користув. область стикування %s%s%s може м msgid "Docking / Anchordocking" msgstr "Стикування / Якірне Стикування" -#: anchordockstr.adrsdockingenabledrequiresarestartoftheide -msgid "Docking enabled (Requires a restart of the IDE)" -msgstr "Стикування ввімкнене (Потребує перезавантажння IDE)" - #: anchordockstr.adrsdockingoptions msgid "Docking options" msgstr "Параметри стикування"