From b0b014f66a6487cbc21de9346abcd6ce93c0fb7a Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Thu, 17 Dec 2009 21:05:46 +0100 Subject: [PATCH] - Added saving of random presets when creating or overwriting one --- Client/UfrmMain.lfm | 131 ++++++++++++++++++++++---------------------- Client/UfrmMain.pas | 11 +++- 2 files changed, 74 insertions(+), 68 deletions(-) diff --git a/Client/UfrmMain.lfm b/Client/UfrmMain.lfm index 34ca2de..a27b558 100644 --- a/Client/UfrmMain.lfm +++ b/Client/UfrmMain.lfm @@ -5,7 +5,7 @@ object frmMain: TfrmMain Width = 766 ActiveControl = oglGameWindow Caption = 'UO CentrED' - ClientHeight = 583 + ClientHeight = 580 ClientWidth = 766 Constraints.MinHeight = 603 Constraints.MinWidth = 766 @@ -23,7 +23,7 @@ object frmMain: TfrmMain object pnlBottom: TPanel Left = 0 Height = 31 - Top = 552 + Top = 549 Width = 766 Align = alBottom BevelOuter = bvNone @@ -34,7 +34,7 @@ object frmMain: TfrmMain Left = 11 Height = 14 Top = 7 - Width = 10 + Width = 11 Caption = 'X:' ParentColor = False end @@ -42,7 +42,7 @@ object frmMain: TfrmMain Left = 88 Height = 14 Top = 7 - Width = 9 + Width = 10 Caption = 'Y:' ParentColor = False end @@ -55,10 +55,10 @@ object frmMain: TfrmMain ParentColor = False end object lblTip: TLabel - Left = 534 + Left = 528 Height = 31 Top = 0 - Width = 224 + Width = 230 Align = alRight Alignment = taRightJustify BorderSpacing.Right = 8 @@ -67,10 +67,10 @@ object frmMain: TfrmMain ParentColor = False end object lblTipC: TLabel - Left = 511 + Left = 498 Height = 31 Top = 0 - Width = 23 + Width = 30 Align = alRight Caption = 'Tip: ' Font.Height = -11 @@ -81,7 +81,7 @@ object frmMain: TfrmMain end object edX: TSpinEdit Left = 24 - Height = 21 + Height = 19 Top = 3 Width = 55 MaxValue = 100000 @@ -89,7 +89,7 @@ object frmMain: TfrmMain end object edY: TSpinEdit Left = 104 - Height = 21 + Height = 19 Top = 3 Width = 52 MaxValue = 100000 @@ -108,7 +108,7 @@ object frmMain: TfrmMain end object pcLeft: TPageControl Left = 0 - Height = 528 + Height = 525 Top = 24 Width = 224 ActivePage = tsTiles @@ -117,13 +117,13 @@ object frmMain: TfrmMain TabOrder = 1 object tsTiles: TTabSheet Caption = 'Tiles' - ClientHeight = 502 - ClientWidth = 216 + ClientHeight = 492 + ClientWidth = 218 object lblFilter: TLabel AnchorSideLeft.Control = cbTerrain AnchorSideLeft.Side = asrBottom AnchorSideTop.Control = cbTerrain - Left = 75 + Left = 81 Height = 14 Top = 8 Width = 30 @@ -140,9 +140,9 @@ object frmMain: TfrmMain AnchorSideRight.Side = asrBottom AnchorSideBottom.Control = spTileList Left = 4 - Height = 258 - Top = 50 - Width = 208 + Height = 242 + Top = 56 + Width = 210 Anchors = [akTop, akLeft, akRight, akBottom] BorderSpacing.Left = 4 BorderSpacing.Top = 4 @@ -194,13 +194,13 @@ object frmMain: TfrmMain AnchorSideBottom.Side = asrBottom Left = 0 Height = 189 - Top = 313 - Width = 216 + Top = 303 + Width = 218 Align = alBottom Anchors = [akTop, akLeft, akRight, akBottom] Caption = 'Random pool' - ClientHeight = 171 - ClientWidth = 212 + ClientHeight = 175 + ClientWidth = 216 TabOrder = 1 object btnAddRandom: TSpeedButton AnchorSideLeft.Control = gbRandom @@ -360,10 +360,10 @@ object frmMain: TfrmMain object btnRandomPresetSave: TSpeedButton AnchorSideTop.Control = cbRandomPreset AnchorSideRight.Control = btnRandomPresetDelete - Left = 160 + Left = 164 Height = 22 Hint = 'Save Preset' - Top = 146 + Top = 142 Width = 22 Anchors = [akTop, akRight] BorderSpacing.Right = 4 @@ -414,10 +414,10 @@ object frmMain: TfrmMain AnchorSideTop.Control = btnRandomPresetSave AnchorSideRight.Control = gbRandom AnchorSideRight.Side = asrBottom - Left = 186 + Left = 190 Height = 22 Hint = 'Delete Preset' - Top = 146 + Top = 142 Width = 22 Anchors = [akTop, akRight] BorderSpacing.Right = 4 @@ -474,9 +474,9 @@ object frmMain: TfrmMain AnchorSideBottom.Control = cbRandomPreset Cursor = 63 Left = 4 - Height = 118 + Height = 114 Top = 24 - Width = 204 + Width = 208 Anchors = [akTop, akLeft, akRight, akBottom] BorderSpacing.Left = 4 BorderSpacing.Top = 2 @@ -522,14 +522,14 @@ object frmMain: TfrmMain AnchorSideBottom.Control = gbRandom AnchorSideBottom.Side = asrBottom Left = 4 - Height = 21 - Top = 146 - Width = 152 + Height = 29 + Top = 142 + Width = 156 Anchors = [akLeft, akRight, akBottom] BorderSpacing.Left = 4 BorderSpacing.Right = 4 BorderSpacing.Bottom = 4 - ItemHeight = 13 + ItemHeight = 0 OnChange = cbRandomPresetChange Sorted = True Style = csDropDownList @@ -543,8 +543,8 @@ object frmMain: TfrmMain Cursor = crVSplit Left = 0 Height = 5 - Top = 308 - Width = 216 + Top = 298 + Width = 218 Align = alNone Anchors = [akLeft, akRight, akBottom] ResizeAnchor = akBottom @@ -554,10 +554,10 @@ object frmMain: TfrmMain AnchorSideRight.Side = asrBottom AnchorSideBottom.Control = vdtTiles AnchorSideBottom.Side = asrBottom - Left = 108 - Height = 21 + Left = 110 + Height = 19 Hint = 'Append S or T to restrict the search to Statics or Terrain.' - Top = 279 + Top = 271 Width = 96 Anchors = [akRight, akBottom] BorderSpacing.Right = 8 @@ -576,10 +576,10 @@ object frmMain: TfrmMain AnchorSideTop.Side = asrBottom AnchorSideRight.Control = tsTiles AnchorSideRight.Side = asrBottom - Left = 75 - Height = 21 + Left = 81 + Height = 19 Top = 22 - Width = 125 + Width = 121 Anchors = [akTop, akLeft, akRight] BorderSpacing.Right = 16 OnEditingDone = edFilterEditingDone @@ -590,10 +590,10 @@ object frmMain: TfrmMain AnchorSideLeft.Side = asrCenter AnchorSideTop.Control = cbTerrain AnchorSideTop.Side = asrBottom - Left = 5 - Height = 19 - Top = 27 - Width = 53 + Left = 4 + Height = 22 + Top = 30 + Width = 60 Caption = 'Statics' Checked = True OnChange = cbStaticsChange @@ -604,9 +604,9 @@ object frmMain: TfrmMain AnchorSideLeft.Control = tsTiles AnchorSideTop.Control = tsTiles Left = 4 - Height = 19 + Height = 22 Top = 8 - Width = 55 + Width = 61 BorderSpacing.Left = 4 BorderSpacing.Top = 8 Caption = 'Terrain' @@ -618,25 +618,26 @@ object frmMain: TfrmMain end object tsClients: TTabSheet Caption = 'Clients' - ClientHeight = 499 - ClientWidth = 216 + ClientHeight = 495 + ClientWidth = 218 object lbClients: TListBox Left = 0 - Height = 499 + Height = 495 Top = 0 - Width = 216 + Width = 218 Align = alClient ItemHeight = 0 OnDblClick = mnuGoToClientClick PopupMenu = pmClients Sorted = True TabOrder = 0 + TopIndex = -1 end end object tsLocations: TTabSheet Caption = 'Locations' - ClientHeight = 499 - ClientWidth = 216 + ClientHeight = 495 + ClientWidth = 218 object btnClearLocations: TSpeedButton AnchorSideLeft.Control = btnDeleteLocation AnchorSideLeft.Side = asrBottom @@ -644,7 +645,7 @@ object frmMain: TfrmMain Left = 125 Height = 22 Hint = 'Clear' - Top = 473 + Top = 469 Width = 23 BorderSpacing.Left = 4 Color = clBtnFace @@ -697,7 +698,7 @@ object frmMain: TfrmMain Left = 98 Height = 22 Hint = 'Delete' - Top = 473 + Top = 469 Width = 23 Anchors = [akLeft, akBottom] BorderSpacing.Bottom = 4 @@ -749,7 +750,7 @@ object frmMain: TfrmMain Left = 71 Height = 22 Hint = 'Add' - Top = 473 + Top = 469 Width = 23 Anchors = [akTop, akRight] BorderSpacing.Right = 4 @@ -803,9 +804,9 @@ object frmMain: TfrmMain AnchorSideBottom.Control = btnDeleteLocation Cursor = 63 Left = 4 - Height = 465 + Height = 461 Top = 4 - Width = 208 + Width = 210 Anchors = [akTop, akLeft, akRight, akBottom] BorderSpacing.Around = 4 BorderStyle = bsSingle @@ -820,7 +821,7 @@ object frmMain: TfrmMain item Position = 1 Text = 'Name' - Width = 129 + Width = 131 end> Header.DefaultHeight = 17 Header.Options = [hoAutoResize, hoColumnResize, hoDrag, hoVisible] @@ -1028,7 +1029,7 @@ object frmMain: TfrmMain AnchorSideBottom.Control = spChat Left = 224 Height = 22 - Top = 416 + Top = 413 Width = 542 Anchors = [akLeft, akRight, akBottom] BevelInner = bvRaised @@ -1041,7 +1042,7 @@ object frmMain: TfrmMain Left = 10 Height = 18 Top = 2 - Width = 101 + Width = 104 Align = alLeft BorderSpacing.Left = 8 Caption = 'Chat and Messages' @@ -1062,7 +1063,7 @@ object frmMain: TfrmMain AnchorSideBottom.Control = pnlBottom Left = 224 Height = 109 - Top = 443 + Top = 440 Width = 542 Anchors = [akTop, akLeft, akRight, akBottom] BevelOuter = bvNone @@ -1073,7 +1074,7 @@ object frmMain: TfrmMain object vstChat: TVirtualStringTree Cursor = 63 Left = 0 - Height = 88 + Height = 90 Top = 0 Width = 542 Align = alClient @@ -1111,8 +1112,8 @@ object frmMain: TfrmMain end object edChat: TEdit Left = 0 - Height = 21 - Top = 88 + Height = 19 + Top = 90 Width = 542 Align = alBottom OnKeyPress = edChatKeyPress @@ -1127,7 +1128,7 @@ object frmMain: TfrmMain Cursor = crVSplit Left = 224 Height = 5 - Top = 438 + Top = 435 Width = 542 Align = alNone Anchors = [akLeft, akRight, akBottom] @@ -1144,7 +1145,7 @@ object frmMain: TfrmMain AnchorSideRight.Side = asrBottom AnchorSideBottom.Control = pnlChatHeader Left = 224 - Height = 392 + Height = 389 Top = 24 Width = 542 Anchors = [akTop, akLeft, akRight, akBottom] diff --git a/Client/UfrmMain.pas b/Client/UfrmMain.pas index 83d6046..c6a46ee 100644 --- a/Client/UfrmMain.pas +++ b/Client/UfrmMain.pas @@ -955,6 +955,8 @@ begin end; cbRandomPreset.ItemIndex := cbRandomPreset.Items.IndexOfObject(preset); + + SaveRandomPresets; end; end; @@ -2491,7 +2493,8 @@ begin acElevate.Enabled := (dmNetwork.AccessLevel >= alNormal); acDelete.Enabled := (dmNetwork.AccessLevel >= alNormal); acHue.Enabled := (dmNetwork.AccessLevel >= alNormal); - Caption := Format('UO CentrED - [%s (%s)]', [dmNetwork.Username, GetAccessLevelString(dmNetwork.AccessLevel)]); + Caption := Format('UO CentrED - [%s (%s)]', [dmNetwork.Username, + GetAccessLevelString(dmNetwork.AccessLevel)]); end; procedure TfrmMain.RebuildScreenBuffer; @@ -2502,7 +2505,8 @@ var begin Logger.EnterMethod([lcClient], 'RebuildScreenBuffer'); - FDrawDistance := Trunc(Sqrt(oglGameWindow.Width * oglGameWindow.Width + oglGamewindow.Height * oglGamewindow.Height) / 44); + FDrawDistance := Trunc(Sqrt(oglGameWindow.Width * oglGameWindow.Width + + oglGamewindow.Height * oglGamewindow.Height) / 44); Logger.Send([lcClient], 'DrawDistance', FDrawDistance); {$HINTS off}{$WARNINGS off} @@ -2515,7 +2519,8 @@ begin FRangeX := FHighOffsetX - FLowOffsetX; FRangeY := FHighOffsetY - FLowOffsetY; - FLandscape.PrepareBlocks((FX + FLowOffsetX) div 8, (FY + FLowOffsetY) div 8, (FX + FHighOffsetX) div 8 + 1, (FY + FHighOffsetY) div 8 + 1); + FLandscape.PrepareBlocks((FX + FLowOffsetX) div 8, (FY + FLowOffsetY) div 8, + (FX + FHighOffsetX) div 8 + 1, (FY + FHighOffsetY) div 8 + 1); if frmVirtualLayer.cbShowLayer.Checked then begin