diff --git a/Installer/librerias.txt b/Installer/librerias.txt index 5d27cb99..cd8e7f95 100644 --- a/Installer/librerias.txt +++ b/Installer/librerias.txt @@ -53,6 +53,35 @@ RemObjects_Core_D11.bpl tb2k_d10.bpl tbx_d10.bpl +dxSkinBlackD11.bpl +dxSkinBlueD11.bpl +dxSkinCaramelD11.bpl +dxSkinCoffeeD11.bpl +dxSkinGlassOceansD11.bpl +dxSkiniMaginaryD11.bpl +dxSkinLilianD11.bpl +dxSkinLiquidSkyD11.bpl +dxSkinLondonLiquidSkyD11.bpl +dxSkinMcSkinD11.bpl +dxSkinMoneyTwinsD11.bpl +dxSkinOffice2007BlackD11.bpl +dxSkinOffice2007BlueD11.bpl +dxSkinOffice2007GreenD11.bpl +dxSkinOffice2007PinkD11.bpl +dxSkinOffice2007SilverD11.bpl +dxSkinsCoreD11.bpl +dxSkinscxPCPainterD11.bpl +dxSkinscxScheduler3PainterD11.bpl +dxSkinsdxBarPainterD11.bpl +dxSkinsdxDLPainterD11.bpl +dxSkinsdxLCPainterD11.bpl +dxSkinsdxNavBar2PainterD11.bpl +dxSkinsdxRibbonPainterD11.bpl +dxSkinSilverD11.bpl +dxSkinStardustD11.bpl +dxSkinValentineD11.bpl +dxSkinXmas2008BlueD11.bpl + adortl100.bpl bdertl100.bpl dbrtl100.bpl diff --git a/Resources/Iconos/Albaranes de cliente/16x16/Budget.png b/Resources/Iconos/Albaranes de cliente/16x16/Budget.png new file mode 100644 index 00000000..74922f8c Binary files /dev/null and b/Resources/Iconos/Albaranes de cliente/16x16/Budget.png differ diff --git a/Resources/Iconos/Albaranes de cliente/16x16/Devolucion.png b/Resources/Iconos/Albaranes de cliente/16x16/Devolucion.png new file mode 100644 index 00000000..404988d6 Binary files /dev/null and b/Resources/Iconos/Albaranes de cliente/16x16/Devolucion.png differ diff --git a/Resources/Iconos/Albaranes/16x16/Letters patent.png b/Resources/Iconos/Albaranes de cliente/16x16/Letters patent.png similarity index 100% rename from Resources/Iconos/Albaranes/16x16/Letters patent.png rename to Resources/Iconos/Albaranes de cliente/16x16/Letters patent.png diff --git a/Resources/Iconos/Albaranes/16x16/pagado.png b/Resources/Iconos/Albaranes de cliente/16x16/pagado.png similarity index 100% rename from Resources/Iconos/Albaranes/16x16/pagado.png rename to Resources/Iconos/Albaranes de cliente/16x16/pagado.png diff --git a/Resources/Iconos/Albaranes de cliente/24x24/Budget.png b/Resources/Iconos/Albaranes de cliente/24x24/Budget.png new file mode 100644 index 00000000..da509973 Binary files /dev/null and b/Resources/Iconos/Albaranes de cliente/24x24/Budget.png differ diff --git a/Resources/Iconos/Albaranes de cliente/24x24/Devolucion.png b/Resources/Iconos/Albaranes de cliente/24x24/Devolucion.png new file mode 100644 index 00000000..37a1fcdf Binary files /dev/null and b/Resources/Iconos/Albaranes de cliente/24x24/Devolucion.png differ diff --git a/Resources/Iconos/Albaranes/24x24/Letters patent.png b/Resources/Iconos/Albaranes de cliente/24x24/Letters patent.png similarity index 100% rename from Resources/Iconos/Albaranes/24x24/Letters patent.png rename to Resources/Iconos/Albaranes de cliente/24x24/Letters patent.png diff --git a/Resources/Iconos/Albaranes de cliente/28x28/Budget.png b/Resources/Iconos/Albaranes de cliente/28x28/Budget.png new file mode 100644 index 00000000..ff77e527 Binary files /dev/null and b/Resources/Iconos/Albaranes de cliente/28x28/Budget.png differ diff --git a/Resources/Iconos/Albaranes de cliente/28x28/Devolucion.png b/Resources/Iconos/Albaranes de cliente/28x28/Devolucion.png new file mode 100644 index 00000000..ba56ab79 Binary files /dev/null and b/Resources/Iconos/Albaranes de cliente/28x28/Devolucion.png differ diff --git a/Resources/Iconos/Albaranes/28x28/Letters patent.png b/Resources/Iconos/Albaranes de cliente/28x28/Letters patent.png similarity index 100% rename from Resources/Iconos/Albaranes/28x28/Letters patent.png rename to Resources/Iconos/Albaranes de cliente/28x28/Letters patent.png diff --git a/Resources/Iconos/Inventario/16x16/articulos.png b/Resources/Iconos/Inventario/16x16/articulos.png new file mode 100644 index 00000000..acbaca94 Binary files /dev/null and b/Resources/Iconos/Inventario/16x16/articulos.png differ diff --git a/Resources/Iconos/Inventario/16x16/liberar.png b/Resources/Iconos/Inventario/16x16/liberar.png new file mode 100644 index 00000000..0f05e979 Binary files /dev/null and b/Resources/Iconos/Inventario/16x16/liberar.png differ diff --git a/Resources/Iconos/Inventario/24x24/Thumbs.db b/Resources/Iconos/Inventario/24x24/Thumbs.db new file mode 100644 index 00000000..b3056588 Binary files /dev/null and b/Resources/Iconos/Inventario/24x24/Thumbs.db differ diff --git a/Resources/Iconos/Inventario/24x24/articulos.png b/Resources/Iconos/Inventario/24x24/articulos.png new file mode 100644 index 00000000..c638dfe6 Binary files /dev/null and b/Resources/Iconos/Inventario/24x24/articulos.png differ diff --git a/Resources/Iconos/Inventario/24x24/liberar.png b/Resources/Iconos/Inventario/24x24/liberar.png new file mode 100644 index 00000000..40be1394 Binary files /dev/null and b/Resources/Iconos/Inventario/24x24/liberar.png differ diff --git a/Resources/Iconos/Inventario/28x28/articulos.png b/Resources/Iconos/Inventario/28x28/articulos.png new file mode 100644 index 00000000..95147f2d Binary files /dev/null and b/Resources/Iconos/Inventario/28x28/articulos.png differ diff --git a/Resources/Iconos/Inventario/28x28/liberar.png b/Resources/Iconos/Inventario/28x28/liberar.png new file mode 100644 index 00000000..bd5c233d Binary files /dev/null and b/Resources/Iconos/Inventario/28x28/liberar.png differ diff --git a/Source/ApplicationBase/ApplicationBase.dproj b/Source/ApplicationBase/ApplicationBase.dproj index 7aa75d9a..c15c4860 100644 --- a/Source/ApplicationBase/ApplicationBase.dproj +++ b/Source/ApplicationBase/ApplicationBase.dproj @@ -60,27 +60,27 @@ MainSource - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj index 8b91dde5..3ac2560d 100644 --- a/Source/Base/Base.dproj +++ b/Source/Base/Base.dproj @@ -53,58 +53,58 @@ MainSource + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
fConfigurarConexion
TForm diff --git a/Source/Base/Base.res b/Source/Base/Base.res index 1641339f..8b251f31 100644 Binary files a/Source/Base/Base.res and b/Source/Base/Base.res differ diff --git a/Source/Base/Controladores/uControllerDetallesBase.pas b/Source/Base/Controladores/uControllerDetallesBase.pas index 790b07b3..6dcd2531 100644 --- a/Source/Base/Controladores/uControllerDetallesBase.pas +++ b/Source/Base/Controladores/uControllerDetallesBase.pas @@ -48,7 +48,7 @@ type procedure EndUpdate(ADataTable: IDAStronglyTypedDataTable); //Si en los hijos existen campos a tener en cuenta se sobreescribira este metodo - procedure validarCampos(DataTable: TDADataTable); virtual; + procedure ValidarCampos(DataTable: TDADataTable); virtual; //Si sobreescribimos este método podremos tener en cuenta otras columnas para el calculo del importe total de un concepto function CalcularImporteTotalConcepto(DataTable: TDADataTable): Double; virtual; diff --git a/Source/Cliente/FactuGES.dproj b/Source/Cliente/FactuGES.dproj index baa4c9ee..e81dcda5 100644 --- a/Source/Cliente/FactuGES.dproj +++ b/Source/Cliente/FactuGES.dproj @@ -54,15 +54,7 @@ Delphi.Personality VCLApplication -FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse1030FalseFalseFalseFalseFalse30821252Rodax Software S.L.1.0.3.0FactuGESFactuGES1.0.3.0 - - - - - - - - +FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse1040FalseFalseFalseFalseFalse30821252Rodax Software S.L.1.0.4.0FactuGESFactuGES1.0.4.0 diff --git a/Source/Cliente/FactuGES.rc b/Source/Cliente/FactuGES.rc index 72176d90..00f6baa7 100644 --- a/Source/Cliente/FactuGES.rc +++ b/Source/Cliente/FactuGES.rc @@ -1,7 +1,7 @@ MAINICON ICON "C:\Codigo Tecsitel\Resources\Iconos\Factuges.ico" 1 VERSIONINFO -FILEVERSION 1,0,3,0 -PRODUCTVERSION 1,0,3,0 +FILEVERSION 1,0,4,0 +PRODUCTVERSION 1,0,4,0 FILEFLAGSMASK 0x3FL FILEFLAGS 0x00L FILEOS 0x40004L @@ -13,10 +13,10 @@ BEGIN BLOCK "0C0A04E4" BEGIN VALUE "CompanyName", "Rodax Software S.L.\0" - VALUE "FileVersion", "1.0.3.0\0" + VALUE "FileVersion", "1.0.4.0\0" VALUE "InternalName", "FactuGES\0" VALUE "ProductName", "FactuGES\0" - VALUE "ProductVersion", "1.0.3.0\0" + VALUE "ProductVersion", "1.0.4.0\0" END END BLOCK "VarFileInfo" diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res index 97541b81..b93898c8 100644 Binary files a/Source/Cliente/FactuGES.res and b/Source/Cliente/FactuGES.res differ diff --git a/Source/Cliente/uNavPaneController.pas b/Source/Cliente/uNavPaneController.pas index 35206ff3..21fe3db1 100644 --- a/Source/Cliente/uNavPaneController.pas +++ b/Source/Cliente/uNavPaneController.pas @@ -71,7 +71,6 @@ function TNavPaneController.CrearPagina(const APageList : TJvNavigationPane; var APanePage: TJvNavPanelPage; begin - Result := 0; APanePage := TJvNavPanelPage.Create(Application); with APanePage do begin @@ -172,8 +171,7 @@ begin AEmpresas := NIL; end; finally - AListaSecciones.Free; - AListaSecciones := NIL; + FreeAndNIL(AListaSecciones); end; end; diff --git a/Source/GUIBase/GUIBase.dproj b/Source/GUIBase/GUIBase.dproj index a7a1c283..e1a4ad76 100644 --- a/Source/GUIBase/GUIBase.dproj +++ b/Source/GUIBase/GUIBase.dproj @@ -58,52 +58,52 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
fDialogBase
 diff --git a/Source/GUIBase/uEditorDBItem.dfm b/Source/GUIBase/uEditorDBItem.dfm index dd33b20b..9edf8834 100644 --- a/Source/GUIBase/uEditorDBItem.dfm +++ b/Source/GUIBase/uEditorDBItem.dfm @@ -47,6 +47,10 @@ inherited fEditorDBItem: TfEditorDBItem TabOrder = 2 object pagGeneral: TTabSheet Caption = 'General' + ExplicitLeft = 0 + ExplicitTop = 0 + ExplicitWidth = 0 + ExplicitHeight = 0 end end inherited StatusBar: TJvStatusBar diff --git a/Source/GUIBase/uViewDetallesBase.dfm b/Source/GUIBase/uViewDetallesBase.dfm index 79d744ff..df60793f 100644 --- a/Source/GUIBase/uViewDetallesBase.dfm +++ b/Source/GUIBase/uViewDetallesBase.dfm @@ -10,7 +10,7 @@ inherited frViewDetallesBase: TfrViewDetallesBase Left = 0 Top = 0 Width = 451 - Height = 73 + Height = 68 AutoSize = True ButtonWidth = 141 Caption = 'ToolBar1' @@ -42,29 +42,30 @@ inherited frViewDetallesBase: TfrViewDetallesBase Top = 0 Action = actSubir AutoSize = True + Wrap = True end object ToolButton4: TToolButton - Left = 184 - Top = 0 + Left = 0 + Top = 22 Action = actBajar AutoSize = True end object ToolButton14: TToolButton - Left = 240 - Top = 0 + Left = 56 + Top = 22 Action = FontEdit1 AutoSize = True Wrap = True end object FontName: TJvFontComboBox Left = 0 - Top = 22 + Top = 44 Width = 145 Height = 22 DroppedDownWidth = 145 MaxMRUCount = 0 FontName = 'Tahoma' - ItemIndex = 43 + ItemIndex = 42 Options = [foTrueTypeOnly, foNoOEMFonts, foScalableOnly, foWysiWyg] Sorted = True TabOrder = 2 @@ -74,7 +75,7 @@ inherited frViewDetallesBase: TfrViewDetallesBase end object FontSize: TEdit Left = 145 - Top = 22 + Top = 44 Width = 26 Height = 22 Hint = 'Font Size|Select font size' @@ -85,7 +86,7 @@ inherited frViewDetallesBase: TfrViewDetallesBase end object UpDown1: TUpDown Left = 171 - Top = 22 + Top = 44 Width = 16 Height = 22 Associate = FontSize @@ -94,7 +95,7 @@ inherited frViewDetallesBase: TfrViewDetallesBase end object ToolButton13: TToolButton Left = 187 - Top = 22 + Top = 44 Width = 8 Caption = 'ToolButton13' ImageIndex = 10 @@ -102,59 +103,60 @@ inherited frViewDetallesBase: TfrViewDetallesBase end object ToolButton6: TToolButton Left = 195 - Top = 22 + Top = 44 Action = RichEditBold1 AutoSize = True end object ToolButton7: TToolButton Left = 261 - Top = 22 + Top = 44 Action = RichEditItalic1 AutoSize = True end object ToolButton8: TToolButton Left = 328 - Top = 22 + Top = 44 Action = RichEditUnderline1 AutoSize = True end object ToolButton12: TToolButton - Left = 0 - Top = 22 + Left = 411 + Top = 44 Width = 8 Caption = 'ToolButton12' ImageIndex = 10 - Wrap = True Style = tbsSeparator end object ToolButton9: TToolButton - Left = 0 - Top = 49 + Left = 419 + Top = 44 Action = RichEditAlignLeft1 AutoSize = True end object ToolButton10: TToolButton - Left = 145 - Top = 49 + Left = 564 + Top = 44 Action = RichEditAlignCenter1 AutoSize = True end object ToolButton11: TToolButton - Left = 270 - Top = 49 + Left = 689 + Top = 44 Action = RichEditAlignRight1 AutoSize = True end end object cxGrid: TcxGrid Left = 0 - Top = 99 + Top = 94 Width = 451 - Height = 205 + Height = 210 Align = alClient TabOrder = 1 LookAndFeel.Kind = lfStandard LookAndFeel.NativeStyle = True + ExplicitTop = 99 + ExplicitHeight = 205 object cxGridView: TcxGridDBTableView NavigatorButtons.ConfirmDelete = False FilterBox.Visible = fvNever @@ -197,6 +199,7 @@ inherited frViewDetallesBase: TfrViewDetallesBase OptionsView.GridLines = glHorizontal OptionsView.GroupByBox = False OptionsView.HeaderEndEllipsis = True + OptionsView.Indicator = True Styles.OnGetContentStyle = cxGridViewStylesGetContentStyle object cxGridViewID: TcxGridDBColumn DataBinding.FieldName = 'ID' @@ -272,9 +275,13 @@ inherited frViewDetallesBase: TfrViewDetallesBase PropertiesClassName = 'TcxImageComboBoxProperties' Properties.ImmediatePost = True Properties.Items = <> - BestFitMaxWidth = 50 - MinWidth = 50 - Width = 50 + Properties.PostPopupValueOnTab = True + MinWidth = 45 + Options.HorzSizing = False + Options.Moving = False + Options.Sorting = False + Styles.Content = cxStyle_ESPECIALES + Width = 45 end object cxGridViewDESCRIPCION: TcxGridDBColumn Caption = 'Concepto' @@ -324,11 +331,12 @@ inherited frViewDetallesBase: TfrViewDetallesBase end object TBXDock1: TTBXDock Left = 0 - Top = 73 + Top = 68 Width = 451 Height = 26 BackgroundOnToolbars = False UseParentBackground = True + ExplicitTop = 73 object TBXToolbar1: TTBXToolbar Left = 0 Top = 0 @@ -919,9 +927,8 @@ inherited frViewDetallesBase: TfrViewDetallesBase Color = 15657963 end object cxStyle_ESPECIALES: TcxStyle - AssignedValues = [svColor, svTextColor] - Color = 552984534 - TextColor = 547699712 + AssignedValues = [svColor] + Color = 15657963 end object cxStyle_NORMAL_PAR: TcxStyle AssignedValues = [svColor] @@ -932,4 +939,35 @@ inherited frViewDetallesBase: TfrViewDetallesBase Color = clWindow end end + object cxGridPopupMenu: TcxGridPopupMenu + Grid = cxGrid + PopupMenus = < + item + GridView = cxGridView + HitTypes = [gvhtCell] + Index = 0 + end + item + HitTypes = [] + Index = 1 + end> + Left = 112 + Top = 136 + end + object GridIndicatorPopupMenu: TPopupMenu + Left = 144 + Top = 136 + object Eliminar1: TMenuItem + Action = actEliminar + end + object N1: TMenuItem + Caption = '-' + end + object dsds1: TMenuItem + Action = actSubir + end + object Bajar1: TMenuItem + Action = actBajar + end + end end diff --git a/Source/GUIBase/uViewDetallesBase.pas b/Source/GUIBase/uViewDetallesBase.pas index c293dd46..5971ceee 100644 --- a/Source/GUIBase/uViewDetallesBase.pas +++ b/Source/GUIBase/uViewDetallesBase.pas @@ -11,7 +11,14 @@ uses PngImageList, cxGrid, cxImageComboBox, cxTextEdit, cxMaskEdit, cxCheckBox, uGridUtils, uControllerDetallesBase, cxCurrencyEdit, ExtCtrls, Grids, DBGrids, StdCtrls, ExtActns, StdActns, cxRichEdit, JvExStdCtrls, JvCombobox, JvColorCombo, - TB2Item, TBX, TB2Dock, TB2Toolbar, uDAInterfaces; + TB2Item, TBX, TB2Dock, TB2Toolbar, uDAInterfaces, dxSkinsCore, dxSkinBlack, + dxSkinBlue, dxSkinCaramel, dxSkinCoffee, dxSkinGlassOceans, dxSkiniMaginary, + dxSkinLilian, dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, + dxSkinMoneyTwins, dxSkinOffice2007Black, dxSkinOffice2007Blue, + dxSkinOffice2007Green, dxSkinOffice2007Pink, dxSkinOffice2007Silver, + dxSkinSilver, dxSkinStardust, dxSkinsDefaultPainters, dxSkinValentine, + dxSkinXmas2008Blue, dxSkinscxPCPainter, cxGridCustomPopupMenu, cxGridPopupMenu, + Menus; type IViewDetallesBase = interface(IViewBase) @@ -120,6 +127,12 @@ type TBXItem15: TTBXItem; TBXItem16: TTBXItem; TBXSeparatorItem7: TTBXSeparatorItem; + cxGridPopupMenu: TcxGridPopupMenu; + GridIndicatorPopupMenu: TPopupMenu; + dsds1: TMenuItem; + Bajar1: TMenuItem; + Eliminar1: TMenuItem; + N1: TMenuItem; procedure actAnadirExecute(Sender: TObject); procedure actEliminarExecute(Sender: TObject); procedure actSubirExecute(Sender: TObject); @@ -500,10 +513,10 @@ end; procedure TfrViewDetallesBase.cxGridViewCustomDrawCell( Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean); -var +{var R : TRect; sVal : String ; - iFlag : Integer ; + iFlag : Integer ;} begin { R := AViewInfo.Bounds; FillGradientRect(ACanvas.Handle, R, clWindow, AViewInfo.EditViewInfo.BackgroundColor, False); @@ -762,15 +775,13 @@ function TfrViewDetallesBase.DarPosicionCAMPO(const Nombre: String): Integer; var i: Integer; begin - Result := -1; - i:=0; - while ((cxGridView.Columns[i].DataBinding.FieldName <> Nombre) - and (i < cxGridView.ColumnCount)) do + while ((cxGridView.Columns[i].DataBinding.FieldName <> Nombre) and + (i < cxGridView.ColumnCount)) do inc(i); - if (i = cxGridView.ColumnCount) - then raise Exception.Create('El campo ' + Nombre + ' no se ha encontrado en el grid (uViewDetallesBase)'); + if (i = cxGridView.ColumnCount) then + raise Exception.Create('El campo ' + Nombre + ' no se ha encontrado en el grid (uViewDetallesBase)'); Result := i; end; diff --git a/Source/GUIBase/uViewDetallesDTO.dfm b/Source/GUIBase/uViewDetallesDTO.dfm index f9a46bbd..b9d6c56c 100644 --- a/Source/GUIBase/uViewDetallesDTO.dfm +++ b/Source/GUIBase/uViewDetallesDTO.dfm @@ -1,8 +1,5 @@ inherited frViewDetallesDTO: TfrViewDetallesDTO - Width = 582 - Height = 327 inherited ToolBar1: TToolBar - Width = 582 inherited ToolButton1: TToolButton ExplicitWidth = 109 end @@ -49,8 +46,8 @@ inherited frViewDetallesDTO: TfrViewDetallesDTO end end inherited cxGrid: TcxGrid - Width = 582 - Height = 228 + ExplicitTop = 126 + ExplicitHeight = 210 inherited cxGridView: TcxGridDBTableView object cxGridViewDESCUENTO: TcxGridDBColumn [7] Caption = 'Dto' @@ -91,10 +88,7 @@ inherited frViewDetallesDTO: TfrViewDetallesDTO end end inherited TBXDock1: TTBXDock - Width = 582 - inherited TBXToolbar1: TTBXToolbar - ExplicitWidth = 582 - end + ExplicitTop = 100 end inherited ActionListContenido: TActionList inherited actAnadir: TAction diff --git a/Source/GUIBase/uViewDetallesDTO.pas b/Source/GUIBase/uViewDetallesDTO.pas index 337697dc..89ad570f 100644 --- a/Source/GUIBase/uViewDetallesDTO.pas +++ b/Source/GUIBase/uViewDetallesDTO.pas @@ -10,7 +10,14 @@ uses StdActns, ExtActns, ActnList, TB2Item, TBX, TB2Dock, TB2Toolbar, cxGridLevel, cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxClasses, cxControls, cxGridCustomView, cxGrid, ComCtrls, StdCtrls, JvExStdCtrls, - JvCombobox, JvColorCombo, ToolWin, uDAInterfaces; + JvCombobox, JvColorCombo, ToolWin, uDAInterfaces, dxSkinsCore, dxSkinBlack, + dxSkinBlue, dxSkinCaramel, dxSkinCoffee, dxSkinGlassOceans, dxSkiniMaginary, + dxSkinLilian, dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, + dxSkinMoneyTwins, dxSkinOffice2007Black, dxSkinOffice2007Blue, + dxSkinOffice2007Green, dxSkinOffice2007Pink, dxSkinOffice2007Silver, + dxSkinSilver, dxSkinStardust, dxSkinsDefaultPainters, dxSkinValentine, + dxSkinXmas2008Blue, dxSkinscxPCPainter, Menus, cxGridCustomPopupMenu, + cxGridPopupMenu; type IViewDetallesDTO = interface(IViewDetallesBase) diff --git a/Source/GUIBase/uViewDetallesGenerico.dfm b/Source/GUIBase/uViewDetallesGenerico.dfm index 3afdb87e..c672004e 100644 --- a/Source/GUIBase/uViewDetallesGenerico.dfm +++ b/Source/GUIBase/uViewDetallesGenerico.dfm @@ -73,19 +73,19 @@ inherited frViewDetallesGenerico: TfrViewDetallesGenerico Transparent = True object ToolButton1: TToolButton Left = 0 - Top = 2 + Top = 0 Action = actAnadir AutoSize = True end object ToolButton4: TToolButton Left = 62 - Top = 2 + Top = 0 Action = actModificar AutoSize = True end object ToolButton5: TToolButton Left = 136 - Top = 2 + Top = 0 Width = 8 Caption = 'ToolButton5' ImageIndex = 2 @@ -93,13 +93,13 @@ inherited frViewDetallesGenerico: TfrViewDetallesGenerico end object ToolButton2: TToolButton Left = 144 - Top = 2 + Top = 0 Action = actEliminar AutoSize = True end object ToolButton6: TToolButton Left = 211 - Top = 2 + Top = 0 Width = 8 Caption = 'ToolButton6' ImageIndex = 2 @@ -107,7 +107,7 @@ inherited frViewDetallesGenerico: TfrViewDetallesGenerico end object ToolButton7: TToolButton Left = 219 - Top = 2 + Top = 0 Action = actAnchoAutomatico AutoSize = True end diff --git a/Source/GUIBase/uViewDetallesGenerico.pas b/Source/GUIBase/uViewDetallesGenerico.pas index d2513866..fb512c7b 100644 --- a/Source/GUIBase/uViewDetallesGenerico.pas +++ b/Source/GUIBase/uViewDetallesGenerico.pas @@ -8,7 +8,13 @@ uses cxDataStorage, cxEdit, DB, cxDBData, cxTextEdit, ActnList, ImgList, PngImageList, uDADataTable, ComCtrls, ToolWin, cxGridLevel, cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxClasses, - cxControls, cxGridCustomView, cxGrid, uDAInterfaces; + cxControls, cxGridCustomView, cxGrid, uDAInterfaces, dxSkinsCore, dxSkinBlack, + dxSkinBlue, dxSkinCaramel, dxSkinCoffee, dxSkinGlassOceans, dxSkiniMaginary, + dxSkinLilian, dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, + dxSkinMoneyTwins, dxSkinOffice2007Black, dxSkinOffice2007Blue, + dxSkinOffice2007Green, dxSkinOffice2007Pink, dxSkinOffice2007Silver, + dxSkinSilver, dxSkinStardust, dxSkinsDefaultPainters, dxSkinValentine, + dxSkinXmas2008Blue, dxSkinscxPCPainter; type IViewDetallesGenerico = interface(IViewBase) diff --git a/Source/GUIBase/uViewGrid.dfm b/Source/GUIBase/uViewGrid.dfm index 4ce1c83b..309fc983 100644 --- a/Source/GUIBase/uViewGrid.dfm +++ b/Source/GUIBase/uViewGrid.dfm @@ -18,6 +18,7 @@ inherited frViewGrid: TfrViewGrid TabOrder = 0 LookAndFeel.Kind = lfOffice11 LookAndFeel.NativeStyle = True + ExplicitTop = 104 object cxGridView: TcxGridDBTableView OnDblClick = cxGridViewDblClick NavigatorButtons.ConfirmDelete = False @@ -39,6 +40,7 @@ inherited frViewGrid: TfrViewGrid OptionsSelection.CellSelect = False OptionsSelection.UnselectFocusedRecordOnExit = False OptionsView.CellEndEllipsis = True + OptionsView.NoDataToDisplayInfoText = '' OptionsView.CellAutoHeight = True OptionsView.ColumnAutoWidth = True OptionsView.DataRowHeight = 22 @@ -46,10 +48,21 @@ inherited frViewGrid: TfrViewGrid OptionsView.GridLineColor = cl3DLight OptionsView.GridLines = glHorizontal OptionsView.GroupByBox = False + OptionsView.GroupRowStyle = grsOffice11 OptionsView.HeaderEndEllipsis = True Styles.Inactive = cxStyleSelection Styles.Selection = cxStyleSelection Styles.OnGetContentStyle = cxGridViewStylesGetContentStyle + object cxGridViewICONO: TcxGridDBColumn + Caption = 'Icono' + OnCustomDrawCell = cxGridViewICONOCustomDrawCell + BestFitMaxWidth = 22 + MinWidth = 22 + Options.HorzSizing = False + Options.Sorting = False + Width = 22 + OnCustomDrawHeader = cxGridViewICONOCustomDrawHeader + end end object cxGridLevel: TcxGridLevel GridView = cxGridView @@ -166,7 +179,7 @@ inherited frViewGrid: TfrViewGrid PrinterPage.ScaleMode = smFit PrinterPage._dxMeasurementUnits_ = 0 PrinterPage._dxLastMU_ = 2 - ReportDocument.CreationDate = 39584.791125752320000000 + ReportDocument.CreationDate = 39588.472473043980000000 StyleManager = dxPrintStyleManager1 OptionsCards.Shadow.Depth = 0 OptionsExpanding.ExpandGroupRows = True @@ -237,26 +250,15 @@ inherited frViewGrid: TfrViewGrid Color = 549249528 end end - object cxViewGridPopupMenu: TcxGridPopupMenu - Grid = cxGrid - PopupMenus = <> - Left = 264 - Top = 128 - end object ActionList1: TActionList - Left = 400 - Top = 360 + Left = 144 + Top = 400 object actQuitarAgrupaciones: TAction Caption = 'Quitar agrupaciones' OnExecute = actQuitarAgrupacionesExecute OnUpdate = actQuitarAgrupacionesUpdate end end - object PngImageList10: TPngImageList - PngImages = <> - Left = 368 - Top = 360 - end object cxStyleRepositoryInforme: TcxStyleRepository Left = 368 Top = 160 @@ -350,4 +352,113 @@ inherited frViewGrid: TfrViewGrid BuiltInStyle = True end end + object GridPNGImageList: TPngImageList + PngImages = < + item + PngImage.Data = { + 89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF + 61000000097048597300000B1300000B1301009A9C1800000A4F694343505068 + 6F746F73686F70204943432070726F66696C65000078DA9D53675453E9163DF7 + DEF4424B8880944B6F5215082052428B801491262A2109104A8821A1D91551C1 + 114545041BC8A088038E8E808C15512C0C8A0AD807E421A28E83A3888ACAFBE1 + 7BA36BD6BCF7E6CDFEB5D73EE7ACF39DB3CF07C0080C9648335135800CA9421E + 11E083C7C4C6E1E42E40810A2470001008B3642173FD230100F87E3C3C2B22C0 + 07BE000178D30B0800C04D9BC0301C87FF0FEA42995C01808401C07491384B08 + 801400407A8E42A600404601809D98265300A0040060CB6362E300502D006027 + 7FE6D300809DF8997B01005B94211501A09100201365884400683B00ACCF568A + 450058300014664BC43900D82D00304957664800B0B700C0CE100BB200080C00 + 305188852900047B0060C8232378008499001446F2573CF12BAE10E72A000078 + 99B23CB9243945815B082D710757572E1E28CE49172B14366102619A402EC279 + 99193281340FE0F3CC0000A0911511E083F3FD78CE0EAECECE368EB60E5F2DEA + BF06FF226262E3FEE5CFAB70400000E1747ED1FE2C2FB31A803B06806DFEA225 + EE04685E0BA075F78B66B20F40B500A0E9DA57F370F87E3C3C45A190B9D9D9E5 + E4E4D84AC4425B61CA577DFE67C25FC057FD6CF97E3CFCF7F5E0BEE22481325D + 814704F8E0C2CCF44CA51CCF92098462DCE68F47FCB70BFFFC1DD322C44962B9 + 582A14E35112718E449A8CF332A52289429229C525D2FF64E2DF2CFB033EDF35 + 00B06A3E017B912DA85D6303F64B27105874C0E2F70000F2BB6FC1D428080380 + 6883E1CF77FFEF3FFD47A02500806649927100005E44242E54CAB33FC7080000 + 44A0812AB0411BF4C1182CC0061CC105DCC10BFC6036844224C4C24210420A64 + 801C726029AC82422886CDB01D2A602FD4401D34C051688693700E2EC255B80E + 3D700FFA61089EC128BC81090441C808136121DA8801628A58238E08179985F8 + 21C14804128B2420C9881451224B91354831528A542055481DF23D720239875C + 46BA913BC8003282FC86BC47319481B2513DD40CB543B9A8371A8446A20BD064 + 74319A8F16A09BD072B41A3D8C36A1E7D0AB680FDA8F3E43C730C0E8180733C4 + 6C302EC6C342B1382C099363CBB122AC0CABC61AB056AC03BB89F563CFB17704 + 128145C0093604774220611E4148584C584ED848A8201C243411DA0937090384 + 51C2272293A84BB426BA11F9C4186232318758482C23D6128F132F107B8843C4 + 37241289433227B9900249B1A454D212D246D26E5223E92CA99B34481A2393C9 + DA646BB20739942C202BC885E49DE4C3E433E41BE421F25B0A9D624071A4F853 + E22852CA6A4A19E510E534E5066598324155A39A52DDA8A15411358F5A42ADA1 + B652AF5187A81334759A39CD8316494BA5ADA295D31A681768F769AFE874BA11 + DD951E4E97D057D2CBE947E897E803F4770C0D861583C7886728199B18071867 + 197718AF984CA619D38B19C754303731EB98E7990F996F55582AB62A7C1591CA + 0A954A9526951B2A2F54A9AAA6AADEAA0B55F355CB548FA95E537DAE46553353 + E3A909D496AB55AA9D50EB531B5367A93BA887AA67A86F543FA47E59FD890659 + C34CC34F43A451A0B15FE3BCC6200B6319B3782C216B0DAB86758135C426B1CD + D97C762ABB98FD1DBB8B3DAAA9A13943334A3357B352F394663F07E39871F89C + 744E09E728A797F37E8ADE14EF29E2291BA6344CB931655C6BAA96979658AB48 + AB51AB47EBBD36AEEDA79DA6BD45BB59FB810E41C74A275C2747678FCE059DE7 + 53D953DDA70AA7164D3D3AF5AE2EAA6BA51BA1BB4477BF6EA7EE989EBE5E809E + 4C6FA7DE79BDE7FA1C7D2FFD54FD6DFAA7F5470C5806B30C2406DB0CCE183CC5 + 35716F3C1D2FC7DBF151435DC34043A561956197E18491B9D13CA3D5468D460F + 8C69C65CE324E36DC66DC6A326062621264B4DEA4DEE9A524DB9A629A63B4C3B + 4CC7CDCCCDA2CDD699359B3D31D732E79BE79BD79BDFB7605A785A2CB6A8B6B8 + 6549B2E45AA659EEB6BC6E855A3959A558555A5DB346AD9DAD25D6BBADBBA711 + A7B94E934EAB9ED667C3B0F1B6C9B6A9B719B0E5D806DBAEB66DB67D61676217 + 67B7C5AEC3EE93BD937DBA7D8DFD3D070D87D90EAB1D5A1D7E73B472143A563A + DE9ACE9CEE3F7DC5F496E92F6758CF10CFD833E3B613CB29C4699D539BD34767 + 1767B97383F3888B894B82CB2E973E2E9B1BC6DDC8BDE44A74F5715DE17AD2F5 + 9D9BB39BC2EDA8DBAFEE36EE69EE87DC9FCC349F299E593373D0C3C843E051E5 + D13F0B9F95306BDFAC7E4F434F8167B5E7232F632F9157ADD7B0B7A577AAF761 + EF173EF63E729FE33EE33C37DE32DE595FCC37C0B7C8B7CB4FC36F9E5F85DF43 + 7F23FF64FF7AFFD100A78025016703898141815B02FBF87A7C21BF8E3F3ADB65 + F6B2D9ED418CA0B94115418F82AD82E5C1AD2168C8EC90AD21F7E798CE91CE69 + 0E85507EE8D6D00761E6618BC37E0C2785878557863F8E7088581AD131973577 + D1DC4373DF44FA449644DE9B67314F39AF2D4A352A3EAA2E6A3CDA37BA34BA3F + C62E6659CCD5589D58496C4B1C392E2AAE366E6CBEDFFCEDF387E29DE20BE37B + 17982FC85D7079A1CEC2F485A716A92E122C3A96404C884E3894F041102AA816 + 8C25F21377258E0A79C21DC267222FD136D188D8435C2A1E4EF2482A4D7A92EC + 91BC357924C533A52CE5B98427A990BC4C0D4CDD9B3A9E169A76206D323D3ABD + 31839291907142AA214D93B667EA67E66676CBAC6585B2FEC56E8BB72F1E9507 + C96BB390AC05592D0AB642A6E8545A28D72A07B267655766BFCD89CA3996AB9E + 2BCDEDCCB3CADB90379CEF9FFFED12C212E192B6A5864B572D1D58E6BDAC6A39 + B23C7179DB0AE315052B865606AC3CB88AB62A6DD54FABED5797AE7EBD267A4D + 6B815EC1CA82C1B5016BEB0B550AE5857DEBDCD7ED5D4F582F59DFB561FA869D + 1B3E15898AAE14DB1797157FD828DC78E51B876FCABF99DC94B4A9ABC4B964CF + 66D266E9E6DE2D9E5B0E96AA97E6970E6E0DD9DAB40DDF56B4EDF5F645DB2F97 + CD28DBBB83B643B9A3BF3CB8BC65A7C9CECD3B3F54A454F454FA5436EED2DDB5 + 61D7F86ED1EE1B7BBCF634ECD5DB5BBCF7FD3EC9BEDB5501554DD566D565FB49 + FBB3F73FAE89AAE9F896FB6D5DAD4E6D71EDC703D203FD07230EB6D7B9D4D51D + D23D54528FD62BEB470EC71FBEFE9DEF772D0D360D558D9CC6E223704479E4E9 + F709DFF71E0D3ADA768C7BACE107D31F761D671D2F6A429AF29A469B539AFB5B + 625BBA4FCC3ED1D6EADE7AFC47DB1F0F9C343C59794AF354C969DAE982D39367 + F2CF8C9D959D7D7E2EF9DC60DBA2B67BE763CEDF6A0F6FEFBA1074E1D245FF8B + E73BBC3BCE5CF2B874F2B2DBE51357B8579AAF3A5F6DEA74EA3CFE93D34FC7BB + 9CBB9AAEB95C6BB9EE7ABDB57B66F7E91B9E37CEDDF4BD79F116FFD6D59E393D + DDBDF37A6FF7C5F7F5DF16DD7E7227FDCECBBBD97727EEADBC4FBC5FF440ED41 + D943DD87D53F5BFEDCD8EFDC7F6AC077A0F3D1DC47F7068583CFFE91F58F0F43 + 058F998FCB860D86EB9E383E3939E23F72FDE9FCA743CF64CF269E17FEA2FECB + AE17162F7EF8D5EBD7CED198D1A197F29793BF6D7CA5FDEAC0EB19AFDBC6C2C6 + 1EBEC97833315EF456FBEDC177DC771DEFA3DF0F4FE47C207F28FF68F9B1F553 + D0A7FB93199393FF040398F3FC63332DDB000000434944415478DA63FCFFFF3F + 03258011D900464646ACA601D530126D00BA6298A1B80C21CA0090183639925C + 80CB3B040DC0E69A510306BD010C04005E03C801036F00008D248BE16F9028BA + 0000000049454E44AE426082} + Name = 'Icono_header' + Background = clWindow + end> + Left = 296 + Top = 320 + Bitmap = {} + end + object cxViewGridPopupMenu: TcxGridPopupMenu + Grid = cxGrid + PopupMenus = < + item + HitTypes = [gvhtCell] + Index = 0 + end> + Left = 248 + Top = 128 + end end diff --git a/Source/GUIBase/uViewGrid.pas b/Source/GUIBase/uViewGrid.pas index 034478bc..c4adffbe 100644 --- a/Source/GUIBase/uViewGrid.pas +++ b/Source/GUIBase/uViewGrid.pas @@ -43,11 +43,9 @@ type dxPSEngineController1: TdxPSEngineController; cxStyleRepository1: TcxStyleRepository; cxStyleSelection: TcxStyle; - cxViewGridPopupMenu: TcxGridPopupMenu; dxComponentPrinterLink: TdxGridReportLink; frViewFiltroBase1: TfrViewFiltroBase; ActionList1: TActionList; - PngImageList10: TPngImageList; actQuitarAgrupaciones: TAction; pnlAgrupaciones: TTBXDockablePanel; TBXAlignmentPanel1: TTBXAlignmentPanel; @@ -69,12 +67,20 @@ type cxStyle_FILTRADO_IMPAR: TcxStyle; cxStyle_FILTRADO_ORDENADO_PAR: TcxStyle; cxStyle_FILTRADO_ORDENADO_IMPAR: TcxStyle; + GridPNGImageList: TPngImageList; + cxViewGridPopupMenu: TcxGridPopupMenu; procedure cxGridViewStylesGetContentStyle( Sender: TcxCustomGridTableView; ARecord: TcxCustomGridRecord; AItem: TcxCustomGridTableItem; out AStyle: TcxStyle); procedure cxGridViewDblClick(Sender: TObject); procedure actQuitarAgrupacionesExecute(Sender: TObject); procedure actQuitarAgrupacionesUpdate(Sender: TObject); + procedure cxGridViewICONOCustomDrawCell(Sender: TcxCustomGridTableView; + ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; + var ADone: Boolean); + procedure cxGridViewICONOCustomDrawHeader(Sender: TcxGridTableView; + ACanvas: TcxCanvas; AViewInfo: TcxGridColumnHeaderViewInfo; + var ADone: Boolean); protected function GetGrid : TcxGrid; override; function GetFocusedView : TcxGridDBTableView; override; @@ -188,6 +194,40 @@ begin FOnDblClick(Sender); end; +procedure TfrViewGrid.cxGridViewICONOCustomDrawCell( + Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; + AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean); +var + R : TRect; +begin + inherited; + R := AViewInfo.ContentBounds; + ACanvas.FillRect(R); + ACanvas.DrawImage(GridPNGImageList, R.Left + 2, R.Top + 2, 1); + ADone := True; +end; + +procedure TfrViewGrid.cxGridViewICONOCustomDrawHeader(Sender: TcxGridTableView; + ACanvas: TcxCanvas; AViewInfo: TcxGridColumnHeaderViewInfo; + var ADone: Boolean); +var + R : TRect; +begin + inherited; + with AViewInfo do + begin + LookAndFeelPainter.DrawHeader(ACanvas, Bounds, TextAreaBounds, Neighbors, + Borders, ButtonState, AlignmentHorz, AlignmentVert, MultiLine, + False, '', Params.Font, Params.TextColor, Params.Color); + + R := AViewInfo.ContentBounds; + ACanvas.FillRect(R); + ACanvas.DrawImage(GridPNGImageList, R.Left + 2, R.Top + 2, 0); + end; + + ADone := True; +end; + procedure TfrViewGrid.cxGridViewStylesGetContentStyle( Sender: TcxCustomGridTableView; ARecord: TcxCustomGridRecord; AItem: TcxCustomGridTableItem; out AStyle: TcxStyle); diff --git a/Source/GUIBase/uViewIncidencias.pas b/Source/GUIBase/uViewIncidencias.pas index 056ba5ed..9243f65b 100644 --- a/Source/GUIBase/uViewIncidencias.pas +++ b/Source/GUIBase/uViewIncidencias.pas @@ -7,7 +7,12 @@ uses Dialogs, uViewBase, ExtCtrls, StdCtrls, DB, uDADataTable, cxGraphics, cxTextEdit, cxMaskEdit, cxDropDownEdit, cxDBEdit, cxControls, cxContainer, cxEdit, cxLabel, cxDBLabel, cxCurrencyEdit, cxSpinEdit, - cxCheckBox, cxMemo, uDAInterfaces; + cxCheckBox, cxMemo, uDAInterfaces, dxSkinsCore, dxSkinBlack, dxSkinBlue, + dxSkinCaramel, dxSkinCoffee, dxSkinGlassOceans, dxSkiniMaginary, dxSkinLilian, + dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMoneyTwins, + dxSkinOffice2007Black, dxSkinOffice2007Blue, dxSkinOffice2007Green, + dxSkinOffice2007Pink, dxSkinOffice2007Silver, dxSkinSilver, dxSkinStardust, + dxSkinsDefaultPainters, dxSkinValentine, dxSkinXmas2008Blue; type TfrViewIncidencias = class(TfrViewBase) diff --git a/Source/GUIBase/uViewRichEditor.pas b/Source/GUIBase/uViewRichEditor.pas index 7c13a7b3..c2966701 100644 --- a/Source/GUIBase/uViewRichEditor.pas +++ b/Source/GUIBase/uViewRichEditor.pas @@ -9,7 +9,12 @@ uses cxTextEdit, cxDropDownEdit, cxColorComboBox, StdCtrls, cxButtons, ComCtrls, ToolWin, ImgList, ActnList, TBXExtItems, TB2ExtItems, TB2Item, TBX, TB2Dock, TB2Toolbar, PngImageList, cxMemo, cxRichEdit, ExtCtrls, DB, uDAInterfaces, - uDADataTable, cxDBRichEdit; + uDADataTable, cxDBRichEdit, dxSkinsCore, dxSkinBlack, dxSkinBlue, + dxSkinCaramel, dxSkinCoffee, dxSkinGlassOceans, dxSkiniMaginary, dxSkinLilian, + dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMoneyTwins, + dxSkinOffice2007Black, dxSkinOffice2007Blue, dxSkinOffice2007Green, + dxSkinOffice2007Pink, dxSkinOffice2007Silver, dxSkinSilver, dxSkinStardust, + dxSkinsDefaultPainters, dxSkinValentine, dxSkinXmas2008Blue; type IViewRichEditor = interface(IViewBase) diff --git a/Source/GUIBase/uViewTotales.dfm b/Source/GUIBase/uViewTotales.dfm index 739478ea..f54c3725 100644 --- a/Source/GUIBase/uViewTotales.dfm +++ b/Source/GUIBase/uViewTotales.dfm @@ -1,14 +1,14 @@ inherited frViewTotales: TfrViewTotales - Width = 880 + Width = 451 Height = 316 Align = alBottom - ExplicitWidth = 880 + ExplicitWidth = 451 ExplicitHeight = 316 object dxLayoutControl1: TdxLayoutControl AlignWithMargins = True Left = 0 Top = 0 - Width = 880 + Width = 451 Height = 217 Margins.Left = 0 Margins.Top = 0 @@ -17,8 +17,9 @@ inherited frViewTotales: TfrViewTotales Align = alTop ParentBackground = True TabOrder = 0 + TabStop = False AutoContentSizes = [acsWidth, acsHeight] - ExplicitWidth = 451 + ExplicitWidth = 880 object Bevel1: TBevel Left = 104 Top = 109 @@ -27,14 +28,14 @@ inherited frViewTotales: TfrViewTotales Shape = bsBottomLine end object Bevel3: TBevel - Left = 434 + Left = 278 Top = 28 Width = 3 Height = 122 Shape = bsRightLine end object Bevel4: TBevel - Left = 546 + Left = 390 Top = 109 Width = 192 Height = 9 @@ -61,18 +62,22 @@ inherited frViewTotales: TfrViewTotales Style.Font.Style = [] Style.HotTrack = False Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' Style.TextColor = clWindowText Style.IsFontAssigned = True StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.TextColor = clWindowText StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.SkinName = '' TabOrder = 5 Height = 21 Width = 93 end object ImporteIVA: TcxDBCurrencyEdit - Left = 617 + Left = 461 Top = 55 AutoSize = False DataBinding.DataField = 'IMPORTE_IVA' @@ -92,18 +97,22 @@ inherited frViewTotales: TfrViewTotales Style.Font.Style = [] Style.HotTrack = False Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' Style.TextColor = clWindowText Style.IsFontAssigned = True StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.TextColor = clWindowText StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.SkinName = '' TabOrder = 9 Height = 21 Width = 137 end object ImporteTotal: TcxDBCurrencyEdit - Left = 547 + Left = 391 Top = 129 AutoSize = False DataBinding.DataField = 'IMPORTE_TOTAL' @@ -123,13 +132,17 @@ inherited frViewTotales: TfrViewTotales Style.Font.Style = [] Style.HotTrack = False Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' Style.TextColor = clActiveCaption Style.TextStyle = [fsBold] Style.IsFontAssigned = True StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.TextColor = clWindowText StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.SkinName = '' TabOrder = 12 Height = 21 Width = 137 @@ -154,18 +167,22 @@ inherited frViewTotales: TfrViewTotales Style.Font.Style = [] Style.HotTrack = False Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' Style.TextColor = clWindowText Style.ButtonStyle = bts3D Style.IsFontAssigned = True StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.SkinName = '' TabOrder = 4 Height = 21 Width = 65 end object edtIVA: TcxDBSpinEdit - Left = 546 + Left = 390 Top = 55 AutoSize = False DataBinding.DataField = 'IVA' @@ -187,22 +204,26 @@ inherited frViewTotales: TfrViewTotales Style.HotTrack = False Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' Style.TextColor = clWindowText Style.ButtonStyle = bts3D Style.IsFontAssigned = True StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.TextColor = clWindowText StyleFocused.LookAndFeel.Kind = lfStandard StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.SkinName = '' TabOrder = 8 Height = 21 Width = 65 end object ImporteBase: TcxDBCurrencyEdit - Left = 546 + Left = 390 Top = 28 AutoSize = False DataBinding.DataField = 'BASE_IMPONIBLE' @@ -222,18 +243,22 @@ inherited frViewTotales: TfrViewTotales Style.Font.Style = [fsBold] Style.HotTrack = False Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' Style.TextColor = clWindowText Style.IsFontAssigned = True StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.TextColor = clWindowText StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.SkinName = '' TabOrder = 7 Height = 21 Width = 92 end object edtRE: TcxDBSpinEdit - Left = 546 + Left = 390 Top = 82 AutoSize = False DataBinding.DataField = 'RE' @@ -255,22 +280,26 @@ inherited frViewTotales: TfrViewTotales Style.HotTrack = False Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' Style.TextColor = clWindowText Style.ButtonStyle = bts3D Style.IsFontAssigned = True StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.TextColor = clWindowText StyleFocused.LookAndFeel.Kind = lfStandard StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.SkinName = '' TabOrder = 10 Height = 21 Width = 65 end object ImporteRE: TcxDBCurrencyEdit - Left = 617 + Left = 461 Top = 82 AutoSize = False DataBinding.DataField = 'IMPORTE_RE' @@ -290,12 +319,16 @@ inherited frViewTotales: TfrViewTotales Style.Font.Style = [] Style.HotTrack = False Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' Style.TextColor = clWindowText Style.IsFontAssigned = True StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.TextColor = clWindowText StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.SkinName = '' TabOrder = 11 Height = 21 Width = 56 @@ -321,12 +354,16 @@ inherited frViewTotales: TfrViewTotales Style.Font.Style = [fsBold] Style.HotTrack = False Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' Style.TextColor = clWindowText Style.IsFontAssigned = True StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.TextColor = clWindowText StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.SkinName = '' TabOrder = 0 Height = 21 Width = 147 @@ -351,12 +388,16 @@ inherited frViewTotales: TfrViewTotales Style.Font.Style = [] Style.HotTrack = False Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' Style.TextColor = clWindowText Style.IsFontAssigned = True StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.TextColor = clWindowText StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.SkinName = '' TabOrder = 6 Height = 21 Width = 147 @@ -381,19 +422,23 @@ inherited frViewTotales: TfrViewTotales Style.HotTrack = False Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' Style.ButtonStyle = bts3D Style.PopupBorderStyle = epbsFrame3D StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.Kind = lfStandard StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.SkinName = '' TabOrder = 1 Width = 81 end object bTiposIVA: TButton - Left = 286 + Left = 130 Top = 55 Width = 132 Height = 21 @@ -415,12 +460,16 @@ inherited frViewTotales: TfrViewTotales Style.HotTrack = False Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.Kind = lfStandard StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.SkinName = '' TabOrder = 3 Width = 219 end diff --git a/Source/GUIBase/uViewTotales.pas b/Source/GUIBase/uViewTotales.pas index 8c992e4e..092fbb7b 100644 --- a/Source/GUIBase/uViewTotales.pas +++ b/Source/GUIBase/uViewTotales.pas @@ -8,7 +8,13 @@ uses cxTextEdit, cxMaskEdit, cxDropDownEdit, cxDBEdit, cxControls, cxContainer, cxEdit, cxLabel, cxDBLabel, cxCurrencyEdit, cxSpinEdit, ComCtrls, dxLayoutControl, dxLayoutLookAndFeels, cxLookupEdit, cxDBLookupEdit, - cxDBLookupComboBox, cxCheckBox, uDAInterfaces; + cxDBLookupComboBox, cxCheckBox, uDAInterfaces, dxSkinsCore, dxSkinBlack, + dxSkinBlue, dxSkinCaramel, dxSkinCoffee, dxSkinGlassOceans, dxSkiniMaginary, + dxSkinLilian, dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, + dxSkinMoneyTwins, dxSkinOffice2007Black, dxSkinOffice2007Blue, + dxSkinOffice2007Green, dxSkinOffice2007Pink, dxSkinOffice2007Silver, + dxSkinSilver, dxSkinStardust, dxSkinsDefaultPainters, dxSkinValentine, + dxSkinXmas2008Blue, dxSkinsdxLCPainter; type TfrViewTotales = class(TfrViewBase) diff --git a/Source/Modulos/Albaranes de cliente/Controller/AlbaranesCliente_controller.dproj b/Source/Modulos/Albaranes de cliente/Controller/AlbaranesCliente_controller.dproj index 252da7f3..06a7230e 100644 --- a/Source/Modulos/Albaranes de cliente/Controller/AlbaranesCliente_controller.dproj +++ b/Source/Modulos/Albaranes de cliente/Controller/AlbaranesCliente_controller.dproj @@ -41,17 +41,17 @@ Delphi.Personality Package -FalseTrueFalseTrueFalseFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0AlbaranesCliente_controller.dpk +FalseTrueFalseFalseFalseFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0AlbaranesCliente_controller.dpk MainSource - - - - + + + + @@ -68,7 +68,7 @@