git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@21449 d1611594-4594-4d17-8e1d-87c2c4800839

src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarMarcaController.java

@@ -40,6 +40,7 @@ import org.zkoss.zul.Row;
 @Scope("prototype")
 public class EditarMarcaController extends MyGenericForwardComposer {
 
+	private static final long serialVersionUID = 1L;
 	@Autowired
 	private MarcaService marcaService;
 	@Autowired

src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/ConfigLayoutImpressaoBoletoController.java

@@ -6,13 +6,16 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Properties;
 
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Controller;
+import org.zkoss.util.media.Media;
 import org.zkoss.zhtml.Filedownload;
 import org.zkoss.zk.ui.Component;
 import org.zkoss.zk.ui.event.Event;
 import org.zkoss.zk.ui.event.InputEvent;
+import org.zkoss.zk.ui.event.UploadEvent;
 import org.zkoss.zul.Combobox;
 import org.zkoss.zul.Comboitem;
 import org.zkoss.zul.Intbox;
@@ -130,4 +133,13 @@ public class ConfigLayoutImpressaoBoletoController extends MyGenericForwardCompo
 
 		txtLayout.setText("");
 	}
+
+	public void onUpload(UploadEvent event) throws IOException {
+		Media media = event.getMedia();
+
+		Properties props = new Properties();
+		InputStream in = media.getStreamData();
+		props.load(in);
+		in.close();
+	}
 }

src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/confcomerciales/ItemMenuConfigLayoutImpressaoBoleto.java

@@ -1,5 +1,7 @@
 package com.rjconsultores.ventaboletos.web.utilerias.menu.item.confcomerciales;
 
+import org.zkoss.util.resource.Labels;
+
 import com.rjconsultores.ventaboletos.web.utilerias.PantallaUtileria;
 import com.rjconsultores.ventaboletos.web.utilerias.menu.DefaultItemMenuSistema;
 
@@ -17,6 +19,6 @@ public class ItemMenuConfigLayoutImpressaoBoleto extends DefaultItemMenuSistema
 	@Override
 	public void ejecutar() {
 		PantallaUtileria.openWindow("/gui/configuraciones_comerciales/configLayoutImpressaoBoleto.zul",
-				"Config Layout Impressão Boleto", null, desktop);
+				Labels.getLabel("configLayoutImpressaoBoletoController.window.title"), null, desktop);
 	}
 }

web/WEB-INF/i3-label_pt_BR.label

@@ -3779,3 +3779,11 @@ editarParamConexionController.lbNome.value=Nome
 editarParamConexionController.lbDesc.value=Descrição
 editarParamConexionController.lbValor.value=Valor
 editarParamConexionController.MSG.suscribirOK=Parametro Atualizado com sucesso
+
+# Configuracao Layout Impressao
+configLayoutImpressaoBoletoController.fileupload.label = Editar Arquivo
+configLayoutImpressaoBoletoController.window.title = Config Layout Impressão Boleto
+configLayoutImpressaoBoletoController.layout.label = Layout
+configLayoutImpressaoBoletoController.campo.label = Campo
+configLayoutImpressaoBoletoController.coluna.label = Coluna
+configLayoutImpressaoBoletoController.linha.label = Linha

web/gui/configuraciones_comerciales/configLayoutImpressaoBoleto.zul

@@ -6,13 +6,16 @@
 
 <zk xmlns="http://www.zkoss.org/2005/zul">
 	<window id="winConfigLayoutImpressaoBoleto"
-		title="Config Layout Impressão Boleto"
+		title="${c:l('configLayoutImpressaoBoletoController.window.title')}"
 		apply="${configLayoutImpressaoBoletoController}"
 		contentStyle="overflow:auto" height="470px" width="800px"
 		border="normal">
 		<toolbar>
 			<button id="btnSalvar" image="/gui/img/save.png"
 				width="35px" />
+			<fileupload visible="false"
+				label="${c:l('configLayoutImpressaoBoletoController.fileupload.label')}"
+				onUpload="winConfigLayoutImpressaoBoleto$composer.onUpload(event)" />
 			<button id="btnCerrar"
 				onClick="winConfigLayoutImpressaoBoleto.detach()"
 				image="/gui/img/exit.png" width="35px" />
@@ -22,7 +25,8 @@
 			<grid fixedLayout="true">
 				<rows>
 					<row spans="2">
-						<label value="Layout" />
+						<label
+							value="${c:l('configLayoutImpressaoBoletoController.layout.label')}" />
 					</row>
 					<row spans="2" align="center">
 						<textbox id="txtLayout" rows="23" cols="60" />
@@ -38,7 +42,8 @@
 					</columns>
 					<rows>
 						<row>
-							<label value="Campo" />
+							<label
+								value="${c:l('configLayoutImpressaoBoletoController.campo.label')}" />
 							<combobox id="cmbCampo">
 								<comboitem value="getOrigen" label="De" />
 								<comboitem value="getDestino"
@@ -97,11 +102,13 @@
 							</combobox>
 						</row>
 						<row>
-							<label value="Linha" />
+							<label
+								value="${c:l('configLayoutImpressaoBoletoController.linha.label')}" />
 							<intbox id="txtLinha" />
 						</row>
 						<row>
-							<label value="Coluna" />
+							<label
+								value="${c:l('configLayoutImpressaoBoletoController.coluna.label')}" />
 							<intbox id="txtColuna" />
 						</row>
 					</rows>
@@ -119,11 +126,11 @@
 					multiple="false">
 					<listhead sizable="true">
 						<listheader image="/gui/img/builder.gif"
-							label="Campo" />
+							label="${c:l('configLayoutImpressaoBoletoController.campo.label')}" />
 						<listheader image="/gui/img/builder.gif"
-							label="Linha" />
+							label="${c:l('configLayoutImpressaoBoletoController.linha.label')}" />
 						<listheader image="/gui/img/create_doc.gif"
-							label="Coluna" />
+							label="${c:l('configLayoutImpressaoBoletoController.coluna.label')}" />
 					</listhead>
 				</listbox>
 			</vbox>