Changeset 28
- Timestamp:
- Dec 22, 2016, 6:01:41 PM (8 years ago)
- Location:
- trunk
- Files:
-
- 102 added
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Forms/UFormMain.lfm
r26 r28 9 9 Menu = MainMenu1 10 10 OnActivate = FormActivate 11 OnClose = FormClose 11 12 OnCreate = FormCreate 12 13 OnDestroy = FormDestroy … … 114 115 top = 206 115 116 end 117 object LastOpenedList1: TLastOpenedList 118 MaxCount = 10 119 OnChange = LastOpenedList1Change 120 left = 292 121 top = 112 122 end 116 123 end -
trunk/Forms/UFormMain.pas
r27 r28 7 7 uses 8 8 Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, Menus, 9 ExtCtrls, ComCtrls, types, LCLType ;9 ExtCtrls, ComCtrls, types, LCLType, ULastOpenedList, URegistry, Registry; 10 10 11 11 type … … 14 14 15 15 TFormMain = class(TForm) 16 LastOpenedList1: TLastOpenedList; 16 17 MainMenu1: TMainMenu; 17 18 MenuItem1: TMenuItem; … … 40 41 Timer1: TTimer; 41 42 procedure FormActivate(Sender: TObject); 43 procedure FormClose(Sender: TObject; var CloseAction: TCloseAction); 42 44 procedure FormCreate(Sender: TObject); 43 45 procedure FormDestroy(Sender: TObject); 44 46 procedure FormShow(Sender: TObject); 47 procedure LastOpenedList1Change(Sender: TObject); 45 48 procedure PaintBox1MouseDown(Sender: TObject; Button: TMouseButton; 46 49 Shift: TShiftState; X, Y: Integer); … … 64 67 MousePos: TPoint; 65 68 Activated: Boolean; 69 procedure OpenRecentClick(Sender: TObject); 66 70 public 67 71 procedure EraseBackground(DC: HDC); override; … … 94 98 end; 95 99 100 procedure TFormMain.OpenRecentClick(Sender: TObject); 101 begin 102 Core.ProjectOpen(TMenuItem(Sender).Caption); 103 end; 104 96 105 procedure TFormMain.EraseBackground(DC: HDC); 97 106 begin … … 120 129 TempBitmap.SetSize(View.SrcRect.Right - View.SrcRect.Left, 121 130 View.SrcRect.Bottom - View.SrcRect.Top); 122 //TempBitmap.BeginUpdate(True);131 TempBitmap.BeginUpdate(True); 123 132 TempBitmap.Canvas.Brush.Color := clBlack; 124 133 TempBitmap.Canvas.FillRect(0, 0, TempBitmap.Width, TempBitmap.Height); 125 134 View.DestRect := Bounds(0, 0, PaintBox1.Width, PaintBox1.Height); 126 //Bitmap.PaintToCanvas(TempBitmap.Canvas, View.SrcRect);127 Bitmap.PaintToBitmap(TempBitmap, View.SrcRect);128 //TempBitmap.EndUpdate(False);135 Bitmap.PaintToCanvas(TempBitmap.Canvas, View.SrcRect); 136 //Bitmap.PaintToBitmap(TempBitmap, View.SrcRect); 137 TempBitmap.EndUpdate(False); 129 138 PaintBox1.Canvas.StretchDraw(View.DestRect, TempBitmap); 130 139 //PaintBox1.Canvas.Draw(0, 0, TempBitmap); … … 147 156 end; 148 157 158 procedure TFormMain.FormClose(Sender: TObject; var CloseAction: TCloseAction); 159 begin 160 Core.PersistentForm1.Save(Self); 161 LastOpenedList1.SaveToRegistry(RegContext(HKEY(Core.ApplicationInfo1.RegistryRoot), 162 Core.ApplicationInfo1.RegistryKey + '\RecentFiles')); 163 end; 164 149 165 procedure TFormMain.FormDestroy(Sender: TObject); 150 166 begin … … 154 170 procedure TFormMain.FormShow(Sender: TObject); 155 171 begin 172 Core.PersistentForm1.Load(Self); 173 LastOpenedList1.LoadFromRegistry(RegContext(HKEY(Core.ApplicationInfo1.RegistryRoot), 174 Core.ApplicationInfo1.RegistryKey + '\RecentFiles')); 175 end; 176 177 procedure TFormMain.LastOpenedList1Change(Sender: TObject); 178 begin 179 LastOpenedList1.LoadToMenuItem(MenuItemRecentFiles, OpenRecentClick); 156 180 end; 157 181 -
trunk/Forms/UFormNew.lfm
r26 r28 7 7 ClientHeight = 300 8 8 ClientWidth = 497 9 OnClose = FormClose 9 10 OnShow = FormShow 10 11 LCLVersion = '1.6.2.0' -
trunk/Forms/UFormNew.pas
r26 r28 26 26 SpinEditWidth: TSpinEdit; 27 27 SpinEditHeight: TSpinEdit; 28 procedure FormClose(Sender: TObject; var CloseAction: TCloseAction); 28 29 procedure FormShow(Sender: TObject); 29 30 procedure SpinEditWidthChange(Sender: TObject); … … 40 41 41 42 {$R *.lfm} 43 44 uses 45 UCore; 42 46 43 47 { TFormNew } … … 57 61 I: Integer; 58 62 begin 63 Core.PersistentForm1.Load(Self); 64 59 65 ComboBoxColorFormat.Clear; 60 66 for I := 0 to ColorFormatManager.FormatCount - 1 do begin … … 71 77 end; 72 78 79 procedure TFormNew.FormClose(Sender: TObject; var CloseAction: TCloseAction); 80 begin 81 Core.PersistentForm1.Save(Self); 82 end; 83 73 84 end. 74 85 -
trunk/LibrePaint.lpi
r26 r28 66 66 </local> 67 67 </RunParams> 68 <RequiredPackages Count=" 2">68 <RequiredPackages Count="4"> 69 69 <Item1> 70 <PackageName Value="Common"/> 71 <DefaultFilename Value="Packages/Common/Common.lpk" Prefer="True"/> 72 </Item1> 73 <Item2> 74 <PackageName Value="TemplateGenerics"/> 75 <DefaultFilename Value="Packages/TemplateGenerics/TemplateGenerics.lpk" Prefer="True"/> 76 </Item2> 77 <Item3> 70 78 <PackageName Value="FastGraphics"/> 71 79 <DefaultFilename Value="Packages/FastGraphics/FastGraphics.lpk" Prefer="True"/> 72 </Item 1>73 <Item 2>80 </Item3> 81 <Item4> 74 82 <PackageName Value="LCL"/> 75 </Item 2>83 </Item4> 76 84 </RequiredPackages> 77 85 <Units Count="5"> -
trunk/LibrePaint.lpr
r26 r28 8 8 {$ENDIF}{$ENDIF} 9 9 Interfaces, // this includes the LCL widgetset 10 SysUtils, Forms, UCore, UProject, UFormNew, UFormMain; 10 SysUtils, Forms, UCore, UProject, TemplateGenerics, Common, UFormNew, 11 UFormMain; 11 12 12 13 {$R *.res} -
trunk/Packages/FastGraphics/ColorFormats/UColorRGB8.pas
r27 r28 92 92 function TPixmapRGB8.RGB8ToColor(Value: TColorRGB8): TColor; 93 93 begin 94 Result := (Value. B shl 16) or (Value.G shl 8) or (Value.Rshl 0);94 Result := (Value.R shl 16) or (Value.G shl 8) or (Value.B shl 0); 95 95 end; 96 96 -
trunk/UCore.lfm
r15 r28 105 105 top = 208 106 106 end 107 object PersistentForm1: TPersistentForm 108 MinVisiblePart = 50 109 EntireVisible = False 110 left = 64 111 top = 48 112 end 113 object ApplicationInfo1: TApplicationInfo 114 Identification = 1 115 VersionMajor = 1 116 VersionMinor = 0 117 VersionBugFix = 0 118 VersionSuffix = 'alfa' 119 CompanyName = 'Chronosoft' 120 HomePage = 'http://svn.zdechov.net/svn/LibrePaint' 121 AuthorsName = 'Chronos' 122 EmailContact = 'robie@centrum.cz' 123 AppName = 'LibrePaint' 124 ReleaseDate = 42726 125 RegistryKey = '\Software\Chronosoft\LibrePaint' 126 RegistryRoot = rrKeyCurrentUser 127 License = 'CC0' 128 left = 62 129 top = 133 130 end 107 131 end -
trunk/UCore.pas
r27 r28 6 6 7 7 uses 8 Classes, SysUtils, FileUtil, ActnList, UProject, UFGraphics, Controls, Graphics,9 ExtDlgs, ExtCtrls;8 Classes, SysUtils, FileUtil, ActnList, UProject, UFGraphics, UPersistentForm, 9 Controls, Graphics, ExtDlgs, ExtCtrls, UREgistry, UApplicationInfo, Registry; 10 10 11 11 const … … 29 29 AFileClose: TAction; 30 30 AFileOpen: TAction; 31 ApplicationInfo1: TApplicationInfo; 31 32 AZoomNormal: TAction; 32 33 AZoomAll: TAction; … … 39 40 ImageList1: TImageList; 40 41 OpenPictureDialog1: TOpenPictureDialog; 42 PersistentForm1: TPersistentForm; 41 43 SavePictureDialog1: TSavePictureDialog; 42 44 procedure AExitExecute(Sender: TObject); … … 59 61 procedure DataModuleDestroy(Sender: TObject); 60 62 private 61 { private declarations }62 63 public 63 64 Project: TProject; 65 procedure ProjectOpen(FileName: string); 64 66 procedure Init; 65 67 end; … … 94 96 end; 95 97 98 procedure TCore.ProjectOpen(FileName: string); 99 var 100 Image: TImage; 101 begin 102 FormMain.LastOpenedList1.AddItem(FileName); 103 Image := TImage.Create(nil); 104 Image.Picture.LoadFromFile(FileName); 105 Image.Picture.Bitmap.BeginUpdate(True); 106 Project.Bitmap.Size := Point(Image.Picture.Bitmap.Width, Image.Picture.Bitmap.Height); 107 Project.Bitmap.LoadFromCanvas(Image.Picture.Bitmap.Canvas); 108 Image.Picture.Bitmap.EndUpdate; 109 Image.Free; 110 AZoomAll.Execute; 111 FormMain.Redraw; 112 Project.FileName := FileName; 113 end; 114 96 115 procedure TCore.Init; 97 116 begin 117 PersistentForm1.RegistryContext := RegContext(HKEY(ApplicationInfo1.RegistryRoot), 118 ApplicationInfo1.RegistryKey); 119 98 120 // Set default 99 121 Project.Bitmap.ColorFormat := ColorFormatManager.Formats[0]; … … 162 184 163 185 procedure TCore.AFileOpenExecute(Sender: TObject); 164 var165 Image: TImage;166 186 begin 167 187 if OpenPictureDialog1.Execute then begin 168 Image := TImage.Create(nil); 169 Image.Picture.LoadFromFile(OpenPictureDialog1.FileName); 170 Image.Picture.Bitmap.BeginUpdate(True); 171 Project.Bitmap.Size := Point(Image.Picture.Bitmap.Width, Image.Picture.Bitmap.Height); 172 Project.Bitmap.LoadFromCanvas(Image.Picture.Bitmap.Canvas); 173 Image.Picture.Bitmap.EndUpdate; 174 Image.Free; 175 AZoomAll.Execute; 176 FormMain.Redraw; 177 Project.FileName := OpenPictureDialog1.FileName; 188 ProjectOpen(OpenPictureDialog1.FileName); 178 189 end; 179 190 end; … … 184 195 if SavePictureDialog1.Execute then begin 185 196 Project.FileName := SavePictureDialog1.FileName; 197 FormMain.LastOpenedList1.AddItem(SavePictureDialog1.FileName); 186 198 AFileSave.Execute; 187 199 end; … … 194 206 if Project.FileName = '' then AFileSaveAs.Execute 195 207 else begin 208 FormMain.LastOpenedList1.AddItem(SavePictureDialog1.FileName); 196 209 Image := TImage.Create(nil); 197 210 Image.Picture.Bitmap.SetSize(Project.Bitmap.Size.X, Project.Bitmap.Size.Y);
Note:
See TracChangeset
for help on using the changeset viewer.