Bernardo Magri 8 лет назад
Родитель
Сommit
23d7d39650
7 измененных файлов с 128 добавлено и 64 удалено
  1. 1 0
      src/main.lfm
  2. 10 2
      src/main.pas
  3. 8 1
      src/myBookShelf.lpi
  4. 2 1
      src/myBookShelf.lpr
  5. 72 60
      src/myBookShelf.lps
  6. 9 0
      src/unitsettingsdialog.lfm
  7. 26 0
      src/unitsettingsdialog.pas

+ 1 - 0
src/main.lfm

@@ -249,6 +249,7 @@ object Form1: TForm1
     Height = 42
     Top = 8
     Width = 42
+    OnClick = ButtonSettingsClick
     OnMouseEnter = ButtonSettingsMouseEnter
     OnMouseLeave = ButtonSettingsMouseLeave
   end

+ 10 - 2
src/main.pas

@@ -6,7 +6,7 @@ interface
 
 uses
   Classes, Sysutils, Fileutil, Forms, Controls, Graphics, Dialogs, ExtCtrls,
-  Book, BookCollection, LCLIntf, LResources, StdCtrls, LCLType;
+  Book, BookCollection, LCLIntf, LResources, StdCtrls, LCLType, unitSettingsDialog;
 
 
 type
@@ -23,6 +23,7 @@ type
     procedure Buttonaddclick(Sender: Tobject);
     procedure Buttonaddmouseenter(Sender: Tobject);
     procedure Buttonaddmouseleave(Sender: Tobject);
+    procedure ButtonSettingsClick(Sender: TObject);
     procedure Buttonsettingsmouseenter(Sender: Tobject);
     procedure Buttonsettingsmouseleave(Sender: Tobject);
     procedure Editsearchenter(Sender: Tobject);
@@ -56,6 +57,7 @@ var
   bookWidth,bookHeight:Integer;
 
 
+
 implementation
 
 {$R *.lfm}
@@ -220,6 +222,13 @@ begin
 Buttonadd.Picture:=mAdd;
 End;
 
+procedure Tform1.ButtonSettingsClick(Sender: TObject);
+var SettingsDialog: TSettingsDialog;
+begin
+     SettingsDialog:=TSettingsDialog.Create(nil);
+     SettingsDialog.ShowModal;
+end;
+
 procedure Tform1.Buttonsettingsmouseenter(Sender: Tobject);
 begin
 ButtonSettings.Picture:=mGearHover;
@@ -233,7 +242,6 @@ End;
 procedure Tform1.Editsearchenter(Sender: Tobject);
 begin
 EditSearch.Caption:='';
-
 End;
 
 procedure Tform1.Editsearchexit(Sender: Tobject);

+ 8 - 1
src/myBookShelf.lpi

@@ -122,7 +122,7 @@ in an easy way."/>
         <PackageName Value="LCL"/>
       </Item1>
     </RequiredPackages>
-    <Units Count="5">
+    <Units Count="6">
       <Unit0>
         <Filename Value="myBookShelf.lpr"/>
         <IsPartOfProject Value="True"/>
@@ -152,6 +152,13 @@ in an easy way."/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="UnitBookDialog"/>
       </Unit4>
+      <Unit5>
+        <Filename Value="unitsettingsdialog.pas"/>
+        <IsPartOfProject Value="True"/>
+        <ComponentName Value="SettingsDialog"/>
+        <ResourceBaseClass Value="Form"/>
+        <UnitName Value="unitSettingsDialog"/>
+      </Unit5>
     </Units>
   </ProjectOptions>
   <CompilerOptions>

+ 2 - 1
src/myBookShelf.lpr

@@ -7,7 +7,7 @@ uses
   Cthreads,
   {$ENDIF}{$ENDIF}
   Interfaces, // this includes the LCL widgetset
-  Forms, main, book, bookCollection, UnitBookDialog
+  Forms, main, book, bookCollection, UnitBookDialog, unitSettingsDialog
   { you can add units after this };
 
 {$R *.res}
@@ -17,6 +17,7 @@ begin
   Application.Initialize;
   Application.Createform(Tform1, Form1);
   Application.Createform(Tbookeditdialog, Bookeditdialog);
+  Application.CreateForm(TSettingsDialog, SettingsDialog);
   Application.Run;
 end.
 

+ 72 - 60
src/myBookShelf.lps

@@ -3,12 +3,12 @@
   <ProjectSession>
     <Version Value="10"/>
     <BuildModes Active="Default"/>
-    <Units Count="14">
+    <Units Count="15">
       <Unit0>
         <Filename Value="myBookShelf.lpr"/>
         <IsPartOfProject Value="True"/>
-        <CursorPos X="29" Y="22"/>
-        <UsageCount Value="65"/>
+        <CursorPos X="72" Y="10"/>
+        <UsageCount Value="70"/>
         <Loaded Value="True"/>
       </Unit0>
       <Unit1>
@@ -17,11 +17,10 @@
         <ComponentName Value="Form1"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <IsVisibleTab Value="True"/>
         <EditorIndex Value="4"/>
-        <TopLine Value="252"/>
-        <CursorPos X="31" Y="277"/>
-        <UsageCount Value="65"/>
+        <TopLine Value="216"/>
+        <CursorPos X="50" Y="229"/>
+        <UsageCount Value="70"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
       </Unit1>
@@ -30,9 +29,9 @@
         <IsPartOfProject Value="True"/>
         <UnitName Value="Book"/>
         <EditorIndex Value="2"/>
-        <TopLine Value="17"/>
+        <TopLine Value="82"/>
         <CursorPos X="36" Y="37"/>
-        <UsageCount Value="65"/>
+        <UsageCount Value="70"/>
         <Loaded Value="True"/>
       </Unit2>
       <Unit3>
@@ -42,7 +41,7 @@
         <EditorIndex Value="3"/>
         <TopLine Value="7"/>
         <CursorPos X="34" Y="28"/>
-        <UsageCount Value="62"/>
+        <UsageCount Value="67"/>
         <Loaded Value="True"/>
       </Unit3>
       <Unit4>
@@ -52,10 +51,10 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="UnitBookDialog"/>
-        <EditorIndex Value="5"/>
-        <TopLine Value="48"/>
+        <EditorIndex Value="6"/>
+        <TopLine Value="7"/>
         <CursorPos X="2" Y="67"/>
-        <UsageCount Value="43"/>
+        <UsageCount Value="48"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
       </Unit4>
@@ -112,7 +111,7 @@
       <Unit12>
         <Filename Value="main.lfm"/>
         <EditorIndex Value="1"/>
-        <UsageCount Value="24"/>
+        <UsageCount Value="26"/>
         <Loaded Value="True"/>
         <DefaultSyntaxHighlighter Value="LFM"/>
       </Unit12>
@@ -124,127 +123,140 @@
         <CursorPos Y="238"/>
         <UsageCount Value="8"/>
       </Unit13>
+      <Unit14>
+        <Filename Value="unitsettingsdialog.pas"/>
+        <IsPartOfProject Value="True"/>
+        <ComponentName Value="SettingsDialog"/>
+        <ResourceBaseClass Value="Form"/>
+        <UnitName Value="unitSettingsDialog"/>
+        <IsVisibleTab Value="True"/>
+        <EditorIndex Value="5"/>
+        <CursorPos X="55" Y="12"/>
+        <UsageCount Value="25"/>
+        <Loaded Value="True"/>
+        <LoadedDesigner Value="True"/>
+      </Unit14>
     </Units>
     <JumpHistory Count="30" HistoryIndex="29">
       <Position1>
         <Filename Value="main.pas"/>
-        <Caret Line="200" Column="3" TopLine="189"/>
+        <Caret Line="218" TopLine="211"/>
       </Position1>
       <Position2>
         <Filename Value="main.pas"/>
-        <Caret Line="199" Column="3" TopLine="188"/>
+        <Caret Line="229" Column="35" TopLine="210"/>
       </Position2>
       <Position3>
         <Filename Value="main.pas"/>
-        <Caret Line="200" Column="3" TopLine="189"/>
+        <Caret Line="230" Column="35" TopLine="211"/>
       </Position3>
       <Position4>
         <Filename Value="main.pas"/>
-        <Caret Line="218" TopLine="211"/>
+        <Caret Line="232" Column="24" TopLine="221"/>
       </Position4>
       <Position5>
         <Filename Value="main.pas"/>
-        <Caret Line="229" Column="35" TopLine="210"/>
+        <Caret Line="250" Column="15" TopLine="245"/>
       </Position5>
       <Position6>
         <Filename Value="main.pas"/>
-        <Caret Line="230" Column="35" TopLine="211"/>
+        <Caret Line="229" Column="17" TopLine="207"/>
       </Position6>
       <Position7>
         <Filename Value="main.pas"/>
-        <Caret Line="232" Column="24" TopLine="221"/>
+        <Caret Line="228" Column="5" TopLine="207"/>
       </Position7>
       <Position8>
         <Filename Value="main.pas"/>
-        <Caret Line="250" Column="15" TopLine="245"/>
+        <Caret Line="241" Column="7" TopLine="220"/>
       </Position8>
       <Position9>
         <Filename Value="main.pas"/>
-        <Caret Line="229" Column="17" TopLine="207"/>
+        <Caret Line="256" Column="30" TopLine="222"/>
       </Position9>
       <Position10>
         <Filename Value="main.pas"/>
-        <Caret Line="228" Column="5" TopLine="207"/>
+        <Caret Line="89" Column="28" TopLine="60"/>
       </Position10>
       <Position11>
         <Filename Value="main.pas"/>
-        <Caret Line="241" Column="7" TopLine="220"/>
+        <Caret Line="87" Column="28" TopLine="63"/>
       </Position11>
       <Position12>
-        <Filename Value="main.pas"/>
-        <Caret Line="256" Column="30" TopLine="222"/>
+        <Filename Value="book.pas"/>
+        <Caret Line="77" Column="124" TopLine="43"/>
       </Position12>
       <Position13>
-        <Filename Value="main.pas"/>
-        <Caret Line="89" Column="28" TopLine="60"/>
+        <Filename Value="book.pas"/>
+        <Caret Line="33" Column="29" TopLine="12"/>
       </Position13>
       <Position14>
-        <Filename Value="main.pas"/>
-        <Caret Line="87" Column="28" TopLine="63"/>
+        <Filename Value="book.pas"/>
+        <Caret Line="24" Column="28" TopLine="5"/>
       </Position14>
       <Position15>
         <Filename Value="book.pas"/>
-        <Caret Line="77" Column="124" TopLine="43"/>
+        <Caret Line="23" Column="7" TopLine="2"/>
       </Position15>
       <Position16>
-        <Filename Value="book.pas"/>
-        <Caret Line="33" Column="29" TopLine="12"/>
+        <Filename Value="main.pas"/>
+        <Caret Line="126" Column="32"/>
       </Position16>
       <Position17>
-        <Filename Value="book.pas"/>
-        <Caret Line="24" Column="28" TopLine="5"/>
+        <Filename Value="main.pas"/>
+        <Caret Line="9" Column="3"/>
       </Position17>
       <Position18>
-        <Filename Value="book.pas"/>
-        <Caret Line="23" Column="7" TopLine="2"/>
+        <Filename Value="main.pas"/>
+        <Caret Line="33" Column="59" TopLine="12"/>
       </Position18>
       <Position19>
-        <Filename Value="main.pas"/>
-        <Caret Line="126" Column="32"/>
+        <Filename Value="bookcollection.pas"/>
+        <Caret Line="44" Column="3" TopLine="5"/>
       </Position19>
       <Position20>
-        <Filename Value="main.pas"/>
-        <Caret Line="9" Column="3"/>
+        <Filename Value="bookcollection.pas"/>
+        <Caret Line="17" Column="5"/>
       </Position20>
       <Position21>
-        <Filename Value="main.pas"/>
-        <Caret Line="33" Column="59" TopLine="12"/>
+        <Filename Value="bookcollection.pas"/>
+        <Caret Line="16" Column="21"/>
       </Position21>
       <Position22>
-        <Filename Value="bookcollection.pas"/>
-        <Caret Line="44" Column="3" TopLine="5"/>
+        <Filename Value="book.pas"/>
+        <Caret Line="21" Column="27"/>
       </Position22>
       <Position23>
-        <Filename Value="bookcollection.pas"/>
-        <Caret Line="17" Column="5"/>
+        <Filename Value="main.pas"/>
+        <Caret Line="307" Column="5" TopLine="287"/>
       </Position23>
       <Position24>
-        <Filename Value="bookcollection.pas"/>
-        <Caret Line="16" Column="21"/>
+        <Filename Value="myBookShelf.lpr"/>
+        <Caret Line="13" Column="9"/>
       </Position24>
       <Position25>
-        <Filename Value="book.pas"/>
-        <Caret Line="21" Column="27"/>
+        <Filename Value="myBookShelf.lpr"/>
+        <Caret Line="22" Column="11"/>
       </Position25>
       <Position26>
-        <Filename Value="main.pas"/>
-        <Caret Line="307" Column="5" TopLine="287"/>
+        <Filename Value="myBookShelf.lpr"/>
+        <Caret Line="21"/>
       </Position26>
       <Position27>
         <Filename Value="myBookShelf.lpr"/>
-        <Caret Line="13" Column="9"/>
+        <Caret Line="14" Column="9"/>
       </Position27>
       <Position28>
-        <Filename Value="myBookShelf.lpr"/>
-        <Caret Line="22" Column="11"/>
+        <Filename Value="main.pas"/>
+        <Caret Line="23" Column="29" TopLine="20"/>
       </Position28>
       <Position29>
         <Filename Value="myBookShelf.lpr"/>
-        <Caret Line="21"/>
+        <Caret Line="23" Column="29"/>
       </Position29>
       <Position30>
-        <Filename Value="myBookShelf.lpr"/>
-        <Caret Line="14" Column="9"/>
+        <Filename Value="main.pas"/>
+        <Caret Line="58" Column="3" TopLine="32"/>
       </Position30>
     </JumpHistory>
   </ProjectSession>

+ 9 - 0
src/unitsettingsdialog.lfm

@@ -0,0 +1,9 @@
+object SettingsDialog: TSettingsDialog
+  Left = 732
+  Height = 387
+  Top = 298
+  Width = 678
+  BorderStyle = bsDialog
+  Caption = 'Settings'
+  LCLVersion = '1.6.4.0'
+end

+ 26 - 0
src/unitsettingsdialog.pas

@@ -0,0 +1,26 @@
+unit unitSettingsDialog;
+
+{$mode objfpc}{$H+}
+
+interface
+
+uses
+  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs;
+
+type
+  TSettingsDialog = class(TForm)
+  private
+    { private declarations }
+  public
+    { public declarations }
+  end;
+
+var
+  SettingsDialog: TSettingsDialog;
+
+implementation
+
+{$R *.lfm}
+
+end.
+