").append(responseText.replace(rscript,"")).find(selector):responseText);}if(callback){self.each(callback,[responseText,status,jqXHR]);}}});return this;},serialize:function(){return jQuery.param(this.serializeArray());},serializeArray:function(){return this.map(function(){return this.elements?jQuery.makeArray(this.elements):this;}).filter(function(){return this.name&&!this.disabled&&(this.checked||rselectTextarea.test(this.nodeName)||rinput.test(this.type));}).map(function(i,elem){var val=jQuery(this).val();return val==null?null:jQuery.isArray(val)?jQuery.map(val,function(val,i){return{name:elem.name,value:val.replace(rCRLF,"\r\n")};}):{name:elem.name,value:val.replace(rCRLF,"\r\n")};}).get();}});jQuery.each(
+"ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(i,o){jQuery.fn[o]=function(f){return this.on(o,f);};});jQuery.each(["get","post"],function(i,method){jQuery[method]=function(url,data,callback,type){if(jQuery.isFunction(data)){type=type||callback;callback=data;data=undefined;}return jQuery.ajax({type:method,url:url,data:data,success:callback,dataType:type});};});jQuery.extend({getScript:function(url,callback){return jQuery.get(url,undefined,callback,"script");},getJSON:function(url,data,callback){return jQuery.get(url,data,callback,"json");},ajaxSetup:function(target,settings){if(settings){ajaxExtend(target,jQuery.ajaxSettings);}else{settings=target;target=jQuery.ajaxSettings;}ajaxExtend(target,settings);return target;},ajaxSettings:{url:ajaxLocation,isLocal:rlocalProtocol.test(ajaxLocParts[1]),global:true,type:"GET",contentType:"application/x-www-form-urlencoded",processData:true,async:true,accepts:{xml:"application/xml, text/xml",html:"text/html",
+text:"text/plain",json:"application/json, text/javascript","*":allTypes},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":window.String,"text html":true,"text json":jQuery.parseJSON,"text xml":jQuery.parseXML},flatOptions:{context:true,url:true}},ajaxPrefilter:addToPrefiltersOrTransports(prefilters),ajaxTransport:addToPrefiltersOrTransports(transports),ajax:function(url,options){if(typeof url==="object"){options=url;url=undefined;}options=options||{};var s=jQuery.ajaxSetup({},options),callbackContext=s.context||s,globalEventContext=callbackContext!==s&&(callbackContext.nodeType||callbackContext instanceof jQuery)?jQuery(callbackContext):jQuery.event,deferred=jQuery.Deferred(),completeDeferred=jQuery.Callbacks("once memory"),statusCode=s.statusCode||{},ifModifiedKey,requestHeaders={},requestHeadersNames={},responseHeadersString,responseHeaders,transport,timeoutTimer,parts,state=0,fireGlobals,i,jqXHR={readyState:0,
+setRequestHeader:function(name,value){if(!state){var lname=name.toLowerCase();name=requestHeadersNames[lname]=requestHeadersNames[lname]||name;requestHeaders[name]=value;}return this;},getAllResponseHeaders:function(){return state===2?responseHeadersString:null;},getResponseHeader:function(key){var match;if(state===2){if(!responseHeaders){responseHeaders={};while((match=rheaders.exec(responseHeadersString))){responseHeaders[match[1].toLowerCase()]=match[2];}}match=responseHeaders[key.toLowerCase()];}return match===undefined?null:match;},overrideMimeType:function(type){if(!state){s.mimeType=type;}return this;},abort:function(statusText){statusText=statusText||"abort";if(transport){transport.abort(statusText);}done(0,statusText);return this;}};function done(status,nativeStatusText,responses,headers){if(state===2){return;}state=2;if(timeoutTimer){clearTimeout(timeoutTimer);}transport=undefined;responseHeadersString=headers||"";jqXHR.readyState=status>0?4:0;var isSuccess,success,error,
+statusText=nativeStatusText,response=responses?ajaxHandleResponses(s,jqXHR,responses):undefined,lastModified,etag;if(status>=200&&status<300||status===304){if(s.ifModified){if((lastModified=jqXHR.getResponseHeader("Last-Modified"))){jQuery.lastModified[ifModifiedKey]=lastModified;}if((etag=jqXHR.getResponseHeader("Etag"))){jQuery.etag[ifModifiedKey]=etag;}}if(status===304){statusText="notmodified";isSuccess=true;}else{try{success=ajaxConvert(s,response);statusText="success";isSuccess=true;}catch(e){statusText="parsererror";error=e;}}}else{error=statusText;if(!statusText||status){statusText="error";if(status<0){status=0;}}}jqXHR.status=status;jqXHR.statusText=""+(nativeStatusText||statusText);if(isSuccess){deferred.resolveWith(callbackContext,[success,statusText,jqXHR]);}else{deferred.rejectWith(callbackContext,[jqXHR,statusText,error]);}jqXHR.statusCode(statusCode);statusCode=undefined;if(fireGlobals){globalEventContext.trigger("ajax"+(isSuccess?"Success":"Error"),[jqXHR,s,isSuccess?
+success:error]);}completeDeferred.fireWith(callbackContext,[jqXHR,statusText]);if(fireGlobals){globalEventContext.trigger("ajaxComplete",[jqXHR,s]);if(!(--jQuery.active)){jQuery.event.trigger("ajaxStop");}}}deferred.promise(jqXHR);jqXHR.success=jqXHR.done;jqXHR.error=jqXHR.fail;jqXHR.complete=completeDeferred.add;jqXHR.statusCode=function(map){if(map){var tmp;if(state<2){for(tmp in map){statusCode[tmp]=[statusCode[tmp],map[tmp]];}}else{tmp=map[jqXHR.status];jqXHR.then(tmp,tmp);}}return this;};s.url=((url||s.url)+"").replace(rhash,"").replace(rprotocol,ajaxLocParts[1]+"//");s.dataTypes=jQuery.trim(s.dataType||"*").toLowerCase().split(rspacesAjax);if(s.crossDomain==null){parts=rurl.exec(s.url.toLowerCase());s.crossDomain=!!(parts&&(parts[1]!=ajaxLocParts[1]||parts[2]!=ajaxLocParts[2]||(parts[3]||(parts[1]==="http:"?80:443))!=(ajaxLocParts[3]||(ajaxLocParts[1]==="http:"?80:443))));}if(s.data&&s.processData&&typeof s.data!=="string"){s.data=jQuery.param(s.data,s.traditional);}
+inspectPrefiltersOrTransports(prefilters,s,options,jqXHR);if(state===2){return false;}fireGlobals=s.global;s.type=s.type.toUpperCase();s.hasContent=!rnoContent.test(s.type);if(fireGlobals&&jQuery.active++===0){jQuery.event.trigger("ajaxStart");}if(!s.hasContent){if(s.data){s.url+=(rquery.test(s.url)?"&":"?")+s.data;delete s.data;}ifModifiedKey=s.url;if(s.cache===false){var ts=jQuery.now(),ret=s.url.replace(rts,"$1_="+ts);s.url=ret+((ret===s.url)?(rquery.test(s.url)?"&":"?")+"_="+ts:"");}}if(s.data&&s.hasContent&&s.contentType!==false||options.contentType){jqXHR.setRequestHeader("Content-Type",s.contentType);}if(s.ifModified){ifModifiedKey=ifModifiedKey||s.url;if(jQuery.lastModified[ifModifiedKey]){jqXHR.setRequestHeader("If-Modified-Since",jQuery.lastModified[ifModifiedKey]);}if(jQuery.etag[ifModifiedKey]){jqXHR.setRequestHeader("If-None-Match",jQuery.etag[ifModifiedKey]);}}jqXHR.setRequestHeader("Accept",s.dataTypes[0]&&s.accepts[s.dataTypes[0]]?s.accepts[s.dataTypes[0]]+(s.dataTypes[
+0]!=="*"?", "+allTypes+"; q=0.01":""):s.accepts["*"]);for(i in s.headers){jqXHR.setRequestHeader(i,s.headers[i]);}if(s.beforeSend&&(s.beforeSend.call(callbackContext,jqXHR,s)===false||state===2)){jqXHR.abort();return false;}for(i in{success:1,error:1,complete:1}){jqXHR[i](s[i]);}transport=inspectPrefiltersOrTransports(transports,s,options,jqXHR);if(!transport){done(-1,"No Transport");}else{jqXHR.readyState=1;if(fireGlobals){globalEventContext.trigger("ajaxSend",[jqXHR,s]);}if(s.async&&s.timeout>0){timeoutTimer=setTimeout(function(){jqXHR.abort("timeout");},s.timeout);}try{state=1;transport.send(requestHeaders,done);}catch(e){if(state<2){done(-1,e);}else{throw e;}}}return jqXHR;},param:function(a,traditional){var s=[],add=function(key,value){value=jQuery.isFunction(value)?value():value;s[s.length]=encodeURIComponent(key)+"="+encodeURIComponent(value);};if(traditional===undefined){traditional=jQuery.ajaxSettings.traditional;}if(jQuery.isArray(a)||(a.jquery&&!jQuery.isPlainObject(a))){
+jQuery.each(a,function(){add(this.name,this.value);});}else{for(var prefix in a){buildParams(prefix,a[prefix],traditional,add);}}return s.join("&").replace(r20,"+");}});function buildParams(prefix,obj,traditional,add){if(jQuery.isArray(obj)){jQuery.each(obj,function(i,v){if(traditional||rbracket.test(prefix)){add(prefix,v);}else{buildParams(prefix+"["+(typeof v==="object"||jQuery.isArray(v)?i:"")+"]",v,traditional,add);}});}else if(!traditional&&obj!=null&&typeof obj==="object"){for(var name in obj){buildParams(prefix+"["+name+"]",obj[name],traditional,add);}}else{add(prefix,obj);}}jQuery.extend({active:0,lastModified:{},etag:{}});function ajaxHandleResponses(s,jqXHR,responses){var contents=s.contents,dataTypes=s.dataTypes,responseFields=s.responseFields,ct,type,finalDataType,firstDataType;for(type in responseFields){if(type in responses){jqXHR[responseFields[type]]=responses[type];}}while(dataTypes[0]==="*"){dataTypes.shift();if(ct===undefined){ct=s.mimeType||jqXHR.getResponseHeader(
+"content-type");}}if(ct){for(type in contents){if(contents[type]&&contents[type].test(ct)){dataTypes.unshift(type);break;}}}if(dataTypes[0]in responses){finalDataType=dataTypes[0];}else{for(type in responses){if(!dataTypes[0]||s.converters[type+" "+dataTypes[0]]){finalDataType=type;break;}if(!firstDataType){firstDataType=type;}}finalDataType=finalDataType||firstDataType;}if(finalDataType){if(finalDataType!==dataTypes[0]){dataTypes.unshift(finalDataType);}return responses[finalDataType];}}function ajaxConvert(s,response){if(s.dataFilter){response=s.dataFilter(response,s.dataType);}var dataTypes=s.dataTypes,converters={},i,key,length=dataTypes.length,tmp,current=dataTypes[0],prev,conversion,conv,conv1,conv2;for(i=1;i
=options.duration+this.startTime){this.now=this.end;this.pos=this.state=1;this.update();options.animatedProperties[this.prop]=true;for(p in options.animatedProperties){
+if(options.animatedProperties[p]!==true){done=false;}}if(done){if(options.overflow!=null&&!jQuery.support.shrinkWrapBlocks){jQuery.each(["","X","Y"],function(index,value){elem.style["overflow"+value]=options.overflow[index];});}if(options.hide){jQuery(elem).hide();}if(options.hide||options.show){for(p in options.animatedProperties){jQuery.style(elem,p,options.orig[p]);jQuery.removeData(elem,"fxshow"+p,true);jQuery.removeData(elem,"toggle"+p,true);}}complete=options.complete;if(complete){options.complete=false;complete.call(elem);}}return false;}else{if(options.duration==Infinity){this.now=t;}else{n=t-this.startTime;this.state=n/options.duration;this.pos=jQuery.easing[options.animatedProperties[this.prop]](this.state,n,0,1,options.duration);this.now=this.start+((this.end-this.start)*this.pos);}this.update();}return true;}};jQuery.extend(jQuery.fx,{tick:function(){var timer,timers=jQuery.timers,i=0;for(;i").appendTo(body),display=elem.css("display");elem.remove();if(display==="none"||display===""){if(!iframe){iframe=document.createElement("iframe");iframe.frameBorder=iframe.width=iframe.height=0;}body.appendChild(iframe);if
+(!iframeDoc||!iframe.createElement){iframeDoc=(iframe.contentWindow||iframe.contentDocument).document;iframeDoc.write((document.compatMode==="CSS1Compat"?"":"")+"");iframeDoc.close();}elem=iframeDoc.createElement(nodeName);iframeDoc.body.appendChild(elem);display=jQuery.css(elem,"display");body.removeChild(iframe);}elemdisplay[nodeName]=display;}return elemdisplay[nodeName];}var rtable=/^t(?:able|d|h)$/i,rroot=/^(?:body|html)$/i;if("getBoundingClientRect"in document.documentElement){jQuery.fn.offset=function(options){var elem=this[0],box;if(options){return this.each(function(i){jQuery.offset.setOffset(this,options,i);});}if(!elem||!elem.ownerDocument){return null;}if(elem===elem.ownerDocument.body){return jQuery.offset.bodyOffset(elem);}try{box=elem.getBoundingClientRect();}catch(e){}var doc=elem.ownerDocument,docElem=doc.documentElement;if(!box||!jQuery.contains(docElem,elem)){return box?{top:box.top,left:box.left}:{top:0,left:0};}var body=doc.body,win=
+getWindow(doc),clientTop=docElem.clientTop||body.clientTop||0,clientLeft=docElem.clientLeft||body.clientLeft||0,scrollTop=win.pageYOffset||jQuery.support.boxModel&&docElem.scrollTop||body.scrollTop,scrollLeft=win.pageXOffset||jQuery.support.boxModel&&docElem.scrollLeft||body.scrollLeft,top=box.top+scrollTop-clientTop,left=box.left+scrollLeft-clientLeft;return{top:top,left:left};};}else{jQuery.fn.offset=function(options){var elem=this[0];if(options){return this.each(function(i){jQuery.offset.setOffset(this,options,i);});}if(!elem||!elem.ownerDocument){return null;}if(elem===elem.ownerDocument.body){return jQuery.offset.bodyOffset(elem);}var computedStyle,offsetParent=elem.offsetParent,prevOffsetParent=elem,doc=elem.ownerDocument,docElem=doc.documentElement,body=doc.body,defaultView=doc.defaultView,prevComputedStyle=defaultView?defaultView.getComputedStyle(elem,null):elem.currentStyle,top=elem.offsetTop,left=elem.offsetLeft;while((elem=elem.parentNode)&&elem!==body&&elem!==docElem){if(
+jQuery.support.fixedPosition&&prevComputedStyle.position==="fixed"){break;}computedStyle=defaultView?defaultView.getComputedStyle(elem,null):elem.currentStyle;top-=elem.scrollTop;left-=elem.scrollLeft;if(elem===offsetParent){top+=elem.offsetTop;left+=elem.offsetLeft;if(jQuery.support.doesNotAddBorder&&!(jQuery.support.doesAddBorderForTableAndCells&&rtable.test(elem.nodeName))){top+=parseFloat(computedStyle.borderTopWidth)||0;left+=parseFloat(computedStyle.borderLeftWidth)||0;}prevOffsetParent=offsetParent;offsetParent=elem.offsetParent;}if(jQuery.support.subtractsBorderForOverflowNotVisible&&computedStyle.overflow!=="visible"){top+=parseFloat(computedStyle.borderTopWidth)||0;left+=parseFloat(computedStyle.borderLeftWidth)||0;}prevComputedStyle=computedStyle;}if(prevComputedStyle.position==="relative"||prevComputedStyle.position==="static"){top+=body.offsetTop;left+=body.offsetLeft;}if(jQuery.support.fixedPosition&&prevComputedStyle.position==="fixed"){top+=Math.max(docElem.scrollTop,
+body.scrollTop);left+=Math.max(docElem.scrollLeft,body.scrollLeft);}return{top:top,left:left};};}jQuery.offset={bodyOffset:function(body){var top=body.offsetTop,left=body.offsetLeft;if(jQuery.support.doesNotIncludeMarginInBodyOffset){top+=parseFloat(jQuery.css(body,"marginTop"))||0;left+=parseFloat(jQuery.css(body,"marginLeft"))||0;}return{top:top,left:left};},setOffset:function(elem,options,i){var position=jQuery.css(elem,"position");if(position==="static"){elem.style.position="relative";}var curElem=jQuery(elem),curOffset=curElem.offset(),curCSSTop=jQuery.css(elem,"top"),curCSSLeft=jQuery.css(elem,"left"),calculatePosition=(position==="absolute"||position==="fixed")&&jQuery.inArray("auto",[curCSSTop,curCSSLeft])>-1,props={},curPosition={},curTop,curLeft;if(calculatePosition){curPosition=curElem.position();curTop=curPosition.top;curLeft=curPosition.left;}else{curTop=parseFloat(curCSSTop)||0;curLeft=parseFloat(curCSSLeft)||0;}if(jQuery.isFunction(options)){options=options.call(elem,i,
+curOffset);}if(options.top!=null){props.top=(options.top-curOffset.top)+curTop;}if(options.left!=null){props.left=(options.left-curOffset.left)+curLeft;}if("using"in options){options.using.call(elem,props);}else{curElem.css(props);}}};jQuery.fn.extend({position:function(){if(!this[0]){return null;}var elem=this[0],offsetParent=this.offsetParent(),offset=this.offset(),parentOffset=rroot.test(offsetParent[0].nodeName)?{top:0,left:0}:offsetParent.offset();offset.top-=parseFloat(jQuery.css(elem,"marginTop"))||0;offset.left-=parseFloat(jQuery.css(elem,"marginLeft"))||0;parentOffset.top+=parseFloat(jQuery.css(offsetParent[0],"borderTopWidth"))||0;parentOffset.left+=parseFloat(jQuery.css(offsetParent[0],"borderLeftWidth"))||0;return{top:offset.top-parentOffset.top,left:offset.left-parentOffset.left};},offsetParent:function(){return this.map(function(){var offsetParent=this.offsetParent||document.body;while(offsetParent&&(!rroot.test(offsetParent.nodeName)&&jQuery.css(offsetParent,"position")
+==="static")){offsetParent=offsetParent.offsetParent;}return offsetParent;});}});jQuery.each(["Left","Top"],function(i,name){var method="scroll"+name;jQuery.fn[method]=function(val){var elem,win;if(val===undefined){elem=this[0];if(!elem){return null;}win=getWindow(elem);return win?("pageXOffset"in win)?win[i?"pageYOffset":"pageXOffset"]:jQuery.support.boxModel&&win.document.documentElement[method]||win.document.body[method]:elem[method];}return this.each(function(){win=getWindow(this);if(win){win.scrollTo(!i?val:jQuery(win).scrollLeft(),i?val:jQuery(win).scrollTop());}else{this[method]=val;}});};});function getWindow(elem){return jQuery.isWindow(elem)?elem:elem.nodeType===9?elem.defaultView||elem.parentWindow:false;}jQuery.each(["Height","Width"],function(i,name){var type=name.toLowerCase();jQuery.fn["inner"+name]=function(){var elem=this[0];return elem?elem.style?parseFloat(jQuery.css(elem,type,"padding")):this[type]():null;};jQuery.fn["outer"+name]=function(margin){var elem=this[0];
+return elem?elem.style?parseFloat(jQuery.css(elem,type,margin?"margin":"border")):this[type]():null;};jQuery.fn[type]=function(size){var elem=this[0];if(!elem){return size==null?null:this;}if(jQuery.isFunction(size)){return this.each(function(i){var self=jQuery(this);self[type](size.call(this,i,self[type]()));});}if(jQuery.isWindow(elem)){var docElemProp=elem.document.documentElement["client"+name],body=elem.document.body;return elem.document.compatMode==="CSS1Compat"&&docElemProp||body&&body["client"+name]||docElemProp;}else if(elem.nodeType===9){return Math.max(elem.documentElement["client"+name],elem.body["scroll"+name],elem.documentElement["scroll"+name],elem.body["offset"+name],elem.documentElement["offset"+name]);}else if(size===undefined){var orig=jQuery.css(elem,type),ret=parseFloat(orig);return jQuery.isNumeric(ret)?ret:orig;}else{return this.css(type,typeof size==="string"?size:size+"px");}};});window.jQuery=window.$=jQuery;if(typeof define==="function"&&define.amd&&define.
+amd.jQuery){define("jquery",[],function(){return jQuery;});}})(window);;var mw=(function($,undefined){"use strict";var hasOwn=Object.prototype.hasOwnProperty;function Map(global){this.values=global===true?window:{};return this;}Map.prototype={get:function(selection,fallback){var results,i;if($.isArray(selection)){selection=$.makeArray(selection);results={};for(i=0;i');}return'<'+this.key+'>';}if(this.format==='plain'){text=this.parser();}if(this.format==='escaped'){text=this.parser();text=mw.html.escape(text);}if(this.format==='parse'){text=this.parser();}return text;},parse:function(){
+this.format='parse';return this.toString();},plain:function(){this.format='plain';return this.toString();},escaped:function(){this.format='escaped';return this.toString();},exists:function(){return this.map.exists(this.key);}};return{log:function(){},Map:Map,Message:Message,config:null,libs:{},legacy:{},messages:new Map(),message:function(key,parameter_1){var parameters;if(parameter_1!==undefined){parameters=$.makeArray(arguments);parameters.shift();}else{parameters=[];}return new Message(mw.messages,key,parameters);},msg:function(key,parameters){return mw.message.apply(mw.message,arguments).toString();},loader:(function(){var registry={},sources={},batch=[],queue=[],jobs=[],ready=false,$marker=null;$(document).ready(function(){ready=true;});function getMarker(){if($marker){return $marker;}else{$marker=$('meta[name="ResourceLoaderDynamicStyles"]');if($marker.length){return $marker;}mw.log('getMarker> No found, inserting dynamically.');$marker=$
+('').attr('name','ResourceLoaderDynamicStyles').appendTo('head');return $marker;}}function addInlineCSS(css,media){var $style=getMarker().prev(),$newStyle,attrs={'type':'text/css','media':media};if($style.is('style')&&$style.data('ResourceLoaderDynamicStyleTag')===true){try{css=$(mw.html.element('style',{},new mw.html.Cdata("\n\n"+css))).html();$style.append(css);}catch(e){css=$style.html()+"\n\n"+css;$newStyle=$(mw.html.element('style',attrs,new mw.html.Cdata(css))).data('ResourceLoaderDynamicStyleTag',true);$style.after($newStyle);$style.remove();}}else{$style=$(mw.html.element('style',attrs,new mw.html.Cdata(css)));$style.data('ResourceLoaderDynamicStyleTag',true);getMarker().before($style);}}function compare(a,b){var i;if(a.length!==b.length){return false;}for(i=0;i '+deps[n]);}unresolved[unresolved.length]=module;recurse(deps[n],resolved,unresolved);unresolved.pop();}}resolved[resolved.length]=module;}function resolve(module){var modules,m,deps,n,resolved;if($.isArray(module)){
+modules=[];for(m=0;m=arr.length){callback();return;}addScript(arr[i],function(){nestedAddScript(arr,callback,async,i+1);},async);};if($.isArray(script)){registry[module].state='loading';nestedAddScript(script,markModuleReady,registry[module].async,0);}else if($.isFunction(script)){script($);markModuleReady();}}catch(e){if(window.console&&typeof window.console.log==='function'){console.log('mw.loader::execute> Exception thrown by '+module+': '+e.message);}registry[module].state='error';}}function request(dependencies,ready,error,async){var regItemDeps,regItemDepLen,n;if(typeof dependencies==='string'){dependencies=[dependencies];if(registry[dependencies[0]]!==undefined){regItemDeps=registry[dependencies[0]].dependencies;
+regItemDepLen=regItemDeps.length;for(n=0;n1){jobs[jobs.length]={'dependencies':filter(['registered','loading','loaded'],dependencies),'ready':ready,'error':error};}dependencies=filter(['registered'],dependencies);for(n=0;nmaxVersion){maxVersion=registry[modules[g]].version;}}currReqBase=$.extend({'version':formatVersionNumber(maxVersion)},reqBase);currReqBaseLength=$.param(currReqBase).length;async=true;l=currReqBaseLength+9;moduleMap={};for(i=0;i0&&!$.isEmptyObject(moduleMap)&&l+bytesAdded>maxQueryLength){doRequest(moduleMap,currReqBase,sourceLoadScript,async);moduleMap={};async=true;l=currReqBaseLength+9;}if(moduleMap[prefix]===undefined){moduleMap[prefix]=[];}moduleMap[prefix].push(suffix);if(!registry[modules[i]].
+async){async=false;}l+=bytesAdded;}if(!$.isEmptyObject(moduleMap)){doRequest(moduleMap,currReqBase,sourceLoadScript,async);}}}},addSource:function(id,props){var source;if(typeof id==='object'){for(source in id){mw.loader.addSource(source,id[source]);}return true;}if(sources[id]!==undefined){throw new Error('source already registered: '+id);}sources[id]=props;return true;},register:function(module,version,dependencies,group,source){var m;if(typeof module==='object'){for(m=0;m',{rel:
+'stylesheet',type:'text/css',href:modules}));return;}else if(type==='text/javascript'||type===undefined){addScript(modules,null,async);return;}throw new Error('invalid type for external url, must be text/css or text/javascript. not '+type);}modules=[modules];}for(filtered=[],m=0;m':return'>';case'&':return'&';}}return{escape:function(s){return s.replace(/['"<>&]/g,escapeCallback);},Raw:function(value){this.value=value;},Cdata:function(value){this.value=value;},element:function(name,attrs,contents){var v,attrName,s='<'+name;for(attrName in attrs){v=attrs[attrName];if(v===true){v=attrName;}else if(v===false){continue;}s+=' '+attrName+'="'+this.escape(String(v))+'"';}if(contents===undefined||contents===null){s+='/>';return s;}s+='>';switch(typeof contents){case'string':s+=this.escape(contents);break;case'number':case'boolean':s+=String(
+contents);break;default:if(contents instanceof this.Raw){s+=contents.value;}else if(contents instanceof this.Cdata){if(/<\/[a-zA-z]/.test(contents.value)){throw new Error('mw.html.element: Illegal end tag found in CDATA');}s+=contents.value;}else{throw new Error('mw.html.element: Invalid type of contents');}}s+='';return s;}};})(),user:{options:new Map(),tokens:new Map()}};})(jQuery);window.$j=jQuery;window.mw=window.mediaWiki=mw;if(typeof startUp!=='undefined'&&jQuery.isFunction(startUp)){startUp();startUp=undefined;};mw.loader.state({"jquery":"ready","mediawiki":"ready"});
+
+/* cache key: oni_wiki:resourceloader:filter:minify-js:7:8f87392541be422f5616ba0b0d90b5dd */
Index: /Vago/trunk/Vago/help/XMLSNDD_files/load(2).php
===================================================================
--- /Vago/trunk/Vago/help/XMLSNDD_files/load(2).php (revision 771)
+++ /Vago/trunk/Vago/help/XMLSNDD_files/load(2).php (revision 771)
@@ -0,0 +1,32 @@
+mw.loader.implement("jquery.client",function($){(function($){var profileCache={};$.client={profile:function(nav){if(nav===undefined){nav=window.navigator;}if(profileCache[nav.userAgent]===undefined){var uk='unknown';var x='x';var wildUserAgents=['Opera','Navigator','Minefield','KHTML','Chrome','PLAYSTATION 3'];var userAgentTranslations=[[/(Firefox|MSIE|KHTML,\slike\sGecko|Konqueror)/,''],['Chrome Safari','Chrome'],['KHTML','Konqueror'],['Minefield','Firefox'],['Navigator','Netscape'],['PLAYSTATION 3','PS3']];var versionPrefixes=['camino','chrome','firefox','netscape','netscape6','opera','version','konqueror','lynx','msie','safari','ps3'];var versionSuffix='(\\/|\\;?\\s|)([a-z0-9\\.\\+]*?)(\\;|dev|rel|\\)|\\s|$)';var names=['camino','chrome','firefox','netscape','konqueror','lynx','msie','opera','safari','ipod','iphone','blackberry','ps3'];var nameTranslations=[];var layouts=['gecko','konqueror','msie','opera','webkit'];var layoutTranslations=[['konqueror','khtml'],['msie','trident'],[
+'opera','presto']];var layoutVersions=['applewebkit','gecko'];var platforms=['win','mac','linux','sunos','solaris','iphone'];var platformTranslations=[['sunos','solaris']];var translate=function(source,translations){for(var i=0;i400){version='2.0';}if(name==='opera'&&version>=9.8){version=ua.match(/version\/([0-9\.]*)/i)[1]||10;}var versionNumber=parseFloat(version,10)||0.0;profileCache[nav.userAgent]={'name':name,'layout':layout,'layoutVersion':layoutversion,'platform':platform,'version':version,'versionBase':(version!==x?Math.floor(versionNumber).toString():x),'versionNumber':versionNumber};}return profileCache[nav.userAgent];},test:function(map,profile){profile=$.isPlainObject(profile)?profile:$.client.profile();var dir=$('body').is('.rtl')?'rtl':'ltr';if(typeof map[dir]!=='object'||typeof map[dir][profile.name]==='undefined'){return true;}var conditions=map[dir][profile.name];for(var i=0;i0){if($curBox.hasClass('js-messagebox')){return $curBox;}else{return $curBox.addClass('js-messagebox');}}else{var $newBox=$('',{'id':options.id,'class':'js-messagebox','css':{'display':'none'}});if($(options.parent).length<1){options.parent='body';}if(options.insert==='append'){$newBox.appendTo(options.parent);return $newBox;}else{$newBox.prependTo(options.parent);return $newBox;}}};$.messageBox=function(options){options=$.extend({'message':'','group':'default','replace':false,'target':'js-messagebox'},options);var $target=$.messageBoxNew({id:options.target});var groupID=options.target+'-'+
+options.group;var $group=$('#'+groupID);if($group.length<1){$group=$('
',{'id':groupID,'class':'js-messagebox-group'});$target.prepend($group);}if(options.replace===true){$group.empty();}if(options.message===''||options.message===null){$group.hide();}else{$group.prepend($('
').append(options.message)).show();$target.slideDown();}if($target.find('> *:visible').length===0){$group.show();$target.slideUp();$group.hide();}else{$target.slideDown();}return $group;};})(jQuery);;},{"all":".js-messagebox{margin:1em 5%;padding:0.5em 2.5%;border:1px solid #ccc;background-color:#fcfcfc;font-size:0.8em}.js-messagebox .js-messagebox-group{margin:1px;padding:0.5em 2.5%;border-bottom:1px solid #ddd}.js-messagebox .js-messagebox-group:last-child{border-bottom:thin none transparent}\n\n/* cache key: oni_wiki:resourceloader:filter:minify-css:7:8b08bdc91c52a9ffba396dccfb5b473c */\n"},{});mw.loader.implement("jquery.mwExtension",function($){(function($){$.extend({trimLeft:function(str){return str===
+null?'':str.toString().replace(/^\s+/,'');},trimRight:function(str){return str===null?'':str.toString().replace(/\s+$/,'');},ucFirst:function(str){return str.charAt(0).toUpperCase()+str.substr(1);},escapeRE:function(str){return str.replace(/([\\{}()|.?*+\-^$\[\]])/g,"\\$1");},isDomElement:function(el){return!!el&&!!el.nodeType;},isEmpty:function(v){if(v===''||v===0||v==='0'||v===null||v===false||v===undefined){return true;}if(v.length===0){return true;}if(typeof v==='object'){for(var key in v){return false;}return true;}return false;},compareArray:function(arrThis,arrAgainst){if(arrThis.length!=arrAgainst.length){return false;}for(var i=0;iError: '+x.status+' '+x.statusText+' ('+x.responseText+')
';}}}else{alert('bad target for sajax_do_call: not a function or object: '+target);}};sajax_debug(func_name+' uri = '+uri+' / post = '+post_data);x.send(post_data)
+;sajax_debug(func_name+' waiting..');delete x;return true;};window.wfSupportsAjax=function(){var request=sajax_init_object();var supportsAjax=request?true:false;delete request;return supportsAjax;};;},{},{});mw.loader.implement("mediawiki.legacy.wikibits",function($){(function(){window.clientPC=navigator.userAgent.toLowerCase();window.is_gecko=/gecko/.test(clientPC)&&!/khtml|spoofer|netscape\/7\.0/.test(clientPC);window.is_safari=window.is_safari_win=window.webkit_version=window.is_chrome=window.is_chrome_mac=false;window.webkit_match=clientPC.match(/applewebkit\/(\d+)/);if(webkit_match){window.is_safari=clientPC.indexOf('applewebkit')!=-1&&clientPC.indexOf('spoofer')==-1;window.is_safari_win=is_safari&&clientPC.indexOf('windows')!=-1;window.webkit_version=parseInt(webkit_match[1]);window.is_chrome=clientPC.indexOf('chrome')!==-1&&clientPC.indexOf('spoofer')===-1;window.is_chrome_mac=is_chrome&&clientPC.indexOf('mac')!==-1}window.is_ff2=/firefox\/[2-9]|minefield\/3/.test(clientPC);
+window.ff2_bugs=/firefox\/2/.test(clientPC);window.is_ff2_win=is_ff2&&clientPC.indexOf('windows')!=-1;window.is_ff2_x11=is_ff2&&clientPC.indexOf('x11')!=-1;window.is_opera=window.is_opera_preseven=window.is_opera_95=window.opera6_bugs=window.opera7_bugs=window.opera95_bugs=false;if(clientPC.indexOf('opera')!=-1){window.is_opera=true;window.is_opera_preseven=window.opera&&!document.childNodes;window.is_opera_seven=window.opera&&document.childNodes;window.is_opera_95=/opera\/(9\.[5-9]|[1-9][0-9])/.test(clientPC);window.opera6_bugs=is_opera_preseven;window.opera7_bugs=is_opera_seven&&!is_opera_95;window.opera95_bugs=/opera\/(9\.5)/.test(clientPC);}window.ie6_bugs=false;if(/msie ([0-9]{1,}[\.0-9]{0,})/.exec(clientPC)!=null&&parseFloat(RegExp.$1)<=6.0){ie6_bugs=true;}window.doneOnloadHook=undefined;if(!window.onloadFuncts){window.onloadFuncts=[];}window.addOnloadHook=function(hookFunct){if(!doneOnloadHook){onloadFuncts[onloadFuncts.length]=hookFunct;}else{hookFunct();}};window.importScript=
+function(page){var uri=mw.config.get('wgScript')+'?title='+mw.util.wikiUrlencode(page)+'&action=raw&ctype=text/javascript';return importScriptURI(uri);};window.loadedScripts={};window.importScriptURI=function(url){if(loadedScripts[url]){return null;}loadedScripts[url]=true;var s=document.createElement('script');s.setAttribute('src',url);s.setAttribute('type','text/javascript');document.getElementsByTagName('head')[0].appendChild(s);return s;};window.importStylesheet=function(page){return importStylesheetURI(mw.config.get('wgScript')+'?action=raw&ctype=text/css&title='+mw.util.wikiUrlencode(page));};window.importStylesheetURI=function(url,media){var l=document.createElement('link');l.type='text/css';l.rel='stylesheet';l.href=url;if(media){l.media=media;}document.getElementsByTagName('head')[0].appendChild(l);return l;};window.appendCSS=function(text){var s=document.createElement('style');s.type='text/css';s.rel='stylesheet';if(s.styleSheet){s.styleSheet.cssText=text;}else{s.appendChild(
+document.createTextNode(text+''));}document.getElementsByTagName('head')[0].appendChild(s);return s;};var skinpath=mw.config.get('stylepath')+'/'+mw.config.get('skin');if(mw.config.get('skin')==='monobook'){if(opera6_bugs){importStylesheetURI(skinpath+'/Opera6Fixes.css');}else if(opera7_bugs){importStylesheetURI(skinpath+'/Opera7Fixes.css');}else if(opera95_bugs){importStylesheetURI(skinpath+'/Opera9Fixes.css');}else if(ff2_bugs){importStylesheetURI(skinpath+'/FF2Fixes.css');}}if(mw.config.get('wgBreakFrames')){if(window.top!=window){window.top.location=window.location;}}window.changeText=function(el,newText){if(el.innerText){el.innerText=newText;}else if(el.firstChild&&el.firstChild.nodeValue){el.firstChild.nodeValue=newText;}};window.killEvt=function(evt){evt=evt||window.event||window.Event;if(typeof(evt.preventDefault)!='undefined'){evt.preventDefault();evt.stopPropagation();}else{evt.cancelBubble=true;}return false;};window.mwEditButtons=[];window.mwCustomEditButtons=[];window.
+escapeQuotes=function(text){var re=new RegExp("'","g");text=text.replace(re,"\\'");re=new RegExp("\\n","g");text=text.replace(re,"\\n");return escapeQuotesHTML(text);};window.escapeQuotesHTML=function(text){var re=new RegExp('&',"g");text=text.replace(re,"&");re=new RegExp('"',"g");text=text.replace(re,""");re=new RegExp('<',"g");text=text.replace(re,"<");re=new RegExp('>',"g");text=text.replace(re,">");return text;};window.tooltipAccessKeyPrefix='alt-';if(is_opera){tooltipAccessKeyPrefix='shift-esc-';}else if(is_chrome){tooltipAccessKeyPrefix=is_chrome_mac?'ctrl-option-':'alt-';}else if(!is_safari_win&&is_safari&&webkit_version>526){tooltipAccessKeyPrefix='ctrl-alt-';}else if(!is_safari_win&&(is_safari||clientPC.indexOf('mac')!=-1||clientPC.indexOf('konqueror')!=-1)){tooltipAccessKeyPrefix='ctrl-';}else if(is_ff2){tooltipAccessKeyPrefix='alt-shift-';}window.tooltipAccessKeyRegexp=/\[(ctrl-)?(alt-)?(shift-)?(esc-)?(.)\]$/;window.updateTooltipAccessKeys=function(nodeList)
+{if(!nodeList){var linkContainers=['column-one','mw-head','mw-panel','p-logo'];for(var i in linkContainers){var linkContainer=document.getElementById(linkContainers[i]);if(linkContainer){updateTooltipAccessKeys(linkContainer.getElementsByTagName('a'));}}updateTooltipAccessKeys(document.getElementsByTagName('input'));updateTooltipAccessKeys(document.getElementsByTagName('label'));return;}for(var i=0;i
0){node=uls[0];}else{node=document.createElement('ul');var lastElementChild=null;for(var i=0;iinputs.length){finish=inputs.length;}for(var i=start;istart&&typeof checkboxes[i].onchange=='function'){checkboxes[i].onchange();}}lastCheckbox=this.index;return true;};window.getElementsByClassName=function(oElm,strTagName,oClassNames){var arrReturnElements=[];if(typeof(oElm.getElementsByClassName)=='function'){var arrNativeReturn=oElm.getElementsByClassName(oClassNames);if(strTagName=='*'){return arrNativeReturn;}for(var h=0;h526){util.tooltipAccessKeyPrefix='ctrl-alt-';}else if(!(profile.platform==='win'&&profile.name==='safari')&&(profile.name==='safari'||profile.platform==='mac'||profile.name==='konqueror')){util.tooltipAccessKeyPrefix='ctrl-';}else if(profile.name==='firefox'&&profile.versionBase>'1'){util.tooltipAccessKeyPrefix='alt-shift-';}if($('#bodyContent').length){util.$content=$('#bodyContent');}else if($('#mw_contentholder').length){util.$content=$('#mw_contentholder');}else if($('#article').length){util.$content=$('#article');}else{util.$content=$('#content');}$tocTitle=$('#toctitle');$tocToggleLink=$('#togglelink');if($('#toc').length&&$tocTitle.length&&!$tocToggleLink.length){hideTocCookie=$.cookie('mw_hidetoc');$tocToggleLink=$('').text(mw.msg('hidetoc')).click(function(e){e.preventDefault();util.toggleToc($(this));}
+);$tocTitle.append($tocToggleLink.wrap('').parent().prepend(' [').append('] '));if(hideTocCookie==='1'){util.toggleToc($tocToggleLink);}}},rawurlencode:function(str){str=String(str);return encodeURIComponent(str).replace(/!/g,'%21').replace(/'/g,'%27').replace(/\(/g,'%28').replace(/\)/g,'%29').replace(/\*/g,'%2A').replace(/~/g,'%7E');},wikiUrlencode:function(str){return util.rawurlencode(str).replace(/%20/g,'_').replace(/%3A/g,':').replace(/%2F/g,'/');},wikiGetlink:function(str){return mw.config.get('wgArticlePath').replace('$1',util.wikiUrlencode(typeof str==='string'?str:mw.config.get('wgPageName')));},wikiScript:function(str){return mw.config.get('wgScriptPath')+'/'+(str||'index')+mw.config.get('wgScriptExtension');},addCSS:function(text){var s=document.createElement('style');s.type='text/css';s.rel='stylesheet';document.getElementsByTagName('head')[0].appendChild(s);if(s.styleSheet){s.styleSheet.cssText=text;}else{s.appendChild(document.
+createTextNode(String(text)));}return s.sheet||s;},toggleToc:function($toggleLink,callback){var $tocList=$('#toc ul:first');if($tocList.length){if($tocList.is(':hidden')){$tocList.slideDown('fast',callback);$toggleLink.text(mw.msg('hidetoc'));$('#toc').removeClass('tochidden');$.cookie('mw_hidetoc',null,{expires:30,path:'/'});return true;}else{$tocList.slideUp('fast',callback);$toggleLink.text(mw.msg('showtoc'));$('#toc').addClass('tochidden');$.cookie('mw_hidetoc','1',{expires:30,path:'/'});return false;}}else{return null;}},getParamValue:function(param,url){url=url||document.location.href;var re=new RegExp('^[^#]*[&?]'+$.escapeRE(param)+'=([^&#]*)'),m=re.exec(url);if(m&&m.length>1){return decodeURIComponent(m[1].replace(/\+/g,'%20'));}return null;},tooltipAccessKeyPrefix:'alt-',tooltipAccessKeyRegexp:/\[(ctrl-)?(alt-)?(shift-)?(esc-)?(.)\]$/,updateTooltipAccessKeys:function($nodes){if(!$nodes){$nodes=$('#column-one a, #mw-head a, #mw-panel a, #p-logo a, input, label');}else if(!(
+$nodes instanceof $)){$nodes=$($nodes);}$nodes.attr('title',function(i,val){if(val&&util.tooltipAccessKeyRegexp.exec(val)){return val.replace(util.tooltipAccessKeyRegexp,'['+util.tooltipAccessKeyPrefix+'$5]');}return val;});},$content:null,addPortletLink:function(portlet,href,text,id,tooltip,accesskey,nextnode){var $item,$link,$portlet,$ul;if(arguments.length<3){return null;}$link=$('').attr('href',href).text(text);if(tooltip){$link.attr('title',tooltip);}switch(mw.config.get('skin')){case'standard':case'cologneblue':$('#quickbar').append($link.after('
'));return $link[0];case'nostalgia':$('#searchform').before($link).before(' | ');return $link[0];default:$portlet=$('#'+portlet);if($portlet.length===0){return null;}$ul=$portlet.find('ul');if($ul.length===0){if($portlet.find('div:first').length===0){$portlet.append('');}else{$portlet.find('div').eq(-1).append('');}$ul=$portlet.find('ul').eq(0);}if($ul.length===0){return null;}$portlet.removeClass(
+'emptyPortlet');if($portlet.hasClass('vectorTabs')){$item=$link.wrap('').parent().parent();}else{$item=$link.wrap('').parent();}if(id){$item.attr('id',id);}if(accesskey){$link.attr('accesskey',accesskey);tooltip+=' ['+accesskey+']';$link.attr('title',tooltip);}if(accesskey&&tooltip){util.updateTooltipAccessKeys($link);}if(nextnode&&nextnode.parentNode===$ul[0]){$(nextnode).before($item);}else if(typeof nextnode==='string'&&$ul.find(nextnode).length!==0){$ul.find(nextnode).eq(0).before($item);}else{$ul.append($item);}return $item[0];}},jsMessage:function(message,className){if(!arguments.length||message===''||message===null){$('#mw-js-message').empty().hide();return true;}else{var $messageDiv=$('#mw-js-message');if(!$messageDiv.length){$messageDiv=$('');if(util.$content.parent().length){util.$content.parent().prepend($messageDiv);}else{return false;}}if(className){$messageDiv.prop('class','mw-js-message-'+className);}if(typeof
+message==='object'){$messageDiv.empty();$messageDiv.append(message);}else{$messageDiv.html(message);}$messageDiv.slideDown();return true;}},validateEmail:function(mailtxt){var rfc5322_atext,rfc1034_ldh_str,HTML5_email_regexp;if(mailtxt===''){return null;}rfc5322_atext="a-z0-9!#$%&'*+\\-/=?^_`{|}~";rfc1034_ldh_str="a-z0-9\\-";HTML5_email_regexp=new RegExp('^'+'['+rfc5322_atext+'\\.]+'+'@'+'['+rfc1034_ldh_str+']+'+'(?:\\.['+rfc1034_ldh_str+']+)*'+'$','i');return(null!==mailtxt.match(HTML5_email_regexp));},isIPv4Address:function(address,allowBlock){if(typeof address!=='string'){return false;}var block=allowBlock?'(?:\\/(?:3[0-2]|[12]?\\d))?':'',RE_IP_BYTE='(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|0?[0-9]?[0-9])',RE_IP_ADD='(?:'+RE_IP_BYTE+'\\.){3}'+RE_IP_BYTE;return address.search(new RegExp('^'+RE_IP_ADD+block+'$'))!==-1;},isIPv6Address:function(address,allowBlock){if(typeof address!=='string'){return false;}var block=allowBlock?'(?:\\/(?:12[0-8]|1[01][0-9]|[1-9]?\\d))?':'',RE_IPV6_ADD='(?:'+
+':(?::|(?::'+'[0-9A-Fa-f]{1,4}'+'){1,7})'+'|'+'[0-9A-Fa-f]{1,4}'+'(?::'+'[0-9A-Fa-f]{1,4}'+'){0,6}::'+'|'+'[0-9A-Fa-f]{1,4}'+'(?::'+'[0-9A-Fa-f]{1,4}'+'){7}'+')';if(address.search(new RegExp('^'+RE_IPV6_ADD+block+'$'))!==-1){return true;}RE_IPV6_ADD='[0-9A-Fa-f]{1,4}'+'(?:::?'+'[0-9A-Fa-f]{1,4}'+'){1,6}';return address.search(new RegExp('^'+RE_IPV6_ADD+block+'$'))!==-1&&address.search(/::/)!==-1&&address.search(/::.*::/)===-1;}};mw.util=util;})(jQuery,mediaWiki);;},{},{"showtoc":"show","hidetoc":"hide"});
+
+/* cache key: oni_wiki:resourceloader:filter:minify-js:7:1aa4243ba1ca1aec859d6ce378a84443 */
Index: /Vago/trunk/Vago/help/XMLSNDD_files/load(3).php
===================================================================
--- /Vago/trunk/Vago/help/XMLSNDD_files/load(3).php (revision 771)
+++ /Vago/trunk/Vago/help/XMLSNDD_files/load(3).php (revision 771)
@@ -0,0 +1,3 @@
+jQuery(function($){$('div.vectorMenu').each(function(){var self=this;$('h5:first a:first',this).click(function(e){$('.menu:first',self).toggleClass('menuForceShow');e.preventDefault();}).focus(function(){$(self).addClass('vectorMenuFocus');}).blur(function(){$(self).removeClass('vectorMenuFocus');});});});;mw.loader.state({"skins.vector":"ready"});
+
+/* cache key: oni_wiki:resourceloader:filter:minify-js:7:0fcba82177db6429d02096ea1f0465ed */
Index: /Vago/trunk/Vago/help/XMLSNDD_files/load(4).php
===================================================================
--- /Vago/trunk/Vago/help/XMLSNDD_files/load(4).php (revision 771)
+++ /Vago/trunk/Vago/help/XMLSNDD_files/load(4).php (revision 771)
@@ -0,0 +1,33 @@
+mw.loader.implement("jquery.checkboxShiftClick",function($){(function($){$.fn.checkboxShiftClick=function(text){var prevCheckbox=null;var $box=this;$box.click(function(e){if(prevCheckbox!==null&&e.shiftKey){$box.slice(Math.min($box.index(prevCheckbox),$box.index(e.target)),Math.max($box.index(prevCheckbox),$box.index(e.target))+1).prop('checked',e.target.checked?true:false);}prevCheckbox=e.target;});return $box;};})(jQuery);;},{},{});mw.loader.implement("jquery.makeCollapsible",function($){(function($,mw){$.fn.makeCollapsible=function(){return this.each(function(){var _fn='jquery.makeCollapsible> ';var $that=$(this).addClass('mw-collapsible'),that=this,collapsetext=$(this).attr('data-collapsetext'),expandtext=$(this).attr('data-expandtext'),toggleElement=function($collapsible,action,$defaultToggle,instantHide){if(!$collapsible.jquery){return;}if(action!='expand'&&action!='collapse'){return;}if(typeof $defaultToggle=='undefined'){$defaultToggle=null;}if($defaultToggle!==null&&!(
+$defaultToggle instanceof $)){return;}var $containers=null;if(action=='collapse'){if($collapsible.is('table')){$containers=$collapsible.find('>tbody>tr');if($defaultToggle){$containers.not($defaultToggle.closest('tr')).stop(true,true).fadeOut();}else{if(instantHide){$containers.hide();}else{$containers.stop(true,true).fadeOut();}}}else if($collapsible.is('ul')||$collapsible.is('ol')){$containers=$collapsible.find('> li');if($defaultToggle){$containers.not($defaultToggle.parent()).stop(true,true).slideUp();}else{if(instantHide){$containers.hide();}else{$containers.stop(true,true).slideUp();}}}else{var $collapsibleContent=$collapsible.find('> .mw-collapsible-content');if($collapsibleContent.length){if(instantHide){$collapsibleContent.hide();}else{$collapsibleContent.slideUp();}}else{if($collapsible.is('tr')||$collapsible.is('td')||$collapsible.is('th')){$collapsible.fadeOut();}else{$collapsible.slideUp();}}}}else{if($collapsible.is('table')){$containers=$collapsible.find('>tbody>tr');if(
+$defaultToggle){$containers.not($defaultToggle.parent().parent()).stop(true,true).fadeIn();}else{$containers.stop(true,true).fadeIn();}}else if($collapsible.is('ul')||$collapsible.is('ol')){$containers=$collapsible.find('> li');if($defaultToggle){$containers.not($defaultToggle.parent()).stop(true,true).slideDown();}else{$containers.stop(true,true).slideDown();}}else{var $collapsibleContent=$collapsible.find('> .mw-collapsible-content');if($collapsibleContent.length){$collapsibleContent.slideDown();}else{if($collapsible.is('tr')||$collapsible.is('td')||$collapsible.is('th')){$collapsible.fadeIn();}else{$collapsible.slideDown();}}}}},toggleLinkDefault=function(that,e){var $that=$(that),$collapsible=$that.closest('.mw-collapsible.mw-made-collapsible').toggleClass('mw-collapsed');e.preventDefault();e.stopPropagation();if(!$that.hasClass('mw-collapsible-toggle-collapsed')){$that.removeClass('mw-collapsible-toggle-expanded').addClass('mw-collapsible-toggle-collapsed');if($that.find('> a').
+length){$that.find('> a').text(expandtext);}else{$that.text(expandtext);}toggleElement($collapsible,'collapse',$that);}else{$that.removeClass('mw-collapsible-toggle-collapsed').addClass('mw-collapsible-toggle-expanded');if($that.find('> a').length){$that.find('> a').text(collapsetext);}else{$that.text(collapsetext);}toggleElement($collapsible,'expand',$that);}return;},toggleLinkPremade=function($that,e){var $collapsible=$that.eq(0).closest('.mw-collapsible.mw-made-collapsible').toggleClass('mw-collapsed');if($(e.target).is('a')){return true;}e.preventDefault();e.stopPropagation();if(!$that.hasClass('mw-collapsible-toggle-collapsed')){$that.removeClass('mw-collapsible-toggle-expanded').addClass('mw-collapsible-toggle-collapsed');toggleElement($collapsible,'collapse',$that);}else{$that.removeClass('mw-collapsible-toggle-collapsed').addClass('mw-collapsible-toggle-expanded');toggleElement($collapsible,'expand',$that);}return;},toggleLinkCustom=function($that,e,$collapsible){if(e){e.
+preventDefault();e.stopPropagation();}var action=$collapsible.hasClass('mw-collapsed')?'expand':'collapse';$collapsible.toggleClass('mw-collapsed');toggleElement($collapsible,action,$that);};if(!collapsetext){collapsetext=mw.msg('collapsible-collapse');}if(!expandtext){expandtext=mw.msg('collapsible-expand');}var $toggleLink=$('').text(collapsetext).wrap('').parent().prepend(' [').append('] ').bind('click.mw-collapse',function(e){toggleLinkDefault(this,e);});if($that.hasClass('mw-made-collapsible')){return;}else{$that.addClass('mw-made-collapsible');}if(($that.attr('id')||'').indexOf('mw-customcollapsible-')===0){var thatId=$that.attr('id'),$customTogglers=$('.'+thatId.replace('mw-customcollapsible','mw-customtoggle'));mw.log(_fn+'Found custom collapsible: #'+thatId);if($customTogglers.length){$customTogglers.bind('click.mw-collapse',function(e){toggleLinkCustom($(this),e,$that);});}else{mw.log(_fn+'#'+thatId+
+': Missing toggler!');}if($that.hasClass('mw-collapsed')){$that.removeClass('mw-collapsed');toggleLinkCustom($customTogglers,null,$that);}}else{if($that.is('table')){var $firstRowCells=$('tr:first th, tr:first td',that),$toggle=$firstRowCells.find('> .mw-collapsible-toggle');if(!$toggle.length){$firstRowCells.eq(-1).prepend($toggleLink);}else{$toggleLink=$toggle.unbind('click.mw-collapse').bind('click.mw-collapse',function(e){toggleLinkPremade($toggle,e);});}}else if($that.is('ul')||$that.is('ol')){var $firstItem=$('li:first',$that),$toggle=$firstItem.find('> .mw-collapsible-toggle');if(!$toggle.length){var firstval=$firstItem.attr('value');if(firstval===undefined||!firstval||firstval=='-1'){$firstItem.attr('value','1');}$that.prepend($toggleLink.wrap('').parent());}else{$toggleLink=$toggle.unbind('click.mw-collapse').bind('click.mw-collapse',function(e){toggleLinkPremade($toggle,e);});}}else{var $toggle=$that.find('> .mw-collapsible-toggle');
+if(!$that.find('> .mw-collapsible-content').length){$that.wrapInner('');}if(!$toggle.length){$that.prepend($toggleLink);}else{$toggleLink=$toggle.unbind('click.mw-collapse').bind('click.mw-collapse',function(e){toggleLinkPremade($toggle,e);});}}}if($that.hasClass('mw-collapsed')&&($that.attr('id')||'').indexOf('mw-customcollapsible-')!==0){$that.removeClass('mw-collapsed');toggleElement($that,'collapse',$toggleLink.eq(0),true);$toggleLink.eq(0).click();}});};})(jQuery,mediaWiki);;},{"all":".mw-collapsible-toggle{float:right} li .mw-collapsible-toggle{float:none} .mw-collapsible-toggle-li{list-style:none}\n\n/* cache key: oni_wiki:resourceloader:filter:minify-css:7:4250852ed2349a0d4d0fc6509a3e7d4c */\n"},{"collapsible-expand":"Expand","collapsible-collapse":"Collapse"});mw.loader.implement("jquery.mw-jump",function($){jQuery(function($){$('.mw-jump').delegate('a','focus blur',function(e){if(e.type==="blur"||e.type==="focusout"){$(this).closest(
+'.mw-jump').css({height:'0'});}else{$(this).closest('.mw-jump').css({height:'auto'});}});});;},{},{});mw.loader.implement("jquery.placeholder",function($){(function($){$.fn.placeholder=function(){return this.each(function(){if(this.placeholder&&'placeholder'in document.createElement(this.tagName)){return;}var placeholder=this.getAttribute('placeholder');var $input=$(this);if(this.value===''||this.value===placeholder){$input.addClass('placeholder').val(placeholder);}$input.blur(function(){if(this.value===''){this.value=placeholder;$input.addClass('placeholder');}}).bind('focus drop keydown paste',function(e){if($input.hasClass('placeholder')){if(e.type=='drop'&&e.originalEvent.dataTransfer){try{this.value=e.originalEvent.dataTransfer.getData('text/plain');}catch(exception){this.value=e.originalEvent.dataTransfer.getData('text');}e.preventDefault();}else{this.value='';}$input.removeClass('placeholder');}});if(this.form){$(this.form).submit(function(){if($input.hasClass('placeholder')){
+$input.val('').removeClass('placeholder');}});}});};})(jQuery);;},{},{});mw.loader.implement("mediawiki.legacy.mwsuggest",function($){if(!mw.config.exists('wgMWSuggestTemplate')){mw.config.set('wgMWSuggestTemplate',mw.config.get('wgServer')+mw.config.get('wgScriptPath')+"/api.php?action=opensearch\x26search={searchTerms}\x26namespace={namespaces}\x26suggest");}window.os_map={};window.os_cache={};window.os_cur_keypressed=0;window.os_keypressed_count=0;window.os_timer=null;window.os_mouse_pressed=false;window.os_mouse_num=-1;window.os_mouse_moved=false;window.os_search_timeout=250;window.os_autoload_inputs=['searchInput','searchInput2','powerSearchText','searchText'];window.os_autoload_forms=['searchform','searchform2','powersearch','search'];window.os_is_stopped=false;window.os_max_lines_per_suggest=7;window.os_animation_steps=6;window.os_animation_min_step=2;window.os_animation_delay=30;window.os_container_max_width=2;window.os_animation_timer=null;window.os_enabled=true;window.
+os_use_datalist=false;window.os_Timer=function(id,r,query){this.id=id;this.r=r;this.query=query;};window.os_Results=function(name,formname){this.searchform=formname;this.searchbox=name;this.container=name+'Suggest';this.resultTable=name+'Result';this.resultText=name+'ResultText';this.toggle=name+'Toggle';this.query=null;this.results=null;this.resultCount=0;this.original=null;this.selected=-1;this.containerCount=0;this.containerRow=0;this.containerTotal=0;this.visible=false;this.stayHidden=false;};window.os_AnimationTimer=function(r,target){this.r=r;var current=document.getElementById(r.container).offsetWidth;this.inc=Math.round((target-current)/os_animation_steps);if(this.inc=0){this.inc=os_animation_min_step;}if(this.inc>-os_animation_min_step&&this.inc<0){this.inc=-os_animation_min_step;}this.target=target;};window.os_MWSuggestInit=function(){if(!window.os_enabled){return;}for(var i=0;i2&&name[0]=='n'&&name[1]=='s'&&((elements[i].type=='checkbox'&&elements[i].checked)||(elements[i].type=='hidden'&&elements[i].value=='1'))){if(namespaces!=''){namespaces+='|';}namespaces+=name.substring(2);}}if(namespaces==''){namespaces=mw.config.get('wgSearchNamespaces').join('|');}return namespaces;};window.os_updateIfRelevant=function(r,query,text,cacheKey){var t=document.getElementById(r.searchbox);if(t!=null&&t.value==query){os_updateResults(r,query,text,cacheKey);}r.query=query;};window.os_delayedFetch=function(){if(os_timer==null){return;}var r=os_timer.r;var query=os_timer.query;os_timer=null;var path=mw.config.get('wgMWSuggestTemplate').replace("{namespaces}",os_getNamespaces(r)).replace("{dbname}",mw.config.get(
+'wgDBname')).replace("{searchTerms}",os_encodeQuery(query));var cached=os_cache[path];if(cached!=null&&cached!=undefined){os_updateIfRelevant(r,query,cached,path);}else{var xmlhttp=sajax_init_object();if(xmlhttp){try{xmlhttp.open('GET',path,true);xmlhttp.onreadystatechange=function(){if(xmlhttp.readyState==4&&typeof os_updateIfRelevant=='function'){os_updateIfRelevant(r,query,xmlhttp.responseText,path);}};xmlhttp.send(null);}catch(e){if(window.location.hostname=='localhost'){alert("Your browser blocks XMLHttpRequest to 'localhost', try using a real hostname for development/testing.");}throw e;}}}};window.os_fetchResults=function(r,query,timeout){if(query==''){r.query='';os_hideResults(r);return;}else if(query==r.query){return;}os_is_stopped=false;if(os_timer!=null&&os_timer.id!=null){clearTimeout(os_timer.id);}if(timeout!=0){os_timer=new os_Timer(setTimeout("os_delayedFetch()",timeout),r,query);}else{os_timer=new os_Timer(null,r,query);os_delayedFetch();}};window.os_getTarget=function(
+e){if(!e){e=window.event;}if(e.target){return e.target;}else if(e.srcElement){return e.srcElement;}else{return null;}};window.os_isNumber=function(x){if(x==''||isNaN(x)){return false;}for(var i=0;i='0'&&c<='9')){return false;}}return true;};window.os_enableSuggestionsOn=function(inputId,formName){os_initHandlers(inputId,formName,document.getElementById(inputId));};window.os_disableSuggestionsOn=function(inputId){r=os_map[inputId];if(r!=null){os_timer=null;os_hideResults(r);document.getElementById(inputId).setAttribute('autocomplete','on');os_map[inputId]=null;}var index=os_autoload_inputs.indexOf(inputId);if(index>=0){os_autoload_inputs[index]=os_autoload_forms[index]='';}};window.os_eventBlur=function(e){var targ=os_getTarget(e);var r=os_map[targ.id];if(r==null){return;}if(!os_mouse_pressed){os_hideResults(r);r.stayHidden=true;if(os_timer!=null&&os_timer.id!=null){clearTimeout(os_timer.id);}os_timer=null;}};window.os_eventFocus=function(e){var
+targ=os_getTarget(e);var r=os_map[targ.id];if(r==null){return;}r.stayHidden=false;};window.os_setupDiv=function(r,results){var c=document.getElementById(r.container);if(c==null){c=os_createContainer(r);}c.innerHTML=os_createResultTable(r,results);var t=document.getElementById(r.resultTable);r.containerTotal=t.offsetHeight;r.containerRow=t.offsetHeight/r.resultCount;os_fitContainer(r);os_trimResultText(r);os_showResults(r);};window.os_createResultTable=function(r,results){var c=document.getElementById(r.container);var width=c.offsetWidth-os_operaWidthFix(c.offsetWidth);var html='';r.results=[];r.resultCount=results.length;for(i=0;i| '+title+' | ';}html+='
';return html;};window.os_showResults=function(r){if(
+os_is_stopped){return;}if(r.stayHidden){return;}os_fitContainer(r);var c=document.getElementById(r.container);r.selected=-1;if(c!=null){c.scrollTop=0;c.style.visibility='visible';r.visible=true;}};window.os_operaWidthFix=function(x){if(typeof document.body.style.overflowX!='string'){return 30;}return 0;};window.f_clientWidth=function(){return f_filterResults(window.innerWidth?window.innerWidth:0,document.documentElement?document.documentElement.clientWidth:0,document.body?document.body.clientWidth:0);};window.f_clientHeight=function(){return f_filterResults(window.innerHeight?window.innerHeight:0,document.documentElement?document.documentElement.clientHeight:0,document.body?document.body.clientHeight:0);};window.f_scrollLeft=function(){return f_filterResults(window.pageXOffset?window.pageXOffset:0,document.documentElement?document.documentElement.scrollLeft:0,document.body?document.body.scrollLeft:0);};window.f_scrollTop=function(){return f_filterResults(window.pageYOffset?window.
+pageYOffset:0,document.documentElement?document.documentElement.scrollTop:0,document.body?document.body.scrollTop:0);};window.f_filterResults=function(n_win,n_docel,n_body){var n_result=n_win?n_win:0;if(n_docel&&(!n_result||(n_result>n_docel))){n_result=n_docel;}return n_body&&(!n_result||(n_result>n_body))?n_body:n_result;};window.os_availableHeight=function(r){var absTop=document.getElementById(r.container).style.top;var px=absTop.lastIndexOf('px');if(px>0){absTop=absTop.substring(0,px);}return f_clientHeight()-(absTop-f_scrollTop());};window.os_getElementPosition=function(elemID){var offsetTrail=document.getElementById(elemID);var offsetLeft=0;var offsetTop=0;while(offsetTrail){offsetLeft+=offsetTrail.offsetLeft;offsetTop+=offsetTrail.offsetTop;offsetTrail=offsetTrail.offsetParent;}if(navigator.userAgent.indexOf('Mac')!=-1&&typeof document.body.leftMargin!='undefined'){offsetLeft+=document.body.leftMargin;offsetTop+=document.body.topMargin;}return{left:offsetLeft,top:offsetTop};};
+window.os_createContainer=function(r){var c=document.createElement('div');var s=document.getElementById(r.searchbox);var pos=os_getElementPosition(r.searchbox);var left=pos.left;var top=pos.top+s.offsetHeight;c.className='os-suggest';c.setAttribute('id',r.container);document.body.appendChild(c);c=document.getElementById(r.container);c.style.top=top+'px';c.style.left=left+'px';c.style.width=s.offsetWidth+'px';c.onmouseover=function(event){os_eventMouseover(r.searchbox,event);};c.onmousemove=function(event){os_eventMousemove(r.searchbox,event);};c.onmousedown=function(event){return os_eventMousedown(r.searchbox,event);};c.onmouseup=function(event){os_eventMouseup(r.searchbox,event);};return c;};window.os_fitContainer=function(r){var c=document.getElementById(r.container);var h=os_availableHeight(r)-20;var inc=r.containerRow;h=parseInt(h/inc)*inc;if(h<(2*inc)&&r.resultCount>1){h=2*inc;}if((h/inc)>os_max_lines_per_suggest){h=inc*os_max_lines_per_suggest;}if(hmaxW){maxW=e.offsetWidth;}}var w=document.getElementById(r.container).offsetWidth;var fix=0;if(r.containerCountos_container_max_width){prop=os_container_max_width;}else if(prop<1){prop=1;}var newW=Math.round(normW*prop);if(w!=newW){w=newW;if(os_animation_timer!=null){clearInterval(os_animation_timer.id);}os_animation_timer=new os_AnimationTimer(r,w);os_animation_timer.id=setInterval("os_animateChangeWidth()",os_animation_delay);w-=fix;}if(w<10){return;}for(var i=0;iw&&(e.offsetWidth0&&nw>=target)||(inc<=0&&nw<=target)){c.style.width=target+'px';clearInterval(os_animation_timer.id);os_animation_timer=null;}else{c.style.width=nw+'px';if(document.documentElement.dir=='rtl'){c.style.left=(normL+normW+(target-nw)-os_animation_timer.target-1)+'px';}}};window.os_changeHighlight=function(r,cur,next,
+updateSearchBox){if(next>=r.resultCount){next=r.resultCount-1;}if(next<-1){next=-1;}r.selected=next;if(cur==next){return;}if(cur>=0){var curRow=document.getElementById(r.resultTable+cur);if(curRow!=null){curRow.className='os-suggest-result';}}var newText;if(next>=0){var nextRow=document.getElementById(r.resultTable+next);if(nextRow!=null){nextRow.className=os_HighlightClass();}newText=r.results[next];}else{newText=r.original;}if(r.containerCount=vEnd){c.scrollTop=(next-r.containerCount+1)*r.containerRow;}}if(updateSearchBox){os_updateSearchQuery(r,newText);}};window.os_HighlightClass=function(){var match=navigator.userAgent.match(/AppleWebKit\/(\d+)/);if(match){var webKitVersion=parseInt(match[1]);if(webKitVersion<523){return'os-suggest-result-hl-webkit';}}return'os-suggest-result-hl';};window.
+os_updateSearchQuery=function(r,newText){document.getElementById(r.searchbox).value=newText;r.query=newText;};window.os_eventMouseover=function(srcId,e){var targ=os_getTarget(e);var r=os_map[srcId];if(r==null||!os_mouse_moved){return;}var num=os_getNumberSuffix(targ.id);if(num>=0){os_changeHighlight(r,r.selected,num,false);}};window.os_getNumberSuffix=function(id){var num=id.substring(id.length-2);if(!(num.charAt(0)>='0'&&num.charAt(0)<='9')){num=num.substring(1);}if(os_isNumber(num)){return parseInt(num);}else{return-1;}};window.os_eventMousemove=function(srcId,e){os_mouse_moved=true;};window.os_eventMousedown=function(srcId,e){var targ=os_getTarget(e);var r=os_map[srcId];if(r==null){return;}var num=os_getNumberSuffix(targ.id);os_mouse_pressed=true;if(num>=0){os_mouse_num=num;}document.getElementById(r.searchbox).focus();return false;};window.os_eventMouseup=function(srcId,e){var targ=os_getTarget(e);var r=os_map[srcId];if(r==null){return;}var num=os_getNumberSuffix(targ.id);if(num>=0
+&&os_mouse_num==num){os_updateSearchQuery(r,r.results[num]);os_hideResults(r);document.getElementById(r.searchform).submit();}os_mouse_pressed=false;document.getElementById(r.searchbox).focus();};window.os_createToggle=function(r,className){var t=document.createElement('span');t.className=className;t.setAttribute('id',r.toggle);var link=document.createElement('a');link.setAttribute('href','javascript:void(0);');link.onclick=function(){os_toggle(r.searchbox,r.searchform);};var msg=document.createTextNode(wgMWSuggestMessages[0]);link.appendChild(msg);t.appendChild(link);return t;};window.os_toggle=function(inputId,formName){r=os_map[inputId];var msg='';if(r==null){os_enableSuggestionsOn(inputId,formName);r=os_map[inputId];msg=wgMWSuggestMessages[0];}else{os_disableSuggestionsOn(inputId,formName);msg=wgMWSuggestMessages[1];}var link=document.getElementById(r.toggle).firstChild;link.replaceChild(document.createTextNode(msg),link.firstChild);};hookEvent('load',os_MWSuggestInit);;},{},{
+"search-mwsuggest-enabled":"with suggestions","search-mwsuggest-disabled":"no suggestions"});mw.loader.implement("mediawiki.page.ready",function($){jQuery(document).ready(function($){if(!('placeholder'in document.createElement('input'))){$('input[placeholder]').placeholder();}$('.mw-collapsible').makeCollapsible();if($('table.sortable').length){mw.loader.using('jquery.tablesorter',function(){$('table.sortable').tablesorter();});}$('input[type=checkbox]:not(.noshiftselect)').checkboxShiftClick();mw.util.updateTooltipAccessKeys();});;},{},{});mw.loader.implement("mediawiki.user",function($){(function($){function User(options,tokens){var that=this;this.options=options||new mw.Map();this.tokens=tokens||new mw.Map();function generateId(){var id='';var seed='0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';for(var i=0,r;i<32;i++){r=Math.floor(Math.random()*seed.length);id+=seed.substring(r,r+1);}return id;}this.name=function(){return mw.config.get('wgUserName');};this.
+anonymous=function(){return that.name()?false:true;};this.sessionId=function(){var sessionId=$.cookie('mediaWiki.user.sessionId');if(typeof sessionId=='undefined'||sessionId===null){sessionId=generateId();$.cookie('mediaWiki.user.sessionId',sessionId,{'expires':null,'path':'/'});}return sessionId;};this.id=function(){var name=that.name();if(name){return name;}var id=$.cookie('mediaWiki.user.id');if(typeof id=='undefined'||id===null){id=generateId();}$.cookie('mediaWiki.user.id',id,{'expires':365,'path':'/'});return id;};this.bucket=function(key,options){options=$.extend({'buckets':{},'version':0,'tracked':false,'expires':30},options||{});var cookie=$.cookie('mediaWiki.user.bucket:'+key);var bucket=null;var version=0;if(typeof cookie==='string'&&cookie.length>2&&cookie.indexOf(':')>0){var parts=cookie.split(':');if(parts.length>1&&parts[0]==options.version){version=Number(parts[0]);bucket=String(parts[1]);}}if(bucket===null){if(!$.isPlainObject(options.buckets)){throw'Invalid buckets error. Object expected for options.buckets.'
+;}version=Number(options.version);var range=0,k;for(k in options.buckets){range+=options.buckets[k];}var rand=Math.random()*range;var total=0;for(k in options.buckets){bucket=k;total+=options.buckets[k];if(total>=rand){break;}}if(options.tracked){mw.loader.using('jquery.clickTracking',function(){$.trackAction('mediaWiki.user.bucket:'+key+'@'+version+':'+bucket);});}$.cookie('mediaWiki.user.bucket:'+key,version+':'+bucket,{'path':'/','expires':Number(options.expires)});}return bucket;};}mw.user=new User(mw.user.options,mw.user.tokens);})(jQuery);;},{},{});
+
+/* cache key: oni_wiki:resourceloader:filter:minify-js:7:d3fb03f9b61ada0e0e6ae2e20c3f4edc */
Index: /Vago/trunk/Vago/help/XMLSNDD_files/load(5).php
===================================================================
--- /Vago/trunk/Vago/help/XMLSNDD_files/load(5).php (revision 771)
+++ /Vago/trunk/Vago/help/XMLSNDD_files/load(5).php (revision 771)
@@ -0,0 +1,11 @@
+function getURLParamValue(paramName,url){if(typeof(url)=='undefined'||url===null)url=document.location.href;var cmdRe=RegExp('[&?]'+paramName+'=([^&#]*)');var m=cmdRe.exec(url);if(m&&m.length>1)return decodeURIComponent(m[1]);return null;}var extraJS=getURLParamValue("withJS");if(extraJS&&extraJS.match("^MediaWiki:[^&<>=%]*\.js$")){importScript(extraJS);}if(wgAction=="edit"||wgAction=="submit"||wgPageName=="Special:Upload"){importScript("MediaWiki:Common.js/edit.js")}else if(wgPageName=="Special:Search"){importScript("MediaWiki:Common.js/search.js")}if(navigator.appName=='Microsoft Internet Explorer'){var oldWidth;var docEl=document.documentElement;var fixIEScroll=function(){if(!oldWidth||docEl.clientWidth>oldWidth){doFixIEScroll();}else{setTimeout(doFixIEScroll,1);}oldWidth=docEl.clientWidth;};var doFixIEScroll=function(){docEl.style.overflowX=(docEl.scrollWidth-docEl.clientWidth<4)?"hidden":"";};document.attachEvent("onreadystatechange",fixIEScroll);document.attachEvent("onresize",
+fixIEScroll);appendCSS('@media print { sup, sub, p, .documentDescription { line-height: normal; }}');appendCSS('div.overflowbugx { overflow-x: scroll !important; overflow-y: hidden !important; } div.overflowbugy { overflow-y: scroll !important; overflow-x: hidden !important; }');appendCSS('.iezoomfix div, .iezoomfix table { zoom: 1;}');if(navigator.appVersion.substr(22,1)=='6'){importScript('MediaWiki:Common.js/IE60Fixes.js');}}var hasClass=(function(){var reCache={};return function(element,className){return(reCache[className]?reCache[className]:(reCache[className]=new RegExp("(?:\\s|^)"+className+"(?:\\s|$)"))).test(element.className);};})();function showDescrip(typeID,show_or_not){var DescripPanel=document.getElementsByClassName("hovertable_descrip")[0];var Descrips=DescripPanel.getElementsByTagName("span");if(!DescripPanel||!Descrips)return false;for(var i=0;i=autoCollapse&&hasClass(NavigationBoxes[i],"autocollapse"))){collapseTable(i);}else if(hasClass(NavigationBoxes[i],"innercollapse")){var element=NavigationBoxes[i];while(element=element.parentNode){if(hasClass(element,"outercollapse")){collapseTable(i);break;}}}}}addOnloadHook(createCollapseButtons);var NavigationBarHide='['+collapseCaption+']';var NavigationBarShow='['+expandCaption+']';function toggleNavigationBar(indexNavigationBar){var NavToggle=document.getElementById("NavToggle"+indexNavigationBar);var NavFrame=document.getElementById("NavFrame"+indexNavigationBar);if(!NavFrame||!NavToggle){return false;}if(NavToggle.firstChild.data==NavigationBarHide){for(var NavChild=NavFrame.firstChild;NavChild!=null;NavChild=NavChild.nextSibling){if(hasClass(
+NavChild,'NavContent')||hasClass(NavChild,'NavPic')){NavChild.style.display='none';}}NavToggle.firstChild.data=NavigationBarShow;}else if(NavToggle.firstChild.data==NavigationBarShow){for(var NavChild=NavFrame.firstChild;NavChild!=null;NavChild=NavChild.nextSibling){if(hasClass(NavChild,'NavContent')||hasClass(NavChild,'NavPic')){NavChild.style.display='block';}}NavToggle.firstChild.data=NavigationBarHide;}}function createNavigationBarToggleButton(){var indexNavigationBar=0;var divs=document.getElementsByTagName("div");for(var i=0;NavFrame=divs[i];i++){if(hasClass(NavFrame,"NavFrame")){indexNavigationBar++;var NavToggle=document.createElement("a");NavToggle.className='NavToggle';NavToggle.setAttribute('id','NavToggle'+indexNavigationBar);NavToggle.setAttribute('href','javascript:toggleNavigationBar('+indexNavigationBar+');');var isCollapsed=hasClass(NavFrame,"collapsed");for(var NavChild=NavFrame.firstChild;NavChild!=null&&!isCollapsed;NavChild=NavChild.nextSibling){if(hasClass(
+NavChild,'NavPic')||hasClass(NavChild,'NavContent')){if(NavChild.style.display=='none'){isCollapsed=true;}}}if(isCollapsed){for(var NavChild=NavFrame.firstChild;NavChild!=null;NavChild=NavChild.nextSibling){if(hasClass(NavChild,'NavPic')||hasClass(NavChild,'NavContent')){NavChild.style.display='none';}}}var NavToggleText=document.createTextNode(isCollapsed?NavigationBarShow:NavigationBarHide);NavToggle.appendChild(NavToggleText);for(var j=0;j
+#include
+#include
+#include
+#include
+
+// You can remove this #include if you replace the qDebug() statements.
+#include
+
+/*!
+ \class UnZip unzip.h
+
+ \brief PKZip 2.0 file decompression.
+ Compatibility with later versions is not ensured as they may use
+ unsupported compression algorithms.
+ Versions after 2.7 may have an incompatible header format and thus be
+ completely incompatible.
+*/
+
+/*! \enum UnZip::ErrorCode The result of a decompression operation.
+ \value UnZip::Ok No error occurred.
+ \value UnZip::ZlibInit Failed to init or load the zlib library.
+ \value UnZip::ZlibError The zlib library returned some error.
+ \value UnZip::OpenFailed Unable to create or open a device.
+ \value UnZip::PartiallyCorrupted Corrupted zip archive - some files could be extracted.
+ \value UnZip::Corrupted Corrupted or invalid zip archive.
+ \value UnZip::WrongPassword Unable to decrypt a password protected file.
+ \value UnZip::NoOpenArchive No archive has been opened yet.
+ \value UnZip::FileNotFound Unable to find the requested file in the archive.
+ \value UnZip::ReadFailed Reading of a file failed.
+ \value UnZip::WriteFailed Writing of a file failed.
+ \value UnZip::SeekFailed Seek failed.
+ \value UnZip::CreateDirFailed Could not create a directory.
+ \value UnZip::InvalidDevice A null device has been passed as parameter.
+ \value UnZip::InvalidArchive This is not a valid (or supported) ZIP archive.
+ \value UnZip::HeaderConsistencyError Local header record info does not match with the central directory record info. The archive may be corrupted.
+
+ \value UnZip::Skip Internal use only.
+ \value UnZip::SkipAll Internal use only.
+*/
+
+/*! \enum UnZip::ExtractionOptions Some options for the file extraction methods.
+ \value UnZip::ExtractPaths Default. Does not ignore the path of the zipped files.
+ \value UnZip::SkipPaths Default. Ignores the path of the zipped files and extracts them all to the same root directory.
+ \value UnZip::VerifyOnly Doesn't actually extract files.
+ \value UnZip::NoSilentDirectoryCreation Doesn't attempt to silently create missing output directories.
+*/
+
+//! Local header size (excluding signature, excluding variable length fields)
+#define UNZIP_LOCAL_HEADER_SIZE 26
+//! Central Directory file entry size (excluding signature, excluding variable length fields)
+#define UNZIP_CD_ENTRY_SIZE_NS 42
+//! Data descriptor size (excluding signature)
+#define UNZIP_DD_SIZE 12
+//! End Of Central Directory size (including signature, excluding variable length fields)
+#define UNZIP_EOCD_SIZE 22
+//! Local header entry encryption header size
+#define UNZIP_LOCAL_ENC_HEADER_SIZE 12
+
+// Some offsets inside a CD record (excluding signature)
+#define UNZIP_CD_OFF_VERSION_MADE 0
+#define UNZIP_CD_OFF_VERSION 2
+#define UNZIP_CD_OFF_GPFLAG 4
+#define UNZIP_CD_OFF_CMETHOD 6
+#define UNZIP_CD_OFF_MODT 8
+#define UNZIP_CD_OFF_MODD 10
+#define UNZIP_CD_OFF_CRC32 12
+#define UNZIP_CD_OFF_CSIZE 16
+#define UNZIP_CD_OFF_USIZE 20
+#define UNZIP_CD_OFF_NAMELEN 24
+#define UNZIP_CD_OFF_XLEN 26
+#define UNZIP_CD_OFF_COMMLEN 28
+#define UNZIP_CD_OFF_LHOFFSET 38
+
+// Some offsets inside a local header record (excluding signature)
+#define UNZIP_LH_OFF_VERSION 0
+#define UNZIP_LH_OFF_GPFLAG 2
+#define UNZIP_LH_OFF_CMETHOD 4
+#define UNZIP_LH_OFF_MODT 6
+#define UNZIP_LH_OFF_MODD 8
+#define UNZIP_LH_OFF_CRC32 10
+#define UNZIP_LH_OFF_CSIZE 14
+#define UNZIP_LH_OFF_USIZE 18
+#define UNZIP_LH_OFF_NAMELEN 22
+#define UNZIP_LH_OFF_XLEN 24
+
+// Some offsets inside a data descriptor record (excluding signature)
+#define UNZIP_DD_OFF_CRC32 0
+#define UNZIP_DD_OFF_CSIZE 4
+#define UNZIP_DD_OFF_USIZE 8
+
+// Some offsets inside a EOCD record
+#define UNZIP_EOCD_OFF_ENTRIES 6
+#define UNZIP_EOCD_OFF_CDOFF 12
+#define UNZIP_EOCD_OFF_COMMLEN 16
+
+/*!
+ Max version handled by this API.
+ 0x14 = 2.0 --> full compatibility only up to this version;
+ later versions use unsupported features
+*/
+#define UNZIP_VERSION 0x14
+
+//! CRC32 routine
+#define CRC32(c, b) crcTable[((int)c^b) & 0xff] ^ (c >> 8)
+
+OSDAB_BEGIN_NAMESPACE(Zip)
+
+
+/************************************************************************
+ ZipEntry
+*************************************************************************/
+
+/*!
+ ZipEntry constructor - initialize data. Type is set to File.
+*/
+UnZip::ZipEntry::ZipEntry()
+{
+ compressedSize = uncompressedSize = crc32 = 0;
+ compression = NoCompression;
+ type = File;
+ encrypted = false;
+}
+
+
+/************************************************************************
+ Private interface
+*************************************************************************/
+
+//! \internal
+UnzipPrivate::UnzipPrivate() :
+ password(),
+ skipAllEncrypted(false),
+ headers(0),
+ device(0),
+ file(0),
+ uBuffer(0),
+ crcTable(0),
+ cdOffset(0),
+ eocdOffset(0),
+ cdEntryCount(0),
+ unsupportedEntryCount(0),
+ comment()
+{
+ uBuffer = (unsigned char*) buffer1;
+ crcTable = (quint32*) get_crc_table();
+}
+
+//! \internal
+void UnzipPrivate::deviceDestroyed(QObject*)
+{
+ qDebug("Unexpected device destruction detected.");
+ do_closeArchive();
+}
+
+//! \internal Parses a Zip archive.
+UnZip::ErrorCode UnzipPrivate::openArchive(QIODevice* dev)
+{
+ Q_ASSERT(!device);
+ Q_ASSERT(dev);
+
+ if (!(dev->isOpen() || dev->open(QIODevice::ReadOnly))) {
+ qDebug() << "Unable to open device for reading";
+ return UnZip::OpenFailed;
+ }
+
+ device = dev;
+ if (device != file)
+ connect(device, SIGNAL(destroyed(QObject*)), this, SLOT(deviceDestroyed(QObject*)));
+
+ UnZip::ErrorCode ec;
+
+ ec = seekToCentralDirectory();
+ if (ec != UnZip::Ok) {
+ closeArchive();
+ return ec;
+ }
+
+ //! \todo Ignore CD entry count? CD may be corrupted.
+ if (cdEntryCount == 0) {
+ return UnZip::Ok;
+ }
+
+ bool continueParsing = true;
+
+ while (continueParsing) {
+ if (device->read(buffer1, 4) != 4) {
+ if (headers) {
+ qDebug() << "Corrupted zip archive. Some files might be extracted.";
+ ec = headers->size() != 0 ? UnZip::PartiallyCorrupted : UnZip::Corrupted;
+ break;
+ } else {
+ closeArchive();
+ qDebug() << "Corrupted or invalid zip archive. Closing.";
+ ec = UnZip::Corrupted;
+ break;
+ }
+ }
+
+ if (! (buffer1[0] == 'P' && buffer1[1] == 'K' && buffer1[2] == 0x01 && buffer1[3] == 0x02) )
+ break;
+
+ if ((ec = parseCentralDirectoryRecord()) != UnZip::Ok)
+ break;
+ }
+
+ if (ec != UnZip::Ok)
+ closeArchive();
+
+ return ec;
+}
+
+/*
+ \internal Parses a local header record and makes some consistency check
+ with the information stored in the Central Directory record for this entry
+ that has been previously parsed.
+ \todo Optional consistency check (as a ExtractionOptions flag)
+
+ local file header signature 4 bytes (0x04034b50)
+ version needed to extract 2 bytes
+ general purpose bit flag 2 bytes
+ compression method 2 bytes
+ last mod file time 2 bytes
+ last mod file date 2 bytes
+ crc-32 4 bytes
+ compressed size 4 bytes
+ uncompressed size 4 bytes
+ file name length 2 bytes
+ extra field length 2 bytes
+
+ file name (variable size)
+ extra field (variable size)
+*/
+UnZip::ErrorCode UnzipPrivate::parseLocalHeaderRecord(const QString& path, const ZipEntryP& entry)
+{
+ Q_ASSERT(device);
+
+ if (!device->seek(entry.lhOffset))
+ return UnZip::SeekFailed;
+
+ // Test signature
+ if (device->read(buffer1, 4) != 4)
+ return UnZip::ReadFailed;
+
+ if ((buffer1[0] != 'P') || (buffer1[1] != 'K') || (buffer1[2] != 0x03) || (buffer1[3] != 0x04))
+ return UnZip::InvalidArchive;
+
+ if (device->read(buffer1, UNZIP_LOCAL_HEADER_SIZE) != UNZIP_LOCAL_HEADER_SIZE)
+ return UnZip::ReadFailed;
+
+ /*
+ Check 3rd general purpose bit flag.
+
+ "bit 3: If this bit is set, the fields crc-32, compressed size
+ and uncompressed size are set to zero in the local
+ header. The correct values are put in the data descriptor
+ immediately following the compressed data."
+ */
+ bool hasDataDescriptor = entry.hasDataDescriptor();
+
+ bool checkFailed = false;
+
+ if (!checkFailed)
+ checkFailed = entry.compMethod != getUShort(uBuffer, UNZIP_LH_OFF_CMETHOD);
+ if (!checkFailed)
+ checkFailed = entry.gpFlag[0] != uBuffer[UNZIP_LH_OFF_GPFLAG];
+ if (!checkFailed)
+ checkFailed = entry.gpFlag[1] != uBuffer[UNZIP_LH_OFF_GPFLAG + 1];
+ if (!checkFailed)
+ checkFailed = entry.modTime[0] != uBuffer[UNZIP_LH_OFF_MODT];
+ if (!checkFailed)
+ checkFailed = entry.modTime[1] != uBuffer[UNZIP_LH_OFF_MODT + 1];
+ if (!checkFailed)
+ checkFailed = entry.modDate[0] != uBuffer[UNZIP_LH_OFF_MODD];
+ if (!checkFailed)
+ checkFailed = entry.modDate[1] != uBuffer[UNZIP_LH_OFF_MODD + 1];
+ if (!hasDataDescriptor)
+ {
+ if (!checkFailed)
+ checkFailed = entry.crc != getULong(uBuffer, UNZIP_LH_OFF_CRC32);
+ if (!checkFailed)
+ checkFailed = entry.szComp != getULong(uBuffer, UNZIP_LH_OFF_CSIZE);
+ if (!checkFailed)
+ checkFailed = entry.szUncomp != getULong(uBuffer, UNZIP_LH_OFF_USIZE);
+ }
+
+ if (checkFailed)
+ return UnZip::HeaderConsistencyError;
+
+ // Check filename
+ quint16 szName = getUShort(uBuffer, UNZIP_LH_OFF_NAMELEN);
+ if (szName == 0)
+ return UnZip::HeaderConsistencyError;
+
+ if (device->read(buffer2, szName) != szName)
+ return UnZip::ReadFailed;
+
+ QString filename = QString::fromAscii(buffer2, szName);
+ if (filename != path) {
+ qDebug() << "Filename in local header mismatches.";
+ return UnZip::HeaderConsistencyError;
+ }
+
+ // Skip extra field
+ quint16 szExtra = getUShort(uBuffer, UNZIP_LH_OFF_XLEN);
+ if (szExtra != 0) {
+ if (!device->seek(device->pos() + szExtra))
+ return UnZip::SeekFailed;
+ }
+
+ entry.dataOffset = device->pos();
+
+ if (hasDataDescriptor) {
+ /*
+ The data descriptor has this OPTIONAL signature: PK\7\8
+ We try to skip the compressed data relying on the size set in the
+ Central Directory record.
+ */
+ if (!device->seek(device->pos() + entry.szComp))
+ return UnZip::SeekFailed;
+
+ // Read 4 bytes and check if there is a data descriptor signature
+ if (device->read(buffer2, 4) != 4)
+ return UnZip::ReadFailed;
+
+ bool hasSignature = buffer2[0] == 'P' && buffer2[1] == 'K' && buffer2[2] == 0x07 && buffer2[3] == 0x08;
+ if (hasSignature) {
+ if (device->read(buffer2, UNZIP_DD_SIZE) != UNZIP_DD_SIZE)
+ return UnZip::ReadFailed;
+ } else {
+ if (device->read(buffer2 + 4, UNZIP_DD_SIZE - 4) != UNZIP_DD_SIZE - 4)
+ return UnZip::ReadFailed;
+ }
+
+ // DD: crc, compressed size, uncompressed size
+ if (
+ entry.crc != getULong((unsigned char*)buffer2, UNZIP_DD_OFF_CRC32) ||
+ entry.szComp != getULong((unsigned char*)buffer2, UNZIP_DD_OFF_CSIZE) ||
+ entry.szUncomp != getULong((unsigned char*)buffer2, UNZIP_DD_OFF_USIZE)
+ )
+ return UnZip::HeaderConsistencyError;
+ }
+
+ return UnZip::Ok;
+}
+
+/*! \internal Attempts to find the start of the central directory record.
+
+ We seek the file back until we reach the "End Of Central Directory"
+ signature PK\5\6.
+
+ end of central dir signature 4 bytes (0x06054b50)
+ number of this disk 2 bytes
+ number of the disk with the
+ start of the central directory 2 bytes
+ total number of entries in the
+ central directory on this disk 2 bytes
+ total number of entries in
+ the central directory 2 bytes
+ size of the central directory 4 bytes
+ offset of start of central
+ directory with respect to
+ the starting disk number 4 bytes
+ .ZIP file comment length 2 bytes
+ --- SIZE UNTIL HERE: UNZIP_EOCD_SIZE ---
+ .ZIP file comment (variable size)
+*/
+UnZip::ErrorCode UnzipPrivate::seekToCentralDirectory()
+{
+ Q_ASSERT(device);
+
+ qint64 length = device->size();
+ qint64 offset = length - UNZIP_EOCD_SIZE;
+
+ if (length < UNZIP_EOCD_SIZE)
+ return UnZip::InvalidArchive;
+
+ if (!device->seek( offset ))
+ return UnZip::SeekFailed;
+
+ if (device->read(buffer1, UNZIP_EOCD_SIZE) != UNZIP_EOCD_SIZE)
+ return UnZip::ReadFailed;
+
+ bool eocdFound = (buffer1[0] == 'P' && buffer1[1] == 'K' && buffer1[2] == 0x05 && buffer1[3] == 0x06);
+
+ if (eocdFound) {
+ // Zip file has no comment (the only variable length field in the EOCD record)
+ eocdOffset = offset;
+ } else {
+ qint64 read;
+ char* p = 0;
+
+ offset -= UNZIP_EOCD_SIZE;
+
+ if (offset <= 0)
+ return UnZip::InvalidArchive;
+
+ if (!device->seek( offset ))
+ return UnZip::SeekFailed;
+
+ while ((read = device->read(buffer1, UNZIP_EOCD_SIZE)) >= 0) {
+ if ( (p = strstr(buffer1, "PK\5\6")) != 0) {
+ // Seek to the start of the EOCD record so we can read it fully
+ // Yes... we could simply read the missing bytes and append them to the buffer
+ // but this is far easier so heck it!
+ device->seek( offset + (p - buffer1) );
+ eocdFound = true;
+ eocdOffset = offset + (p - buffer1);
+
+ // Read EOCD record
+ if (device->read(buffer1, UNZIP_EOCD_SIZE) != UNZIP_EOCD_SIZE)
+ return UnZip::ReadFailed;
+
+ break;
+ }
+
+ // TODO: This is very slow and only a temporary bug fix. Need some pattern matching algorithm here.
+ offset -= 1 /*UNZIP_EOCD_SIZE*/;
+ if (offset <= 0)
+ return UnZip::InvalidArchive;
+
+ if (!device->seek( offset ))
+ return UnZip::SeekFailed;
+ }
+ }
+
+ if (!eocdFound)
+ return UnZip::InvalidArchive;
+
+ // Parse EOCD to locate CD offset
+ offset = getULong((const unsigned char*)buffer1, UNZIP_EOCD_OFF_CDOFF + 4);
+
+ cdOffset = offset;
+
+ cdEntryCount = getUShort((const unsigned char*)buffer1, UNZIP_EOCD_OFF_ENTRIES + 4);
+
+ quint16 commentLength = getUShort((const unsigned char*)buffer1, UNZIP_EOCD_OFF_COMMLEN + 4);
+ if (commentLength != 0) {
+ QByteArray c = device->read(commentLength);
+ if (c.count() != commentLength)
+ return UnZip::ReadFailed;
+
+ comment = c;
+ }
+
+ // Seek to the start of the CD record
+ if (!device->seek( cdOffset ))
+ return UnZip::SeekFailed;
+
+ return UnZip::Ok;
+}
+
+/*!
+ \internal Parses a central directory record.
+
+ Central Directory record structure:
+
+ [file header 1]
+ .
+ .
+ .
+ [file header n]
+ [digital signature] // PKZip 6.2 or later only
+
+ File header:
+
+ central file header signature 4 bytes (0x02014b50)
+ version made by 2 bytes
+ version needed to extract 2 bytes
+ general purpose bit flag 2 bytes
+ compression method 2 bytes
+ last mod file time 2 bytes
+ last mod file date 2 bytes
+ crc-32 4 bytes
+ compressed size 4 bytes
+ uncompressed size 4 bytes
+ file name length 2 bytes
+ extra field length 2 bytes
+ file comment length 2 bytes
+ disk number start 2 bytes
+ internal file attributes 2 bytes
+ external file attributes 4 bytes
+ relative offset of local header 4 bytes
+
+ file name (variable size)
+ extra field (variable size)
+ file comment (variable size)
+*/
+UnZip::ErrorCode UnzipPrivate::parseCentralDirectoryRecord()
+{
+ Q_ASSERT(device);
+
+ // Read CD record
+ if (device->read(buffer1, UNZIP_CD_ENTRY_SIZE_NS) != UNZIP_CD_ENTRY_SIZE_NS)
+ return UnZip::ReadFailed;
+
+ bool skipEntry = false;
+
+ // Get compression type so we can skip non compatible algorithms
+ quint16 compMethod = getUShort(uBuffer, UNZIP_CD_OFF_CMETHOD);
+
+ // Get variable size fields length so we can skip the whole record
+ // if necessary
+ quint16 szName = getUShort(uBuffer, UNZIP_CD_OFF_NAMELEN);
+ quint16 szExtra = getUShort(uBuffer, UNZIP_CD_OFF_XLEN);
+ quint16 szComment = getUShort(uBuffer, UNZIP_CD_OFF_COMMLEN);
+
+ quint32 skipLength = szName + szExtra + szComment;
+
+ UnZip::ErrorCode ec = UnZip::Ok;
+
+ if ((compMethod != 0) && (compMethod != 8)) {
+ qDebug() << "Unsupported compression method. Skipping file.";
+ skipEntry = true;
+ }
+
+ if (!skipEntry && szName == 0) {
+ qDebug() << "Skipping file with no name.";
+ skipEntry = true;
+ }
+
+ QString filename;
+ if (device->read(buffer2, szName) != szName) {
+ ec = UnZip::ReadFailed;
+ skipEntry = true;
+ } else {
+ filename = QString::fromAscii(buffer2, szName);
+ }
+
+ // Unsupported features if version is bigger than UNZIP_VERSION
+ if (!skipEntry && buffer1[UNZIP_CD_OFF_VERSION] > UNZIP_VERSION) {
+ QString v = QString::number(buffer1[UNZIP_CD_OFF_VERSION]);
+ if (v.length() == 2)
+ v.insert(1, QLatin1Char('.'));
+ v = QString::fromLatin1("Unsupported PKZip version (%1). Skipping file: %2")
+ .arg(v, filename.isEmpty() ? QString::fromLatin1("") : filename);
+ qDebug() << v.toLatin1().constData();
+ skipEntry = true;
+ }
+
+ if (skipEntry) {
+ if (ec == UnZip::Ok) {
+ if (!device->seek( device->pos() + skipLength ))
+ ec = UnZip::SeekFailed;
+ unsupportedEntryCount++;
+ }
+
+ return ec;
+ }
+
+ ZipEntryP* h = new ZipEntryP;
+ h->compMethod = compMethod;
+
+ h->gpFlag[0] = buffer1[UNZIP_CD_OFF_GPFLAG];
+ h->gpFlag[1] = buffer1[UNZIP_CD_OFF_GPFLAG + 1];
+
+ h->modTime[0] = buffer1[UNZIP_CD_OFF_MODT];
+ h->modTime[1] = buffer1[UNZIP_CD_OFF_MODT + 1];
+
+ h->modDate[0] = buffer1[UNZIP_CD_OFF_MODD];
+ h->modDate[1] = buffer1[UNZIP_CD_OFF_MODD + 1];
+
+ h->crc = getULong(uBuffer, UNZIP_CD_OFF_CRC32);
+ h->szComp = getULong(uBuffer, UNZIP_CD_OFF_CSIZE);
+ h->szUncomp = getULong(uBuffer, UNZIP_CD_OFF_USIZE);
+
+ // Skip extra field (if any)
+ if (szExtra != 0) {
+ if (!device->seek( device->pos() + szExtra )) {
+ delete h;
+ return UnZip::SeekFailed;
+ }
+ }
+
+ // Read comment field (if any)
+ if (szComment != 0) {
+ if (device->read(buffer2, szComment) != szComment) {
+ delete h;
+ return UnZip::ReadFailed;
+ }
+
+ h->comment = QString::fromAscii(buffer2, szComment);
+ }
+
+ h->lhOffset = getULong(uBuffer, UNZIP_CD_OFF_LHOFFSET);
+
+ if (!headers)
+ headers = new QMap();
+ headers->insert(filename, h);
+
+ return UnZip::Ok;
+}
+
+//! \internal Closes the archive and resets the internal status.
+void UnzipPrivate::closeArchive()
+{
+ if (!device) {
+ Q_ASSERT(!file);
+ return;
+ }
+
+ if (device != file)
+ disconnect(device, 0, this, 0);
+
+ do_closeArchive();
+}
+
+//! \internal
+void UnzipPrivate::do_closeArchive()
+{
+ skipAllEncrypted = false;
+
+ if (headers) {
+ if (headers)
+ qDeleteAll(*headers);
+ delete headers;
+ headers = 0;
+ }
+
+ device = 0;
+
+ if (file)
+ delete file;
+ file = 0;
+
+ cdOffset = eocdOffset = 0;
+ cdEntryCount = 0;
+ unsupportedEntryCount = 0;
+
+ comment.clear();
+}
+
+//! \internal
+UnZip::ErrorCode UnzipPrivate::extractFile(const QString& path, const ZipEntryP& entry,
+ const QDir& dir, UnZip::ExtractionOptions options)
+{
+ QString name(path);
+ QString dirname;
+ QString directory;
+
+ const bool verify = (options & UnZip::VerifyOnly);
+ const int pos = name.lastIndexOf('/');
+
+ // This entry is for a directory
+ if (pos == name.length() - 1) {
+ if (verify)
+ return UnZip::Ok;
+
+ if (options & UnZip::SkipPaths)
+ return UnZip::Ok;
+
+ directory = QString("%1/%2").arg(dir.absolutePath()).arg(QDir::cleanPath(name));
+ if (!createDirectory(directory)) {
+ qDebug() << QString("Unable to create directory: %1").arg(directory);
+ return UnZip::CreateDirFailed;
+ }
+
+ return UnZip::Ok;
+ }
+
+ // Extract path from entry
+ if (verify) {
+ return extractFile(path, entry, 0, options);
+ }
+
+ if (pos > 0) {
+ // get directory part
+ dirname = name.left(pos);
+ if (options & UnZip::SkipPaths) {
+ directory = dir.absolutePath();
+ } else {
+ directory = QString("%1/%2").arg(dir.absolutePath()).arg(QDir::cleanPath(dirname));
+ if (!createDirectory(directory)) {
+ qDebug() << QString("Unable to create directory: %1").arg(directory);
+ return UnZip::CreateDirFailed;
+ }
+ }
+ name = name.right(name.length() - pos - 1);
+ } else {
+ directory = dir.absolutePath();
+ }
+
+ const bool silentDirectoryCreation = !(options & UnZip::NoSilentDirectoryCreation);
+ if (silentDirectoryCreation) {
+ if (!createDirectory(directory)) {
+ qDebug() << QString("Unable to create output directory %1").arg(directory);
+ return UnZip::CreateDirFailed;
+ }
+ }
+
+ name = QString("%1/%2").arg(directory).arg(name);
+
+ QFile outFile(name);
+ if (!outFile.open(QIODevice::WriteOnly)) {
+ qDebug() << QString("Unable to open %1 for writing").arg(name);
+ return UnZip::OpenFailed;
+ }
+
+ UnZip::ErrorCode ec = extractFile(path, entry, &outFile, options);
+ outFile.close();
+
+ const QDateTime lastModified = convertDateTime(entry.modDate, entry.modTime);
+ const bool setTimeOk = OSDAB_ZIP_MANGLE(setFileTimestamp)(name, lastModified);
+ if (!setTimeOk) {
+ qDebug() << QString("Unable to set last modified time on file: %1").arg(name);
+ }
+
+ if (ec != UnZip::Ok) {
+ if (!outFile.remove())
+ qDebug() << QString("Unable to remove corrupted file: %1").arg(name);
+ }
+
+ return ec;
+}
+
+//! \internal
+UnZip::ErrorCode UnzipPrivate::extractStoredFile(
+ const quint32 szComp, quint32** keys, quint32& myCRC, QIODevice* outDev,
+ UnZip::ExtractionOptions options)
+{
+ const bool verify = (options & UnZip::VerifyOnly);
+ const bool isEncrypted = keys != 0;
+
+ uInt rep = szComp / UNZIP_READ_BUFFER;
+ uInt rem = szComp % UNZIP_READ_BUFFER;
+ uInt cur = 0;
+
+ // extract data
+ qint64 read;
+ quint64 tot = 0;
+
+ while ( (read = device->read(buffer1, cur < rep ? UNZIP_READ_BUFFER : rem)) > 0 ) {
+ if (isEncrypted)
+ decryptBytes(*keys, buffer1, read);
+
+ myCRC = crc32(myCRC, uBuffer, read);
+ if (!verify) {
+ if (outDev->write(buffer1, read) != read)
+ return UnZip::WriteFailed;
+ }
+
+ cur++;
+ tot += read;
+ if (tot == szComp)
+ break;
+ }
+
+ return (read < 0)
+ ? UnZip::ReadFailed
+ : UnZip::Ok;
+}
+
+//! \internal
+UnZip::ErrorCode UnzipPrivate::inflateFile(
+ const quint32 szComp, quint32** keys, quint32& myCRC, QIODevice* outDev,
+ UnZip::ExtractionOptions options)
+{
+ const bool verify = (options & UnZip::VerifyOnly);
+ const bool isEncrypted = keys != 0;
+ Q_ASSERT(verify ? true : outDev != 0);
+
+ uInt rep = szComp / UNZIP_READ_BUFFER;
+ uInt rem = szComp % UNZIP_READ_BUFFER;
+ uInt cur = 0;
+
+ // extract data
+ qint64 read;
+ quint64 tot = 0;
+
+ /* Allocate inflate state */
+ z_stream zstr;
+ zstr.zalloc = Z_NULL;
+ zstr.zfree = Z_NULL;
+ zstr.opaque = Z_NULL;
+ zstr.next_in = Z_NULL;
+ zstr.avail_in = 0;
+
+ int zret;
+
+ // Use inflateInit2 with negative windowBits to get raw decompression
+ if ( (zret = inflateInit2_(&zstr, -MAX_WBITS, ZLIB_VERSION, sizeof(z_stream))) != Z_OK )
+ return UnZip::ZlibError;
+
+ int szDecomp;
+
+ // Decompress until deflate stream ends or end of file
+ do {
+ read = device->read(buffer1, cur < rep ? UNZIP_READ_BUFFER : rem);
+ if (!read)
+ break;
+
+ if (read < 0) {
+ (void)inflateEnd(&zstr);
+ return UnZip::ReadFailed;
+ }
+
+ if (isEncrypted)
+ decryptBytes(*keys, buffer1, read);
+
+ cur++;
+ tot += read;
+
+ zstr.avail_in = (uInt) read;
+ zstr.next_in = (Bytef*) buffer1;
+
+ // Run inflate() on input until output buffer not full
+ do {
+ zstr.avail_out = UNZIP_READ_BUFFER;
+ zstr.next_out = (Bytef*) buffer2;;
+
+ zret = inflate(&zstr, Z_NO_FLUSH);
+
+ switch (zret) {
+ case Z_NEED_DICT:
+ case Z_DATA_ERROR:
+ case Z_MEM_ERROR:
+ inflateEnd(&zstr);
+ return UnZip::WriteFailed;
+ default:
+ ;
+ }
+
+ szDecomp = UNZIP_READ_BUFFER - zstr.avail_out;
+ if (!verify) {
+ if (outDev->write(buffer2, szDecomp) != szDecomp) {
+ inflateEnd(&zstr);
+ return UnZip::ZlibError;
+ }
+ }
+
+ myCRC = crc32(myCRC, (const Bytef*) buffer2, szDecomp);
+
+ } while (zstr.avail_out == 0);
+
+ } while (zret != Z_STREAM_END);
+
+ inflateEnd(&zstr);
+ return UnZip::Ok;
+}
+
+//! \internal \p outDev is null if the VerifyOnly option is set
+UnZip::ErrorCode UnzipPrivate::extractFile(const QString& path, const ZipEntryP& entry,
+ QIODevice* outDev, UnZip::ExtractionOptions options)
+{
+ const bool verify = (options & UnZip::VerifyOnly);
+
+ Q_UNUSED(options);
+ Q_ASSERT(device);
+ Q_ASSERT(verify ? true : outDev != 0);
+
+ if (!entry.lhEntryChecked) {
+ UnZip::ErrorCode ec = parseLocalHeaderRecord(path, entry);
+ entry.lhEntryChecked = true;
+ if (ec != UnZip::Ok)
+ return ec;
+ }
+
+ if (!device->seek(entry.dataOffset))
+ return UnZip::SeekFailed;
+
+ // Encryption keys
+ quint32 keys[3];
+ quint32 szComp = entry.szComp;
+ if (entry.isEncrypted()) {
+ UnZip::ErrorCode e = testPassword(keys, path, entry);
+ if (e != UnZip::Ok)
+ {
+ qDebug() << QString("Unable to decrypt %1").arg(path);
+ return e;
+ }//! Encryption header size
+ szComp -= UNZIP_LOCAL_ENC_HEADER_SIZE; // remove encryption header size
+ }
+
+ if (szComp == 0) {
+ if (entry.crc != 0)
+ return UnZip::Corrupted;
+ return UnZip::Ok;
+ }
+
+ quint32 myCRC = crc32(0L, Z_NULL, 0);
+ quint32* k = keys;
+
+ UnZip::ErrorCode ec = UnZip::Ok;
+ if (entry.compMethod == 0) {
+ ec = extractStoredFile(szComp, entry.isEncrypted() ? &k : 0, myCRC, outDev, options);
+ } else if (entry.compMethod == 8) {
+ ec = inflateFile(szComp, entry.isEncrypted() ? &k : 0, myCRC, outDev, options);
+ }
+
+ if (ec == UnZip::Ok && myCRC != entry.crc)
+ return UnZip::Corrupted;
+
+ return UnZip::Ok;
+}
+
+//! \internal Creates a new directory and all the needed parent directories.
+bool UnzipPrivate::createDirectory(const QString& path)
+{
+ QDir d(path);
+ if (!d.exists() && !d.mkpath(path)) {
+ qDebug() << QString("Unable to create directory: %1").arg(path);
+ return false;
+ }
+
+ return true;
+}
+
+/*!
+ \internal Reads an quint32 (4 bytes) from a byte array starting at given offset.
+*/
+quint32 UnzipPrivate::getULong(const unsigned char* data, quint32 offset) const
+{
+ quint32 res = (quint32) data[offset];
+ res |= (((quint32)data[offset+1]) << 8);
+ res |= (((quint32)data[offset+2]) << 16);
+ res |= (((quint32)data[offset+3]) << 24);
+
+ return res;
+}
+
+/*!
+ \internal Reads an quint64 (8 bytes) from a byte array starting at given offset.
+*/
+quint64 UnzipPrivate::getULLong(const unsigned char* data, quint32 offset) const
+{
+ quint64 res = (quint64) data[offset];
+ res |= (((quint64)data[offset+1]) << 8);
+ res |= (((quint64)data[offset+2]) << 16);
+ res |= (((quint64)data[offset+3]) << 24);
+ res |= (((quint64)data[offset+1]) << 32);
+ res |= (((quint64)data[offset+2]) << 40);
+ res |= (((quint64)data[offset+3]) << 48);
+ res |= (((quint64)data[offset+3]) << 56);
+
+ return res;
+}
+
+/*!
+ \internal Reads an quint16 (2 bytes) from a byte array starting at given offset.
+*/
+quint16 UnzipPrivate::getUShort(const unsigned char* data, quint32 offset) const
+{
+ return (quint16) data[offset] | (((quint16)data[offset+1]) << 8);
+}
+
+/*!
+ \internal Return the next byte in the pseudo-random sequence
+ */
+int UnzipPrivate::decryptByte(quint32 key2) const
+{
+ quint16 temp = ((quint16)(key2) & 0xffff) | 2;
+ return (int)(((temp * (temp ^ 1)) >> 8) & 0xff);
+}
+
+/*!
+ \internal Update the encryption keys with the next byte of plain text
+ */
+void UnzipPrivate::updateKeys(quint32* keys, int c) const
+{
+ keys[0] = CRC32(keys[0], c);
+ keys[1] += keys[0] & 0xff;
+ keys[1] = keys[1] * 134775813L + 1;
+ keys[2] = CRC32(keys[2], ((int)keys[1]) >> 24);
+}
+
+/*!
+ \internal Initialize the encryption keys and the random header according to
+ the given password.
+ */
+void UnzipPrivate::initKeys(const QString& pwd, quint32* keys) const
+{
+ keys[0] = 305419896L;
+ keys[1] = 591751049L;
+ keys[2] = 878082192L;
+
+ QByteArray pwdBytes = pwd.toAscii();
+ int sz = pwdBytes.size();
+ const char* ascii = pwdBytes.data();
+
+ for (int i = 0; i < sz; ++i)
+ updateKeys(keys, (int)ascii[i]);
+}
+
+/*!
+ \internal Attempts to test a password without actually extracting a file.
+ The \p file parameter can be used in the user interface or for debugging purposes
+ as it is the name of the encrypted file for wich the password is being tested.
+*/
+UnZip::ErrorCode UnzipPrivate::testPassword(quint32* keys, const QString& file, const ZipEntryP& header)
+{
+ Q_UNUSED(file);
+ Q_ASSERT(device);
+
+ // read encryption keys
+ if (device->read(buffer1, 12) != 12)
+ return UnZip::Corrupted;
+
+ // Replace this code if you want to i.e. call some dialog and ask the user for a password
+ initKeys(password, keys);
+ if (testKeys(header, keys))
+ return UnZip::Ok;
+
+ return UnZip::Skip;
+}
+
+/*!
+ \internal Tests a set of keys on the encryption header.
+*/
+bool UnzipPrivate::testKeys(const ZipEntryP& header, quint32* keys)
+{
+ char lastByte;
+
+ // decrypt encryption header
+ for (int i = 0; i < 11; ++i)
+ updateKeys(keys, lastByte = buffer1[i] ^ decryptByte(keys[2]));
+ updateKeys(keys, lastByte = buffer1[11] ^ decryptByte(keys[2]));
+
+ // if there is an extended header (bit in the gp flag) buffer[11] is a byte from the file time
+ // with no extended header we have to check the crc high-order byte
+ char c = ((header.gpFlag[0] & 0x08) == 8) ? header.modTime[1] : header.crc >> 24;
+
+ return (lastByte == c);
+}
+
+/*!
+ \internal Decrypts an array of bytes long \p read.
+*/
+void UnzipPrivate::decryptBytes(quint32* keys, char* buffer, qint64 read)
+{
+ for (int i = 0; i < (int)read; ++i)
+ updateKeys(keys, buffer[i] ^= decryptByte(keys[2]));
+}
+
+/*!
+ \internal Converts date and time values from ZIP format to a QDateTime object.
+*/
+QDateTime UnzipPrivate::convertDateTime(const unsigned char date[2], const unsigned char time[2]) const
+{
+ QDateTime dt;
+
+ // Usual PKZip low-byte to high-byte order
+
+ // Date: 7 bits = years from 1980, 4 bits = month, 5 bits = day
+ quint16 year = (date[1] >> 1) & 127;
+ quint16 month = ((date[1] << 3) & 14) | ((date[0] >> 5) & 7);
+ quint16 day = date[0] & 31;
+
+ // Time: 5 bits hour, 6 bits minutes, 5 bits seconds with a 2sec precision
+ quint16 hour = (time[1] >> 3) & 31;
+ quint16 minutes = ((time[1] << 3) & 56) | ((time[0] >> 5) & 7);
+ quint16 seconds = (time[0] & 31) * 2;
+
+ dt.setDate(QDate(1980 + year, month, day));
+ dt.setTime(QTime(hour, minutes, seconds));
+ return dt;
+}
+
+
+/************************************************************************
+ Public interface
+*************************************************************************/
+
+/*!
+ Creates a new Zip file decompressor.
+*/
+UnZip::UnZip() : d(new UnzipPrivate)
+{
+}
+
+/*!
+ Closes any open archive and releases used resources.
+*/
+UnZip::~UnZip()
+{
+ closeArchive();
+ delete d;
+}
+
+/*!
+ Returns true if there is an open archive.
+*/
+bool UnZip::isOpen() const
+{
+ return d->device;
+}
+
+/*!
+ Opens a zip archive and reads the files list. Closes any previously opened archive.
+*/
+UnZip::ErrorCode UnZip::openArchive(const QString& filename)
+{
+ closeArchive();
+
+ // closeArchive will destroy the file
+ d->file = new QFile(filename);
+
+ if (!d->file->exists()) {
+ delete d->file;
+ d->file = 0;
+ return UnZip::FileNotFound;
+ }
+
+ if (!d->file->open(QIODevice::ReadOnly)) {
+ delete d->file;
+ d->file = 0;
+ return UnZip::OpenFailed;
+ }
+
+ return d->openArchive(d->file);
+}
+
+/*!
+ Opens a zip archive and reads the entries list.
+ Closes any previously opened archive.
+ \warning The class takes DOES NOT take ownership of the device.
+*/
+UnZip::ErrorCode UnZip::openArchive(QIODevice* device)
+{
+ closeArchive();
+
+ if (!device) {
+ qDebug() << "Invalid device.";
+ return UnZip::InvalidDevice;
+ }
+
+ return d->openArchive(device);
+}
+
+/*!
+ Closes the archive and releases all the used resources (like cached passwords).
+*/
+void UnZip::closeArchive()
+{
+ d->closeArchive();
+}
+
+QString UnZip::archiveComment() const
+{
+ return d->comment;
+}
+
+/*!
+ Returns a locale translated error string for a given error code.
+*/
+QString UnZip::formatError(UnZip::ErrorCode c) const
+{
+ switch (c)
+ {
+ case Ok: return QCoreApplication::translate("UnZip", "ZIP operation completed successfully."); break;
+ case ZlibInit: return QCoreApplication::translate("UnZip", "Failed to initialize or load zlib library."); break;
+ case ZlibError: return QCoreApplication::translate("UnZip", "zlib library error."); break;
+ case OpenFailed: return QCoreApplication::translate("UnZip", "Unable to create or open file."); break;
+ case PartiallyCorrupted: return QCoreApplication::translate("UnZip", "Partially corrupted archive. Some files might be extracted."); break;
+ case Corrupted: return QCoreApplication::translate("UnZip", "Corrupted archive."); break;
+ case WrongPassword: return QCoreApplication::translate("UnZip", "Wrong password."); break;
+ case NoOpenArchive: return QCoreApplication::translate("UnZip", "No archive has been created yet."); break;
+ case FileNotFound: return QCoreApplication::translate("UnZip", "File or directory does not exist."); break;
+ case ReadFailed: return QCoreApplication::translate("UnZip", "File read error."); break;
+ case WriteFailed: return QCoreApplication::translate("UnZip", "File write error."); break;
+ case SeekFailed: return QCoreApplication::translate("UnZip", "File seek error."); break;
+ case CreateDirFailed: return QCoreApplication::translate("UnZip", "Unable to create a directory."); break;
+ case InvalidDevice: return QCoreApplication::translate("UnZip", "Invalid device."); break;
+ case InvalidArchive: return QCoreApplication::translate("UnZip", "Invalid or incompatible zip archive."); break;
+ case HeaderConsistencyError: return QCoreApplication::translate("UnZip", "Inconsistent headers. Archive might be corrupted."); break;
+ default: ;
+ }
+
+ return QCoreApplication::translate("UnZip", "Unknown error.");
+}
+
+/*!
+ Returns true if the archive contains a file with the given path and name.
+*/
+bool UnZip::contains(const QString& file) const
+{
+ return d->headers ? d->headers->contains(file) : false;
+}
+
+/*!
+ Returns complete paths of files and directories in this archive.
+*/
+QStringList UnZip::fileList() const
+{
+ return d->headers ? d->headers->keys() : QStringList();
+}
+
+/*!
+ Returns information for each (correctly parsed) entry of this archive.
+*/
+QList UnZip::entryList() const
+{
+ QList list;
+ if (!d->headers)
+ return list;
+
+ for (QMap::ConstIterator it = d->headers->constBegin();
+ it != d->headers->constEnd(); ++it) {
+ const ZipEntryP* entry = it.value();
+ Q_ASSERT(entry != 0);
+
+ ZipEntry z;
+
+ z.filename = it.key();
+ if (!entry->comment.isEmpty())
+ z.comment = entry->comment;
+ z.compressedSize = entry->szComp;
+ z.uncompressedSize = entry->szUncomp;
+ z.crc32 = entry->crc;
+ z.lastModified = d->convertDateTime(entry->modDate, entry->modTime);
+
+ z.compression = entry->compMethod == 0 ? NoCompression : entry->compMethod == 8 ? Deflated : UnknownCompression;
+ z.type = z.filename.endsWith("/") ? Directory : File;
+
+ z.encrypted = entry->isEncrypted();
+
+ list.append(z);
+ }
+
+ return list;
+}
+
+/*!
+ Extracts the whole archive to a directory.
+*/
+UnZip::ErrorCode UnZip::verifyArchive()
+{
+ return extractAll(QDir(), VerifyOnly);
+}
+
+/*!
+ Extracts the whole archive to a directory.
+*/
+UnZip::ErrorCode UnZip::extractAll(const QString& dirname, ExtractionOptions options)
+{
+ return extractAll(QDir(dirname), options);
+}
+
+/*!
+ Extracts the whole archive to a directory.
+ Stops extraction at the first error.
+*/
+UnZip::ErrorCode UnZip::extractAll(const QDir& dir, ExtractionOptions options)
+{
+ // this should only happen if we didn't call openArchive() yet
+ if (!d->device)
+ return NoOpenArchive;
+
+ if (!d->headers)
+ return Ok;
+
+ ErrorCode ec = Ok;
+
+ QMap::ConstIterator it = d->headers->constBegin();
+ const QMap::ConstIterator end = d->headers->constEnd();
+ while (it != end) {
+ ZipEntryP* entry = it.value();
+ Q_ASSERT(entry != 0);
+ if ((entry->isEncrypted()) && d->skipAllEncrypted) {
+ ++it;
+ continue;
+ }
+
+ bool skip = false;
+ ec = d->extractFile(it.key(), *entry, dir, options);
+ switch (ec) {
+ case Corrupted:
+ qDebug() << "Corrupted entry" << it.key();
+ break;
+ case CreateDirFailed:
+ break;
+ case Skip:
+ skip = true;
+ break;
+ case SkipAll:
+ skip = true;
+ d->skipAllEncrypted = true;
+ break;
+ default:
+ ;
+ }
+
+ if (ec != Ok && !skip) {
+ break;
+ }
+
+ ++it;
+ }
+
+ return ec;
+}
+
+/*!
+ Extracts a single file to a directory.
+*/
+UnZip::ErrorCode UnZip::extractFile(const QString& filename, const QString& dirname, ExtractionOptions options)
+{
+ return extractFile(filename, QDir(dirname), options);
+}
+
+/*!
+ Extracts a single file to a directory.
+*/
+UnZip::ErrorCode UnZip::extractFile(const QString& filename, const QDir& dir, ExtractionOptions options)
+{
+ if (!d->device)
+ return NoOpenArchive;
+ if (!d->headers)
+ return FileNotFound;
+
+ QMap::Iterator itr = d->headers->find(filename);
+ if (itr != d->headers->end()) {
+ ZipEntryP* entry = itr.value();
+ Q_ASSERT(entry != 0);
+ return d->extractFile(itr.key(), *entry, dir, options);
+ }
+
+ return FileNotFound;
+}
+
+/*!
+ Extracts a single file to a directory.
+*/
+UnZip::ErrorCode UnZip::extractFile(const QString& filename, QIODevice* outDev, ExtractionOptions options)
+{
+ if (!d->device)
+ return NoOpenArchive;
+ if (!d->headers)
+ return FileNotFound;
+ if (!outDev)
+ return InvalidDevice;
+
+ QMap::Iterator itr = d->headers->find(filename);
+ if (itr != d->headers->end()) {
+ ZipEntryP* entry = itr.value();
+ Q_ASSERT(entry != 0);
+ return d->extractFile(itr.key(), *entry, outDev, options);
+ }
+
+ return FileNotFound;
+}
+
+/*!
+ Extracts a list of files.
+ Stops extraction at the first error (but continues if a file does not exist in the archive).
+ */
+UnZip::ErrorCode UnZip::extractFiles(const QStringList& filenames, const QString& dirname, ExtractionOptions options)
+{
+ if (!d->device)
+ return NoOpenArchive;
+ if (!d->headers)
+ return Ok;
+
+ QDir dir(dirname);
+ ErrorCode ec;
+
+ for (QStringList::ConstIterator itr = filenames.constBegin(); itr != filenames.constEnd(); ++itr) {
+ ec = extractFile(*itr, dir, options);
+ if (ec == FileNotFound)
+ continue;
+ if (ec != Ok)
+ return ec;
+ }
+
+ return Ok;
+}
+
+/*!
+ Extracts a list of files.
+ Stops extraction at the first error (but continues if a file does not exist in the archive).
+ */
+UnZip::ErrorCode UnZip::extractFiles(const QStringList& filenames, const QDir& dir, ExtractionOptions options)
+{
+ if (!d->device)
+ return NoOpenArchive;
+ if (!d->headers)
+ return Ok;
+
+ ErrorCode ec;
+
+ for (QStringList::ConstIterator itr = filenames.constBegin(); itr != filenames.constEnd(); ++itr) {
+ ec = extractFile(*itr, dir, options);
+ if (ec == FileNotFound)
+ continue;
+ if (ec != Ok)
+ return ec;
+ }
+
+ return Ok;
+}
+
+/*!
+ Remove/replace this method to add your own password retrieval routine.
+*/
+void UnZip::setPassword(const QString& pwd)
+{
+ d->password = pwd;
+}
+
+OSDAB_END_NAMESPACE
Index: /Vago/trunk/Vago/libs/unzip.h
===================================================================
--- /Vago/trunk/Vago/libs/unzip.h (revision 771)
+++ /Vago/trunk/Vago/libs/unzip.h (revision 771)
@@ -0,0 +1,152 @@
+/****************************************************************************
+** Filename: unzip.h
+** Last updated [dd/mm/yyyy]: 27/03/2011
+**
+** pkzip 2.0 decompression.
+**
+** Some of the code has been inspired by other open source projects,
+** (mainly Info-Zip and Gilles Vollant's minizip).
+** Compression and decompression actually uses the zlib library.
+**
+** Copyright (C) 2007-2012 Angius Fabrizio. All rights reserved.
+**
+** This file is part of the OSDaB project (http://osdab.42cows.org/).
+**
+** This file may be distributed and/or modified under the terms of the
+** GNU General Public License version 2 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+** See the file LICENSE.GPL that came with this software distribution or
+** visit http://www.gnu.org/copyleft/gpl.html for GPL licensing information.
+**
+**********************************************************************/
+
+#ifndef OSDAB_UNZIP__H
+#define OSDAB_UNZIP__H
+
+#include "zipglobal.h"
+
+#include
+#include
+#include
+
+#include
+
+class QDir;
+class QFile;
+class QIODevice;
+class QString;
+class QStringList;
+
+OSDAB_BEGIN_NAMESPACE(Zip)
+
+class UnzipPrivate;
+
+class OSDAB_ZIP_EXPORT UnZip
+{
+public:
+ enum ErrorCode
+ {
+ Ok,
+ ZlibInit,
+ ZlibError,
+ OpenFailed,
+ PartiallyCorrupted,
+ Corrupted,
+ WrongPassword,
+ NoOpenArchive,
+ FileNotFound,
+ ReadFailed,
+ WriteFailed,
+ SeekFailed,
+ CreateDirFailed,
+ InvalidDevice,
+ InvalidArchive,
+ HeaderConsistencyError,
+
+ Skip, SkipAll // internal use only
+ };
+
+ enum ExtractionOption
+ {
+ ExtractPaths = 0x0001,
+ SkipPaths = 0x0002,
+ VerifyOnly = 0x0004,
+ NoSilentDirectoryCreation = 0x0008
+ };
+ Q_DECLARE_FLAGS(ExtractionOptions, ExtractionOption)
+
+ enum CompressionMethod
+ {
+ NoCompression, Deflated, UnknownCompression
+ };
+
+ enum FileType
+ {
+ File, Directory
+ };
+
+ struct ZipEntry
+ {
+ ZipEntry();
+
+ QString filename;
+ QString comment;
+
+ quint32 compressedSize;
+ quint32 uncompressedSize;
+ quint32 crc32;
+
+ QDateTime lastModified;
+
+ CompressionMethod compression;
+ FileType type;
+
+ bool encrypted;
+ };
+
+ UnZip();
+ virtual ~UnZip();
+
+ bool isOpen() const;
+
+ ErrorCode openArchive(const QString& filename);
+ ErrorCode openArchive(QIODevice* device);
+ void closeArchive();
+
+ QString archiveComment() const;
+
+ QString formatError(UnZip::ErrorCode c) const;
+
+ bool contains(const QString& file) const;
+
+ QStringList fileList() const;
+ QList entryList() const;
+
+ ErrorCode verifyArchive();
+
+ ErrorCode extractAll(const QString& dirname, ExtractionOptions options = ExtractPaths);
+ ErrorCode extractAll(const QDir& dir, ExtractionOptions options = ExtractPaths);
+
+ ErrorCode extractFile(const QString& filename, const QString& dirname, ExtractionOptions options = ExtractPaths);
+ ErrorCode extractFile(const QString& filename, const QDir& dir, ExtractionOptions options = ExtractPaths);
+ ErrorCode extractFile(const QString& filename, QIODevice* device, ExtractionOptions options = ExtractPaths);
+
+ ErrorCode extractFiles(const QStringList& filenames, const QString& dirname, ExtractionOptions options = ExtractPaths);
+ ErrorCode extractFiles(const QStringList& filenames, const QDir& dir, ExtractionOptions options = ExtractPaths);
+
+ void setPassword(const QString& pwd);
+
+private:
+ UnzipPrivate* d;
+};
+
+Q_DECLARE_OPERATORS_FOR_FLAGS(UnZip::ExtractionOptions)
+
+OSDAB_END_NAMESPACE
+
+#endif // OSDAB_UNZIP__H
Index: /Vago/trunk/Vago/libs/unzip_p.h
===================================================================
--- /Vago/trunk/Vago/libs/unzip_p.h (revision 771)
+++ /Vago/trunk/Vago/libs/unzip_p.h (revision 771)
@@ -0,0 +1,130 @@
+/****************************************************************************
+** Filename: unzip_p.h
+** Last updated [dd/mm/yyyy]: 27/03/2011
+**
+** pkzip 2.0 decompression.
+**
+** Some of the code has been inspired by other open source projects,
+** (mainly Info-Zip and Gilles Vollant's minizip).
+** Compression and decompression actually uses the zlib library.
+**
+** Copyright (C) 2007-2012 Angius Fabrizio. All rights reserved.
+**
+** This file is part of the OSDaB project (http://osdab.42cows.org/).
+**
+** This file may be distributed and/or modified under the terms of the
+** GNU General Public License version 2 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+** See the file LICENSE.GPL that came with this software distribution or
+** visit http://www.gnu.org/copyleft/gpl.html for GPL licensing information.
+**
+**********************************************************************/
+
+//
+// W A R N I N G
+// -------------
+//
+// This file is not part of the Zip/UnZip API. It exists purely as an
+// implementation detail. This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#ifndef OSDAB_UNZIP_P__H
+#define OSDAB_UNZIP_P__H
+
+#include "unzip.h"
+#include "zipentry_p.h"
+
+#include
+#include
+
+// zLib authors suggest using larger buffers (128K or 256K) for (de)compression (especially for inflate())
+// we use a 256K buffer here - if you want to use this code on a pre-iceage mainframe please change it ;)
+#define UNZIP_READ_BUFFER (256*1024)
+
+OSDAB_BEGIN_NAMESPACE(Zip)
+
+class UnzipPrivate : public QObject
+{
+ Q_OBJECT
+
+public:
+ UnzipPrivate();
+
+ // Replace this with whatever else you use to store/retrieve the password.
+ QString password;
+
+ bool skipAllEncrypted;
+
+ QMap* headers;
+
+ QIODevice* device;
+ QFile* file;
+
+ char buffer1[UNZIP_READ_BUFFER];
+ char buffer2[UNZIP_READ_BUFFER];
+
+ unsigned char* uBuffer;
+ const quint32* crcTable;
+
+ // Central Directory (CD) offset
+ quint32 cdOffset;
+ // End of Central Directory (EOCD) offset
+ quint32 eocdOffset;
+
+ // Number of entries in the Central Directory (as to the EOCD record)
+ quint16 cdEntryCount;
+
+ // The number of detected entries that have been skipped because of a non compatible format
+ quint16 unsupportedEntryCount;
+
+ QString comment;
+
+ UnZip::ErrorCode openArchive(QIODevice* device);
+
+ UnZip::ErrorCode seekToCentralDirectory();
+ UnZip::ErrorCode parseCentralDirectoryRecord();
+ UnZip::ErrorCode parseLocalHeaderRecord(const QString& path, const ZipEntryP& entry);
+
+ void closeArchive();
+
+ UnZip::ErrorCode extractFile(const QString& path, const ZipEntryP& entry, const QDir& dir, UnZip::ExtractionOptions options);
+ UnZip::ErrorCode extractFile(const QString& path, const ZipEntryP& entry, QIODevice* device, UnZip::ExtractionOptions options);
+
+ UnZip::ErrorCode testPassword(quint32* keys, const QString& file, const ZipEntryP& header);
+ bool testKeys(const ZipEntryP& header, quint32* keys);
+
+ bool createDirectory(const QString& path);
+
+ inline void decryptBytes(quint32* keys, char* buffer, qint64 read);
+
+ inline quint32 getULong(const unsigned char* data, quint32 offset) const;
+ inline quint64 getULLong(const unsigned char* data, quint32 offset) const;
+ inline quint16 getUShort(const unsigned char* data, quint32 offset) const;
+ inline int decryptByte(quint32 key2) const;
+ inline void updateKeys(quint32* keys, int c) const;
+ inline void initKeys(const QString& pwd, quint32* keys) const;
+
+ inline QDateTime convertDateTime(const unsigned char date[2], const unsigned char time[2]) const;
+
+private slots:
+ void deviceDestroyed(QObject*);
+
+private:
+ UnZip::ErrorCode extractStoredFile(const quint32 szComp, quint32** keys,
+ quint32& myCRC, QIODevice* outDev, UnZip::ExtractionOptions options);
+ UnZip::ErrorCode inflateFile(const quint32 szComp, quint32** keys,
+ quint32& myCRC, QIODevice* outDev, UnZip::ExtractionOptions options);
+ void do_closeArchive();
+};
+
+OSDAB_END_NAMESPACE
+
+#endif // OSDAB_UNZIP_P__H
Index: /Vago/trunk/Vago/libs/zip.cpp
===================================================================
--- /Vago/trunk/Vago/libs/zip.cpp (revision 771)
+++ /Vago/trunk/Vago/libs/zip.cpp (revision 771)
@@ -0,0 +1,1619 @@
+/****************************************************************************
+** Filename: zip.cpp
+** Last updated [dd/mm/yyyy]: 01/02/2007
+**
+** pkzip 2.0 file compression.
+**
+** Some of the code has been inspired by other open source projects,
+** (mainly Info-Zip and Gilles Vollant's minizip).
+** Compression and decompression actually uses the zlib library.
+**
+** Copyright (C) 2007-2012 Angius Fabrizio. All rights reserved.
+**
+** This file is part of the OSDaB project (http://osdab.42cows.org/).
+**
+** This file may be distributed and/or modified under the terms of the
+** GNU General Public License version 2 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+** See the file LICENSE.GPL that came with this software distribution or
+** visit http://www.gnu.org/copyleft/gpl.html for GPL licensing information.
+**
+**********************************************************************/
+
+#include "zip.h"
+#include "zip_p.h"
+#include "zipentry_p.h"
+
+// we only use this to seed the random number generator
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+// You can remove this #include if you replace the qDebug() statements.
+#include
+
+
+/*! #define OSDAB_ZIP_NO_PNG_RLE to disable the use of Z_RLE compression strategy with
+ PNG files (achieves slightly better compression levels according to the authors).
+*/
+// #define OSDAB_ZIP_NO_PNG_RLE
+
+#define OSDAB_ZIP_NO_DEBUG
+
+//! Local header size (including signature, excluding variable length fields)
+#define ZIP_LOCAL_HEADER_SIZE 30
+//! Encryption header size
+#define ZIP_LOCAL_ENC_HEADER_SIZE 12
+//! Data descriptor size (signature included)
+#define ZIP_DD_SIZE_WS 16
+//! Central Directory record size (signature included)
+#define ZIP_CD_SIZE 46
+//! End of Central Directory record size (signature included)
+#define ZIP_EOCD_SIZE 22
+
+// Some offsets inside a local header record (signature included)
+#define ZIP_LH_OFF_VERS 4
+#define ZIP_LH_OFF_GPFLAG 6
+#define ZIP_LH_OFF_CMET 8
+#define ZIP_LH_OFF_MODT 10
+#define ZIP_LH_OFF_MODD 12
+#define ZIP_LH_OFF_CRC 14
+#define ZIP_LH_OFF_CSIZE 18
+#define ZIP_LH_OFF_USIZE 22
+#define ZIP_LH_OFF_NAMELEN 26
+#define ZIP_LH_OFF_XLEN 28
+
+// Some offsets inside a data descriptor record (including signature)
+#define ZIP_DD_OFF_CRC32 4
+#define ZIP_DD_OFF_CSIZE 8
+#define ZIP_DD_OFF_USIZE 12
+
+// Some offsets inside a Central Directory record (including signature)
+#define ZIP_CD_OFF_MADEBY 4
+#define ZIP_CD_OFF_VERSION 6
+#define ZIP_CD_OFF_GPFLAG 8
+#define ZIP_CD_OFF_CMET 10
+#define ZIP_CD_OFF_MODT 12
+#define ZIP_CD_OFF_MODD 14
+#define ZIP_CD_OFF_CRC 16
+#define ZIP_CD_OFF_CSIZE 20
+#define ZIP_CD_OFF_USIZE 24
+#define ZIP_CD_OFF_NAMELEN 28
+#define ZIP_CD_OFF_XLEN 30
+#define ZIP_CD_OFF_COMMLEN 32
+#define ZIP_CD_OFF_DISKSTART 34
+#define ZIP_CD_OFF_IATTR 36
+#define ZIP_CD_OFF_EATTR 38
+#define ZIP_CD_OFF_LHOFF 42
+
+// Some offsets inside a EOCD record (including signature)
+#define ZIP_EOCD_OFF_DISKNUM 4
+#define ZIP_EOCD_OFF_CDDISKNUM 6
+#define ZIP_EOCD_OFF_ENTRIES 8
+#define ZIP_EOCD_OFF_CDENTRIES 10
+#define ZIP_EOCD_OFF_CDSIZE 12
+#define ZIP_EOCD_OFF_CDOFF 16
+#define ZIP_EOCD_OFF_COMMLEN 20
+
+//! PKZip version for archives created by this API
+#define ZIP_VERSION 0x14
+
+//! Do not store very small files as the compression headers overhead would be to big
+#define ZIP_COMPRESSION_THRESHOLD 60
+
+/*!
+ \class Zip zip.h
+
+ \brief Zip file compression.
+
+ Some quick usage examples.
+
+ \verbatim
+ Suppose you have this directory structure:
+
+ /home/user/dir1/file1.1
+ /home/user/dir1/file1.2
+ /home/user/dir1/dir1.1/
+ /home/user/dir1/dir1.2/file1.2.1
+
+ EXAMPLE 1:
+ myZipInstance.addDirectory("/home/user/dir1");
+
+ RESULT:
+ Beheaves like any common zip software and creates a zip file with this structure:
+
+ dir1/file1.1
+ dir1/file1.2
+ dir1/dir1.1/
+ dir1/dir1.2/file1.2.1
+
+ EXAMPLE 2:
+ myZipInstance.addDirectory("/home/user/dir1", "myRoot/myFolder");
+
+ RESULT:
+ Adds a custom root to the paths and creates a zip file with this structure:
+
+ myRoot/myFolder/dir1/file1.1
+ myRoot/myFolder/dir1/file1.2
+ myRoot/myFolder/dir1/dir1.1/
+ myRoot/myFolder/dir1/dir1.2/file1.2.1
+
+ EXAMPLE 3:
+ myZipInstance.addDirectory("/home/user/dir1", Zip::AbsolutePaths);
+
+ NOTE:
+ Same as calling addDirectory(SOME_PATH, PARENT_PATH_of_SOME_PATH).
+
+ RESULT:
+ Preserves absolute paths and creates a zip file with this structure:
+
+ /home/user/dir1/file1.1
+ /home/user/dir1/file1.2
+ /home/user/dir1/dir1.1/
+ /home/user/dir1/dir1.2/file1.2.1
+
+ EXAMPLE 4:
+ myZipInstance.setPassword("hellopass");
+ myZipInstance.addDirectory("/home/user/dir1", "/");
+
+ RESULT:
+ Adds and encrypts the files in /home/user/dir1, creating the following zip structure:
+
+ /dir1/file1.1
+ /dir1/file1.2
+ /dir1/dir1.1/
+ /dir1/dir1.2/file1.2.1
+
+ EXAMPLE 5:
+ myZipInstance.addDirectory("/home/user/dir1", Zip::IgnoreRoot);
+
+ RESULT:
+ Adds the files in /home/user/dir1 but doesn't create the top level
+ directory:
+
+ file1.1
+ file1.2
+ dir1.1/
+ dir1.2/file1.2.1
+
+ EXAMPLE 5:
+ myZipInstance.addDirectory("/home/user/dir1", "data/backup", Zip::IgnoreRoot);
+
+ RESULT:
+ Adds the files in /home/user/dir1 but uses "data/backup" as top level
+ directory instead of "dir1":
+
+ data/backup/file1.1
+ data/backup/file1.2
+ data/backup/dir1.1/
+ data/backup/dir1.2/file1.2.1
+
+ \endverbatim
+*/
+
+/*! \enum Zip::ErrorCode The result of a compression operation.
+ \value Zip::Ok No error occurred.
+ \value Zip::ZlibInit Failed to init or load the zlib library.
+ \value Zip::ZlibError The zlib library returned some error.
+ \value Zip::FileExists The file already exists and will not be overwritten.
+ \value Zip::OpenFailed Unable to create or open a device.
+ \value Zip::NoOpenArchive CreateArchive() has not been called yet.
+ \value Zip::FileNotFound File or directory does not exist.
+ \value Zip::ReadFailed Reading of a file failed.
+ \value Zip::WriteFailed Writing of a file failed.
+ \value Zip::SeekFailed Seek failed.
+*/
+
+/*! \enum Zip::CompressionLevel Returns the result of a decompression operation.
+ \value Zip::Store No compression.
+ \value Zip::Deflate1 Deflate compression level 1(lowest compression).
+ \value Zip::Deflate1 Deflate compression level 2.
+ \value Zip::Deflate1 Deflate compression level 3.
+ \value Zip::Deflate1 Deflate compression level 4.
+ \value Zip::Deflate1 Deflate compression level 5.
+ \value Zip::Deflate1 Deflate compression level 6.
+ \value Zip::Deflate1 Deflate compression level 7.
+ \value Zip::Deflate1 Deflate compression level 8.
+ \value Zip::Deflate1 Deflate compression level 9 (maximum compression).
+ \value Zip::AutoCPU Adapt compression level to CPU speed (faster CPU => better compression).
+ \value Zip::AutoMIME Adapt compression level to MIME type of the file being compressed.
+ \value Zip::AutoFull Use both CPU and MIME type detection.
+*/
+
+namespace {
+
+struct ZippedDir {
+ bool init;
+ QString actualRoot;
+ int files;
+ ZippedDir() : init(false), actualRoot(), files(0) {}
+};
+
+void checkRootPath(QString& path)
+{
+ const bool isUnixRoot = path.length() == 1 && path.at(0) == QLatin1Char('/');
+ if (!path.isEmpty() && !isUnixRoot) {
+ while (path.endsWith(QLatin1String("\\")))
+ path.truncate(path.length() - 1);
+
+ int sepCount = 0;
+ for (int i = path.length()-1; i >= 0; --i) {
+ if (path.at(i) == QLatin1Char('/'))
+ ++sepCount;
+ else break;
+ }
+
+ if (sepCount > 1)
+ path.truncate(path.length() - (sepCount-1));
+ else if (sepCount == 0)
+ path.append(QLatin1String("/"));
+ }
+}
+
+}
+
+//////////////////////////////////////////////////////////////////////////
+
+OSDAB_BEGIN_NAMESPACE(Zip)
+
+/************************************************************************
+ Private interface
+*************************************************************************/
+
+//! \internal
+ZipPrivate::ZipPrivate() :
+ headers(0),
+ device(0),
+ file(0),
+ uBuffer(0),
+ crcTable(0),
+ comment(),
+ password()
+{
+ // keep an unsigned pointer so we avoid to over bloat the code with casts
+ uBuffer = (unsigned char*) buffer1;
+ crcTable = get_crc_table();
+}
+
+//! \internal
+ZipPrivate::~ZipPrivate()
+{
+ closeArchive();
+}
+
+//! \internal
+Zip::ErrorCode ZipPrivate::createArchive(QIODevice* dev)
+{
+ Q_ASSERT(dev);
+
+ if (device)
+ closeArchive();
+
+ device = dev;
+ if (device != file)
+ connect(device, SIGNAL(destroyed(QObject*)), this, SLOT(deviceDestroyed(QObject*)));
+
+ if (!device->isOpen()) {
+ if (!device->open(QIODevice::ReadOnly)) {
+ delete device;
+ device = 0;
+ qDebug() << "Unable to open device for writing.";
+ return Zip::OpenFailed;
+ }
+ }
+
+ headers = new QMap;
+ return Zip::Ok;
+}
+
+//! \internal
+void ZipPrivate::deviceDestroyed(QObject*)
+{
+ qDebug("Unexpected device destruction detected.");
+ do_closeArchive();
+}
+
+/*! Returns true if an entry for \p info has already been added.
+ Uses file size and lower case absolute path to compare entries.
+*/
+bool ZipPrivate::containsEntry(const QFileInfo& info) const
+{
+ if (!headers || headers->isEmpty())
+ return false;
+
+ const qint64 sz = info.size();
+ const QString path = info.absoluteFilePath().toLower();
+
+ QMap::ConstIterator b = headers->constBegin();
+ const QMap::ConstIterator e = headers->constEnd();
+ while (b != e) {
+ const ZipEntryP* e = b.value();
+ if (e->fileSize == sz && e->absolutePath == path)
+ return true;
+ ++b;
+ }
+
+ return false;
+}
+
+//! \internal Actual implementation of the addDirectory* methods.
+Zip::ErrorCode ZipPrivate::addDirectory(const QString& path, const QString& root,
+ Zip::CompressionOptions options, Zip::CompressionLevel level, int hierarchyLevel,
+ int* addedFiles)
+{
+ if (addedFiles)
+ ++(*addedFiles);
+
+ // Bad boy didn't call createArchive() yet :)
+ if (!device)
+ return Zip::NoOpenArchive;
+
+ QDir dir(path);
+ if (!dir.exists())
+ return Zip::FileNotFound;
+
+ // Remove any trailing separator
+ QString actualRoot = root.trimmed();
+
+ // Preserve Unix root but make sure the path ends only with a single
+ // unix like separator
+ ::checkRootPath(actualRoot);
+
+ // QDir::cleanPath() fixes some issues with QDir::dirName()
+ QFileInfo current(QDir::cleanPath(path));
+
+ const bool path_absolute = options.testFlag(Zip::AbsolutePaths);
+ const bool path_ignore = options.testFlag(Zip::IgnorePaths);
+ const bool path_noroot = options.testFlag(Zip::IgnoreRoot);
+
+ if (path_absolute && !path_ignore && !path_noroot) {
+ QString absolutePath = extractRoot(path, options);
+ if (!absolutePath.isEmpty() && absolutePath != QLatin1String("/"))
+ absolutePath.append(QLatin1String("/"));
+ actualRoot.append(absolutePath);
+ }
+
+ const bool skipDirName = !hierarchyLevel && path_noroot;
+ if (!path_ignore && !skipDirName) {
+ actualRoot.append(QDir(current.absoluteFilePath()).dirName());
+ actualRoot.append(QLatin1String("/"));
+ }
+
+ // actualRoot now contains the path of the file relative to the zip archive
+ // with a trailing /
+
+ const bool skipBad = options & Zip::SkipBadFiles;
+ const bool noDups = options & Zip::CheckForDuplicates;
+
+ const QDir::Filters dir_filter =
+ QDir::Files |
+ QDir::Dirs |
+ QDir::NoDotAndDotDot |
+ QDir::NoSymLinks;
+ const QDir::SortFlags dir_sort =
+ QDir::DirsFirst;
+ QFileInfoList list = dir.entryInfoList(dir_filter, dir_sort);
+
+ Zip::ErrorCode ec = Zip::Ok;
+ bool filesAdded = false;
+
+ Zip::CompressionOptions recursionOptions;
+ if (path_ignore)
+ recursionOptions |= Zip::IgnorePaths;
+ else recursionOptions |= Zip::RelativePaths;
+
+ for (int i = 0; i < list.size(); ++i) {
+ QFileInfo info = list.at(i);
+ const QString absPath = info.absoluteFilePath();
+ if (noDups && containsEntry(info))
+ continue;
+ if (info.isDir()) {
+ // Recursion
+ ec = addDirectory(absPath, actualRoot, recursionOptions,
+ level, hierarchyLevel + 1, addedFiles);
+ } else {
+ ec = createEntry(info, actualRoot, level);
+ if (ec == Zip::Ok) {
+ filesAdded = true;
+ if (addedFiles)
+ ++(*addedFiles);
+ }
+ }
+
+ if (ec != Zip::Ok && !skipBad) {
+ break;
+ }
+ }
+
+ // We need an explicit record for this dir
+ // Non-empty directories don't need it because they have a path component in the filename
+ if (!filesAdded && !path_ignore)
+ ec = createEntry(current, actualRoot, level);
+
+ return ec;
+}
+
+//! \internal Actual implementation of the addFile methods.
+Zip::ErrorCode ZipPrivate::addFiles(const QStringList& files, const QString& root,
+ Zip::CompressionOptions options, Zip::CompressionLevel level,
+ int* addedFiles)
+{
+ if (addedFiles)
+ *addedFiles = 0;
+
+ const bool skipBad = options & Zip::SkipBadFiles;
+ const bool noDups = options & Zip::CheckForDuplicates;
+
+ // Bad boy didn't call createArchive() yet :)
+ if (!device)
+ return Zip::NoOpenArchive;
+
+ QFileInfoList paths;
+ paths.reserve(files.size());
+ for (int i = 0; i < files.size(); ++i) {
+ QFileInfo info(files.at(i));
+ if (noDups && (paths.contains(info) || containsEntry(info)))
+ continue;
+ if (!info.exists() || !info.isReadable()) {
+ if (skipBad) {
+ continue;
+ } else {
+ return Zip::FileNotFound;
+ }
+ }
+ paths.append(info);
+ }
+
+ if (paths.isEmpty())
+ return Zip::Ok;
+
+ // Remove any trailing separator
+ QString actualRoot = root.trimmed();
+
+ // Preserve Unix root but make sure the path ends only with a single
+ // unix like separator
+ ::checkRootPath(actualRoot);
+
+ const bool path_absolute = options.testFlag(Zip::AbsolutePaths);
+ const bool path_ignore = options.testFlag(Zip::IgnorePaths);
+ const bool path_noroot = options.testFlag(Zip::IgnoreRoot);
+
+ Zip::ErrorCode ec = Zip::Ok;
+ QHash dirMap;
+
+ for (int i = 0; i < paths.size(); ++i) {
+ const QFileInfo& info = paths.at(i);
+ const QString path = QFileInfo(QDir::cleanPath(info.absolutePath())).absolutePath();
+
+ ZippedDir& zd = dirMap[path];
+ if (!zd.init) {
+ zd.init = true;
+ zd.actualRoot = actualRoot;
+ if (path_absolute && !path_ignore && !path_noroot) {
+ QString absolutePath = extractRoot(path, options);
+ if (!absolutePath.isEmpty() && absolutePath != QLatin1String("/"))
+ absolutePath.append(QLatin1String("/"));
+ zd.actualRoot.append(absolutePath);
+ }
+
+ if (!path_ignore && !path_noroot) {
+ zd.actualRoot.append(QDir(path).dirName());
+ zd.actualRoot.append(QLatin1String("/"));
+ }
+ }
+
+ // zd.actualRoot now contains the path of the file relative to the zip archive
+ // with a trailing /
+
+ if (info.isDir()) {
+ // Recursion
+ ec = addDirectory(info.absoluteFilePath(), actualRoot, options,
+ level, 1, addedFiles);
+ } else {
+ ec = createEntry(info, actualRoot, level);
+ if (ec == Zip::Ok) {
+ ++zd.files;
+ if (addedFiles)
+ ++(*addedFiles);
+ }
+ }
+
+ if (ec != Zip::Ok && !skipBad) {
+ break;
+ }
+ }
+
+ // Create explicit records for empty directories
+ if (!path_ignore) {
+ QHash::ConstIterator b = dirMap.constBegin();
+ const QHash::ConstIterator e = dirMap.constEnd();
+ while (b != e) {
+ const ZippedDir& zd = b.value();
+ if (zd.files <= 0) {
+ ec = createEntry(b.key(), zd.actualRoot, level);
+ }
+ ++b;
+ }
+ }
+
+ return ec;
+}
+
+//! \internal \p file must be a file and not a directory.
+Zip::ErrorCode ZipPrivate::deflateFile(const QFileInfo& fileInfo,
+ quint32& crc, qint64& written, const Zip::CompressionLevel& level, quint32** keys)
+{
+ const QString path = fileInfo.absoluteFilePath();
+ QFile file(path);
+ if (!file.open(QIODevice::ReadOnly)) {
+ qDebug() << QString("An error occurred while opening %1").arg(path);
+ return Zip::OpenFailed;
+ }
+
+ const Zip::ErrorCode ec = (level == Zip::Store)
+ ? storeFile(path, file, crc, written, keys)
+ : compressFile(path, file, crc, written, level, keys);
+
+ file.close();
+ return ec;
+}
+
+//! \internal
+Zip::ErrorCode ZipPrivate::storeFile(const QString& path, QIODevice& file,
+ quint32& crc, qint64& totalWritten, quint32** keys)
+{
+ Q_UNUSED(path);
+
+ qint64 read = 0;
+ qint64 written = 0;
+
+ const bool encrypt = keys != 0;
+
+ totalWritten = 0;
+ crc = crc32(0L, Z_NULL, 0);
+
+ while ( (read = file.read(buffer1, ZIP_READ_BUFFER)) > 0 ) {
+ crc = crc32(crc, uBuffer, read);
+ if (encrypt)
+ encryptBytes(*keys, buffer1, read);
+ written = device->write(buffer1, read);
+ totalWritten += written;
+ if (written != read) {
+ return Zip::WriteFailed;
+ }
+ }
+
+ return Zip::Ok;
+}
+
+//! \internal
+int ZipPrivate::compressionStrategy(const QString& path, QIODevice& file) const
+{
+ Q_UNUSED(file);
+
+#ifndef OSDAB_ZIP_NO_PNG_RLE
+ return Z_DEFAULT_STRATEGY;
+#endif
+ const bool isPng = path.endsWith(QLatin1String("png"), Qt::CaseInsensitive);
+ return isPng ? Z_RLE : Z_DEFAULT_STRATEGY;
+}
+
+//! \internal
+Zip::ErrorCode ZipPrivate::compressFile(const QString& path, QIODevice& file,
+ quint32& crc, qint64& totalWritten, const Zip::CompressionLevel& level, quint32** keys)
+{
+ qint64 read = 0;
+ qint64 written = 0;
+
+ qint64 totRead = 0;
+ qint64 toRead = file.size();
+
+ const bool encrypt = keys != 0;
+ const int strategy = compressionStrategy(path, file);
+
+ totalWritten = 0;
+ crc = crc32(0L, Z_NULL, 0);
+
+ z_stream zstr;
+
+ // Initialize zalloc, zfree and opaque before calling the init function
+ zstr.zalloc = Z_NULL;
+ zstr.zfree = Z_NULL;
+ zstr.opaque = Z_NULL;
+
+ int zret;
+
+ // Use deflateInit2 with negative windowBits to get raw compression
+ if ((zret = deflateInit2_(
+ &zstr,
+ (int)level, // compression level
+ Z_DEFLATED, // method
+ -MAX_WBITS, // windowBits
+ 8, // memLevel
+ strategy,
+ ZLIB_VERSION,
+ sizeof(z_stream)
+ )) != Z_OK ) {
+ qDebug() << "Could not initialize zlib for compression";
+ return Zip::ZlibError;
+ }
+
+ qint64 compressed;
+ int flush = Z_NO_FLUSH;
+ do {
+ read = file.read(buffer1, ZIP_READ_BUFFER);
+ totRead += read;
+ if (!read)
+ break;
+
+ if (read < 0) {
+ deflateEnd(&zstr);
+ qDebug() << QString("Error while reading %1").arg(path);
+ return Zip::ReadFailed;
+ }
+
+ crc = crc32(crc, uBuffer, read);
+
+ zstr.next_in = (Bytef*) buffer1;
+ zstr.avail_in = (uInt)read;
+
+ // Tell zlib if this is the last chunk we want to encode
+ // by setting the flush parameter to Z_FINISH
+ flush = (totRead == toRead) ? Z_FINISH : Z_NO_FLUSH;
+
+ // Run deflate() on input until output buffer not full
+ // finish compression if all of source has been read in
+ do {
+ zstr.next_out = (Bytef*) buffer2;
+ zstr.avail_out = ZIP_READ_BUFFER;
+
+ zret = deflate(&zstr, flush);
+ // State not clobbered
+ Q_ASSERT(zret != Z_STREAM_ERROR);
+
+ // Write compressed data to file and empty buffer
+ compressed = ZIP_READ_BUFFER - zstr.avail_out;
+
+ if (encrypt)
+ encryptBytes(*keys, buffer2, compressed);
+
+ written = device->write(buffer2, compressed);
+ totalWritten += written;
+
+ if (written != compressed) {
+ deflateEnd(&zstr);
+ qDebug() << QString("Error while writing %1").arg(path);
+ return Zip::WriteFailed;
+ }
+
+ } while (zstr.avail_out == 0);
+
+ // All input will be used
+ Q_ASSERT(zstr.avail_in == 0);
+
+ } while (flush != Z_FINISH);
+
+ // Stream will be complete
+ Q_ASSERT(zret == Z_STREAM_END);
+ deflateEnd(&zstr);
+
+ return Zip::Ok;
+}
+
+//! \internal Writes a new entry in the zip file.
+Zip::ErrorCode ZipPrivate::createEntry(const QFileInfo& file, const QString& root,
+ Zip::CompressionLevel level)
+{
+ const bool dirOnly = file.isDir();
+
+ // entryName contains the path as it should be written
+ // in the zip file records
+ const QString entryName = dirOnly
+ ? root
+ : root + file.fileName();
+
+ // Directory entry
+ if (dirOnly || file.size() < ZIP_COMPRESSION_THRESHOLD) {
+ level = Zip::Store;
+ } else {
+ switch (level) {
+ case Zip::AutoCPU:
+ level = Zip::Deflate5;
+#ifndef OSDAB_ZIP_NO_DEBUG
+ qDebug("Compression level for '%s': %d", entryName.toLatin1().constData(), (int)level);
+#endif
+ break;
+ case Zip::AutoMIME:
+ level = detectCompressionByMime(file.completeSuffix().toLower());
+#ifndef OSDAB_ZIP_NO_DEBUG
+ qDebug("Compression level for '%s': %d", entryName.toLatin1().constData(), (int)level);
+#endif
+ break;
+ case Zip::AutoFull:
+ level = detectCompressionByMime(file.completeSuffix().toLower());
+#ifndef OSDAB_ZIP_NO_DEBUG
+ qDebug("Compression level for '%s': %d", entryName.toLatin1().constData(), (int)level);
+#endif
+ break;
+ default: ;
+ }
+ }
+
+
+
+ // create header and store it to write a central directory later
+ QScopedPointer h(new ZipEntryP);
+ h->absolutePath = file.absoluteFilePath().toLower();
+ h->fileSize = file.size();
+
+ // Set encryption bit and set the data descriptor bit
+ // so we can use mod time instead of crc for password check
+ bool encrypt = !dirOnly && !password.isEmpty();
+ if (encrypt)
+ h->gpFlag[0] |= 9;
+
+ QDateTime dt = file.lastModified();
+ dt = OSDAB_ZIP_MANGLE(fromFileTimestamp)(dt);
+ QDate d = dt.date();
+ h->modDate[1] = ((d.year() - 1980) << 1) & 254;
+ h->modDate[1] |= ((d.month() >> 3) & 1);
+ h->modDate[0] = ((d.month() & 7) << 5) & 224;
+ h->modDate[0] |= d.day();
+
+ QTime t = dt.time();
+ h->modTime[1] = (t.hour() << 3) & 248;
+ h->modTime[1] |= ((t.minute() >> 3) & 7);
+ h->modTime[0] = ((t.minute() & 7) << 5) & 224;
+ h->modTime[0] |= t.second() / 2;
+
+ h->szUncomp = dirOnly ? 0 : file.size();
+
+ h->compMethod = (level == Zip::Store) ? 0 : 0x0008;
+
+ // **** Write local file header ****
+
+ // signature
+ buffer1[0] = 'P'; buffer1[1] = 'K';
+ buffer1[2] = 0x3; buffer1[3] = 0x4;
+
+ // version needed to extract
+ buffer1[ZIP_LH_OFF_VERS] = ZIP_VERSION;
+ buffer1[ZIP_LH_OFF_VERS + 1] = 0;
+
+ // general purpose flag
+ buffer1[ZIP_LH_OFF_GPFLAG] = h->gpFlag[0];
+ buffer1[ZIP_LH_OFF_GPFLAG + 1] = h->gpFlag[1];
+
+ // compression method
+ buffer1[ZIP_LH_OFF_CMET] = h->compMethod & 0xFF;
+ buffer1[ZIP_LH_OFF_CMET + 1] = (h->compMethod>>8) & 0xFF;
+
+ // last mod file time
+ buffer1[ZIP_LH_OFF_MODT] = h->modTime[0];
+ buffer1[ZIP_LH_OFF_MODT + 1] = h->modTime[1];
+
+ // last mod file date
+ buffer1[ZIP_LH_OFF_MODD] = h->modDate[0];
+ buffer1[ZIP_LH_OFF_MODD + 1] = h->modDate[1];
+
+ // skip crc (4bytes) [14,15,16,17]
+
+ // skip compressed size but include evtl. encryption header (4bytes: [18,19,20,21])
+ buffer1[ZIP_LH_OFF_CSIZE] =
+ buffer1[ZIP_LH_OFF_CSIZE + 1] =
+ buffer1[ZIP_LH_OFF_CSIZE + 2] =
+ buffer1[ZIP_LH_OFF_CSIZE + 3] = 0;
+
+ h->szComp = encrypt ? ZIP_LOCAL_ENC_HEADER_SIZE : 0;
+
+ // uncompressed size [22,23,24,25]
+ setULong(h->szUncomp, buffer1, ZIP_LH_OFF_USIZE);
+
+ // filename length
+ QByteArray entryNameBytes = entryName.toAscii();
+ int sz = entryNameBytes.size();
+
+ buffer1[ZIP_LH_OFF_NAMELEN] = sz & 0xFF;
+ buffer1[ZIP_LH_OFF_NAMELEN + 1] = (sz >> 8) & 0xFF;
+
+ // extra field length
+ buffer1[ZIP_LH_OFF_XLEN] = buffer1[ZIP_LH_OFF_XLEN + 1] = 0;
+
+ // Store offset to write crc and compressed size
+ h->lhOffset = device->pos();
+ quint32 crcOffset = h->lhOffset + ZIP_LH_OFF_CRC;
+
+ if (device->write(buffer1, ZIP_LOCAL_HEADER_SIZE) != ZIP_LOCAL_HEADER_SIZE) {
+ return Zip::WriteFailed;
+ }
+
+ // Write out filename
+ if (device->write(entryNameBytes) != sz) {
+ return Zip::WriteFailed;
+ }
+
+ // Encryption keys
+ quint32 keys[3] = { 0, 0, 0 };
+
+ if (encrypt) {
+ // **** encryption header ****
+
+ // XOR with PI to ensure better random numbers
+ // with poorly implemented rand() as suggested by Info-Zip
+ srand(time(NULL) ^ 3141592654UL);
+ int randByte;
+
+ initKeys(keys);
+ for (int i = 0; i < 10; ++i) {
+ randByte = (rand() >> 7) & 0xff;
+ buffer1[i] = decryptByte(keys[2]) ^ randByte;
+ updateKeys(keys, randByte);
+ }
+
+ // Encrypt encryption header
+ initKeys(keys);
+ for (int i = 0; i < 10; ++i) {
+ randByte = decryptByte(keys[2]);
+ updateKeys(keys, buffer1[i]);
+ buffer1[i] ^= randByte;
+ }
+
+ // We don't know the CRC at this time, so we use the modification time
+ // as the last two bytes
+ randByte = decryptByte(keys[2]);
+ updateKeys(keys, h->modTime[0]);
+ buffer1[10] ^= randByte;
+
+ randByte = decryptByte(keys[2]);
+ updateKeys(keys, h->modTime[1]);
+ buffer1[11] ^= randByte;
+
+ // Write out encryption header
+ if (device->write(buffer1, ZIP_LOCAL_ENC_HEADER_SIZE) != ZIP_LOCAL_ENC_HEADER_SIZE) {
+ return Zip::WriteFailed;
+ }
+ }
+
+ quint32 crc = 0;
+ qint64 written = 0;
+
+ if (!dirOnly) {
+ quint32* k = keys;
+ const Zip::ErrorCode ec = deflateFile(file, crc, written, level, encrypt ? &k : 0);
+ if (ec != Zip::Ok)
+ return ec;
+ Q_ASSERT(!h.isNull());
+ }
+
+ // Store end of entry offset
+ quint32 current = device->pos();
+
+ // Update crc and compressed size in local header
+ if (!device->seek(crcOffset)) {
+ return Zip::SeekFailed;
+ }
+
+ h->crc = dirOnly ? 0 : crc;
+ h->szComp += written;
+
+ setULong(h->crc, buffer1, 0);
+ setULong(h->szComp, buffer1, 4);
+ if ( device->write(buffer1, 8) != 8) {
+ return Zip::WriteFailed;
+ }
+
+ // Seek to end of entry
+ if (!device->seek(current)) {
+ return Zip::SeekFailed;
+ }
+
+ if ((h->gpFlag[0] & 8) == 8) {
+ // Write data descriptor
+
+ // Signature: PK\7\8
+ buffer1[0] = 'P';
+ buffer1[1] = 'K';
+ buffer1[2] = 0x07;
+ buffer1[3] = 0x08;
+
+ // CRC
+ setULong(h->crc, buffer1, ZIP_DD_OFF_CRC32);
+
+ // Compressed size
+ setULong(h->szComp, buffer1, ZIP_DD_OFF_CSIZE);
+
+ // Uncompressed size
+ setULong(h->szUncomp, buffer1, ZIP_DD_OFF_USIZE);
+
+ if (device->write(buffer1, ZIP_DD_SIZE_WS) != ZIP_DD_SIZE_WS) {
+ return Zip::WriteFailed;
+ }
+ }
+
+ headers->insert(entryName, h.take());
+ return Zip::Ok;
+}
+
+//! \internal
+int ZipPrivate::decryptByte(quint32 key2) const
+{
+ quint16 temp = ((quint16)(key2) & 0xffff) | 2;
+ return (int)(((temp * (temp ^ 1)) >> 8) & 0xff);
+}
+
+//! \internal Writes an quint32 (4 bytes) to a byte array at given offset.
+void ZipPrivate::setULong(quint32 v, char* buffer, unsigned int offset)
+{
+ buffer[offset+3] = ((v >> 24) & 0xFF);
+ buffer[offset+2] = ((v >> 16) & 0xFF);
+ buffer[offset+1] = ((v >> 8) & 0xFF);
+ buffer[offset] = (v & 0xFF);
+}
+
+//! \internal Initializes decryption keys using a password.
+void ZipPrivate::initKeys(quint32* keys) const
+{
+ // Encryption keys initialization constants are taken from the
+ // PKZip file format specification docs
+ keys[0] = 305419896L;
+ keys[1] = 591751049L;
+ keys[2] = 878082192L;
+
+ QByteArray pwdBytes = password.toAscii();
+ int sz = pwdBytes.size();
+ const char* ascii = pwdBytes.data();
+
+ for (int i = 0; i < sz; ++i)
+ updateKeys(keys, (int)ascii[i]);
+}
+
+//! Updates a one-char-only CRC; it's the Info-Zip macro re-adapted.
+quint32 ZipPrivate::updateChecksum(const quint32& crc, const quint32& val) const
+{
+ return quint32(crcTable[quint32(crc^val) & 0xff] ^ crc_t(crc >> 8));
+}
+
+//! \internal Updates encryption keys.
+void ZipPrivate::updateKeys(quint32* keys, int c) const
+{
+ keys[0] = updateChecksum(keys[0], c);
+ keys[1] += keys[0] & 0xff;
+ keys[1] = keys[1] * 134775813L + 1;
+ keys[2] = updateChecksum(keys[2], ((int)keys[1]) >> 24);
+}
+
+//! \internal Encrypts a byte array.
+void ZipPrivate::encryptBytes(quint32* keys, char* buffer, qint64 read)
+{
+ char t;
+
+ for (qint64 i = 0; i < read; ++i) {
+ t = buffer[i];
+ buffer[i] ^= decryptByte(keys[2]);
+ updateKeys(keys, t);
+ }
+}
+
+namespace {
+struct KeywordHelper {
+ const QString needle;
+ inline KeywordHelper(const QString& keyword) : needle(keyword) {}
+};
+
+bool operator<(const KeywordHelper& helper, const char* keyword) {
+ return helper.needle.compare(QLatin1String(keyword)) < 0;
+}
+
+bool operator<(const char* keyword, const KeywordHelper& helper) {
+ return helper.needle.compare(QLatin1String(keyword)) > 0;
+}
+
+bool hasExtension(const QString& ext, const char* const* map, int max) {
+ const char* const* start = &map[0];
+ const char* const* end = &map[max - 1];
+ const char* const* kw = qBinaryFind(start, end, KeywordHelper(ext));
+ return kw != end;
+}
+}
+
+//! \internal Detects the best compression level for a given file extension.
+Zip::CompressionLevel ZipPrivate::detectCompressionByMime(const QString& ext)
+{
+ // NOTE: Keep the MAX_* and the number of strings in the map up to date.
+ // NOTE: Alphabetically sort the strings in the map -- we use a binary search!
+
+ // Archives or files that will hardly compress
+ const int MAX_EXT1 = 14;
+ const char* const ext1[MAX_EXT1] = {
+ "7z", "bin", "deb", "exe", "gz", "gz2", "jar", "rar", "rpm", "tar", "tgz", "z", "zip",
+ 0 // # MAX_EXT1
+ };
+
+ // Slow or usually large files that we should not spend to much time with
+ const int MAX_EXT2 = 24;
+ const char* const ext2[MAX_EXT2] = {
+ "asf",
+ "avi",
+ "divx",
+ "doc",
+ "docx",
+ "flv",
+ "gif",
+ "iso",
+ "jpg",
+ "jpeg",
+ "mka",
+ "mkv",
+ "mp3",
+ "mp4",
+ "mpeg",
+ "mpg",
+ "odt",
+ "ogg",
+ "ogm",
+ "ra",
+ "rm",
+ "wma",
+ "wmv",
+ 0 // # MAX_EXT2
+ };
+
+ // Files with high compression ratio
+ const int MAX_EXT3 = 28;
+ const char* const ext3[MAX_EXT3] = {
+ "asp", "bat", "c", "conf", "cpp", "cpp", "css", "csv", "cxx", "h", "hpp", "htm", "html", "hxx",
+ "ini", "js", "php", "pl", "py", "rtf", "sh", "tsv", "txt", "vb", "vbs", "xml", "xst",
+ 0 // # MAX_EXT3
+ };
+
+ const char* const* map = ext1;
+ if (hasExtension(ext, map, MAX_EXT1))
+ return Zip::Store;
+
+ map = ext2;
+ if (hasExtension(ext, map, MAX_EXT2))
+ return Zip::Deflate2;
+
+ map = ext3;
+ if (hasExtension(ext, map, MAX_EXT3))
+ return Zip::Deflate9;
+
+ return Zip::Deflate5;
+}
+
+/*!
+ Closes the current archive and writes out pending data.
+*/
+Zip::ErrorCode ZipPrivate::closeArchive()
+{
+ if (!device) {
+ Q_ASSERT(!file);
+ return Zip::Ok;
+ }
+
+ if (device != file)
+ disconnect(device, 0, this, 0);
+
+ return do_closeArchive();
+}
+
+//! \internal
+Zip::ErrorCode ZipPrivate::do_closeArchive()
+{
+ // Close current archive by writing out central directory
+ // and free up resources
+
+ if (!device && !headers)
+ return Zip::Ok;
+
+ quint32 szCentralDir = 0;
+ quint32 offCentralDir = device->pos();
+ Zip::ErrorCode c = Zip::Ok;
+
+ if (headers && device) {
+ for (QMap::ConstIterator itr = headers->constBegin();
+ itr != headers->constEnd(); ++itr) {
+ const QString fileName = itr.key();
+ const ZipEntryP* h = itr.value();
+ c = writeEntry(fileName, h, szCentralDir);
+ }
+ }
+
+ if (c == Zip::Ok)
+ c = writeCentralDir(offCentralDir, szCentralDir);
+
+ if (c != Zip::Ok) {
+ if (file) {
+ file->close();
+ if (!file->remove()) {
+ qDebug() << "Failed to delete corrupt archive.";
+ }
+ }
+ }
+
+ return c;
+}
+
+//! \internal
+Zip::ErrorCode ZipPrivate::writeEntry(const QString& fileName, const ZipEntryP* h, quint32& szCentralDir)
+{
+ unsigned int sz;
+
+ Q_ASSERT(h && device && headers);
+
+ // signature
+ buffer1[0] = 'P';
+ buffer1[1] = 'K';
+ buffer1[2] = 0x01;
+ buffer1[3] = 0x02;
+
+ // version made by (currently only MS-DOS/FAT - no symlinks or other stuff supported)
+ buffer1[ZIP_CD_OFF_MADEBY] = buffer1[ZIP_CD_OFF_MADEBY + 1] = 0;
+
+ // version needed to extract
+ buffer1[ZIP_CD_OFF_VERSION] = ZIP_VERSION;
+ buffer1[ZIP_CD_OFF_VERSION + 1] = 0;
+
+ // general purpose flag
+ buffer1[ZIP_CD_OFF_GPFLAG] = h->gpFlag[0];
+ buffer1[ZIP_CD_OFF_GPFLAG + 1] = h->gpFlag[1];
+
+ // compression method
+ buffer1[ZIP_CD_OFF_CMET] = h->compMethod & 0xFF;
+ buffer1[ZIP_CD_OFF_CMET + 1] = (h->compMethod >> 8) & 0xFF;
+
+ // last mod file time
+ buffer1[ZIP_CD_OFF_MODT] = h->modTime[0];
+ buffer1[ZIP_CD_OFF_MODT + 1] = h->modTime[1];
+
+ // last mod file date
+ buffer1[ZIP_CD_OFF_MODD] = h->modDate[0];
+ buffer1[ZIP_CD_OFF_MODD + 1] = h->modDate[1];
+
+ // crc (4bytes) [16,17,18,19]
+ setULong(h->crc, buffer1, ZIP_CD_OFF_CRC);
+
+ // compressed size (4bytes: [20,21,22,23])
+ setULong(h->szComp, buffer1, ZIP_CD_OFF_CSIZE);
+
+ // uncompressed size [24,25,26,27]
+ setULong(h->szUncomp, buffer1, ZIP_CD_OFF_USIZE);
+
+ // filename
+ QByteArray fileNameBytes = fileName.toAscii();
+ sz = fileNameBytes.size();
+ buffer1[ZIP_CD_OFF_NAMELEN] = sz & 0xFF;
+ buffer1[ZIP_CD_OFF_NAMELEN + 1] = (sz >> 8) & 0xFF;
+
+ // extra field length
+ buffer1[ZIP_CD_OFF_XLEN] = buffer1[ZIP_CD_OFF_XLEN + 1] = 0;
+
+ // file comment length
+ buffer1[ZIP_CD_OFF_COMMLEN] = buffer1[ZIP_CD_OFF_COMMLEN + 1] = 0;
+
+ // disk number start
+ buffer1[ZIP_CD_OFF_DISKSTART] = buffer1[ZIP_CD_OFF_DISKSTART + 1] = 0;
+
+ // internal file attributes
+ buffer1[ZIP_CD_OFF_IATTR] = buffer1[ZIP_CD_OFF_IATTR + 1] = 0;
+
+ // external file attributes
+ buffer1[ZIP_CD_OFF_EATTR] =
+ buffer1[ZIP_CD_OFF_EATTR + 1] =
+ buffer1[ZIP_CD_OFF_EATTR + 2] =
+ buffer1[ZIP_CD_OFF_EATTR + 3] = 0;
+
+ // relative offset of local header [42->45]
+ setULong(h->lhOffset, buffer1, ZIP_CD_OFF_LHOFF);
+
+ if (device->write(buffer1, ZIP_CD_SIZE) != ZIP_CD_SIZE) {
+ return Zip::WriteFailed;
+ }
+
+ // Write out filename
+ if ((unsigned int)device->write(fileNameBytes) != sz) {
+ return Zip::WriteFailed;
+ }
+
+ szCentralDir += (ZIP_CD_SIZE + sz);
+
+ return Zip::Ok;
+}
+
+//! \internal
+Zip::ErrorCode ZipPrivate::writeCentralDir(quint32 offCentralDir, quint32 szCentralDir)
+{
+ Q_ASSERT(device && headers);
+
+ unsigned int sz;
+
+ // signature
+ buffer1[0] = 'P';
+ buffer1[1] = 'K';
+ buffer1[2] = 0x05;
+ buffer1[3] = 0x06;
+
+ // number of this disk
+ buffer1[ZIP_EOCD_OFF_DISKNUM] = buffer1[ZIP_EOCD_OFF_DISKNUM + 1] = 0;
+
+ // number of disk with central directory
+ buffer1[ZIP_EOCD_OFF_CDDISKNUM] = buffer1[ZIP_EOCD_OFF_CDDISKNUM + 1] = 0;
+
+ // number of entries in this disk
+ sz = headers->count();
+ buffer1[ZIP_EOCD_OFF_ENTRIES] = sz & 0xFF;
+ buffer1[ZIP_EOCD_OFF_ENTRIES + 1] = (sz >> 8) & 0xFF;
+
+ // total number of entries
+ buffer1[ZIP_EOCD_OFF_CDENTRIES] = buffer1[ZIP_EOCD_OFF_ENTRIES];
+ buffer1[ZIP_EOCD_OFF_CDENTRIES + 1] = buffer1[ZIP_EOCD_OFF_ENTRIES + 1];
+
+ // size of central directory [12->15]
+ setULong(szCentralDir, buffer1, ZIP_EOCD_OFF_CDSIZE);
+
+ // central dir offset [16->19]
+ setULong(offCentralDir, buffer1, ZIP_EOCD_OFF_CDOFF);
+
+ // ZIP file comment length
+ QByteArray commentBytes = comment.toAscii();
+ quint16 commentLength = commentBytes.size();
+
+ if (commentLength == 0) {
+ buffer1[ZIP_EOCD_OFF_COMMLEN] = buffer1[ZIP_EOCD_OFF_COMMLEN + 1] = 0;
+ } else {
+ buffer1[ZIP_EOCD_OFF_COMMLEN] = commentLength & 0xFF;
+ buffer1[ZIP_EOCD_OFF_COMMLEN + 1] = (commentLength >> 8) & 0xFF;
+ }
+
+ if (device->write(buffer1, ZIP_EOCD_SIZE) != ZIP_EOCD_SIZE) {
+ return Zip::WriteFailed;
+ }
+
+ if (commentLength != 0) {
+ if ((unsigned int)device->write(commentBytes) != commentLength) {
+ return Zip::WriteFailed;
+ }
+ }
+
+ return Zip::Ok;
+}
+
+//! \internal
+void ZipPrivate::reset()
+{
+ comment.clear();
+
+ if (headers) {
+ qDeleteAll(*headers);
+ delete headers;
+ headers = 0;
+ }
+
+ device = 0;
+
+ if (file)
+ delete file;
+ file = 0;
+}
+
+//! \internal Returns the path of the parent directory
+QString ZipPrivate::extractRoot(const QString& p, Zip::CompressionOptions o)
+{
+ Q_UNUSED(o);
+ QDir d(QDir::cleanPath(p));
+ if (!d.exists())
+ return QString();
+
+ if (!d.cdUp())
+ return QString();
+
+ return d.absolutePath();
+}
+
+
+/************************************************************************
+ Public interface
+*************************************************************************/
+
+/*!
+ Creates a new Zip file compressor.
+*/
+Zip::Zip() : d(new ZipPrivate)
+{
+}
+
+/*!
+ Closes any open archive and releases used resources.
+*/
+Zip::~Zip()
+{
+ closeArchive();
+ delete d;
+}
+
+/*!
+ Returns true if there is an open archive.
+*/
+bool Zip::isOpen() const
+{
+ return d->device;
+}
+
+/*!
+ Sets the password to be used for the next files being added!
+ Files added before calling this method will use the previously
+ set password (if any).
+ Closing the archive won't clear the password!
+*/
+void Zip::setPassword(const QString& pwd)
+{
+ d->password = pwd;
+}
+
+//! Convenience method, clears the current password.
+void Zip::clearPassword()
+{
+ d->password.clear();
+}
+
+//! Returns the currently used password.
+QString Zip::password() const
+{
+ return d->password;
+}
+
+/*!
+ Attempts to create a new Zip archive. If \p overwrite is true and the file
+ already exist it will be overwritten.
+ Any open archive will be closed.
+ */
+Zip::ErrorCode Zip::createArchive(const QString& filename, bool overwrite)
+{
+ closeArchive();
+ Q_ASSERT(!d->device && !d->file);
+
+ if (filename.isEmpty())
+ return Zip::FileNotFound;
+
+ d->file = new QFile(filename);
+
+ if (d->file->exists() && !overwrite) {
+ delete d->file;
+ d->file = 0;
+ return Zip::FileExists;
+ }
+
+ if (!d->file->open(QIODevice::WriteOnly)) {
+ delete d->file;
+ d->file = 0;
+ return Zip::OpenFailed;
+ }
+
+ const Zip::ErrorCode ec = createArchive(d->file);
+ if (ec != Zip::Ok) {
+ closeArchive();
+ }
+
+ return ec;
+}
+
+/*!
+ Attempts to create a new Zip archive. If there is another open archive this will be closed.
+ \warning The class takes ownership of the device!
+ */
+Zip::ErrorCode Zip::createArchive(QIODevice* device)
+{
+ if (!device) {
+ qDebug() << "Invalid device.";
+ return Zip::OpenFailed;
+ }
+
+ return d->createArchive(device);
+}
+
+/*!
+ Returns the current archive comment.
+*/
+QString Zip::archiveComment() const
+{
+ return d->comment;
+}
+
+/*!
+ Sets the comment for this archive. Note: createArchive() should have been
+ called before.
+*/
+void Zip::setArchiveComment(const QString& comment)
+{
+ d->comment = comment;
+}
+
+/*!
+ Convenience method, same as calling Zip::addDirectory(const QString&,const QString&,CompressionOptions,CompressionLevel)
+ with the Zip::IgnorePaths flag as compression option and an empty \p root parameter.
+
+ The result is that all files found in \p path (and in subdirectories) are
+ added to the zip file without a directory entry.
+*/
+Zip::ErrorCode Zip::addDirectoryContents(const QString& path, CompressionLevel level)
+{
+ return addDirectory(path, QString(), IgnorePaths, level);
+}
+
+/*!
+ Convenience method, same as calling Zip::addDirectory(const QString&,const QString&,CompressionOptions,CompressionLevel)
+ with the Zip::IgnorePaths flag as compression option.
+
+ The result is that all files found in \p path (and in subdirectories) are
+ added to the zip file without a directory entry (or within a directory
+ structure specified by \p root).
+*/
+Zip::ErrorCode Zip::addDirectoryContents(const QString& path, const QString& root, CompressionLevel level)
+{
+ return addDirectory(path, root, IgnorePaths, level);
+}
+
+/*!
+ Convenience method, same as calling
+ Zip::addDirectory(const QString&,const QString&,CompressionLevel)
+ with an empty \p root parameter and Zip::RelativePaths flag as compression option.
+ */
+Zip::ErrorCode Zip::addDirectory(const QString& path, CompressionLevel level)
+{
+ return addDirectory(path, QString(), Zip::RelativePaths, level);
+}
+
+/*!
+ Convenience method, same as calling Zip::addDirectory(const QString&,const QString&,CompressionOptions,CompressionLevel)
+ with the Zip::RelativePaths flag as compression option.
+ */
+Zip::ErrorCode Zip::addDirectory(const QString& path, const QString& root, CompressionLevel level)
+{
+ return addDirectory(path, root, Zip::RelativePaths, level);
+}
+
+/*!
+ Recursively adds files contained in \p dir to the archive, using \p root as name for the root folder.
+ Stops adding files if some error occurs.
+
+ The ExtractionOptions are checked in the order they are defined in the zip.h heaser file.
+ This means that the last one overwrites the previous one (if some conflict occurs), i.e.
+ Zip::IgnorePaths | Zip::AbsolutePaths would be interpreted as Zip::IgnorePaths.
+
+ The \p root parameter is ignored with the Zip::IgnorePaths parameter and used as path prefix (a trailing /
+ is always added as directory separator!) otherwise (even with Zip::AbsolutePaths set!).
+
+ If \p addedFiles is not null it is set to the number of successfully added
+ files.
+*/
+Zip::ErrorCode Zip::addDirectory(const QString& path, const QString& root,
+ CompressionOptions options, CompressionLevel level, int* addedFiles)
+{
+ const int hierarchyLev = 0;
+ return d->addDirectory(path, root, options, level, hierarchyLev, addedFiles);
+}
+
+/*!
+ Convenience method, same as calling Zip::addFile(const QString&,const QString&,CompressionOptions,CompressionLevel)
+ with an empty \p root parameter and Zip::RelativePaths as compression option.
+ */
+Zip::ErrorCode Zip::addFile(const QString& path, CompressionLevel level)
+{
+ return addFile(path, QString(), Zip::RelativePaths, level);
+}
+
+/*!
+ Convenience method, same as calling Zip::addFile(const QString&,const QString&,CompressionOptions,CompressionLevel)
+ with the Zip::RelativePaths flag as compression option.
+ */
+Zip::ErrorCode Zip::addFile(const QString& path, const QString& root,
+ CompressionLevel level)
+{
+ return addFile(path, root, Zip::RelativePaths, level);
+}
+
+/*!
+ Adds the file at \p path to the archive, using \p root as name for the root folder.
+ If \p path points to a directory the behaviour is basically the same as
+ addDirectory().
+
+ The ExtractionOptions are checked in the order they are defined in the zip.h heaser file.
+ This means that the last one overwrites the previous one (if some conflict occurs), i.e.
+ Zip::IgnorePaths | Zip::AbsolutePaths would be interpreted as Zip::IgnorePaths.
+
+ The \p root parameter is ignored with the Zip::IgnorePaths parameter and used as path prefix (a trailing /
+ is always added as directory separator!) otherwise (even with Zip::AbsolutePaths set!).
+*/
+Zip::ErrorCode Zip::addFile(const QString& path, const QString& root,
+ CompressionOptions options, CompressionLevel level)
+{
+ if (path.isEmpty())
+ return Zip::Ok;
+ return addFiles(QStringList() << path, root, options, level);
+}
+
+/*!
+ Convenience method, same as calling Zip::addFiles(const QStringList&,const QString&,CompressionOptions,CompressionLevel)
+ with an empty \p root parameter and Zip::RelativePaths as compression option.
+ */
+Zip::ErrorCode Zip::addFiles(const QStringList& paths, CompressionLevel level)
+{
+ return addFiles(paths, QString(), Zip::RelativePaths, level);
+}
+
+/*!
+ Convenience method, same as calling Zip::addFiles(const QStringList&,const QString&,CompressionOptions,CompressionLevel)
+ with the Zip::RelativePaths flag as compression option.
+ */
+Zip::ErrorCode Zip::addFiles(const QStringList& paths, const QString& root,
+ CompressionLevel level)
+{
+ return addFiles(paths, root, Zip::RelativePaths, level);
+}
+
+/*!
+ Adds the files or directories in \p paths to the archive, using \p root as
+ name for the root folder.
+ This is similar to calling addFile or addDirectory for all the entries in
+ \p paths, except it is slightly faster.
+
+ The ExtractionOptions are checked in the order they are defined in the zip.h heaser file.
+ This means that the last one overwrites the previous one (if some conflict occurs), i.e.
+ Zip::IgnorePaths | Zip::AbsolutePaths would be interpreted as Zip::IgnorePaths.
+
+ The \p root parameter is ignored with the Zip::IgnorePaths parameter and used as path prefix (a trailing /
+ is always added as directory separator!) otherwise (even with Zip::AbsolutePaths set!).
+
+ If \p addedFiles is not null it is set to the number of successfully added
+ files.
+*/
+Zip::ErrorCode Zip::addFiles(const QStringList& paths, const QString& root,
+ CompressionOptions options, CompressionLevel level, int* addedFiles)
+{
+ return d->addFiles(paths, root, options, level, addedFiles);
+}
+
+/*!
+ Closes the archive and writes any pending data.
+*/
+Zip::ErrorCode Zip::closeArchive()
+{
+ Zip::ErrorCode ec = d->closeArchive();
+ d->reset();
+ return ec;
+}
+
+/*!
+ Returns a locale translated error string for a given error code.
+*/
+QString Zip::formatError(Zip::ErrorCode c) const
+{
+ switch (c)
+ {
+ case Ok: return QCoreApplication::translate("Zip", "ZIP operation completed successfully."); break;
+ case ZlibInit: return QCoreApplication::translate("Zip", "Failed to initialize or load zlib library."); break;
+ case ZlibError: return QCoreApplication::translate("Zip", "zlib library error."); break;
+ case OpenFailed: return QCoreApplication::translate("Zip", "Unable to create or open file."); break;
+ case NoOpenArchive: return QCoreApplication::translate("Zip", "No archive has been created yet."); break;
+ case FileNotFound: return QCoreApplication::translate("Zip", "File or directory does not exist."); break;
+ case ReadFailed: return QCoreApplication::translate("Zip", "File read error."); break;
+ case WriteFailed: return QCoreApplication::translate("Zip", "File write error."); break;
+ case SeekFailed: return QCoreApplication::translate("Zip", "File seek error."); break;
+ default: ;
+ }
+
+ return QCoreApplication::translate("Zip", "Unknown error.");
+}
+
+OSDAB_END_NAMESPACE
Index: /Vago/trunk/Vago/libs/zip.h
===================================================================
--- /Vago/trunk/Vago/libs/zip.h (revision 771)
+++ /Vago/trunk/Vago/libs/zip.h (revision 771)
@@ -0,0 +1,158 @@
+/****************************************************************************
+** Filename: zip.h
+** Last updated [dd/mm/yyyy]: 27/03/2011
+**
+** pkzip 2.0 file compression.
+**
+** Some of the code has been inspired by other open source projects,
+** (mainly Info-Zip and Gilles Vollant's minizip).
+** Compression and decompression actually uses the zlib library.
+**
+** Copyright (C) 2007-2012 Angius Fabrizio. All rights reserved.
+**
+** This file is part of the OSDaB project (http://osdab.42cows.org/).
+**
+** This file may be distributed and/or modified under the terms of the
+** GNU General Public License version 2 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+** See the file LICENSE.GPL that came with this software distribution or
+** visit http://www.gnu.org/copyleft/gpl.html for GPL licensing information.
+**
+**********************************************************************/
+
+#ifndef OSDAB_ZIP__H
+#define OSDAB_ZIP__H
+
+#include "zipglobal.h"
+
+#include
+#include
+
+#include
+
+class QIODevice;
+class QFile;
+class QDir;
+class QStringList;
+class QString;
+
+OSDAB_BEGIN_NAMESPACE(Zip)
+
+class ZipPrivate;
+
+class OSDAB_ZIP_EXPORT Zip
+{
+public:
+ enum ErrorCode
+ {
+ Ok,
+ ZlibInit,
+ ZlibError,
+ FileExists,
+ OpenFailed,
+ NoOpenArchive,
+ FileNotFound,
+ ReadFailed,
+ WriteFailed,
+ SeekFailed,
+ InternalError
+ };
+
+ enum CompressionLevel
+ {
+ Store,
+ Deflate1 = 1, Deflate2, Deflate3, Deflate4,
+ Deflate5, Deflate6, Deflate7, Deflate8, Deflate9,
+ AutoCPU, AutoMIME, AutoFull
+ };
+
+ enum CompressionOption
+ {
+ /*! Does not preserve absolute paths in the zip file when adding a
+ file or directory (default) */
+ RelativePaths = 0x0001,
+ /*! Preserve absolute paths */
+ AbsolutePaths = 0x0002,
+ /*! Do not store paths. All the files are put in the (evtl. user defined)
+ root of the zip file */
+ IgnorePaths = 0x0004,
+ /*! Works only with addDirectory(). Adds the directory's contents,
+ including subdirectories, but does not add an entry for the root
+ directory itself. */
+ IgnoreRoot = 0x0008,
+ /*! Used only when compressing a directory or multiple files.
+ If set invalid or unreadable files are simply skipped.
+ */
+ SkipBadFiles = 0x0020,
+ /*! Makes sure a file is never added twice to the same zip archive.
+ This check is only necessary in certain usage scenarios and given
+ that it slows down processing you need to enable it explicitly with
+ this flag.
+ */
+ CheckForDuplicates = 0x0040
+ };
+ Q_DECLARE_FLAGS(CompressionOptions, CompressionOption)
+
+ Zip();
+ virtual ~Zip();
+
+ bool isOpen() const;
+
+ void setPassword(const QString& pwd);
+ void clearPassword();
+ QString password() const;
+
+ ErrorCode createArchive(const QString& file, bool overwrite = true);
+ ErrorCode createArchive(QIODevice* device);
+
+ QString archiveComment() const;
+ void setArchiveComment(const QString& comment);
+
+ ErrorCode addDirectoryContents(const QString& path,
+ CompressionLevel level = AutoFull);
+ ErrorCode addDirectoryContents(const QString& path, const QString& root,
+ CompressionLevel level = AutoFull);
+
+ ErrorCode addDirectory(const QString& path,
+ CompressionLevel level = AutoFull);
+ ErrorCode addDirectory(const QString& path, const QString& root,
+ CompressionLevel level = AutoFull);
+ ErrorCode addDirectory(const QString& path, const QString& root,
+ CompressionOptions options, CompressionLevel level = AutoFull,
+ int* addedFiles = 0);
+
+ ErrorCode addFile(const QString& path,
+ CompressionLevel level = AutoFull);
+ ErrorCode addFile(const QString& path, const QString& root,
+ CompressionLevel level = AutoFull);
+ ErrorCode addFile(const QString& path, const QString& root,
+ CompressionOptions options,
+ CompressionLevel level = AutoFull);
+
+ ErrorCode addFiles(const QStringList& paths,
+ CompressionLevel level = AutoFull);
+ ErrorCode addFiles(const QStringList& paths, const QString& root,
+ CompressionLevel level = AutoFull);
+ ErrorCode addFiles(const QStringList& paths, const QString& root,
+ CompressionOptions options,
+ CompressionLevel level = AutoFull,
+ int* addedFiles = 0);
+
+ ErrorCode closeArchive();
+
+ QString formatError(ErrorCode c) const;
+
+private:
+ ZipPrivate* d;
+};
+
+Q_DECLARE_OPERATORS_FOR_FLAGS(Zip::CompressionOptions)
+
+OSDAB_END_NAMESPACE
+
+#endif // OSDAB_ZIP__H
Index: /Vago/trunk/Vago/libs/zip_p.h
===================================================================
--- /Vago/trunk/Vago/libs/zip_p.h (revision 771)
+++ /Vago/trunk/Vago/libs/zip_p.h (revision 771)
@@ -0,0 +1,133 @@
+/****************************************************************************
+** Filename: zip_p.h
+** Last updated [dd/mm/yyyy]: 27/03/2011
+**
+** pkzip 2.0 file compression.
+**
+** Some of the code has been inspired by other open source projects,
+** (mainly Info-Zip and Gilles Vollant's minizip).
+** Compression and decompression actually uses the zlib library.
+**
+** Copyright (C) 2007-2012 Angius Fabrizio. All rights reserved.
+**
+** This file is part of the OSDaB project (http://osdab.42cows.org/).
+**
+** This file may be distributed and/or modified under the terms of the
+** GNU General Public License version 2 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+** See the file LICENSE.GPL that came with this software distribution or
+** visit http://www.gnu.org/copyleft/gpl.html for GPL licensing information.
+**
+**********************************************************************/
+
+//
+// W A R N I N G
+// -------------
+//
+// This file is not part of the Zip/UnZip API. It exists purely as an
+// implementation detail. This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#ifndef OSDAB_ZIP_P__H
+#define OSDAB_ZIP_P__H
+
+#include "zip.h"
+#include "zipentry_p.h"
+
+#include
+#include
+#include
+
+#include
+
+/*!
+ zLib authors suggest using larger buffers (128K or 256K) for (de)compression (especially for inflate())
+ we use a 256K buffer here - if you want to use this code on a pre-iceage mainframe please change it ;)
+*/
+#define ZIP_READ_BUFFER (256*1024)
+
+OSDAB_BEGIN_NAMESPACE(Zip)
+
+class ZipPrivate : public QObject
+{
+ Q_OBJECT
+
+public:
+ // uLongf from zconf.h
+ typedef uLongf crc_t;
+
+ ZipPrivate();
+ virtual ~ZipPrivate();
+
+ QMap* headers;
+
+ QIODevice* device;
+ QFile* file;
+
+ char buffer1[ZIP_READ_BUFFER];
+ char buffer2[ZIP_READ_BUFFER];
+
+ unsigned char* uBuffer;
+
+ const crc_t* crcTable;
+
+ QString comment;
+ QString password;
+
+ Zip::ErrorCode createArchive(QIODevice* device);
+ Zip::ErrorCode closeArchive();
+ void reset();
+
+ bool zLibInit();
+
+ bool containsEntry(const QFileInfo& info) const;
+
+ Zip::ErrorCode addDirectory(const QString& path, const QString& root,
+ Zip::CompressionOptions options, Zip::CompressionLevel level,
+ int hierarchyLevel, int* addedFiles = 0);
+ Zip::ErrorCode addFiles(const QStringList& paths, const QString& root,
+ Zip::CompressionOptions options, Zip::CompressionLevel level,
+ int* addedFiles);
+
+ Zip::ErrorCode createEntry(const QFileInfo& file, const QString& root,
+ Zip::CompressionLevel level);
+ Zip::CompressionLevel detectCompressionByMime(const QString& ext);
+
+ inline quint32 updateChecksum(const quint32& crc, const quint32& val) const;
+
+ inline void encryptBytes(quint32* keys, char* buffer, qint64 read);
+
+ inline void setULong(quint32 v, char* buffer, unsigned int offset);
+ inline void updateKeys(quint32* keys, int c) const;
+ inline void initKeys(quint32* keys) const;
+ inline int decryptByte(quint32 key2) const;
+
+ inline QString extractRoot(const QString& p, Zip::CompressionOptions o);
+
+private slots:
+ void deviceDestroyed(QObject*);
+
+private:
+ int compressionStrategy(const QString& path, QIODevice& file) const;
+ Zip::ErrorCode deflateFile(const QFileInfo& fileInfo,
+ quint32& crc, qint64& written, const Zip::CompressionLevel& level, quint32** keys);
+ Zip::ErrorCode storeFile(const QString& path, QIODevice& file,
+ quint32& crc, qint64& written, quint32** keys);
+ Zip::ErrorCode compressFile(const QString& path, QIODevice& file,
+ quint32& crc, qint64& written, const Zip::CompressionLevel& level, quint32** keys);
+ Zip::ErrorCode do_closeArchive();
+ Zip::ErrorCode writeEntry(const QString& fileName, const ZipEntryP* h, quint32& szCentralDir);
+ Zip::ErrorCode writeCentralDir(quint32 offCentralDir, quint32 szCentralDir);
+};
+
+OSDAB_END_NAMESPACE
+
+#endif // OSDAB_ZIP_P__H
Index: /Vago/trunk/Vago/libs/zipentry_p.h
===================================================================
--- /Vago/trunk/Vago/libs/zipentry_p.h (revision 771)
+++ /Vago/trunk/Vago/libs/zipentry_p.h (revision 771)
@@ -0,0 +1,91 @@
+/****************************************************************************
+** Filename: ZipEntryP.h
+** Last updated [dd/mm/yyyy]: 27/03/2011
+**
+** Wrapper for a ZIP local header.
+**
+** Some of the code has been inspired by other open source projects,
+** (mainly Info-Zip and Gilles Vollant's minizip).
+** Compression and decompression actually uses the zlib library.
+**
+** Copyright (C) 2007-2012 Angius Fabrizio. All rights reserved.
+**
+** This file is part of the OSDaB project (http://osdab.42cows.org/).
+**
+** This file may be distributed and/or modified under the terms of the
+** GNU General Public License version 2 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+** See the file LICENSE.GPL that came with this software distribution or
+** visit http://www.gnu.org/copyleft/gpl.html for GPL licensing information.
+**
+**********************************************************************/
+
+//
+// W A R N I N G
+// -------------
+//
+// This file is not part of the Zip/UnZip API. It exists purely as an
+// implementation detail. This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#ifndef OSDAB_ZIPENTRY_P__H
+#define OSDAB_ZIPENTRY_P__H
+
+#include
+#include
+
+OSDAB_BEGIN_NAMESPACE(Zip)
+
+class ZipEntryP
+{
+public:
+ ZipEntryP() :
+ lhOffset(0),
+ dataOffset(0),
+ gpFlag(),
+ compMethod(0),
+ modTime(),
+ modDate(),
+ crc(0),
+ szComp(0),
+ szUncomp(0),
+ absolutePath(),
+ fileSize(0),
+ lhEntryChecked(false)
+ {
+ gpFlag[0] = gpFlag[1] = 0;
+ modTime[0] = modTime[1] = 0;
+ modDate[0] = modDate[1] = 0;
+ }
+
+ quint32 lhOffset; // Offset of the local header record for this entry
+ mutable quint32 dataOffset; // Offset of the file data for this entry
+ unsigned char gpFlag[2]; // General purpose flag
+ quint16 compMethod; // Compression method
+ unsigned char modTime[2]; // Last modified time
+ unsigned char modDate[2]; // Last modified date
+ quint32 crc; // CRC32
+ quint32 szComp; // Compressed file size
+ quint32 szUncomp; // Uncompressed file size
+ QString comment; // File comment
+
+ QString absolutePath; // Internal use
+ qint64 fileSize; // Internal use
+
+ mutable bool lhEntryChecked; // Is true if the local header record for this entry has been parsed
+
+ inline bool isEncrypted() const { return gpFlag[0] & 0x01; }
+ inline bool hasDataDescriptor() const { return gpFlag[0] & 0x08; }
+};
+
+OSDAB_END_NAMESPACE
+
+#endif // OSDAB_ZIPENTRY_P__H
Index: /Vago/trunk/Vago/libs/zipglobal.cpp
===================================================================
--- /Vago/trunk/Vago/libs/zipglobal.cpp (revision 771)
+++ /Vago/trunk/Vago/libs/zipglobal.cpp (revision 771)
@@ -0,0 +1,152 @@
+/****************************************************************************
+** Filename: zipglobal.cpp
+** Last updated [dd/mm/yyyy]: 06/02/2011
+**
+** pkzip 2.0 file compression.
+**
+** Some of the code has been inspired by other open source projects,
+** (mainly Info-Zip and Gilles Vollant's minizip).
+** Compression and decompression actually uses the zlib library.
+**
+** Copyright (C) 2007-2012 Angius Fabrizio. All rights reserved.
+**
+** This file is part of the OSDaB project (http://osdab.42cows.org/).
+**
+** This file may be distributed and/or modified under the terms of the
+** GNU General Public License version 2 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+** See the file LICENSE.GPL that came with this software distribution or
+** visit http://www.gnu.org/copyleft/gpl.html for GPL licensing information.
+**
+**********************************************************************/
+
+#include "zipglobal.h"
+
+#if defined(Q_OS_WIN) || defined(Q_OS_WINCE) || defined(Q_OS_LINUX) || defined (Q_OS_MACX)
+#define OSDAB_ZIP_HAS_UTC
+#include
+#else
+#undef OSDAB_ZIP_HAS_UTC
+#endif
+
+#if defined(Q_OS_WIN)
+#include
+#elif defined(Q_OS_LINUX) || defined(Q_OS_MACX)
+#include
+#endif
+
+OSDAB_BEGIN_NAMESPACE(Zip)
+
+/*! Returns the current UTC offset in seconds unless OSDAB_ZIP_NO_UTC is defined
+ and method is implemented for the current platform and 0 otherwise.
+*/
+int OSDAB_ZIP_MANGLE(currentUtcOffset)()
+{
+#if !(!defined OSDAB_ZIP_NO_UTC && defined OSDAB_ZIP_HAS_UTC)
+ return 0;
+#else
+ time_t curr_time_t;
+ time(&curr_time_t);
+
+#if defined Q_OS_WIN
+ struct tm _tm_struct;
+ struct tm* tm_struct = &_tm_struct;
+#else
+ struct tm* tm_struct = 0;
+#endif
+
+#if !defined(QT_NO_THREAD) && defined(_POSIX_THREAD_SAFE_FUNCTIONS)
+ // use the reentrant version of localtime() where available
+ tzset();
+ tm res;
+ tm_struct = gmtime_r(&curr_time_t, &res);
+#elif defined Q_OS_WIN && !defined Q_CC_MINGW
+ if (gmtime_s(tm_struct, &curr_time_t))
+ return 0;
+#else
+ tm_struct = gmtime(&curr_time_t);
+#endif
+
+ if (!tm_struct)
+ return 0;
+
+ const time_t global_time_t = mktime(tm_struct);
+
+#if !defined(QT_NO_THREAD) && defined(_POSIX_THREAD_SAFE_FUNCTIONS)
+ // use the reentrant version of localtime() where available
+ tm_struct = localtime_r(&curr_time_t, &res);
+#elif defined Q_OS_WIN && !defined Q_CC_MINGW
+ if (localtime_s(tm_struct, &curr_time_t))
+ return 0;
+#else
+ tm_struct = localtime(&curr_time_t);
+#endif
+
+ if (!tm_struct)
+ return 0;
+
+ const time_t local_time_t = mktime(tm_struct);
+
+ const int utcOffset = - qRound(difftime(global_time_t, local_time_t));
+ return tm_struct->tm_isdst > 0 ? utcOffset + 3600 : utcOffset;
+#endif // No UTC
+
+ return 0;
+}
+
+QDateTime OSDAB_ZIP_MANGLE(fromFileTimestamp)(const QDateTime& dateTime)
+{
+#if !defined OSDAB_ZIP_NO_UTC && defined OSDAB_ZIP_HAS_UTC
+ const int utc = OSDAB_ZIP_MANGLE(currentUtcOffset)();
+ return dateTime.toUTC().addSecs(utc);
+#else
+ return dateTime;
+#endif // OSDAB_ZIP_NO_UTC
+}
+
+bool OSDAB_ZIP_MANGLE(setFileTimestamp)(const QString& fileName, const QDateTime& dateTime)
+{
+ if (fileName.isEmpty())
+ return true;
+
+#ifdef Q_OS_WIN
+ HANDLE hFile = CreateFile(fileName.toStdWString().c_str(),
+ GENERIC_WRITE, FILE_SHARE_WRITE, 0, OPEN_EXISTING, 0, 0);
+ if (hFile == INVALID_HANDLE_VALUE) {
+ return false;
+ }
+
+ SYSTEMTIME st;
+ FILETIME ft, ftLastMod;
+ const QDate date = dateTime.date();
+ const QTime time = dateTime.time();
+ st.wYear = date.year();
+ st.wMonth = date.month();
+ st.wDay = date.day();
+ st.wHour = time.hour();
+ st.wMinute = time.minute();
+ st.wSecond = time.second();
+ st.wMilliseconds = time.msec();
+
+ SystemTimeToFileTime(&st, &ft);
+ LocalFileTimeToFileTime(&ft, &ftLastMod);
+
+ const bool success = SetFileTime(hFile, NULL, NULL, &ftLastMod);
+ CloseHandle(hFile);
+ return success;
+
+#elif defined(Q_OS_LINUX) || defined(Q_OS_MACX)
+
+ struct utimbuf t_buffer;
+ t_buffer.actime = t_buffer.modtime = dateTime.toTime_t();
+ return utime(fileName.toLocal8Bit().constData(), &t_buffer) == 0;
+#endif
+
+ return true;
+}
+OSDAB_END_NAMESPACE
Index: /Vago/trunk/Vago/libs/zipglobal.h
===================================================================
--- /Vago/trunk/Vago/libs/zipglobal.h (revision 771)
+++ /Vago/trunk/Vago/libs/zipglobal.h (revision 771)
@@ -0,0 +1,77 @@
+/****************************************************************************
+** Filename: zipglobal.h
+** Last updated [dd/mm/yyyy]: 27/03/2011
+**
+** pkzip 2.0 file compression.
+**
+** Some of the code has been inspired by other open source projects,
+** (mainly Info-Zip and Gilles Vollant's minizip).
+** Compression and decompression actually uses the zlib library.
+**
+** Copyright (C) 2007-2012 Angius Fabrizio. All rights reserved.
+**
+** This file is part of the OSDaB project (http://osdab.42cows.org/).
+**
+** This file may be distributed and/or modified under the terms of the
+** GNU General Public License version 2 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+** See the file LICENSE.GPL that came with this software distribution or
+** visit http://www.gnu.org/copyleft/gpl.html for GPL licensing information.
+**
+**********************************************************************/
+
+#ifndef OSDAB_ZIPGLOBAL__H
+#define OSDAB_ZIPGLOBAL__H
+
+#include
+#include
+
+/* If you want to build the OSDaB Zip code as
+ a library, define OSDAB_ZIP_LIB in the library's .pro file and
+ in the libraries using it OR remove the #ifndef OSDAB_ZIP_LIB
+ define below and leave the #else body. Also remember to define
+ OSDAB_ZIP_BUILD_LIB in the library's project).
+*/
+
+#ifndef OSDAB_ZIP_LIB
+# define OSDAB_ZIP_EXPORT
+#else
+# if defined(OSDAB_ZIP_BUILD_LIB)
+# define OSDAB_ZIP_EXPORT Q_DECL_EXPORT
+# else
+# define OSDAB_ZIP_EXPORT Q_DECL_IMPORT
+# endif
+#endif
+
+#ifdef OSDAB_NAMESPACE
+#define OSDAB_BEGIN_NAMESPACE(ModuleName) namespace Osdab { namespace ModuleName {
+#else
+#define OSDAB_BEGIN_NAMESPACE(ModuleName)
+#endif
+
+#ifdef OSDAB_NAMESPACE
+#define OSDAB_END_NAMESPACE } }
+#else
+#define OSDAB_END_NAMESPACE
+#endif
+
+#ifndef OSDAB_NAMESPACE
+#define OSDAB_ZIP_MANGLE(x) zip_##x
+#else
+#define OSDAB_ZIP_MANGLE(x) x
+#endif
+
+OSDAB_BEGIN_NAMESPACE(Zip)
+
+OSDAB_ZIP_EXPORT int OSDAB_ZIP_MANGLE(currentUtcOffset)();
+OSDAB_ZIP_EXPORT QDateTime OSDAB_ZIP_MANGLE(fromFileTimestamp)(const QDateTime& dateTime);
+OSDAB_ZIP_EXPORT bool OSDAB_ZIP_MANGLE(setFileTimestamp)(const QString& fileName, const QDateTime& dateTime);
+
+OSDAB_END_NAMESPACE
+
+#endif // OSDAB_ZIPGLOBAL__H
Index: /Vago/trunk/Vago/libs/zlib/zconf.h
===================================================================
--- /Vago/trunk/Vago/libs/zlib/zconf.h (revision 771)
+++ /Vago/trunk/Vago/libs/zlib/zconf.h (revision 771)
@@ -0,0 +1,428 @@
+/* zconf.h -- configuration of the zlib compression library
+ * Copyright (C) 1995-2010 Jean-loup Gailly.
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* @(#) $Id$ */
+
+#ifndef ZCONF_H
+#define ZCONF_H
+
+/*
+ * If you *really* need a unique prefix for all types and library functions,
+ * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
+ * Even better than compiling with -DZ_PREFIX would be to use configure to set
+ * this permanently in zconf.h using "./configure --zprefix".
+ */
+#ifdef Z_PREFIX /* may be set to #if 1 by ./configure */
+
+/* all linked symbols */
+# define _dist_code z__dist_code
+# define _length_code z__length_code
+# define _tr_align z__tr_align
+# define _tr_flush_block z__tr_flush_block
+# define _tr_init z__tr_init
+# define _tr_stored_block z__tr_stored_block
+# define _tr_tally z__tr_tally
+# define adler32 z_adler32
+# define adler32_combine z_adler32_combine
+# define adler32_combine64 z_adler32_combine64
+# define compress z_compress
+# define compress2 z_compress2
+# define compressBound z_compressBound
+# define crc32 z_crc32
+# define crc32_combine z_crc32_combine
+# define crc32_combine64 z_crc32_combine64
+# define deflate z_deflate
+# define deflateBound z_deflateBound
+# define deflateCopy z_deflateCopy
+# define deflateEnd z_deflateEnd
+# define deflateInit2_ z_deflateInit2_
+# define deflateInit_ z_deflateInit_
+# define deflateParams z_deflateParams
+# define deflatePrime z_deflatePrime
+# define deflateReset z_deflateReset
+# define deflateSetDictionary z_deflateSetDictionary
+# define deflateSetHeader z_deflateSetHeader
+# define deflateTune z_deflateTune
+# define deflate_copyright z_deflate_copyright
+# define get_crc_table z_get_crc_table
+# define gz_error z_gz_error
+# define gz_intmax z_gz_intmax
+# define gz_strwinerror z_gz_strwinerror
+# define gzbuffer z_gzbuffer
+# define gzclearerr z_gzclearerr
+# define gzclose z_gzclose
+# define gzclose_r z_gzclose_r
+# define gzclose_w z_gzclose_w
+# define gzdirect z_gzdirect
+# define gzdopen z_gzdopen
+# define gzeof z_gzeof
+# define gzerror z_gzerror
+# define gzflush z_gzflush
+# define gzgetc z_gzgetc
+# define gzgets z_gzgets
+# define gzoffset z_gzoffset
+# define gzoffset64 z_gzoffset64
+# define gzopen z_gzopen
+# define gzopen64 z_gzopen64
+# define gzprintf z_gzprintf
+# define gzputc z_gzputc
+# define gzputs z_gzputs
+# define gzread z_gzread
+# define gzrewind z_gzrewind
+# define gzseek z_gzseek
+# define gzseek64 z_gzseek64
+# define gzsetparams z_gzsetparams
+# define gztell z_gztell
+# define gztell64 z_gztell64
+# define gzungetc z_gzungetc
+# define gzwrite z_gzwrite
+# define inflate z_inflate
+# define inflateBack z_inflateBack
+# define inflateBackEnd z_inflateBackEnd
+# define inflateBackInit_ z_inflateBackInit_
+# define inflateCopy z_inflateCopy
+# define inflateEnd z_inflateEnd
+# define inflateGetHeader z_inflateGetHeader
+# define inflateInit2_ z_inflateInit2_
+# define inflateInit_ z_inflateInit_
+# define inflateMark z_inflateMark
+# define inflatePrime z_inflatePrime
+# define inflateReset z_inflateReset
+# define inflateReset2 z_inflateReset2
+# define inflateSetDictionary z_inflateSetDictionary
+# define inflateSync z_inflateSync
+# define inflateSyncPoint z_inflateSyncPoint
+# define inflateUndermine z_inflateUndermine
+# define inflate_copyright z_inflate_copyright
+# define inflate_fast z_inflate_fast
+# define inflate_table z_inflate_table
+# define uncompress z_uncompress
+# define zError z_zError
+# define zcalloc z_zcalloc
+# define zcfree z_zcfree
+# define zlibCompileFlags z_zlibCompileFlags
+# define zlibVersion z_zlibVersion
+
+/* all zlib typedefs in zlib.h and zconf.h */
+# define Byte z_Byte
+# define Bytef z_Bytef
+# define alloc_func z_alloc_func
+# define charf z_charf
+# define free_func z_free_func
+# define gzFile z_gzFile
+# define gz_header z_gz_header
+# define gz_headerp z_gz_headerp
+# define in_func z_in_func
+# define intf z_intf
+# define out_func z_out_func
+# define uInt z_uInt
+# define uIntf z_uIntf
+# define uLong z_uLong
+# define uLongf z_uLongf
+# define voidp z_voidp
+# define voidpc z_voidpc
+# define voidpf z_voidpf
+
+/* all zlib structs in zlib.h and zconf.h */
+# define gz_header_s z_gz_header_s
+# define internal_state z_internal_state
+
+#endif
+
+#if defined(__MSDOS__) && !defined(MSDOS)
+# define MSDOS
+#endif
+#if (defined(OS_2) || defined(__OS2__)) && !defined(OS2)
+# define OS2
+#endif
+#if defined(_WINDOWS) && !defined(WINDOWS)
+# define WINDOWS
+#endif
+#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)
+# ifndef WIN32
+# define WIN32
+# endif
+#endif
+#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32)
+# if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__)
+# ifndef SYS16BIT
+# define SYS16BIT
+# endif
+# endif
+#endif
+
+/*
+ * Compile with -DMAXSEG_64K if the alloc function cannot allocate more
+ * than 64k bytes at a time (needed on systems with 16-bit int).
+ */
+#ifdef SYS16BIT
+# define MAXSEG_64K
+#endif
+#ifdef MSDOS
+# define UNALIGNED_OK
+#endif
+
+#ifdef __STDC_VERSION__
+# ifndef STDC
+# define STDC
+# endif
+# if __STDC_VERSION__ >= 199901L
+# ifndef STDC99
+# define STDC99
+# endif
+# endif
+#endif
+#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus))
+# define STDC
+#endif
+#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__))
+# define STDC
+#endif
+#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32))
+# define STDC
+#endif
+#if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__))
+# define STDC
+#endif
+
+#if defined(__OS400__) && !defined(STDC) /* iSeries (formerly AS/400). */
+# define STDC
+#endif
+
+#ifndef STDC
+# ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */
+# define const /* note: need a more gentle solution here */
+# endif
+#endif
+
+/* Some Mac compilers merge all .h files incorrectly: */
+#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)
+# define NO_DUMMY_DECL
+#endif
+
+/* Maximum value for memLevel in deflateInit2 */
+#ifndef MAX_MEM_LEVEL
+# ifdef MAXSEG_64K
+# define MAX_MEM_LEVEL 8
+# else
+# define MAX_MEM_LEVEL 9
+# endif
+#endif
+
+/* Maximum value for windowBits in deflateInit2 and inflateInit2.
+ * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files
+ * created by gzip. (Files created by minigzip can still be extracted by
+ * gzip.)
+ */
+#ifndef MAX_WBITS
+# define MAX_WBITS 15 /* 32K LZ77 window */
+#endif
+
+/* The memory requirements for deflate are (in bytes):
+ (1 << (windowBits+2)) + (1 << (memLevel+9))
+ that is: 128K for windowBits=15 + 128K for memLevel = 8 (default values)
+ plus a few kilobytes for small objects. For example, if you want to reduce
+ the default memory requirements from 256K to 128K, compile with
+ make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
+ Of course this will generally degrade compression (there's no free lunch).
+
+ The memory requirements for inflate are (in bytes) 1 << windowBits
+ that is, 32K for windowBits=15 (default value) plus a few kilobytes
+ for small objects.
+*/
+
+ /* Type declarations */
+
+#ifndef OF /* function prototypes */
+# ifdef STDC
+# define OF(args) args
+# else
+# define OF(args) ()
+# endif
+#endif
+
+/* The following definitions for FAR are needed only for MSDOS mixed
+ * model programming (small or medium model with some far allocations).
+ * This was tested only with MSC; for other MSDOS compilers you may have
+ * to define NO_MEMCPY in zutil.h. If you don't need the mixed model,
+ * just define FAR to be empty.
+ */
+#ifdef SYS16BIT
+# if defined(M_I86SM) || defined(M_I86MM)
+ /* MSC small or medium model */
+# define SMALL_MEDIUM
+# ifdef _MSC_VER
+# define FAR _far
+# else
+# define FAR far
+# endif
+# endif
+# if (defined(__SMALL__) || defined(__MEDIUM__))
+ /* Turbo C small or medium model */
+# define SMALL_MEDIUM
+# ifdef __BORLANDC__
+# define FAR _far
+# else
+# define FAR far
+# endif
+# endif
+#endif
+
+#if defined(WINDOWS) || defined(WIN32)
+ /* If building or using zlib as a DLL, define ZLIB_DLL.
+ * This is not mandatory, but it offers a little performance increase.
+ */
+# ifdef ZLIB_DLL
+# if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))
+# ifdef ZLIB_INTERNAL
+# define ZEXTERN extern __declspec(dllexport)
+# else
+# define ZEXTERN extern __declspec(dllimport)
+# endif
+# endif
+# endif /* ZLIB_DLL */
+ /* If building or using zlib with the WINAPI/WINAPIV calling convention,
+ * define ZLIB_WINAPI.
+ * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.
+ */
+# ifdef ZLIB_WINAPI
+# ifdef FAR
+# undef FAR
+# endif
+# include
+ /* No need for _export, use ZLIB.DEF instead. */
+ /* For complete Windows compatibility, use WINAPI, not __stdcall. */
+# define ZEXPORT WINAPI
+# ifdef WIN32
+# define ZEXPORTVA WINAPIV
+# else
+# define ZEXPORTVA FAR CDECL
+# endif
+# endif
+#endif
+
+#if defined (__BEOS__)
+# ifdef ZLIB_DLL
+# ifdef ZLIB_INTERNAL
+# define ZEXPORT __declspec(dllexport)
+# define ZEXPORTVA __declspec(dllexport)
+# else
+# define ZEXPORT __declspec(dllimport)
+# define ZEXPORTVA __declspec(dllimport)
+# endif
+# endif
+#endif
+
+#ifndef ZEXTERN
+# define ZEXTERN extern
+#endif
+#ifndef ZEXPORT
+# define ZEXPORT
+#endif
+#ifndef ZEXPORTVA
+# define ZEXPORTVA
+#endif
+
+#ifndef FAR
+# define FAR
+#endif
+
+#if !defined(__MACTYPES__)
+typedef unsigned char Byte; /* 8 bits */
+#endif
+typedef unsigned int uInt; /* 16 bits or more */
+typedef unsigned long uLong; /* 32 bits or more */
+
+#ifdef SMALL_MEDIUM
+ /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
+# define Bytef Byte FAR
+#else
+ typedef Byte FAR Bytef;
+#endif
+typedef char FAR charf;
+typedef int FAR intf;
+typedef uInt FAR uIntf;
+typedef uLong FAR uLongf;
+
+#ifdef STDC
+ typedef void const *voidpc;
+ typedef void FAR *voidpf;
+ typedef void *voidp;
+#else
+ typedef Byte const *voidpc;
+ typedef Byte FAR *voidpf;
+ typedef Byte *voidp;
+#endif
+
+#if defined(HAVE_UNISTD_H) || !defined(WIN32)
+# define Z_HAVE_UNISTD_H
+#endif
+
+#if defined(STDC) && !defined(_WIN32_WCE)
+# include /* for off_t */
+#endif
+
+/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
+ * "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even
+ * though the former does not conform to the LFS document), but considering
+ * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
+ * equivalently requesting no 64-bit operations
+ */
+#if -_LARGEFILE64_SOURCE - -1 == 1
+# undef _LARGEFILE64_SOURCE
+#endif
+
+#if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
+# include /* for SEEK_* and off_t */
+# ifdef VMS
+# include /* for off_t */
+# endif
+# ifndef z_off_t
+# define z_off_t off_t
+# endif
+#endif
+
+#ifndef SEEK_SET
+# define SEEK_SET 0 /* Seek from beginning of file. */
+# define SEEK_CUR 1 /* Seek from current position. */
+# define SEEK_END 2 /* Set file pointer to EOF plus "offset" */
+#endif
+
+#ifndef z_off_t
+# define z_off_t long
+#endif
+
+#if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0
+# define z_off64_t off64_t
+#else
+# define z_off64_t z_off_t
+#endif
+
+#if defined(__OS400__)
+# define NO_vsnprintf
+#endif
+
+#if defined(__MVS__)
+# define NO_vsnprintf
+#endif
+
+/* MVS linker does not support external names larger than 8 bytes */
+#if defined(__MVS__)
+ #pragma map(deflateInit_,"DEIN")
+ #pragma map(deflateInit2_,"DEIN2")
+ #pragma map(deflateEnd,"DEEND")
+ #pragma map(deflateBound,"DEBND")
+ #pragma map(inflateInit_,"ININ")
+ #pragma map(inflateInit2_,"ININ2")
+ #pragma map(inflateEnd,"INEND")
+ #pragma map(inflateSync,"INSY")
+ #pragma map(inflateSetDictionary,"INSEDI")
+ #pragma map(compressBound,"CMBND")
+ #pragma map(inflate_table,"INTABL")
+ #pragma map(inflate_fast,"INFA")
+ #pragma map(inflate_copyright,"INCOPY")
+#endif
+
+#endif /* ZCONF_H */
Index: /Vago/trunk/Vago/libs/zlib/zlib.h
===================================================================
--- /Vago/trunk/Vago/libs/zlib/zlib.h (revision 771)
+++ /Vago/trunk/Vago/libs/zlib/zlib.h (revision 771)
@@ -0,0 +1,1622 @@
+/* zlib.h -- interface of the 'zlib' general purpose compression library
+ version 1.2.5, April 19th, 2010
+
+ Copyright (C) 1995-2010 Jean-loup Gailly and Mark Adler
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+
+ Jean-loup Gailly Mark Adler
+ jloup@gzip.org madler@alumni.caltech.edu
+
+
+ The data format used by the zlib library is described by RFCs (Request for
+ Comments) 1950 to 1952 in the files http://www.ietf.org/rfc/rfc1950.txt
+ (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format).
+*/
+
+#ifndef ZLIB_H
+#define ZLIB_H
+
+#include "zconf.h"
+
+#include "qconfig.h"
+#if defined(QT_VISIBILITY_AVAILABLE)
+# undef ZEXTERN
+# define ZEXTERN __attribute__((visibility("default")))
+#elif defined(QT_MAKEDLL)
+# undef ZEXTERN
+# define ZEXTERN __declspec(dllexport)
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define ZLIB_VERSION "1.2.5"
+#define ZLIB_VERNUM 0x1250
+#define ZLIB_VER_MAJOR 1
+#define ZLIB_VER_MINOR 2
+#define ZLIB_VER_REVISION 5
+#define ZLIB_VER_SUBREVISION 0
+
+/*
+ The 'zlib' compression library provides in-memory compression and
+ decompression functions, including integrity checks of the uncompressed data.
+ This version of the library supports only one compression method (deflation)
+ but other algorithms will be added later and will have the same stream
+ interface.
+
+ Compression can be done in a single step if the buffers are large enough,
+ or can be done by repeated calls of the compression function. In the latter
+ case, the application must provide more input and/or consume the output
+ (providing more output space) before each call.
+
+ The compressed data format used by default by the in-memory functions is
+ the zlib format, which is a zlib wrapper documented in RFC 1950, wrapped
+ around a deflate stream, which is itself documented in RFC 1951.
+
+ The library also supports reading and writing files in gzip (.gz) format
+ with an interface similar to that of stdio using the functions that start
+ with "gz". The gzip format is different from the zlib format. gzip is a
+ gzip wrapper, documented in RFC 1952, wrapped around a deflate stream.
+
+ This library can optionally read and write gzip streams in memory as well.
+
+ The zlib format was designed to be compact and fast for use in memory
+ and on communications channels. The gzip format was designed for single-
+ file compression on file systems, has a larger header than zlib to maintain
+ directory information, and uses a different, slower check method than zlib.
+
+ The library does not install any signal handler. The decoder checks
+ the consistency of the compressed data, so the library should never crash
+ even in case of corrupted input.
+*/
+
+typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size));
+typedef void (*free_func) OF((voidpf opaque, voidpf address));
+
+struct internal_state;
+
+typedef struct z_stream_s {
+ Bytef *next_in; /* next input byte */
+ uInt avail_in; /* number of bytes available at next_in */
+ uLong total_in; /* total nb of input bytes read so far */
+
+ Bytef *next_out; /* next output byte should be put there */
+ uInt avail_out; /* remaining free space at next_out */
+ uLong total_out; /* total nb of bytes output so far */
+
+ char *msg; /* last error message, NULL if no error */
+ struct internal_state FAR *state; /* not visible by applications */
+
+ alloc_func zalloc; /* used to allocate the internal state */
+ free_func zfree; /* used to free the internal state */
+ voidpf opaque; /* private data object passed to zalloc and zfree */
+
+ int data_type; /* best guess about the data type: binary or text */
+ uLong adler; /* adler32 value of the uncompressed data */
+ uLong reserved; /* reserved for future use */
+} z_stream;
+
+typedef z_stream FAR *z_streamp;
+
+/*
+ gzip header information passed to and from zlib routines. See RFC 1952
+ for more details on the meanings of these fields.
+*/
+typedef struct gz_header_s {
+ int text; /* true if compressed data believed to be text */
+ uLong time; /* modification time */
+ int xflags; /* extra flags (not used when writing a gzip file) */
+ int os; /* operating system */
+ Bytef *extra; /* pointer to extra field or Z_NULL if none */
+ uInt extra_len; /* extra field length (valid if extra != Z_NULL) */
+ uInt extra_max; /* space at extra (only when reading header) */
+ Bytef *name; /* pointer to zero-terminated file name or Z_NULL */
+ uInt name_max; /* space at name (only when reading header) */
+ Bytef *comment; /* pointer to zero-terminated comment or Z_NULL */
+ uInt comm_max; /* space at comment (only when reading header) */
+ int hcrc; /* true if there was or will be a header crc */
+ int done; /* true when done reading gzip header (not used
+ when writing a gzip file) */
+} gz_header;
+
+typedef gz_header FAR *gz_headerp;
+
+/*
+ The application must update next_in and avail_in when avail_in has dropped
+ to zero. It must update next_out and avail_out when avail_out has dropped
+ to zero. The application must initialize zalloc, zfree and opaque before
+ calling the init function. All other fields are set by the compression
+ library and must not be updated by the application.
+
+ The opaque value provided by the application will be passed as the first
+ parameter for calls of zalloc and zfree. This can be useful for custom
+ memory management. The compression library attaches no meaning to the
+ opaque value.
+
+ zalloc must return Z_NULL if there is not enough memory for the object.
+ If zlib is used in a multi-threaded application, zalloc and zfree must be
+ thread safe.
+
+ On 16-bit systems, the functions zalloc and zfree must be able to allocate
+ exactly 65536 bytes, but will not be required to allocate more than this if
+ the symbol MAXSEG_64K is defined (see zconf.h). WARNING: On MSDOS, pointers
+ returned by zalloc for objects of exactly 65536 bytes *must* have their
+ offset normalized to zero. The default allocation function provided by this
+ library ensures this (see zutil.c). To reduce memory requirements and avoid
+ any allocation of 64K objects, at the expense of compression ratio, compile
+ the library with -DMAX_WBITS=14 (see zconf.h).
+
+ The fields total_in and total_out can be used for statistics or progress
+ reports. After compression, total_in holds the total size of the
+ uncompressed data and may be saved for use in the decompressor (particularly
+ if the decompressor wants to decompress everything in a single step).
+*/
+
+ /* constants */
+
+#define Z_NO_FLUSH 0
+#define Z_PARTIAL_FLUSH 1
+#define Z_SYNC_FLUSH 2
+#define Z_FULL_FLUSH 3
+#define Z_FINISH 4
+#define Z_BLOCK 5
+#define Z_TREES 6
+/* Allowed flush values; see deflate() and inflate() below for details */
+
+#define Z_OK 0
+#define Z_STREAM_END 1
+#define Z_NEED_DICT 2
+#define Z_ERRNO (-1)
+#define Z_STREAM_ERROR (-2)
+#define Z_DATA_ERROR (-3)
+#define Z_MEM_ERROR (-4)
+#define Z_BUF_ERROR (-5)
+#define Z_VERSION_ERROR (-6)
+/* Return codes for the compression/decompression functions. Negative values
+ * are errors, positive values are used for special but normal events.
+ */
+
+#define Z_NO_COMPRESSION 0
+#define Z_BEST_SPEED 1
+#define Z_BEST_COMPRESSION 9
+#define Z_DEFAULT_COMPRESSION (-1)
+/* compression levels */
+
+#define Z_FILTERED 1
+#define Z_HUFFMAN_ONLY 2
+#define Z_RLE 3
+#define Z_FIXED 4
+#define Z_DEFAULT_STRATEGY 0
+/* compression strategy; see deflateInit2() below for details */
+
+#define Z_BINARY 0
+#define Z_TEXT 1
+#define Z_ASCII Z_TEXT /* for compatibility with 1.2.2 and earlier */
+#define Z_UNKNOWN 2
+/* Possible values of the data_type field (though see inflate()) */
+
+#define Z_DEFLATED 8
+/* The deflate compression method (the only one supported in this version) */
+
+#define Z_NULL 0 /* for initializing zalloc, zfree, opaque */
+
+#define zlib_version zlibVersion()
+/* for compatibility with versions < 1.0.2 */
+
+
+ /* basic functions */
+
+ZEXTERN const char * ZEXPORT zlibVersion OF((void));
+/* The application can compare zlibVersion and ZLIB_VERSION for consistency.
+ If the first character differs, the library code actually used is not
+ compatible with the zlib.h header file used by the application. This check
+ is automatically made by deflateInit and inflateInit.
+ */
+
+/*
+ZEXTERN int ZEXPORT deflateInit OF((z_streamp strm, int level));
+
+ Initializes the internal stream state for compression. The fields
+ zalloc, zfree and opaque must be initialized before by the caller. If
+ zalloc and zfree are set to Z_NULL, deflateInit updates them to use default
+ allocation functions.
+
+ The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9:
+ 1 gives best speed, 9 gives best compression, 0 gives no compression at all
+ (the input data is simply copied a block at a time). Z_DEFAULT_COMPRESSION
+ requests a default compromise between speed and compression (currently
+ equivalent to level 6).
+
+ deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
+ memory, Z_STREAM_ERROR if level is not a valid compression level, or
+ Z_VERSION_ERROR if the zlib library version (zlib_version) is incompatible
+ with the version assumed by the caller (ZLIB_VERSION). msg is set to null
+ if there is no error message. deflateInit does not perform any compression:
+ this will be done by deflate().
+*/
+
+
+ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
+/*
+ deflate compresses as much data as possible, and stops when the input
+ buffer becomes empty or the output buffer becomes full. It may introduce
+ some output latency (reading input without producing any output) except when
+ forced to flush.
+
+ The detailed semantics are as follows. deflate performs one or both of the
+ following actions:
+
+ - Compress more input starting at next_in and update next_in and avail_in
+ accordingly. If not all input can be processed (because there is not
+ enough room in the output buffer), next_in and avail_in are updated and
+ processing will resume at this point for the next call of deflate().
+
+ - Provide more output starting at next_out and update next_out and avail_out
+ accordingly. This action is forced if the parameter flush is non zero.
+ Forcing flush frequently degrades the compression ratio, so this parameter
+ should be set only when necessary (in interactive applications). Some
+ output may be provided even if flush is not set.
+
+ Before the call of deflate(), the application should ensure that at least
+ one of the actions is possible, by providing more input and/or consuming more
+ output, and updating avail_in or avail_out accordingly; avail_out should
+ never be zero before the call. The application can consume the compressed
+ output when it wants, for example when the output buffer is full (avail_out
+ == 0), or after each call of deflate(). If deflate returns Z_OK and with
+ zero avail_out, it must be called again after making room in the output
+ buffer because there might be more output pending.
+
+ Normally the parameter flush is set to Z_NO_FLUSH, which allows deflate to
+ decide how much data to accumulate before producing output, in order to
+ maximize compression.
+
+ If the parameter flush is set to Z_SYNC_FLUSH, all pending output is
+ flushed to the output buffer and the output is aligned on a byte boundary, so
+ that the decompressor can get all input data available so far. (In
+ particular avail_in is zero after the call if enough output space has been
+ provided before the call.) Flushing may degrade compression for some
+ compression algorithms and so it should be used only when necessary. This
+ completes the current deflate block and follows it with an empty stored block
+ that is three bits plus filler bits to the next byte, followed by four bytes
+ (00 00 ff ff).
+
+ If flush is set to Z_PARTIAL_FLUSH, all pending output is flushed to the
+ output buffer, but the output is not aligned to a byte boundary. All of the
+ input data so far will be available to the decompressor, as for Z_SYNC_FLUSH.
+ This completes the current deflate block and follows it with an empty fixed
+ codes block that is 10 bits long. This assures that enough bytes are output
+ in order for the decompressor to finish the block before the empty fixed code
+ block.
+
+ If flush is set to Z_BLOCK, a deflate block is completed and emitted, as
+ for Z_SYNC_FLUSH, but the output is not aligned on a byte boundary, and up to
+ seven bits of the current block are held to be written as the next byte after
+ the next deflate block is completed. In this case, the decompressor may not
+ be provided enough bits at this point in order to complete decompression of
+ the data provided so far to the compressor. It may need to wait for the next
+ block to be emitted. This is for advanced applications that need to control
+ the emission of deflate blocks.
+
+ If flush is set to Z_FULL_FLUSH, all output is flushed as with
+ Z_SYNC_FLUSH, and the compression state is reset so that decompression can
+ restart from this point if previous compressed data has been damaged or if
+ random access is desired. Using Z_FULL_FLUSH too often can seriously degrade
+ compression.
+
+ If deflate returns with avail_out == 0, this function must be called again
+ with the same value of the flush parameter and more output space (updated
+ avail_out), until the flush is complete (deflate returns with non-zero
+ avail_out). In the case of a Z_FULL_FLUSH or Z_SYNC_FLUSH, make sure that
+ avail_out is greater than six to avoid repeated flush markers due to
+ avail_out == 0 on return.
+
+ If the parameter flush is set to Z_FINISH, pending input is processed,
+ pending output is flushed and deflate returns with Z_STREAM_END if there was
+ enough output space; if deflate returns with Z_OK, this function must be
+ called again with Z_FINISH and more output space (updated avail_out) but no
+ more input data, until it returns with Z_STREAM_END or an error. After
+ deflate has returned Z_STREAM_END, the only possible operations on the stream
+ are deflateReset or deflateEnd.
+
+ Z_FINISH can be used immediately after deflateInit if all the compression
+ is to be done in a single step. In this case, avail_out must be at least the
+ value returned by deflateBound (see below). If deflate does not return
+ Z_STREAM_END, then it must be called again as described above.
+
+ deflate() sets strm->adler to the adler32 checksum of all input read
+ so far (that is, total_in bytes).
+
+ deflate() may update strm->data_type if it can make a good guess about
+ the input data type (Z_BINARY or Z_TEXT). In doubt, the data is considered
+ binary. This field is only for information purposes and does not affect the
+ compression algorithm in any manner.
+
+ deflate() returns Z_OK if some progress has been made (more input
+ processed or more output produced), Z_STREAM_END if all input has been
+ consumed and all output has been produced (only when flush is set to
+ Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example
+ if next_in or next_out was Z_NULL), Z_BUF_ERROR if no progress is possible
+ (for example avail_in or avail_out was zero). Note that Z_BUF_ERROR is not
+ fatal, and deflate() can be called again with more input and more output
+ space to continue compressing.
+*/
+
+
+ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm));
+/*
+ All dynamically allocated data structures for this stream are freed.
+ This function discards any unprocessed input and does not flush any pending
+ output.
+
+ deflateEnd returns Z_OK if success, Z_STREAM_ERROR if the
+ stream state was inconsistent, Z_DATA_ERROR if the stream was freed
+ prematurely (some input or output was discarded). In the error case, msg
+ may be set but then points to a static string (which must not be
+ deallocated).
+*/
+
+
+/*
+ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm));
+
+ Initializes the internal stream state for decompression. The fields
+ next_in, avail_in, zalloc, zfree and opaque must be initialized before by
+ the caller. If next_in is not Z_NULL and avail_in is large enough (the
+ exact value depends on the compression method), inflateInit determines the
+ compression method from the zlib header and allocates all data structures
+ accordingly; otherwise the allocation will be deferred to the first call of
+ inflate. If zalloc and zfree are set to Z_NULL, inflateInit updates them to
+ use default allocation functions.
+
+ inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
+ memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
+ version assumed by the caller, or Z_STREAM_ERROR if the parameters are
+ invalid, such as a null pointer to the structure. msg is set to null if
+ there is no error message. inflateInit does not perform any decompression
+ apart from possibly reading the zlib header if present: actual decompression
+ will be done by inflate(). (So next_in and avail_in may be modified, but
+ next_out and avail_out are unused and unchanged.) The current implementation
+ of inflateInit() does not process any header information -- that is deferred
+ until inflate() is called.
+*/
+
+
+ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
+/*
+ inflate decompresses as much data as possible, and stops when the input
+ buffer becomes empty or the output buffer becomes full. It may introduce
+ some output latency (reading input without producing any output) except when
+ forced to flush.
+
+ The detailed semantics are as follows. inflate performs one or both of the
+ following actions:
+
+ - Decompress more input starting at next_in and update next_in and avail_in
+ accordingly. If not all input can be processed (because there is not
+ enough room in the output buffer), next_in is updated and processing will
+ resume at this point for the next call of inflate().
+
+ - Provide more output starting at next_out and update next_out and avail_out
+ accordingly. inflate() provides as much output as possible, until there is
+ no more input data or no more space in the output buffer (see below about
+ the flush parameter).
+
+ Before the call of inflate(), the application should ensure that at least
+ one of the actions is possible, by providing more input and/or consuming more
+ output, and updating the next_* and avail_* values accordingly. The
+ application can consume the uncompressed output when it wants, for example
+ when the output buffer is full (avail_out == 0), or after each call of
+ inflate(). If inflate returns Z_OK and with zero avail_out, it must be
+ called again after making room in the output buffer because there might be
+ more output pending.
+
+ The flush parameter of inflate() can be Z_NO_FLUSH, Z_SYNC_FLUSH, Z_FINISH,
+ Z_BLOCK, or Z_TREES. Z_SYNC_FLUSH requests that inflate() flush as much
+ output as possible to the output buffer. Z_BLOCK requests that inflate()
+ stop if and when it gets to the next deflate block boundary. When decoding
+ the zlib or gzip format, this will cause inflate() to return immediately
+ after the header and before the first block. When doing a raw inflate,
+ inflate() will go ahead and process the first block, and will return when it
+ gets to the end of that block, or when it runs out of data.
+
+ The Z_BLOCK option assists in appending to or combining deflate streams.
+ Also to assist in this, on return inflate() will set strm->data_type to the
+ number of unused bits in the last byte taken from strm->next_in, plus 64 if
+ inflate() is currently decoding the last block in the deflate stream, plus
+ 128 if inflate() returned immediately after decoding an end-of-block code or
+ decoding the complete header up to just before the first byte of the deflate
+ stream. The end-of-block will not be indicated until all of the uncompressed
+ data from that block has been written to strm->next_out. The number of
+ unused bits may in general be greater than seven, except when bit 7 of
+ data_type is set, in which case the number of unused bits will be less than
+ eight. data_type is set as noted here every time inflate() returns for all
+ flush options, and so can be used to determine the amount of currently
+ consumed input in bits.
+
+ The Z_TREES option behaves as Z_BLOCK does, but it also returns when the
+ end of each deflate block header is reached, before any actual data in that
+ block is decoded. This allows the caller to determine the length of the
+ deflate block header for later use in random access within a deflate block.
+ 256 is added to the value of strm->data_type when inflate() returns
+ immediately after reaching the end of the deflate block header.
+
+ inflate() should normally be called until it returns Z_STREAM_END or an
+ error. However if all decompression is to be performed in a single step (a
+ single call of inflate), the parameter flush should be set to Z_FINISH. In
+ this case all pending input is processed and all pending output is flushed;
+ avail_out must be large enough to hold all the uncompressed data. (The size
+ of the uncompressed data may have been saved by the compressor for this
+ purpose.) The next operation on this stream must be inflateEnd to deallocate
+ the decompression state. The use of Z_FINISH is never required, but can be
+ used to inform inflate that a faster approach may be used for the single
+ inflate() call.
+
+ In this implementation, inflate() always flushes as much output as
+ possible to the output buffer, and always uses the faster approach on the
+ first call. So the only effect of the flush parameter in this implementation
+ is on the return value of inflate(), as noted below, or when it returns early
+ because Z_BLOCK or Z_TREES is used.
+
+ If a preset dictionary is needed after this call (see inflateSetDictionary
+ below), inflate sets strm->adler to the adler32 checksum of the dictionary
+ chosen by the compressor and returns Z_NEED_DICT; otherwise it sets
+ strm->adler to the adler32 checksum of all output produced so far (that is,
+ total_out bytes) and returns Z_OK, Z_STREAM_END or an error code as described
+ below. At the end of the stream, inflate() checks that its computed adler32
+ checksum is equal to that saved by the compressor and returns Z_STREAM_END
+ only if the checksum is correct.
+
+ inflate() can decompress and check either zlib-wrapped or gzip-wrapped
+ deflate data. The header type is detected automatically, if requested when
+ initializing with inflateInit2(). Any information contained in the gzip
+ header is not retained, so applications that need that information should
+ instead use raw inflate, see inflateInit2() below, or inflateBack() and
+ perform their own processing of the gzip header and trailer.
+
+ inflate() returns Z_OK if some progress has been made (more input processed
+ or more output produced), Z_STREAM_END if the end of the compressed data has
+ been reached and all uncompressed output has been produced, Z_NEED_DICT if a
+ preset dictionary is needed at this point, Z_DATA_ERROR if the input data was
+ corrupted (input stream not conforming to the zlib format or incorrect check
+ value), Z_STREAM_ERROR if the stream structure was inconsistent (for example
+ next_in or next_out was Z_NULL), Z_MEM_ERROR if there was not enough memory,
+ Z_BUF_ERROR if no progress is possible or if there was not enough room in the
+ output buffer when Z_FINISH is used. Note that Z_BUF_ERROR is not fatal, and
+ inflate() can be called again with more input and more output space to
+ continue decompressing. If Z_DATA_ERROR is returned, the application may
+ then call inflateSync() to look for a good compression block if a partial
+ recovery of the data is desired.
+*/
+
+
+ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm));
+/*
+ All dynamically allocated data structures for this stream are freed.
+ This function discards any unprocessed input and does not flush any pending
+ output.
+
+ inflateEnd returns Z_OK if success, Z_STREAM_ERROR if the stream state
+ was inconsistent. In the error case, msg may be set but then points to a
+ static string (which must not be deallocated).
+*/
+
+
+ /* Advanced functions */
+
+/*
+ The following functions are needed only in some special applications.
+*/
+
+/*
+ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm,
+ int level,
+ int method,
+ int windowBits,
+ int memLevel,
+ int strategy));
+
+ This is another version of deflateInit with more compression options. The
+ fields next_in, zalloc, zfree and opaque must be initialized before by the
+ caller.
+
+ The method parameter is the compression method. It must be Z_DEFLATED in
+ this version of the library.
+
+ The windowBits parameter is the base two logarithm of the window size
+ (the size of the history buffer). It should be in the range 8..15 for this
+ version of the library. Larger values of this parameter result in better
+ compression at the expense of memory usage. The default value is 15 if
+ deflateInit is used instead.
+
+ windowBits can also be -8..-15 for raw deflate. In this case, -windowBits
+ determines the window size. deflate() will then generate raw deflate data
+ with no zlib header or trailer, and will not compute an adler32 check value.
+
+ windowBits can also be greater than 15 for optional gzip encoding. Add
+ 16 to windowBits to write a simple gzip header and trailer around the
+ compressed data instead of a zlib wrapper. The gzip header will have no
+ file name, no extra data, no comment, no modification time (set to zero), no
+ header crc, and the operating system will be set to 255 (unknown). If a
+ gzip stream is being written, strm->adler is a crc32 instead of an adler32.
+
+ The memLevel parameter specifies how much memory should be allocated
+ for the internal compression state. memLevel=1 uses minimum memory but is
+ slow and reduces compression ratio; memLevel=9 uses maximum memory for
+ optimal speed. The default value is 8. See zconf.h for total memory usage
+ as a function of windowBits and memLevel.
+
+ The strategy parameter is used to tune the compression algorithm. Use the
+ value Z_DEFAULT_STRATEGY for normal data, Z_FILTERED for data produced by a
+ filter (or predictor), Z_HUFFMAN_ONLY to force Huffman encoding only (no
+ string match), or Z_RLE to limit match distances to one (run-length
+ encoding). Filtered data consists mostly of small values with a somewhat
+ random distribution. In this case, the compression algorithm is tuned to
+ compress them better. The effect of Z_FILTERED is to force more Huffman
+ coding and less string matching; it is somewhat intermediate between
+ Z_DEFAULT_STRATEGY and Z_HUFFMAN_ONLY. Z_RLE is designed to be almost as
+ fast as Z_HUFFMAN_ONLY, but give better compression for PNG image data. The
+ strategy parameter only affects the compression ratio but not the
+ correctness of the compressed output even if it is not set appropriately.
+ Z_FIXED prevents the use of dynamic Huffman codes, allowing for a simpler
+ decoder for special applications.
+
+ deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
+ memory, Z_STREAM_ERROR if any parameter is invalid (such as an invalid
+ method), or Z_VERSION_ERROR if the zlib library version (zlib_version) is
+ incompatible with the version assumed by the caller (ZLIB_VERSION). msg is
+ set to null if there is no error message. deflateInit2 does not perform any
+ compression: this will be done by deflate().
+*/
+
+ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm,
+ const Bytef *dictionary,
+ uInt dictLength));
+/*
+ Initializes the compression dictionary from the given byte sequence
+ without producing any compressed output. This function must be called
+ immediately after deflateInit, deflateInit2 or deflateReset, before any call
+ of deflate. The compressor and decompressor must use exactly the same
+ dictionary (see inflateSetDictionary).
+
+ The dictionary should consist of strings (byte sequences) that are likely
+ to be encountered later in the data to be compressed, with the most commonly
+ used strings preferably put towards the end of the dictionary. Using a
+ dictionary is most useful when the data to be compressed is short and can be
+ predicted with good accuracy; the data can then be compressed better than
+ with the default empty dictionary.
+
+ Depending on the size of the compression data structures selected by
+ deflateInit or deflateInit2, a part of the dictionary may in effect be
+ discarded, for example if the dictionary is larger than the window size
+ provided in deflateInit or deflateInit2. Thus the strings most likely to be
+ useful should be put at the end of the dictionary, not at the front. In
+ addition, the current implementation of deflate will use at most the window
+ size minus 262 bytes of the provided dictionary.
+
+ Upon return of this function, strm->adler is set to the adler32 value
+ of the dictionary; the decompressor may later use this value to determine
+ which dictionary has been used by the compressor. (The adler32 value
+ applies to the whole dictionary even if only a subset of the dictionary is
+ actually used by the compressor.) If a raw deflate was requested, then the
+ adler32 value is not computed and strm->adler is not set.
+
+ deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a
+ parameter is invalid (e.g. dictionary being Z_NULL) or the stream state is
+ inconsistent (for example if deflate has already been called for this stream
+ or if the compression method is bsort). deflateSetDictionary does not
+ perform any compression: this will be done by deflate().
+*/
+
+ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest,
+ z_streamp source));
+/*
+ Sets the destination stream as a complete copy of the source stream.
+
+ This function can be useful when several compression strategies will be
+ tried, for example when there are several ways of pre-processing the input
+ data with a filter. The streams that will be discarded should then be freed
+ by calling deflateEnd. Note that deflateCopy duplicates the internal
+ compression state which can be quite large, so this strategy is slow and can
+ consume lots of memory.
+
+ deflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
+ enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
+ (such as zalloc being Z_NULL). msg is left unchanged in both source and
+ destination.
+*/
+
+ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm));
+/*
+ This function is equivalent to deflateEnd followed by deflateInit,
+ but does not free and reallocate all the internal compression state. The
+ stream will keep the same compression level and any other attributes that
+ may have been set by deflateInit2.
+
+ deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
+ stream state was inconsistent (such as zalloc or state being Z_NULL).
+*/
+
+ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm,
+ int level,
+ int strategy));
+/*
+ Dynamically update the compression level and compression strategy. The
+ interpretation of level and strategy is as in deflateInit2. This can be
+ used to switch between compression and straight copy of the input data, or
+ to switch to a different kind of input data requiring a different strategy.
+ If the compression level is changed, the input available so far is
+ compressed with the old level (and may be flushed); the new level will take
+ effect only at the next call of deflate().
+
+ Before the call of deflateParams, the stream state must be set as for
+ a call of deflate(), since the currently available input may have to be
+ compressed and flushed. In particular, strm->avail_out must be non-zero.
+
+ deflateParams returns Z_OK if success, Z_STREAM_ERROR if the source
+ stream state was inconsistent or if a parameter was invalid, Z_BUF_ERROR if
+ strm->avail_out was zero.
+*/
+
+ZEXTERN int ZEXPORT deflateTune OF((z_streamp strm,
+ int good_length,
+ int max_lazy,
+ int nice_length,
+ int max_chain));
+/*
+ Fine tune deflate's internal compression parameters. This should only be
+ used by someone who understands the algorithm used by zlib's deflate for
+ searching for the best matching string, and even then only by the most
+ fanatic optimizer trying to squeeze out the last compressed bit for their
+ specific input data. Read the deflate.c source code for the meaning of the
+ max_lazy, good_length, nice_length, and max_chain parameters.
+
+ deflateTune() can be called after deflateInit() or deflateInit2(), and
+ returns Z_OK on success, or Z_STREAM_ERROR for an invalid deflate stream.
+ */
+
+ZEXTERN uLong ZEXPORT deflateBound OF((z_streamp strm,
+ uLong sourceLen));
+/*
+ deflateBound() returns an upper bound on the compressed size after
+ deflation of sourceLen bytes. It must be called after deflateInit() or
+ deflateInit2(), and after deflateSetHeader(), if used. This would be used
+ to allocate an output buffer for deflation in a single pass, and so would be
+ called before deflate().
+*/
+
+ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm,
+ int bits,
+ int value));
+/*
+ deflatePrime() inserts bits in the deflate output stream. The intent
+ is that this function is used to start off the deflate output with the bits
+ leftover from a previous deflate stream when appending to it. As such, this
+ function can only be used for raw deflate, and must be used before the first
+ deflate() call after a deflateInit2() or deflateReset(). bits must be less
+ than or equal to 16, and that many of the least significant bits of value
+ will be inserted in the output.
+
+ deflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source
+ stream state was inconsistent.
+*/
+
+ZEXTERN int ZEXPORT deflateSetHeader OF((z_streamp strm,
+ gz_headerp head));
+/*
+ deflateSetHeader() provides gzip header information for when a gzip
+ stream is requested by deflateInit2(). deflateSetHeader() may be called
+ after deflateInit2() or deflateReset() and before the first call of
+ deflate(). The text, time, os, extra field, name, and comment information
+ in the provided gz_header structure are written to the gzip header (xflag is
+ ignored -- the extra flags are set according to the compression level). The
+ caller must assure that, if not Z_NULL, name and comment are terminated with
+ a zero byte, and that if extra is not Z_NULL, that extra_len bytes are
+ available there. If hcrc is true, a gzip header crc is included. Note that
+ the current versions of the command-line version of gzip (up through version
+ 1.3.x) do not support header crc's, and will report that it is a "multi-part
+ gzip file" and give up.
+
+ If deflateSetHeader is not used, the default gzip header has text false,
+ the time set to zero, and os set to 255, with no extra, name, or comment
+ fields. The gzip header is returned to the default state by deflateReset().
+
+ deflateSetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
+ stream state was inconsistent.
+*/
+
+/*
+ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm,
+ int windowBits));
+
+ This is another version of inflateInit with an extra parameter. The
+ fields next_in, avail_in, zalloc, zfree and opaque must be initialized
+ before by the caller.
+
+ The windowBits parameter is the base two logarithm of the maximum window
+ size (the size of the history buffer). It should be in the range 8..15 for
+ this version of the library. The default value is 15 if inflateInit is used
+ instead. windowBits must be greater than or equal to the windowBits value
+ provided to deflateInit2() while compressing, or it must be equal to 15 if
+ deflateInit2() was not used. If a compressed stream with a larger window
+ size is given as input, inflate() will return with the error code
+ Z_DATA_ERROR instead of trying to allocate a larger window.
+
+ windowBits can also be zero to request that inflate use the window size in
+ the zlib header of the compressed stream.
+
+ windowBits can also be -8..-15 for raw inflate. In this case, -windowBits
+ determines the window size. inflate() will then process raw deflate data,
+ not looking for a zlib or gzip header, not generating a check value, and not
+ looking for any check values for comparison at the end of the stream. This
+ is for use with other formats that use the deflate compressed data format
+ such as zip. Those formats provide their own check values. If a custom
+ format is developed using the raw deflate format for compressed data, it is
+ recommended that a check value such as an adler32 or a crc32 be applied to
+ the uncompressed data as is done in the zlib, gzip, and zip formats. For
+ most applications, the zlib format should be used as is. Note that comments
+ above on the use in deflateInit2() applies to the magnitude of windowBits.
+
+ windowBits can also be greater than 15 for optional gzip decoding. Add
+ 32 to windowBits to enable zlib and gzip decoding with automatic header
+ detection, or add 16 to decode only the gzip format (the zlib format will
+ return a Z_DATA_ERROR). If a gzip stream is being decoded, strm->adler is a
+ crc32 instead of an adler32.
+
+ inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
+ memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
+ version assumed by the caller, or Z_STREAM_ERROR if the parameters are
+ invalid, such as a null pointer to the structure. msg is set to null if
+ there is no error message. inflateInit2 does not perform any decompression
+ apart from possibly reading the zlib header if present: actual decompression
+ will be done by inflate(). (So next_in and avail_in may be modified, but
+ next_out and avail_out are unused and unchanged.) The current implementation
+ of inflateInit2() does not process any header information -- that is
+ deferred until inflate() is called.
+*/
+
+ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,
+ const Bytef *dictionary,
+ uInt dictLength));
+/*
+ Initializes the decompression dictionary from the given uncompressed byte
+ sequence. This function must be called immediately after a call of inflate,
+ if that call returned Z_NEED_DICT. The dictionary chosen by the compressor
+ can be determined from the adler32 value returned by that call of inflate.
+ The compressor and decompressor must use exactly the same dictionary (see
+ deflateSetDictionary). For raw inflate, this function can be called
+ immediately after inflateInit2() or inflateReset() and before any call of
+ inflate() to set the dictionary. The application must insure that the
+ dictionary that was used for compression is provided.
+
+ inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a
+ parameter is invalid (e.g. dictionary being Z_NULL) or the stream state is
+ inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the
+ expected one (incorrect adler32 value). inflateSetDictionary does not
+ perform any decompression: this will be done by subsequent calls of
+ inflate().
+*/
+
+ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm));
+/*
+ Skips invalid compressed data until a full flush point (see above the
+ description of deflate with Z_FULL_FLUSH) can be found, or until all
+ available input is skipped. No output is provided.
+
+ inflateSync returns Z_OK if a full flush point has been found, Z_BUF_ERROR
+ if no more input was provided, Z_DATA_ERROR if no flush point has been
+ found, or Z_STREAM_ERROR if the stream structure was inconsistent. In the
+ success case, the application may save the current current value of total_in
+ which indicates where valid compressed data was found. In the error case,
+ the application may repeatedly call inflateSync, providing more input each
+ time, until success or end of the input data.
+*/
+
+ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest,
+ z_streamp source));
+/*
+ Sets the destination stream as a complete copy of the source stream.
+
+ This function can be useful when randomly accessing a large stream. The
+ first pass through the stream can periodically record the inflate state,
+ allowing restarting inflate at those points when randomly accessing the
+ stream.
+
+ inflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
+ enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
+ (such as zalloc being Z_NULL). msg is left unchanged in both source and
+ destination.
+*/
+
+ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm));
+/*
+ This function is equivalent to inflateEnd followed by inflateInit,
+ but does not free and reallocate all the internal decompression state. The
+ stream will keep attributes that may have been set by inflateInit2.
+
+ inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
+ stream state was inconsistent (such as zalloc or state being Z_NULL).
+*/
+
+ZEXTERN int ZEXPORT inflateReset2 OF((z_streamp strm,
+ int windowBits));
+/*
+ This function is the same as inflateReset, but it also permits changing
+ the wrap and window size requests. The windowBits parameter is interpreted
+ the same as it is for inflateInit2.
+
+ inflateReset2 returns Z_OK if success, or Z_STREAM_ERROR if the source
+ stream state was inconsistent (such as zalloc or state being Z_NULL), or if
+ the windowBits parameter is invalid.
+*/
+
+ZEXTERN int ZEXPORT inflatePrime OF((z_streamp strm,
+ int bits,
+ int value));
+/*
+ This function inserts bits in the inflate input stream. The intent is
+ that this function is used to start inflating at a bit position in the
+ middle of a byte. The provided bits will be used before any bytes are used
+ from next_in. This function should only be used with raw inflate, and
+ should be used before the first inflate() call after inflateInit2() or
+ inflateReset(). bits must be less than or equal to 16, and that many of the
+ least significant bits of value will be inserted in the input.
+
+ If bits is negative, then the input stream bit buffer is emptied. Then
+ inflatePrime() can be called again to put bits in the buffer. This is used
+ to clear out bits leftover after feeding inflate a block description prior
+ to feeding inflate codes.
+
+ inflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source
+ stream state was inconsistent.
+*/
+
+ZEXTERN long ZEXPORT inflateMark OF((z_streamp strm));
+/*
+ This function returns two values, one in the lower 16 bits of the return
+ value, and the other in the remaining upper bits, obtained by shifting the
+ return value down 16 bits. If the upper value is -1 and the lower value is
+ zero, then inflate() is currently decoding information outside of a block.
+ If the upper value is -1 and the lower value is non-zero, then inflate is in
+ the middle of a stored block, with the lower value equaling the number of
+ bytes from the input remaining to copy. If the upper value is not -1, then
+ it is the number of bits back from the current bit position in the input of
+ the code (literal or length/distance pair) currently being processed. In
+ that case the lower value is the number of bytes already emitted for that
+ code.
+
+ A code is being processed if inflate is waiting for more input to complete
+ decoding of the code, or if it has completed decoding but is waiting for
+ more output space to write the literal or match data.
+
+ inflateMark() is used to mark locations in the input data for random
+ access, which may be at bit positions, and to note those cases where the
+ output of a code may span boundaries of random access blocks. The current
+ location in the input stream can be determined from avail_in and data_type
+ as noted in the description for the Z_BLOCK flush parameter for inflate.
+
+ inflateMark returns the value noted above or -1 << 16 if the provided
+ source stream state was inconsistent.
+*/
+
+ZEXTERN int ZEXPORT inflateGetHeader OF((z_streamp strm,
+ gz_headerp head));
+/*
+ inflateGetHeader() requests that gzip header information be stored in the
+ provided gz_header structure. inflateGetHeader() may be called after
+ inflateInit2() or inflateReset(), and before the first call of inflate().
+ As inflate() processes the gzip stream, head->done is zero until the header
+ is completed, at which time head->done is set to one. If a zlib stream is
+ being decoded, then head->done is set to -1 to indicate that there will be
+ no gzip header information forthcoming. Note that Z_BLOCK or Z_TREES can be
+ used to force inflate() to return immediately after header processing is
+ complete and before any actual data is decompressed.
+
+ The text, time, xflags, and os fields are filled in with the gzip header
+ contents. hcrc is set to true if there is a header CRC. (The header CRC
+ was valid if done is set to one.) If extra is not Z_NULL, then extra_max
+ contains the maximum number of bytes to write to extra. Once done is true,
+ extra_len contains the actual extra field length, and extra contains the
+ extra field, or that field truncated if extra_max is less than extra_len.
+ If name is not Z_NULL, then up to name_max characters are written there,
+ terminated with a zero unless the length is greater than name_max. If
+ comment is not Z_NULL, then up to comm_max characters are written there,
+ terminated with a zero unless the length is greater than comm_max. When any
+ of extra, name, or comment are not Z_NULL and the respective field is not
+ present in the header, then that field is set to Z_NULL to signal its
+ absence. This allows the use of deflateSetHeader() with the returned
+ structure to duplicate the header. However if those fields are set to
+ allocated memory, then the application will need to save those pointers
+ elsewhere so that they can be eventually freed.
+
+ If inflateGetHeader is not used, then the header information is simply
+ discarded. The header is always checked for validity, including the header
+ CRC if present. inflateReset() will reset the process to discard the header
+ information. The application would need to call inflateGetHeader() again to
+ retrieve the header from the next gzip stream.
+
+ inflateGetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
+ stream state was inconsistent.
+*/
+
+/*
+ZEXTERN int ZEXPORT inflateBackInit OF((z_streamp strm, int windowBits,
+ unsigned char FAR *window));
+
+ Initialize the internal stream state for decompression using inflateBack()
+ calls. The fields zalloc, zfree and opaque in strm must be initialized
+ before the call. If zalloc and zfree are Z_NULL, then the default library-
+ derived memory allocation routines are used. windowBits is the base two
+ logarithm of the window size, in the range 8..15. window is a caller
+ supplied buffer of that size. Except for special applications where it is
+ assured that deflate was used with small window sizes, windowBits must be 15
+ and a 32K byte window must be supplied to be able to decompress general
+ deflate streams.
+
+ See inflateBack() for the usage of these routines.
+
+ inflateBackInit will return Z_OK on success, Z_STREAM_ERROR if any of
+ the paramaters are invalid, Z_MEM_ERROR if the internal state could not be
+ allocated, or Z_VERSION_ERROR if the version of the library does not match
+ the version of the header file.
+*/
+
+typedef unsigned (*in_func) OF((void FAR *, unsigned char FAR * FAR *));
+typedef int (*out_func) OF((void FAR *, unsigned char FAR *, unsigned));
+
+ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm,
+ in_func in, void FAR *in_desc,
+ out_func out, void FAR *out_desc));
+/*
+ inflateBack() does a raw inflate with a single call using a call-back
+ interface for input and output. This is more efficient than inflate() for
+ file i/o applications in that it avoids copying between the output and the
+ sliding window by simply making the window itself the output buffer. This
+ function trusts the application to not change the output buffer passed by
+ the output function, at least until inflateBack() returns.
+
+ inflateBackInit() must be called first to allocate the internal state
+ and to initialize the state with the user-provided window buffer.
+ inflateBack() may then be used multiple times to inflate a complete, raw
+ deflate stream with each call. inflateBackEnd() is then called to free the
+ allocated state.
+
+ A raw deflate stream is one with no zlib or gzip header or trailer.
+ This routine would normally be used in a utility that reads zip or gzip
+ files and writes out uncompressed files. The utility would decode the
+ header and process the trailer on its own, hence this routine expects only
+ the raw deflate stream to decompress. This is different from the normal
+ behavior of inflate(), which expects either a zlib or gzip header and
+ trailer around the deflate stream.
+
+ inflateBack() uses two subroutines supplied by the caller that are then
+ called by inflateBack() for input and output. inflateBack() calls those
+ routines until it reads a complete deflate stream and writes out all of the
+ uncompressed data, or until it encounters an error. The function's
+ parameters and return types are defined above in the in_func and out_func
+ typedefs. inflateBack() will call in(in_desc, &buf) which should return the
+ number of bytes of provided input, and a pointer to that input in buf. If
+ there is no input available, in() must return zero--buf is ignored in that
+ case--and inflateBack() will return a buffer error. inflateBack() will call
+ out(out_desc, buf, len) to write the uncompressed data buf[0..len-1]. out()
+ should return zero on success, or non-zero on failure. If out() returns
+ non-zero, inflateBack() will return with an error. Neither in() nor out()
+ are permitted to change the contents of the window provided to
+ inflateBackInit(), which is also the buffer that out() uses to write from.
+ The length written by out() will be at most the window size. Any non-zero
+ amount of input may be provided by in().
+
+ For convenience, inflateBack() can be provided input on the first call by
+ setting strm->next_in and strm->avail_in. If that input is exhausted, then
+ in() will be called. Therefore strm->next_in must be initialized before
+ calling inflateBack(). If strm->next_in is Z_NULL, then in() will be called
+ immediately for input. If strm->next_in is not Z_NULL, then strm->avail_in
+ must also be initialized, and then if strm->avail_in is not zero, input will
+ initially be taken from strm->next_in[0 .. strm->avail_in - 1].
+
+ The in_desc and out_desc parameters of inflateBack() is passed as the
+ first parameter of in() and out() respectively when they are called. These
+ descriptors can be optionally used to pass any information that the caller-
+ supplied in() and out() functions need to do their job.
+
+ On return, inflateBack() will set strm->next_in and strm->avail_in to
+ pass back any unused input that was provided by the last in() call. The
+ return values of inflateBack() can be Z_STREAM_END on success, Z_BUF_ERROR
+ if in() or out() returned an error, Z_DATA_ERROR if there was a format error
+ in the deflate stream (in which case strm->msg is set to indicate the nature
+ of the error), or Z_STREAM_ERROR if the stream was not properly initialized.
+ In the case of Z_BUF_ERROR, an input or output error can be distinguished
+ using strm->next_in which will be Z_NULL only if in() returned an error. If
+ strm->next_in is not Z_NULL, then the Z_BUF_ERROR was due to out() returning
+ non-zero. (in() will always be called before out(), so strm->next_in is
+ assured to be defined if out() returns non-zero.) Note that inflateBack()
+ cannot return Z_OK.
+*/
+
+ZEXTERN int ZEXPORT inflateBackEnd OF((z_streamp strm));
+/*
+ All memory allocated by inflateBackInit() is freed.
+
+ inflateBackEnd() returns Z_OK on success, or Z_STREAM_ERROR if the stream
+ state was inconsistent.
+*/
+
+ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void));
+/* Return flags indicating compile-time options.
+
+ Type sizes, two bits each, 00 = 16 bits, 01 = 32, 10 = 64, 11 = other:
+ 1.0: size of uInt
+ 3.2: size of uLong
+ 5.4: size of voidpf (pointer)
+ 7.6: size of z_off_t
+
+ Compiler, assembler, and debug options:
+ 8: DEBUG
+ 9: ASMV or ASMINF -- use ASM code
+ 10: ZLIB_WINAPI -- exported functions use the WINAPI calling convention
+ 11: 0 (reserved)
+
+ One-time table building (smaller code, but not thread-safe if true):
+ 12: BUILDFIXED -- build static block decoding tables when needed
+ 13: DYNAMIC_CRC_TABLE -- build CRC calculation tables when needed
+ 14,15: 0 (reserved)
+
+ Library content (indicates missing functionality):
+ 16: NO_GZCOMPRESS -- gz* functions cannot compress (to avoid linking
+ deflate code when not needed)
+ 17: NO_GZIP -- deflate can't write gzip streams, and inflate can't detect
+ and decode gzip streams (to avoid linking crc code)
+ 18-19: 0 (reserved)
+
+ Operation variations (changes in library functionality):
+ 20: PKZIP_BUG_WORKAROUND -- slightly more permissive inflate
+ 21: FASTEST -- deflate algorithm with only one, lowest compression level
+ 22,23: 0 (reserved)
+
+ The sprintf variant used by gzprintf (zero is best):
+ 24: 0 = vs*, 1 = s* -- 1 means limited to 20 arguments after the format
+ 25: 0 = *nprintf, 1 = *printf -- 1 means gzprintf() not secure!
+ 26: 0 = returns value, 1 = void -- 1 means inferred string length returned
+
+ Remainder:
+ 27-31: 0 (reserved)
+ */
+
+
+ /* utility functions */
+
+/*
+ The following utility functions are implemented on top of the basic
+ stream-oriented functions. To simplify the interface, some default options
+ are assumed (compression level and memory usage, standard memory allocation
+ functions). The source code of these utility functions can be modified if
+ you need special options.
+*/
+
+ZEXTERN int ZEXPORT compress OF((Bytef *dest, uLongf *destLen,
+ const Bytef *source, uLong sourceLen));
+/*
+ Compresses the source buffer into the destination buffer. sourceLen is
+ the byte length of the source buffer. Upon entry, destLen is the total size
+ of the destination buffer, which must be at least the value returned by
+ compressBound(sourceLen). Upon exit, destLen is the actual size of the
+ compressed buffer.
+
+ compress returns Z_OK if success, Z_MEM_ERROR if there was not
+ enough memory, Z_BUF_ERROR if there was not enough room in the output
+ buffer.
+*/
+
+ZEXTERN int ZEXPORT compress2 OF((Bytef *dest, uLongf *destLen,
+ const Bytef *source, uLong sourceLen,
+ int level));
+/*
+ Compresses the source buffer into the destination buffer. The level
+ parameter has the same meaning as in deflateInit. sourceLen is the byte
+ length of the source buffer. Upon entry, destLen is the total size of the
+ destination buffer, which must be at least the value returned by
+ compressBound(sourceLen). Upon exit, destLen is the actual size of the
+ compressed buffer.
+
+ compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
+ memory, Z_BUF_ERROR if there was not enough room in the output buffer,
+ Z_STREAM_ERROR if the level parameter is invalid.
+*/
+
+ZEXTERN uLong ZEXPORT compressBound OF((uLong sourceLen));
+/*
+ compressBound() returns an upper bound on the compressed size after
+ compress() or compress2() on sourceLen bytes. It would be used before a
+ compress() or compress2() call to allocate the destination buffer.
+*/
+
+ZEXTERN int ZEXPORT uncompress OF((Bytef *dest, uLongf *destLen,
+ const Bytef *source, uLong sourceLen));
+/*
+ Decompresses the source buffer into the destination buffer. sourceLen is
+ the byte length of the source buffer. Upon entry, destLen is the total size
+ of the destination buffer, which must be large enough to hold the entire
+ uncompressed data. (The size of the uncompressed data must have been saved
+ previously by the compressor and transmitted to the decompressor by some
+ mechanism outside the scope of this compression library.) Upon exit, destLen
+ is the actual size of the uncompressed buffer.
+
+ uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
+ enough memory, Z_BUF_ERROR if there was not enough room in the output
+ buffer, or Z_DATA_ERROR if the input data was corrupted or incomplete.
+*/
+
+
+ /* gzip file access functions */
+
+/*
+ This library supports reading and writing files in gzip (.gz) format with
+ an interface similar to that of stdio, using the functions that start with
+ "gz". The gzip format is different from the zlib format. gzip is a gzip
+ wrapper, documented in RFC 1952, wrapped around a deflate stream.
+*/
+
+typedef voidp gzFile; /* opaque gzip file descriptor */
+
+/*
+ZEXTERN gzFile ZEXPORT gzopen OF((const char *path, const char *mode));
+
+ Opens a gzip (.gz) file for reading or writing. The mode parameter is as
+ in fopen ("rb" or "wb") but can also include a compression level ("wb9") or
+ a strategy: 'f' for filtered data as in "wb6f", 'h' for Huffman-only
+ compression as in "wb1h", 'R' for run-length encoding as in "wb1R", or 'F'
+ for fixed code compression as in "wb9F". (See the description of
+ deflateInit2 for more information about the strategy parameter.) Also "a"
+ can be used instead of "w" to request that the gzip stream that will be
+ written be appended to the file. "+" will result in an error, since reading
+ and writing to the same gzip file is not supported.
+
+ gzopen can be used to read a file which is not in gzip format; in this
+ case gzread will directly read from the file without decompression.
+
+ gzopen returns NULL if the file could not be opened, if there was
+ insufficient memory to allocate the gzFile state, or if an invalid mode was
+ specified (an 'r', 'w', or 'a' was not provided, or '+' was provided).
+ errno can be checked to determine if the reason gzopen failed was that the
+ file could not be opened.
+*/
+
+ZEXTERN gzFile ZEXPORT gzdopen OF((int fd, const char *mode));
+/*
+ gzdopen associates a gzFile with the file descriptor fd. File descriptors
+ are obtained from calls like open, dup, creat, pipe or fileno (if the file
+ has been previously opened with fopen). The mode parameter is as in gzopen.
+
+ The next call of gzclose on the returned gzFile will also close the file
+ descriptor fd, just like fclose(fdopen(fd, mode)) closes the file descriptor
+ fd. If you want to keep fd open, use fd = dup(fd_keep); gz = gzdopen(fd,
+ mode);. The duplicated descriptor should be saved to avoid a leak, since
+ gzdopen does not close fd if it fails.
+
+ gzdopen returns NULL if there was insufficient memory to allocate the
+ gzFile state, if an invalid mode was specified (an 'r', 'w', or 'a' was not
+ provided, or '+' was provided), or if fd is -1. The file descriptor is not
+ used until the next gz* read, write, seek, or close operation, so gzdopen
+ will not detect if fd is invalid (unless fd is -1).
+*/
+
+ZEXTERN int ZEXPORT gzbuffer OF((gzFile file, unsigned size));
+/*
+ Set the internal buffer size used by this library's functions. The
+ default buffer size is 8192 bytes. This function must be called after
+ gzopen() or gzdopen(), and before any other calls that read or write the
+ file. The buffer memory allocation is always deferred to the first read or
+ write. Two buffers are allocated, either both of the specified size when
+ writing, or one of the specified size and the other twice that size when
+ reading. A larger buffer size of, for example, 64K or 128K bytes will
+ noticeably increase the speed of decompression (reading).
+
+ The new buffer size also affects the maximum length for gzprintf().
+
+ gzbuffer() returns 0 on success, or -1 on failure, such as being called
+ too late.
+*/
+
+ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy));
+/*
+ Dynamically update the compression level or strategy. See the description
+ of deflateInit2 for the meaning of these parameters.
+
+ gzsetparams returns Z_OK if success, or Z_STREAM_ERROR if the file was not
+ opened for writing.
+*/
+
+ZEXTERN int ZEXPORT gzread OF((gzFile file, voidp buf, unsigned len));
+/*
+ Reads the given number of uncompressed bytes from the compressed file. If
+ the input file was not in gzip format, gzread copies the given number of
+ bytes into the buffer.
+
+ After reaching the end of a gzip stream in the input, gzread will continue
+ to read, looking for another gzip stream, or failing that, reading the rest
+ of the input file directly without decompression. The entire input file
+ will be read if gzread is called until it returns less than the requested
+ len.
+
+ gzread returns the number of uncompressed bytes actually read, less than
+ len for end of file, or -1 for error.
+*/
+
+ZEXTERN int ZEXPORT gzwrite OF((gzFile file,
+ voidpc buf, unsigned len));
+/*
+ Writes the given number of uncompressed bytes into the compressed file.
+ gzwrite returns the number of uncompressed bytes written or 0 in case of
+ error.
+*/
+
+ZEXTERN int ZEXPORTVA gzprintf OF((gzFile file, const char *format, ...));
+/*
+ Converts, formats, and writes the arguments to the compressed file under
+ control of the format string, as in fprintf. gzprintf returns the number of
+ uncompressed bytes actually written, or 0 in case of error. The number of
+ uncompressed bytes written is limited to 8191, or one less than the buffer
+ size given to gzbuffer(). The caller should assure that this limit is not
+ exceeded. If it is exceeded, then gzprintf() will return an error (0) with
+ nothing written. In this case, there may also be a buffer overflow with
+ unpredictable consequences, which is possible only if zlib was compiled with
+ the insecure functions sprintf() or vsprintf() because the secure snprintf()
+ or vsnprintf() functions were not available. This can be determined using
+ zlibCompileFlags().
+*/
+
+ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s));
+/*
+ Writes the given null-terminated string to the compressed file, excluding
+ the terminating null character.
+
+ gzputs returns the number of characters written, or -1 in case of error.
+*/
+
+ZEXTERN char * ZEXPORT gzgets OF((gzFile file, char *buf, int len));
+/*
+ Reads bytes from the compressed file until len-1 characters are read, or a
+ newline character is read and transferred to buf, or an end-of-file
+ condition is encountered. If any characters are read or if len == 1, the
+ string is terminated with a null character. If no characters are read due
+ to an end-of-file or len < 1, then the buffer is left untouched.
+
+ gzgets returns buf which is a null-terminated string, or it returns NULL
+ for end-of-file or in case of error. If there was an error, the contents at
+ buf are indeterminate.
+*/
+
+ZEXTERN int ZEXPORT gzputc OF((gzFile file, int c));
+/*
+ Writes c, converted to an unsigned char, into the compressed file. gzputc
+ returns the value that was written, or -1 in case of error.
+*/
+
+ZEXTERN int ZEXPORT gzgetc OF((gzFile file));
+/*
+ Reads one byte from the compressed file. gzgetc returns this byte or -1
+ in case of end of file or error.
+*/
+
+ZEXTERN int ZEXPORT gzungetc OF((int c, gzFile file));
+/*
+ Push one character back onto the stream to be read as the first character
+ on the next read. At least one character of push-back is allowed.
+ gzungetc() returns the character pushed, or -1 on failure. gzungetc() will
+ fail if c is -1, and may fail if a character has been pushed but not read
+ yet. If gzungetc is used immediately after gzopen or gzdopen, at least the
+ output buffer size of pushed characters is allowed. (See gzbuffer above.)
+ The pushed character will be discarded if the stream is repositioned with
+ gzseek() or gzrewind().
+*/
+
+ZEXTERN int ZEXPORT gzflush OF((gzFile file, int flush));
+/*
+ Flushes all pending output into the compressed file. The parameter flush
+ is as in the deflate() function. The return value is the zlib error number
+ (see function gzerror below). gzflush is only permitted when writing.
+
+ If the flush parameter is Z_FINISH, the remaining data is written and the
+ gzip stream is completed in the output. If gzwrite() is called again, a new
+ gzip stream will be started in the output. gzread() is able to read such
+ concatented gzip streams.
+
+ gzflush should be called only when strictly necessary because it will
+ degrade compression if called too often.
+*/
+
+/*
+ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile file,
+ z_off_t offset, int whence));
+
+ Sets the starting position for the next gzread or gzwrite on the given
+ compressed file. The offset represents a number of bytes in the
+ uncompressed data stream. The whence parameter is defined as in lseek(2);
+ the value SEEK_END is not supported.
+
+ If the file is opened for reading, this function is emulated but can be
+ extremely slow. If the file is opened for writing, only forward seeks are
+ supported; gzseek then compresses a sequence of zeroes up to the new
+ starting position.
+
+ gzseek returns the resulting offset location as measured in bytes from
+ the beginning of the uncompressed stream, or -1 in case of error, in
+ particular if the file is opened for writing and the new starting position
+ would be before the current position.
+*/
+
+ZEXTERN int ZEXPORT gzrewind OF((gzFile file));
+/*
+ Rewinds the given file. This function is supported only for reading.
+
+ gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET)
+*/
+
+/*
+ZEXTERN z_off_t ZEXPORT gztell OF((gzFile file));
+
+ Returns the starting position for the next gzread or gzwrite on the given
+ compressed file. This position represents a number of bytes in the
+ uncompressed data stream, and is zero when starting, even if appending or
+ reading a gzip stream from the middle of a file using gzdopen().
+
+ gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR)
+*/
+
+/*
+ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile file));
+
+ Returns the current offset in the file being read or written. This offset
+ includes the count of bytes that precede the gzip stream, for example when
+ appending or when using gzdopen() for reading. When reading, the offset
+ does not include as yet unused buffered input. This information can be used
+ for a progress indicator. On error, gzoffset() returns -1.
+*/
+
+ZEXTERN int ZEXPORT gzeof OF((gzFile file));
+/*
+ Returns true (1) if the end-of-file indicator has been set while reading,
+ false (0) otherwise. Note that the end-of-file indicator is set only if the
+ read tried to go past the end of the input, but came up short. Therefore,
+ just like feof(), gzeof() may return false even if there is no more data to
+ read, in the event that the last read request was for the exact number of
+ bytes remaining in the input file. This will happen if the input file size
+ is an exact multiple of the buffer size.
+
+ If gzeof() returns true, then the read functions will return no more data,
+ unless the end-of-file indicator is reset by gzclearerr() and the input file
+ has grown since the previous end of file was detected.
+*/
+
+ZEXTERN int ZEXPORT gzdirect OF((gzFile file));
+/*
+ Returns true (1) if file is being copied directly while reading, or false
+ (0) if file is a gzip stream being decompressed. This state can change from
+ false to true while reading the input file if the end of a gzip stream is
+ reached, but is followed by data that is not another gzip stream.
+
+ If the input file is empty, gzdirect() will return true, since the input
+ does not contain a gzip stream.
+
+ If gzdirect() is used immediately after gzopen() or gzdopen() it will
+ cause buffers to be allocated to allow reading the file to determine if it
+ is a gzip file. Therefore if gzbuffer() is used, it should be called before
+ gzdirect().
+*/
+
+ZEXTERN int ZEXPORT gzclose OF((gzFile file));
+/*
+ Flushes all pending output if necessary, closes the compressed file and
+ deallocates the (de)compression state. Note that once file is closed, you
+ cannot call gzerror with file, since its structures have been deallocated.
+ gzclose must not be called more than once on the same file, just as free
+ must not be called more than once on the same allocation.
+
+ gzclose will return Z_STREAM_ERROR if file is not valid, Z_ERRNO on a
+ file operation error, or Z_OK on success.
+*/
+
+ZEXTERN int ZEXPORT gzclose_r OF((gzFile file));
+ZEXTERN int ZEXPORT gzclose_w OF((gzFile file));
+/*
+ Same as gzclose(), but gzclose_r() is only for use when reading, and
+ gzclose_w() is only for use when writing or appending. The advantage to
+ using these instead of gzclose() is that they avoid linking in zlib
+ compression or decompression code that is not used when only reading or only
+ writing respectively. If gzclose() is used, then both compression and
+ decompression code will be included the application when linking to a static
+ zlib library.
+*/
+
+ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum));
+/*
+ Returns the error message for the last error which occurred on the given
+ compressed file. errnum is set to zlib error number. If an error occurred
+ in the file system and not in the compression library, errnum is set to
+ Z_ERRNO and the application may consult errno to get the exact error code.
+
+ The application must not modify the returned string. Future calls to
+ this function may invalidate the previously returned string. If file is
+ closed, then the string previously returned by gzerror will no longer be
+ available.
+
+ gzerror() should be used to distinguish errors from end-of-file for those
+ functions above that do not distinguish those cases in their return values.
+*/
+
+ZEXTERN void ZEXPORT gzclearerr OF((gzFile file));
+/*
+ Clears the error and end-of-file flags for file. This is analogous to the
+ clearerr() function in stdio. This is useful for continuing to read a gzip
+ file that is being written concurrently.
+*/
+
+
+ /* checksum functions */
+
+/*
+ These functions are not related to compression but are exported
+ anyway because they might be useful in applications using the compression
+ library.
+*/
+
+ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));
+/*
+ Update a running Adler-32 checksum with the bytes buf[0..len-1] and
+ return the updated checksum. If buf is Z_NULL, this function returns the
+ required initial value for the checksum.
+
+ An Adler-32 checksum is almost as reliable as a CRC32 but can be computed
+ much faster.
+
+ Usage example:
+
+ uLong adler = adler32(0L, Z_NULL, 0);
+
+ while (read_buffer(buffer, length) != EOF) {
+ adler = adler32(adler, buffer, length);
+ }
+ if (adler != original_adler) error();
+*/
+
+/*
+ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2,
+ z_off_t len2));
+
+ Combine two Adler-32 checksums into one. For two sequences of bytes, seq1
+ and seq2 with lengths len1 and len2, Adler-32 checksums were calculated for
+ each, adler1 and adler2. adler32_combine() returns the Adler-32 checksum of
+ seq1 and seq2 concatenated, requiring only adler1, adler2, and len2.
+*/
+
+ZEXTERN uLong ZEXPORT crc32 OF((uLong crc, const Bytef *buf, uInt len));
+/*
+ Update a running CRC-32 with the bytes buf[0..len-1] and return the
+ updated CRC-32. If buf is Z_NULL, this function returns the required
+ initial value for the for the crc. Pre- and post-conditioning (one's
+ complement) is performed within this function so it shouldn't be done by the
+ application.
+
+ Usage example:
+
+ uLong crc = crc32(0L, Z_NULL, 0);
+
+ while (read_buffer(buffer, length) != EOF) {
+ crc = crc32(crc, buffer, length);
+ }
+ if (crc != original_crc) error();
+*/
+
+/*
+ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, z_off_t len2));
+
+ Combine two CRC-32 check values into one. For two sequences of bytes,
+ seq1 and seq2 with lengths len1 and len2, CRC-32 check values were
+ calculated for each, crc1 and crc2. crc32_combine() returns the CRC-32
+ check value of seq1 and seq2 concatenated, requiring only crc1, crc2, and
+ len2.
+*/
+
+
+ /* various hacks, don't look :) */
+
+/* deflateInit and inflateInit are macros to allow checking the zlib version
+ * and the compiler's view of z_stream:
+ */
+ZEXTERN int ZEXPORT deflateInit_ OF((z_streamp strm, int level,
+ const char *version, int stream_size));
+ZEXTERN int ZEXPORT inflateInit_ OF((z_streamp strm,
+ const char *version, int stream_size));
+ZEXTERN int ZEXPORT deflateInit2_ OF((z_streamp strm, int level, int method,
+ int windowBits, int memLevel,
+ int strategy, const char *version,
+ int stream_size));
+ZEXTERN int ZEXPORT inflateInit2_ OF((z_streamp strm, int windowBits,
+ const char *version, int stream_size));
+ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits,
+ unsigned char FAR *window,
+ const char *version,
+ int stream_size));
+#define deflateInit(strm, level) \
+ deflateInit_((strm), (level), ZLIB_VERSION, sizeof(z_stream))
+#define inflateInit(strm) \
+ inflateInit_((strm), ZLIB_VERSION, sizeof(z_stream))
+#define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
+ deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
+ (strategy), ZLIB_VERSION, sizeof(z_stream))
+#define inflateInit2(strm, windowBits) \
+ inflateInit2_((strm), (windowBits), ZLIB_VERSION, sizeof(z_stream))
+#define inflateBackInit(strm, windowBits, window) \
+ inflateBackInit_((strm), (windowBits), (window), \
+ ZLIB_VERSION, sizeof(z_stream))
+
+/* provide 64-bit offset functions if _LARGEFILE64_SOURCE defined, and/or
+ * change the regular functions to 64 bits if _FILE_OFFSET_BITS is 64 (if
+ * both are true, the application gets the *64 functions, and the regular
+ * functions are changed to 64 bits) -- in case these are set on systems
+ * without large file support, _LFS64_LARGEFILE must also be true
+ */
+#if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0
+ ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
+ ZEXTERN z_off64_t ZEXPORT gzseek64 OF((gzFile, z_off64_t, int));
+ ZEXTERN z_off64_t ZEXPORT gztell64 OF((gzFile));
+ ZEXTERN z_off64_t ZEXPORT gzoffset64 OF((gzFile));
+ ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off64_t));
+ ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off64_t));
+#endif
+
+#if !defined(ZLIB_INTERNAL) && _FILE_OFFSET_BITS-0 == 64 && _LFS64_LARGEFILE-0
+# define gzopen gzopen64
+# define gzseek gzseek64
+# define gztell gztell64
+# define gzoffset gzoffset64
+# define adler32_combine adler32_combine64
+# define crc32_combine crc32_combine64
+# ifdef _LARGEFILE64_SOURCE
+ ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
+ ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int));
+ ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile));
+ ZEXTERN z_off_t ZEXPORT gzoffset64 OF((gzFile));
+ ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
+ ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
+# endif
+#else
+ ZEXTERN gzFile ZEXPORT gzopen OF((const char *, const char *));
+ ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile, z_off_t, int));
+ ZEXTERN z_off_t ZEXPORT gztell OF((gzFile));
+ ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile));
+ ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t));
+ ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t));
+#endif
+
+/* hack for buggy compilers */
+#if !defined(ZUTIL_H) && !defined(NO_DUMMY_DECL)
+ struct internal_state {int dummy;};
+#endif
+
+/* undocumented functions */
+ZEXTERN const char * ZEXPORT zError OF((int));
+ZEXTERN int ZEXPORT inflateSyncPoint OF((z_streamp));
+ZEXTERN const uLongf * ZEXPORT get_crc_table OF((void));
+ZEXTERN int ZEXPORT inflateUndermine OF((z_streamp, int));
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* ZLIB_H */
Index: /Vago/trunk/Vago/logger.cpp
===================================================================
--- /Vago/trunk/Vago/logger.cpp (revision 771)
+++ /Vago/trunk/Vago/logger.cpp (revision 771)
@@ -0,0 +1,43 @@
+#include "logger.h"
+
+Logger::Logger()
+{
+ myLogFile = new QFile(GlobalVars::AppLogName);
+
+ if (!myLogFile->open(QIODevice::WriteOnly | QIODevice::Text)){ //open to write
+ return;
+ }
+
+ logStream = new QTextStream (myLogFile);
+ //logStream->setCodec("UTF-8");
+}
+
+ /**
+ ** Mutex makes it thread safe. (not sure if needed although)
+ **/
+void Logger::writeString(QString strToWrite){
+ mutex.lock();
+ *this->logStream << "--------------------------------------------";
+ *this->logStream << "\nEvent Start: " << QDateTime::currentDateTime().toString() << "\n" << strToWrite << "\nEvent End.\n";
+ *this->logStream << "--------------------------------------------\n";
+ this->logStream->flush();
+ mutex.unlock();
+}
+
+/**
+ ** Mutex makes it thread safe. (not sure if needed although)
+ **/
+void Logger::writeBytes(QByteArray arrToWrite){
+ mutex.lock();
+ *this->logStream << "--------------------------------------------";
+ *this->logStream << "\nEvent Start: " << QDateTime::currentDateTime().toString() << "\n" << arrToWrite << "\nEvent End.\n";
+ *this->logStream << "--------------------------------------------";
+ this->logStream->flush();
+ mutex.unlock();
+}
+
+//deconstructor, will close the file automatically and free the resources...
+Logger::~Logger(){
+ delete this->logStream;
+ delete this->myLogFile; //the deconstructor of the file will close it automatically
+}
Index: /Vago/trunk/Vago/logger.h
===================================================================
--- /Vago/trunk/Vago/logger.h (revision 771)
+++ /Vago/trunk/Vago/logger.h (revision 771)
@@ -0,0 +1,22 @@
+#ifndef LOGGER_H
+#define LOGGER_H
+#include
+#include
+#include
+#include
+#include
+
+class Logger
+{
+public:
+ Logger();
+ ~Logger();
+ void writeString(QString strToWrite);
+ void writeBytes(QByteArray arrToWrite);
+private:
+ QFile *myLogFile;
+ QTextStream *logStream;
+ QMutex mutex; //mutex for control writes to the logs
+};
+
+#endif // LOGGER_H
Index: /Vago/trunk/Vago/main.cpp
===================================================================
--- /Vago/trunk/Vago/main.cpp (revision 771)
+++ /Vago/trunk/Vago/main.cpp (revision 771)
@@ -0,0 +1,12 @@
+#include
+#include "mainwindow.h"
+
+int main(int argc, char *argv[])
+{
+ QApplication a(argc, argv);
+ MainWindow w;
+ w.show();
+ a.setStyleSheet("QStatusBar::item { border: 0px; }"); //hide QLabels border in status bar //http://qt-project.org/forums/viewthread/18743
+
+ return a.exec();
+}
Index: /Vago/trunk/Vago/mainwindow.cpp
===================================================================
--- /Vago/trunk/Vago/mainwindow.cpp (revision 771)
+++ /Vago/trunk/Vago/mainwindow.cpp (revision 771)
@@ -0,0 +1,1520 @@
+#include "mainwindow.h"
+#include "ui_mainwindow.h"
+
+const QString MainWindow::VagoSettingsName = "settingsVago.ini";
+
+MainWindow::MainWindow(QWidget *parent) :
+ QMainWindow(parent),
+ ui(new Ui::MainWindow)
+{
+ ui->setupUi(this);
+
+ this->setWindowTitle("Vago v"+GlobalVars::AppVersion);
+
+ // QTextCodec::setCodecForCStrings(QTextCodec::codecForLocale ());
+
+ if(!QFile::exists(QDir::currentPath()+"/"+GlobalVars::OniSplitExeName)){
+ Util::showErrorPopUp("OniSplit not found. Please download it at "+GlobalVars::ModsDomain+" and put it in the same folder of Vago. \n\nProgram will now exit.");
+ exit(1);
+ }
+
+ if(!QFile::exists(QDir::currentPath()+"/"+GlobalVars::XmlToolsExeName)){
+ Util::showErrorPopUp("xmlTools not found. Please download it at "+GlobalVars::ModsDomain+" and put it in the same folder of Vago. \n\nProgram will now exit.");
+ exit(1);
+ }
+
+ this->vagoSettings = new QSettings(QDir::currentPath() + "/" + this->VagoSettingsName, QSettings::IniFormat);
+
+ //First Execution? Old configuration? Settings missed?
+ bool iniChanged=false;
+ if(!this->vagoSettings->contains("VagoVersion") || this->vagoSettings->value("VagoVersion")!=GlobalVars::AppVersion){
+ this->vagoSettings->setValue("VagoVersion", GlobalVars::AppVersion);
+ iniChanged=true;
+ }
+ if(!this->vagoSettings->contains("Workspace")){
+ this->vagoSettings->setValue("Workspace", QDir::currentPath()+"/VagoWorkspace");
+ iniChanged=true;
+ }
+ if(!this->vagoSettings->contains("AeFolder")){
+
+ Util::showPopUp("Seems it's the first time you are executing Vago. \n\nPlease input your Anniversary Edition (AE) Folder.");
+ QString aefolder=Util::normalizePath(QFileDialog::getExistingDirectory(this,"Choose Anniversary Edition (AE) folder..."));
+
+ if(aefolder.isEmpty()){
+ Util::showErrorPopUp("AE folder is mandatory. Application will exit.");
+ exit(1);
+ }
+
+ if(!aefolder.endsWith("AE")){
+ Util::showWarningPopUp("Seems the folder you selected isn't called 'AE'. \n\nIf you run in any problems you can always change it in Vago preferences window.");
+ }
+
+ this->vagoSettings->setValue("AeFolder", aefolder);
+ iniChanged=true;
+ }
+ if(!this->vagoSettings->contains("OniWindow")){
+ this->vagoSettings->setValue("OniWindow", true);
+ iniChanged=true;
+ }
+ if(!this->vagoSettings->contains("SeparateInWorkspace")){
+ this->vagoSettings->setValue("SeparateInWorkspace",true);
+ iniChanged=true;
+ }
+ if(!this->vagoSettings->contains("ConfirmExit")){
+ this->vagoSettings->setValue("ConfirmExit", false);
+ iniChanged=true;
+ }
+
+ if(iniChanged){
+ this->vagoSettings->sync();
+ }
+ ///
+
+ this->workspaceLocation=this->vagoSettings->value("Workspace").toString();
+ this->workspaceWizardsLocation=this->workspaceLocation+"/Wizards";
+ this->AeLocation=this->vagoSettings->value("AeFolder").toString();
+ this->outputFolder=this->workspaceLocation;
+
+ //Create our workspace if it doesn't exists yet
+ if(!QDir(this->workspaceLocation).exists()){
+ QDir().mkdir(this->workspaceLocation);
+ }
+ this->itemsLoaded=new QLabel(this);
+ ui->statusBar->addWidget(this->itemsLoaded);
+ this->myBar = new QProgressBar(this);
+ this->myBar->setTextVisible(false); //hides text
+
+ this->myBar->setSizePolicy(QSizePolicy::Minimum,QSizePolicy::Fixed);
+ this->myBar->setMinimumWidth(150);
+ this->myBar->hide(); //hide while not being used
+
+ ui->statusBar->addPermanentWidget(myBar); //this adds automatically in right
+
+ this->myLogger = new Logger(); //start logger
+
+ //Initialize list pointers
+ this->listToProccess = new QStringList;
+
+ //Create a thread for do the conversion in background
+ this->myConverter = new Converter(this->myLogger,this->listToProccess);
+
+ ui->mainToolBar->addWidget(ui->tbAE); //add ae installer launch button
+ ui->mainToolBar->addWidget(ui->emptySpacerLabel); //trick, we can't add directly a space so we add an empty
+ ui->mainToolBar->addWidget(ui->tbOni); //add oni launch buttonlabel
+ ui->mainToolBar->addWidget(ui->emptySpacerLabel2); //same as before
+ ui->mainToolBar->addWidget(ui->tbCommand); //add option to manual onisplit commands
+ ui->mainToolBar->addWidget(ui->emptySpacerLabel3); //same as before
+ ui->mainToolBar->addWidget(ui->tbOpenFolder); //add option to open folder with files converted etc
+
+ ui->mainToolBar->setLayoutDirection(Qt::RightToLeft);
+
+ connectSlots();
+
+ //Commands Mapping
+ this->commandMap = QHash();
+ mapCommands();
+
+ updateItemsLoaded(ui->twSourcesGeneral);
+
+ this->myLogger->writeString("Application started.");
+}
+
+MainWindow::~MainWindow()
+{
+ delete ui;
+ this->myLogger->writeString("Application Exited.");
+}
+
+void MainWindow::on_actionExit_triggered()
+{
+ close();
+}
+
+void MainWindow::on_actionAbout_triggered()
+{
+ //Show preferences
+ About *aboutWindow = new About(this);
+ aboutWindow->show(); //it destroys itself when finished.
+}
+
+void MainWindow::on_actionAE_Package_Creator_triggered()
+{
+ PackageWizard myWizard = PackageWizard(this->workspaceWizardsLocation, this->vagoSettings, this->myLogger);
+ myWizard.exec();
+}
+
+void MainWindow::on_actionSound_Wizard_triggered()
+{
+ SoundWizard myWizard (this->workspaceWizardsLocation, this->myLogger, &this->commandMap);
+ myWizard.exec();
+}
+
+void MainWindow::on_tbOni_clicked()
+{
+ QStringList arguments;
+
+ if(this->vagoSettings->value("OniWindow").toBool()){ //Run in a window?
+ arguments << "-noswitch";
+ }
+ else{
+ arguments << "-switch";
+ }
+
+ arguments << " -debugfiles";
+
+ if(!QProcess::startDetached(this->AeLocation+"/Oni.exe",arguments,this->AeLocation)){
+ showErrStatusMessage("Oni could not be started!");
+ }
+}
+
+void MainWindow::on_tbAE_clicked()
+{
+ // If the app turn out someday to a native app use QProcess::startDetached instead...
+
+ if(!QDesktopServices::openUrl(this->AeLocation+"/AEInstaller/bin/AEInstaller2.jar")){
+ showErrStatusMessage("Could not start AE Installer!");
+ }
+}
+
+void MainWindow::on_tbOpenFolder_clicked()
+{
+ QDesktopServices::openUrl(QUrl("file:///"+this->outputFolder));
+}
+
+void MainWindow::on_cbEnvMap_toggled(bool checked)
+{
+ ui->leEnvMapTexture->setEnabled(checked);
+}
+
+void MainWindow::on_cbTexture_toggled(bool checked)
+{
+ ui->leTextureName->setEnabled(checked);
+}
+
+void MainWindow::on_cbWithAnimation_toggled(bool checked)
+{
+ ui->leAnimationName->setEnabled(checked);
+}
+
+void MainWindow::on_cbCamera_toggled(bool checked)
+{
+ if(checked){
+ ui->cbGeometry->setChecked(false);
+ }
+}
+
+void MainWindow::on_cbGeometry_toggled(bool checked)
+{
+ ui->leGeometryName->setEnabled(checked);
+ if(checked){
+ ui->cbCamera->setChecked(false);
+ }
+}
+
+void MainWindow::on_actionCheck_For_Updates_triggered()
+{
+
+ //let's check in the web if this version is the latest
+ QNetworkAccessManager *manager = new QNetworkAccessManager(this);
+ connect(manager, SIGNAL(finished(QNetworkReply*)),
+ this, SLOT(checkVagoLastVersion(QNetworkReply*)));
+
+ manager->get(QNetworkRequest(QUrl(GlobalVars::VagoCheckUpdatesUrl)));
+
+}
+
+void MainWindow::checkVagoLastVersion(QNetworkReply *result){
+
+ if(result->error()==QNetworkReply::NoError){
+ QScriptEngine engine;
+ QScriptValue sc = engine.evaluate("(" + QString(result->readAll()) + ")");
+
+ // "field_version":{"und":[{"value":"0.6a","format":null,"safe_value":"0.6a"}]} //Note the use of [{}] which means it's a array of 1 element with one object inside (so the use of [0] bellow
+
+ QString newVersion = sc.property("field_version").toObject().property("und").toObject().property("0").toObject().property("value").toString();
+
+ if(newVersion!=GlobalVars::AppVersion){
+ Util::showRichPopUp("There's a new version of Vago! (v"+newVersion+")
"+
+ "You can download it here.");
+ }
+ else{
+ Util::showPopUp("You are using last version.");
+ }
+ }
+ else{
+ Util::showErrorPopUp("An error occurred checking last version:\n\n"+result->errorString());
+ }
+ result->deleteLater();
+}
+
+void MainWindow::on_pbAddSourceGeneral_clicked()
+{
+ if(QString::compare(ui->cbFromGeneral->currentText(),"ONI",Qt::CaseSensitive)==0 && QString::compare(ui->cbToGeneral->currentText(),"DAT",Qt::CaseSensitive)==0){ //CaseSensitive is faster)
+ addFilesSource(ui->twSourcesGeneral,Util::multipleDirDialog("Choose folders with ONIs..."));
+ }
+ else{
+ addFilesSource( ui->twSourcesGeneral,QFileDialog::getOpenFileNames(this,"Choose the files...","./" , "All Files (*.*)"));
+ }
+}
+
+void MainWindow::on_pbAddSourceTextures_clicked()
+{
+ addFilesSource( ui->twSourcesTextures, QFileDialog::getOpenFileNames(this,"Choose the files...","./" , "All Files (*.*)"));
+}
+
+void MainWindow::on_pbAddSourceModels_clicked()
+{
+ addFilesSource( ui->twSourcesModels,QFileDialog::getOpenFileNames(this,"Choose the files...","./" , "All Files (*.*)"));
+}
+
+void MainWindow::on_pbAddSourceAnimations_clicked()
+{
+ addFilesSource( ui->twSourcesAnimations,QFileDialog::getOpenFileNames(this,"Choose the files...","./" , "All Files (*.*)"));
+}
+
+void MainWindow::on_pbAddSourceLevels_clicked()
+{
+ addFilesSource( ui->twSourcesLevels,QFileDialog::getOpenFileNames(this,"Choose the files...","./" , "All Files (*.*)"));
+}
+
+void MainWindow::on_pbAddSourceMisc_clicked()
+{
+ addFilesSource( ui->twSourcesMisc,QFileDialog::getOpenFileNames(this,"Choose the files...","./" , "All Files (*.*)"));
+}
+
+QString MainWindow::getFileOutputFolder(QString fromTo, QString myOutputFolder){
+
+ if(myOutputFolder==""){ //We may want to change to a non standart location with context menu
+ myOutputFolder=this->outputFolder;
+ }
+
+ if(this->vagoSettings->value("SeparateInWorkspace").toBool() && myOutputFolder==this->workspaceLocation){
+ myOutputFolder+="/"+ui->tabWidget->tabText(ui->tabWidget->currentIndex());
+ myOutputFolder+="/"+QString(fromTo).replace(" / ","_").replace(" > "," - ");
+ }
+ return Util::insertQuotes(myOutputFolder+"/");
+}
+
+void MainWindow::addFilesSource(DropTableWidget *myTable, QStringList files){
+
+ //Get Conversion pretended
+ QString from,to;
+
+ QString fromTo = getTypeConversion(myTable);
+
+ from = QString(fromTo).remove(fromTo.indexOf(" >"),fromTo.size()-1); //parse the string to get the from, only 1 time parsed by each group of files = very fast
+ to = QString(fromTo).remove(0,fromTo.lastIndexOf("> ")+2); //+2 to start after "> "
+
+ //Pre-processing (check if the files/folders received are valid), e.g. check for ONI->DAT if are only given folders and not files
+ if(QString::compare(from,"ONI",Qt::CaseSensitive)==0 && QString::compare(to,"DAT",Qt::CaseSensitive)==0){
+ //check if it's a folder
+ foreach(QString myFile, files){
+ if(!QDir(myFile).exists()){
+ showErrStatusMessage("Only folders are allowed for this operation.");
+ return;
+ }
+ }
+
+ }
+ else{
+ foreach(QString myFile, files){
+ //check if it's a file
+ if(QDir(myFile).exists()){
+ showErrStatusMessage("Only files are allowed for this operation.");
+ return;
+ }
+ }
+ }
+
+ //Build command
+ QString command, lastFileName;
+
+ QString myOutputFolder=getFileOutputFolder(fromTo);
+
+ //if folder doesn't exist onisplit will create it for us :)
+ foreach(QString currentFile, files){
+
+ currentFile=Util::normalizeAndQuote(currentFile); //insert quotes ("") in file
+
+ if(lastFileName.isEmpty()){ //Optimization: all commands are the same for each file, just replace the filename
+
+ command=getCommand(myTable,myOutputFolder,from,to,currentFile);
+
+ if(command.isEmpty()){ //something wrong was happening (not inputted a texture name?)
+ return; //stop adding files
+ }
+ currentFile=Util::cutName(currentFile);
+ }else{ //one parsing was already made just replace the filename by the old one in the command
+
+ currentFile=Util::cutName(currentFile);
+
+ command.replace(lastFileName,currentFile,Qt::CaseSensitive); //case sentive is faster
+ }
+
+ lastFileName=currentFile;
+
+ addRowTable(myTable,lastFileName,fromTo,command);
+ }
+ updateItemsLoaded(myTable);
+}
+
+QString MainWindow::fileParsingGeneral(QString myOutputFolder, QString from, QString to , QString file){
+
+ QString command;
+
+ if(QString::compare(from,"ONI",Qt::CaseSensitive)==0 && QString::compare(to,"DAT",Qt::CaseSensitive)==0){ //CaseSensitive is faster
+
+ QString datName;
+
+ if(ui->cbDatGeneral->isChecked()){
+ if(ui->leTargetDatGeneral->text().isEmpty()){
+ showErrStatusMessage("Checkbox '"+ui->cbDatGeneral->text()+"' is selected. The name cannot be empty.");
+ return "";
+ }
+ datName+=QString(myOutputFolder).insert(myOutputFolder.size()-1,ui->leTargetDatGeneral->text()); //set name inputted by user
+ if(!ui->leTargetDatGeneral->text().toUpper().endsWith(".DAT")){
+ datName.insert(datName.size()-1,".dat"); //append extension if necessary (-1 to maintain final quote)
+ }
+ }
+ else{
+ datName=QString(myOutputFolder).insert(myOutputFolder.size()-1,Util::cutName(file).remove("/")+".dat"); //if none iputted set the same name of input file
+ }
+
+ if(ui->actionWindows->isChecked()){ //is target plataform select windows?
+ return command=this->commandMap.value("general->"+from+"->"+to+"(PC)")+" "+ file + " "+datName;
+ }
+ else{
+ return command=this->commandMap.value("general->"+from+"->"+to+"(demoPCMAC)")+" "+ file + " "+datName;
+ }
+ }
+ else if(QString::compare(from,"ONI",Qt::CaseSensitive)==0 && QString::compare(to,"XML",Qt::CaseSensitive)==0 && ui->cbTRAMGeneral->isChecked()){
+ if(ui->leTRAMGeneral->text().isEmpty()){
+ showErrStatusMessage("Checkbox '"+ui->cbTRAMGeneral->text()+"' is selected. The source cannot be empty.");
+ return "";
+ }
+ return command=this->commandMap.value("general->"+from+"->"+to)+" "+myOutputFolder+" "+this->commandMap.value("general->"+ui->cbTRAMGeneral->text())+file + " "+ Util::normalizeAndQuote(ui->leTRAMGeneral->text());
+ }
+ else{
+ return command=this->commandMap.value("general->"+from+"->"+to)+" "+myOutputFolder+" "+file;
+ }
+
+}
+
+QString MainWindow::fileParsingTextures(QString myOutputFolder, QString from, QString to , QString file){
+
+ QString command=this->commandMap.value("textures->"+from+"->"+to)+" "+myOutputFolder;
+
+ if(ui->gbTextures->isEnabled()){ //faster than compare strings (if is DAT/ONI)
+
+ if(ui->cbMipMapsTextures->isChecked()){
+ command+=" "+this->commandMap.value("textures->"+ui->cbMipMapsTextures->text());
+ }
+
+ if(ui->cbNoUwrap->isChecked()){
+ command+=" "+this->commandMap.value("textures->"+ui->cbNoUwrap->text());
+ }
+
+ if(ui->cbNoVwrap->isChecked()){
+ command+=" "+this->commandMap.value("textures->"+ui->cbNoVwrap->text());
+ }
+
+ if(ui->cbLarge->isChecked()){
+ command+=" "+this->commandMap.value("textures->"+ui->cbLarge->text());
+ }
+
+ if(ui->rbBGR32->isChecked()){
+ command+=" "+this->commandMap.value("textures->"+ui->rbBGR32->text());
+ }
+ else if(ui->rbBGRA32->isChecked()){
+ command+=" "+this->commandMap.value("textures->"+ui->rbBGRA32->text());
+ }
+ else if(ui->rbBGR555->isChecked()){
+ command+=" "+this->commandMap.value("textures->"+ui->rbBGR555->text());
+ }
+ else if(ui->rbBGRA5551->isChecked()){
+ command+=" "+this->commandMap.value("textures->"+ui->rbBGRA5551->text());
+ }
+ else if(ui->rbBGRA444->isChecked()){
+ command+=" "+this->commandMap.value("textures->"+ui->rbBGRA444->text());
+ }
+ else{ //dxt1 checked
+ command+=" "+this->commandMap.value("textures->"+ui->rbDxt1->text());
+ }
+
+ if(ui->cbEnvMap->isChecked()){
+ if(ui->leEnvMapTexture->text().isEmpty()){
+ showErrStatusMessage("Checkbox '"+ui->cbEnvMap->text()+"' is selected. The name texture name cannot be empty.");
+ return "";
+ }
+ command+=" "+this->commandMap.value("textures->"+ui->cbEnvMap->text()) + ui->leEnvMapTexture->text().remove(".oni",Qt::CaseInsensitive);
+ }
+ }
+
+ return command+=" "+file; //add source
+}
+
+QString MainWindow::fileParsingModels(QString myOutputFolder, QString from, QString to , QString file){
+
+ QString command=this->commandMap.value("models->"+from+"->"+to)+" "+myOutputFolder;
+
+ //TODO: This can be optimized. When some are not enable others are.
+ if(ui->cbTexture->isChecked()){
+ if(ui->leTextureName->text().isEmpty()){
+ showErrStatusMessage("Checkbox '"+ui->cbTexture->text()+"' is selected. The name cannot be empty.");
+ return "";
+ }
+ command+=" "+this->commandMap.value("models->"+ui->cbTexture->text()) + ui->leTextureName->text().remove(".oni",Qt::CaseInsensitive);
+ }
+
+ if(ui->cbCellShading->isChecked()){
+ command+=" "+this->commandMap.value("models->"+ui->cbCellShading->text());
+ }
+
+ if(ui->cbNormals->isChecked()){
+ command+=" "+this->commandMap.value("models->"+ui->cbNormals->text());
+ }
+
+ if(ui->cbWithAnimation->isEnabled()){
+ if(ui->cbWithAnimation->isChecked()){
+ command+=" "+this->commandMap.value("models->"+ui->cbWithAnimation->text())+ui->leAnimationName->text().remove(".oni",Qt::CaseInsensitive);
+ }
+ else{
+ command+=" "+this->commandMap.value("models->No Animation");
+ }
+ }
+
+
+ return command+=" "+file; //add source
+}
+
+QString MainWindow::fileParsingAnimations(QString myOutputFolder, QString from, QString to , QString file){
+
+ QString command=this->commandMap.value("animations->"+from+"->"+to)+" "+myOutputFolder + " " + file ;
+
+ if(ui->cbCamera->isChecked()){
+ command+=" "+this->commandMap.value("animations->"+ui->cbCamera->text());
+ }
+ else if(ui->cbGeometry->isChecked()){
+ if(ui->leGeometryName->text().isEmpty()){
+ showErrStatusMessage("Checkbox '"+ui->cbGeometry->text()+"' is selected. The geometry file path cannot be empty.");
+ return "";
+ }
+ command+=" "+this->commandMap.value("animations->"+ui->cbGeometry->text()) + (ui->leGeometryName->text().startsWith('"')?ui->leGeometryName->text():Util::insertQuotes(ui->leGeometryName->text()));
+ }
+
+ return command;
+}
+
+QString MainWindow::fileParsingLevels(QString myOutputFolder, QString from, QString to , QString file){
+
+ QString datName, command;
+
+ command=this->commandMap.value("levels->"+from+"->"+to)+" "+myOutputFolder+" "+file;
+
+ if(from=="MASTER XML" && to=="DAT"){
+ command+=GlobalVars::OniSplitProcSeparator; //insert mark so we know this action will take 2 commands
+
+ QString datName;
+ if(ui->cbDatLevels->isChecked()){
+ if(ui->leTargetDatLevels->text().isEmpty()){
+ showErrStatusMessage("Checkbox '"+ui->cbDatLevels->text()+"' is selected. The name cannot be empty.");
+ return "";
+ }
+ datName+=QString(myOutputFolder).insert(myOutputFolder.size()-1,ui->leTargetDatLevels->text()); //set name inputted by user
+ if(!ui->leTargetDatLevels->text().toUpper().endsWith(".DAT")){
+ datName.insert(datName.size()-1,".dat"); //append extension if necessary (-1 to maintain final quote)
+ }
+ }
+ else{
+ datName=QString(myOutputFolder).insert(myOutputFolder.size()-1,Util::cutName(file).remove("/").replace(".xml",".dat",Qt::CaseInsensitive)); //if none iputted set the same name of input file
+ }
+
+ if(ui->actionWindows->isChecked()){ //is target plataform select windows?
+ command+=this->commandMap.value("general->ONI->"+to+"(PC)")+" "+myOutputFolder+" "+datName; //add second command
+ }
+ else{
+ command+=this->commandMap.value("general->ONI->"+to+"(demoPCMAC)")+" "+myOutputFolder+" "+datName; //add second command
+ }
+ }
+
+ if(ui->cbBnvLevels->isChecked()){
+
+ if(ui->leBnvLevels->text().isEmpty()){
+ showErrStatusMessage("Checkbox '"+ui->cbBnvLevels->text()+"' is selected. The BNV file cannot be empty.");
+ return "";
+ }
+ command+=" "+Util::normalizeAndQuote(ui->leBnvLevels->text());
+ }
+
+ if(ui->cbAdditionalSourcesLevels->isChecked()){
+
+ if(ui->leAdditSourcesLevels->text().isEmpty()){
+ showErrStatusMessage("Checkbox '"+ui->cbAdditionalSourcesLevels->text()+"' is selected. The source files cannot be empty.");
+ return "";
+ }
+
+ QString additionalFiles=ui->leAdditSourcesLevels->text();
+
+ int currentIndex=0, nextIndex=0;
+
+ //parse all files (separated by spaces)
+ while(true){
+ nextIndex=additionalFiles.indexOf(" ",currentIndex+1);
+
+ command += " "+Util::normalizeAndQuote(additionalFiles.mid(currentIndex,(nextIndex-currentIndex)));
+
+ if(nextIndex==-1){ //we got to the end, stop parsing
+ break;
+ }
+ currentIndex=nextIndex+1; //update currentIndex +1 for start after the separator
+ }
+ }
+
+ if(ui->cbGridsLevels->isChecked()){
+ command+=GlobalVars::OniSplitProcSeparator+this->commandMap.value("levels->"+ui->cbGridsLevels->text())+" "+Util::normalizeAndQuote(ui->leBnvLevels->text())+" "+file+" -out:"+myOutputFolder;
+ }
+
+ return command;
+}
+
+QString MainWindow::fileParsingMisc(QString myOutputFolder, QString from, QString to , QString file){
+ return this->commandMap.value("misc->"+from+"->"+to)+" "+myOutputFolder+" "+file;
+}
+
+void MainWindow::addRowTable(DropTableWidget *myTable, QString fileName, QString fromTo, QString command){
+ //Get actual number rows
+ int twSize=myTable->rowCount();
+
+ //increase the rows for the new item
+ myTable->setRowCount(twSize+1);
+
+ //Add to table and list to
+ QTableWidgetItem *newFile = new QTableWidgetItem(fileName);
+ QTableWidgetItem *newConversion = new QTableWidgetItem(fromTo);
+ QTableWidgetItem *newCommand = new QTableWidgetItem(command);
+
+ myTable->setItem(twSize,0,newFile);
+ myTable->setItem(twSize,1,newConversion);
+ myTable->setItem(twSize,2,newCommand);
+
+ myTable->updateTableToolTips(twSize); //Update tool tips
+}
+
+void MainWindow::on_pbConvertGeneral_clicked()
+{
+ startConversion(ui->twSourcesGeneral);
+}
+
+void MainWindow::on_pbConvertTextures_clicked()
+{
+ startConversion(ui->twSourcesTextures);
+}
+
+void MainWindow::on_pbConvertModels_clicked()
+{
+ startConversion(ui->twSourcesModels);
+}
+
+void MainWindow::on_pbConvertAnimations_clicked()
+{
+ startConversion(ui->twSourcesAnimations);
+}
+
+void MainWindow::on_pbConvertLevels_clicked()
+{
+ startConversion(ui->twSourcesLevels);
+}
+
+void MainWindow::on_pbConvertMisc_clicked()
+{
+ startConversion(ui->twSourcesMisc);
+}
+
+void MainWindow::startConversion(DropTableWidget *myTable){
+
+ bool ready=false;
+ for(int i=0; irowCount(); i++){ //There are items to process?
+ if(myTable->item(i,2)->background()!=myTable->disabledBackStyle){
+ ready=true;
+ break;
+ }
+ }
+
+ if(!ready){
+ showErrStatusMessage("Please add sources to convert first.");
+ return;
+ }
+
+ if(myBar->isVisible()){
+ Util::showErrorPopUp("Another conversion is progress. Please wait until it finishes.");
+ return;
+ }
+
+ for(int i=0; irowCount(); i++){
+ //Only process enabled items
+ if(myTable->item(i,2)->background()!=myTable->disabledBackStyle){
+ this->listToProccess->append(myTable->item(i,2)->text());
+ }
+ }
+
+ this->myConverter->start();
+}
+
+void MainWindow::TsetupProgressBar(int max){
+ this->myBar->setValue(0);
+ this->myBar->show();
+ this->myBar->setMaximum(max);
+}
+
+void MainWindow::TupdateProgressBar(){
+ this->myBar->setValue(this->myBar->value()+1); //more one task done
+}
+
+void MainWindow::TresultConversion(QString result, int numErrors){
+ QApplication::alert(this); //Show a notification if window is not active
+ this->myBar->hide();
+
+ if(numErrors!=0){
+ QString sNumErrors=QString::number(numErrors);
+ if(numErrors>1){
+ Util::showErrorLogPopUp(result+"\n This is the last of "+sNumErrors+" Errors.");
+ showErrStatusMessage("Something gone wrong. Check log file ("+sNumErrors+" Errors).");
+ }
+ else{
+ Util::showErrorLogPopUp(result);
+ showErrStatusMessage("Something gone wrong. Check log file.");
+ }
+
+ }
+ else{
+ showSuccessStatusMessage("Everything went well!");
+ }
+}
+
+void MainWindow::showErrStatusMessage(QString message){
+
+ QPalette myPalete = QPalette();
+ myPalete.setColor( QPalette::WindowText, QColor(255,0,0));
+ statusBar()->setPalette( myPalete );
+ ui->statusBar->showMessage(message,10000); //display by 10 seconds
+
+}
+
+void MainWindow::showSuccessStatusMessage(QString message){
+
+ QPalette myPalete = QPalette();
+ myPalete.setColor( QPalette::WindowText, QColor(0,150,0));
+ statusBar()->setPalette( myPalete );
+ ui->statusBar->showMessage(message,10000); //display by 10 seconds
+
+}
+
+void MainWindow::mapCommands(){
+ ////////////////////////////////////////////////////////////////////////General Commands
+ this->commandMap.insert("general->DAT->ONI","-export");
+ //this->commandMap.insert("general->ONI->DAT","-import"); //Not used.
+ this->commandMap.insert("general->ONI->DAT(PC)","-import:nosep");
+ this->commandMap.insert("general->ONI->DAT(demoPCMAC)","-import:sep");
+ this->commandMap.insert("general->ONI->XML","-extract:xml");
+ this->commandMap.insert("general->XML->ONI","-create");
+ //######################General Options
+ this->commandMap.insert("general->"+ui->cbTRAMGeneral->text(),"-anim-body:");
+ //Possible Combinations
+ this->commandMap.insertMulti("general->DAT","ONI");
+ this->commandMap.insertMulti("general->ONI","DAT");
+ this->commandMap.insertMulti("general->ONI","XML");
+ this->commandMap.insertMulti("general->XML","ONI");
+
+ ////////////////////////////////////////////////////////////////////////Textures Commands
+ this->commandMap.insert("textures->DAT / ONI->DDS","-extract:dds");
+ this->commandMap.insert("textures->DAT / ONI->TGA","-extract:tga");
+ this->commandMap.insert("textures->DAT / ONI->PNG","-extract:png");
+ this->commandMap.insert("textures->DAT / ONI->JPG","-extract:jpg");
+ this->commandMap.insert("textures->DDS / TGA / PNG / JPG->ONI","-create:txmp");
+ //######################Textures Options
+ this->commandMap.insert("textures->"+ui->rbBGR32->text(),"-format:bgr32");
+ this->commandMap.insert("textures->"+ui->rbBGRA32->text(),"-format:bgra32");
+ this->commandMap.insert("textures->"+ui->rbBGR555->text(),"-format:bgr555");
+ this->commandMap.insert("textures->"+ui->rbBGRA5551->text(),"-format:bgra5551");
+ this->commandMap.insert("textures->"+ui->rbBGRA444->text(),"-format:bgra4444");
+ this->commandMap.insert("textures->"+ui->rbDxt1->text(),"-format:dxt1");
+ this->commandMap.insert("textures->"+ui->cbMipMapsTextures->text(),"-genmipmaps");
+ this->commandMap.insert("textures->"+ui->cbNoUwrap->text(),"-nouwrap");
+ this->commandMap.insert("textures->"+ui->cbNoVwrap->text(),"-novwrap");
+ this->commandMap.insert("textures->"+ui->cbLarge->text(),"-large");
+ this->commandMap.insert("textures->"+ui->cbEnvMap->text(),"-envmap:");
+ //Possible Combinations
+ this->commandMap.insertMulti("textures->DAT / ONI","DDS");
+ this->commandMap.insertMulti("textures->DAT / ONI","TGA");
+ this->commandMap.insertMulti("textures->DAT / ONI","PNG");
+ this->commandMap.insertMulti("textures->DAT / ONI","JPG");
+ this->commandMap.insertMulti("textures->DDS / TGA / PNG / JPG","ONI");
+
+ ////////////////////////////////////////////////////////////////////////Models Commands
+ this->commandMap.insert("models->ONI->OBJ","-extract:obj");
+ this->commandMap.insert("models->ONI->DAE","-extract:dae -search "+Util::insertQuotes(this->AeLocation+"/GameDataFolder/level0_Final"));
+ this->commandMap.insert("models->OBJ->ONI","-create:m3gm");
+ this->commandMap.insert("models->DAE->ONI","-create:trbs");
+ //######################Models Options
+ this->commandMap.insert("models->"+ui->cbCellShading->text(),"-cel");
+ this->commandMap.insert("models->"+ui->cbNormals->text(),"-normals");
+ this->commandMap.insert("models->"+ui->cbTexture->text(),"-tex:");
+ this->commandMap.insert("models->"+ui->cbWithAnimation->text(),"-anim:");
+ this->commandMap.insert("models->No Animation","-noanim"); //No label with this name so can't be dynamic
+ //Possible Combinations
+ this->commandMap.insertMulti("models->ONI","OBJ");
+ this->commandMap.insertMulti("models->ONI","DAE");
+ this->commandMap.insertMulti("models->OBJ","ONI");
+ this->commandMap.insertMulti("models->DAE","ONI");
+
+ ////////////////////////////////////////////////////////////////////////Animations Commands
+ this->commandMap.insert("animations->ONI->DAE","-extract:dae");
+ this->commandMap.insert("animations->FILM DAT->XML","film2xml");
+ //######################Animations Options
+ this->commandMap.insert("animations->"+ui->cbCamera->text(),"-geom:camera");
+ this->commandMap.insert("animations->"+ui->cbGeometry->text(),"-geom:");
+ //Possible Combinations
+ this->commandMap.insertMulti("animations->ONI","DAE");
+ this->commandMap.insertMulti("animations->DAE","ONI");
+ this->commandMap.insertMulti("animations->FILM DAT","XML");
+
+ ////////////////////////////////////////////////////////////////////////Levels Commands
+ this->commandMap.insert("levels->ONI->DAE","-extract:dae -search "+Util::insertQuotes(this->AeLocation+"/GameDataFolder/level0_Final"));
+ this->commandMap.insert("levels->DAE->ONI","-create:akev");
+ this->commandMap.insert("levels->MASTER XML->DAT","-create:level");
+ this->commandMap.insert("levels->MASTER XML->ONI FILES","-create:level");
+ //######################Levels Options
+ this->commandMap.insert("levels->"+ui->cbGridsLevels->text(),"-grid:create");
+ //Possible Combinations
+ this->commandMap.insertMulti("levels->ONI","DAE");
+ this->commandMap.insertMulti("levels->DAE","ONI");
+ this->commandMap.insertMulti("levels->MASTER XML","DAT");
+ this->commandMap.insertMulti("levels->MASTER XML","ONI FILES");
+
+ ////////////////////////////////////////////////////////////////////////Misc Commands
+ this->commandMap.insert("misc->DAT / ONI->WAV","-extract:wav");
+ this->commandMap.insert("misc->DAT / ONI->AIF","-extract:aif");
+ this->commandMap.insert("misc->DAT / ONI->TXT","-extract:txt");
+ this->commandMap.insert("misc->WAV / AIF->ONI","-create");
+ this->commandMap.insert("misc->TXT->ONI","-create:subt");
+ //Possible Combinations
+ this->commandMap.insertMulti("misc->DAT / ONI","WAV");
+ this->commandMap.insertMulti("misc->DAT / ONI","AIF");
+ this->commandMap.insertMulti("misc->DAT / ONI","TXT");
+ this->commandMap.insertMulti("misc->WAV / AIF","ONI");
+ this->commandMap.insertMulti("misc->TXT","ONI");
+
+}
+
+void MainWindow::on_cbFromGeneral_currentIndexChanged(const QString &arg1)
+{
+ updateComboBox(arg1, ui->cbToGeneral, "general");
+}
+
+void MainWindow::on_cbFromTextures_currentIndexChanged(const QString &arg1)
+{
+ //Options are only used for DAT/ONI -> Image
+ if(QString::compare(arg1,"DAT / ONI",Qt::CaseSensitive)==0){ //case sensitive is faster
+ ui->gbTextures->setEnabled(false);
+ }
+ else{
+ ui->gbTextures->setEnabled(true);
+ }
+
+ updateComboBox(arg1, ui->cbToTextures, "textures");
+}
+
+void MainWindow::on_cbFromModels_currentIndexChanged(const QString &arg1)
+{
+
+ ui->cbCellShading->setEnabled(false);
+ ui->cbCellShading->setChecked(false);
+ ui->cbNormals->setEnabled(false);
+ ui->cbNormals->setChecked(false);
+ ui->cbTexture->setEnabled(false);
+ ui->cbTexture->setChecked(false);
+ ui->cbWithAnimation->setEnabled(false);
+ ui->cbWithAnimation->setChecked(false);
+
+ if(QString::compare(arg1,"OBJ",Qt::CaseSensitive)==0){ //case sensitive is faster
+ ui->cbTexture->setEnabled(true);
+ }
+ else if(QString::compare(arg1,"DAE",Qt::CaseSensitive)==0){
+ ui->cbCellShading->setEnabled(true);
+ ui->cbNormals->setEnabled(true);
+ }
+
+ updateComboBox(arg1, ui->cbToModels, "models");
+}
+
+void MainWindow::on_cbFromAnimations_currentIndexChanged(const QString &arg1)
+{
+ ui->cbCamera->setEnabled(false);
+ ui->cbCamera->setChecked(false);
+ ui->cbGeometry->setEnabled(false);
+ ui->cbGeometry->setChecked(false);
+
+ if(QString::compare(arg1,"ONI",Qt::CaseSensitive)==0){ //case sensitive is faster
+ ui->cbCamera->setEnabled(true);
+ ui->cbGeometry->setEnabled(true);
+ }
+
+ updateComboBox(arg1, ui->cbToAnimations, "animations");
+}
+
+void MainWindow::on_cbFromLevels_currentIndexChanged(const QString &arg1)
+{
+ updateComboBox(arg1, ui->cbToLevels, "levels");
+}
+
+void MainWindow::on_cbFromMisc_currentIndexChanged(const QString &arg1)
+{
+ updateComboBox(arg1, ui->cbToMisc, "misc");
+}
+
+void MainWindow::updateComboBox(const QString &arg1, QComboBox *comboBox, const QString &identifier){
+ comboBox->clear();
+
+ QStringList toUpdate=QStringList();
+
+ QStringList values=commandMap.values(identifier+"->"+arg1);
+
+ for (int i = values.size()-1; i >= 0; i--){ //By defaut MultiItems have the inversed order (http://qt-project.org/doc/qt-4.8/qhash.html#insertMulti)
+ toUpdate << values.at(i);
+ }
+
+ comboBox->addItems(toUpdate);
+}
+
+
+void MainWindow::on_actionWindows_triggered()
+{
+ ui->actionWindows->setChecked(true);
+ ui->actionMac_Windows_demo->setChecked(false);
+}
+
+void MainWindow::on_actionMac_Windows_demo_triggered()
+{
+ ui->actionMac_Windows_demo->setChecked(true);
+ ui->actionWindows->setChecked(false);
+}
+
+void MainWindow::on_pbRemoveSourceGeneral_clicked()
+{
+ removeTableContents( ui->twSourcesGeneral);
+}
+
+void MainWindow::on_pbRemoveSourceTextures_clicked()
+{
+ removeTableContents(ui->twSourcesTextures);
+}
+
+void MainWindow::on_pbRemoveSourceModels_clicked()
+{
+ removeTableContents(ui->twSourcesModels);
+}
+
+void MainWindow::on_pbRemoveSourceAnimations_clicked()
+{
+ removeTableContents(ui->twSourcesAnimations);
+}
+
+void MainWindow::on_pbRemoveSourceLevels_clicked()
+{
+ removeTableContents(ui->twSourcesLevels);
+}
+
+void MainWindow::on_pbRemoveSourceMisc_clicked()
+{
+ removeTableContents(ui->twSourcesMisc);
+}
+
+void MainWindow::on_pbClearSourcesGeneral_clicked()
+{
+ clearTableContents(ui->twSourcesGeneral);
+}
+
+void MainWindow::on_pbClearSourcesTextures_clicked()
+{
+ clearTableContents(ui->twSourcesTextures);
+}
+
+void MainWindow::on_pbClearSourcesModels_clicked()
+{
+ clearTableContents(ui->twSourcesModels);
+}
+
+void MainWindow::on_pbClearSourcesAnimations_clicked()
+{
+ clearTableContents(ui->twSourcesAnimations);
+}
+
+void MainWindow::on_pbClearSourcesLevels_clicked()
+{
+ clearTableContents(ui->twSourcesLevels);
+}
+
+void MainWindow::on_pbClearSourcesMisc_clicked()
+{
+ clearTableContents(ui->twSourcesMisc);
+}
+
+void MainWindow::removeTableContents(DropTableWidget *myTable){
+ int size = myTable->selectionModel()->selectedRows().size();
+
+ if(size==0){
+ Util::showPopUp("Select a row first.");
+ return;
+ }
+
+ if(Util::showQuestionPopUp(this,"Are you sure you want to delete the selected rows?")){
+ for(int i=0; iremoveRow(myTable->selectedItems().at(size-i-1)->row());
+ myTable->removeRow(myTable->selectionModel()->selectedRows().at(size-i-1).row());
+ }
+ updateItemsLoaded(myTable);
+ }
+}
+
+void MainWindow::clearTableContents(DropTableWidget *myTable){
+ if(myTable->rowCount()==0){
+ Util::showPopUp("Nothing to clear.");
+ return;
+ }
+
+ if(Util::showQuestionPopUp(this,"Are you sure you want to clear the content?")){
+ myTable->clearContents();
+ myTable->setRowCount(0);
+ }
+ updateItemsLoaded(myTable);
+}
+
+
+void MainWindow::on_actionPreferences_triggered()
+{
+ //Show preferences
+ Preferences *preferencesWindow = new Preferences(this,this->vagoSettings);
+ preferencesWindow->exec(); //it destroys itself when finished.
+}
+
+
+void MainWindow::closeEvent(QCloseEvent *event){
+ if(this->vagoSettings->value("ConfirmExit").toBool()){
+ if(!Util::showQuestionPopUp(this,"Exit Vago?")){
+ event->ignore();
+ }
+ }
+}
+
+void MainWindow::on_cbToGeneral_currentIndexChanged(const QString &arg1)
+{
+
+ ui->cbDatGeneral->setEnabled(false);
+ ui->cbDatGeneral->setChecked(false);
+ ui->cbTRAMGeneral->setEnabled(false);
+ ui->cbTRAMGeneral->setChecked(false);
+
+ if(QString::compare(ui->cbFromGeneral->currentText(),"ONI",Qt::CaseSensitive)==0){
+ if(QString::compare(arg1,"DAT",Qt::CaseSensitive)==0){
+ ui->cbDatGeneral->setEnabled(true);
+ }
+ else{
+ ui->cbTRAMGeneral->setEnabled(true);
+ }
+ }
+
+}
+
+void MainWindow::on_cbToModels_currentIndexChanged(const QString &arg1)
+{
+ ui->cbWithAnimation->setEnabled(false);
+ ui->cbWithAnimation->setChecked(false);
+
+ if(arg1=="DAE"){
+ ui->cbWithAnimation->setEnabled(true);
+ }
+}
+
+void MainWindow::on_cbToLevels_currentIndexChanged(const QString &arg1)
+{
+
+ ui->cbDatLevels->setEnabled(false);
+ ui->cbDatLevels->setChecked(false);
+ ui->cbBnvLevels->setEnabled(false);
+ ui->cbBnvLevels->setChecked(false);
+ ui->cbAdditionalSourcesLevels->setEnabled(false);
+ ui->cbAdditionalSourcesLevels->setChecked(false);
+ ui->cbGridsLevels->setEnabled(false);
+ ui->cbGridsLevels->setChecked(false);
+
+ if(ui->cbFromLevels->currentText()=="MASTER XML" && arg1=="DAT"){
+ ui->cbDatLevels->setEnabled(true);
+ }
+ else if(ui->cbFromLevels->currentText()=="DAE" && arg1=="ONI"){
+ ui->cbBnvLevels->setEnabled(true);
+ ui->cbAdditionalSourcesLevels->setEnabled(true);
+ }
+}
+
+void MainWindow::on_cbDatGeneral_toggled(bool checked)
+{
+ ui->leTargetDatGeneral->setEnabled(checked);
+}
+
+void MainWindow::on_cbTRAMGeneral_toggled(bool checked)
+{
+ ui->leTRAMGeneral->setEnabled(checked);
+ if(checked){
+ QString file=QFileDialog::getOpenFileName(this,"Choose the TRAM.oni file...","./" , "All Files (*.*)");
+ if(!file.isEmpty()){
+ ui->leTRAMGeneral->setText(file);
+ }
+ }
+}
+
+void MainWindow::on_cbDatLevels_toggled(bool checked)
+{
+ ui->leTargetDatLevels->setEnabled(checked);
+}
+
+void MainWindow::on_cbBnvLevels_toggled(bool checked)
+{
+ ui->leBnvLevels->setEnabled(checked);
+ ui->cbGridsLevels->setEnabled(checked);
+ ui->cbGridsLevels->setChecked(checked);
+ if(checked){
+ QString file=QFileDialog::getOpenFileName(this,"Choose the BNV.dae file...","./" , "All Files (*.*)");
+ if(!file.isEmpty()){
+ ui->leBnvLevels->setText(file);
+ }
+ }
+}
+
+void MainWindow::on_cbAdditionalSourcesLevels_toggled(bool checked)
+{
+ ui->leAdditSourcesLevels->setEnabled(checked);
+
+ if(checked){
+ QStringList filesSelected=QFileDialog::getOpenFileNames(this,"Choose the additional .dae files...","./" , "All Files (*.*)");
+ QString filesJoined;
+ int size=filesSelected.size();
+
+ if(!filesSelected.isEmpty()){
+ for(int i=0; ileAdditSourcesLevels->setText(filesJoined);
+ }
+
+ }
+}
+
+void MainWindow::on_actionCheck_OniSplit_version_triggered()
+{
+ QProcess *myProcess = new QProcess();
+ myProcess->start(GlobalVars::OniSplitExeName+" -version");
+ myProcess->waitForFinished(-1);
+ QString result=myProcess->readAllStandardOutput();
+ delete myProcess;
+ Util::showPopUp("This Vago version was built with base in OniSplit version "+GlobalVars::BuiltOniSplitVersion+"\n\nActual version is:\n"+result);
+}
+
+void MainWindow::on_actionCheck_xmlTools_version_triggered()
+{
+ QProcess *myProcess = new QProcess();
+ myProcess->start(GlobalVars::XmlToolsExeName+" version");
+ myProcess->waitForFinished(-1);
+ QString result=myProcess->readLine();
+ delete myProcess;
+ Util::showPopUp("This Vago version was built with base in xmlTools version "+GlobalVars::BuiltXmlToolsVersion+"\n\nActual version is:\n"+result);
+}
+
+/**
+ Update items loaded
+ **/
+void MainWindow::on_tabWidget_selected(const QString &arg1)
+{
+ if(arg1.compare("General",Qt::CaseSensitive)==0){ //case sentive is faster
+ updateItemsLoaded(ui->twSourcesGeneral);
+ }
+ else if(arg1.compare("Textures",Qt::CaseSensitive)==0){
+ updateItemsLoaded(ui->twSourcesTextures);
+ }
+ else if(arg1.compare("Models",Qt::CaseSensitive)==0){
+ updateItemsLoaded(ui->twSourcesModels);
+ }
+ else if(arg1.compare("Levels",Qt::CaseSensitive)==0){
+ updateItemsLoaded(ui->twSourcesLevels);
+ }
+ else{
+ updateItemsLoaded(ui->twSourcesMisc);
+ }
+}
+
+void MainWindow::updateItemsLoaded(DropTableWidget *currentTable){
+
+ int numItems=currentTable->rowCount();
+
+ this->itemsLoaded->setText(QString().setNum(numItems)+ (numItems==1?" item ":" items ") +"loaded");
+}
+
+void MainWindow::on_tbCommand_clicked()
+{
+ //Show preferences
+ ManualCommands *commandsWindow = new ManualCommands(this);
+ commandsWindow->show(); //it destroys itself when finished.
+}
+
+void MainWindow::on_actionWorkspace_triggered()
+{
+ ui->actionWorkspace->setChecked(true);
+ ui->actionOther->setChecked(false);
+ this->outputFolder=this->workspaceLocation;
+ ui->tbOpenFolder->setToolTip("Open Vago workspace");
+ showSuccessStatusMessage("Vago is now outputting the NEW items for Vago workspace.");
+}
+
+void MainWindow::on_actionOther_triggered()
+{
+ QString newDir=QFileDialog::getExistingDirectory(this,"Choose the folder for output NEW files directly...",this->AeLocation+"/GameDataFolder");
+ newDir=Util::normalizePath(newDir);
+
+ if(newDir.isEmpty()){
+ ui->actionOther->setChecked(false);
+ return; //do nothing
+ }
+
+ if(newDir==this->workspaceLocation){
+ on_actionWorkspace_triggered(); //set it to vago workspace
+ return;
+ }
+
+ ui->actionOther->setChecked(true);
+ ui->actionWorkspace->setChecked(false);
+
+ this->outputFolder=newDir;
+
+ QString newDirName=Util::cutName(newDir);
+ ui->tbOpenFolder->setToolTip("Open "+newDirName+" output folder");
+ showSuccessStatusMessage("Vago is now outputting the NEW items for "+newDirName+".");
+}
+
+void MainWindow::on_actionView_log_triggered()
+{
+ Util::openLogFile();
+}
+
+QString MainWindow::getTypeConversion(DropTableWidget *myTable){
+ QString from,to;
+
+ if(myTable==ui->twSourcesGeneral){
+ from=ui->cbFromGeneral->currentText();
+ to=ui->cbToGeneral->currentText();
+ }
+ else if(myTable==ui->twSourcesTextures){
+ from=ui->cbFromTextures->currentText();
+ to=ui->cbToTextures->currentText();
+ }
+ else if(myTable==ui->twSourcesModels){
+ from=ui->cbFromModels->currentText();
+ to=ui->cbToModels->currentText();
+ }
+ else if(myTable==ui->twSourcesAnimations){
+ from=ui->cbFromAnimations->currentText();
+ to=ui->cbToAnimations->currentText();
+ }
+ else if(myTable==ui->twSourcesLevels){
+ from=ui->cbFromLevels->currentText();
+ to=ui->cbToLevels->currentText();
+ }
+ else{
+ from=ui->cbFromMisc->currentText();
+ to=ui->cbToMisc->currentText();
+ }
+
+ return from + " > " + to;
+}
+
+//Drop table widget context menu
+void MainWindow::dtContextMenu(DropTableWidget* myTable, QContextMenuEvent *event){
+ QModelIndex index = myTable->indexAt(event->pos());
+
+ //item exists?
+ if(!index.isValid())
+ return;
+
+ if(myTable->selectionModel()->selectedRows().size()==0){ //No multiple rows selected
+ myTable->selectRow(myTable->itemAt(event->pos())->row()); //select all the row of the item clicked
+ }
+
+ QList selectedRows = QList();
+
+ foreach(QModelIndex rowItem, myTable->selectionModel()->selectedRows()){
+ selectedRows << rowItem.row();
+ }
+
+ QMenu *menu = new QMenu();
+ QAction *copy = new QAction("Copy",myTable);
+ QAction *moveUp = new QAction("Move Up",myTable);
+ QAction *moveDown = new QAction("Move Down",myTable);
+ QAction *changeOptions = new QAction("Change To Current Options",myTable);
+ QMenu *changeOutput = new QMenu("Change Output for:");
+ QAction *outWorkspace = new QAction("Workspace",myTable);
+ QAction *outCurrOutput = new QAction("Current Output Folder",myTable);
+ QAction *outOther = new QAction("Other...",myTable);
+ QAction *edisable = new QAction("Enable/Disable",myTable);
+
+ menu->addAction(copy);
+ menu->addSeparator();
+ menu->addAction(moveUp);
+ menu->addAction(moveDown);
+ menu->addSeparator();
+ menu->addAction(changeOptions);
+ menu->addMenu(changeOutput);
+ changeOutput->addActions(QList() << outWorkspace << outCurrOutput << outOther);
+ menu->addAction(edisable);
+
+
+ //if it's in the first row it can't be setted up
+ if(selectedRows.at(0)==0){
+ moveUp->setEnabled(false);
+ }
+
+ //if we are at bottom we can't go down
+ if(selectedRows.at(selectedRows.size()-1)==myTable->rowCount()-1){
+ moveDown->setEnabled(false);
+ }
+
+ //Can we change the settings? (the conversion must be the same)
+ QString currentSettings = (getTypeConversion(myTable)); //call function at the mainWindow with a signal (different threads?)
+ foreach(int row, selectedRows){
+ if( myTable->item(row,1)->text() != currentSettings){ //If we find out any of the selected items can't be convert disable operation
+ changeOptions->setEnabled(false);
+ break;
+ }
+ }
+
+ QAction* selectedOption = menu->exec(event->globalPos());
+
+ if(selectedOption==copy){
+ //Let's copy the contents to the clipboard
+
+ QString toCopy;
+
+ int size=selectedRows.size();
+
+ //Let's format it a bit...
+ for(int i=0; icolumnCount(); j++){
+ toCopy+=myTable->item(selectedRows.at(i),j)->text();
+ if(j!=myTable->columnCount()-1){
+ toCopy+="\t";
+ }
+ }
+ if(i!=size-1){
+ toCopy+="\n";
+ }
+ }
+
+ QApplication::clipboard()->setText(toCopy);
+ showSuccessStatusMessage(QString::number(size) + (size==1?" item ":" items ")+ "copied to the clipboard");
+ }
+ else if(selectedOption==moveUp){
+ qSort(selectedRows); //let's order the selections by the row number, so we know exactly how to swap it
+ myTable->swapPositions(selectedRows,-1);
+ }
+ else if(selectedOption==moveDown){
+ qSort(selectedRows);
+ myTable->swapPositions(selectedRows,+1);
+ }
+ else if(selectedOption==changeOptions){
+ changeToCurrentSettings(selectedRows,myTable);
+ }
+ else if(selectedOption==outWorkspace){
+ changeItemsOutput(myTable,selectedRows,this->workspaceLocation);
+ }
+ else if(selectedOption==outCurrOutput){
+ changeItemsOutput(myTable,selectedRows,this->outputFolder);
+ }
+ else if(selectedOption==outOther){
+
+ QString newDir=QFileDialog::getExistingDirectory(this,"Choose the folder for the output of the files selected...",this->AeLocation+"/GameDataFolder");
+ newDir=Util::normalizePath(newDir);
+
+ if(newDir.isEmpty()){
+ return; //do nothing
+ }
+
+ changeItemsOutput(myTable,selectedRows,newDir);
+
+ }
+ else if(selectedOption==edisable){
+
+ int enabledCount=0, disabledCount=0;
+
+ for(int i=0; icolumnCount(); j++){
+ QTableWidgetItem *currentItem=myTable->item(selectedRows.at(i),j);
+
+ if(currentItem->background()!=myTable->disabledBackStyle){
+ myTable->setDisableStyleWidgetItem(currentItem);
+ if(j==0){ //Only count the row, not the columns
+ disabledCount++;
+ }
+ }
+ else{ //reset to initial state (enable)
+ myTable->resetStyleWidgetItem(currentItem);
+ if(j==0){
+ enabledCount++;
+ }
+ }
+ }
+ }
+
+ QString result;
+
+ if(enabledCount!=0){
+ result+=QString::number(enabledCount) + (enabledCount==1?" item ":" items ") + "Enabled";
+ }
+ if(enabledCount!=0 && disabledCount!=0){
+ result+=" and ";
+ }
+ if(disabledCount!=0){
+ result+=QString::number(disabledCount) + (disabledCount==1?" item ":" items ") + "Disabled";
+ }
+
+ showSuccessStatusMessage(result);
+ }
+
+ delete copy;
+ delete moveUp;
+ delete moveDown;
+ delete changeOptions;
+ delete outWorkspace;
+ delete outCurrOutput;
+ delete outOther;
+ delete changeOutput;
+ delete edisable;
+ delete menu;
+}
+
+void MainWindow::changeToCurrentSettings(QList rows, DropTableWidget* myTable){
+ //construct a command for each one
+ //Output a status message saying the number of changed files
+ QString fromTo=getTypeConversion(myTable);
+ QString from = QString(fromTo).remove(fromTo.indexOf(" >"),fromTo.size()-1); //parse the string to get the from, only 1 time parsed by each group of files = very fast
+ QString to = QString(fromTo).remove(0,fromTo.lastIndexOf("> ")+2); //+2 to start after "> "
+
+ QString command;
+
+ foreach(int row, rows){
+
+ command=getCommand(myTable,getFileOutputFolder(fromTo,myTable->getOutputAbsolute(row)),from,to,myTable->getFileAbsolute(row));
+
+ if(command.isEmpty()){ //something wrong was happening (not inputted a texture name?)
+ return; //stop changing settings
+ }
+
+ myTable->item(row,2)->setText(command); //update settings to the current row
+ myTable->updateTableToolTips(row);
+ }
+
+ showSuccessStatusMessage(QString::number(rows.size()) + (rows.size()==1?" item ":" items ")+ "changed to the current settings");
+}
+
+void MainWindow::changeItemsOutput(DropTableWidget* myTable, QList rows, QString newOutput){
+
+ QString command, currentAbsoluteFile, fromTo, from, to;
+
+ foreach(int row, rows){ //No optimization possible here, commands may be different
+ fromTo=myTable->item(row,1)->text();
+ from = QString(fromTo).remove(fromTo.indexOf(" >"),fromTo.size()-1); //parse the string to get the from
+ to = QString(fromTo).remove(0,fromTo.lastIndexOf("> ")+2); //+2 to start after "> "
+
+ currentAbsoluteFile=myTable->getFileAbsolute(row);
+ command=getCommand(myTable,getFileOutputFolder(fromTo,newOutput),from,to,currentAbsoluteFile);
+
+ if(command.isEmpty()){ //something wrong was happening (not inputted a texture name?)
+ return; //stop changing output
+ }
+
+ myTable->item(row,2)->setText(command); //update command to the current row
+ myTable->updateTableToolTips(row);
+ }
+
+ showSuccessStatusMessage(QString::number(rows.size()) + (rows.size()==1?" item ":" items ")+ "changed the output to "+(newOutput!=this->workspaceLocation?Util::cutName(newOutput):"Vago workspace"));
+}
+
+QString MainWindow::getCommand(DropTableWidget* myTable, QString myOutputFolder, QString from, QString to , QString file){
+ if(myTable==ui->twSourcesGeneral){ //So we only need to parse one command.
+ return fileParsingGeneral(myOutputFolder,from,to,file);
+ }
+ else if(myTable==ui->twSourcesTextures){
+ return fileParsingTextures(myOutputFolder,from,to,file);
+ }
+ else if(myTable==ui->twSourcesModels){
+ return fileParsingModels(myOutputFolder,from,to,file);
+ }
+ else if(myTable==ui->twSourcesAnimations){
+ return fileParsingAnimations(myOutputFolder,from,to,file);
+ }
+ else if(myTable==ui->twSourcesLevels){
+ return fileParsingLevels(myOutputFolder,from,to,file);
+ }
+ else{
+ return fileParsingMisc(myOutputFolder,from,to,file);
+ }
+
+}
+
+void MainWindow::connectSlots(){
+
+ //This signal is for thread that is working setup the progress bar (make it visible and set it's min-max)
+ connect(myConverter, SIGNAL(setupPB(int)), this, SLOT(TsetupProgressBar(int)), Qt::BlockingQueuedConnection);
+
+ //This signal is for thread that is working can update the progress bar of the gui
+ connect(myConverter, SIGNAL(taskDone()), this, SLOT(TupdateProgressBar()),Qt::BlockingQueuedConnection);
+
+ //This signal is for thread that is working can show the result of a conversion
+ connect(myConverter, SIGNAL(resultConversion(QString,int)), this, SLOT(TresultConversion(QString,int)));
+
+ //Drop signal for General table
+ connect(ui->twSourcesGeneral, SIGNAL(dropped(DropTableWidget*,QStringList)), this, SLOT(addFilesSource(DropTableWidget*,QStringList)));
+
+ //Drop signal for Textures table
+ connect(ui->twSourcesTextures, SIGNAL(dropped(DropTableWidget*,QStringList)), this, SLOT(addFilesSource(DropTableWidget*,QStringList)));
+
+ //Drop signal for Models table
+ connect(ui->twSourcesModels, SIGNAL(dropped(DropTableWidget*,QStringList)), this, SLOT(addFilesSource(DropTableWidget*,QStringList)));
+
+ //Drop signal for Animations table
+ connect(ui->twSourcesAnimations, SIGNAL(dropped(DropTableWidget*,QStringList)), this, SLOT(addFilesSource(DropTableWidget*,QStringList)));
+
+ //Drop signal for Levels table
+ connect(ui->twSourcesLevels, SIGNAL(dropped(DropTableWidget*,QStringList)), this, SLOT(addFilesSource(DropTableWidget*,QStringList)));
+
+ //Drop signal for Misc table
+ connect(ui->twSourcesMisc, SIGNAL(dropped(DropTableWidget*,QStringList)), this, SLOT(addFilesSource(DropTableWidget*,QStringList)));
+
+ //Context menu for General table
+ connect(ui->twSourcesGeneral, SIGNAL(dtContextMenu(DropTableWidget*,QContextMenuEvent*)), this, SLOT(dtContextMenu(DropTableWidget*,QContextMenuEvent*)));
+
+ //Context menu for Textures table
+ connect(ui->twSourcesTextures, SIGNAL(dtContextMenu(DropTableWidget*,QContextMenuEvent*)), this, SLOT(dtContextMenu(DropTableWidget*,QContextMenuEvent*)));
+
+ //Context menu for Models table
+ connect(ui->twSourcesModels, SIGNAL(dtContextMenu(DropTableWidget*,QContextMenuEvent*)), this, SLOT(dtContextMenu(DropTableWidget*,QContextMenuEvent*)));
+
+ //Context menu for Animations table
+ connect(ui->twSourcesAnimations, SIGNAL(dtContextMenu(DropTableWidget*,QContextMenuEvent*)), this, SLOT(dtContextMenu(DropTableWidget*,QContextMenuEvent*)));
+
+ //Context menu for Levels table
+ connect(ui->twSourcesLevels, SIGNAL(dtContextMenu(DropTableWidget*,QContextMenuEvent*)), this, SLOT(dtContextMenu(DropTableWidget*,QContextMenuEvent*)));
+
+ //Context menu for Misc table
+ connect(ui->twSourcesMisc, SIGNAL(dtContextMenu(DropTableWidget*,QContextMenuEvent*)), this, SLOT(dtContextMenu(DropTableWidget*,QContextMenuEvent*)));
+}
+
+
Index: /Vago/trunk/Vago/mainwindow.h
===================================================================
--- /Vago/trunk/Vago/mainwindow.h (revision 771)
+++ /Vago/trunk/Vago/mainwindow.h (revision 771)
@@ -0,0 +1,223 @@
+#ifndef MAINWINDOW_H
+#define MAINWINDOW_H
+
+#include "util.h"
+#include "preferences.h"
+#include "manualcommands.h"
+#include "about.h"
+#include "packagewizard.h"
+#include "soundwizard.h"
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+namespace Ui {
+class MainWindow;
+}
+
+class MainWindow : public QMainWindow
+{
+ Q_OBJECT
+
+public:
+ explicit MainWindow(QWidget *parent = 0);
+
+ ~MainWindow();
+
+protected:
+ void closeEvent(QCloseEvent *event);
+
+private slots:
+ void on_actionExit_triggered();
+
+ void on_actionAbout_triggered();
+
+ void on_tbOni_clicked();
+
+ void on_tbAE_clicked();
+
+ void on_tbOpenFolder_clicked();
+
+ void on_cbEnvMap_toggled(bool checked);
+
+ void on_cbTexture_toggled(bool checked);
+
+ void on_actionCheck_For_Updates_triggered();
+
+ void on_pbAddSourceGeneral_clicked();
+
+ void on_pbConvertGeneral_clicked();
+
+ void TsetupProgressBar(int max);
+
+ void TupdateProgressBar();
+
+ void TresultConversion(QString result, int numErrors);
+
+ void on_cbFromGeneral_currentIndexChanged(const QString &arg1);
+
+ void on_actionWindows_triggered();
+
+ void on_actionMac_Windows_demo_triggered();
+
+ void on_pbClearSourcesGeneral_clicked();
+
+ void on_pbRemoveSourceGeneral_clicked();
+
+ void on_pbAddSourceTextures_clicked();
+
+ void on_pbRemoveSourceTextures_clicked();
+
+ void on_pbClearSourcesTextures_clicked();
+
+ void on_cbFromTextures_currentIndexChanged(const QString &arg1);
+
+ void on_cbFromModels_currentIndexChanged(const QString &arg1);
+
+ void on_cbFromLevels_currentIndexChanged(const QString &arg1);
+
+ void on_cbFromMisc_currentIndexChanged(const QString &arg1);
+
+ void on_pbAddSourceModels_clicked();
+
+ void on_pbAddSourceLevels_clicked();
+
+ void on_pbAddSourceMisc_clicked();
+
+ void on_pbConvertTextures_clicked();
+
+ void on_pbConvertModels_clicked();
+
+ void on_pbConvertLevels_clicked();
+
+ void on_pbConvertMisc_clicked();
+
+ void on_pbRemoveSourceModels_clicked();
+
+ void on_pbRemoveSourceLevels_clicked();
+
+ void on_pbRemoveSourceMisc_clicked();
+
+ void on_pbClearSourcesModels_clicked();
+
+ void on_pbClearSourcesLevels_clicked();
+
+ void on_pbClearSourcesMisc_clicked();
+
+ void on_actionPreferences_triggered();
+
+ void on_cbToGeneral_currentIndexChanged(const QString &arg1);
+
+ void on_cbToLevels_currentIndexChanged(const QString &arg1);
+
+ void on_cbDatGeneral_toggled(bool checked);
+
+ void on_cbDatLevels_toggled(bool checked);
+
+ void on_actionCheck_OniSplit_version_triggered();
+
+ void addFilesSource(DropTableWidget *myTable, QStringList files); //for drag 'n drop
+
+ void dtContextMenu(DropTableWidget* myTable, QContextMenuEvent *event); //Context menu options for table widgets
+
+ void on_cbTRAMGeneral_toggled(bool checked);
+
+ void on_tabWidget_selected(const QString &arg1);
+
+ void checkVagoLastVersion(QNetworkReply *result); //check vago last version
+
+ void on_cbBnvLevels_toggled(bool checked);
+
+ void on_cbAdditionalSourcesLevels_toggled(bool checked);
+
+ void on_tbCommand_clicked();
+
+ void on_actionWorkspace_triggered();
+
+ void on_actionOther_triggered();
+
+ void on_actionView_log_triggered();
+
+ void on_cbToModels_currentIndexChanged(const QString &arg1);
+
+ void on_cbWithAnimation_toggled(bool checked);
+
+ void on_actionAE_Package_Creator_triggered();
+
+ void on_cbFromAnimations_currentIndexChanged(const QString &arg1);
+
+ void on_cbCamera_toggled(bool checked);
+
+ void on_cbGeometry_toggled(bool checked);
+
+ void on_pbConvertAnimations_clicked();
+
+ void on_pbAddSourceAnimations_clicked();
+
+ void on_pbRemoveSourceAnimations_clicked();
+
+ void on_pbClearSourcesAnimations_clicked();
+
+ void on_actionSound_Wizard_triggered();
+
+ void on_actionCheck_xmlTools_version_triggered();
+
+private:
+ Ui::MainWindow *ui;
+ Logger *myLogger;
+ QString workspaceLocation; //Workspace location
+ QString workspaceWizardsLocation; //Workspace wizard location
+ QString outputFolder; //Output folder
+ QString AeLocation; //Workspace location
+ QLabel *itemsLoaded;
+ QProgressBar *myBar; //Progress Bar
+ QHash commandMap; //Map the commands for fast retreive
+ QStringList *listToProccess; //items to proccess
+ Converter *myConverter;
+ QSettings *vagoSettings;
+ static const QString VagoSettingsName;
+
+ void connectSlots();
+ void showErrStatusMessage(QString message);
+ void showSuccessStatusMessage(QString message);
+ void mapCommands();
+ void addRowTable(DropTableWidget *myTable,QString file, QString fromTo, QString command);
+ void clearTableContents(DropTableWidget *myTable);
+ void removeTableContents(DropTableWidget *myTable);
+ void updateComboBox(const QString &arg1, QComboBox *comboBox, const QString &identifier);
+ void startConversion(DropTableWidget *myTable);
+ void updateItemsLoaded(DropTableWidget *currentTable);
+ void changeToCurrentSettings(QList rows, DropTableWidget* myTable); //change some rows to the current settings
+ void changeItemsOutput(DropTableWidget* myTable, QList rows, QString newOutput);
+ QString getFileOutputFolder(QString fromTo, QString myOutputFolder="");
+ QString fileParsingGeneral(QString myOutputFolder, QString from, QString to , QString file);
+ QString fileParsingTextures(QString myOutputFolder, QString from, QString to , QString file);
+ QString fileParsingModels(QString myOutputFolder, QString from, QString to , QString file);
+ QString fileParsingAnimations(QString myOutputFolder, QString from, QString to , QString file);
+ QString fileParsingLevels(QString myOutputFolder, QString from, QString to , QString file);
+ QString fileParsingMisc(QString myOutputFolder, QString from, QString to , QString file);
+ QString getCommand(DropTableWidget* myTable, QString myOutputFolder, QString from, QString to , QString file);
+ QString getTypeConversion(DropTableWidget *myTable); //get the current type for a table
+};
+
+#endif // MAINWINDOW_H
Index: /Vago/trunk/Vago/mainwindow.ui
===================================================================
--- /Vago/trunk/Vago/mainwindow.ui (revision 771)
+++ /Vago/trunk/Vago/mainwindow.ui (revision 771)
@@ -0,0 +1,1676 @@
+
+
+ MainWindow
+
+
+
+ 0
+ 0
+ 640
+ 480
+
+
+
+ Vago
+
+
+
+ :/new/icons/vago_icon.png:/new/icons/vago_icon.png
+
+
+
+ -
+
+
-
+
+
+ Open Vago workspace
+
+
+ ...
+
+
+
+ :/new/icons/folder_icon.png:/new/icons/folder_icon.png
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 20
+ 0
+
+
+
+
+
+
+
+ -
+
+
+ Manual OniSplit Commands
+
+
+ ...
+
+
+
+ :/new/icons/command_icon.png:/new/icons/command_icon.png
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 20
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+
+
+
+
+ -
+
+
+ Launch Oni
+
+
+ ...
+
+
+
+ :/new/icons/oni_icon.png:/new/icons/oni_icon.png
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 20
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+
+
+
+
+ -
+
+
+ Launch AE installer
+
+
+ ...
+
+
+
+ :/new/icons/AE_icon.png:/new/icons/AE_icon.png
+
+
+
+
+
+ -
+
+
+ 0
+
+
+
+ General
+
+
+
-
+
+
-
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ From
+
+
+
+ -
+
+
-
+
+ DAT
+
+
+ -
+
+ ONI
+
+
+ -
+
+ XML
+
+
+
+
+
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ To
+
+
+
+ -
+
+
-
+
+ ONI
+
+
+
+
+
+
+
+
+ -
+
+
-
+
+
+ Sources
+
+
+
-
+
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ Add
+
+
+
+ -
+
+
+ Remove
+
+
+
+ -
+
+
+ Clear
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+ true
+
+
+ Options
+
+
+
-
+
+
-
+
+
-
+
+
+ false
+
+
+ DAT Filename:
+
+
+
+ -
+
+
+ false
+
+
+ Custom .dat filename
+
+
+
+
+
+
+
+ -
+
+
+ false
+
+
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Extract an ONCC with another character's TRAM</span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">For example extract Konoko's ONCC with Muro's TRAM</span></p></body></html>
+
+
+ Another TRAM:
+
+
+
+ -
+
+
+ false
+
+
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Extract an ONCC with another character's TRAM</span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">For example extract Konoko's ONCC with Muro's TRAM</span></p></body></html>
+
+
+ TRAM.oni source file
+
+
+
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ -
+
+
+
+ 0
+ 30
+
+
+
+ Convert
+
+
+
+
+
+
+
+ Textures
+
+
+ -
+
+
-
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ From
+
+
+
+ -
+
+
-
+
+ DAT / ONI
+
+
+ -
+
+ DDS / TGA / PNG / JPG
+
+
+
+
+
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ To
+
+
+
+ -
+
+
-
+
+ DDS
+
+
+ -
+
+ TGA
+
+
+ -
+
+ PNG
+
+
+ -
+
+ JPG
+
+
+
+
+
+
+
+
+ -
+
+
+ Sources
+
+
+
-
+
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ Add
+
+
+
+ -
+
+
+ Remove
+
+
+
+ -
+
+
+ Clear
+
+
+
+
+
+
+
+
+ -
+
+
+ false
+
+
+ Options
+
+
+
-
+
+
-
+
+
-
+
+
+ BGR32
+
+
+ true
+
+
+
+ -
+
+
+ BGRA32
+
+
+
+ -
+
+
+ BGR555
+
+
+
+ -
+
+
+ BGRA5551
+
+
+
+ -
+
+
+ BGRA444
+
+
+
+ -
+
+
+ dxt1
+
+
+
+
+
+ -
+
+
-
+
+
+ GenMipMaps
+
+
+ true
+
+
+
+ -
+
+
+ NoUwrap
+
+
+
+ -
+
+
+ NoVwrap
+
+
+
+ -
+
+
+ Large
+
+
+
+ -
+
+
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Used for reflection in armors. The armor texture has an alpha channel which is transparent and the envmap texture is shown.</span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">It's the name of a TXMP.oni file, don't include the extension.</span></p></body></html>
+
+
+ EnvMap:
+
+
+
+ -
+
+
+ false
+
+
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Used for reflection in armors. The armor texture has an alpha channel which is transparent and the envmap texture is shown.</span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">It's the name of a TXMP.oni file, don't include the extension.</span></p></body></html>
+
+
+ EnvMap texture name
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ -
+
+
+
+ 0
+ 30
+
+
+
+ Convert
+
+
+
+
+
+
+
+ Models
+
+
+ -
+
+
-
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ From
+
+
+
+ -
+
+
-
+
+ ONI
+
+
+ -
+
+ OBJ
+
+
+ -
+
+ DAE
+
+
+
+
+
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ To
+
+
+
+ -
+
+
-
+
+ OBJ
+
+
+ -
+
+ DAE
+
+
+
+
+
+
+
+
+ -
+
+
+ Sources
+
+
+
-
+
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ Add
+
+
+
+ -
+
+
+ Remove
+
+
+
+ -
+
+
+ Clear
+
+
+
+
+
+
+
+
+ -
+
+
+ Options
+
+
+
-
+
+
-
+
+
-
+
+
+ false
+
+
+ Cell Shading
+
+
+
+ -
+
+
+ false
+
+
+ Normals
+
+
+
+ -
+
+
+ false
+
+
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Extract the model with a specific animation. </span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">If none inputted (and checkbox is selected) it will search for one at ONCC>TRAC.</span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">It's the name of a TRAM.oni file, don't include the extension.</span></p></body></html>
+
+
+ With Animation:
+
+
+
+ -
+
+
+ false
+
+
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Extract the model with a specific animation. </span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">If none inputted (and checkbox is selected) it will search for one at </span><span style=" font-weight:600;">ONCC>TRAC.</span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">It's the name of a TRAM.oni file, don't include the extension.</span></p></body></html>
+
+
+ Animation name
+
+
+
+ -
+
+
+ false
+
+
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Give model a texture.</span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">It's the name of a TXMP.oni file, don't include the extension.</span></p></body></html>
+
+
+ Texture:
+
+
+
+ -
+
+
+ false
+
+
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Give model a texture. </span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">It's the name of a TXMP.oni file, don't include the extension.</span></p></body></html>
+
+
+ Texture name
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ -
+
+
+
+ 0
+ 30
+
+
+
+ Convert
+
+
+
+
+
+
+
+ Animations
+
+
+ -
+
+
-
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ From
+
+
+
+ -
+
+
-
+
+ ONI
+
+
+ -
+
+ FILM DAT
+
+
+
+
+
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ To
+
+
+
+ -
+
+
-
+
+ DAE
+
+
+
+
+
+
+
+
+ -
+
+
+ Sources
+
+
+
-
+
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ Add
+
+
+
+ -
+
+
+ Remove
+
+
+
+ -
+
+
+ Clear
+
+
+
+
+
+
+
+
+ -
+
+
+ Options
+
+
+
-
+
+
-
+
+
-
+
+
+ true
+
+
+ Camera
+
+
+
+ -
+
+
+ true
+
+
+
+
+
+ Geometry:
+
+
+
+ -
+
+
+ false
+
+
+
+
+
+ Geometry file path
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ -
+
+
+
+ 0
+ 30
+
+
+
+ Convert
+
+
+
+
+
+
+
+ Levels
+
+
+ -
+
+
-
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ From
+
+
+
+ -
+
+
-
+
+ ONI
+
+
+ -
+
+ DAE
+
+
+ -
+
+ MASTER XML
+
+
+
+
+
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ To
+
+
+
+ -
+
+
-
+
+ DAE
+
+
+
+
+
+
+
+
+ -
+
+
+ Sources
+
+
+
-
+
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ Add
+
+
+
+ -
+
+
+ Remove
+
+
+
+ -
+
+
+ Clear
+
+
+
+
+
+
+
+
+ -
+
+
+ true
+
+
+ Options
+
+
+
-
+
+
-
+
+
+ false
+
+
+
+ 115
+ 0
+
+
+
+ DAT Filename:
+
+
+
+ -
+
+
+ false
+
+
+ Custom .dat level filename
+
+
+
+ -
+
+
+ false
+
+
+ Bnv Source:
+
+
+
+ -
+
+
+ false
+
+
+ Bnv .dae source file
+
+
+
+
+
+ -
+
+
-
+
+
+ false
+
+
+ Additional Sources:
+
+
+
+ -
+
+
+ false
+
+
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Use "space" as separator for each file</span></p></body></html>
+
+
+ Additional .dae sources for akev (e.g. env_markers.dae)
+
+
+
+ -
+
+
+ false
+
+
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Generate pathfinding grids (master xml generates them automatically). Needs Bnv source.</span></p></body></html>
+
+
+ Generate Grids
+
+
+
+
+
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ -
+
+
+
+ 0
+ 30
+
+
+
+ Convert
+
+
+
+
+
+
+
+ Misc
+
+
+ -
+
+
-
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ From
+
+
+
+ -
+
+
-
+
+ DAT / ONI
+
+
+ -
+
+ WAV / AIF
+
+
+ -
+
+ TXT
+
+
+
+
+
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ To
+
+
+
+ -
+
+
-
+
+ WAV
+
+
+ -
+
+ AIF
+
+
+ -
+
+ TXT
+
+
+
+
+
+
+
+
+ -
+
+
+ Sources
+
+
+
-
+
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ Add
+
+
+
+ -
+
+
+ Remove
+
+
+
+ -
+
+
+ Clear
+
+
+
+
+
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ -
+
+
+
+ 0
+ 30
+
+
+
+ Convert
+
+
+
+
+
+
+
+
+
+
+
+
+ TopToolBarArea
+
+
+ false
+
+
+
+
+ Qt::LeftToRight
+
+
+
+
+ Exit
+
+
+
+
+ About
+
+
+
+
+ Check for Vago updates
+
+
+
+
+ true
+
+
+ true
+
+
+ Windows
+
+
+
+
+ true
+
+
+ Mac / Windows demo
+
+
+
+
+ Preferences
+
+
+
+
+ Check OniSplit version
+
+
+
+
+ Clean Workspace
+
+
+
+
+ true
+
+
+ true
+
+
+ Workspace
+
+
+ Workspace
+
+
+
+
+ true
+
+
+ Other...
+
+
+ Other
+
+
+
+
+
+ :/new/icons/log.png:/new/icons/log.png
+
+
+ View log file
+
+
+
+
+
+ :/new/icons/package.png:/new/icons/package.png
+
+
+ AEI Mod Package Wizard
+
+
+
+
+
+ :/new/icons/sound.png:/new/icons/sound.png
+
+
+ Sound Wizard
+
+
+
+
+ Check XmlTools version
+
+
+
+
+
+
+ DropTableWidget
+ QTableWidget
+
+
+
+
+
+
+
+
Index: /Vago/trunk/Vago/manualcommands.cpp
===================================================================
--- /Vago/trunk/Vago/manualcommands.cpp (revision 771)
+++ /Vago/trunk/Vago/manualcommands.cpp (revision 771)
@@ -0,0 +1,161 @@
+#include "manualcommands.h"
+#include "ui_manualcommands.h"
+
+ManualCommands::ManualCommands(QWidget *parent) :
+ QMainWindow(parent),
+ ui(new Ui::ManualCommands)
+{
+ ui->setupUi(this);
+ this->setAttribute(Qt::WA_DeleteOnClose,true); //destroy itself once finished.
+ this->myProcess = new QProcess();
+ this->myProcess->setProcessChannelMode(QProcess::MergedChannels);
+ ui->leManualCommand->installEventFilter(this);
+
+ this->nextInsertHistoryIdx=0;
+ this->searchHistoryIdx=0;
+ for(int i=0; ilimHistory; i++){
+ this->history[i]=""; //clean array
+ }
+}
+
+ManualCommands::~ManualCommands()
+{
+ delete myProcess;
+ delete ui;
+}
+
+void ManualCommands::on_pbInput_clicked()
+{
+ executeCommand();
+}
+
+void ManualCommands::executeCommand(){
+
+ QString command=ui->leManualCommand->text().trimmed();
+
+ if(command.isEmpty()){
+ Util::showErrorPopUp("Please input a command first.");
+ return;
+ }
+
+ //Only add to the history if the last command is different
+ bool different=false;
+ if(this->nextInsertHistoryIdx==0){ //at the limit
+ if(this->history[this->limHistory-1]!=command){
+ different=true;
+ }
+ }
+ else{
+ if(this->history[this->nextInsertHistoryIdx-1]!=command){
+ different=true;
+ }
+ }
+
+ if(different){
+ this->history[this->nextInsertHistoryIdx++]=command; //assign and increment
+
+ if(this->nextInsertHistoryIdx==this->limHistory){ //if we are at the limit begin override
+ this->nextInsertHistoryIdx=0;
+ }
+ }
+
+ this->myProcess->start(GlobalVars::OniSplitExeName+" "+ui->leManualCommand->text());
+ this->myProcess->waitForFinished(120000); //wait 2 minutes at maximum
+ ui->ptOutput->appendPlainText("> "+command);
+ ui->ptOutput->appendPlainText(this->myProcess->readAll());
+ ui->ptOutput->ensureCursorVisible();
+ ui->ptOutput->verticalScrollBar()->setValue( ui->ptOutput->verticalScrollBar()->maximum() );
+ ui->leManualCommand->clear();
+}
+
+void ManualCommands::on_pcCopyClipboard_clicked()
+{
+ QApplication::clipboard()->setText(ui->ptOutput->toPlainText());
+}
+
+void ManualCommands::on_pbClear_clicked()
+{
+ if(Util::showQuestionPopUp(this,"Clear the output?")){
+ ui->ptOutput->clear();
+ }
+}
+
+//Allows detecting arrows press for history without subclassing lineedit.
+bool ManualCommands::eventFilter(QObject* obj, QEvent *event)
+{
+ if (obj == ui->leManualCommand)
+ {
+ if (event->type() == QEvent::KeyPress)
+ {
+ QKeyEvent* keyEvent = static_cast(event);
+ if (keyEvent->key() == Qt::Key_Up) //UP ARROW
+ {
+
+ int oldValue=this->searchHistoryIdx;
+
+ //if it isn't the first member of history continue decrementing
+ if(this->searchHistoryIdx!=this->nextInsertHistoryIdx){ //for when it didn't the round
+ this->searchHistoryIdx--;
+ }
+
+ //start with the last elemented inputted
+ if(ui->leManualCommand->text().trimmed().isEmpty()){
+ this->searchHistoryIdx=this->nextInsertHistoryIdx-1;
+ }
+
+ //rotate
+ if(this->searchHistoryIdx < 0){
+ this->searchHistoryIdx=this->limHistory-1; //start from behind (49)
+ }
+ else if(this->searchHistoryIdx == this->limHistory){
+ this->searchHistoryIdx=0; //start from 0 again
+ }
+
+ //not filled yet value? Stop.
+ if(this->history[this->searchHistoryIdx].isEmpty()){
+ this->searchHistoryIdx=oldValue;
+ return true;
+ }
+
+ ui->leManualCommand->setText(this->history[this->searchHistoryIdx]);
+
+ return true;
+
+ }
+ else if(keyEvent->key() == Qt::Key_Down) //DOWN ARROW
+ {
+ if(ui->leManualCommand->text().trimmed().isEmpty()){
+ return true;
+ }
+
+ int oldValue=this->searchHistoryIdx;
+
+ //Continue incrementing if it isnt the last member of history
+ if(this->searchHistoryIdx!=this->nextInsertHistoryIdx-1 && //for when it didn't the round
+ !(this->nextInsertHistoryIdx==0 && this->searchHistoryIdx==this->limHistory-1)){ //for when it did the round
+ this->searchHistoryIdx++;
+ }
+
+ //rotate
+ if(this->searchHistoryIdx < 0){
+ this->searchHistoryIdx=this->limHistory-1; //start from behind (49)
+ }
+ else if(this->searchHistoryIdx == this->limHistory){
+ this->searchHistoryIdx=0; //start from 0 again
+ }
+
+ //not filled yet value? Stop.
+ if(this->history[this->searchHistoryIdx].isEmpty()){
+ this->searchHistoryIdx=oldValue;
+ return true;
+ }
+
+ ui->leManualCommand->setText(this->history[this->searchHistoryIdx]);
+
+ return true;
+ }
+ }
+ return false;
+ }
+ return QMainWindow::eventFilter(obj, event);
+}
Index: /Vago/trunk/Vago/manualcommands.h
===================================================================
--- /Vago/trunk/Vago/manualcommands.h (revision 771)
+++ /Vago/trunk/Vago/manualcommands.h (revision 771)
@@ -0,0 +1,43 @@
+#ifndef MANUALCOMMANDS_H
+#define MANUALCOMMANDS_H
+
+#include
+#include
+#include
+#include
+#include
+
+
+namespace Ui {
+class ManualCommands;
+}
+
+class ManualCommands : public QMainWindow
+{
+ Q_OBJECT
+
+public:
+ explicit ManualCommands(QWidget *parent = 0);
+ ~ManualCommands();
+
+protected:
+ bool eventFilter(QObject* obj, QEvent *event);
+
+private slots:
+ void on_pbInput_clicked();
+
+ void on_pcCopyClipboard_clicked();
+
+ void on_pbClear_clicked();
+
+private:
+ void executeCommand();
+ Ui::ManualCommands *ui;
+ static const int limHistory=50;
+ QString history[limHistory]; //this is kinda a circular buffer manual implementation (http://www.boost.org/doc/libs/1_36_0/libs/circular_buffer/doc/circular_buffer.html)
+ int nextInsertHistoryIdx; //next index where new commands will be inserted
+ int searchHistoryIdx; //current index when searching history with arrows
+ QProcess *myProcess;
+};
+
+#endif // MANUALCOMMANDS_H
Index: /Vago/trunk/Vago/manualcommands.ui
===================================================================
--- /Vago/trunk/Vago/manualcommands.ui (revision 771)
+++ /Vago/trunk/Vago/manualcommands.ui (revision 771)
@@ -0,0 +1,155 @@
+
+
+ ManualCommands
+
+
+
+ 0
+ 0
+ 460
+ 300
+
+
+
+ Manual OniSplit Commands
+
+
+
+ -
+
+
+ Input
+
+
+
-
+
+
-
+
+
+ Command:
+
+
+
+ -
+
+
+ Input the command directly (up arrow for last inputted)
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Input
+
+
+
+
+
+
+
+
+ -
+
+
+ Output
+
+
+
-
+
+
+ true
+
+
+
+
+
+
+ -
+
+
-
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+
+ 100
+ 0
+
+
+
+ Copy to clipboard
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::Fixed
+
+
+
+ 20
+ 20
+
+
+
+
+ -
+
+
+
+ 100
+ 0
+
+
+
+ Clear
+
+
+
+
+
+
+
+
+
+
+
+ leManualCommand
+ returnPressed()
+ pbInput
+ click()
+
+
+ 95
+ 42
+
+
+ 404
+ 50
+
+
+
+
+
Index: /Vago/trunk/Vago/packageWizard/packagepage2.cpp
===================================================================
--- /Vago/trunk/Vago/packageWizard/packagepage2.cpp (revision 771)
+++ /Vago/trunk/Vago/packageWizard/packagepage2.cpp (revision 771)
@@ -0,0 +1,209 @@
+#include "packagepage2.h"
+#include "ui_packagepage2.h"
+
+const QString PackagePage2::ZipCacheFile = "jsoncache.zip";
+const QString PackagePage2::PackagesCacheUrl = "http://mods.oni2.net/jsoncache/"+ZipCacheFile;
+const QString PackagePage2::CacheFile = "nodes.json";
+
+PackagePage2::PackagePage2(Logger *myLogger, QWidget *parent) :
+ QWizardPage(parent),
+ ui(new Ui::PackagePage2)
+{
+ ui->setupUi(this);
+ this->myLogger=myLogger;
+ this->setTitle("Mandatory Fields");
+
+ //Register fields to be accessible in another pages //Not using mandatory field, it would require empty verification too...
+ registerField("leModName", ui->leModName);
+ registerField("leAuthors", ui->leAuthors);
+ registerField("leVersion", ui->leVersion);
+ registerField("ptDescription", ui->ptDescription,"plainText");
+ registerField("lePackageNumber", ui->lePackageNumber);
+ registerField("rbReplace", ui->rbReplace);
+}
+
+bool PackagePage2::validatePage(){
+ QString modName=ui->leModName->text();
+ QString authors=ui->leAuthors->text();
+ QString version=ui->leVersion->text();
+ QString description=ui->ptDescription->toPlainText();
+ QString number=ui->lePackageNumber->text();
+
+ bool emptyContent=Util::checkEmptySpaces(QStringList()<lePackageNumber->text();
+
+ if(Util::checkEmptySpaces(QStringList(number))){
+ Util::showErrorPopUp("Number is empty. Please fill it first.");
+ return;
+ }
+
+ if(number.size()!=5){
+ Util::showErrorPopUp("Invalid number format. It should contain 5 numbers.");
+ return;
+ }
+
+ if(Util::isStringInteger(number)){
+
+ bool necessaryToRedownload=false;
+
+ QFile *file = new QFile(GlobalVars::VagoTemporaryDir+"/"+this->ZipCacheFile);
+
+ if(!file->exists()){
+ necessaryToRedownload=true; //File doesn't exist yet, necessary to download
+ }
+ else if (QDateTime::currentDateTime().toTime_t()-QFileInfo(*file).lastModified().toTime_t() > 150){ //checks between 2 minutes (give more 30 seconds due to zip extraction)
+ necessaryToRedownload=true; //File already exists but already expired (+2 mins without update)
+ }
+ delete file;
+
+ if(necessaryToRedownload){
+ //let's start the search in the web, so we make sure it doesn't exists yet
+ QNetworkAccessManager *manager = new QNetworkAccessManager(this);
+ connect(manager, SIGNAL(finished(QNetworkReply*)),
+ this, SLOT(downloadPackagesCache(QNetworkReply*)));
+
+ //This timestamp is to guarantee that the cache received is fresh even through proxys
+ QDateTime currTime = QDateTime::currentDateTime();
+ QString t_time = QString::number(currTime.toTime_t());
+
+ manager->get(QNetworkRequest(QUrl(this->PackagesCacheUrl+"?ts="+t_time)));
+ }
+ else{ //Not needed to download! :) Let's use our local cache.
+ checkForPackagesInCache();
+ }
+ }
+ else{
+ Util::showErrorPopUp("Number is not numeric.");
+ }
+}
+
+void PackagePage2::downloadPackagesCache(QNetworkReply *result){
+
+ if(result->error()==QNetworkReply::NoError){
+
+ QFile *file = new QFile(GlobalVars::VagoTemporaryDir+"/"+this->ZipCacheFile);
+
+ // Create temp folder if it doesn't exist
+ if(!QDir(GlobalVars::VagoTemporaryDir).exists()){
+ QDir().mkdir(GlobalVars::VagoTemporaryDir);
+ }
+
+ if(!file->open(QIODevice::WriteOnly)){
+ const QString error="Error fetching package data: creating cache file.";
+ this->myLogger->writeString(error);
+ Util::showErrorPopUp(error);
+ return;
+ }
+ file->write(result->readAll());
+ file->close();
+
+ //Let's extract the cache data
+ UnZip uz;
+ UnZip::ErrorCode ec = uz.openArchive(GlobalVars::VagoTemporaryDir+"/"+this->ZipCacheFile);
+ checkForUnzipError(ec);
+
+ //Extract the cache files
+ ec = uz.extractAll(GlobalVars::VagoTemporaryDir);
+ checkForUnzipError(ec);
+
+ //Close zip archive
+ uz.closeArchive();
+
+ delete file;
+
+ checkForPackagesInCache();
+
+ }
+ else{
+ const QString error="An error occurred checking number availability:\n\n"+result->errorString();
+ this->myLogger->writeString(error);
+ Util::showErrorLogPopUp(error);
+ }
+
+ result->deleteLater();
+}
+
+void PackagePage2::checkForPackagesInCache(){
+ QString packageNumber=ui->lePackageNumber->text();
+
+ QFile *file = new QFile(GlobalVars::VagoTemporaryDir+"/"+this->CacheFile); //let's read the chache unzipped
+ if(!file->open(QIODevice::ReadOnly)){
+ const QString error="Error reading downloaded package cache data.";
+ this->myLogger->writeString(error);
+ Util::showErrorPopUp(error);
+ return;
+ }
+ //Read file cache to ram
+ QString data=file->readAll();
+
+
+ //Let's play with json engine
+ QScriptEngine engine;
+ QScriptValue sc = engine.evaluate("(" + data + ")");
+
+ QScriptValue currNumber;
+ QString existingModName,existingModUrl;
+
+ QScriptValueIterator it(sc);
+
+ while (it.hasNext()) {
+ it.next();
+ currNumber=it.value().toObject().property("field_package_number").toObject().property("und").toObject().property("0").toObject().property("value");
+ if(currNumber.isValid() && currNumber.toString() == packageNumber){
+ existingModName = it.value().toObject().property("title").toString();
+ existingModUrl = it.value().toObject().property("path").toString();
+ break;
+ }
+ }
+
+ if(!existingModName.isEmpty()){
+ Util::showRichErrorPopUp("Package "+packageNumber+" is already being used by the following mod:
"+
+ existingModName+"
"+
+ "More information here.");
+ }
+ else{
+ Util::showPopUp("Package "+packageNumber+" seems it's not being used yet! :)");
+ }
+
+ delete file;
+}
+
+void PackagePage2::on_cbType_currentIndexChanged(int index)
+{
+ ui->lePackageNumber->setText(QString().setNum(index+1)+"000X");
+}
+
+void PackagePage2::checkForUnzipError(UnZip::ErrorCode ec){
+ if (ec != UnZip::Ok){
+ const QString error="Error found while unzipping the package data. Error number = "+QString::number(ec);
+ Util::showErrorPopUp(error);
+ this->myLogger->writeString(error);
+ }
+}
Index: /Vago/trunk/Vago/packageWizard/packagepage2.h
===================================================================
--- /Vago/trunk/Vago/packageWizard/packagepage2.h (revision 771)
+++ /Vago/trunk/Vago/packageWizard/packagepage2.h (revision 771)
@@ -0,0 +1,44 @@
+#ifndef PACKAGEPAGE2_H
+#define PACKAGEPAGE2_H
+
+#include "util.h"
+#include "logger.h"
+#include "unzip.h"
+#include
+#include
+#include
+#include
+#include
+#include
+
+namespace Ui {
+class PackagePage2;
+}
+
+class PackagePage2 : public QWizardPage
+{
+ Q_OBJECT
+
+public:
+ explicit PackagePage2(Logger *myLogger, QWidget *parent = 0);
+
+ ~PackagePage2();
+
+private slots:
+ void on_pbCheck_clicked();
+ void downloadPackagesCache(QNetworkReply *result);
+
+ void on_cbType_currentIndexChanged(int index);
+ bool validatePage();
+
+private:
+ Ui::PackagePage2 *ui;
+ Logger *myLogger;
+ static const QString ZipCacheFile;
+ static const QString CacheFile;
+ static const QString PackagesCacheUrl;
+ void checkForUnzipError(UnZip::ErrorCode ec);
+ void checkForPackagesInCache();
+};
+
+#endif // PACKAGEPAGE2_H
Index: /Vago/trunk/Vago/packageWizard/packagepage2.ui
===================================================================
--- /Vago/trunk/Vago/packageWizard/packagepage2.ui (revision 771)
+++ /Vago/trunk/Vago/packageWizard/packagepage2.ui (revision 771)
@@ -0,0 +1,336 @@
+
+
+ PackagePage2
+
+
+
+ 0
+ 0
+ 400
+ 353
+
+
+
+
+ 0
+ 0
+
+
+
+ WizardPage
+
+
+ -
+
+
-
+
+
+
+ 84
+ 0
+
+
+
+ Mod Name:
+
+
+
+ -
+
+
+ -
+
+
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; color:#0000ff;">*</span></p></body></html>
+
+
+
+
+
+ -
+
+
-
+
+
+
+ 84
+ 0
+
+
+
+ Author(s):
+
+
+
+ -
+
+
+ -
+
+
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; color:#0000ff;">*</span></p></body></html>
+
+
+
+
+
+ -
+
+
-
+
+
+
+ 84
+ 0
+
+
+
+ Version:
+
+
+
+ -
+
+
+ -
+
+
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; color:#0000ff;">*</span></p></body></html>
+
+
+
+
+
+ -
+
+
-
+
+
+
+ 84
+ 0
+
+
+
+ Description:
+
+
+
+ -
+
+
+
+ 16777215
+ 100
+
+
+
+
+ -
+
+
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; color:#0000ff;">*</span></p></body></html>
+
+
+
+
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 84
+ 0
+
+
+
+ Type:
+
+
+
+ -
+
+
-
+
+ Weapons
+
+
+ -
+
+ Characters
+
+
+ -
+
+ Particles
+
+
+ -
+
+ Animations (non-combat)
+
+
+ -
+
+ Animations (combat)
+
+
+ -
+
+ Sounds
+
+
+ -
+
+ User Interface
+
+
+ -
+
+ New Levels
+
+
+ -
+
+ Scenarios
+
+
+
+
+
+
+ -
+
+
-
+
+
+ Package Number:
+
+
+
+ -
+
+
+ -
+
+
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Check if the current number is available using a online database</span></p></body></html>
+
+
+ Check
+
+
+
+
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 84
+ 0
+
+
+
+ Scripts:
+
+
+
+ -
+
+
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">The Installer considers your mod a scenario and takes steps to exclude other BSL scenario mods from being installed for the same level</span></p></body></html>
+
+
+ Replace
+
+
+ true
+
+
+
+ -
+
+
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">The Installer allows your mod to be installed to any level without restriction (allows multiple BSLs from different mods to co-exist in the same level)</span></p></body></html>
+
+
+ Add
+
+
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
+ -
+
+
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; color:#0000ff;">* Fields read </span><span style=" font-size:8pt; color:#0000ff;">only</span><span style=" font-size:8pt; color:#0000ff;"> by AEI2 when the package isn't at the mod depot.</span></p></body></html>
+
+
+
+
+
+
+
+
Index: /Vago/trunk/Vago/packageWizard/packagepage3.cpp
===================================================================
--- /Vago/trunk/Vago/packageWizard/packagepage3.cpp (revision 771)
+++ /Vago/trunk/Vago/packageWizard/packagepage3.cpp (revision 771)
@@ -0,0 +1,64 @@
+#include "packagepage3.h"
+#include "ui_packagepage3.h"
+
+PackagePage3::PackagePage3(QWidget *parent) :
+ QWizardPage(parent),
+ ui(new Ui::PackagePage3)
+{
+ ui->setupUi(this);
+ this->setTitle("Optional Fields");
+ this->setSubTitle("Separate multiple elements by commas.");
+
+ //Register fields
+ registerField("leDependentPackages", ui->leDependent);
+ registerField("leIncompatiblePackages", ui->leIncompatible);
+ registerField("leUnlockLevels", ui->leUnlockLevels);
+}
+
+bool PackagePage3::validatePage(){
+ QString dependentPackages=ui->leDependent->text().trimmed();
+ QString incompatiblePackages=ui->leIncompatible->text().trimmed();
+ QString unlockLevels=ui->leUnlockLevels->text().trimmed();
+
+ if(!validateField(dependentPackages) || !validateField(incompatiblePackages)
+ || !validateField(unlockLevels,true)){
+ return false;
+ }
+
+ return true;
+}
+
+bool PackagePage3::validateField(QString &field, bool isLevels){
+ //Check if the numbers are correct and correctly separated
+ if(!field.isEmpty()){
+
+ QStringList list =Util::substring(field,",");
+
+ for(int i=0; i
+#include "util.h"
+
+namespace Ui {
+class PackagePage3;
+}
+
+class PackagePage3 : public QWizardPage
+{
+ Q_OBJECT
+
+public:
+ explicit PackagePage3(QWidget *parent = 0);
+ ~PackagePage3();
+
+private:
+ Ui::PackagePage3 *ui;
+ bool validateField(QString &field, bool isLevels=false);
+ bool validatePage();
+};
+
+#endif // PACKAGEPAGE3_H
Index: /Vago/trunk/Vago/packageWizard/packagepage3.ui
===================================================================
--- /Vago/trunk/Vago/packageWizard/packagepage3.ui (revision 771)
+++ /Vago/trunk/Vago/packageWizard/packagepage3.ui (revision 771)
@@ -0,0 +1,120 @@
+
+
+ PackagePage3
+
+
+
+ 0
+ 0
+ 364
+ 290
+
+
+
+ WizardPage
+
+
+ -
+
+
-
+
+
+
+ 113
+ 0
+
+
+
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Fill with the packages number which this package will depend</span></p></body></html>
+
+
+ Dependent Packages:
+
+
+
+ -
+
+
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Fill with the packages number which this package will depend</span></p></body></html>
+
+
+
+
+
+ -
+
+
-
+
+
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Fill with the packages number that will conflict with this package</span></p></body></html>
+
+
+ Incompatible Packages:
+
+
+
+ -
+
+
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Fill with the packages number that will conflict with this package</span></p></body></html>
+
+
+
+
+
+ -
+
+
-
+
+
+
+ 113
+ 0
+
+
+
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">If this package use new levels, specify its number to get them unlocked automatically</span></p></body></html>
+
+
+ Unlock Levels:
+
+
+
+ -
+
+
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">If this package use new levels, specify its number to get them unlocked automatically</span></p></body></html>
+
+
+
+
+
+
+
+
+
+
Index: /Vago/trunk/Vago/packageWizard/packagepage4.cpp
===================================================================
--- /Vago/trunk/Vago/packageWizard/packagepage4.cpp (revision 771)
+++ /Vago/trunk/Vago/packageWizard/packagepage4.cpp (revision 771)
@@ -0,0 +1,167 @@
+#include "packagepage4.h"
+#include "ui_packagepage4.h"
+
+PackagePage4::PackagePage4(QWidget *parent) :
+ QWizardPage(parent),
+ ui(new Ui::PackagePage4)
+{
+ ui->setupUi(this);
+ this->setTitle("Package Files");
+ this->setSubTitle("Add here the resources to the correspondent plataform for your package.");
+
+ commonTable=ui->twCommon;
+ windowsTable=ui->twWindows;
+ macTable=ui->twMac;
+
+ //Setup package resources tables
+ QStringList headers = QStringList()<<"Folder"<<"Type"<<"Full Path";
+ ui->twCommon->setHorizontalHeaderLabels(headers);
+ ui->twCommon->setColumnWidth(1,75); //set size for type
+ ui->twWindows->setHorizontalHeaderLabels(headers);
+ ui->twWindows->setColumnWidth(1,75);
+ ui->twMac->setHorizontalHeaderLabels(headers);
+ ui->twMac->setColumnWidth(1,75);
+ //
+
+ //Set +- tooltips
+ on_pbSwitchFiles_clicked();
+
+ ui->tbCommonMinus->setToolTip("Remove the selected common OS folders");
+ ui->tbWindowsMinus->setToolTip("Remove the selected Windows OS folders");
+ ui->tbMacMinus->setToolTip("Remove the selected Mac OS folders");
+
+ connectSlots();
+}
+
+PackagePage4::~PackagePage4()
+{
+ delete ui;
+}
+
+void PackagePage4::on_pbSwitchFiles_clicked()
+{
+ if(ui->pbSwitchFiles->text()==".oni files"){
+ ui->pbSwitchFiles->setText(".bsl files");
+ ui->pbSwitchFiles->setToolTip("Click to add folders with .oni-patch files instead");
+ }
+ else if(ui->pbSwitchFiles->text()==".bsl files"){
+ ui->pbSwitchFiles->setText(".oni-patch files");
+ ui->pbSwitchFiles->setToolTip("Click to add folders with .oni files instead");
+ }
+ else{
+ ui->pbSwitchFiles->setText(".oni files");
+ ui->pbSwitchFiles->setToolTip("Click to add folders with .bsl files files instead");
+ }
+
+ ui->tbCommonPlus->setToolTip("Add common OS folders with "+ui->pbSwitchFiles->text());
+ ui->tbWindowsPlus->setToolTip("Add Windows OS folders with "+ui->pbSwitchFiles->text());
+ ui->tbMacPlus->setToolTip("Add Mac OS folders with "+ui->pbSwitchFiles->text());
+}
+
+
+void PackagePage4::addResourcesPackage(DropTableWidget *myTable, QStringList resources){
+
+ //Pre-processing (check if received only folders)
+ foreach(QString myFile, resources){
+ if(!QDir(myFile).exists()){
+ Util::showErrorPopUp("Only folders are allowed for this operation.");
+ return;
+ }
+ }
+
+ QString type=ui->pbSwitchFiles->text().replace(" files","");
+
+ foreach(QString currentFolder, resources){
+
+ currentFolder=Util::normalizePath(currentFolder); //normalize path
+
+ //Get actual number rows
+ int twSize=myTable->rowCount();
+
+ //increase the rows for the new item
+ myTable->setRowCount(twSize+1);
+
+ //Add to table and list to
+ QTableWidgetItem *newFolder = new QTableWidgetItem(Util::cutName(currentFolder));
+ QTableWidgetItem *newType = new QTableWidgetItem(type);
+ QTableWidgetItem *newFullPath = new QTableWidgetItem(currentFolder);
+
+ myTable->setItem(twSize,0,newFolder);
+ myTable->setItem(twSize,1,newType);
+ myTable->setItem(twSize,2,newFullPath);
+ myTable->updateTableToolTips(twSize); //Update tool tips
+ }
+}
+
+void PackagePage4::connectSlots(){
+ //Drop signal for Packages table
+ connect(ui->twCommon, SIGNAL(dropped(DropTableWidget*,QStringList)), this, SLOT(addResourcesPackage(DropTableWidget*,QStringList)));
+ connect(ui->twWindows, SIGNAL(dropped(DropTableWidget*,QStringList)), this, SLOT(addResourcesPackage(DropTableWidget*,QStringList)));
+ connect(ui->twMac, SIGNAL(dropped(DropTableWidget*,QStringList)), this, SLOT(addResourcesPackage(DropTableWidget*,QStringList)));
+}
+
+void PackagePage4::on_tbCommonPlus_clicked()
+{
+ addTableContents(ui->twCommon);
+}
+
+void PackagePage4::on_tbCommonMinus_clicked()
+{
+ removeTableContents(ui->twCommon);
+}
+
+void PackagePage4::on_tbWindowsPlus_clicked()
+{
+ addTableContents(ui->twWindows);
+}
+
+void PackagePage4::on_tbWindowsMinus_clicked()
+{
+ removeTableContents(ui->twWindows);
+}
+
+void PackagePage4::on_tbMacPlus_clicked()
+{
+ addTableContents(ui->twMac);
+}
+
+void PackagePage4::on_tbMacMinus_clicked()
+{
+ removeTableContents(ui->twMac);
+}
+
+void PackagePage4::addTableContents(DropTableWidget *myTable){
+ if(ui->pbSwitchFiles->text()==".oni files"){
+ addResourcesPackage(myTable,Util::multipleDirDialog("Choose folders with .oni files..."));
+ }
+ else if(ui->pbSwitchFiles->text()==".bsl files"){
+ addResourcesPackage(myTable,Util::multipleDirDialog("Choose folders with .bsl files..."));
+ }
+ else{
+ addResourcesPackage(myTable,Util::multipleDirDialog("Choose folders with .oni-patch files..."));
+ }
+}
+
+void PackagePage4::removeTableContents(DropTableWidget *myTable){
+ int size = myTable->selectionModel()->selectedRows().size();
+
+ if(size==0){
+ Util::showPopUp("Select a row first.");
+ return;
+ }
+
+ if(Util::showQuestionPopUp(this,"Are you sure you want to delete the selected rows?")){
+ for(int i=0; iremoveRow(myTable->selectionModel()->selectedRows().at(size-i-1).row());
+ }
+ }
+}
+
+bool PackagePage4::validatePage(){
+ if(ui->twCommon->rowCount()==0 && ui->twWindows->rowCount()==0 && ui->twMac->rowCount()==0){
+ Util::showErrorPopUp("You need to add some folders with resources first!");
+ return false;
+ }
+
+ return true;
+}
Index: /Vago/trunk/Vago/packageWizard/packagepage4.h
===================================================================
--- /Vago/trunk/Vago/packageWizard/packagepage4.h (revision 771)
+++ /Vago/trunk/Vago/packageWizard/packagepage4.h (revision 771)
@@ -0,0 +1,47 @@
+#ifndef PACKAGEPAGE4_H
+#define PACKAGEPAGE4_H
+
+#include
+
+#include "droptablewidget.h"
+
+namespace Ui {
+class PackagePage4;
+}
+
+class PackagePage4 : public QWizardPage
+{
+ Q_OBJECT
+
+public:
+ const DropTableWidget *commonTable;
+ const DropTableWidget *windowsTable;
+ const DropTableWidget *macTable;
+ explicit PackagePage4(QWidget *parent = 0);
+ ~PackagePage4();
+
+private slots:
+ void on_pbSwitchFiles_clicked();
+ void addResourcesPackage(DropTableWidget *myTable, QStringList resources); //for packages drop
+
+ void on_tbCommonPlus_clicked();
+
+ void on_tbCommonMinus_clicked();
+
+ void on_tbWindowsPlus_clicked();
+
+ void on_tbWindowsMinus_clicked();
+
+ void on_tbMacPlus_clicked();
+
+ void on_tbMacMinus_clicked();
+
+private:
+ Ui::PackagePage4 *ui;
+ void connectSlots();
+ void addTableContents(DropTableWidget *myTable);
+ void removeTableContents(DropTableWidget *myTable);
+ bool validatePage();
+};
+
+#endif // PACKAGEPAGE4_H
Index: /Vago/trunk/Vago/packageWizard/packagepage4.ui
===================================================================
--- /Vago/trunk/Vago/packageWizard/packagepage4.ui (revision 771)
+++ /Vago/trunk/Vago/packageWizard/packagepage4.ui (revision 771)
@@ -0,0 +1,202 @@
+
+
+ PackagePage4
+
+
+
+ 0
+ 0
+ 408
+ 300
+
+
+
+ WizardPage
+
+
+ -
+
+
-
+
+
-
+
+
+
+ 250
+ 0
+
+
+
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Common</span></p></body></html>
+
+
+
+ -
+
+
+ Click to add folders with .bsl files instead
+
+
+ patch files
+
+
+
+ :/new/icons/switch.png:/new/icons/switch.png
+
+
+
+
+
+ -
+
+
-
+
+
+ -
+
+
-
+
+
+ ...
+
+
+
+ :/new/icons/plus.png:/new/icons/plus.png
+
+
+
+ -
+
+
+ ...
+
+
+
+ :/new/icons/minus.png:/new/icons/minus.png
+
+
+
+
+
+
+
+
+
+ -
+
+
-
+
+
-
+
+
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Windows Only</span></p></body></html>
+
+
+
+ -
+
+
-
+
+
+ -
+
+
-
+
+
+ ...
+
+
+
+ :/new/icons/plus.png:/new/icons/plus.png
+
+
+
+ -
+
+
+ ...
+
+
+
+ :/new/icons/minus.png:/new/icons/minus.png
+
+
+
+
+
+
+
+
+
+ -
+
+
-
+
+
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Mac OS Only</span></p></body></html>
+
+
+
+ -
+
+
-
+
+
+ -
+
+
-
+
+
+ ...
+
+
+
+ :/new/icons/plus.png:/new/icons/plus.png
+
+
+
+ -
+
+
+ ...
+
+
+
+ :/new/icons/minus.png:/new/icons/minus.png
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ DropTableWidget
+ QTableWidget
+
+
+
+
+
+
+
+
Index: /Vago/trunk/Vago/packageWizard/packagepagefinal.cpp
===================================================================
--- /Vago/trunk/Vago/packageWizard/packagepagefinal.cpp (revision 771)
+++ /Vago/trunk/Vago/packageWizard/packagepagefinal.cpp (revision 771)
@@ -0,0 +1,34 @@
+#include "packagepagefinal.h"
+#include "ui_packagepagefinal.h"
+
+PackagePageFinal::PackagePageFinal(QSettings *vagoSettings, QWidget *parent) :
+ QWizardPage(parent),
+ ui(new Ui::PackagePageFinal)
+{
+ ui->setupUi(this);
+ this->setTitle("Finished");
+
+ //Use the global var for the depot domain so it's easier to change in the code if the domain changes
+ ui->lbComplete->setText(ui->lbComplete->text().replace("mods.oni2.net",GlobalVars::ModsDomain));
+
+ ui->lbComplete->setOpenExternalLinks(true); //allow navigate to mod depot
+
+ //Default checkboxes values
+ if(!vagoSettings->contains("PackageCreator/OpenFolder")){
+ vagoSettings->setValue("PackageCreator/OpenFolder", true);
+ }
+ if(!vagoSettings->contains("PackageCreator/CreateZip")){
+ vagoSettings->setValue("PackageCreator/CreateZip",true);
+ }
+
+ //remember them next time
+ ui->cbOpenFolder->setChecked(vagoSettings->value("PackageCreator/OpenFolder").toBool());
+ ui->cbCreateZip->setChecked(vagoSettings->value("PackageCreator/CreateZip").toBool());
+ registerField("cbOpenFolder", ui->cbOpenFolder);
+ registerField("cbCreateZip", ui->cbCreateZip);
+}
+
+PackagePageFinal::~PackagePageFinal()
+{
+ delete ui;
+}
Index: /Vago/trunk/Vago/packageWizard/packagepagefinal.h
===================================================================
--- /Vago/trunk/Vago/packageWizard/packagepagefinal.h (revision 771)
+++ /Vago/trunk/Vago/packageWizard/packagepagefinal.h (revision 771)
@@ -0,0 +1,26 @@
+#ifndef PACKAGEPAGEFINAL_H
+#define PACKAGEPAGEFINAL_H
+
+#include "util.h"
+#include "logger.h"
+
+#include
+#include
+
+namespace Ui {
+class PackagePageFinal;
+}
+
+class PackagePageFinal : public QWizardPage
+{
+ Q_OBJECT
+
+public:
+ explicit PackagePageFinal(QSettings *vagoSettings, QWidget *parent=0);
+ ~PackagePageFinal();
+
+private:
+ Ui::PackagePageFinal *ui;
+};
+
+#endif // PACKAGEPAGEFINAL_H
Index: /Vago/trunk/Vago/packageWizard/packagepagefinal.ui
===================================================================
--- /Vago/trunk/Vago/packageWizard/packagepagefinal.ui (revision 771)
+++ /Vago/trunk/Vago/packageWizard/packagepagefinal.ui (revision 771)
@@ -0,0 +1,72 @@
+
+
+ PackagePageFinal
+
+
+
+ 0
+ 0
+ 400
+ 300
+
+
+
+ WizardPage
+
+
+ -
+
+
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">The wizard is now complete. The package will be created when you click in finish.</span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">After that you can upload the package to </span><a href="www.mods.oni2.net"><span style=" text-decoration: underline; color:#0000ff;">mods.oni2.net</span></a><span style=" font-size:8pt;"> to get your mod listed in the AEI.</span></p></body></html>
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+ QSizePolicy::Fixed
+
+
+
+ 20
+ 30
+
+
+
+
+ -
+
+
+ After the package creation
+
+
+
-
+
+
+ Open the folder automatically where the package resides
+
+
+
+ -
+
+
+ Automatically create a zip archive for the package
+
+
+
+
+
+
+
+
+
+
+
Index: /Vago/trunk/Vago/packageWizard/packagewizard.cpp
===================================================================
--- /Vago/trunk/Vago/packageWizard/packagewizard.cpp (revision 771)
+++ /Vago/trunk/Vago/packageWizard/packagewizard.cpp (revision 771)
@@ -0,0 +1,220 @@
+#include "packagewizard.h"
+
+PackageWizard::PackageWizard(QString workspaceWizardLocation, QSettings *vagoSettings, Logger *myLogger)
+{
+ this->workspaceWizardLocation=workspaceWizardLocation;
+ this->vagoSettings=vagoSettings;
+ this->myLogger=myLogger;
+ this->packagesLocation=this->workspaceWizardLocation+"/Packages";
+}
+
+int PackageWizard::exec(){
+ QWizard myWizard;
+
+ myWizard.setWindowIcon(QIcon(":/new/icons/package.png"));
+
+ //Center and resize QWizard (http://www.thedazzlersinc.com/source/2012/06/04/qt-center-window-in-screen/)
+ myWizard.resize(640,480);
+ QRect position = myWizard.frameGeometry();
+ position.moveCenter(QDesktopWidget().availableGeometry().center());
+ myWizard.move(position.topLeft());
+ //
+
+ PackagePage2 *page2 = new PackagePage2(this->myLogger);
+ PackagePage3 *page3 = new PackagePage3();
+ PackagePage4 *page4 = new PackagePage4();
+ PackagePageFinal *pageFinal = new PackagePageFinal(this->vagoSettings);
+
+ myWizard.addPage(createIntroPage());
+ myWizard.addPage(page2);
+ myWizard.addPage(page3);
+ myWizard.addPage(page4);
+ myWizard.addPage(pageFinal);
+
+ myWizard.setWindowTitle("AIE2 Package Creator");
+
+ //If wizard finished with sucess
+ if(myWizard.exec()){ //modal and wait for finalization
+ createPackage(myWizard, page4);
+ }
+
+ return 0;
+}
+
+QWizardPage* PackageWizard::createIntroPage() {
+ QWizardPage *page = new QWizardPage;
+ page->setTitle("Introduction");
+
+ QLabel *label = new QLabel("Welcome to the Anniversary Edition Installer 2 (AIE2) package"
+ " creator wizard.\n"
+ "This wizard will allow you to create in a few and simple steps a package for AIE2.");
+ label->setWordWrap(true);
+
+ QVBoxLayout *layout = new QVBoxLayout;
+ layout->addWidget(label);
+ page->setLayout(layout);
+
+ return page;
+}
+
+void PackageWizard::createPackage(const QWizard &myWizard, PackagePage4 *page4){
+ const QString aeVersion="2.0";
+
+ //Get info page 2
+ QString modName=myWizard.field("leModName").toString();
+ QString authors=myWizard.field("leAuthors").toString();
+ QString version=myWizard.field("leVersion").toString();
+ QString description=myWizard.field("ptDescription").toString();
+ QString packageNumber=myWizard.field("lePackageNumber").toString();
+ bool bslReplace=myWizard.field("rbReplace").toBool();
+
+ //Get info page 3
+ QString dependentPackages=myWizard.field("leDependentPackages").toString();
+ QString incompatiblePackages=myWizard.field("leIncompatiblePackages").toString();
+ QString unlockLevels=myWizard.field("leUnlockLevels").toString();
+
+ //Get info page 4
+ const DropTableWidget *commonTable=page4->commonTable;
+ const DropTableWidget *windowsTable=page4->windowsTable;
+ const DropTableWidget *macTable=page4->macTable;
+
+ //Get info from final page
+ bool openFolder=myWizard.field("cbOpenFolder").toBool();
+ bool createZip=myWizard.field("cbCreateZip").toBool();
+ //Remember the final page choices to next time
+ this->vagoSettings->setValue("PackageCreator/OpenFolder",openFolder);
+ this->vagoSettings->setValue("PackageCreator/CreateZip",createZip);
+
+ const QString packageName=packageNumber+Util::fullTrim(modName);
+
+ // Start package creation...
+
+ // Create Packages folder if it doesn't exist
+ if(!QDir(this->packagesLocation).exists()){
+ QDir().mkpath(this->packagesLocation);
+ }
+
+ QString modDir=this->packagesLocation+"/"+packageName+"/";
+
+ QDir().mkdir(modDir);
+
+ bool bslExist=false;
+
+ if(commonTable->rowCount()>0){
+ copyPackageFolders(commonTable,"common",modDir,bslExist);
+ }
+
+ if(windowsTable->rowCount()>0){
+ copyPackageFolders(windowsTable,"win_only",modDir,bslExist);
+ }
+
+ if(macTable->rowCount()>0){
+ copyPackageFolders(macTable,"mac_only",modDir,bslExist);
+ }
+
+ QFile *modInfo = new QFile(modDir+"Mod_Info.cfg");
+
+ if (!modInfo->open(QIODevice::WriteOnly | QIODevice::Text)){ //open to write
+ Util::showErrorPopUp("Couldn't' create Mod_Info.cfg file.");
+ myLogger->writeString("Couldn't' create Mod_Info.cfg file when creating AE Package.");
+ return;
+ }
+
+ QTextStream *modWriteStream = new QTextStream (modInfo);
+ *modWriteStream << "AEInstallVersion -> "+aeVersion+"\n";
+ *modWriteStream << "NameOfMod -> "+modName+"\n";
+ *modWriteStream << "ModVersion -> "+version+"\n";
+ *modWriteStream << "Creator -> "+authors+"\n";
+ *modWriteStream << "Readme -> "+description.replace("\n"," \\n ")+"\n";
+ if(!incompatiblePackages.isEmpty()){
+ *modWriteStream << "IncompatibleWith -> "+incompatiblePackages+"\n";
+ }
+ if(!dependentPackages.isEmpty()){
+ *modWriteStream << "DependsOn -> "+dependentPackages+"\n";
+ }
+
+ if(bslExist){
+ if(bslReplace){
+ *modWriteStream << "HasBsl -> Yes\n";
+ }
+ else{
+ *modWriteStream << "HasBsl -> Addon\n";
+ }
+ }
+
+ if(!unlockLevels.isEmpty()){
+ *modWriteStream << "UnlockLevel -> "+unlockLevels+"\n";
+ }
+
+ *modWriteStream << "Vago -> "+GlobalVars::AppVersion;
+
+ delete modWriteStream; //it auto closes the files/streams
+ delete modInfo;
+
+ //Create zipped package using PKZIP 2.0 (http://osdab.42cows.org/snippets/zip.php?mode=advanced)
+ if(createZip){
+ Zip uz;
+
+ Zip::ErrorCode ec = uz.createArchive(this->packagesLocation+"/"+packageName+".zip");
+ checkForZipError(ec);
+
+ ec=uz.addDirectory(modDir);
+ checkForZipError(ec);
+
+ ec = uz.closeArchive();
+ checkForZipError(ec);
+ }
+
+ if(openFolder){
+ QDesktopServices::openUrl(QUrl("file:///"+this->packagesLocation));
+ }
+}
+
+void PackageWizard::copyPackageFolders(const DropTableWidget *myTable, QString tableDir, QString modDir, bool &bslExist){
+
+ QString sourceFolder;
+ bool onisExist=false;
+ QString path;
+
+ for(int i=0; irowCount(); i++){
+
+ sourceFolder=myTable->item(i,2)->text();
+
+ if(myTable->item(i,1)->text()==".oni"){
+ path=modDir+"oni/"+tableDir;
+ if(!onisExist){
+ onisExist=true;
+ }
+ }
+ else if(myTable->item(i,1)->text()==".bsl"){
+ path=modDir+"bsl/"+tableDir;
+ if(!bslExist){
+ bslExist=true;
+ }
+ }
+ else{
+ path=modDir+"patches/"+tableDir;
+ if(!bslExist){
+ bslExist=true;
+ }
+ }
+ QDir().mkpath(path); //create path if doesn't exist
+ if(!Util::cpDir(sourceFolder,path+Util::cutName(sourceFolder))){//copy contents (creates dest destination automatically if not exists yet)
+ QString errorString="An error occurred while copping the folder/files to the package folder: \n"
+ "Copying from "+sourceFolder+"\n to "+path+Util::cutName(sourceFolder);
+ Util::showErrorLogPopUp(errorString);
+ this->myLogger->writeString(errorString);
+ }
+ }
+}
+
+/**
+ Convenience function for checking for zipping errors
+ */
+void PackageWizard::checkForZipError(Zip::ErrorCode ec){
+ if (ec != Zip::Ok){
+ const QString error="Error found while zipping the package. Error number = "+QString::number(ec);
+ Util::showErrorPopUp(error);
+ this->myLogger->writeString(error);
+ }
+}
Index: /Vago/trunk/Vago/packageWizard/packagewizard.h
===================================================================
--- /Vago/trunk/Vago/packageWizard/packagewizard.h (revision 771)
+++ /Vago/trunk/Vago/packageWizard/packagewizard.h (revision 771)
@@ -0,0 +1,35 @@
+#ifndef PACKAGEWIZARD_H
+#define PACKAGEWIZARD_H
+
+#include "logger.h"
+#include "packagepage2.h"
+#include "packagepage3.h"
+#include "packagepage4.h"
+#include "packagepagefinal.h"
+#include "zip.h"
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+class PackageWizard
+{
+public:
+ PackageWizard(QString workspaceWizardLocation,QSettings *vagoSettings, Logger *myLogger);
+ int exec();
+private:
+ QWizardPage *createIntroPage();
+ void copyPackageFolders(const DropTableWidget *myTable, QString tableDir, QString modDir, bool &bslExist);
+ void createPackage(const QWizard &myWizard, PackagePage4 *page4);
+ void checkForZipError(Zip::ErrorCode ec);
+
+ Logger *myLogger;
+ QString workspaceWizardLocation;
+ QString packagesLocation;
+ QSettings *vagoSettings;
+};
+
+#endif // PACKAGEWIZARD_H
Index: /Vago/trunk/Vago/preferences.cpp
===================================================================
--- /Vago/trunk/Vago/preferences.cpp (revision 771)
+++ /Vago/trunk/Vago/preferences.cpp (revision 771)
@@ -0,0 +1,61 @@
+#include "preferences.h"
+#include "ui_preferences.h"
+
+Preferences::Preferences(QWidget *parent, QSettings *vagoSettings) :
+ QDialog(parent),
+ ui(new Ui::Preferences)
+{
+ ui->setupUi(this);
+ this->setAttribute(Qt::WA_DeleteOnClose,true ); //destroy itself once finished.
+
+ this->vagoSettings=vagoSettings;
+
+ ui->leAEfolder->setText(this->vagoSettings->value("AeFolder").toString());
+ ui->leWorkspace->setText(this->vagoSettings->value("Workspace").toString());
+ ui->cbOniWindow->setChecked(this->vagoSettings->value("OniWindow").toBool());
+ ui->cbSeparate->setChecked(this->vagoSettings->value("SeparateInWorkspace").toBool());
+ ui->cbVagoExit->setChecked(this->vagoSettings->value("ConfirmExit").toBool());
+
+}
+
+Preferences::~Preferences()
+{
+ delete ui;
+}
+
+void Preferences::on_buttonBox_accepted()
+{
+ this->vagoSettings->setValue("AeFolder",ui->leAEfolder->text());
+ this->vagoSettings->setValue("Workspace",ui->leWorkspace->text());
+ this->vagoSettings->setValue("OniWindow",ui->cbOniWindow->isChecked());
+ this->vagoSettings->setValue("SeparateInWorkspace",ui->cbSeparate->isChecked());
+ this->vagoSettings->setValue("ConfirmExit",ui->cbVagoExit->isChecked());
+
+ Util::showPopUp("You need to restart the application to all changes take effect.");
+}
+
+void Preferences::on_pbChooseWorkspace_clicked()
+{
+ QString newDir=QFileDialog::getExistingDirectory(this,"Choose workspace folder...");
+ newDir=Util::normalizePath(newDir);
+
+ if(!newDir.isEmpty()){
+ ui->leWorkspace->setText(newDir);
+ }
+}
+
+void Preferences::on_pbChooseAE_clicked()
+{
+ QString newDir=QFileDialog::getExistingDirectory(this,"Choose AE folder...");
+ newDir=Util::normalizePath(newDir);
+
+ if(!newDir.isEmpty()){
+ ui->leAEfolder->setText(newDir);
+ }
+}
+
+void Preferences::on_buttonBox_rejected()
+{
+ this->destroy(true,true);
+}
+
Index: /Vago/trunk/Vago/preferences.h
===================================================================
--- /Vago/trunk/Vago/preferences.h (revision 771)
+++ /Vago/trunk/Vago/preferences.h (revision 771)
@@ -0,0 +1,37 @@
+#ifndef PREFERENCES_H
+#define PREFERENCES_H
+
+#include
+#include
+#include
+#include
+#include
+
+namespace Ui {
+class Preferences;
+}
+
+class Preferences : public QDialog
+{
+ Q_OBJECT
+
+public:
+ Preferences(QWidget *parent, QSettings *vagoSettings);
+ ~Preferences();
+
+private slots:
+
+ void on_buttonBox_accepted();
+
+ void on_pbChooseWorkspace_clicked();
+
+ void on_pbChooseAE_clicked();
+
+ void on_buttonBox_rejected();
+
+private:
+ Ui::Preferences *ui;
+ QSettings *vagoSettings;
+};
+
+#endif // PREFERENCES_H
Index: /Vago/trunk/Vago/preferences.ui
===================================================================
--- /Vago/trunk/Vago/preferences.ui (revision 771)
+++ /Vago/trunk/Vago/preferences.ui (revision 771)
@@ -0,0 +1,149 @@
+
+
+ Preferences
+
+
+
+ 0
+ 0
+ 493
+ 258
+
+
+
+ Vago Preferences
+
+
+ -
+
+
+ Preferences
+
+
+
-
+
+
-
+
+
+
+ 130
+ 0
+
+
+
+ Vago Workspace Folder:
+
+
+
+ -
+
+
+ -
+
+
+ Choose
+
+
+
+
+
+ -
+
+
-
+
+
+ Anniversary Edition Folder:
+
+
+
+ -
+
+
+ -
+
+
+ Choose
+
+
+
+
+
+ -
+
+
+ Launch Oni in a window
+
+
+
+ -
+
+
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Separate conversions by folders. For example: "Textures" -> "DAT_ONI - DDS"</span></p></body></html>
+
+
+ Separate different conversions in workspace
+
+
+
+ -
+
+
+ Always confirm Vago exit
+
+
+
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+ QDialogButtonBox::Cancel|QDialogButtonBox::Ok
+
+
+
+
+
+
+
+
+ buttonBox
+ accepted()
+ Preferences
+ accept()
+
+
+ 248
+ 254
+
+
+ 157
+ 274
+
+
+
+
+ buttonBox
+ rejected()
+ Preferences
+ reject()
+
+
+ 316
+ 260
+
+
+ 286
+ 274
+
+
+
+
+
Index: /Vago/trunk/Vago/readme.txt
===================================================================
--- /Vago/trunk/Vago/readme.txt (revision 771)
+++ /Vago/trunk/Vago/readme.txt (revision 771)
@@ -0,0 +1,128 @@
+Readme.txt
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Vago GUI v0.8
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+----------------------------------
+Description:
+----------------------------------
+
+An user interface application to use OniSplit in Windows.
+
+OniSplit:
+"OniSplit, written by Neo, is an integral part of the Anniversary Edition and an essential modding tool on its own.
+It is able to import and export many kinds of Oni game data, such as textures, sound, 3D models, level geometry &
+combat animations and is also able to split & recombine Oni's data files. It's functions supersede those of OUP &
+OME and is currently the community's modding tool of choice."
+
+----------------------------------
+Installation (standalone version):
+----------------------------------
+
+Extract Vago folder to any place in your computer. At first run select your Anniversary Edition folder.
+
+----------------------------------
+Contacts:
+----------------------------------
+
+Script10k, "faob2@hotmail.com"
+
+Oni Central Forum:
+http://oni.bungie.org
+->Select forum
+
+Oni Wiki:
+http://wiki.oni2.net
+
+----------------------------------
+Change Log:
+----------------------------------
+0.8, 01-04-2012
+-Updated OniSplit to 0.9.86.0 version
+-Added Animations tab and options to export OBAN as dae, plus option to
+export "saved_films*.dat" as XML
+-Fixed AEI2 launch button
+-Added patch support in AEI2 package wizard
+-Added wizard to convert sounds to oni (thanks paradox,
+have based in your excel macro)
+-Added xmlTools 0.8d as part of the framework (like onisplit)
+----------------------------------
+0.7, 10-02-2012
+-Updated to support the AEI2
+-Added wizard to create AEI2 packages
+-Added zip option to packages
+-Fixed check packages number (using new method, thanks Alloc!)
+-Fixed check for vago updates
+----------------------------------
+0.6a, 22-09-2012
+-Fixed the table tooltips disappearing when changing items order
+----------------------------------
+0.6, 11-09-2012
+-Added option to view log in option menu and also in error dialogs
+-Number of characters in oni split errors limited
+-When executing only one task, progess bar will be intermitent
+-Fixed About dialog image (didn't know that qt needed a plugin for jpg files)
+-Taskbar now flashes if a task is done and the Vago windows is not the window active
+-Added context menu with the following options: change items order, disable items
+processing, change items to the current settings, change specified items to output
+to a specified folder, copy items to clipboard
+-Added tooltips to every row and column to be processed (it's easier to check the
+command for each file for example)
+-Added wav/aif > oni conversion
+-Now .dat is added when a filename (to be exported as .dat) is inputted without
+extension
+-Now the number of errors is showed
+-Added option to extract a dae with a specified animation
+----------------------------------
+0.5b, 28-07-2012
+-Fixed another small typo in the from/to description
+----------------------------------
+0.5a, 28-07-2012
+-Fixed two typos. EnvMap at Textures and at Texture Models were asking
+for a .oni absolute file when it only needs the filename without the .oni
+extension
+----------------------------------
+0.5, 26-07-2012
+-Now every result of a conversion or package is separated in folders
+in the workspace by default. This can be disabled in preferences
+-Added an icon
+-Changed About dialog
+-It now checks if every entry of ini exists at the begin
+-Added option to clear everything in packages
+-Added option to change output folder at anytime, this allows for example
+output a level directly to it's correct folder for easy testing. It is
+also simple to change between the workspace and another output folder
+-Fixed bug when selecting multiple dirs and the user cancelled which
+still resulted in returning the files selected
+----------------------------------
+0.4, 25-07-2012
+-Fixed a typo in Packages creating making scripts installation fail
+-Added option to create AKEV from env.dae and bnv.dae, plus others resources
+plus the ability to generate the path finding grids for AKEVs automatically
+-Added manual oni split commands input
+----------------------------------
+0.3, 22-07-2012
+-Implemented Packages tab functionality
+-Implemented check for Vago updates functionality
+-Fixed a bug in "extract an ONCC with another character's TRAM"
+(command bad built)
+-Fixed an index out range bug when multiple selections in tables (when removing)
+----------------------------------
+0.2, 19-07-2012
+-It now checks for OniSplit at each run and exits if it's not found
+-Option to check onisplit version from gui
+-Optimized the code and made it more modular
+-Added -search ../GameDataFolder/level0_Final to AKEV (ONI) > DAE
+-Added JPG support for textures
+-Added -extract:xml -anim-body: ONCCsource TRAMsource
+(extract an ONCC with another character's TRAM)
+-Fixed a bug in ONI->DAT conversion (command bad built)
+-Added folder drag n' drop and checks if the current operation only work
+with files or folders
+-Added items loaded at status bar
+----------------------------------
+0.1a, 15-07-2012
+-Fixed a bug with spaces in directories
+----------------------------------
+0.1, 15-07-2012
+-Initial Version
Index: /Vago/trunk/Vago/resources.qrc
===================================================================
--- /Vago/trunk/Vago/resources.qrc (revision 771)
+++ /Vago/trunk/Vago/resources.qrc (revision 771)
@@ -0,0 +1,23 @@
+
+
+ oni_icon.png
+ AE_icon.png
+ command_icon.png
+ vago_icon.png
+ folder_icon.png
+ minus.png
+ plus.png
+ switch.png
+ package.png
+ log.png
+ toolPackage.png
+ sound.png
+
+
+ about.png
+
+
+ sampleFiles/OSBDsample_file.amb.xml
+ sampleFiles/OSBDsample_file.grp.xml
+
+
Index: /Vago/trunk/Vago/sampleFiles/OSBDsample_file.amb.xml
===================================================================
--- /Vago/trunk/Vago/sampleFiles/OSBDsample_file.amb.xml (revision 771)
+++ /Vago/trunk/Vago/sampleFiles/OSBDsample_file.amb.xml (revision 771)
@@ -0,0 +1,27 @@
+
+
+
+ Normal
+
+
+ 10
+
+ 1
+ 1
+
+
+
+
+ 10
+ 50
+
+
+
+ sample_file
+
+
+
+ 3
+ 0
+
+
Index: /Vago/trunk/Vago/sampleFiles/OSBDsample_file.grp.xml
===================================================================
--- /Vago/trunk/Vago/sampleFiles/OSBDsample_file.grp.xml (revision 771)
+++ /Vago/trunk/Vago/sampleFiles/OSBDsample_file.grp.xml (revision 771)
@@ -0,0 +1,23 @@
+
+
+
+ 1
+ 1
+ PreventRepeat
+ 2
+
+
+ 10
+
+ 1
+ 1
+
+
+ 1
+ 1
+
+ sample_file.wav
+
+
+
+
Index: /Vago/trunk/Vago/soundWizard/soundpage2.cpp
===================================================================
--- /Vago/trunk/Vago/soundWizard/soundpage2.cpp (revision 771)
+++ /Vago/trunk/Vago/soundWizard/soundpage2.cpp (revision 771)
@@ -0,0 +1,141 @@
+#include "soundpage2.h"
+#include "ui_soundpage2.h"
+
+const QStringList SoundPage2::allowedFiles = QStringList() << "*.wav" << "*.aif" << "*.aifc" << "*.afc";
+const QString SoundPage2::codecLocalHelpFile=GlobalVars::HelpLocation + "/XMLSNDD.html#Source_file_creation";
+
+SoundPage2::SoundPage2(QWidget *parent) :
+ QWizardPage(parent),
+ ui(new Ui::soundpage2)
+{
+ ui->setupUi(this);
+ this->soundTable=ui->twSoundFiles;
+ ui->twSoundFiles->removeColumn(2); // Only two columns
+
+ // Drop signal for Packages table
+ connect(ui->twSoundFiles, SIGNAL(dropped(DropTableWidget*,QStringList)), this, SLOT(addResourcesSounds(DropTableWidget*,QStringList)));
+ // Signal for click in label (display local help)
+ connect(ui->label, SIGNAL(linkActivated(const QString & )), this, SLOT(openCodecLocalHelp()));
+
+ //Register fields to be accessible in another pages
+ registerField("rbOther", ui->rbOther);
+ registerField("leOtherLocation", ui->leOtherLocation);
+}
+
+SoundPage2::~SoundPage2()
+{
+ delete ui;
+}
+
+void SoundPage2::on_rbOther_toggled(bool checked)
+{
+ if(checked){
+ ui->leOtherLocation->setEnabled(true);
+ ui->pbBrowserOtherLocation->setEnabled(true);
+ return;
+ }
+
+ ui->leOtherLocation->setEnabled(false);
+ ui->pbBrowserOtherLocation->setEnabled(false);
+}
+
+void SoundPage2::on_tbAddFiles_clicked()
+{
+ addResourcesSounds(ui->twSoundFiles,QFileDialog::getOpenFileNames(this,"Choose the sound files...","./" , "Audio (" + this->allowedFiles.join(" ") + ")"));
+}
+
+void SoundPage2::on_tbRemoveFiles_clicked()
+{
+ int size = ui->twSoundFiles->selectionModel()->selectedRows().size();
+
+ if(size==0){
+ Util::showPopUp("Select a row first.");
+ return;
+ }
+
+ if(Util::showQuestionPopUp(this,"Are you sure you want to delete the selected rows?")){
+ for(int i=0; itwSoundFiles->removeRow(ui->twSoundFiles->selectionModel()->selectedRows().at(size-i-1).row());
+ }
+ }
+}
+
+void SoundPage2::addResourcesSounds(DropTableWidget *myTable, QStringList resources){
+
+ bool fileExtValid=false;
+
+ //Pre-processing (check if received only folders)
+ foreach(QString myFile, resources){
+ QString currFileExt=QFileInfo(myFile).completeSuffix();
+ if(QDir(myFile).exists()){
+ Util::showErrorPopUp("Only files are allowed for this operation.");
+ return;
+ }
+
+ foreach(QString vext, this->allowedFiles){
+ vext.remove("*.");
+ if(vext==currFileExt){
+ fileExtValid=true;
+ break;
+ }
+ }
+
+ if(!fileExtValid){
+ Util::showErrorPopUp("Files must be in the follow formats:\n" +
+ this->allowedFiles.join(" "));
+ return;
+ }
+ }
+
+ foreach(QString currentFile, resources){
+
+ //Get actual number rows
+ int twSize=myTable->rowCount();
+
+ //increase the rows for the new item
+ myTable->setRowCount(twSize+1);
+
+ //Add to table and list to
+ QTableWidgetItem *newName = new QTableWidgetItem(QFileInfo(currentFile).baseName());
+ QTableWidgetItem *newFileLocation = new QTableWidgetItem(Util::normalizePath(currentFile));
+
+ myTable->setItem(twSize,0,newName);
+ myTable->setItem(twSize,1,newFileLocation);
+ myTable->updateTableToolTips(twSize); //Update tool tips
+ }
+}
+
+void SoundPage2::on_pbBrowserOtherLocation_clicked()
+{
+ ui->leOtherLocation->setText(QFileDialog::getExistingDirectory(this,"Choose output folder..."));
+}
+
+void SoundPage2::openCodecLocalHelp(){
+ QDesktopServices::openUrl(QUrl("file:///"+this->codecLocalHelpFile));
+}
+
+bool SoundPage2::validatePage(){
+
+ QStringList namesList;
+
+ if(ui->twSoundFiles->rowCount()==0){
+ Util::showErrorPopUp("You need to add some sound files first!");
+ return false;
+ }
+
+ for(int i=0; itwSoundFiles->rowCount(); i++){
+ namesList << ui->twSoundFiles->item(i,0)->text();
+ }
+
+ if(ui->rbOther->isChecked() && Util::checkEmptySpaces(QStringList() << ui->leOtherLocation->text())){
+ Util::showErrorPopUp("Please input a directory to output the files.");
+ return false;
+ }
+
+ if(ui->rbOther->isChecked() && !QDir(ui->leOtherLocation->text()).exists()){
+ Util::showErrorPopUp("Invalid directory specified in other location. Please fix it.");
+ return false;
+ }
+
+ return true;
+}
Index: /Vago/trunk/Vago/soundWizard/soundpage2.h
===================================================================
--- /Vago/trunk/Vago/soundWizard/soundpage2.h (revision 771)
+++ /Vago/trunk/Vago/soundWizard/soundpage2.h (revision 771)
@@ -0,0 +1,44 @@
+#ifndef SOUNDPAGE2_H
+#define SOUNDPAGE2_H
+
+#include
+
+#include "util.h"
+#include "droptablewidget.h"
+
+namespace Ui {
+class soundpage2;
+}
+
+class SoundPage2 : public QWizardPage
+{
+ Q_OBJECT
+
+public:
+ DropTableWidget *soundTable;
+
+ explicit SoundPage2(QWidget *parent = 0);
+ ~SoundPage2();
+
+private slots:
+ void addResourcesSounds(DropTableWidget *myTable, QStringList resources);
+
+ void on_rbOther_toggled(bool checked);
+
+ void on_tbAddFiles_clicked();
+
+ void on_tbRemoveFiles_clicked();
+
+ void on_pbBrowserOtherLocation_clicked();
+
+ void openCodecLocalHelp();
+
+private:
+ Ui::soundpage2 *ui;
+ static const QStringList allowedFiles;
+ static const QString codecLocalHelpFile;
+
+ bool validatePage();
+};
+
+#endif // SOUNDPAGE2_H
Index: /Vago/trunk/Vago/soundWizard/soundpage2.ui
===================================================================
--- /Vago/trunk/Vago/soundWizard/soundpage2.ui (revision 771)
+++ /Vago/trunk/Vago/soundWizard/soundpage2.ui (revision 771)
@@ -0,0 +1,191 @@
+
+
+ soundpage2
+
+
+
+ 0
+ 0
+ 640
+ 480
+
+
+
+ WizardPage
+
+
+ Sound files to process
+
+
+ -
+
+
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Add here the files you want to convert. All the files will have the same properties applied. </span></p>
+<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Don't forget to first convert the files to an oni compatible codec</span><span style=" font-size:8pt;">. More information </span><a href=" "><span style=" font-size:8pt; text-decoration: underline; color:#0000ff;">here</span></a><span style=" font-size:8pt;">.</span></p></body></html>
+
+
+ true
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 57
+
+
+
+
+ -
+
+
+ Files to convert
+
+
+
-
+
+
-
+
+
+ true
+
+
+
+ Name
+
+
+
+
+ File Location
+
+
+
+
+ -
+
+
-
+
+
+ Add sound files
+
+
+ ...
+
+
+
+ :/new/icons/plus.png:/new/icons/plus.png
+
+
+
+ -
+
+
+ Remove selected sound files
+
+
+ ...
+
+
+
+ :/new/icons/minus.png:/new/icons/minus.png
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 57
+
+
+
+
+ -
+
+
+ Output converted files to:
+
+
+
-
+
+
-
+
+
+ Workspace
+
+
+ true
+
+
+
+ -
+
+
-
+
+
+ true
+
+
+ Other
+
+
+
+ -
+
+
+ false
+
+
+
+ -
+
+
+ false
+
+
+ Browse...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ DropTableWidget
+ QTableWidget
+
+
+
+
+
+
+
+
Index: /Vago/trunk/Vago/soundWizard/soundpage3.cpp
===================================================================
--- /Vago/trunk/Vago/soundWizard/soundpage3.cpp (revision 771)
+++ /Vago/trunk/Vago/soundWizard/soundpage3.cpp (revision 771)
@@ -0,0 +1,52 @@
+#include "soundpage3.h"
+#include "ui_soundpage3.h"
+
+SoundPage3::SoundPage3(QWidget *parent) :
+ QWizardPage(parent),
+ ui(new Ui::soundpage3)
+{
+ ui->setupUi(this);
+
+ //Register fields to be accessible in another pages
+
+ registerField("rbPriorityLow", ui->rbPriorityLow);
+ registerField("rbPriorityNormal", ui->rbPriorityNormal);
+ registerField("rbPriorityHigh", ui->rbPriorityHigh);
+ registerField("rbPriorityHighest", ui->rbPriorityHighest);
+ registerField("cbInterruptOnStop", ui->cbInterruptOnStop);
+
+ registerField("cbPlayOnce", ui->cbPlayOnce);
+ registerField("cbCanPan", ui->cbCanPan);
+
+ registerField("leSphereRadious", ui->leSphereRadious);
+ registerField("leMinElapsedTime", ui->leMinElapsedTime);
+ registerField("leMaxElapsedTime", ui->leMaxElapsedTime);
+ registerField("leMinVolumeDistance", ui->leMinVolumeDistance);
+ registerField("leMaxVolumeDistance", ui->leMaxVolumeDistance);
+ registerField("leMinOcclusion", ui->leMinOcclusion);
+ registerField("leTreshold", ui->leTreshold);
+}
+
+bool SoundPage3::validatePage(){
+ QStringList leContents;
+ leContents << ui->leSphereRadious->text() << ui->leMinElapsedTime->text() << ui->leMaxElapsedTime->text()
+ << ui->leMinVolumeDistance->text() << ui->leMaxVolumeDistance->text() << ui->leMinOcclusion->text()
+ << ui->leTreshold->text();
+
+ if(Util::checkEmptySpaces(leContents)){
+ Util::showErrorPopUp("Please fill all fields first!");
+ return false;
+ }
+
+ if(Util::checkIfDoubles(leContents)){
+ Util::showErrorPopUp("All fields must contains numbers!");
+ return false;
+ }
+
+ return true;
+}
+
+SoundPage3::~SoundPage3()
+{
+ delete ui;
+}
Index: /Vago/trunk/Vago/soundWizard/soundpage3.h
===================================================================
--- /Vago/trunk/Vago/soundWizard/soundpage3.h (revision 771)
+++ /Vago/trunk/Vago/soundWizard/soundpage3.h (revision 771)
@@ -0,0 +1,26 @@
+#ifndef SOUNDPAGE3_H
+#define SOUNDPAGE3_H
+
+#include
+
+#include "util.h"
+
+namespace Ui {
+class soundpage3;
+}
+
+class SoundPage3 : public QWizardPage
+{
+ Q_OBJECT
+
+public:
+ explicit SoundPage3(QWidget *parent = 0);
+ ~SoundPage3();
+
+private:
+ Ui::soundpage3 *ui;
+
+ bool validatePage();
+};
+
+#endif // SOUNDPAGE3_H
Index: /Vago/trunk/Vago/soundWizard/soundpage3.ui
===================================================================
--- /Vago/trunk/Vago/soundWizard/soundpage3.ui (revision 771)
+++ /Vago/trunk/Vago/soundWizard/soundpage3.ui (revision 771)
@@ -0,0 +1,278 @@
+
+
+ soundpage3
+
+
+
+ 0
+ 0
+ 680
+ 460
+
+
+
+ WizardPage
+
+
+ OSBD.amb file properties
+
+
+ -
+
+
+ Sound priority
+
+
+
-
+
+
-
+
+
+ Low
+
+
+
+ -
+
+
+ Normal
+
+
+ true
+
+
+
+ -
+
+
+ High
+
+
+
+ -
+
+
+ Highest
+
+
+
+
+
+
+
+
+ -
+
+
+ Options
+
+
+
-
+
+
+ Interrupt track on stop
+
+
+ true
+
+
+
+ -
+
+
+ Play once
+
+
+
+ -
+
+
+ Can pan
+
+
+
+
+
+
+ -
+
+
+ Properties
+
+
+
-
+
+
-
+
+
+
+ 115
+ 0
+
+
+
+ Sphere radious:
+
+
+
+ -
+
+
+ 10
+
+
+
+
+
+ -
+
+
-
+
+
+
+ 115
+ 0
+
+
+
+ Min elapsed time:
+
+
+
+ -
+
+
+ 1
+
+
+
+
+
+ -
+
+
-
+
+
+
+ 115
+ 0
+
+
+
+ Max elapsed time:
+
+
+
+ -
+
+
+ 1
+
+
+
+
+
+ -
+
+
-
+
+
+
+ 115
+ 0
+
+
+
+ Min volume distance:
+
+
+
+ -
+
+
+ 10
+
+
+
+
+
+ -
+
+
-
+
+
+
+ 115
+ 0
+
+
+
+ Max volume distance:
+
+
+
+ -
+
+
+ 50
+
+
+
+
+
+ -
+
+
-
+
+
+
+ 115
+ 0
+
+
+
+ Min occlusion:
+
+
+
+ -
+
+
+ 3
+
+
+
+
+
+ -
+
+
-
+
+
+
+ 115
+ 0
+
+
+
+ Treshold:
+
+
+
+ -
+
+
+ 0
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: /Vago/trunk/Vago/soundWizard/soundpage4.cpp
===================================================================
--- /Vago/trunk/Vago/soundWizard/soundpage4.cpp (revision 771)
+++ /Vago/trunk/Vago/soundWizard/soundpage4.cpp (revision 771)
@@ -0,0 +1,48 @@
+#include "soundpage4.h"
+#include "ui_soundpage4.h"
+
+SoundPage4::SoundPage4(QWidget *parent) :
+ QWizardPage(parent),
+ ui(new Ui::soundpage4)
+{
+ ui->setupUi(this);
+
+ //Register fields to be accessible in another pages
+ registerField("leVolume", ui->leVolume);
+ registerField("leMinVolume", ui->leMinVolume);
+ registerField("leMaxVolume", ui->leMaxVolume);
+ registerField("lePitch", ui->lePitch);
+ registerField("leMinPitch", ui->leMinPitch);
+ registerField("leMaxPitch", ui->leMaxPitch);
+ registerField("leWeight", ui->leWeight);
+
+ registerField("cbPreventRepeat", ui->cbPreventRepeat);
+
+ registerField("rbStereo22", ui->rbStereo22);
+ registerField("rbMono22", ui->rbMono22);
+ registerField("rbMono44Pc", ui->rbMono44Pc);
+}
+
+bool SoundPage4::validatePage(){
+ QStringList leContents;
+ leContents << ui->leVolume->text() << ui->leMinVolume->text() << ui->leMaxVolume->text()
+ << ui->lePitch->text() << ui->leMinPitch->text() << ui->leMaxPitch->text()
+ << ui->leWeight->text();
+
+ if(Util::checkEmptySpaces(leContents)){
+ Util::showErrorPopUp("Please fill all fields first!");
+ return false;
+ }
+
+ if(Util::checkIfDoubles(leContents)){
+ Util::showErrorPopUp("All fields must contains numbers!");
+ return false;
+ }
+
+ return true;
+}
+
+SoundPage4::~SoundPage4()
+{
+ delete ui;
+}
Index: /Vago/trunk/Vago/soundWizard/soundpage4.h
===================================================================
--- /Vago/trunk/Vago/soundWizard/soundpage4.h (revision 771)
+++ /Vago/trunk/Vago/soundWizard/soundpage4.h (revision 771)
@@ -0,0 +1,26 @@
+#ifndef SOUNDPAGE4_H
+#define SOUNDPAGE4_H
+
+#include
+
+#include "util.h"
+
+namespace Ui {
+class soundpage4;
+}
+
+class SoundPage4 : public QWizardPage
+{
+ Q_OBJECT
+
+public:
+ explicit SoundPage4(QWidget *parent = 0);
+ ~SoundPage4();
+
+private:
+ Ui::soundpage4 *ui;
+
+ bool validatePage();
+};
+
+#endif // SOUNDPAGE4_H
Index: /Vago/trunk/Vago/soundWizard/soundpage4.ui
===================================================================
--- /Vago/trunk/Vago/soundWizard/soundpage4.ui (revision 771)
+++ /Vago/trunk/Vago/soundWizard/soundpage4.ui (revision 771)
@@ -0,0 +1,244 @@
+
+
+ soundpage4
+
+
+
+ 0
+ 0
+ 640
+ 480
+
+
+
+ WizardPage
+
+
+ OSBD.grp file properties
+
+
+ -
+
+
+ Properties
+
+
+
-
+
+
-
+
+
+
+ 115
+ 0
+
+
+
+ Volume:
+
+
+
+ -
+
+
+ 1
+
+
+
+
+
+ -
+
+
-
+
+
+
+ 115
+ 0
+
+
+
+ Min volume:
+
+
+
+ -
+
+
+ 1
+
+
+
+
+
+ -
+
+
-
+
+
+
+ 115
+ 0
+
+
+
+ Max volume:
+
+
+
+ -
+
+
+ 1
+
+
+
+
+
+ -
+
+
-
+
+
+
+ 115
+ 0
+
+
+
+ Pitch:
+
+
+
+ -
+
+
+ 1
+
+
+
+
+
+ -
+
+
-
+
+
+
+ 115
+ 0
+
+
+
+ Min pitch:
+
+
+
+ -
+
+
+ 1
+
+
+
+
+
+ -
+
+
-
+
+
+
+ 115
+ 0
+
+
+
+ Max pitch:
+
+
+
+ -
+
+
+ 1
+
+
+
+
+
+ -
+
+
-
+
+
+
+ 115
+ 0
+
+
+
+ Weight:
+
+
+
+ -
+
+
+ 10
+
+
+
+
+
+ -
+
+
+ This flag forces the engine to always play a different sound
+
+
+ Prevent repeat
+
+
+
+
+
+
+ -
+
+
+ Audio Channels
+
+
+
-
+
+
+ Stereo - 22.05 kHz
+
+
+ true
+
+
+
+ -
+
+
+ Mono - 22.05 kHz
+
+
+
+ -
+
+
+ Mono - 44.10 kHz (PC only)
+
+
+
+
+
+
+
+
+
+
+
Index: /Vago/trunk/Vago/soundWizard/soundpagefinal.cpp
===================================================================
--- /Vago/trunk/Vago/soundWizard/soundpagefinal.cpp (revision 771)
+++ /Vago/trunk/Vago/soundWizard/soundpagefinal.cpp (revision 771)
@@ -0,0 +1,247 @@
+#include "soundpagefinal.h"
+#include "ui_soundpagefinal.h"
+
+SoundPageFinal::SoundPageFinal(QString soundsLocation, DropTableWidget *page2Table, Logger *myLogger, QHash *commandMap, QWidget *parent) :
+ QWizardPage(parent),
+ ui(new Ui::soundpagefinal)
+{
+ ui->setupUi(this);
+ this->soundsLocation=soundsLocation;
+ this->page2Table=page2Table;
+ this->myLogger=myLogger;
+ this->commandMap=commandMap;
+
+ this->xmlCommands = new QStringList();
+ this->oniSplitCommands = new QStringList();
+ this->myXmlProcessor = new XmlProcessor(this->myLogger,this->xmlCommands);
+ this->myConverter = new Converter(this->myLogger,this->oniSplitCommands);
+
+ connectSlots();
+}
+
+void SoundPageFinal::openSoundsFolder(){
+ QString outputFolder;
+
+ if(field("rbOther").toBool()){
+ outputFolder=field("leOtherLocation").toString();
+ }
+ else{
+ outputFolder=this->soundsLocation;
+ }
+
+ QDesktopServices::openUrl(QUrl("file:///"+outputFolder));
+}
+
+void SoundPageFinal::initializePage(){
+ startProcessing();
+}
+
+void SoundPageFinal::startProcessing(){
+ // Sample files names
+ QString ambFile="OSBDsample_file.amb.xml";
+ QString grpFile="OSBDsample_file.grp.xml";
+ QString ambFileLocation=GlobalVars::VagoTemporaryDir+"/"+ambFile;
+ QString grpFileLocation=GlobalVars::VagoTemporaryDir+"/"+grpFile;
+
+ // Page 2 variables
+ QString outputFolder;
+
+ // Page 3 variables
+ QString sphereRadious, minElapsedTime, maxElapsedTime, minVolumeDistance,
+ maxVolumeDistance, minOcclusion, treshold, priority;
+ QStringList flags;
+ bool priorityLow = false, priorityNormal = false,
+ priorityHigh = false, priorityHighest = false;
+
+ bool interruptOnStop=false;
+ bool playOnce=false;
+ bool canPan=false;
+
+ // Page 4 variables
+ QString volume, minVolume, maxVolume, pitch, minPitch, weight, maxPitch,
+ numberChannels;
+ bool preventRepeat=false;
+ bool stereo22=false, mono22=false, mono44Pc=false;
+
+ // Get data page 2
+ if(field("rbOther").toBool()){
+ outputFolder=field("leOtherLocation").toString();
+ }
+ else{
+ outputFolder=this->soundsLocation;
+ }
+
+ outputFolder = Util::insertQuotes(outputFolder); // for onisplit work correctly
+
+ // Get data page 3
+
+ priorityLow=field("rbPriorityLow").toBool();
+ priorityNormal=field("rbPriorityNormal").toBool();
+ priorityHigh=field("rbPriorityHigh").toBool();
+ priorityHighest=field("rbPriorityHighest").toBool();
+
+ if(priorityNormal){
+ priority="Normal";
+ }
+ else if(priorityLow){
+ priority="Low";
+ }
+ else if(priorityHigh){
+ priority="High";
+ }
+ else if(priorityHighest){
+ priority="Highest";
+ }
+
+ if(interruptOnStop){
+ flags << "InterruptTracksOnStop";
+ }
+
+ if(playOnce){
+ flags << "PlayOnce";
+ }
+
+ if(canPan){
+ flags << "CanPan";
+ }
+
+ interruptOnStop=field("cbInterruptOnStop").toBool();
+ playOnce=field("cbPlayOnce").toBool();
+ canPan=field("cbCanPan").toBool();
+
+ sphereRadious=Util::normalizeDecimalSeparator(field("leSphereRadious").toString());
+ minElapsedTime=Util::normalizeDecimalSeparator(field("leMinElapsedTime").toString());
+ maxElapsedTime=Util::normalizeDecimalSeparator(field("leMaxElapsedTime").toString());
+ minVolumeDistance=Util::normalizeDecimalSeparator(field("leMinVolumeDistance").toString());
+ maxVolumeDistance=Util::normalizeDecimalSeparator(field("leMaxVolumeDistance").toString());
+ minOcclusion=Util::normalizeDecimalSeparator(field("leMinOcclusion").toString());
+ treshold=Util::normalizeDecimalSeparator(field("leTreshold").toString());
+
+ // Get data page 4
+
+ volume=Util::normalizeDecimalSeparator(field("leVolume").toString());
+ minVolume=Util::normalizeDecimalSeparator(field("leMinVolume").toString());
+ maxVolume=Util::normalizeDecimalSeparator(field("leMaxVolume").toString());
+ pitch=Util::normalizeDecimalSeparator(field("lePitch").toString());
+ minPitch=Util::normalizeDecimalSeparator(field("leMinPitch").toString());
+ maxPitch=Util::normalizeDecimalSeparator(field("leMaxPitch").toString());
+ weight=Util::normalizeDecimalSeparator(field("leWeight").toString());
+
+ preventRepeat=field("cbPreventRepeat").toBool();
+
+ stereo22=field("rbStereo22").toBool();
+ mono22=field("rbMono22").toBool();
+ mono44Pc=field("rbMono44Pc").toBool();
+
+ if(stereo22 || mono44Pc){
+ numberChannels="2";
+ }
+ else if(mono22){
+ numberChannels="1";
+ }
+ //######################################################### Starting xml processing
+
+ // Clean tmp dir
+ if(!Util::rmDir(GlobalVars::VagoTemporaryDir)){
+ QString message="Couldn't clean vago temp dir for complete sound wizard. Aborting.\n"+GlobalVars::VagoTemporaryDir;
+ this->myLogger->writeString(message);
+ Util::showErrorLogPopUp(message);
+ return;
+ }
+
+ if(!QDir(QDir::tempPath()).mkpath("VagoTemp")){
+ QString message="Couldn't reconstruct vago temp dir for complete sound wizard. Aborting.\n"+GlobalVars::VagoTemporaryDir;
+ this->myLogger->writeString(message);
+ Util::showErrorLogPopUp(message);
+ }
+
+ // Copy sample xml files to tmp dir
+ QFile::copy(":/new/sampleFiles/"+ambFile , ambFileLocation);
+ QFile::copy(":/new/sampleFiles/"+grpFile , grpFileLocation);
+ QFile::setPermissions(ambFileLocation, QFile::ReadOwner | QFile::WriteOwner); //remove read only attribute that come from resources
+ QFile::setPermissions(grpFileLocation, QFile::ReadOwner | QFile::WriteOwner);
+
+ (*this->xmlCommands) << "replaceall -element:Priority -value:"+priority+" -filename:"+ambFileLocation+" -nobackups"
+ << "replaceall -element:Flags -value:"+flags.join(" ")+" -filename:"+ambFileLocation+" -nobackups"
+ << "replaceall -element:SphereRadius -value:"+sphereRadious+" -filename:"+ambFileLocation+" -nobackups"
+ << "replaceall -element:Treshold -value:"+treshold+" -filename:"+ambFileLocation+" -nobackups"
+ << "replaceall -element:MinOcclusion -value:"+minOcclusion+" -filename:"+ambFileLocation+" -nobackups"
+ << "replaceall -parelement:ElapsedTime -element:Min -value:"+minElapsedTime+" -filename:"+ambFileLocation+" -nobackups"
+ << "replaceall -parelement:Distance -element:Max -value:"+maxVolumeDistance+" -filename:"+ambFileLocation+" -nobackups"
+ << "replaceall -parelement:Distance -element:Min -value:"+minVolumeDistance+" -filename:"+ambFileLocation+" -nobackups"
+ << "replaceall -parelement:SoundGroup -element:Volume -value:"+volume+" -filename:"+grpFileLocation+" -nobackups"
+ << "replaceall -parelement:SoundGroup -element:Pitch -value:"+pitch+" -filename:"+grpFileLocation+" -nobackups"
+ << "replaceall -parelement:SoundGroup -element:NumberOfChannels -value:"+numberChannels+" -filename:"+grpFileLocation+" -nobackups"
+ << "replaceall -parelement:Volume -element:Min -value:"+minVolume+" -filename:"+grpFileLocation+" -nobackups"
+ << "replaceall -parelement:Volume -element:Max -value:"+maxVolume+" -filename:"+grpFileLocation+" -nobackups"
+ << "replaceall -parelement:Pitch -element:Min -value:"+minPitch+" -filename:"+grpFileLocation+" -nobackups"
+ << "replaceall -parelement:Pitch -element:Max -value:"+maxPitch+" -filename:"+grpFileLocation+" -nobackups"
+ << "replaceall -element:Weight -value:"+weight+" -filename:"+grpFileLocation+" -nobackups";
+
+ if(preventRepeat){
+ (*this->xmlCommands) << "replaceall -parelement:SoundGroup -element:Flags -value:PreventRepeat -filename:"+grpFileLocation+" -nobackups";
+ }
+
+ myXmlProcessor->start();
+ myXmlProcessor->wait(); // Wait until all xml is edited
+
+ QString currFileName;
+ QString currGrpFileLocation;
+ QString currAmbFileLocation;
+
+ for(int i=0; ipage2Table->rowCount(); i++){
+
+ (*this->oniSplitCommands) << this->commandMap->value("general->XML->ONI")+" "+outputFolder+" "+Util::insertQuotes(this->page2Table->item(i,1)->text()); // add location of sound file to convert
+
+ currFileName=this->page2Table->item(i,0)->text(); // get current file name
+ currAmbFileLocation = QString(ambFileLocation).replace("sample_file",currFileName); // get the new files, filenames
+ currGrpFileLocation = QString(grpFileLocation).replace("sample_file",currFileName);
+
+ QFile::copy(ambFileLocation, currAmbFileLocation); // make a copy of the sample files that will be the real files
+ QFile::copy(grpFileLocation, currGrpFileLocation);
+
+ (*this->xmlCommands) << "replaceall -element:BaseTrack1 -value:"+currFileName+" -filename:"+currAmbFileLocation+" -nobackups" // process the xml
+ << "replaceall -element:Sound -value:"+currFileName+" -filename:"+currGrpFileLocation+" -nobackups";
+
+ myXmlProcessor->start();
+ myXmlProcessor->wait(); // Wait until all xml is edited
+ }
+
+ (*this->oniSplitCommands) << this->commandMap->value("general->XML->ONI")+" "+outputFolder+" "+Util::insertQuotes(GlobalVars::VagoTemporaryDir+"/*.xml");
+
+ this->myConverter->start(); // finally process the onisplit commands
+ this->myConverter->wait(); // wait for it to complete
+
+ // Finally remove the sample files, since not needed anymore
+ QFile(ambFileLocation).remove();
+ QFile(grpFileLocation).remove();
+}
+
+void SoundPageFinal::catchXmlAndOSplitProcessingError(QString result, int numErrors){
+
+ if(numErrors!=0){
+ QString sNumErrors=QString::number(numErrors);
+ if(numErrors>1){
+ Util::showErrorLogPopUp(result+"\n This is the last of "+sNumErrors+" Errors.");
+ }
+ else{
+ Util::showErrorLogPopUp(result);
+ }
+ }
+}
+
+void SoundPageFinal::connectSlots(){
+ //This signal is for thread that is working setup the progress bar (make it visible and set it's min-max)
+ connect(this->myXmlProcessor, SIGNAL(resultConversion(QString, int)), this, SLOT(catchXmlAndOSplitProcessingError(QString, int)));
+ connect(this->myConverter, SIGNAL(resultConversion(QString, int)), this, SLOT(catchXmlAndOSplitProcessingError(QString, int)));
+ connect(ui->lbComplete, SIGNAL(linkActivated(const QString & )), this, SLOT(openSoundsFolder()));
+}
+
+SoundPageFinal::~SoundPageFinal()
+{
+ delete this->xmlCommands;
+ delete this->oniSplitCommands;
+ delete this->myXmlProcessor;
+ delete this->myConverter;
+ delete ui;
+}
Index: /Vago/trunk/Vago/soundWizard/soundpagefinal.h
===================================================================
--- /Vago/trunk/Vago/soundWizard/soundpagefinal.h (revision 771)
+++ /Vago/trunk/Vago/soundWizard/soundpagefinal.h (revision 771)
@@ -0,0 +1,45 @@
+#ifndef SOUNDPAGEFINAL_H
+#define SOUNDPAGEFINAL_H
+
+#include
+#include
+#include
+
+#include "droptablewidget.h"
+#include "logger.h"
+#include "xmlprocessor.h"
+#include "converter.h"
+
+namespace Ui {
+class soundpagefinal;
+}
+
+class SoundPageFinal : public QWizardPage
+{
+ Q_OBJECT
+
+public:
+ explicit SoundPageFinal(QString soundsLocation, DropTableWidget *page2Table, Logger *myLogger, QHash *commandMap, QWidget *parent = 0);
+ ~SoundPageFinal();
+
+private:
+ QString soundsLocation;
+ Ui::soundpagefinal *ui;
+ DropTableWidget *page2Table;
+ Logger *myLogger;
+ XmlProcessor *myXmlProcessor;
+ Converter *myConverter;
+ QStringList *xmlCommands;
+ QStringList *oniSplitCommands;
+ QHash *commandMap;
+
+ void initializePage();
+ void startProcessing();
+ void connectSlots();
+
+private slots:
+ void openSoundsFolder();
+ void catchXmlAndOSplitProcessingError(QString result, int numErrors);
+};
+
+#endif // SOUNDPAGEFINAL_H
Index: /Vago/trunk/Vago/soundWizard/soundpagefinal.ui
===================================================================
--- /Vago/trunk/Vago/soundWizard/soundpagefinal.ui (revision 771)
+++ /Vago/trunk/Vago/soundWizard/soundpagefinal.ui (revision 771)
@@ -0,0 +1,50 @@
+
+
+ soundpagefinal
+
+
+
+ 0
+ 0
+ 640
+ 480
+
+
+
+ WizardPage
+
+
+ -
+
+
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">The wizard is now complete. The sounds have been converted. You can view all converted files clicking </span><a href=" "><span style=" font-size:8pt; text-decoration: underline; color:#0000ff;">here</span></a><span style=" font-size:8pt;">.</span></p>
+<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Click restart to create more sounds from the wizard beggining, otherwise click finish.</span></p></body></html>
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+ QSizePolicy::Fixed
+
+
+
+ 20
+ 30
+
+
+
+
+
+
+
+
+
Index: /Vago/trunk/Vago/soundWizard/soundwizard.cpp
===================================================================
--- /Vago/trunk/Vago/soundWizard/soundwizard.cpp (revision 771)
+++ /Vago/trunk/Vago/soundWizard/soundwizard.cpp (revision 771)
@@ -0,0 +1,79 @@
+#include "soundwizard.h"
+
+SoundWizard::SoundWizard(QString workspaceWizardLocation, Logger *myLogger, QHash *commandMap)
+{
+ this->workspaceWizardLocation=workspaceWizardLocation;
+ this->myLogger=myLogger;
+ this->soundsLocation=this->workspaceWizardLocation+"/Sounds";
+ this->commandMap=commandMap;
+}
+
+int SoundWizard::exec(){
+ this->myWizard = new QWizard();
+
+ QPushButton *restartButton = new QPushButton("Restart");
+ this->myWizard->setButton(QWizard::CustomButton1,restartButton);
+ this->myWizard->setOption(QWizard::HaveCustomButton1, true);
+
+ connect(this->myWizard, SIGNAL(currentIdChanged(int)), this, SLOT(pageChanged(int)));
+ connect(restartButton, SIGNAL(clicked(bool)), this, SLOT(restartWizard()));
+
+ this->myWizard->setWindowIcon(QIcon(":/new/icons/sound.png"));
+
+ //Center and resize QWizard (http://www.thedazzlersinc.com/source/2012/06/04/qt-center-window-in-screen/)
+ this->myWizard->resize(640,480);
+ QRect position = this->myWizard->frameGeometry();
+ position.moveCenter(QDesktopWidget().availableGeometry().center());
+ this->myWizard->move(position.topLeft());
+ //
+
+ SoundPage2 *page2 = new SoundPage2();
+ SoundPage3 *page3 = new SoundPage3();
+ SoundPage4 *page4 = new SoundPage4();
+ SoundPageFinal *pageFinal = new SoundPageFinal(this->soundsLocation,page2->soundTable,this->myLogger, this->commandMap);
+
+ this->myWizard->addPage(createIntroPage());
+ this->myWizard->addPage(page2);
+ this->myWizard->addPage(page3);
+ this->myWizard->addPage(page4);
+ this->myWizard->addPage(pageFinal);
+
+ this->myWizard->setWindowTitle("Sound wizard");
+
+ //If wizard finished with sucess
+ if(this->myWizard->exec()){ //modal and wait for finalization
+ //createPackage(this->myWizard, page4);
+ }
+
+ delete this->myWizard; // not needed anymore
+
+ return 0;
+}
+
+QWizardPage* SoundWizard::createIntroPage() {
+ QWizardPage *page = new QWizardPage;
+ page->setTitle("Introduction");
+
+ QLabel *label = new QLabel("Welcome to the Oni Sound wizard.\n"
+ "This wizard will allow you to convert in a few and simple steps sounds to oni format.");
+ label->setWordWrap(true);
+
+ QVBoxLayout *layout = new QVBoxLayout;
+ layout->addWidget(label);
+ page->setLayout(layout);
+
+ return page;
+}
+
+void SoundWizard::restartWizard(){
+ this->myWizard->restart();
+}
+
+void SoundWizard::pageChanged(int pageId){
+ // Last page?
+ if(pageId==4){
+ this->myWizard->setOption(QWizard::HaveCustomButton1, true); // set visible
+ return;
+ }
+ this->myWizard->setOption(QWizard::HaveCustomButton1, false); // set invisible
+}
Index: /Vago/trunk/Vago/soundWizard/soundwizard.h
===================================================================
--- /Vago/trunk/Vago/soundWizard/soundwizard.h (revision 771)
+++ /Vago/trunk/Vago/soundWizard/soundwizard.h (revision 771)
@@ -0,0 +1,40 @@
+#ifndef SOUNDWIZARD_H
+#define SOUNDWIZARD_H
+
+// System includes
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+// Local includes
+#include "util.h"
+#include "logger.h"
+#include "soundpage2.h"
+#include "soundpage3.h"
+#include "soundpage4.h"
+#include "soundpagefinal.h"
+
+class SoundWizard: public QObject // for signals and slots
+{
+ Q_OBJECT // for signals and slots
+public:
+ SoundWizard(QString workspaceWizardLocation, Logger *myLogger, QHash *commandMap);
+ int exec();
+private:
+ QWizardPage* createIntroPage();
+
+ QString workspaceWizardLocation;
+ QString soundsLocation;
+ Logger *myLogger;
+ QWizard *myWizard;
+ QHash *commandMap;
+private slots:
+ void restartWizard();
+ void pageChanged(int pageId);
+};
+
+#endif // SOUNDWIZARD_H
Index: /Vago/trunk/Vago/util.cpp
===================================================================
--- /Vago/trunk/Vago/util.cpp (revision 771)
+++ /Vago/trunk/Vago/util.cpp (revision 771)
@@ -0,0 +1,237 @@
+#include "util.h"
+
+namespace Util{
+
+QString normalizePath(QString path){
+ return path.replace("\\","/");
+}
+
+QString cutName(QString path){
+ return path.remove(0,path.lastIndexOf('/')).remove('"');
+}
+
+QString insertQuotes(QString path){
+ return "\""+path+"\"";
+}
+
+QString normalizeAndQuote(QString path){
+ return insertQuotes(normalizePath(path));
+}
+
+void showPopUp(QString message){
+ QMessageBox msgBox;
+ msgBox.setIcon(QMessageBox::Information);
+ msgBox.setText(message);
+ msgBox.exec();
+}
+
+void showRichPopUp(QString message){
+ QMessageBox msgBox;
+ msgBox.setTextFormat(Qt::RichText);
+ msgBox.setIcon(QMessageBox::Information);
+ msgBox.setText(message);
+ msgBox.exec();
+}
+
+void showWarningPopUp(QString message){
+ QMessageBox msgBox;
+ msgBox.setIcon(QMessageBox::Warning);
+ msgBox.setText(message);
+ msgBox.exec();
+}
+
+void showErrorPopUp(QString message){
+ QMessageBox msgBox;
+ msgBox.setIcon(QMessageBox::Critical);
+ msgBox.setText(message);
+ msgBox.exec();
+}
+
+//Same of above but allow open log file (doesn't right in log file!!)
+void showErrorLogPopUp(QString message){
+ QMessageBox msgBox;
+ msgBox.setIcon(QMessageBox::Critical);
+ msgBox.setText(message);
+ QPushButton *viewb = msgBox.addButton("View log", QMessageBox::ActionRole);
+ msgBox.setStandardButtons(QMessageBox::Close);
+ msgBox.exec();
+ if(msgBox.clickedButton() == (QAbstractButton*) viewb){
+ openLogFile();
+ }
+}
+
+void showRichErrorPopUp(QString message){
+ QMessageBox msgBox;
+ msgBox.setIcon(QMessageBox::Critical);
+ msgBox.setText(message);
+ msgBox.exec();
+}
+
+bool showQuestionPopUp(QWidget * parent, QString message){
+ return QMessageBox::question (parent, "Are you sure?", message, QMessageBox::Yes, QMessageBox::No)==QMessageBox::Yes;
+}
+
+QStringList multipleDirDialog(QString title){
+ QFileDialog w;
+
+ w.setFileMode(QFileDialog::DirectoryOnly);
+
+ w.setWindowTitle(title);
+
+ QListView *l = w.findChild("listView");
+
+ if (l) {
+ l->setSelectionMode(QAbstractItemView::MultiSelection);
+ }
+
+ QTreeView *t = w.findChild();
+
+ if (t) {
+ t->setSelectionMode(QAbstractItemView::MultiSelection);
+ }
+
+ if(w.exec()){ //if accepted
+ return w.selectedFiles();
+ }
+ return QStringList(); //return empty
+}
+
+bool checkEmptySpaces(QStringList toCheck){
+ foreach (QString current, toCheck){
+ if(current.trimmed().isEmpty()){
+ return true; //There are empty spaces
+ }
+ }
+ return false;
+}
+
+bool checkIfDoubles(QStringList toCheck){
+ foreach (QString current, toCheck){
+ if(!isStringDouble(current)){
+ return true; // Some aren't valid doubles
+ }
+ }
+ return false;
+}
+
+bool isStringInteger(QString myString){
+ bool isNumber;
+
+ myString.toInt(&isNumber); //convert to int and see if it succeeds
+
+ return isNumber;
+}
+
+bool isStringDouble(QString myString){
+ bool isDouble;
+
+ myString.toDouble(&isDouble); //convert to double and see if it succeeds
+
+ return isDouble;
+}
+
+//Copied from here: http://stackoverflow.com/questions/2536524/copy-directory-using-qt (ty roop)
+bool cpDir(const QString &srcPath, const QString &dstPath)
+{
+ rmDir(dstPath);
+
+ QDir parentDstDir(QFileInfo(dstPath).path());
+ if (!parentDstDir.mkdir(QFileInfo(dstPath).fileName()))
+ return false;
+
+ QDir srcDir(srcPath);
+ foreach(const QFileInfo &info, srcDir.entryInfoList(QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot)) {
+ QString srcItemPath = srcPath + "/" + info.fileName();
+ QString dstItemPath = dstPath + "/" + info.fileName();
+ if (info.isDir()) {
+ if (!cpDir(srcItemPath, dstItemPath)) {
+ return false;
+ }
+ } else if (info.isFile()) {
+ if (!QFile::copy(srcItemPath, dstItemPath)) {
+ return false;
+ }
+ } else {
+ qDebug("Unhandled item" + info.filePath().toAscii() + "in cpDir");
+ }
+ }
+ return true;
+}
+
+//Copied from here: http://stackoverflow.com/questions/2536524/copy-directory-using-qt (ty roop)
+bool rmDir(const QString &dirPath)
+{
+ QDir dir(dirPath);
+ if (!dir.exists())
+ return true;
+ foreach(const QFileInfo &info, dir.entryInfoList(QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot)) {
+ if (info.isDir()) {
+ if (!rmDir(info.filePath()))
+ return false;
+ } else {
+ if (!dir.remove(info.fileName()))
+ return false;
+ }
+ }
+ QDir parentDir(QFileInfo(dirPath).path());
+ return parentDir.rmdir(QFileInfo(dirPath).fileName());
+}
+
+QString fullTrim(QString str) {
+
+ str = str.simplified(); //convert all invisible chars in normal whitespaces
+ str.replace( " ", "" );
+
+ return str;
+}
+
+void openLogFile(){
+ QDesktopServices::openUrl(QUrl("file:///"+QDir::currentPath()+"/"+GlobalVars::AppLogName));
+}
+
+//Searches for the QString "toSearch" in the "myString" variable backward
+//Returns the index of the first match or -1 if not found
+int indexOfBackward(QString myString, QString toSearch, int from){
+ int myStringSize=myString.size();
+ int toSearchSize=toSearch.size();
+
+ if(from==-1){
+ from=myStringSize;
+ }
+
+ int i=from;
+
+ while(i>=0){
+ for(int j=toSearchSize-1; j>=0; j--){
+ i--;
+ if(myString.at(i)!=toSearch.at(j)){
+ break;
+ }
+ if(j==0){
+ return i;
+ }
+ }
+ }
+
+ return -1;
+}
+
+QStringList substring(QString myString,QString separator, Qt::CaseSensitivity cs){
+ QStringList result = QStringList();
+ int currIdx=0, nextIdx=0;
+
+ while(true){
+ nextIdx=myString.indexOf(separator,currIdx,cs);
+ result << myString.mid(currIdx,nextIdx-currIdx);
+ if(nextIdx==-1) break;
+ currIdx=nextIdx+1;
+ }
+
+ return result;
+}
+
+QString normalizeDecimalSeparator(QString value){
+ return value.replace(',','.');
+}
+
+}
Index: /Vago/trunk/Vago/util.h
===================================================================
--- /Vago/trunk/Vago/util.h (revision 771)
+++ /Vago/trunk/Vago/util.h (revision 771)
@@ -0,0 +1,60 @@
+#ifndef UTIL_H
+#define UTIL_H
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+
+namespace GlobalVars{
+ const QString AppVersion="0.8";
+ const QString OniSplitExeName="OniSplit.exe";
+ const QString XmlToolsExeName="xmlTools.exe";
+ const QString AppLogName="logVago.txt";
+ const QString BuiltOniSplitVersion="0.9.86.0";
+ const QString BuiltXmlToolsVersion="0.8d";
+ const QString ModsDomain="www.mods.oni2.net";
+ const QString VagoNode = "247";
+ const QString VagoCheckUpdatesUrl="http://"+ModsDomain+"/?q=api/node/"+VagoNode+".json";
+ const QString VagoWebUrl="http://"+ModsDomain+"/node/"+VagoNode;
+ const QString VagoTemporaryDir=QDir::tempPath()+"/VagoTemp";
+ const QString HelpLocation=QDir::currentPath() + "/help";
+ const char OniSplitProcSeparator=';';
+}
+
+/**
+ Utilities functions (global)
+ **/
+namespace Util{
+ QString normalizePath(QString path);
+ QString cutName(QString path);
+ QString insertQuotes(QString path);
+ QString normalizeAndQuote(QString path);
+ QString fullTrim(QString str);
+ QString normalizeDecimalSeparator(QString value);
+ QStringList multipleDirDialog(QString title);
+ QStringList substring(QString myString,QString separator,Qt::CaseSensitivity cs = Qt::CaseSensitive);
+ int indexOfBackward(QString myString, QString toSearch, int from = -1);
+ bool showQuestionPopUp(QWidget * parent, QString message);
+ bool checkEmptySpaces(QStringList toCheck);
+ bool checkIfDoubles(QStringList toCheck);
+ bool isStringInteger(QString myString);
+ bool isStringDouble(QString myString);
+ bool cpDir(const QString &srcPath, const QString &dstPath);
+ bool rmDir(const QString &dirPath);
+ bool removeDir(const QString &dirName);
+ void showPopUp(QString message);
+ void showRichPopUp(QString message);
+ void showWarningPopUp(QString message);
+ void showErrorPopUp(QString message);
+ void showErrorLogPopUp(QString message);
+ void showRichErrorPopUp(QString message);
+ void openLogFile();
+
+}
+
+#endif // UTIL_H
Index: /Vago/trunk/Vago/xmlprocessor.cpp
===================================================================
--- /Vago/trunk/Vago/xmlprocessor.cpp (revision 771)
+++ /Vago/trunk/Vago/xmlprocessor.cpp (revision 771)
@@ -0,0 +1,44 @@
+#include "xmlprocessor.h"
+
+XmlProcessor::XmlProcessor(Logger *myLogger, QStringList *commands)
+{
+ this->myLogger=myLogger;
+ this->commands=commands;
+}
+
+void XmlProcessor::run()
+{
+ QProcess *myProcess = new QProcess();
+ QString result = QString();
+ QString errorMessage = "";
+ int numErrors=0;
+
+ for(int i=0; icommands->size(); i++){
+
+ myProcess->start(GlobalVars::XmlToolsExeName+" "+this->commands->at(i));
+ myProcess->waitForFinished(-1);
+ result=myProcess->readAllStandardError();
+
+ if(!result.isEmpty()){
+ //catch exception
+ myLogger->writeString("Xml Tools Error: \n"+this->commands->at(i)+"\n"+result);
+ errorMessage=result;
+ numErrors++;
+ }
+
+ }
+
+ delete myProcess; //delete object and make pointer invalid
+ this->commands->clear(); //clean list
+
+ //let's cut it a bit, complete error is in log file.
+ if(errorMessage.size()>600){
+ //limit it at 400 characters (not counting the warning at the begin)
+ errorMessage.remove(299,errorMessage.size()-600);
+ errorMessage.insert(299,"\n \t ... \n");
+ errorMessage.insert(0,"This error was been shortened. \nSee the complete error at Vago log file.\n\n");
+ }
+
+ emit resultConversion(errorMessage,numErrors);
+}
+
Index: /Vago/trunk/Vago/xmlprocessor.h
===================================================================
--- /Vago/trunk/Vago/xmlprocessor.h (revision 771)
+++ /Vago/trunk/Vago/xmlprocessor.h (revision 771)
@@ -0,0 +1,25 @@
+#ifndef XMLCOMMAND_H
+#define XMLCOMMAND_H
+#include
+#include
+#include
+#include
+
+class XmlProcessor : public QThread
+{
+ Q_OBJECT
+public:
+ XmlProcessor(Logger *myLogger, QStringList *commands);
+private:
+ Logger *myLogger;
+ QStringList *commands;
+
+protected:
+ void run(); //for thread
+signals:
+ void resultConversion(QString result, int numErrors);
+};
+
+
+
+#endif // XMLCOMMAND_H
+
+
+
