New Version Release -vs2.3 - fix Bugs

* fix currency format
miguelhp373 · Jul 11, 2022 · 11c4610 · 11c4610
1 parent 3ca67c1
commit 11c4610
Show file tree

Hide file tree

Showing 11 changed files with 51 additions and 25 deletions.
diff --git a/NumismaticPro.dpr b/NumismaticPro.dpr
@@ -6,7 +6,8 @@ uses
   U_DataModule in 'U_DataModule.pas' {DataModule1: TDataModule},
   U_FrInfo in 'U_FrInfo.pas' {FrInfo},
   U_Config in 'U_Config.pas' {FrConfig},
-  U_SelectDatabase in 'U_SelectDatabase.pas' {FrSelectDatabase};
+  U_SelectDatabase in 'U_SelectDatabase.pas' {FrSelectDatabase},
+  U_Format in '..\Utils\U_Format.pas';
 
 {$R *.res}
 

diff --git a/NumismaticPro.dproj b/NumismaticPro.dproj
@@ -126,6 +126,7 @@
             <Form>FrSelectDatabase</Form>
             <FormType>dfm</FormType>
         </DCCReference>
+        <DCCReference Include="..\Utils\U_Format.pas"/>
         <BuildConfiguration Include="Release">
             <Key>Cfg_2</Key>
             <CfgParent>Base</CfgParent>

diff --git a/NumismaticPro.dproj.local b/NumismaticPro.dproj.local
@@ -2,26 +2,30 @@
 <BorlandProject>
 	<Transactions>
     <Transaction>2022/02/12 18:52:32.000.261,=C:\Users\migue\OneDrive\Documentos\Embarcadero\Studio\Projects\Unit1.pas</Transaction>
-    <Transaction>2022/02/12 18:54:20.000.960,C:\Users\migue\OneDrive\Documentos\Embarcadero\Studio\Projects\Unit1.pas=C:\Users\migue\OneDrive\Documentos\Projetos\Delphi\NumismaticProDesktop\Menu.pas</Transaction>
-    <Transaction>2022/02/12 18:54:20.000.960,C:\Users\migue\OneDrive\Documentos\Embarcadero\Studio\Projects\Unit1.dfm=C:\Users\migue\OneDrive\Documentos\Projetos\Delphi\NumismaticProDesktop\Menu.dfm</Transaction>
-    <Transaction>2022/02/12 18:54:29.000.479,C:\Users\migue\OneDrive\Documentos\Embarcadero\Studio\Projects\Project1.dproj=C:\Users\migue\OneDrive\Documentos\Projetos\Delphi\NumismaticProDesktop\NumismaticPro.dproj</Transaction>
+    <Transaction>2022/02/12 18:54:20.000.960,C:\Users\migue\OneDrive\Documentos\Projetos\Delphi\NumismaticProDesktop\Menu.dfm=C:\Users\migue\OneDrive\Documentos\Embarcadero\Studio\Projects\Unit1.dfm</Transaction>
+    <Transaction>2022/02/12 18:54:20.000.960,C:\Users\migue\OneDrive\Documentos\Projetos\Delphi\NumismaticProDesktop\Menu.pas=C:\Users\migue\OneDrive\Documentos\Embarcadero\Studio\Projects\Unit1.pas</Transaction>
+    <Transaction>2022/02/12 18:54:29.000.479,C:\Users\migue\OneDrive\Documentos\Projetos\Delphi\NumismaticProDesktop\NumismaticPro.dproj=C:\Users\migue\OneDrive\Documentos\Embarcadero\Studio\Projects\Project1.dproj</Transaction>
     <Transaction>2022/02/12 18:55:04.000.408,C:\Users\migue\OneDrive\Documentos\Projetos\Delphi\NumismaticProDesktop\NumismaticPro.dproj=C:\Users\migue\OneDrive\Documentos\Projetos\Delphi\NumismaticProDesktop\NumismaticPro.dproj</Transaction>
-    <Transaction>2022/02/12 19:01:29.000.684,C:\Users\migue\OneDrive\Documentos\Projetos\Delphi\NumismaticProDesktop\Menu.pas=C:\Users\migue\OneDrive\Documentos\Projetos\Delphi\NumismaticProDesktop\U_Menu.pas</Transaction>
-    <Transaction>2022/02/12 19:01:29.000.684,C:\Users\migue\OneDrive\Documentos\Projetos\Delphi\NumismaticProDesktop\Menu.dfm=C:\Users\migue\OneDrive\Documentos\Projetos\Delphi\NumismaticProDesktop\U_Menu.dfm</Transaction>
+    <Transaction>2022/02/12 19:01:29.000.684,C:\Users\migue\OneDrive\Documentos\Projetos\Delphi\NumismaticProDesktop\U_Menu.dfm=C:\Users\migue\OneDrive\Documentos\Projetos\Delphi\NumismaticProDesktop\Menu.dfm</Transaction>
+    <Transaction>2022/02/12 19:01:29.000.684,C:\Users\migue\OneDrive\Documentos\Projetos\Delphi\NumismaticProDesktop\U_Menu.pas=C:\Users\migue\OneDrive\Documentos\Projetos\Delphi\NumismaticProDesktop\Menu.pas</Transaction>
     <Transaction>2022/02/12 19:40:56.000.882,=C:\Users\migue\OneDrive\Documentos\Projetos\Delphi\NumismaticProDesktop\Unit1.pas</Transaction>
-    <Transaction>2022/02/12 19:41:05.000.964,C:\Users\migue\OneDrive\Documentos\Projetos\Delphi\NumismaticProDesktop\Unit1.dfm=C:\Users\migue\OneDrive\Documentos\Projetos\Delphi\NumismaticProDesktop\U_DataModule.dfm</Transaction>
-    <Transaction>2022/02/12 19:41:05.000.964,C:\Users\migue\OneDrive\Documentos\Projetos\Delphi\NumismaticProDesktop\Unit1.pas=C:\Users\migue\OneDrive\Documentos\Projetos\Delphi\NumismaticProDesktop\U_DataModule.pas</Transaction>
+    <Transaction>2022/02/12 19:41:05.000.964,C:\Users\migue\OneDrive\Documentos\Projetos\Delphi\NumismaticProDesktop\U_DataModule.dfm=C:\Users\migue\OneDrive\Documentos\Projetos\Delphi\NumismaticProDesktop\Unit1.dfm</Transaction>
+    <Transaction>2022/02/12 19:41:05.000.964,C:\Users\migue\OneDrive\Documentos\Projetos\Delphi\NumismaticProDesktop\U_DataModule.pas=C:\Users\migue\OneDrive\Documentos\Projetos\Delphi\NumismaticProDesktop\Unit1.pas</Transaction>
     <Transaction>2022/02/12 19:58:39.000.400,=C:\Users\migue\OneDrive\Documentos\Projetos\Delphi\NumismaticProDesktop\Unit1.pas</Transaction>
-    <Transaction>2022/02/12 19:59:05.000.404,C:\Users\migue\OneDrive\Documentos\Projetos\Delphi\NumismaticProDesktop\Unit1.pas=C:\Users\migue\OneDrive\Documentos\Projetos\Delphi\NumismaticProDesktop\U_FrInfo.pas</Transaction>
-    <Transaction>2022/02/12 19:59:05.000.404,C:\Users\migue\OneDrive\Documentos\Projetos\Delphi\NumismaticProDesktop\Unit1.dfm=C:\Users\migue\OneDrive\Documentos\Projetos\Delphi\NumismaticProDesktop\U_FrInfo.dfm</Transaction>
+    <Transaction>2022/02/12 19:59:05.000.404,C:\Users\migue\OneDrive\Documentos\Projetos\Delphi\NumismaticProDesktop\U_FrInfo.dfm=C:\Users\migue\OneDrive\Documentos\Projetos\Delphi\NumismaticProDesktop\Unit1.dfm</Transaction>
+    <Transaction>2022/02/12 19:59:05.000.404,C:\Users\migue\OneDrive\Documentos\Projetos\Delphi\NumismaticProDesktop\U_FrInfo.pas=C:\Users\migue\OneDrive\Documentos\Projetos\Delphi\NumismaticProDesktop\Unit1.pas</Transaction>
     <Transaction>2022/02/28 21:24:54.000.012,=C:\Users\migue\OneDrive\Documentos\Projetos\Delphi\NumismaticProDesktop\Unit1.pas</Transaction>
-    <Transaction>2022/02/28 21:25:16.000.149,C:\Users\migue\OneDrive\Documentos\Projetos\Delphi\NumismaticProDesktop\U_Config.dfm=C:\Users\migue\OneDrive\Documentos\Projetos\Delphi\NumismaticProDesktop\Unit1.dfm</Transaction>
-    <Transaction>2022/02/28 21:25:16.000.149,C:\Users\migue\OneDrive\Documentos\Projetos\Delphi\NumismaticProDesktop\U_Config.pas=C:\Users\migue\OneDrive\Documentos\Projetos\Delphi\NumismaticProDesktop\Unit1.pas</Transaction>
+    <Transaction>2022/02/28 21:25:16.000.149,C:\Users\migue\OneDrive\Documentos\Projetos\Delphi\NumismaticProDesktop\Unit1.dfm=C:\Users\migue\OneDrive\Documentos\Projetos\Delphi\NumismaticProDesktop\U_Config.dfm</Transaction>
+    <Transaction>2022/02/28 21:25:16.000.149,C:\Users\migue\OneDrive\Documentos\Projetos\Delphi\NumismaticProDesktop\Unit1.pas=C:\Users\migue\OneDrive\Documentos\Projetos\Delphi\NumismaticProDesktop\U_Config.pas</Transaction>
     <Transaction>2022/03/05 14:49:03.000.482,=C:\Users\migue\OneDrive\Documentos\Projetos\Delphi\NumismaticProDesktop\Unit1.pas</Transaction>
-    <Transaction>2022/03/05 14:52:36.000.423,C:\Users\migue\OneDrive\Documentos\Projetos\Delphi\NumismaticProDesktop\U_SelectDatabase.dfm=C:\Users\migue\OneDrive\Documentos\Projetos\Delphi\NumismaticProDesktop\Unit1.dfm</Transaction>
-    <Transaction>2022/03/05 14:52:36.000.423,C:\Users\migue\OneDrive\Documentos\Projetos\Delphi\NumismaticProDesktop\U_SelectDatabase.pas=C:\Users\migue\OneDrive\Documentos\Projetos\Delphi\NumismaticProDesktop\Unit1.pas</Transaction>
+    <Transaction>2022/03/05 14:52:36.000.423,C:\Users\migue\OneDrive\Documentos\Projetos\Delphi\NumismaticProDesktop\Unit1.dfm=C:\Users\migue\OneDrive\Documentos\Projetos\Delphi\NumismaticProDesktop\U_SelectDatabase.dfm</Transaction>
+    <Transaction>2022/03/05 14:52:36.000.423,C:\Users\migue\OneDrive\Documentos\Projetos\Delphi\NumismaticProDesktop\Unit1.pas=C:\Users\migue\OneDrive\Documentos\Projetos\Delphi\NumismaticProDesktop\U_SelectDatabase.pas</Transaction>
+    <Transaction>2022/07/11 19:41:49.557,=C:\Users\migue\OneDrive\Documentos\Projetos\Delphi\Utils\U_Format.pas</Transaction>
   </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
+    <File Path="..\..\Delphi"/>
+    <File Path="..\Utils"/>
+    <File Path="..\Utils\U_Format.pas"/>
     <File Path="U_Config.pas"/>
     <File Path="U_Config.dfm"/>
     <File Path="U_DataModule.pas"/>

diff --git a/NumismaticPro.identcache b/NumismaticPro.identcache
diff --git a/Setup/Setup.exe b/Setup/Setup.exe
diff --git a/Setup/Setup.rar b/Setup/Setup.rar
diff --git a/Setup/compressed/Setup_vs2.3.rar b/Setup/compressed/Setup_vs2.3.rar
diff --git a/Setup/exe/Setup_vs2.3.exe b/Setup/exe/Setup_vs2.3.exe
diff --git a/U_Menu.dfm b/U_Menu.dfm
@@ -657,6 +657,7 @@ object FrMenu: TFrMenu
       Hint = 'Clique Com o Bot'#227'o Direito Para Adicionar Uma Imagem'
       Center = True
       ParentShowHint = False
+      PopupMenu = PopupMenu1
       Proportional = True
       ShowHint = True
       Stretch = True
@@ -671,6 +672,7 @@ object FrMenu: TFrMenu
       Hint = 'Clique Com o Bot'#227'o Direito Para Adicionar Uma Imagem'
       Center = True
       ParentShowHint = False
+      PopupMenu = PopupMenu2
       Proportional = True
       ShowHint = True
       Stretch = True
@@ -682,6 +684,8 @@ object FrMenu: TFrMenu
       Width = 23
       Height = 22
       Caption = '...'
+      PopupMenu = PopupMenu1
+      OnClick = SpeedButton1Click
     end
     object Button2: TButton
       Left = 180
@@ -690,8 +694,8 @@ object FrMenu: TFrMenu
       Height = 25
       Caption = '...'
       DropDownMenu = PopupMenu2
-      PopupMenu = PopupMenu1
       TabOrder = 0
+      OnClick = Button2Click
     end
   end
   object MainMenu1: TMainMenu
@@ -755,6 +759,7 @@ object FrMenu: TFrMenu
     object button1pop: TMenuItem
       Caption = 'Adicionar Imagem Frente'
       ImageIndex = 5
+      Visible = False
       OnClick = button1popClick
     end
     object RemoverImagem1: TMenuItem
@@ -770,6 +775,7 @@ object FrMenu: TFrMenu
     object button2pop: TMenuItem
       Caption = 'Adicionar Imagem Verso'
       ImageIndex = 5
+      Visible = False
       OnClick = button2popClick
     end
     object RemoverImagem2: TMenuItem

diff --git a/U_Menu.pas b/U_Menu.pas
@@ -91,6 +91,8 @@   TFrMenu = class(TForm)
     procedure cb_orderbylistChange(Sender: TObject);
     procedure Value_EditExit(Sender: TObject);
     procedure Year_EditExit(Sender: TObject);
+    procedure SpeedButton1Click(Sender: TObject);
+    procedure Button2Click(Sender: TObject);
   private
     { Private declarations }
   public
@@ -110,7 +112,7 @@   TFrMenu = class(TForm)
 
 implementation
 
-uses U_DataModule, U_FrInfo, U_Config;
+uses U_DataModule, U_Format, U_FrInfo, U_Config;
 
 {$R *.dfm}
 
@@ -129,7 +131,7 @@ procedure TFrMenu.FormCreate(Sender: TObject);
   path  : String;
 begin
   //Define Version
-  GlbInfoVersion  :=  '2.2.2';
+  GlbInfoVersion  :=  '2.3';
 
   path := ExtractFilePath(ParamStr(0));
 
@@ -234,9 +236,9 @@ procedure TFrMenu.LoaderImage(ImgComponent : String);
           JPG1 := TJPEGImage.Create();
           JPG1.LoadFromFile(OpenDialog1.FileName);
           image01.Picture.Assign(JPG1);
-        Finally
-            Application.MessageBox('Operação Cancelada! Não Foi Possivel Selecionar a Imagem, Tente Novamente.','Numismatic Pro Desktop',48);
-            FreeAndNil(JPG1);
+        Except
+          Application.MessageBox('Operação Cancelada! Não Foi Possivel Selecionar a Imagem - #001, Tente Novamente.','Numismatic Pro Desktop',48);
+          FreeAndNil(JPG1);
         End;
     End;
   End;
@@ -251,9 +253,9 @@ procedure TFrMenu.LoaderImage(ImgComponent : String);
         JPG2 := TJPEGImage.Create();
         JPG2.LoadFromFile(OpenDialog2.FileName);
         image02.Picture.Assign(JPG2);
-      Finally
-            Application.MessageBox('Operação Cancelada! Não Foi Possivel Selecionar a Imagem, Tente Novamente.','Numismatic Pro Desktop',48);
-         FreeAndNil(JPG2);
+      Except
+        Application.MessageBox('Operação Cancelada! Não Foi Possivel Selecionar a Imagem - #002, Tente Novamente.','Numismatic Pro Desktop',48);
+        FreeAndNil(JPG2);
       End;
     end;
   end;
@@ -605,6 +607,12 @@ procedure TFrMenu.SearchFieldChange(Sender: TObject);
   SearchAction(SearchField.Text);
 end;
 
+procedure TFrMenu.SpeedButton1Click(Sender: TObject);
+begin
+  LoaderImage('1');
+  ActiveControl := Name_Edit;
+end;
+
 procedure TFrMenu.Value_EditExit(Sender: TObject);
 begin
   Value_Edit.Text:= Formatfloat('#####0.00',strtofloat(Value_Edit.Text));
@@ -688,7 +696,7 @@ procedure TFrMenu.ActionsDB(TypaAction: String);
           ParamByName('Year'    ).AsString := Year_Edit.Text;
           ParamByName('Type'    ).AsString := Type_Edit.Text;
           ParamByName('Quantity').AsString := Qtd_Edit.Text;
-          
+
 
           Stream1 := TMemoryStream.Create; 
           Stream2 := TMemoryStream.Create; 
@@ -739,7 +747,7 @@ procedure TFrMenu.ActionsDB(TypaAction: String);
           SQL.Add('WHERE Id = :Id');
 
           ParamByName('Name'    ).AsString := Name_Edit.Text;
-          ParamByName('Value'   ).AsString := Value_Edit.Text;
+          ParamByName('Value'   ).AsFloat  := StrToFloat(Value_Edit.Text);
           ParamByName('Unit'    ).AsString := Unit_Edit.Text;
           ParamByName('Country' ).AsString := Country_Edit.Text;
           ParamByName('Year'    ).AsString := Year_Edit.Text;
@@ -803,6 +811,12 @@ procedure TFrMenu.button1popClick(Sender: TObject);
   ActiveControl := Name_Edit;
 end;
 
+procedure TFrMenu.Button2Click(Sender: TObject);
+begin
+  LoaderImage('2');
+  ActiveControl := Name_Edit;
+end;
+
 procedure TFrMenu.BtnNewRegisterClick(Sender: TObject);
 begin
   IdFieldAction       :=  0;

diff --git a/exe/NumismaticPro.exe b/exe/NumismaticPro.exe