From 03b9097465e27b60cf1748bead024d750906f909 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Thu, 24 Dec 2009 16:34:29 +0100 Subject: [PATCH] - Bumped version to 0.6.1 - Added silk icon reference to the about dialog --- Client/CentrED.lpi | 6 +- Client/UfrmAbout.lfm | 296 ++++++++++++++++++++-------------------- Client/UfrmAbout.pas | 154 ++++++++++----------- Server/cedserver.lpi | 12 +- Setup/CentrED_win32.iss | 94 ++++++------- Setup/Changelog.txt | 257 +++++++++++++++++----------------- version.inc | 10 +- 7 files changed, 419 insertions(+), 410 deletions(-) diff --git a/Client/CentrED.lpi b/Client/CentrED.lpi index 8a748aa..6128ec5 100644 --- a/Client/CentrED.lpi +++ b/Client/CentrED.lpi @@ -18,10 +18,12 @@ - - + + + + diff --git a/Client/UfrmAbout.lfm b/Client/UfrmAbout.lfm index cf2d044..55fbf27 100644 --- a/Client/UfrmAbout.lfm +++ b/Client/UfrmAbout.lfm @@ -1,150 +1,146 @@ -object frmAbout: TfrmAbout - Left = 290 - Height = 308 - Top = 171 - Width = 354 - AutoSize = True - BorderIcons = [biSystemMenu] - BorderStyle = bsDialog - Caption = 'About CentrED' - ClientHeight = 308 - ClientWidth = 354 - Font.Height = -11 - OnCreate = FormCreate - Position = poScreenCenter - LCLVersion = '0.9.25' - object Label3: TLabel - Left = 8 - Height = 62 - Top = 204 - Width = 338 - Align = alTop - BorderSpacing.Top = 16 - BorderSpacing.Around = 8 - Caption = 'Ultima(tm) Online (c) 1997 Electronic Arts Inc. Ultima, the UO logo, Are You With Us?, ORIGIN, the ORIGIN logo and We create worlds are trademarks or registered trademarks of Electronic Arts Inc. in the U.S. and/or other countries. All rights reserved.' - ParentColor = False - ParentFont = True - WordWrap = True - end - object Label5: TLabel - Left = 8 - Height = 14 - Top = 120 - Width = 338 - Align = alTop - BorderSpacing.Left = 8 - BorderSpacing.Right = 8 - Caption = 'It is using the following great components:' - ParentColor = False - ParentFont = True - end - object Label6: TLabel - Left = 16 - Height = 46 - Top = 134 - Width = 330 - Align = alTop - BorderSpacing.Left = 16 - BorderSpacing.Right = 8 - Caption = '- Vampyre Imaging Lib by Marek Mauder'#13#10'- lNet by Ales Katona and Micha Nelissen'#13#10'- VirtualTrees by Mike Lischke' - ParentColor = False - ParentFont = True - end - object Label7: TLabel - Left = 8 - Height = 14 - Top = 106 - Width = 338 - Align = alTop - BorderSpacing.Left = 8 - BorderSpacing.Right = 8 - Caption = 'CentrED has been developed using Lazarus and FreePascal.' - ParentColor = False - ParentFont = True - WordWrap = True - end - object Panel2: TPanel - Height = 98 - Width = 354 - Align = alTop - AutoSize = True - BorderSpacing.Bottom = 8 - BevelOuter = bvNone - ClientHeight = 98 - ClientWidth = 354 - ParentFont = True - TabOrder = 0 - object Panel1: TPanel - Height = 98 - Width = 220 - AutoSize = True - BevelInner = bvRaised - BevelOuter = bvLowered - ClientHeight = 98 - ClientWidth = 220 - ParentFont = True - TabOrder = 0 - object Label1: TLabel - Left = 2 - Height = 38 - Top = 2 - Width = 216 - Align = alTop - Alignment = taCenter - AutoSize = False - Caption = 'UO CentrED' - Font.Height = -29 - Font.Style = [fsBold] - Layout = tlCenter - ParentColor = False - end - object lblVersion: TLabel - Left = 6 - Height = 25 - Top = 40 - Width = 208 - Align = alTop - Alignment = taRightJustify - BorderSpacing.Left = 4 - BorderSpacing.Right = 4 - ParentColor = False - ParentFont = True - end - object lblCopyright: TLabel - Left = 6 - Height = 25 - Top = 69 - Width = 208 - Align = alTop - Alignment = taCenter - BorderSpacing.Around = 4 - ParentColor = False - ParentFont = True - end - end - end - object Panel3: TPanel - Left = 8 - Height = 25 - Top = 274 - Width = 338 - Align = alTop - BorderSpacing.Around = 8 - BevelOuter = bvNone - ClientHeight = 25 - ClientWidth = 338 - ParentFont = True - TabOrder = 1 - object btnClose: TButton - Left = 263 - Height = 25 - Width = 75 - Align = alRight - BorderSpacing.InnerBorder = 4 - Caption = 'Close' - OnClick = btnCloseClick - ParentFont = True - TabOrder = 0 - end - end -end +object frmAbout: TfrmAbout + Left = 290 + Height = 308 + Top = 171 + Width = 354 + AutoSize = True + BorderIcons = [biSystemMenu] + BorderStyle = bsDialog + Caption = 'About CentrED' + ClientHeight = 308 + ClientWidth = 354 + Font.Height = -11 + OnCreate = FormCreate + Position = poScreenCenter + LCLVersion = '0.9.29' + object Label3: TLabel + Left = 8 + Height = 53 + Top = 189 + Width = 338 + Align = alTop + BorderSpacing.Top = 16 + BorderSpacing.Around = 8 + Caption = 'Ultima(tm) Online (c) 1997 Electronic Arts Inc. Ultima, the UO logo, Are You With Us?, ORIGIN, the ORIGIN logo and We create worlds are trademarks or registered trademarks of Electronic Arts Inc. in the U.S. and/or other countries. All rights reserved.' + ParentColor = False + WordWrap = True + end + object Label5: TLabel + Left = 8 + Height = 14 + Top = 98 + Width = 338 + Align = alTop + BorderSpacing.Left = 8 + BorderSpacing.Right = 8 + Caption = 'It is using the following great components:' + ParentColor = False + end + object Label6: TLabel + Left = 16 + Height = 53 + Top = 112 + Width = 330 + Align = alTop + BorderSpacing.Left = 16 + BorderSpacing.Right = 8 + Caption = '- Vampyre Imaging Lib by Marek Mauder'#13#10'- lNet by Ales Katona and Micha Nelissen'#13#10'- VirtualTrees by Mike Lischke'#13#10'- Silk Icons by Mark James' + ParentColor = False + end + object Label7: TLabel + Left = 8 + Height = 14 + Top = 84 + Width = 338 + Align = alTop + BorderSpacing.Left = 8 + BorderSpacing.Right = 8 + Caption = 'CentrED has been developed using Lazarus and FreePascal.' + ParentColor = False + WordWrap = True + end + object Panel2: TPanel + Left = 0 + Height = 76 + Top = 0 + Width = 354 + Align = alTop + AutoSize = True + BorderSpacing.Bottom = 8 + BevelOuter = bvNone + ClientHeight = 76 + ClientWidth = 354 + TabOrder = 0 + object Panel1: TPanel + Left = 0 + Height = 76 + Top = 0 + Width = 167 + AutoSize = True + BevelInner = bvRaised + BevelOuter = bvLowered + ClientHeight = 76 + ClientWidth = 167 + TabOrder = 0 + object Label1: TLabel + Left = 2 + Height = 38 + Top = 2 + Width = 163 + Align = alTop + Alignment = taCenter + AutoSize = False + Caption = 'UO CentrED' + Font.Height = -29 + Font.Style = [fsBold] + Layout = tlCenter + ParentColor = False + ParentFont = False + end + object lblVersion: TLabel + Left = 6 + Height = 14 + Top = 40 + Width = 155 + Align = alTop + Alignment = taRightJustify + BorderSpacing.Left = 4 + BorderSpacing.Right = 4 + ParentColor = False + end + object lblCopyright: TLabel + Left = 6 + Height = 14 + Top = 58 + Width = 155 + Align = alTop + Alignment = taCenter + BorderSpacing.Around = 4 + ParentColor = False + end + end + end + object Panel3: TPanel + Left = 8 + Height = 25 + Top = 250 + Width = 338 + Align = alTop + BorderSpacing.Around = 8 + BevelOuter = bvNone + ClientHeight = 25 + ClientWidth = 338 + TabOrder = 1 + object btnClose: TButton + Left = 263 + Height = 25 + Top = 0 + Width = 75 + Align = alRight + BorderSpacing.InnerBorder = 4 + Caption = 'Close' + OnClick = btnCloseClick + TabOrder = 0 + end + end +end diff --git a/Client/UfrmAbout.pas b/Client/UfrmAbout.pas index 1fd6921..97e495c 100644 --- a/Client/UfrmAbout.pas +++ b/Client/UfrmAbout.pas @@ -1,84 +1,84 @@ -(* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at - * http://www.opensource.org/licenses/cddl1.php. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at - * http://www.opensource.org/licenses/cddl1.php. If applicable, - * add the following below this CDDL HEADER, with the fields enclosed - * by brackets "[]" replaced with your own identifying * information: - * Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - * - * - * Portions Copyright 2007 Andreas Schneider - *) -unit UfrmAbout; - -{$mode objfpc}{$H+} - -interface - -uses - Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, StdCtrls, - ExtCtrls; - -type - - { TfrmAbout } - +(* + * CDDL HEADER START + * + * The contents of this file are subject to the terms of the + * Common Development and Distribution License, Version 1.0 only + * (the "License"). You may not use this file except in compliance + * with the License. + * + * You can obtain a copy of the license at + * http://www.opensource.org/licenses/cddl1.php. + * See the License for the specific language governing permissions + * and limitations under the License. + * + * When distributing Covered Code, include this CDDL HEADER in each + * file and include the License file at + * http://www.opensource.org/licenses/cddl1.php. If applicable, + * add the following below this CDDL HEADER, with the fields enclosed + * by brackets "[]" replaced with your own identifying * information: + * Portions Copyright [yyyy] [name of copyright owner] + * + * CDDL HEADER END + * + * + * Portions Copyright 2007 Andreas Schneider + *) +unit UfrmAbout; + +{$mode objfpc}{$H+} + +interface + +uses + Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, StdCtrls, + ExtCtrls; + +type + + { TfrmAbout } + TfrmAbout = class(TForm) btnClose: TButton; - Label1: TLabel; - Label3: TLabel; - Label5: TLabel; - Label6: TLabel; + Label1: TLabel; + Label3: TLabel; + Label5: TLabel; + Label6: TLabel; Label7: TLabel; lblCopyright: TLabel; lblVersion: TLabel; Panel1: TPanel; Panel2: TPanel; - Panel3: TPanel; - procedure btnCloseClick(Sender: TObject); - procedure FormCreate(Sender: TObject); - private - { private declarations } - public - { public declarations } - end; - -var - frmAbout: TfrmAbout; - -implementation - -{$I version.inc} - -{ TfrmAbout } - -procedure TfrmAbout.btnCloseClick(Sender: TObject); -begin - Close; -end; - -procedure TfrmAbout.FormCreate(Sender: TObject); -begin - lblVersion.Caption := Format('Version %s', [ProductVersion]); - lblCopyright.Caption := Format('Copyright %s', [Copyright]); -end; - -initialization - {$I UfrmAbout.lrs} - -end. - + Panel3: TPanel; + procedure btnCloseClick(Sender: TObject); + procedure FormCreate(Sender: TObject); + private + { private declarations } + public + { public declarations } + end; + +var + frmAbout: TfrmAbout; + +implementation + +{$I version.inc} + +{ TfrmAbout } + +procedure TfrmAbout.btnCloseClick(Sender: TObject); +begin + Close; +end; + +procedure TfrmAbout.FormCreate(Sender: TObject); +begin + lblVersion.Caption := Format('Version %s', [ProductVersion]); + lblCopyright.Caption := Format('Copyright %s', [Copyright]); +end; + +initialization + {$I UfrmAbout.lrs} + +end. + diff --git a/Server/cedserver.lpi b/Server/cedserver.lpi index 405f1f7..cc732e2 100644 --- a/Server/cedserver.lpi +++ b/Server/cedserver.lpi @@ -14,8 +14,9 @@ - - + + + @@ -144,14 +145,15 @@ - + - - + + +