opensource/HeidiSQL
1
0
Fork 0
mirror of https://github.com/HeidiSQL/HeidiSQL.git synced 2026-03-13 09:24:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Do not add duplicate custom colors in color selector. Fixes issue #2704.

Browse Source
This commit is contained in:
Ansgar Becker
2012-02-07 21:00:06 +00:00
parent 000004d1d3
commit e4fb7bfe7f
1 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
source/main.pas
View File

@@ -3887,6 +3887,21 @@ var
Col: TColor;
ColString: String;
CharPostfix: Char;
function ValueExists(Value: String): Boolean;
var
j: Integer;
begin
// Value exists in string list?
Result := False;
for j:=0 to cs.Dialog.CustomColors.Count-1 do begin
if cs.Dialog.CustomColors.ValueFromIndex[j] = Value then begin
Result := True;
break;
end;
end;
end;
begin
// Select database tree background color
cs := TColorSelect.Create(Self);
@@ -3897,13 +3912,15 @@ begin
MainReg.GetKeyNames(SessionNames);
CharPostfix := 'A';
for i:=0 to SessionNames.Count-1 do begin
Col := GetRegValue(REGNAME_TREEBACKGROUND, clWhite, SessionNames[i]);
if Col <> clWhite then begin
Col := GetRegValue(REGNAME_TREEBACKGROUND, clDefault, SessionNames[i]);
if Col <> clDefault then begin
ColString := IntToHex(ColorToRgb(Col), 6);
cs.Dialog.CustomColors.Add('Color'+CharPostfix+'='+ColString);
if CharPostFix = 'P' then
break;
CharPostfix := Chr(Ord(CharPostfix)+1);
if not ValueExists(ColString) then begin
cs.Dialog.CustomColors.Add('Color'+CharPostfix+'='+ColString);
if cs.Dialog.CustomColors.Count >= MaxCustomColors then
break;
CharPostfix := Chr(Ord(CharPostfix)+1);
end;
end;
end;
if cs.Execute then begin