From 4639bc83bf9bdca27b9fac2fa2874cdbfb8f4720 Mon Sep 17 00:00:00 2001 From: mattias Date: Thu, 8 Oct 2015 17:23:39 +0000 Subject: [PATCH] cody: find overloads: adjust columns, double click autosize column, nicer distances, resourcestrings git-svn-id: trunk@50004 - --- .../codetools/ide/codyfindoverloads.lfm | 2 +- .../codetools/ide/codyfindoverloads.pas | 24 ++++++++++++------- components/codetools/ide/codystrconsts.pas | 1 + .../ide/languages/codystrconsts.de.po | 4 ++++ .../ide/languages/codystrconsts.fr.po | 4 ++++ .../ide/languages/codystrconsts.hu.po | 4 ++++ .../ide/languages/codystrconsts.it.po | 4 ++++ .../ide/languages/codystrconsts.lt.po | 4 ++++ .../codetools/ide/languages/codystrconsts.po | 4 ++++ .../ide/languages/codystrconsts.pt_BR.po | 4 ++++ .../ide/languages/codystrconsts.ru.po | 4 ++++ .../ide/languages/codystrconsts.uk.po | 4 ++++ 12 files changed, 53 insertions(+), 10 deletions(-) diff --git a/components/codetools/ide/codyfindoverloads.lfm b/components/codetools/ide/codyfindoverloads.lfm index 75880145fa..b67903bd83 100644 --- a/components/codetools/ide/codyfindoverloads.lfm +++ b/components/codetools/ide/codyfindoverloads.lfm @@ -162,7 +162,7 @@ object CodyFindOverloadsWindow: TCodyFindOverloadsWindow TabOrder = 0 OnColRowExchanged = ResultsStringGridColRowExchanged OnCompareCells = ResultsStringGridCompareCells - OnDblClick = ResultsStringGridDblClick + OnMouseDown = ResultsStringGridMouseDown ColWidths = ( 182 100 diff --git a/components/codetools/ide/codyfindoverloads.pas b/components/codetools/ide/codyfindoverloads.pas index cd28cc1a1e..131deb48ad 100644 --- a/components/codetools/ide/codyfindoverloads.pas +++ b/components/codetools/ide/codyfindoverloads.pas @@ -36,7 +36,6 @@ -show line number -param compatibility -last visited - -filter by ancestor -hint: show file name + param list } unit CodyFindOverloads; @@ -138,7 +137,8 @@ type IsColumn: Boolean; sIndex, tIndex: Integer); procedure ResultsStringGridCompareCells(Sender: TObject; ACol, ARow, BCol, BRow: Integer; var Result: integer); - procedure ResultsStringGridDblClick(Sender: TObject); + procedure ResultsStringGridMouseDown(Sender: TObject; {%H-}Button: TMouseButton; + Shift: TShiftState; X, Y: Integer); procedure Timer1Timer(Sender: TObject); private FFilterAncestor: string; @@ -335,9 +335,16 @@ begin debugln(['TCodyFindOverloadsWindow.ResultsStringGridCompareCells invalid ACol=',ACol,' ARow=',ARow,' BCol=',BCol,' BRow=',BRow]); end; -procedure TCodyFindOverloadsWindow.ResultsStringGridDblClick(Sender: TObject); +procedure TCodyFindOverloadsWindow.ResultsStringGridMouseDown(Sender: TObject; + Button: TMouseButton; Shift: TShiftState; X, Y: Integer); +var + Col, Row: Longint; begin - JumpToIdentifier; + Col:=0; + Row:=0; + ResultsStringGrid.MouseToCell(X,Y,Col,Row); + if (Row>0) and (ssDouble in Shift) then + JumpToIdentifier; end; procedure TCodyFindOverloadsWindow.Timer1Timer(Sender: TObject); @@ -348,7 +355,7 @@ begin Cnt:=0; if FUsesGraph.FilesTree<>nil then Cnt:=FUsesGraph.FilesTree.Count; - ResultsGroupBox.Caption:=Format('Scanning: %s units ...', [IntToStr(Cnt)]); + ResultsGroupBox.Caption:=Format(crsScanningSUnits, [IntToStr(Cnt)]); end; procedure TCodyFindOverloadsWindow.SetIdleConnected(AValue: boolean); @@ -678,11 +685,11 @@ var Edge:=TCFOEdge(AVLNode.Data); NewDistance:=GraphNode.Distance; case Edge.Typ of - cfoetReachable: NewDistance+=100000;// not related + cfoetReachable: NewDistance+=50000;// not related cfoetMethodOf: ; // methods within one class are close cfoetDescendantOf: if GraphNode=Edge.FromNode then - NewDistance+=10 // going to the ancestors + NewDistance+=100 // going to the ancestors else NewDistance+=1; // going to the descendants end; @@ -813,8 +820,7 @@ begin Grid.EndUpdate(true); Grid.HandleNeeded; - - // ToDo: resize columns + Grid.AutoAdjustColumns; JumpToButton.Enabled:=Grid.Row>0; end; diff --git a/components/codetools/ide/codystrconsts.pas b/components/codetools/ide/codystrconsts.pas index 14ab7ed3fb..c7879d345c 100644 --- a/components/codetools/ide/codystrconsts.pas +++ b/components/codetools/ide/codystrconsts.pas @@ -268,6 +268,7 @@ resourcestring crsIncompatible = 'incompatible'; crsCodyFindOverloads = 'Cody - Find Overloads'; crsOnlyMethods = 'Only methods'; + crsScanningSUnits = 'Scanning: %s units ...'; crsOnlyDescendantsOf = 'Only descendants of %s'; crsOnlyNonMethods = 'Only non methods'; crsAny = 'Any'; diff --git a/components/codetools/ide/languages/codystrconsts.de.po b/components/codetools/ide/languages/codystrconsts.de.po index 36353076aa..1f7cd3d233 100644 --- a/components/codetools/ide/languages/codystrconsts.de.po +++ b/components/codetools/ide/languages/codystrconsts.de.po @@ -646,6 +646,10 @@ msgstr "Speichere Wörterbuch jetzt" msgid "Save to file %s" msgstr "" +#: codystrconsts.crsscanningsunits +msgid "Scanning: %s units ..." +msgstr "" + #: codystrconsts.crssearching msgid "searching ..." msgstr "" diff --git a/components/codetools/ide/languages/codystrconsts.fr.po b/components/codetools/ide/languages/codystrconsts.fr.po index bc0dd30a62..c9cc9f8059 100644 --- a/components/codetools/ide/languages/codystrconsts.fr.po +++ b/components/codetools/ide/languages/codystrconsts.fr.po @@ -647,6 +647,10 @@ msgstr "Enregistrer le dictionnaire tout de suite" msgid "Save to file %s" msgstr "Enregistrer dans le fichier %s" +#: codystrconsts.crsscanningsunits +msgid "Scanning: %s units ..." +msgstr "" + #: codystrconsts.crssearching msgid "searching ..." msgstr "recherche en cours..." diff --git a/components/codetools/ide/languages/codystrconsts.hu.po b/components/codetools/ide/languages/codystrconsts.hu.po index f94509e27a..df2a6e5586 100644 --- a/components/codetools/ide/languages/codystrconsts.hu.po +++ b/components/codetools/ide/languages/codystrconsts.hu.po @@ -647,6 +647,10 @@ msgstr "Szótár mentése most" msgid "Save to file %s" msgstr "Mentés fájlba: %s" +#: codystrconsts.crsscanningsunits +msgid "Scanning: %s units ..." +msgstr "" + #: codystrconsts.crssearching msgid "searching ..." msgstr "keresés ..." diff --git a/components/codetools/ide/languages/codystrconsts.it.po b/components/codetools/ide/languages/codystrconsts.it.po index 9e12065b9b..ba77e260f7 100644 --- a/components/codetools/ide/languages/codystrconsts.it.po +++ b/components/codetools/ide/languages/codystrconsts.it.po @@ -648,6 +648,10 @@ msgstr "Salvare il dizionario ora" msgid "Save to file %s" msgstr "Salvare nel file %s" +#: codystrconsts.crsscanningsunits +msgid "Scanning: %s units ..." +msgstr "" + #: codystrconsts.crssearching msgid "searching ..." msgstr "Ricerca in corso..." diff --git a/components/codetools/ide/languages/codystrconsts.lt.po b/components/codetools/ide/languages/codystrconsts.lt.po index 068de4c549..dc94a32fe7 100644 --- a/components/codetools/ide/languages/codystrconsts.lt.po +++ b/components/codetools/ide/languages/codystrconsts.lt.po @@ -647,6 +647,10 @@ msgstr "Žodyną įrašyti dabar" msgid "Save to file %s" msgstr "Įrašyti į failą „%s“" +#: codystrconsts.crsscanningsunits +msgid "Scanning: %s units ..." +msgstr "" + #: codystrconsts.crssearching msgid "searching ..." msgstr "ieškoma…" diff --git a/components/codetools/ide/languages/codystrconsts.po b/components/codetools/ide/languages/codystrconsts.po index 84dc821547..b34307cf23 100644 --- a/components/codetools/ide/languages/codystrconsts.po +++ b/components/codetools/ide/languages/codystrconsts.po @@ -637,6 +637,10 @@ msgstr "" msgid "Save to file %s" msgstr "" +#: codystrconsts.crsscanningsunits +msgid "Scanning: %s units ..." +msgstr "" + #: codystrconsts.crssearching msgid "searching ..." msgstr "" diff --git a/components/codetools/ide/languages/codystrconsts.pt_BR.po b/components/codetools/ide/languages/codystrconsts.pt_BR.po index 16e6e7fc16..ee1ec74d2e 100644 --- a/components/codetools/ide/languages/codystrconsts.pt_BR.po +++ b/components/codetools/ide/languages/codystrconsts.pt_BR.po @@ -657,6 +657,10 @@ msgstr "Salvar dicionário agora" msgid "Save to file %s" msgstr "Salvar para o arquivo %s" +#: codystrconsts.crsscanningsunits +msgid "Scanning: %s units ..." +msgstr "" + #: codystrconsts.crssearching msgid "searching ..." msgstr "localizando ..." diff --git a/components/codetools/ide/languages/codystrconsts.ru.po b/components/codetools/ide/languages/codystrconsts.ru.po index 151897d2be..895490e842 100644 --- a/components/codetools/ide/languages/codystrconsts.ru.po +++ b/components/codetools/ide/languages/codystrconsts.ru.po @@ -658,6 +658,10 @@ msgstr "Сохранить словарь сейчас" msgid "Save to file %s" msgstr "Сохранить в файл %s" +#: codystrconsts.crsscanningsunits +msgid "Scanning: %s units ..." +msgstr "" + #: codystrconsts.crssearching msgid "searching ..." msgstr "поиск ..." diff --git a/components/codetools/ide/languages/codystrconsts.uk.po b/components/codetools/ide/languages/codystrconsts.uk.po index 5c2cccb209..b53817686a 100644 --- a/components/codetools/ide/languages/codystrconsts.uk.po +++ b/components/codetools/ide/languages/codystrconsts.uk.po @@ -659,6 +659,10 @@ msgstr "" msgid "Save to file %s" msgstr "" +#: codystrconsts.crsscanningsunits +msgid "Scanning: %s units ..." +msgstr "" + #: codystrconsts.crssearching msgid "searching ..." msgstr "пошук ..."