From: <jfu...@us...> - 2007-03-11 18:16:02
|
Revision: 11205 http://svn.sourceforge.net/jvcl/?rev=11205&view=rev Author: jfudickar Date: 2007-03-11 11:15:58 -0700 (Sun, 11 Mar 2007) Log Message: ----------- Different Fixes Modified Paths: -------------- trunk/jvcl/run/JvBaseDBLogonDialog.pas trunk/jvcl/run/JvBaseDBThreadedDataset.pas trunk/jvcl/run/JvDBActionsEngine.pas Modified: trunk/jvcl/run/JvBaseDBLogonDialog.pas =================================================================== --- trunk/jvcl/run/JvBaseDBLogonDialog.pas 2007-03-11 12:40:10 UTC (rev 11204) +++ trunk/jvcl/run/JvBaseDBLogonDialog.pas 2007-03-11 18:15:58 UTC (rev 11205) @@ -1744,7 +1744,6 @@ Change: Boolean; begin Change := Value <> FGroupByDatabase; - FGroupByDatabase := Value; if Change then begin if Assigned(IGroupByDatabaseCheckBox) then @@ -1757,6 +1756,7 @@ IGroupByUserCheckBox.ControlSetState(cbUnChecked); FillGroupTreeView; end; + FGroupByDatabase := Value; end; procedure TJvBaseDBLogonDialog.SetGroupByUser(Value: Boolean); @@ -1764,7 +1764,6 @@ Change: Boolean; begin Change := Value <> fGroupByUser; - fGroupByUser := Value; if Change then begin if Assigned(IGroupByUserCheckBox) then @@ -1777,6 +1776,7 @@ IGroupByDatabaseCheckBox.ControlSetState(cbUnChecked); FillGroupTreeView; end; + fGroupByUser := Value; end; procedure TJvBaseDBLogonDialog.SetOptions(const Value: TJvBaseDBLogonDialogOptions); Modified: trunk/jvcl/run/JvBaseDBThreadedDataset.pas =================================================================== --- trunk/jvcl/run/JvBaseDBThreadedDataset.pas 2007-03-11 12:40:10 UTC (rev 11204) +++ trunk/jvcl/run/JvBaseDBThreadedDataset.pas 2007-03-11 18:15:58 UTC (rev 11205) @@ -1057,37 +1057,37 @@ procedure TJvBaseDatasetThreadHandler.HandleAfterOpenRefresh; begin - CurrentOpenDuration := Now - FCurrentOperationStart; - FCurrentOperationStart := Now; - DatasetFetchAllRecords := FIntDatasetFetchAllRecords; - CurrentFetchDuration := 0; - if CurrentAction <> tdaCancel then - begin - CurrentAction := tdaFetch; - FetchMode := tdfmFetch; - if Dataset.Active then + try + CurrentOpenDuration := Now - FCurrentOperationStart; + FCurrentOperationStart := Now; + DatasetFetchAllRecords := FIntDatasetFetchAllRecords; + CurrentFetchDuration := 0; + if CurrentAction <> tdaCancel then begin - Dataset.First; - if DatasetFetchAllRecords then - IThreadedDatasetInterface.DoInheritedInternalLast - else - if (EnhancedOptions.FetchRowsFirst > Dataset.RecordCount) or - (FMoveToRecordAfterOpen > Dataset.RecordCount) then - if FMoveToRecordAfterOpen > EnhancedOptions.FetchRowsFirst then - Dataset.MoveBy(FMoveToRecordAfterOpen - 1) - else - Dataset.MoveBy(EnhancedOptions.FetchRowsFirst - 1); + CurrentAction := tdaFetch; + FetchMode := tdfmFetch; + if Dataset.Active then + begin + Dataset.First; + if DatasetFetchAllRecords then + IThreadedDatasetInterface.DoInheritedInternalLast + else + if (EnhancedOptions.FetchRowsFirst > Dataset.RecordCount) or + (FMoveToRecordAfterOpen > Dataset.RecordCount) then + if FMoveToRecordAfterOpen > EnhancedOptions.FetchRowsFirst then + Dataset.MoveBy(FMoveToRecordAfterOpen - 1) + else + Dataset.MoveBy(EnhancedOptions.FetchRowsFirst - 1); + end; end; - end; - try Dataset.Filtered := FIntDatasetWasFiltered; if Dataset.Active and (CurrentAction <> tdaCancel) then if FMoveToRecordAfterOpen > 0 then MoveTo(FMoveToRecordAfterOpen) else Dataset.First; + finally CurrentAction := tdaNothing; - finally ExecuteThreadSynchronize(Dataset.EnableControls); end; end; Modified: trunk/jvcl/run/JvDBActionsEngine.pas =================================================================== --- trunk/jvcl/run/JvDBActionsEngine.pas 2007-03-11 12:40:10 UTC (rev 11204) +++ trunk/jvcl/run/JvDBActionsEngine.pas 2007-03-11 18:15:58 UTC (rev 11205) @@ -550,7 +550,7 @@ TAccessCustomControl(AParentControl).Canvas.TextWidth('X') * Field.Size else begin - if (ADynControlEngineDB.GetFieldControlType(ds.DataSet.Fields[I])= jctDBMemo) and + if (ADynControlEngineDB.GetFieldControlType(Field)= jctDBMemo) and (FieldMaxWidth > 0) then Control.Width := FieldMaxWidth; end This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |