git-svn-id: https://192.168.0.254/svn/Proyectos.Varela_PuntosVenta/trunk@65 1c943782-d109-9647-9548-93b3ac332352

Source/Servidor/AdminPV_Server.dpr

@@ -72,5 +72,7 @@ begin
   Application.Title := '';
   Application.CreateForm(TdmServer, dmServer);
   Application.CreateForm(TServerForm, ServerForm);
+  Application.ShowMainForm := False;
+//  Application.MainFormOnTaskBar := False;  
   Application.Run;
 end.

Source/Servidor/AdminPV_Server.dproj

@@ -45,27 +45,6 @@
     <Borland.ProjectType>VCLApplication</Borland.ProjectType>
     <BorlandProject>
 <BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">2</VersionInfo><VersionInfo Name="Release">5</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.2.5.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">AdminPV_Server</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.2.5.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">miércoles, 12 de septiembre de 2007 18:52</VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">AdminPV_Server.dpr</Source></Source><Excluded_Packages>
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
       <Excluded_Packages Name="C:\Varela_D2007\Lib\DevExpressVCL\dxPSCoreD10.bpl">ExpressPrinting System by Developer Express Inc.</Excluded_Packages>
       <Excluded_Packages Name="$(BDS)\bin\dclwebsnap100.bpl">CodeGear WebSnap Components</Excluded_Packages>
       <Excluded_Packages Name="$(BDS)\bin\dclsoap100.bpl">CodeGear SOAP Components</Excluded_Packages>

Source/Servidor/Configuracion/uConfFicherosEDI.dfm

@@ -1,5 +1,7 @@
 inherited frConfFicherosEDI: TfrConfFicherosEDI
   Visible = True
+  ExplicitWidth = 451
+  ExplicitHeight = 304
   object GroupBox1: TGroupBox
     Left = 8
     Top = 8
@@ -11,46 +13,25 @@ inherited frConfFicherosEDI: TfrConfFicherosEDI
     object Label1: TLabel
       Left = 16
       Top = 32
-      Width = 95
+      Width = 98
       Height = 13
       Caption = 'Entrada de ficheros:'
     end
     object Label2: TLabel
       Left = 16
       Top = 128
-      Width = 146
+      Width = 147
       Height = 13
       Caption = 'Almac'#233'n de ficheros cargados:'
     end
-    object edtEntrada: TJvDirectoryEdit
-      Left = 16
-      Top = 48
-      Width = 345
-      Height = 21
-      AcceptFiles = False
-      DialogKind = dkWin32
-      DialogText = 'Directorio de entrada de ficheros EDI'
-      ShowButton = False
-      TabOrder = 0
-    end
-    object edtAlmacen: TJvDirectoryEdit
-      Left = 16
-      Top = 144
-      Width = 345
-      Height = 21
-      AcceptFiles = False
-      DialogKind = dkWin32
-      DialogText = 'Directorio para almacenar ficheros EDI cargados'
-      ShowButton = False
-      TabOrder = 1
-    end
     object bElegir1: TButton
       Left = 16
       Top = 72
       Width = 97
       Height = 25
       Caption = 'Elegir carpeta...'
-      TabOrder = 2
+      TabOrder = 0
+      Visible = False
       OnClick = bElegir1Click
     end
     object bElegir2: TButton
@@ -59,7 +40,8 @@ inherited frConfFicherosEDI: TfrConfFicherosEDI
       Width = 97
       Height = 25
       Caption = 'Elegir carpeta...'
-      TabOrder = 3
+      TabOrder = 1
+      Visible = False
       OnClick = bElegir2Click
     end
   end
@@ -89,7 +71,7 @@ inherited frConfFicherosEDI: TfrConfFicherosEDI
     object Label3: TLabel
       Left = 25
       Top = 12
-      Width = 298
+      Width = 299
       Height = 13
       Caption = 'N'#250'mero de d'#237'as a mantener de almac'#233'n de ficheros cargados :'
       Transparent = False
@@ -112,6 +94,28 @@ inherited frConfFicherosEDI: TfrConfFicherosEDI
       Width = 41
     end
   end
+  object edtEntrada: TcxTextEdit
+    Left = 24
+    Top = 56
+    Style.LookAndFeel.NativeStyle = True
+    StyleDisabled.LookAndFeel.NativeStyle = True
+    StyleFocused.LookAndFeel.NativeStyle = True
+    StyleHot.LookAndFeel.NativeStyle = True
+    TabOrder = 4
+    Text = 'edtEntrada'
+    Width = 345
+  end
+  object edtAlmacen: TcxTextEdit
+    Left = 24
+    Top = 149
+    Style.LookAndFeel.NativeStyle = True
+    StyleDisabled.LookAndFeel.NativeStyle = True
+    StyleFocused.LookAndFeel.NativeStyle = True
+    StyleHot.LookAndFeel.NativeStyle = True
+    TabOrder = 5
+    Text = 'edtEntrada'
+    Width = 345
+  end
   object ActionList1: TActionList
     Left = 320
     Top = 120

Source/Servidor/Configuracion/uConfFicherosEDI.pas

@@ -11,10 +11,8 @@ uses
 type
   TfrConfFicherosEDI = class(TFrameConfiguracion)
     GroupBox1: TGroupBox;
-    edtEntrada: TJvDirectoryEdit;
     Label1: TLabel;
     Label2: TLabel;
-    edtAlmacen: TJvDirectoryEdit;
     bElegir1: TButton;
     bElegir2: TButton;
     bAbrir1: TButton;
@@ -25,6 +23,8 @@ type
     Panel1: TPanel;
     Label3: TLabel;
     edtDias: TcxSpinEdit;
+    edtEntrada: TcxTextEdit;
+    edtAlmacen: TcxTextEdit;
     procedure bElegir1Click(Sender: TObject);
     procedure bElegir2Click(Sender: TObject);
     procedure actAbrir1Update(Sender: TObject);
@@ -66,13 +66,13 @@ end;
 procedure TfrConfFicherosEDI.bElegir1Click(Sender: TObject);
 begin
   inherited;
-  edtEntrada.DoClick;
+//  edtEntrada.DoClick;
 end;
 
 procedure TfrConfFicherosEDI.bElegir2Click(Sender: TObject);
 begin
   inherited;
-  edtAlmacen.DoClick;
+//  edtAlmacen.DoClick;
 end;
 
 procedure TfrConfFicherosEDI.actAbrir1Update(Sender: TObject);

Source/Servidor/Configuracion/uConfiguracion.dfm

@@ -3,8 +3,8 @@ object fConfiguracion: TfConfiguracion
   Top = 203
   BorderStyle = bsDialog
   Caption = 'Configuraci'#243'n'
-  ClientHeight = 442
+  ClientHeight = 341
-  ClientWidth = 623
+  ClientWidth = 414
   Color = clBtnFace
   Font.Charset = DEFAULT_CHARSET
   Font.Color = clWindowText
@@ -13,11 +13,12 @@ object fConfiguracion: TfConfiguracion
   Font.Style = []
   OldCreateOrder = False
   Position = poScreenCenter
+  OnShow = FormShow
   PixelsPerInch = 96
   TextHeight = 13
   object Button1: TButton
-    Left = 445
+    Left = 251
-    Top = 407
+    Top = 311
     Width = 75
     Height = 25
     Action = actAceptar
@@ -25,8 +26,8 @@ object fConfiguracion: TfConfiguracion
     TabOrder = 0
   end
   object Button2: TButton
-    Left = 533
+    Left = 332
-    Top = 407
+    Top = 311
     Width = 75
     Height = 25
     Action = actCancelar
@@ -34,106 +35,65 @@ object fConfiguracion: TfConfiguracion
     ModalResult = 2
     TabOrder = 1
   end
-  object JvSettingsTreeView1: TJvSettingsTreeView
+  object PageControl1: TPageControl
     Left = 8
     Top = 8
-    Width = 193
+    Width = 399
-    Height = 385
+    Height = 289
-    PageDefault = 0
+    ActivePage = pagGeneral
-    PageList = JvPageList1
     Images = PngImageList1
-    Indent = 19
     TabOrder = 2
-    OnChanging = JvSettingsTreeView1Changing
+    OnChange = PageControl1Change
-    Items.Data = {
+    object pagGeneral: TTabSheet
-      0300000020000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0000000000000000
+      Caption = 'General'
-      0747656E6572616C28000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF01000000
+      ImageIndex = -1
-      000000000F436F6E657869F36E20636F6E2042442E000000FFFFFFFFFFFFFFFF
-      FFFFFFFFFFFFFFFF02000000000000001555626963616369F36E206465206669
-      636865726F73}
-    Items.Links = {03000000000000000100000002000000}
-  end
-  object JvPageList1: TJvPageList
-    Left = 216
-    Top = 8
-    Width = 394
-    Height = 385
-    ActivePage = JvStandardPage1
-    PropagateEnable = False
-    object JvStandardPage1: TJvStandardPage
-      Left = 0
-      Top = 0
-      Width = 394
-      Height = 385
-      Caption = 'JvStandardPage1'
       inline frConfGeneral1: TfrConfGeneral
         Left = 0
         Top = 0
-        Width = 394
+        Width = 391
-        Height = 385
+        Height = 260
         Align = alClient
-        ParentBackground = False
         TabOrder = 0
+        ExplicitWidth = 391
+        ExplicitHeight = 260
+        inherited GroupBox1: TGroupBox
+          Height = 97
+          ExplicitHeight = 97
+        end
       end
     end
-    object JvStandardPage2: TJvStandardPage
+    object pagBD: TTabSheet
-      Left = 0
+      Caption = 'Base de datos'
-      Top = 0
+      ImageIndex = 1
-      Width = 394
-      Height = 385
-      Caption = 'JvStandardPage2'
       inline frConexionBD1: TfrConexionBD
         Left = 0
         Top = 0
-        Width = 394
+        Width = 391
-        Height = 385
+        Height = 260
         Align = alClient
-        ParentBackground = False
         TabOrder = 0
-        inherited GroupBox1: TGroupBox
+        ExplicitWidth = 391
-          inherited Label1: TLabel
+        ExplicitHeight = 260
-            Width = 100
-          end
-          inherited Label3: TLabel
-            Width = 72
-          end
-          inherited Label5: TLabel
-            Width = 60
-          end
-        end
       end
     end
-    object JvStandardPage3: TJvStandardPage
+    object pagFicheros: TTabSheet
-      Left = 0
+      Caption = 'Ubicaci'#243'n de ficheros'
-      Top = 0
+      ImageIndex = -1
-      Width = 394
-      Height = 385
-      Caption = 'JvStandardPage3'
       inline frConfFicherosEDI1: TfrConfFicherosEDI
         Left = 0
         Top = 0
-        Width = 394
+        Width = 391
-        Height = 385
+        Height = 260
         Align = alClient
-        ParentBackground = False
         TabOrder = 0
-        inherited Label3: TLabel
+        ExplicitWidth = 391
-          Width = 299
+        ExplicitHeight = 260
-        end
-        inherited GroupBox1: TGroupBox
-          inherited Label1: TLabel
-            Width = 98
-          end
-          inherited Label2: TLabel
-            Width = 147
-          end
-        end
       end
     end
   end
   object ActionList1: TActionList
     Left = 8
-    Top = 400
+    Top = 304
     object actAceptar: TAction
       Caption = '&Aceptar'
       OnExecute = actAceptarExecute
@@ -148,8 +108,8 @@ object fConfiguracion: TfConfiguracion
     StorageOptions.BooleanStringFalseValues = 'FALSE, NO, N'
     Root = 'Software\%APPL_NAME%'
     SubStorages = <>
-    Left = 48
+    Left = 40
-    Top = 400
+    Top = 304
   end
   object PngImageList1: TPngImageList
     PngImages = <
@@ -207,8 +167,8 @@ object fConfiguracion: TfConfiguracion
         Name = 'PngImage1'
         Background = clWindow
       end>
-    Left = 88
+    Left = 80
-    Top = 400
+    Top = 304
     Bitmap = {}
   end
 end

Source/Servidor/Configuracion/uConfiguracion.pas

@@ -8,7 +8,7 @@ uses
   JvAppStorage, JvAppRegistryStorage, Contnrs, ExtCtrls, ImgList,
   PngImageList, JvExControls, JvGradientHeaderPanel, uFrameConfiguracion,
   JvComponentBase, JvPageList, JvExComCtrls, JvPageListTreeView,
-  uConfFicherosEDI, uConexionBD, uConfGeneral;
+  uConexionBD, uConfGeneral, uConfFicherosEDI;
 
 type
   TfConfiguracion = class(TForm)
@@ -19,21 +19,21 @@ type
     actCancelar: TAction;
     JvAppRegistryStorage1: TJvAppRegistryStorage;
     PngImageList1: TPngImageList;
-    JvSettingsTreeView1: TJvSettingsTreeView;
-    JvPageList1: TJvPageList;
-    JvStandardPage1: TJvStandardPage;
-    JvStandardPage2: TJvStandardPage;
-    JvStandardPage3: TJvStandardPage;
     frConfGeneral1: TfrConfGeneral;
+    PageControl1: TPageControl;
+    pagGeneral: TTabSheet;
+    pagBD: TTabSheet;
     frConexionBD1: TfrConexionBD;
+    pagFicheros: TTabSheet;
     frConfFicherosEDI1: TfrConfFicherosEDI;
-    procedure tvArbolChange(Sender: TObject; Node: TTreeNode);
     procedure actAceptarExecute(Sender: TObject);
     procedure actCancelarExecute(Sender: TObject);
-    procedure JvSettingsTreeView1Changing(Sender: TObject; Node: TTreeNode;
+    procedure FormShow(Sender: TObject);
-      var AllowChange: Boolean);
+    procedure PageControl1Change(Sender: TObject);
   private
     FPaginaActual : IConfiguracionFrame;
+  public
+    constructor Create(AOwner: TComponent); override;
   end;
 
 var
@@ -45,7 +45,7 @@ uses uDataModuleServer;
 
 {$R *.dfm}
 
-type
+{type
   TFrameClass = class of TFrameConfiguracion;
 
 function CreateFrame(Parent: TWinControl; FrameClass: TFrameClass): IConfiguracionFrame;
@@ -58,26 +58,13 @@ begin
   aFrame.Init;
   aFrame.Show;
   Result := aFrame;
-end;
+end;}
-
-procedure TfConfiguracion.tvArbolChange(Sender: TObject; Node: TTreeNode);
-begin
-{  if Assigned(FPaginaActual) then
-    FPaginaActual.Finalize;
-
-  case Node.Index of
-    0   : FPaginaActual := CreateFrame(pnlPagina, TfrConfGeneral);
-    1   : FPaginaActual := CreateFrame(pnlPagina, TfrConexionBD);
-    2   : FPaginaActual := CreateFrame(pnlPagina, TfrConfFicherosEDI);
-  end;
-  Self.Update;
-  pnlHeader.LabelCaption := Node.Text;}
-end;
 
 procedure TfConfiguracion.actAceptarExecute(Sender: TObject);
 begin
   if Assigned(FPaginaActual) then
     FPaginaActual.Finalize;
+
   dmServer.SalvarConfiguracion;
   Close;
 end;
@@ -87,19 +74,34 @@ begin
   Close;
 end;
 
-procedure TfConfiguracion.JvSettingsTreeView1Changing(Sender: TObject;
+constructor TfConfiguracion.Create(AOwner: TComponent);
-  Node: TTreeNode; var AllowChange: Boolean);
+begin
+  inherited;
+  FPaginaActual := NIL;
+end;
+
+procedure TfConfiguracion.FormShow(Sender: TObject);
+begin
+  PageControl1.ActivePageIndex := 0;
+  //Se ha de llamar al evento ya que la asignación anterior no lo lanza
+  PageControl1Change(PageControl1);
+end;
+
+procedure TfConfiguracion.PageControl1Change(Sender: TObject);
 begin
   if Assigned(FPaginaActual) then
     FPaginaActual.Finalize;
 
-  case Node.Index of
+  case PageControl1.ActivePageIndex of
     0   : FPaginaActual := frConfGeneral1;
     1   : FPaginaActual := frConexionBD1;
     2   : FPaginaActual := frConfFicherosEDI1;
   end;
+
   if Assigned(FPaginaActual) then
     FPaginaActual.Init;
+
+  Self.Update;
 end;
 
 end.

Source/Servidor/Configuracion/uFrameConfiguracion.dfm

@@ -1,10 +1,8 @@
 object FrameConfiguracion: TFrameConfiguracion
   Left = 0
   Top = 0
-  Width = 443
+  Width = 451
-  Height = 277
+  Height = 304
   Align = alClient
-  ParentBackground = False
   TabOrder = 0
-  Visible = False
 end

Source/Servidor/fServerForm.dfm

@@ -13,7 +13,6 @@ object ServerForm: TServerForm
   Font.Style = []
   OldCreateOrder = False
   Position = poScreenCenter
-  OnClose = FormClose
   OnCreate = FormCreate
   PixelsPerInch = 96
   TextHeight = 13
@@ -1057,19 +1056,10 @@ object ServerForm: TServerForm
     Top = 16
   end
   object TrayIcon1: TTrayIcon
+    Animate = True
+    BalloonFlags = bfInfo
     PopupMenu = PopupMenu1
-    Visible = True
     Left = 144
     Top = 16
   end
-  object JvTrayIcon: TJvTrayIcon
-    IconIndex = 0
-    DropDownMenu = PopupMenu1
-    PopupMenu = PopupMenu1
-    Delay = 300
-    Snap = True
-    Visibility = [tvVisibleTaskBar, tvAutoHide]
-    Left = 8
-    Top = 16
-  end
 end

Source/Servidor/fServerForm.pas

@@ -31,12 +31,10 @@ type
     Acercade1: TMenuItem;
     N1: TMenuItem;
     TrayIcon1: TTrayIcon;
-    JvTrayIcon: TJvTrayIcon;
     procedure actCerrarExecute(Sender: TObject);
     procedure actRestartExecute(Sender: TObject);
     procedure actOpcionesExecute(Sender: TObject);
     procedure FormCreate(Sender: TObject);
-    procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure actAcercaExecute(Sender: TObject);
   private
     { Private declarations }
@@ -73,28 +71,19 @@ begin
   try
     AForm.ShowModal;
   finally
-    AForm.Free;
+    AForm.Release;
     actRestart.Execute;
   end;
 end;
 
 procedure TServerForm.FormCreate(Sender: TObject);
 begin
-{  JvTrayIcon.HideApplication;
+  TrayIcon1.Visible := True;
-  JvTrayIcon.Hint := 'Administración de puntos de venta (Servidor)' +
+  TrayIcon1.Hint := 'Administración de puntos de venta (Servidor)' +
     #10#13 + dmServer.ConnectionName;
-  JvTrayIcon.Active := True;
+  TrayIcon1.ShowBalloonHint;
-}
 
-{  JvTrayIcon.Hint := 'Administración de puntos de venta (Servidor)' +
+  Self.Visible := False;  
-    #10#13 + dmServer.ConnectionName;
-  JvTrayIcon.Active := True;
-}
-end;
-
-procedure TServerForm.FormClose(Sender: TObject; var Action: TCloseAction);
-begin
-  JvTrayIcon.Active := False;
 end;
 
 procedure TServerForm.actAcercaExecute(Sender: TObject);