* Fix issue #3417: Use applicable default value of 0 instead of -1 for TCoolBand.Index

* Remove debug output
This commit is contained in:
Ansgar Becker
2013-11-09 12:16:40 +00:00
parent 3131bf3850
commit c0e57fdea6
2 changed files with 6 additions and 11 deletions

View File

@ -3052,7 +3052,7 @@ begin
InitSetting(asMainWinWidth, 'MainWinWidth', 800); InitSetting(asMainWinWidth, 'MainWinWidth', 800);
InitSetting(asMainWinHeight, 'MainWinHeight', 600); InitSetting(asMainWinHeight, 'MainWinHeight', 600);
InitSetting(asMainWinOnMonitor, 'MainWinOnMonitor', 1); InitSetting(asMainWinOnMonitor, 'MainWinOnMonitor', 1);
InitSetting(asCoolBandIndex, 'CoolBand%sIndex', -1); InitSetting(asCoolBandIndex, 'CoolBand%sIndex', 0);
InitSetting(asCoolBandBreak, 'CoolBand%sBreak', 0, True); InitSetting(asCoolBandBreak, 'CoolBand%sBreak', 0, True);
InitSetting(asCoolBandWidth, 'CoolBand%sWidth', 0); InitSetting(asCoolBandWidth, 'CoolBand%sWidth', 0);
InitSetting(asQuerymemoheight, 'querymemoheight', 100); InitSetting(asQuerymemoheight, 'querymemoheight', 100);

View File

@ -1348,7 +1348,6 @@ begin
// Save various settings // Save various settings
for i:=0 to CoolBarMainMenu.Bands.Count-1 do begin for i:=0 to CoolBarMainMenu.Bands.Count-1 do begin
BandId := IntToStr(CoolBarMainMenu.Bands[i].Id); BandId := IntToStr(CoolBarMainMenu.Bands[i].Id);
logsql('BandId: '+BandId);
AppSettings.WriteInt(asCoolBandIndex, CoolBarMainMenu.Bands[i].Index, BandId); AppSettings.WriteInt(asCoolBandIndex, CoolBarMainMenu.Bands[i].Index, BandId);
AppSettings.WriteBool(asCoolBandBreak, CoolBarMainMenu.Bands[i].Break, BandId); AppSettings.WriteBool(asCoolBandBreak, CoolBarMainMenu.Bands[i].Break, BandId);
AppSettings.WriteInt(asCoolBandWidth, CoolBarMainMenu.Bands[i].Width, BandId); AppSettings.WriteInt(asCoolBandWidth, CoolBarMainMenu.Bands[i].Width, BandId);
@ -1590,15 +1589,11 @@ begin
MakeFullyVisible(Screen.Monitors[MonitorIndex]); MakeFullyVisible(Screen.Monitors[MonitorIndex]);
// Configure toolbars // Configure toolbars
try for i:=0 to CoolBarMainMenu.Bands.Count-1 do begin
for i:=0 to CoolBarMainMenu.Bands.Count-1 do begin CoolBand := TCoolBand(CoolBarMainMenu.Bands.FindItemID(i));
CoolBand := TCoolBand(CoolBarMainMenu.Bands.FindItemID(i)); CoolBand.Index := AppSettings.ReadInt(asCoolBandIndex, IntToStr(CoolBand.ID), CoolBand.Index);
CoolBand.Index := AppSettings.ReadInt(asCoolBandIndex, IntToStr(CoolBand.ID), CoolBand.Index); CoolBand.Break := AppSettings.ReadBool(asCoolBandBreak, IntToStr(CoolBand.ID), CoolBand.Break);
CoolBand.Break := AppSettings.ReadBool(asCoolBandBreak, IntToStr(CoolBand.ID), CoolBand.Break); CoolBand.Width := AppSettings.ReadInt(asCoolBandWidth, IntToStr(CoolBand.ID), CoolBand.Width);
CoolBand.Width := AppSettings.ReadInt(asCoolBandWidth, IntToStr(CoolBand.ID), CoolBand.Width);
end;
except
// Temporarily silenced
end; end;
FHasDonatedDatabaseCheck := nbUnset; FHasDonatedDatabaseCheck := nbUnset;
lblDonate.Visible := HasDonated(True) <> nbTrue; lblDonate.Visible := HasDonated(True) <> nbTrue;