Se quitan los shortcodes de todas las acciones para que no produzcan efectos laterales. Se arregal informe fast report para que no secuelgue si ponemos imagen una imagen en la portada

git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@1063 0c75b7a4-871f-7646-8a2f-f78d34cc349f
This commit is contained in:
roberto 2012-06-28 11:43:25 +00:00
parent ad81e76a95
commit bb492c7ad6
11 changed files with 96 additions and 110 deletions

View File

@ -6,7 +6,7 @@
<propertysets/> <propertysets/>
<variables> <variables>
<project_path> <project_path>
<![CDATA[C:\Codigo Tecsitel]]> <![CDATA[C:\Codigo tecsitel]]>
</project_path> </project_path>
</variables> </variables>
<properties> <properties>

View File

@ -1,4 +1,4 @@
MAINICON ICON "C:\Codigo Tecsitel\Resources\Iconos\Factuges.ico" MAINICON ICON "C:\Codigo tecsitel\Resources\Iconos\Factuges.ico"
1 VERSIONINFO 1 VERSIONINFO
FILEVERSION 1,9,5,0 FILEVERSION 1,9,5,0
PRODUCTVERSION 1,9,5,0 PRODUCTVERSION 1,9,5,0

View File

@ -319,7 +319,6 @@ object fEditorBase: TfEditorBase
Caption = 'Cortar' Caption = 'Cortar'
Hint = 'Cortar|Corta la selecci'#243'n y la coloca en el portapapeles' Hint = 'Cortar|Corta la selecci'#243'n y la coloca en el portapapeles'
ImageIndex = 3 ImageIndex = 3
ShortCut = 16472
end end
object actCerrar: TAction object actCerrar: TAction
Category = 'Archivo' Category = 'Archivo'
@ -338,7 +337,6 @@ object fEditorBase: TfEditorBase
Caption = 'Pegar' Caption = 'Pegar'
Hint = 'Pegar|Inserta el contenido del portapapeles' Hint = 'Pegar|Inserta el contenido del portapapeles'
ImageIndex = 5 ImageIndex = 5
ShortCut = 16470
end end
object actSeleccionarTodo: TEditSelectAll object actSeleccionarTodo: TEditSelectAll
Category = 'Edici'#243'n' Category = 'Edici'#243'n'

View File

@ -64,7 +64,7 @@ inherited frViewDetallesBase: TfrViewDetallesBase
DroppedDownWidth = 145 DroppedDownWidth = 145
MaxMRUCount = 0 MaxMRUCount = 0
FontName = 'Tahoma' FontName = 'Tahoma'
ItemIndex = 39 ItemIndex = 42
Options = [foTrueTypeOnly, foNoOEMFonts, foScalableOnly, foWysiWyg] Options = [foTrueTypeOnly, foNoOEMFonts, foScalableOnly, foWysiWyg]
Sorted = True Sorted = True
TabOrder = 2 TabOrder = 2
@ -542,21 +542,18 @@ inherited frViewDetallesBase: TfrViewDetallesBase
object actDetallesCortar: TAction object actDetallesCortar: TAction
Category = 'Editar' Category = 'Editar'
Caption = 'Cortar' Caption = 'Cortar'
ShortCut = 16472
OnExecute = actDetallesCortarExecute OnExecute = actDetallesCortarExecute
OnUpdate = actDetallesCortarUpdate OnUpdate = actDetallesCortarUpdate
end end
object actDetallesCopiar: TAction object actDetallesCopiar: TAction
Category = 'Editar' Category = 'Editar'
Caption = 'Copiar' Caption = 'Copiar'
ShortCut = 16451
OnExecute = actDetallesCopiarExecute OnExecute = actDetallesCopiarExecute
OnUpdate = actDetallesCopiarUpdate OnUpdate = actDetallesCopiarUpdate
end end
object actDetallesPegar: TAction object actDetallesPegar: TAction
Category = 'Editar' Category = 'Editar'
Caption = 'Pegar' Caption = 'Pegar'
ShortCut = 16470
OnExecute = actDetallesPegarExecute OnExecute = actDetallesPegarExecute
OnUpdate = actDetallesPegarUpdate OnUpdate = actDetallesPegarUpdate
end end

View File

@ -201,7 +201,6 @@ inherited frViewRichEditor: TfrViewRichEditor
Caption = 'Cu&t' Caption = 'Cu&t'
Hint = 'Delete selected item' Hint = 'Delete selected item'
ImageIndex = 3 ImageIndex = 3
ShortCut = 16472
OnExecute = actEditCutExecute OnExecute = actEditCutExecute
end end
object actEditCopy: TAction object actEditCopy: TAction
@ -209,7 +208,6 @@ inherited frViewRichEditor: TfrViewRichEditor
Caption = '&Copy' Caption = '&Copy'
Hint = 'Copy selected item to clipboard' Hint = 'Copy selected item to clipboard'
ImageIndex = 4 ImageIndex = 4
ShortCut = 16451
OnExecute = actEditCopyExecute OnExecute = actEditCopyExecute
end end
object actEditPaste: TAction object actEditPaste: TAction
@ -217,7 +215,6 @@ inherited frViewRichEditor: TfrViewRichEditor
Caption = '&Paste' Caption = '&Paste'
Hint = 'Paste contents of clipboard' Hint = 'Paste contents of clipboard'
ImageIndex = 5 ImageIndex = 5
ShortCut = 16470
OnExecute = actEditPasteExecute OnExecute = actEditPasteExecute
end end
object actEditFont: TAction object actEditFont: TAction

File diff suppressed because one or more lines are too long

View File

@ -177,16 +177,14 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
ExplicitWidth = 758 ExplicitWidth = 758
ExplicitHeight = 366 ExplicitHeight = 366
inherited pagGeneral: TTabSheet inherited pagGeneral: TTabSheet
ExplicitLeft = 4
ExplicitTop = 24
ExplicitWidth = 750 ExplicitWidth = 750
ExplicitHeight = 338 ExplicitHeight = 338
end end
object pagContenido: TTabSheet object pagContenido: TTabSheet
Caption = 'Contenido' Caption = 'Contenido'
ImageIndex = 1 ImageIndex = 1
ExplicitLeft = 0
ExplicitTop = 0
ExplicitWidth = 0
ExplicitHeight = 0
inline frViewDetallesPresupuestoCliente1: TfrViewDetallesPresupuestoCliente inline frViewDetallesPresupuestoCliente1: TfrViewDetallesPresupuestoCliente
Left = 0 Left = 0
Top = 0 Top = 0
@ -207,105 +205,100 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
ExplicitHeight = 338 ExplicitHeight = 338
inherited ToolBar1: TToolBar inherited ToolBar1: TToolBar
Width = 750 Width = 750
Height = 46 Height = 51
ExplicitWidth = 750 ExplicitWidth = 750
ExplicitHeight = 46 ExplicitHeight = 51
inherited ToolButton3: TToolButton inherited ToolButton3: TToolButton
Wrap = False Wrap = False
end end
inherited ToolButton4: TToolButton inherited ToolButton4: TToolButton
Left = 278 Left = 278
Top = 0 Top = 0
Wrap = True
ExplicitLeft = 278 ExplicitLeft = 278
ExplicitTop = 0 ExplicitTop = 0
end end
inherited ToolButton14: TToolButton inherited ToolButton14: TToolButton
Left = 0 Left = 334
Wrap = False Top = 0
ExplicitLeft = 0 ExplicitLeft = 334
end ExplicitTop = 0
inherited FontName: TJvFontComboBox
Left = 65
Top = 22
ExplicitLeft = 65
ExplicitTop = 22
end
inherited FontSize: TEdit
Left = 210
Top = 22
Width = 200
ExplicitLeft = 210
ExplicitTop = 22
ExplicitWidth = 200
end
inherited UpDown1: TUpDown
Left = 410
Top = 22
ExplicitLeft = 410
ExplicitTop = 22
end
inherited ToolButton13: TToolButton
Left = 427
Top = 22
ExplicitLeft = 427
ExplicitTop = 22
end
inherited ToolButton6: TToolButton
Left = 435
Top = 22
ExplicitLeft = 435
ExplicitTop = 22
end
inherited ToolButton7: TToolButton
Left = 501
Top = 22
ExplicitLeft = 501
ExplicitTop = 22
end
inherited ToolButton8: TToolButton
Left = 568
Top = 22
ExplicitLeft = 568
ExplicitTop = 22
end
inherited ToolButton12: TToolButton
Left = 651
Top = 22
ExplicitLeft = 651
ExplicitTop = 22
end end
inherited ToolButton9: TToolButton inherited ToolButton9: TToolButton
Left = 659 Left = 399
Top = 22 Top = 0
ExplicitLeft = 659 ExplicitLeft = 399
ExplicitTop = 22 ExplicitTop = 0
end end
inherited ToolButton10: TToolButton inherited FontName: TJvFontComboBox
Left = 804 Left = 544
Top = 22 Top = 0
ExplicitLeft = 804 ExplicitLeft = 544
ExplicitTop = 22 ExplicitTop = 0
end
inherited UpDown1: TUpDown
Left = 689
Top = 0
ExplicitLeft = 689
ExplicitTop = 0
end
inherited ToolButton13: TToolButton
Top = 0
ExplicitTop = 0
end
inherited ToolButton6: TToolButton
Top = 27
ExplicitTop = 27
end
inherited FontSize: TEdit
Top = 27
Width = 200
ExplicitTop = 27
ExplicitWidth = 200
end
inherited ToolButton7: TToolButton
Left = 266
Top = 27
ExplicitLeft = 266
ExplicitTop = 27
end end
inherited ToolButton11: TToolButton inherited ToolButton11: TToolButton
Left = 929 Left = 333
Top = 22 Top = 27
ExplicitLeft = 929 ExplicitLeft = 333
ExplicitTop = 22 ExplicitTop = 27
end
inherited ToolButton12: TToolButton
Left = 474
Top = 27
Wrap = False
ExplicitLeft = 474
ExplicitTop = 27
ExplicitHeight = 22
end
inherited ToolButton10: TToolButton
Left = 482
Top = 27
ExplicitLeft = 482
ExplicitTop = 27
end
inherited ToolButton8: TToolButton
Left = 607
Top = 27
ExplicitLeft = 607
ExplicitTop = 27
end end
end end
inherited cxGrid: TcxGrid inherited cxGrid: TcxGrid
Top = 72 Top = 77
Width = 750 Width = 750
Height = 266 Height = 261
ExplicitTop = 104
ExplicitWidth = 750 ExplicitWidth = 750
ExplicitHeight = 234 ExplicitHeight = 239
end end
inherited TBXDock1: TTBXDock inherited TBXDock1: TTBXDock
Top = 46 Top = 51
Width = 750 Width = 750
ExplicitTop = 78 ExplicitTop = 73
ExplicitWidth = 750 ExplicitWidth = 750
inherited TBXToolbar1: TTBXToolbar inherited TBXToolbar1: TTBXToolbar
ExplicitWidth = 750 ExplicitWidth = 750
@ -325,10 +318,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
object pagPortada: TTabSheet object pagPortada: TTabSheet
Caption = 'Portada' Caption = 'Portada'
ImageIndex = 3 ImageIndex = 3
ExplicitLeft = 0 OnShow = pagPortadaShow
ExplicitTop = 0
ExplicitWidth = 0
ExplicitHeight = 0
object Panel1: TPanel object Panel1: TPanel
Left = 0 Left = 0
Top = 0 Top = 0
@ -336,7 +326,6 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
Height = 338 Height = 338
Align = alLeft Align = alLeft
TabOrder = 0 TabOrder = 0
ExplicitHeight = 398
object Image2: TImage object Image2: TImage
Left = 16 Left = 16
Top = 16 Top = 16
@ -461,10 +450,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
object pagMemoria: TTabSheet object pagMemoria: TTabSheet
Caption = 'Memoria' Caption = 'Memoria'
ImageIndex = 4 ImageIndex = 4
ExplicitLeft = 0 OnShow = pagMemoriaShow
ExplicitTop = 0
ExplicitWidth = 0
ExplicitHeight = 0
object Panel2: TPanel object Panel2: TPanel
Left = 0 Left = 0
Top = 0 Top = 0
@ -472,7 +458,6 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
Height = 338 Height = 338
Align = alLeft Align = alLeft
TabOrder = 0 TabOrder = 0
ExplicitHeight = 398
object Image3: TImage object Image3: TImage
Left = 16 Left = 16
Top = 16 Top = 16
@ -768,10 +753,6 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
object pagInicidencias: TTabSheet object pagInicidencias: TTabSheet
Caption = 'Incidencias' Caption = 'Incidencias'
ImageIndex = 2 ImageIndex = 2
ExplicitLeft = 0
ExplicitTop = 0
ExplicitWidth = 0
ExplicitHeight = 0
inline frViewIncidenciasCli: TfrViewIncidencias inline frViewIncidenciasCli: TfrViewIncidencias
Left = 0 Left = 0
Top = 0 Top = 0
@ -836,7 +817,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
Width = 750 Width = 750
Height = 315 Height = 315
ExplicitWidth = 750 ExplicitWidth = 750
ExplicitHeight = 375 ExplicitHeight = 315
end end
end end
end end
@ -1106,7 +1087,6 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
ExplicitLeft = 21 ExplicitLeft = 21
ExplicitTop = 29 ExplicitTop = 29
ExplicitWidth = 277 ExplicitWidth = 277
ExplicitHeight = 0
Width = 277 Width = 277
end end
inherited eDescripcionBonificacion: TcxDBTextEdit inherited eDescripcionBonificacion: TcxDBTextEdit

View File

@ -59,6 +59,8 @@ type
procedure actEnviarPorEMailExecute(Sender: TObject); procedure actEnviarPorEMailExecute(Sender: TObject);
procedure actEnviarPorEMailUpdate(Sender: TObject); procedure actEnviarPorEMailUpdate(Sender: TObject);
procedure actEliminarUpdate(Sender: TObject); procedure actEliminarUpdate(Sender: TObject);
procedure pagPortadaShow(Sender: TObject);
procedure pagMemoriaShow(Sender: TObject);
private private
procedure RecalcularPortePorUnidad; procedure RecalcularPortePorUnidad;
@ -327,6 +329,18 @@ begin
end; end;
end; end;
procedure TfEditorPresupuestoCliente.pagMemoriaShow(Sender: TObject);
begin
inherited;
frViewRichEditor2.RichEdit.SetFocus;
end;
procedure TfEditorPresupuestoCliente.pagPortadaShow(Sender: TObject);
begin
inherited;
frViewRichEditor1.RichEdit.SetFocus;
end;
procedure TfEditorPresupuestoCliente.pgPaginasChanging(Sender: TObject; procedure TfEditorPresupuestoCliente.pgPaginasChanging(Sender: TObject;
var AllowChange: Boolean); var AllowChange: Boolean);
var var

Binary file not shown.

View File

@ -1,4 +1,4 @@
MAINICON ICON "C:\Codigo Tecsitel\Resources\Iconos\Servidor.ico" MAINICON ICON "C:\Codigo tecsitel\Resources\Iconos\Servidor.ico"
1 VERSIONINFO 1 VERSIONINFO
FILEVERSION 1,9,4,0 FILEVERSION 1,9,4,0
PRODUCTVERSION 1,9,4,0 PRODUCTVERSION 1,9,4,0
@ -14,7 +14,7 @@ BEGIN
BEGIN BEGIN
VALUE "FileVersion", "1.9.4.0\0" VALUE "FileVersion", "1.9.4.0\0"
VALUE "ProductVersion", "1.9.4.0\0" VALUE "ProductVersion", "1.9.4.0\0"
VALUE "CompileDate", "martes, 12 de junio de 2012 10:58\0" VALUE "CompileDate", "jueves, 28 de junio de 2012 13:19\0"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"