").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: s10k/Vago/help/XMLSNDD_files/load(4).php
===================================================================
--- s10k/Vago/help/XMLSNDD_files/load(4).php (revision 1092)
+++ s10k/Vago/help/XMLSNDD_files/load(4).php (revision 1092)
@@ -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: s10k/Vago/help/XMLSNDD_files/load(5).php
===================================================================
--- s10k/Vago/help/XMLSNDD_files/load(5).php (revision 1092)
+++ s10k/Vago/help/XMLSNDD_files/load(5).php (revision 1092)
@@ -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: s10k/Vago/help/XMLSNDD_files/load(6).php
===================================================================
--- s10k/Vago/help/XMLSNDD_files/load(6).php (revision 1092)
+++ s10k/Vago/help/XMLSNDD_files/load(6).php (revision 1092)
@@ -0,0 +1,39 @@
+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.action.watch.ajax",function($){(function($,mw,undefined){var title=mw.config.get('wgRelevantPageName',mw.config.get('wgPageName'));function updateWatchLink($link,action,state){var msgKey=state==='loading'?action+'ing':action,accesskeyTip=$link.attr('title').match(mw.util.tooltipAccessKeyRegexp),$li=$link.closest('li');$link.text(mw.msg(msgKey)).attr('title',mw.msg('tooltip-ca-'+action)+(accesskeyTip?' '+accesskeyTip[0]:'')).attr('href',mw.util.wikiScript()+'?'+$.param({title:title,action:action}));if($li.hasClass('icon')){if(state==='loading'){$link.addClass('loading');}else{$link.removeClass('loading');}}}function mwUriGetAction(url){var actionPaths=mw.config.get('wgActionPaths'),key,parts,m,action;action=mw.util.getParamValue('action',url);if(action!==null){return action;}for(key in actionPaths){if(actionPaths.hasOwnProperty(key)){parts=actionPaths[key].split('$1');for(i=0;i2&&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);;},{},{});mw.loader.implement("mediawiki.api.watch",function($){(function($,mw){$.extend(mw.Api.prototype,{watch:function(page,success,err){var params,ok;params={action:'watch',title:String(page),token:mw.user.tokens.get('watchToken'),uselang:mw.config.get('wgUserLanguage')};ok=function(data){success(data.watch);};return this.post(params,{ok:ok,err:err});},unwatch:function(page,success,err){var params,ok;params={action:'watch',unwatch:1,title:String(page),token:mw.user.tokens.get('watchToken'),uselang:mw.config.get('wgUserLanguage')};ok=function(data){success(data.watch);};return this.post(params,{ok:ok,err:err});}});})(jQuery,mediaWiki);;},{},{});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();});;},{},{});
+
+/* cache key: oni_wiki:resourceloader:filter:minify-js:7:52f85c67a660c33318a4361f87c17a08 */
Index: s10k/Vago/help/XMLSNDD_files/load(7).php
===================================================================
--- s10k/Vago/help/XMLSNDD_files/load(7).php (revision 1092)
+++ s10k/Vago/help/XMLSNDD_files/load(7).php (revision 1092)
@@ -0,0 +1,13 @@
+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 tr > th,table.wikitable > tr > td,table.wikitable > * > tr > th,table.wikitable > * > tr > td,.mw_metadata th,.mw_metadata td{border:1px #aaa solid;padding:0.2em}table.wikitable > tr > th,table.wikitable > * > tr > th,.mw_metadata th{text-align:center;background:white;font-weight:bold}table.wikitable > caption,.mw_metadata caption{font-weight:bold}a.sortheader{margin:0 0.3em} .wikitable,.thumb,img{page-break-inside:avoid}h2,h3,h4,h5,h6,h7{page-break-after:avoid}p{widows:3;orphans:3} .catlinks ul{display:inline;margin:0;padding:0;list-style:none;list-style-type:none;list-style-image:none;vertical-align:middle !ie}.catlinks li{display:inline-block;line-height:1.15em;padding:0 .4em;border-left:1px solid #AAA;margin:0.1em 0;zoom:1;display:inline !ie}.catlinks li:first-child{padding-left:.2em;border-left:none}}@media screen{ .mw-content-ltr{ direction:ltr}.mw-content-rtl{ direction:rtl} .sitedir-ltr textarea,.sitedir-ltr input{ direction:ltr}.sitedir-rtl textarea,.sitedir-rtl input{ direction:rtl} input[type="submit"],input[type="button"],input[type="reset"],input[type="file"]{direction:ltr} textarea[dir="ltr"],input[dir="ltr"]{ direction:ltr}textarea[dir="rtl"],input[dir="rtl"]{ direction:rtl} abbr,acronym,.explain{border-bottom:1px dotted;cursor:help} .mw-plusminus-pos{color:#006400; }.mw-plusminus-neg{color:#8b0000; }.mw-plusminus-null{color:#aaa; } .allpagesredirect,.redirect-in-category,.watchlistredir{font-style:italic} span.comment{font-style:italic}span.changedby{font-size:95%} .texvc{direction:ltr;unicode-bidi:embed}img.tex{vertical-align:middle}span.texhtml{font-family:serif} #wikiPreview.ontop{margin-bottom:1em} #editform,#toolbar,#wpTextbox1{clear:both}#toolbar img{cursor:pointer}div#mw-js-message{margin:1em 5%;padding:0.5em 2.5%;border:solid 1px #ddd;background-color:#fcfcfc} .editsection{float:right;margin-left:5px} .mw-content-ltr .editsection,.mw-content-rtl .mw-content-ltr .editsection{ float:right}.mw-content-rtl .editsection,.mw-content-ltr .mw-content-rtl .editsection{ float:left} div.mw-filepage-resolutioninfo{font-size:smaller} h2#filehistory{clear:both}table.filehistory th,table.filehistory td{vertical-align:top}table.filehistory th{text-align:left}table.filehistory td.mw-imagepage-filesize,table.filehistory th.mw-imagepage-filesize{white-space:nowrap}table.filehistory td.filehistory-selected{font-weight:bold} .filehistory a img,#file img:hover{background:white url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAAAAAA6mKC9AAAAGElEQVQYV2N4DwX/oYBhgARgDJjEAAkAAEC99wFuu0VFAAAAAElFTkSuQmCC) repeat;background:white url(http://wiki.oni2.net/w/skins/common/images/Checker-16x16.png?2012-08-30T22:25:00Z) repeat!ie} li span.deleted,span.history-deleted{text-decoration:line-through;color:#888;font-style:italic} .not-patrolled{background-color:#ffa}.unpatrolled{font-weight:bold;color:red}div.patrollink{font-size:75%;text-align:right} td.mw-label{text-align:right}td.mw-input{text-align:left}td.mw-submit{text-align:left}td.mw-label{vertical-align:top}.prefsection td.mw-label{width:20%}.prefsection table{width:100%}td.mw-submit{white-space:nowrap}table.mw-htmlform-nolabel td.mw-label{width:1px}tr.mw-htmlform-vertical-label td.mw-label{text-align:left !important}.mw-htmlform-invalid-input td.mw-input input{border-color:red}.mw-htmlform-flatlist div.mw-htmlform-flatlist-item{display:inline;margin-right:1em;white-space:nowrap}input#wpSummary{width:80%} .thumbcaption{text-align:left}.magnify{float:right} #catlinks{ text-align:left}.catlinks ul{display:inline;margin:0;padding:0;list-style:none;list-style-type:none;list-style-image:none;vertical-align:middle !ie}.catlinks li{display:inline-block;line-height:1.25em;border-left:1px solid #AAA;margin:0.125em 0;padding:0 0.5em;zoom:1;display:inline !ie}.catlinks li:first-child{padding-left:0.25em;border-left:none} .mw-hidden-cats-hidden{display:none}.catlinks-allhidden{display:none} p.mw-ipb-conveniencelinks,p.mw-protect-editreasons,p.mw-filedelete-editreasons,p.mw-delete-editreasons,p.mw-revdel-editreasons{font-size:90%;text-align:right} .os-suggest{overflow:auto;overflow-x:hidden;position:absolute;top:0;left:0;width:0;background-color:white;border-style:solid;border-color:#AAAAAA;border-width:1px;z-index:99;font-size:95%}table.os-suggest-results{font-size:95%;cursor:pointer;border:0;border-collapse:collapse;width:100%}.os-suggest-result,.os-suggest-result-hl{white-space:nowrap;background-color:white;color:black;padding:2px}.os-suggest-result-hl,.os-suggest-result-hl-webkit{background-color:#4C59A6;color:white}.os-suggest-toggle{position:relative;left:1ex;font-size:65%}.os-suggest-toggle-def{position:absolute;top:0;left:0;font-size:65%;visibility:hidden} .autocomment{color:gray}#pagehistory .history-user{margin-left:0.4em;margin-right:0.2em}#pagehistory span.minor{font-weight:bold}#pagehistory li{border:1px solid white}#pagehistory li.selected{background-color:#f9f9f9;border:1px dashed #aaa}.mw-history-revisiondelete-button,#mw-fileduplicatesearch-icon{float:right} .newpage,.minoredit,.botedit{font-weight:bold}#shared-image-dup,#shared-image-conflict{font-style:italic} div.mw-warning-with-logexcerpt{padding:3px;margin-bottom:3px;border:2px solid #2F6FAB;clear:both}div.mw-warning-with-logexcerpt ul li{font-size:90%} span.mw-revdelundel-link,strong.mw-revdelundel-link{font-size:90%}span.mw-revdelundel-hidden,input.mw-revdelundel-hidden{visibility:hidden}td.mw-revdel-checkbox,th.mw-revdel-checkbox{padding-right:10px;text-align:center} a.feedlink{background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAYAAABWdVznAAAABmJLR0QA/wD/AP+gvaeTAAAAB3RJTUUH2AkOCjkSL9xYhAAAAc9JREFUKJE90LFrU1EYQPHzffe+l/iSVkXTmNiANBU7iE5OLrbSVYKIiy5dnARB3FwEB5dOOhQKuthJEEHRsUXBoosO0lKKEYRa29LWQk3S5L53r0PVv+D8OPJlolrrr1ZmI7F1BFEjqBXECGJAjSBCaLddc7u5Mmb7q5U5007rWh5E9rYR/xsTBBXBWMVEglqRpGiGhcE5G6kdyugxcGsGyRdJ15ZwC29IF55jNEWt8K+aFOMhc+dC7Z6SITjC7ga2MkI8cpH41Dhh7RPa20Gt4toZac+IqhFMTpG0hVt8RetJg967SaTvGLnGNKZ0EtfOcB1P5jyqVjCRkIzfpnjtMYXrT2FrCff6JqhFRx/gnCXtZHgXUFHQSGg/u4Gbf4T2lYkvTaFGce8fIgePY09fwXU8Pg3sk2JFu5v4lQ+4FxPge+j5u3Q+v8TvrBKfbZB1PT4LqJh9Uv7yFLmrM2i+gPs4jRyqIaUz7C2+xZZOEA4cJaSgaAhqhbC1DK0N3K9NusvzAHB4GLf+HQBJBsiCD7J6/9zXI2VbVyv/b6Sdv1e6nrTryboB7wVbyjXt1rcfo0Frs4UkqvtUJHMBjyVEAcSjFiQJwRvf3F3/OfYH/dDFWrCooaIAAAAASUVORK5CYII=) center left no-repeat;background:url(http://wiki.oni2.net/w/skins/common/images/feed-icon.png?2012-08-30T22:25:00Z) center left no-repeat!ie;padding-left:16px} .plainlinks a{background:none !important;padding:0 !important} .rtl a.external.free,.rtl a.external.autonumber{direction:ltr;unicode-bidi:embed} table.wikitable{margin:1em 1em 1em 0;background-color:#f9f9f9;border:1px #aaa solid;border-collapse:collapse;color:black}table.wikitable > tr > th,table.wikitable > tr > td,table.wikitable > * > tr > th,table.wikitable > * > tr > td{border:1px #aaa solid;padding:0.2em}table.wikitable > tr > th,table.wikitable > * > tr > th{background-color:#f2f2f2;text-align:center}table.wikitable > caption{font-weight:bold} table.collapsed tr.collapsable{display:none} .success{color:green;font-size:larger}.warning{color:#FFA500; font-size:larger}.error{color:red;font-size:larger}.errorbox,.warningbox,.successbox{font-size:larger;border:2px solid;padding:.5em 1em;float:left;margin-bottom:2em;color:#000}.errorbox{border-color:red;background-color:#fff2f2}.warningbox{border-color:#FF8C00; background-color:#FFFFC0}.successbox{border-color:green;background-color:#dfd}.errorbox h2,.warningbox h2,.successbox h2{font-size:1em;font-weight:bold;display:inline;margin:0 .5em 0 0;border:none} .mw-infobox{border:2px solid #ff7f00;margin:0.5em;clear:left;overflow:hidden}.mw-infobox-left{margin:7px;float:left;width:35px}.mw-infobox-right{margin:0.5em 0.5em 0.5em 49px} .previewnote{color:#c00;margin-bottom:1em}.previewnote p{text-indent:3em;margin:0.8em 0}.visualClear{clear:both}#mw_trackbacks{border:solid 1px #bbbbff;background-color:#eeeeff;padding:0.2em} .mw-datatable{border-collapse:collapse}.mw-datatable,.mw-datatable td,.mw-datatable th{border:1px solid #aaaaaa;padding:0 0.15em 0 0.15em}.mw-datatable th{background-color:#ddddff}.mw-datatable td{background-color:#ffffff}.mw-datatable tr:hover td{background-color:#eeeeff} .TablePager{min-width:80%}.TablePager_nav{margin:0 auto}.TablePager_nav td{padding:3px;text-align:center}.TablePager_nav a{text-decoration:none}.imagelist td,.imagelist th{white-space:nowrap}.imagelist .TablePager_col_links{background-color:#eeeeff}.imagelist .TablePager_col_img_description{white-space:normal}.imagelist th.TablePager_sort{background-color:#ccccff} ul#filetoc{text-align:center;border:1px solid #aaaaaa;background-color:#f9f9f9;padding:5px;font-size:95%;margin-bottom:0.5em;margin-left:0;margin-right:0}#filetoc li{display:inline;list-style-type:none;padding-right:2em} table.mw_metadata{font-size:0.8em;margin-left:0.5em;margin-bottom:0.5em;width:400px}table.mw_metadata caption{font-weight:bold}table.mw_metadata th{font-weight:normal}table.mw_metadata td{padding:0.1em}table.mw_metadata{border:none;border-collapse:collapse}table.mw_metadata td,table.mw_metadata th{text-align:center;border:1px solid #aaaaaa;padding-left:5px;padding-right:5px}table.mw_metadata th{background-color:#f9f9f9}table.mw_metadata td{background-color:#fcfcfc}table.mw_metadata ul.metadata-langlist{list-style-type:none;list-style-image:none;padding-right:5px;padding-left:5px;margin:0} .mw-content-ltr ul,.mw-content-rtl .mw-content-ltr ul{ margin:0.3em 0 0 1.6em;padding:0}.mw-content-rtl ul,.mw-content-ltr .mw-content-rtl ul{ margin:0.3em 1.6em 0 0;padding:0}.mw-content-ltr ol,.mw-content-rtl .mw-content-ltr ol{ margin:0.3em 0 0 3.2em;padding:0}.mw-content-rtl ol,.mw-content-ltr .mw-content-rtl ol{ margin:0.3em 3.2em 0 0;padding:0} .mw-content-ltr dd,.mw-content-rtl .mw-content-ltr dd{margin-left:1.6em;margin-right:0} .mw-content-rtl dd,.mw-content-ltr .mw-content-rtl dd{margin-right:1.6em;margin-left:0} li.gallerybox{vertical-align:top;border:solid 2px white;display:-moz-inline-box;display:inline-block}ul.gallery,li.gallerybox{zoom:1;*display:inline}ul.gallery{margin:2px;padding:2px;display:block}li.gallerycaption{font-weight:bold;text-align:center;display:block;word-wrap:break-word}li.gallerybox div.thumb{text-align:center;border:1px solid #ccc;background-color:#f9f9f9;margin:2px}li.gallerybox div.thumb img{display:block;margin:0 auto}div.gallerytext{overflow:hidden;font-size:94%;padding:2px 4px;word-wrap:break-word}.mw-ajax-loader{background-image:url(data:image/gif;base64,R0lGODlhIAAgAPMAAP///wAAAMbGxoSEhLa2tpqamjY2NlZWVtjY2OTk5Ly8vB4eHgQEBAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh/hpDcmVhdGVkIHdpdGggYWpheGxvYWQuaW5mbwAh+QQJCgAAACwAAAAAIAAgAAAE5xDISWlhperN52JLhSSdRgwVo1ICQZRUsiwHpTJT4iowNS8vyW2icCF6k8HMMBkCEDskxTBDAZwuAkkqIfxIQyhBQBFvAQSDITM5VDW6XNE4KagNh6Bgwe60smQUB3d4Rz1ZBApnFASDd0hihh12BkE9kjAJVlycXIg7CQIFA6SlnJ87paqbSKiKoqusnbMdmDC2tXQlkUhziYtyWTxIfy6BE8WJt5YJvpJivxNaGmLHT0VnOgSYf0dZXS7APdpB309RnHOG5gDqXGLDaC457D1zZ/V/nmOM82XiHRLYKhKP1oZmADdEAAAh+QQJCgAAACwAAAAAIAAgAAAE6hDISWlZpOrNp1lGNRSdRpDUolIGw5RUYhhHukqFu8DsrEyqnWThGvAmhVlteBvojpTDDBUEIFwMFBRAmBkSgOrBFZogCASwBDEY/CZSg7GSE0gSCjQBMVG023xWBhklAnoEdhQEfyNqMIcKjhRsjEdnezB+A4k8gTwJhFuiW4dokXiloUepBAp5qaKpp6+Ho7aWW54wl7obvEe0kRuoplCGepwSx2jJvqHEmGt6whJpGpfJCHmOoNHKaHx61WiSR92E4lbFoq+B6QDtuetcaBPnW6+O7wDHpIiK9SaVK5GgV543tzjgGcghAgAh+QQJCgAAACwAAAAAIAAgAAAE7hDISSkxpOrN5zFHNWRdhSiVoVLHspRUMoyUakyEe8PTPCATW9A14E0UvuAKMNAZKYUZCiBMuBakSQKG8G2FzUWox2AUtAQFcBKlVQoLgQReZhQlCIJesQXI5B0CBnUMOxMCenoCfTCEWBsJColTMANldx15BGs8B5wlCZ9Po6OJkwmRpnqkqnuSrayqfKmqpLajoiW5HJq7FL1Gr2mMMcKUMIiJgIemy7xZtJsTmsM4xHiKv5KMCXqfyUCJEonXPN2rAOIAmsfB3uPoAK++G+w48edZPK+M6hLJpQg484enXIdQFSS1u6UhksENEQAAIfkECQoAAAAsAAAAACAAIAAABOcQyEmpGKLqzWcZRVUQnZYg1aBSh2GUVEIQ2aQOE+G+cD4ntpWkZQj1JIiZIogDFFyHI0UxQwFugMSOFIPJftfVAEoZLBbcLEFhlQiqGp1Vd140AUklUN3eCA51C1EWMzMCezCBBmkxVIVHBWd3HHl9JQOIJSdSnJ0TDKChCwUJjoWMPaGqDKannasMo6WnM562R5YluZRwur0wpgqZE7NKUm+FNRPIhjBJxKZteWuIBMN4zRMIVIhffcgojwCF117i4nlLnY5ztRLsnOk+aV+oJY7V7m76PdkS4trKcdg0Zc0tTcKkRAAAIfkECQoAAAAsAAAAACAAIAAABO4QyEkpKqjqzScpRaVkXZWQEximw1BSCUEIlDohrft6cpKCk5xid5MNJTaAIkekKGQkWyKHkvhKsR7ARmitkAYDYRIbUQRQjWBwJRzChi9CRlBcY1UN4g0/VNB0AlcvcAYHRyZPdEQFYV8ccwR5HWxEJ02YmRMLnJ1xCYp0Y5idpQuhopmmC2KgojKasUQDk5BNAwwMOh2RtRq5uQuPZKGIJQIGwAwGf6I0JXMpC8C7kXWDBINFMxS4DKMAWVWAGYsAdNqW5uaRxkSKJOZKaU3tPOBZ4DuK2LATgJhkPJMgTwKCdFjyPHEnKxFCDhEAACH5BAkKAAAALAAAAAAgACAAAATzEMhJaVKp6s2nIkolIJ2WkBShpkVRWqqQrhLSEu9MZJKK9y1ZrqYK9WiClmvoUaF8gIQSNeF1Er4MNFn4SRSDARWroAIETg1iVwuHjYB1kYc1mwruwXKC9gmsJXliGxc+XiUCby9ydh1sOSdMkpMTBpaXBzsfhoc5l58Gm5yToAaZhaOUqjkDgCWNHAULCwOLaTmzswadEqggQwgHuQsHIoZCHQMMQgQGubVEcxOPFAcMDAYUA85eWARmfSRQCdcMe0zeP1AAygwLlJtPNAAL19DARdPzBOWSm1brJBi45soRAWQAAkrQIykShQ9wVhHCwCQCACH5BAkKAAAALAAAAAAgACAAAATrEMhJaVKp6s2nIkqFZF2VIBWhUsJaTokqUCoBq+E71SRQeyqUToLA7VxF0JDyIQh/MVVPMt1ECZlfcjZJ9mIKoaTl1MRIl5o4CUKXOwmyrCInCKqcWtvadL2SYhyASyNDJ0uIiRMDjI0Fd30/iI2UA5GSS5UDj2l6NoqgOgN4gksEBgYFf0FDqKgHnyZ9OX8HrgYHdHpcHQULXAS2qKpENRg7eAMLC7kTBaixUYFkKAzWAAnLC7FLVxLWDBLKCwaKTULgEwbLA4hJtOkSBNqITT3xEgfLpBtzE/jiuL04RGEBgwWhShRgQExHBAAh+QQJCgAAACwAAAAAIAAgAAAE7xDISWlSqerNpyJKhWRdlSAVoVLCWk6JKlAqAavhO9UkUHsqlE6CwO1cRdCQ8iEIfzFVTzLdRAmZX3I2SfZiCqGk5dTESJeaOAlClzsJsqwiJwiqnFrb2nS9kmIcgEsjQydLiIlHehhpejaIjzh9eomSjZR+ipslWIRLAgMDOR2DOqKogTB9pCUJBagDBXR6XB0EBkIIsaRsGGMMAxoDBgYHTKJiUYEGDAzHC9EACcUGkIgFzgwZ0QsSBcXHiQvOwgDdEwfFs0sDzt4S6BK4xYjkDOzn0unFeBzOBijIm1Dgmg5YFQwsCMjp1oJ8LyIAACH5BAkKAAAALAAAAAAgACAAAATwEMhJaVKp6s2nIkqFZF2VIBWhUsJaTokqUCoBq+E71SRQeyqUToLA7VxF0JDyIQh/MVVPMt1ECZlfcjZJ9mIKoaTl1MRIl5o4CUKXOwmyrCInCKqcWtvadL2SYhyASyNDJ0uIiUd6GGl6NoiPOH16iZKNlH6KmyWFOggHhEEvAwwMA0N9GBsEC6amhnVcEwavDAazGwIDaH1ipaYLBUTCGgQDA8NdHz0FpqgTBwsLqAbWAAnIA4FWKdMLGdYGEgraigbT0OITBcg5QwPT4xLrROZL6AuQAPUS7bxLpoWidY0JtxLHKhwwMJBTHgPKdEQAACH5BAkKAAAALAAAAAAgACAAAATrEMhJaVKp6s2nIkqFZF2VIBWhUsJaTokqUCoBq+E71SRQeyqUToLA7VxF0JDyIQh/MVVPMt1ECZlfcjZJ9mIKoaTl1MRIl5o4CUKXOwmyrCInCKqcWtvadL2SYhyASyNDJ0uIiUd6GAULDJCRiXo1CpGXDJOUjY+Yip9DhToJA4RBLwMLCwVDfRgbBAaqqoZ1XBMHswsHtxtFaH1iqaoGNgAIxRpbFAgfPQSqpbgGBqUD1wBXeCYp1AYZ19JJOYgH1KwA4UBvQwXUBxPqVD9L3sbp2BNk2xvvFPJd+MFCN6HAAIKgNggY0KtEBAAh+QQJCgAAACwAAAAAIAAgAAAE6BDISWlSqerNpyJKhWRdlSAVoVLCWk6JKlAqAavhO9UkUHsqlE6CwO1cRdCQ8iEIfzFVTzLdRAmZX3I2SfYIDMaAFdTESJeaEDAIMxYFqrOUaNW4E4ObYcCXaiBVEgULe0NJaxxtYksjh2NLkZISgDgJhHthkpU4mW6blRiYmZOlh4JWkDqILwUGBnE6TYEbCgevr0N1gH4At7gHiRpFaLNrrq8HNgAJA70AWxQIH1+vsYMDAzZQPC9VCNkDWUhGkuE5PxJNwiUK4UfLzOlD4WvzAHaoG9nxPi5d+jYUqfAhhykOFwJWiAAAIfkECQoAAAAsAAAAACAAIAAABPAQyElpUqnqzaciSoVkXVUMFaFSwlpOCcMYlErAavhOMnNLNo8KsZsMZItJEIDIFSkLGQoQTNhIsFehRww2CQLKF0tYGKYSg+ygsZIuNqJksKgbfgIGepNo2cIUB3V1B3IvNiBYNQaDSTtfhhx0CwVPI0UJe0+bm4g5VgcGoqOcnjmjqDSdnhgEoamcsZuXO1aWQy8KAwOAuTYYGwi7w5h+Kr0SJ8MFihpNbx+4Erq7BYBuzsdiH1jCAzoSfl0rVirNbRXlBBlLX+BP0XJLAPGzTkAuAOqb0WT5AH7OcdCm5B8TgRwSRKIHQtaLCwg1RAAAOwAAAAAAAAAAAA==);background-image:url(http://wiki.oni2.net/w/skins/common/images/ajax-loader.gif?2012-08-30T22:25:00Z)!ie;background-position:center center;background-repeat:no-repeat;padding:16px;position:relative;top:-16px}.mw-small-spinner{padding:10px !important;margin-right:0.6em;background-image:url(data:image/gif;base64,R0lGODlhFAAUAPUyAAEBAQICAgMDAwQEBAcHBwkJCSIiIigoKCwsLDQ0ND8/P0REREVFRU1NTVJSUlVVVVZWVl1dXWNjY25ubnBwcHR0dHh4eISEhIWFhYeHh4mJiZKSkpaWlpubm6Wlpaqqqra2tre3t7i4uLm5ubq6uru7u7+/v8DAwMLCwsPDw8TExMbGxsfHx8jIyMnJycrKys7OztDQ0P///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAkKADIAIf4aQ3JlYXRlZCB3aXRoIGFqYXhsb2FkLmluZm8AIf8LTkVUU0NBUEUyLjADAQAAACwAAAAAFAAUAAAGlUCZcDhMOIhIImcyJBSEqVRy6EBUhIGADEYyTYcHhZCgTZG+w4fBIgsQZCSp8Cx8NIYKCbElXJFIMXUMDBEeX38pMEgPDBRfKytfG2hJHxoXGRmUIJwgKx2ZmJudipSmfXxTfolEMGZ0U69yMX+RMqlCLbAmcnBDZjKcMn62aHHBIFCwUyYkisJbf2hRQtAygadbxUlBACH5BAkKADcALAAAAAAUABQAhRISEhQUFBYWFh0dHR4eHiEhISIiIiMjIykpKSwsLC0tLS8vLzY2Njo6Oj8/P0FBQUhISEpKSlRUVFdXV2RkZGZmZm1tbW9vb3Nzc35+fn9/f4eHh4mJiYyMjJGRkZSUlJiYmJ2dnZ6enqOjo6SkpLa2tre3t7i4uLm5ubq6uru7u7y8vL+/v8DAwMLCwsPDw8TExMbGxsfHx8jIyMrKys7OztDQ0P///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaQwJtwOIxciEhiKDMsFISLRXJYeTBvBIIQgJgOHxJh9rYAeKmNDbZwCTCGqiHIM5RgiBFhTKWyCUkdHCExXnwvNUgfHSNeMy+FZ0k1KiWVkZWVMTGYJZeYiJGhQi8zXnuHRDUvKitnqyuPN5MqhDelQ3tDsHBDqzeWe7VnrL+dN76uKoiWsnyutcw3fqKywklBACH5BAkKADkALAAAAAAUABQAhQoKChAQEBERESgoKCoqKiwsLC4uLjU1NTY2Njc3Nzo6Ojw8PD09PT4+PkBAQENDQ0RERElJSVBQUFlZWWFhYWJiYmVlZXx8fIKCgoaGhoqKioyMjI+Pj5GRkZWVlZiYmJ6enqSkpKenp7Ozs7a2tre3t7i4uLm5ubq6uru7u7y8vL+/v8DAwMLCwsPDw8TExMXFxcbGxsfHx8jIyMrKys7OztDQ0NTU1NnZ2f///wAAAAAAAAAAAAAAAAAAAAAAAAaZwJxwOKRciEgibDRUMIQRSHII4pSEiYSw8JwKNR2sllHwDkMaZkLBOUSGDoywtRp6QsSJJ8cQCChzKSkwOF4EAAQWSC0pM14QgFM3Zkk1JZdXZpglMDCblJgpNZSkQy2OUzApK6NDNYx1XowpLUI2gjBCqLopQyu1Qr2BOZc5qrmUq8SZK8JezaPFObfOSS3AKZnTpUI1yFNBACH5BAkKADoALAAAAAAUABQAhQAAAAICAgMDAwQEBAcHBwkJCSIiIigoKCsrKzQ0ND4+Pj8/P0REREVFRU1NTVJSUlNTU1RUVFVVVVZWVlxcXGNjY25ubnFxcXR0dHh4eIODg4SEhIWFhYeHh4mJiZGRkZaWlpubm6Wlpaqqqra2tre3t7i4uLm5ubq6uru7u7y8vL+/v8DAwMLCwsPDw8TExMbGxsfHx8jIyMrKys7Ozs/Pz9DQ0NTU1NfX19nZ2f///wAAAAAAAAAAAAAAAAAAAAaZQJ1wOAyNiEhizjbseIQSSXLYSjF1Go2Q4ZgOUythp6OTMLxDWIqG7XwYlKEEJGyFhasZ8SIqHxAWdSkpMDheCwYMF0hVMF4VGV6GaEg0JJcklAEDnAkwmJloAaMFD5SnaY5TM2BsQzYtJHdTVSktQjaDqnppKUMrt0K+gjqXOmqqaGDFoVWUK2vMQjSDaC3BKaE6V6g0yUlBACH5BAkKADoALAAAAAAUABQAhRISEhQUFBYWFhwcHB0dHR4eHiEhISIiIiMjIysrKy8vLzc3Nzo6Oj8/P0FBQUhISFJSUlZWVldXV2VlZW1tbX9/f4KCgoeHh4mJiYuLi4yMjJCQkJSUlJiYmJmZmZqampycnJ2dnZ6enqOjo7CwsLa2tre3t7i4uLm5ubq6uru7u7y8vL+/v8DAwMLCwsPDw8TExMbGxsfHx8jIyMrKys7OztDQ0NTU1NfX19nZ2f///wAAAAAAAAAAAAAAAAAAAAaaQJ1wOCSViEhirjYMfYSfZ1LoUjF1UWFGMx2qXNAnJ9MdxqzYj0oTGk7aOhdryKIRRzHdxNGwUFUqMThdEAwRFUhVeVMUF12DZUg1JZRHZQMImA8xlZZdmZgUkUh+UzGLSQ4CChFENS4lc10LAAAKQjaAi3ZmKkMIt0K+fzqUOmeoXSpzxnHDXSxozTWAZS5gOiqeNqNDNclIQQAh+QQJCgBFACwAAAAAFAAUAIYKCgoQEBAREREnJycqKiosLCwuLi40NDQ1NTU2NjY3Nzc5OTk6Ojo8PDw9PT0+Pj4/Pz9ERERJSUlRUVFYWFhhYWFlZWVmZmZvb298fHyCgoKGhoaHh4eKioqNjY2SkpKVlZWenp6fn5+hoaGioqKjo6Onp6epqamrq6usrKyurq6vr6+xsbGzs7O2tra3t7e4uLi5ubm6urq7u7u8vLy/v7/AwMDCwsLDw8PExMTFxcXGxsbHx8fIyMjKysrOzs7Q0NDU1NTV1dXX19fZ2dn///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHqYBFgoODOz+EiIREh4IvL4IqKomDNzOMjoIkKJODMzeNjyginIWWRY47JJKCIjuCNzWDNT6EN0NFIhsdq5UzO7eTIBsfLYiVrpMmxZPApIQ/jpikBwvUFTvRj6TVBxAZzogenDe0kxQGEBjPNy+xkyQTBAYSgkAzvoLlghEEgxARnSjNOPXIAoAF4GbEkkZAgLMapqRZEACB1I1PRWZoK1JBAzhBP5BNCgQAIfkECQoAOgAsAAAAABQAFACFAQEBAgICAwMDBAQEBwcHCQkJIiIiKCgoLCwsNDQ0Pz8/RERERUVFTU1NUlJSVVVVVlZWXV1dY2Njbm5ucHBwdHR0eHh4gICAg4ODhISEhYWFh4eHiYmJkpKSlpaWm5ubpaWlqqqqtra2t7e3uLi4ubm5urq6u7u7vLy8v7+/wMDAwsLCw8PDxMTExsbGx8fHyMjIysrKy8vLzs7Oz8/P0NDQ1NTU1dXV19fX2dnZ////AAAAAAAAAAAAAAAAAAAABptAnXA4dM2ISGLuKByNhKtVcrg61ZpP3Uk6FW6xumq3ODo6cScXNQdNDVMxYgync52s0LuLPk2NVkxUaV0xgUh8Y0QzTk6JGBuPHy6MWV0bkBwhiUgdXStxUxQMDxiKKyNuUyARDKNCNXpCoEISCkMND0MngjoDAToWBrmJJ24BA0IKB4kpJ0cBvzoVCA5jUUIFBUMTHptCDgljQQAh+QQJCgA9ACwAAAAAFAAUAIUSEhIUFBQVFRUdHR0eHh4fHx8hISEiIiIjIyMpKSksLCwtLS0vLy82NjY6Ojo/Pz9BQUFISEhUVFRWVlZkZGRmZmZtbW1xcXFzc3N8fHx/f3+Hh4eJiYmLi4uMjIyQkJCUlJSYmJidnZ2enp6jo6Orq6u2tra3t7e4uLi5ubm6urq7u7u8vLy/v7/AwMDCwsLDw8PExMTGxsbHx8fIyMjKysrLy8vOzs7Q0NDU1NTV1dXX19fZ2dn///8AAAAAAAAGmsCecDiU3YhIIu8oPJ2Er1dy+Frhms/eSjoVbrG9ard4Ojp3KxmVB20NWzVibdeTrazQu4w+bZ1eTFRpXTWBSHxjRDdOTomMJzIyj45OK4aJWl0vcVMkHh8lii8nblMyIh0dIUI4ekIQRBgSQx+rXkMNARgHAz0bDhWYAAo9A709E7BjCQFCvEIaD8FdCsQ9CAdDGiKYQhYRY0EAIfkECQoAPQAsAAAAABQAFACFCgoKEBAQERERKCgoKioqLCwsLi4uNTU1NjY2Nzc3Ojo6PDw8PT09Pj4+QEBAQ0NDRERESUlJUVFRWlpaW1tbYWFhYmJiZWVlfHx8goKChoaGh4eHioqKjIyMlZWVmZmZnp6en5+foaGhp6enr6+vsrKys7Oztra2t7e3uLi4ubm5urq6u7u7v7+/wMDAwsLCw8PDxMTExcXFxsbGyMjIysrKy8vLzs7O0NDQ1NTU1dXV19fX2dnZ////AAAAAAAABpjAnnA4nN2ISCLvKEShhK9Xcvhi4ZrPHks6FW6xvWq3iDo6d6wZlQdtDVs1Ym3Xm7Gs0PuMPm2hXkxUaV01gUh8Y0Q3Tk6JjCgzM4+OjIaJPYhIFg+EW4YXAwADXTt2Xz0UAgIKPSITRCMeb1wZnEISBh0KBz0mGiGXBg09B7w9HxqJDQZCxU0cwF0QEUINrEIkapc9GK9dQQAh+QQJCgA8ACwAAAAAFAAUAIUCAgIDAwMEBAQGBgYHBwcJCQkiIiIoKCgrKys0NDQ+Pj4/Pz9ERERFRUVNTU1SUlJTU1NUVFRVVVVWVlZcXFxjY2Nubm5xcXF0dHR4eHiDg4OEhISFhYWHh4eJiYmRkZGWlpabm5ulpaWqqqq2tra3t7e4uLi5ubm6urq7u7u/v7/AwMDCwsLDw8PExMTFxcXGxsbIyMjKysrLy8vOzs7Pz8/Q0NDU1NTV1dXX19fY2NjZ2dn///8AAAAAAAAAAAAGlUCecDiE0YhI4u4oLJWELFZyyErZmk9eSjoVbrG8ardYOjpzKRh1B1UNVTKiLMeDpazQO4w+VZVYTFRpXTKBSGxjSBAFAAADiU5OMAkDA42QkYaJPHxJGRWEW4YYCwYLXTl2XzwWCAcRPCIXcm5CKlwgEEMUDR8dGjw0g4kNsL95iQ4NQsfBq1MRsDweHkM2iJsjIWNBACH5BAkKADkALAAAAAAUABQAhQICAgMDAwQEBAcHBwgICAkJCRISEhQUFBYWFiIiIisrKy8vLzQ0NDU1NTo6Oj8/P0FBQVJSUldXV2VlZW1tbX9/f4ODg4iIiImJiYyMjJGRkZSUlJWVlZeXl52dnZ6enqOjo7a2tre3t7i4uLm5ubq6uru7u7+/v8DAwMLCwsPDw8TExMXFxcbGxsfHx8jIyMrKysvLy87OztDQ0NTU1NXV1dfX19jY2NnZ2f///wAAAAAAAAAAAAAAAAAAAAAAAAaYwJxwOGzJiEgi7igUiYQoVHKIOs2az9xIOhVusblqtzg6Om2nVhEnXCSGJxgRZsu1RqNrbnEwNDhdJ1t6Q3wQXTBMSRZjSREEAgIEjU5OLQ2RAgCUTnmNSHVTFxSIW4o5FhIOEV04dydcFQ8QE3YgcydUXB+1Qh8ZeE8yI2qNF4BOUCONGhlgOTOwYx23OclCM2yfOTLFU0EAIfkECQoAPgAsAAAAABQAFACFCgoKEBAQERERJycnKioqLCwsLi4uNDQ0NTU1NjY2Nzc3OTk5Ojo6PDw8PT09Pj4+Pz8/Q0NDRERESUlJUVFRWFhYYWFhYmJiZWVlfHx8goKChoaGioqKi4uLjY2NkZGRlZWVnp6eoaGhp6enr6+vsbGxs7Oztra2t7e3uLi4ubm5urq6u7u7v7+/wMDAwsLCw8PDxMTExcXFxsbGyMjIysrKy8vLzs7O0NDQ1NTU1dXV19fX2NjY2dnZ////AAAABplAn3A4nN2ISKLmMkShhDBYcvgIYIRO4ao1HQYI2Cds1R0yAEznbjUbwnpCCWM4kBBrO99stTr6JgYGFCJdLSgwflQGFV01iUgeZUkZDwcMc2VOTjMXDAefkpooj5I+eVMmI40riEQmHxsgXTt7rEIkHBwhpjV3XEItUnq7Qns7WTdspbZZPi1kZc9hQji2XVHT1HClPjdtXUEAOw==);background-image:url(http://wiki.oni2.net/w/skins/common/images/spinner.gif?2012-08-30T22:25:00Z)!ie;background-position:center center;background-repeat:no-repeat} h1:lang(as),h1:lang(bn),h1:lang(gu),h1:lang(hi),h1:lang(kn),h1:lang(ml),h1:lang(mr),h1:lang(or),h1:lang(pa),h1:lang(sa),h1:lang(ta),h1:lang(te){line-height:1.5em !important}h2:lang(as),h3:lang(as),h4:lang(as),h5:lang(as),h6:lang(as),h2:lang(bn),h3:lang(bn),h4:lang(bn),h5:lang(bn),h6:lang(bn),h2:lang(gu),h3:lang(gu),h4:lang(gu),h5:lang(gu),h6:lang(gu),h2:lang(hi),h3:lang(hi),h4:lang(hi),h5:lang(hi),h6:lang(hi),h2:lang(kn),h3:lang(kn),h4:lang(kn),h5:lang(kn),h6:lang(kn),h2:lang(ml),h3:lang(ml),h4:lang(ml),h5:lang(ml),h6:lang(ml),h2:lang(mr),h3:lang(mr),h4:lang(mr),h5:lang(mr),h6:lang(mr),h2:lang(or),h3:lang(or),h4:lang(or),h5:lang(or),h6:lang(or),h2:lang(pa),h3:lang(pa),h4:lang(pa),h5:lang(pa),h6:lang(pa),h2:lang(sa),h3:lang(sa),h4:lang(sa),h5:lang(sa),h6:lang(sa),h2:lang(ta),h3:lang(ta),h4:lang(ta),h5:lang(ta),h6:lang(ta),h2:lang(te),h3:lang(te),h4:lang(te),h5:lang(te),h6:lang(te){line-height:1.2em} ol:lang(bcc) li,ol:lang(bqi) li,ol:lang(fa) li,ol:lang(glk) li,ol:lang(kk-arab) li,ol:lang(mzn) li{list-style-type:-moz-persian;list-style-type:persian}ol:lang(ckb) li{list-style-type:-moz-arabic-indic;list-style-type:arabic-indic}ol:lang(as) li,ol:lang(bn) li{list-style-type:-moz-bengali;list-style-type:bengali}ol:lang(or) li{list-style-type:-moz-oriya;list-style-type:oriya}#toc ul,.toc ul{margin:.3em 0} .mw-content-ltr .toc ul,.mw-content-ltr #toc ul,.mw-content-rtl .mw-content-ltr .toc ul,.mw-content-rtl .mw-content-ltr #toc ul{text-align:left} .mw-content-rtl .toc ul,.mw-content-rtl #toc ul,.mw-content-ltr .mw-content-rtl .toc ul,.mw-content-ltr .mw-content-rtl #toc ul{text-align:right} .mw-content-ltr .toc ul ul,.mw-content-ltr #toc ul ul,.mw-content-rtl .mw-content-ltr .toc ul ul,.mw-content-rtl .mw-content-ltr #toc ul ul{margin:0 0 0 2em} .mw-content-rtl .toc ul ul,.mw-content-rtl #toc ul ul,.mw-content-ltr .mw-content-rtl .toc ul ul,.mw-content-ltr .mw-content-rtl #toc ul ul{margin:0 2em 0 0}#toc #toctitle,.toc #toctitle,#toc .toctitle,.toc .toctitle{direction:ltr} .mw-help-field-hint{display:none;margin-left:2px;margin-bottom:-8px;padding:0 0 0 15px;background-image:url(data:image/gif;base64,R0lGODlhCwALALMAAP///01NTZOTk1lZWefn57i4uJSUlPPz82VlZdDQ0HFxcaysrNvb28TExAAAAAAAACH5BAAAAAAALAAAAAALAAsAAAQrUIRJqQQ455nNNBgHJANBDAwgZsVwqIG2IEQYYwXy2lq/Kg3NqqeSVCqCCAA7);background-image:url(http://wiki.oni2.net/w/skins/common/images/help-question.gif?2012-08-30T22:25:00Z)!ie;background-position:left center;background-repeat:no-repeat;cursor:pointer;font-size:.8em;text-decoration:underline;color:#0645ad}.mw-help-field-hint:hover{background-image:url(data:image/gif;base64,R0lGODlhCwALALMAAAtop+7z+GCWwpW51oStz8rb6yZzrafF3bnR5Nzn8QBcoD91oABQmf///wAAAAAAACH/C1hNUCBEYXRhWE1QPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENvcmUgNS4wLWMwNjAgNjEuMTM0Nzc3LCAyMDEwLzAyLzEyLTE3OjMyOjAwICAgICAgICAiPiA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1wTU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjAyODAxMTc0MDcyMDY4MTE5NkQ0QUQzRjI0NzRCNUQwIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJBN0FFQTQwQjlGQzExREY5RDlBQTRBODQyMkJCMkFDIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJBN0FFQTNGQjlGQzExREY5RDlBQTRBODQyMkJCMkFDIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzUgTWFjaW50b3NoIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkM3RjExNzQwNzIwNjgxMTk1RkVBQ0ZBOEQxNTU5MkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MDI4MDExNzQwNzIwNjgxMTk2RDRBRDNGMjQ3NEI1RDAiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz4B//79/Pv6+fj39vX08/Lx8O/u7ezr6uno5+bl5OPi4eDf3t3c29rZ2NfW1dTT0tHQz87NzMvKycjHxsXEw8LBwL++vby7urm4t7a1tLOysbCvrq2sq6qpqKempaSjoqGgn56dnJuamZiXlpWUk5KRkI+OjYyLiomIh4aFhIOCgYB/fn18e3p5eHd2dXRzcnFwb25tbGtqaWhnZmVkY2JhYF9eXVxbWllYV1ZVVFNSUVBPTk1MS0pJSEdGRURDQkFAPz49PDs6OTg3NjU0MzIxMC8uLSwrKikoJyYlJCMiISAfHh0cGxoZGBcWFRQTEhEQDw4NDAsKCQgHBgUEAwIBAAAh+QQAAAAAACwAAAAACwALAAAEK3CxSalsOOeZxRQY1yBKkihFI2aDEqiMRgBJGGMD8NpavxoHzaqnklQqiwgAOw==);background-image:url(http://wiki.oni2.net/w/skins/common/images/help-question-hover.gif?2012-08-30T22:25:00Z)!ie}.mw-help-field-data{display:block;background-color:#d6f3ff;padding:5px 8px 4px 8px;border:1px solid #5dc9f4;margin-left:20px}.tipsy{padding:5px 5px 10px;font-size:12px;position:absolute;z-index:100000;overflow:visible}.tipsy-inner{padding:5px 8px 4px 8px;background-color:#d6f3ff;color:black;border:1px solid #5dc9f4;max-width:300px;text-align:left}.tipsy-arrow{position:absolute;background:url(data:image/gif;base64,R0lGODlhDQANAMQAAPf399bz/9vu9m/O9NXy/8Pm9svp9pfd+YLW943X9LTn++z093XQ9WnM9OLw9p/c9YTU9InY9/T292DK9Jre+afj+rvq/Nzv9rjk9brl9cPt/ZLb+GbL9MLs/ZHb+KLh+iH5BAAAAAAALAAAAAANAA0AAAVK4BGMZBkcg2WW1lBEKxkVAFTFFQQAwkSYhIlgB3hQTJQHEbBodEiaxmIJyHhIGwwVIGEoAgqGZAswIAIIA3mX+CTWOwfHAd9dtiEAOw==) no-repeat top left;background:url(http://wiki.oni2.net/w/skins/common/images/tipsy-arrow.gif?2012-08-30T22:25:00Z) no-repeat top left!ie;width:13px;height:13px}.tipsy-se .tipsy-arrow{bottom:-2px;right:10px;background-position:0% 100%}#mw-clearyourcache,#mw-sitecsspreview,#mw-sitejspreview,#mw-usercsspreview,#mw-userjspreview{direction:ltr;unicode-bidi:embed} .diff-currentversion-title,.diff{direction:ltr;unicode-bidi:embed} .diff-contentalign-right td{direction:rtl;unicode-bidi:embed} .diff-contentalign-left td{direction:ltr;unicode-bidi:embed}.diff-otitle,.diff-ntitle,.diff-lineno{direction:ltr !important;unicode-bidi:embed}#mw-revision-info,#mw-revision-info-current,#mw-revision-nav{direction:ltr;display:inline} div.tright,div.floatright,table.floatright{clear:right;float:right} div.tleft,div.floatleft,table.floatleft{float:left;clear:left}div.floatright,table.floatright,div.floatleft,table.floatleft{position:relative} #mw-credits a{unicode-bidi:embed} .mw-jump,#jump-to-nav{overflow:hidden;height:0;zoom:1; } .xdebug-error{position:absolute;z-index:99}}@media screen{ a{text-decoration:none;color:#0645ad;background:none}a:visited{color:#0b0080}a:active{color:#faa700}a:hover,a:focus{text-decoration:underline}a.stub{color:#772233}a.new,#p-personal a.new{color:#ba0000}a.new:visited,#p-personal a.new:visited{color:#a55858} .mw-body a.extiw,.mw-body a.extiw:active{color:#36b}.mw-body a.extiw:visited{color:#636}.mw-body a.extiw:active{color:#b63} .mw-body a.external{color:#36b}.mw-body a.external:visited{color:#636; }.mw-body a.external:active{color:#b63} img{border:none;vertical-align:middle}hr{height:1px;color:#aaa;background-color:#aaa;border:0;margin:.2em 0} h1,h2,h3,h4,h5,h6{color:black;background:none;font-weight:normal;margin:0;overflow:hidden;padding-top:.5em;padding-bottom:.17em;border-bottom:1px solid #aaa;width:auto}h1{font-size:188%}h1 .editsection{font-size:53%}h2{font-size:150%}h2 .editsection{font-size:67%}h3,h4,h5,h6{border-bottom:none;font-weight:bold}h3{font-size:132%}h3 .editsection{font-size:76%;font-weight:normal}h4{font-size:116%}h4 .editsection{font-size:86%;font-weight:normal}h5{font-size:100%}h5 .editsection{font-weight:normal}h6{font-size:80%}h6 .editsection{font-size:125%;font-weight:normal} h1,h2{margin-bottom:.6em}h3,h4,h5{margin-bottom:.3em}p{margin:.4em 0 .5em 0;line-height:1.5em}p img{margin:0}ul{line-height:1.5em;list-style-type:square;margin:.3em 0 0 1.6em;padding:0}ol{line-height:1.5em;margin:.3em 0 0 3.2em;padding:0;list-style-image:none}li{margin-bottom:.1em}dt{font-weight:bold;margin-bottom:.1em}dl{margin-top:.2em;margin-bottom:.5em}dd{line-height:1.5em;margin-left:1.6em;margin-bottom:.1em}q{font-family:Times,"Times New Roman",serif;font-style:italic} pre,code,tt,kbd,samp{ font-family:monospace,Courier}code{background-color:#f9f9f9}pre{padding:1em;border:1px dashed #2f6fab;color:black;background-color:#f9f9f9} table{font-size:100%} fieldset{border:1px solid #2f6fab;margin:1em 0 1em 0;padding:0 1em 1em;line-height:1.5em}fieldset.nested{margin:0 0 0.5em 0;padding:0 0.5em 0.5em}legend{padding:.5em;font-size:95%}form{border:none;margin:0}textarea{width:100%;padding:.1em}select{vertical-align:top} .center{width:100%;text-align:center}*.center *{margin-left:auto;margin-right:auto} .small{font-size:94%}table.small{font-size:100%} #toc,.toc,.mw-warning{border:1px solid #aaa;background-color:#f9f9f9;padding:5px;font-size:95%}#toc h2,.toc h2{display:inline;border:none;padding:0;font-size:100%;font-weight:bold}#toc #toctitle,.toc #toctitle,#toc .toctitle,.toc .toctitle{text-align:center}#toc ul,.toc ul{list-style-type:none;list-style-image:none;margin-left:0;padding:0;text-align:left}#toc ul ul,.toc ul ul{margin:0 0 0 2em}#toc .toctoggle,.toc .toctoggle{font-size:94%}.toccolours{border:1px solid #aaa;background-color:#f9f9f9;padding:5px;font-size:95%} .mw-warning{margin-left:50px;margin-right:50px;text-align:center} div.floatright,table.floatright{margin:0 0 .5em .5em;border:0}div.floatright p{font-style:italic}div.floatleft,table.floatleft{margin:0 .5em .5em 0;border:0}div.floatleft p{font-style:italic} div.thumb{margin-bottom:.5em;width:auto;background-color:transparent}div.thumbinner{border:1px solid #ccc;padding:3px !important;background-color:#f9f9f9;font-size:94%;text-align:center;overflow:hidden}html .thumbimage{border:1px solid #ccc}html .thumbcaption{border:none;text-align:left;line-height:1.4em;padding:3px !important;font-size:94%}div.magnify{float:right;border:none !important;background:none !important}div.magnify a,div.magnify img{display:block;border:none !important;background:none !important}div.tright{margin:.5em 0 1.3em 1.4em}div.tleft{margin:.5em 1.4em 1.3em 0}img.thumbborder{border:1px solid #dddddd} #userlogin,#userloginForm{border:solid 1px #cccccc;padding:1.2em;margin:.5em;float:left} .catlinks{border:1px solid #aaa;background-color:#f9f9f9;padding:5px;margin-top:1em;clear:both} .usermessage{background-color:#ffce7b;border:1px solid #ffa500;color:black;font-weight:bold;margin:2em 0 1em;padding:.5em 1em;vertical-align:middle} #siteNotice{position:relative;text-align:center;margin:0}#localNotice{margin-bottom:0.9em} .firstHeading,#firstHeading{margin-bottom:.1em; line-height:1.2em;padding-bottom:0} #siteSub{display:none}#jump-to-nav{ margin-top:-1.4em;margin-bottom:1.4em }#contentSub,#contentSub2{font-size:84%;line-height:1.2em;margin:0 0 1.4em 1em;color:#7d7d7d;width:auto}span.subpages{display:block} html,body{height:100%;margin:0;padding:0;font-family:sans-serif;font-size:1em}body{background-color:#f3f3f3;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAAAAAA6fptVAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAABRJREFUeF4FwTEBAAAAwJD1D+weGQD4APc0a6VeAAAAAElFTkSuQmCC);background-image:url(http://wiki.oni2.net/w/skins/vector/images/page-base.png?2012-08-30T22:25:00Z)!ie} div#content{margin-left:10em;padding:1em;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAABhJREFUeF4FwTEBAAAAgjD7FzESWfjYdgwEoAJ4lTsaxgAAAABJRU5ErkJggg==);background-image:url(http://wiki.oni2.net/w/skins/vector/images/border.png?2012-08-30T22:25:00Z)!ie;background-position:top left;background-repeat:repeat-y;background-color:white;color:black;direction:ltr} #mw-page-base{height:5em;background-color:white;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAsCAIAAAArRUU2AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAADpJREFUeF5VjUkOAEAIwoD//7lzGJd4MJHGSoBImkFETP67CdLldUd7KC6f8fv3+psd8znbtU5x354HaWQjOx76v7MAAAAASUVORK5CYII=);background-image:url(http://wiki.oni2.net/w/skins/vector/images/page-fade.png?2012-08-30T22:25:00Z)!ie;background-position:bottom left;background-repeat:repeat-x}#mw-head-base{margin-top:-5em;margin-left:10em;height:5em;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAABhJREFUeF4FwTEBAAAAgjD7FzESWfjYdgwEoAJ4lTsaxgAAAABJRU5ErkJggg==);background-image:url(http://wiki.oni2.net/w/skins/vector/images/border.png?2012-08-30T22:25:00Z)!ie;background-position:bottom left;background-repeat:repeat-x}div#mw-head{position:absolute;top:0;right:0;width:100%}div#mw-head h5{margin:0;padding:0} div.emptyPortlet{display:none} #p-personal{position:absolute;top:0;right:0.75em}#p-personal h5{display:none}#p-personal ul{list-style:none;margin:0;padding-left:10em; } #p-personal li{line-height:1.125em;float:left} #p-personal li{margin-left:0.75em;margin-top:0.5em;font-size:0.75em;white-space:nowrap} #left-navigation{position:absolute;left:10em;top:2.5em}#right-navigation{float:right;margin-top:2.5em} div.vectorTabs h5,div.vectorMenu h5 span{display:none} div.vectorTabs{float:left;height:2.5em}div.vectorTabs{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAuCAIAAABmjeQ9AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAERJREFUeF5lTtEKgEAMMv//j/O0IxlH9CA6N2WURAA/OHl5GeWAwUUHBcKV795FtTePxpmV3t9uv8Z3/cmvM88vzbbrAV/dQdX+eas3AAAAAElFTkSuQmCC);background-image:url(http://wiki.oni2.net/w/skins/vector/images/tab-break.png?2012-08-30T22:25:00Z)!ie;background-position:bottom left;background-repeat:no-repeat;padding-left:1px} div.vectorTabs ul{float:left}div.vectorTabs ul{height:100%;list-style:none;margin:0;padding:0} div.vectorTabs ul li{float:left} div.vectorTabs ul li{line-height:1.125em;display:inline-block;height:100%;margin:0;padding:0;background-color:#f3f3f3;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAABkCAIAAADITs03AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAADxJREFUeF7litsRACAMwrD77+Q0rtGoV98r+MEFchhgkr4NnZyb3bk/LM/yMCjiH4wots/++hYR3iXLJVWUBS1AtOi2fwAAAABJRU5ErkJggg==);background-image:url(http://wiki.oni2.net/w/skins/vector/images/tab-normal-fade.png?2012-08-30T22:25:00Z)!ie;background-position:bottom left;background-repeat:repeat-x;white-space:nowrap} div.vectorTabs ul > li{display:block}div.vectorTabs li.selected{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAABkAQAAAABvV2fNAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAABVJREFUeF7dwQEBAAAAQCDTTfdD4WOJ5TIB3ib9EgAAAABJRU5ErkJggg==);background-image:url(http://wiki.oni2.net/w/skins/vector/images/tab-current-fade.png?2012-08-30T22:25:00Z)!ie} div.vectorTabs li a{display:inline-block;height:1.9em;padding-left:0.5em;padding-right:0.5em;color:#0645ad;cursor:pointer;font-size:0.8em} div.vectorTabs li > a{display:block}div.vectorTabs li.icon a{background-position:bottom right;background-repeat:no-repeat} div.vectorTabs span a{display:inline-block;padding-top:1.25em} div.vectorTabs span > a{float:left;display:block}div.vectorTabs span{display:inline-block;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAuCAIAAABmjeQ9AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAERJREFUeF5lTtEKgEAMMv//j/O0IxlH9CA6N2WURAA/OHl5GeWAwUUHBcKV795FtTePxpmV3t9uv8Z3/cmvM88vzbbrAV/dQdX+eas3AAAAAElFTkSuQmCC);background-image:url(http://wiki.oni2.net/w/skins/vector/images/tab-break.png?2012-08-30T22:25:00Z)!ie;background-position:bottom right;background-repeat:no-repeat}div.vectorTabs li.selected a,div.vectorTabs li.selected a:visited{color:#333333;text-decoration:none}div.vectorTabs li.new a,div.vectorTabs li.new a:visited{color:#a55858} div.vectorMenu{direction:ltr;float:left;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAQCAMAAAAlM38UAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAA9QTFRFsbGxmpqa3d3deXl58/n79CzHcQAAAAV0Uk5T/////wD7tg5TAAAAMklEQVR42mJgwQoYBkqYiZEZAhiZUFRDxWGicEPA4nBRhNlAcYQokpVMDEwD6kuAAAMAyGMFQVv5ldcAAAAASUVORK5CYII=);background-image:url(http://wiki.oni2.net/w/skins/vector/images/arrow-down-icon.png?2012-08-30T22:25:00Z)!ie;background-position:100% 60%;background-repeat:no-repeat;cursor:pointer}div.vectorMenuFocus{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAQBAMAAADgw5IVAAAAAXNSR0IArs4c6QAAABVQTFRFmpqakpKSra2tsbGxv7+/3d3d4+PjZlmM5AAAAAF0Uk5TAEDm2GYAAAAJcEhZcwAACxMAAAsTAQCanBgAAAAmSURBVAjXY2CgGmBTFBQUVINykgQFhRIQEmpwVUlwYaCEG8WWAgARKQL1ECU8IAAAAABJRU5ErkJggg==);background-image:url(http://wiki.oni2.net/w/skins/vector/images/arrow-down-focus-icon.png?2012-08-30T22:25:00Z)!ie;background-position:100% 60%} body.rtl div.vectorMenu{direction:rtl} div#mw-head div.vectorMenu h5{float:left;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAuCAIAAABmjeQ9AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAERJREFUeF5lTtEKgEAMMv//j/O0IxlH9CA6N2WURAA/OHl5GeWAwUUHBcKV795FtTePxpmV3t9uv8Z3/cmvM88vzbbrAV/dQdX+eas3AAAAAElFTkSuQmCC);background-image:url(http://wiki.oni2.net/w/skins/vector/images/tab-break.png?2012-08-30T22:25:00Z)!ie;background-repeat:no-repeat} div#mw-head div.vectorMenu h5{background-position:bottom left;margin-left:-1px} div#mw-head div.vectorMenu > h5{background-image:none}div#mw-head div.vectorMenu h4{display:inline-block;float:left;font-size:0.8em;padding-left:0.5em;padding-top:1.375em;font-weight:normal;border:none} div.vectorMenu h5 a{display:inline-block;width:24px;height:2.5em;text-decoration:none;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAuCAIAAABmjeQ9AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAERJREFUeF5lTtEKgEAMMv//j/O0IxlH9CA6N2WURAA/OHl5GeWAwUUHBcKV795FtTePxpmV3t9uv8Z3/cmvM88vzbbrAV/dQdX+eas3AAAAAElFTkSuQmCC);background-image:url(http://wiki.oni2.net/w/skins/vector/images/tab-break.png?2012-08-30T22:25:00Z)!ie;background-repeat:no-repeat} div.vectorMenu h5 a{background-position:bottom right} div.vectorMenu h5 > a{display:block}div.vectorMenu div.menu{position:relative;display:none;clear:both;text-align:left} body.rtl div.vectorMenu div.menu{margin-left:24px} body.rtl div.vectorMenu > div.menu{margin-left:auto} body.rtl div.vectorMenu > div.menu,x:-moz-any-link{margin-left:23px} div.vectorMenu:hover div.menu,div.vectorMenu div.menuForceShow{display:block}div.vectorMenu ul{position:absolute;background-color:white;border:solid 1px silver;border-top-width:0;list-style:none;list-style-image:none;list-style-type:none;padding:0;margin:0;margin-left:-1px;text-align:left} div.vectorMenu ul,x:-moz-any-link{min-width:5em} div.vectorMenu ul,x:-moz-any-link,x:default{min-width:0}div.vectorMenu li{padding:0;margin:0;text-align:left;line-height:1em} div.vectorMenu li a{display:inline-block;padding:0.5em;white-space:nowrap;color:#0645ad;cursor:pointer;font-size:0.8em} div.vectorMenu li > a{display:block}div.vectorMenu li.selected a,div.vectorMenu li.selected a:visited{color:#333333;text-decoration:none} #p-search h5{display:none} #p-search{float:left}#p-search{margin-right:0.5em;margin-left:0.5em}#p-search form,#p-search input{margin:0;margin-top:0.4em}div#simpleSearch{display:block;width:14em;height:1.4em;margin-top:0.65em;position:relative;min-height:1px; border:solid 1px #AAAAAA;color:black;background-color:white;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAQCAIAAABY/YLgAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAACZJREFUeF5diqERACAQgID95/3s+cFg4CDQzASkXl4jidvrCPzfA7puAx52W1pnAAAAAElFTkSuQmCC);background-image:url(http://wiki.oni2.net/w/skins/vector/images/search-fade.png?2012-08-30T22:25:00Z)!ie;background-position:top left;background-repeat:repeat-x}div#simpleSearch label{ font-size:13px;top:0.25em;direction:ltr}div#simpleSearch input{color:black;direction:ltr}div#simpleSearch input:focus{outline:none}div#simpleSearch input.placeholder{color:#999999}div#simpleSearch input::-webkit-input-placeholder{color:#999999}div#simpleSearch input#searchInput{position:absolute;top:0;left:0;width:90%;margin:0;padding:0;padding-left:0.2em;padding-top:0.2em;padding-bottom:0.2em;outline:none;border:none; font-size:13px;background-color:transparent;direction:ltr}div#simpleSearch button#searchButton{position:absolute;width:10%;right:0;top:0;padding:0;padding-top:0.3em;padding-bottom:0.2em;padding-right:0.4em;margin:0;border:none;cursor:pointer;background-color:transparent;background-image:none} div#simpleSearch button#searchButton img{border:none;margin:0;margin-top:-3px;padding:0} div#simpleSearch button#searchButton > img{margin:0} div#mw-panel{position:absolute;top:160px;padding-top:1em;width:10em;left:0}div#mw-panel div.portal{padding-bottom:1.5em;direction:ltr}div#mw-panel div.portal h5{font-weight:normal;color:#444444;padding:0.25em;padding-top:0;padding-left:1.75em;cursor:default;border:none;font-size:0.75em}div#mw-panel div.portal div.body{margin:0;padding-top:0.5em;margin-left:1.25em;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIwAAAABCAAAAAAphRnkAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAClJREFUeF61yMEJACAQxMCN/Xfr/yIsaAfOJxC2UTPWS6f5gABhUTedBz7fGPSonIP/AAAAAElFTkSuQmCC);background-image:url(http://wiki.oni2.net/w/skins/vector/images/portal-break.png?2012-08-30T22:25:00Z)!ie;background-repeat:no-repeat;background-position:top left}div#mw-panel div.portal div.body ul{list-style:none;list-style-image:none;list-style-type:none;padding:0;margin:0}div#mw-panel div.portal div.body ul li{line-height:1.125em;padding:0;padding-bottom:0.5em;margin:0;overflow:hidden;font-size:0.75em}div#mw-panel div.portal div.body ul li a{color:#0645ad}div#mw-panel div.portal div.body ul li a:visited{color:#0b0080} div#footer{margin-left:10em;margin-top:0;padding:0.75em;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAABhJREFUeF4FwTEBAAAAgjD7FzESWfjYdgwEoAJ4lTsaxgAAAABJRU5ErkJggg==);background-image:url(http://wiki.oni2.net/w/skins/vector/images/border.png?2012-08-30T22:25:00Z)!ie;background-position:top left;background-repeat:repeat-x;direction:ltr}div#footer ul{list-style:none;list-style-image:none;list-style-type:none;margin:0;padding:0}div#footer ul li{margin:0;padding:0;padding-top:0.5em;padding-bottom:0.5em;color:#333333;font-size:0.7em}div#footer #footer-icons{float:right} body.ltr div#footer #footer-places{float:left}div#footer #footer-info li{line-height:1.4em}div#footer #footer-icons li{float:left;margin-left:0.5em;line-height:2em;text-align:right}div#footer #footer-places li{float:left;margin-right:1em;line-height:2em} #p-logo{position:absolute;top:-160px;left:0;width:10em;height:160px}#p-logo a{display:block;width:10em;height:160px;background-repeat:no-repeat;background-position:center center;text-decoration:none} #preftoc{ width:100%;float:left;clear:both;margin:0 !important;padding:0 !important;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAhCAQAAACysAk0AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAABAAAAIQBSEXtPAAAAAmJLR0QA/vCI/CkAAAAmSURBVAjXY2BgYPj3n+k/AwL9g5Fwxl8GJgYGpr+ogmgITQuSgQA1QiAL/go8LAAAACV0RVh0Y3JlYXRlLWRhdGUAMjAwOS0wOC0wOVQxOTowNTo0MSswMDowMCYO2tEAAAAldEVYdG1vZGlmeS1kYXRlADIwMDktMDgtMDlUMTk6MDU6NDErMDA6MDB5v6zlAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAABJRU5ErkJggg==);background-image:url(http://wiki.oni2.net/w/skins/vector/images/preferences-break.png?2012-08-30T22:25:00Z)!ie;background-position:bottom left;background-repeat:no-repeat}#preftoc li{ float:left;margin:0;padding:0;padding-right:1px;height:2.25em;white-space:nowrap;list-style-type:none;list-style-image:none;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAhCAQAAACysAk0AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAABAAAAIQBSEXtPAAAAAmJLR0QA/vCI/CkAAAAmSURBVAjXY2BgYPj3n+k/AwL9g5Fwxl8GJgYGpr+ogmgITQuSgQA1QiAL/go8LAAAACV0RVh0Y3JlYXRlLWRhdGUAMjAwOS0wOC0wOVQxOTowNTo0MSswMDowMCYO2tEAAAAldEVYdG1vZGlmeS1kYXRlADIwMDktMDgtMDlUMTk6MDU6NDErMDA6MDB5v6zlAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAABJRU5ErkJggg==);background-image:url(http://wiki.oni2.net/w/skins/vector/images/preferences-break.png?2012-08-30T22:25:00Z)!ie;background-position:bottom right;background-repeat:no-repeat} #preftoc li:first-child{margin-left:1px}#preftoc a,#preftoc a:active{display:inline-block;position:relative;color:#0645ad;padding:0.5em;text-decoration:none;background-image:none;font-size:0.9em}#preftoc a:hover,#preftoc a:focus{text-decoration:underline}#preftoc li.selected a{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAhCAQAAACysAk0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAACBJREFUeF5twskJAAAMAjD3H7mXfYogCQiQeun68Z2WPk0SQHDa/pxXAAAAAElFTkSuQmCC);background-image:url(http://wiki.oni2.net/w/skins/vector/images/preferences-fade.png?2012-08-30T22:25:00Z)!ie;background-position:bottom;background-repeat:repeat-x;color:#333333;text-decoration:none}#preferences{float:left;width:100%;margin:0;margin-top:-2px;clear:both;border:solid 1px #cccccc;background-color:#f9f9f9;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAAAAAA6fptVAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAABRJREFUeF4FwTEBAAAAwJD1j+waGQD8APvyfoZlAAAAAElFTkSuQmCC);background-image:url(http://wiki.oni2.net/w/skins/vector/images/preferences-base.png?2012-08-30T22:25:00Z)!ie}#preferences fieldset{border:none;border-top:solid 1px #cccccc}#preferences fieldset.prefsection{border:none;padding:0;margin:1em}#preferences legend{color:#666666}#preferences fieldset.prefsection legend.mainLegend{display:none}#preferences td{padding-left:0.5em;padding-right:0.5em}#preferences td.htmlform-tip{font-size:x-small;padding:.2em 2em;color:#666666}#preferences div.mw-prefs-buttons{padding:1em}#preferences div.mw-prefs-buttons input{margin-right:0.25em} div#content{line-height:1.5em}#bodyContent{font-size:0.8em}.editsection{float:right}ul{list-style-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAANCAMAAABW4lS6AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAAZQTFRFAFKM////QIUK9QAAAAJ0Uk5T/wDltzBKAAAAGklEQVR42mJgBAEGokgGBjBGBxBxsBqAAAMACHwALd5r8ygAAAAASUVORK5CYII=);list-style-image:url(http://wiki.oni2.net/w/skins/vector/images/bullet-icon.png?2012-08-30T22:25:00Z)!ie}pre{line-height:1.3em} #siteNotice{font-size:0.8em}#firstHeading{padding-top:0;margin-top:0;padding-top:0;font-size:1.6em}div#content a.external,div#content a.external[href ^="gopher://"]{background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAFZJREFUeF59z4EJADEIQ1F36k7u5E7ZKXeUQPACJ3wK7UNokVxVk9kHnQH7bY9hbDyDhNXgjpRLqFlo4M2GgfyJHhjq8V4agfrgPQX3JtJQGbofmCHgA/nAKks+JAjFAAAAAElFTkSuQmCC) center right no-repeat;background:url(http://wiki.oni2.net/w/skins/vector/images/external-link-ltr-icon.png?2012-08-30T22:25:00Z) center right no-repeat!ie;padding-right:13px}div#content a.external[href ^="https://"],.link-https{background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAIVJREFUeF6tjzsKg0AQhi09mimsFJLCzpNYCGKbK3gAtfUIljaCoKCCZIs8MMV2v+yCg8siWlh8zOtjhjEAEFmeIopDQtTrTJNEZIxhWysiNfULJFJjDzGnba/aBt4+wAuBzD+tg6a8SVkXf4GET96xmDxNzP39IvE/PPDtXIyVpYinv14A5F0laJ8oYFgAAAAASUVORK5CYII=) center right no-repeat;background:url(http://wiki.oni2.net/w/skins/vector/images/lock-icon.png?2012-08-30T22:25:00Z) center right no-repeat!ie;padding-right:13px}div#content a.external[href ^="mailto:"],.link-mailto{background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKBAMAAAB/HNKOAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAADBQTFRF////////iIqF9vb26urpycfDvb275eXj2djV+/v4srKy6efio6GcqKejsa6q8fDtVM9qIQAAAAF0Uk5TAEDm2GYAAABOSURBVHheBcExDkAwGIDRL43NpJOt6a9hMdVilP8gklqsHMJmt4qeyeI03oNSNkCrAIU/7YTWbwp0zz4rTXZHxF/9YA15HTG4+4NFRNofUBMMOBBNZngAAAAASUVORK5CYII=) center right no-repeat;background:url(http://wiki.oni2.net/w/skins/vector/images/mail-icon.png?2012-08-30T22:25:00Z) center right no-repeat!ie;padding-right:13px}div#content a.external[href ^="news:"]{background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAHtJREFUeF6NkEEKgCAQRT2w1wiiUxgk0SKiTe6i9oKeQXDhKSZmYAJRKeHh4j//DIp+6OAPJH6cXJRSZqSUQClViBjUKER8zXAbUhev+6Q7hMA0G1msNtIo5zxhrX3xzlNG4ravYMwBMUZsKsBsXjQIABCTHlsfTXuj8wCN3T2QBjtcwQAAAABJRU5ErkJggg==) center right no-repeat;background:url(http://wiki.oni2.net/w/skins/vector/images/news-icon.png?2012-08-30T22:25:00Z) center right no-repeat!ie;padding-right:13px}div#content a.external[href ^="ftp://"],.link-ftp{background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAQAAAAnOwc2AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAExJREFUeF5VyEEKwCAMAMH83o/0LT6kFHqQYqkevG1jIITs3kaQgn+A7A29ujnw5NKrsaPCrTegBBrRMzYeXkbGzsdkZRwsPWMUmEd+CkSgVeVp2OkAAAAASUVORK5CYII=) center right no-repeat;background:url(http://wiki.oni2.net/w/skins/vector/images/file-icon.png?2012-08-30T22:25:00Z) center right no-repeat!ie;padding-right:13px}div#content a.external[href ^="irc://"],div#content a.external[href ^="ircs://"],.link-irc{background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAHRJREFUeF590E0KgCAQBWAvH0TXigI3ZccQ/8H91ExqKNrAW8j7kFG27SvMyzQM9s8whuBnENdQSllFKdWFWFC01pQQwhASMMaAtXYIMQScc/0dxSXyIaPq1ZzzF6JOsKBTHOC9hxgjoQLbf2tRgekWKka5AShBSepvauUSAAAAAElFTkSuQmCC) center right no-repeat;background:url(http://wiki.oni2.net/w/skins/vector/images/talk-icon.png?2012-08-30T22:25:00Z) center right no-repeat!ie;padding-right:13px}div#content a.external[href $=".ogg"],div#content a.external[href $=".OGG"],div#content a.external[href $=".mid"],div#content a.external[href $=".MID"],div#content a.external[href $=".midi"],div#content a.external[href $=".MIDI"],div#content a.external[href $=".mp3"],div#content a.external[href $=".MP3"],div#content a.external[href $=".wav"],div#content a.external[href $=".WAV"],div#content a.external[href $=".wma"],div#content a.external[href $=".WMA"],.link-audio{background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKBAMAAAB/HNKOAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAADBQTFRF////dX8qyNF7eYMzwsxrsr9G8PHrm6Jrt7uakJVmn6OB1duat8NQi5YzhI4ykZR07gQraQAAAAF0Uk5TAEDm2GYAAABJSURBVHheNcSxDUBQFIbR727glxvKl3dHsIHCGESrNIIR7KE1hQ1MoDSCiMhJDixSDWVEhuZbei/sf/Jqbdn28+jxYe4u7CaND+p5C05J6bE1AAAAAElFTkSuQmCC) center right no-repeat;background:url(http://wiki.oni2.net/w/skins/vector/images/audio-icon.png?2012-08-30T22:25:00Z) center right no-repeat!ie;padding-right:13px}div#content a.external[href $=".ogm"],div#content a.external[href $=".OGM"],div#content a.external[href $=".avi"],div#content a.external[href $=".AVI"],div#content a.external[href $=".mpeg"],div#content a.external[href $=".MPEG"],div#content a.external[href $=".mpg"],div#content a.external[href $=".MPG"],.link-video{background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAAAAACoWZBhAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAAJ0Uk5TAP9bkSK1AAAAXElEQVR4Xi2NMQoFMQgFvbpgHUj5LvF6K7sFQXKFsOew2G/xuylmGPn62Wb76U+ayHsTbDnrQMNrHdkZRChyi730KvK1QUWVD47gzoCOMBkXPSZrIuumseW/iKU/eKdG9xXBa10AAAAASUVORK5CYII=) center right no-repeat;background:url(http://wiki.oni2.net/w/skins/vector/images/video-icon.png?2012-08-30T22:25:00Z) center right no-repeat!ie;padding-right:13px}div#content a.external[href $=".pdf"],div#content a.external[href $=".PDF"],div#content a.external[href *=".pdf#"],div#content a.external[href *=".PDF#"],div#content a.external[href *=".pdf?"],div#content a.external[href *=".PDF?"],.link-document{background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAQAAAAnOwc2AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAE5JREFUeF5lykEKgDAMBdF/+17Es/QkiosiCBURXIzJooZohmweX6gwmkCeI+Oqc2C1FnvnF2ejlQYU0tLK2NjY6f/l8V12Ti7uhFFgDj19b58EwXuqkAAAAABJRU5ErkJggg==) center right no-repeat;background:url(http://wiki.oni2.net/w/skins/vector/images/document-icon.png?2012-08-30T22:25:00Z) center right no-repeat!ie;padding-right:13px}div#content .printfooter{display:none} #pt-userpage,#pt-anonuserpage,#pt-login{background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAANCAYAAACQN/8FAAAAIGNIUk0AAHolAACAgwAA+f8AAIDpAAB1MAAA6mAAADqYAAAXb5JfxUYAAAAJcEhZcwAACxMAAAsTAQCanBgAAAHOSURBVCjPY2BAAjtLxLmPN4pFn2gSTdrfICDAgA2c65C0uznf6erT9dH/H6/0+39zut6d051SfiiK9jcwsFyfa3v21Z7S/++Odf1/uSP7/6OF1v+vT9O7ub9BlAdJoajBw+W+P98crPv/8eLC/6/2lPx/vNj+/705xv+PNwsHwRUerOFTvTXX9sfzjTFg056tC/v/YJbu//tzjP4eaxR3hiv8z8DAuKPF4N7DuUb/H84z/X9/hsb/BzM1/x/qMnxwJo2BFa5QP3rKpMjSiT/XtTr+vzzV+P+Vacb/N7fb/48v6fikHTYhFaxII3iSr0vRmm/muZv++9du/L969Yr/Wzeu+O9Tvvq/Rcay//aZC15reHXoMtimz91ulrnyv1n22v/muRv/960693/Fniv/TdKX/zdKXvDfPHX+f9PYySsYbFJnXDWIm/nfOG0pWDKkdsP/oonbgYoW/jdImPNfL2bKf+v4SRcZTCK6D5gkTAcLGibO/W+aMu+/b8mS//pxM8CKdAPr/xtFdB9lkDQNszOP7r1tnTLzr03qzP/WQGyVAqRTpv+3Tprxzzi88560VZo3xNui2jxi+oFB4oYRNaL6Ic0gDGEHh4HkQEoAjALoHv5slukAAAAASUVORK5CYII=) left top no-repeat;background:url(http://wiki.oni2.net/w/skins/vector/images/user-icon.png?2012-08-30T22:25:00Z) left top no-repeat!ie;padding-left:15px !important;text-transform:none}.redirectText{font-size:140%}.redirectMsg img{vertical-align:text-bottom}#bodyContent{position:relative;width:100%}#mw-js-message{font-size:0.8em}div#bodyContent{line-height:1.5em} #ca-unwatch.icon a,#ca-watch.icon a{margin:0;padding:0;outline:none;display:block;width:26px; padding-top:3.1em;margin-top:0; margin-top:-0.8em !ie;height:0;overflow:hidden;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFgAAAAQCAMAAAClQEgHAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAwBQTFRFoNb/+vr52tXLdcP/ltL/ysKt39rPrdz/xtDT8vLwwrJxodr/vqxjzdnr8v7+ntb/uuX/i87/ytTV9fb3zuz+8eOU+fr8zvH/wuX/ecT/hbrnj7XBltb/m9T/h8z/jtH+c8H/vq53lL/Ovq109vb1/v7rx8CuhcT0xLJlot3/2PL/kc//59N3s9//v7KGbL7/mNf//v395NSLmdr//Pz7ccT/wbOIZ7v/ybZk6OzzpNf/icPu0cm2g8n/p9n/9fTzva1ouuL/samQwu3/scfhfrbj8e/q4+bnyLJQ6u3tqtr/irbG7PH5fcz/0d7ww+r/zcuL6Obh9f7/hsv/s8+r+e2rw7J2rb3C+fj2icTy1O7/jrvO1s++vMyUz8zGocna6+rn8vDtlLK8aL3/d8X///vV7fz/vraklMr039nMtNjqp97/o9362ejN4vb/zcN7sN3/vfP/bsD/1dLNhK2+yLeIkrri28drz7tp5N7TiK26grXi3trTccP/vub/rd//+v//qM7fyeHMztmq5PT8u6t0/f3+/P39ksDwk8HQtMTH3fn/kdH/ltLpxb5o0dzsnND6ssXbzun5rdru2+Dh5+vsz9nadrrx1eLz+fLM7/z/w71z//zPgMz/8eWrwtKT9vn8jbPCf7vs1N3pua1terXo1O3tqtfWwOX51cV5dMH/vtmy28p8fLXR4efx9emq///8z9TbzrxowLOP5ea57///nq2xy7xo///5frrnwrSP9PX2+vv7ztzwvd3P2vH5r9z/8/X4nMrlsN//qLq9wa5zh7fikdf/tuL9zbpo3tnQ1u/kx8rL+/z8kq+6+vLGkqKq6f//oMrfxuf8xbVwqLvSh7vq8PP3ltD6d8P/v7Ngx7dqwbFt/PGyk8jv9vf3zLhofqy/wdPqyeTc0vH9//3kxun5i7O/x87X09mr1sRzmK3C3dnQz9XXmLvg///6uc7ozLpq7O7u//zc7evoyfT/+/z+mtf/9e25zcJt7ezowMXGu8nM+Pn5////8/n77InDmQAAAQB0Uk5T////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////AFP3ByUAAAJbSURBVHjaYvgPAb+3/ccK4tKxi7+4SkA9A5SWnuyJVSGXDidWcSnN6/jVQw0+s//fBWzqin9scMImvtF/62us6rfwOaEYXPLvXyM2pzn8+7dGBYt4dZ5WhjA29d3i+Sowg/d4TjuX9+9fQwnH1L8oqhIrN5//909VOdPNBEXcZ8Y7CQlHEam9Pt/Q1O/KrXNcdhSsnuFIZ3zWpLR/QMAnkhWvJA1TxVqx0mheKkj883qjVx9LYeIukRkT2P3rCtgPCGTfiLTuQKjPD3iZK1DAzv64OWD27VIG9+h/SOASB0xhwklk8XImmLilOp+IhK6XFQODrCyD+D1euPoHF50FDoPFZWQKfzIx/N/9PAiuP3oKwmOMYU9hwu8tAhHiYteidO34WbRtFZg1d65DVn+6HiJem3MrEBTGZ6taIPqDvN1RwkxxJkRcVeMLivixEwwsgpLmRfKulqjqm/jB4r08vyCp4tMhiAFPOFCj2L4cIh7KhCp+UJ1bjjlZ/6Y8L5r6PmOQuGkIEzS5vV0BMWBWOKrCGlGIeCorqvhieTlm5pRVkgYuaOpj5zLXmiqkLGeFGhwOTBRRl4EmJKEqVJsDdC3Q8B16qOITs4MNegS/B3OXoanf53s8JNbYN0cPanDSPy3vP0JVz/4tRFVo9u+uRcwbZdF/d1DFy8S5Fz3qr5ZxdkVT/3W1Rsyp1vmFS6AGP1TqAolzSK+9j6KQZ5MNiGK64sGIIr7U+gOI4pWaLoaqfjtEPRdIPdDgdiFY5hRCyaWGbDDz2CKQxdv8YOb5LcCtnuE/jQBAgAEAQlFsBT+lqfQAAAAASUVORK5CYII=);background-image:url(http://wiki.oni2.net/w/skins/vector/images/watch-icons.png?2012-08-30T22:25:00Z)!ie}#ca-unwatch.icon a{background-position:-43px 60%}#ca-watch.icon a{background-position:5px 60%}#ca-unwatch.icon a:hover,#ca-unwatch.icon a:focus{background-position:-67px 60%}#ca-watch.icon a:hover,#ca-watch.icon a:focus{background-position:-19px 60%}#ca-unwatch.icon a.loading,#ca-watch.icon a.loading{background-image:url(data:image/gif;base64,R0lGODlhEAAQAMQfANra2uLi4vDw8PLy8ujo6Ozs7NbW1vj4+Pb29s7Oztzc3NTU1O7u7uDg4NHR0erq6v39/d7e3vz8/Pv7+/7+/tPT09jY2Pr6+tnZ2efn5/X19eXl5ebm5vT09P///////yH/C05FVFNDQVBFMi4wAwEAAAAh+QQJAwAfACwAAAAAEAAQAAAFa+Anjl9QkShacVqabp2XuKjjecHhStrjHDdIgtORiCyWSEZwud0mg0zEUhkYnNhsY/O5OCRZrEEwgvzCkgqZhGiEB1wUgRGeAFKApqcjcJ5QCx4aFQEECX1/JAlJJBsVFRMkEBkXLhyVNJkhACH5BAkDAB8ALAAAAAAQABAAAAV74CeO4hUQZEoGhqGqWzQtEnlYRCYMGSB5BkTKQCgUOBGPkjBIdQDKqBLhaJI4D6l0gylMRg6IVkmhNBIjxWBM8XAwHNFAIdYWDA0SRhNtKy0CJAUVEAcRAQJkFikZDg4EBB0RDR4dGCkIEhAjFBsBDwovKo0BoioFQiMhACH5BAkDAB8ALAAAAAAQABAAAAWB4CeO5HeU33OVl5IIpYEFh/QR1rYNZSMUAYVBwfBYbKRJwwPxFDxQjAbloECvHgMEBUBgPZTApjSxeL+eQGDUsQwkaGhBcUBYinGI5GBIEBwEGhxwVwwLFgoRHQwECgIADRFXBgUfEygfEBEDTmuYIxAJFAYwnyMFABVbpiMYGSghACH5BAkDAB8ALAAAAAAQABAAAAV+4CdKjWieKOJs6De1U5Zhg4YcmaG0kXcElQDtEWkZPMgMBGlofQDIqK9pmhAADClSEDBtAICJROvR7EQGx5LsgQAOogKm0LhQ2IDRQRJRFKIHAh4XAXknEw5REQsRBgAOEigRFBQEERofAgJiKBoZAgsXTicUDgYDoygNXU4hACH5BAUDAB8ALAAAAAAQABAAAAV54Cd+EFBNY6p+hgCssOERGwSP3eZBgUIEG0xhdGFpPMjChjNoRD6XIGBDQVo9FIcogZnsrlbLQNRQfMEewVN0ERAaaE9AoDoECGj76lBBTxQwDlYBEQweGwwqEDIHCwIbBgAAFioUBgUOdCIaBRwrBhUHNykQY6MfIQA7);background-image:url(http://wiki.oni2.net/w/skins/vector/images/watch-icon-loading.gif?2012-08-30T22:25:00Z)!ie;background-position:5px 60%}#ca-unwatch.icon a span,#ca-watch.icon a span{display:none}div.vectorTabs ul{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAuCAIAAABmjeQ9AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAERJREFUeF5lTtEKgEAMMv//j/O0IxlH9CA6N2WURAA/OHl5GeWAwUUHBcKV795FtTePxpmV3t9uv8Z3/cmvM88vzbbrAV/dQdX+eas3AAAAAElFTkSuQmCC);background-image:url(http://wiki.oni2.net/w/skins/vector/images/tab-break.png?2012-08-30T22:25:00Z)!ie;background-position:right bottom;background-repeat:no-repeat} .tipsy{font-size:0.8em}}
+
+/* cache key: oni_wiki:resourceloader:filter:minify-css:7:71312b429efcab0364ff9ffe7312ef96 */
Index: s10k/Vago/icon_resource.rc
===================================================================
--- s10k/Vago/icon_resource.rc (revision 1092)
+++ s10k/Vago/icon_resource.rc (revision 1092)
@@ -0,0 +1,1 @@
+ IDI_ICON1 ICON DISCARDABLE "vago_icon.ico"
Index: s10k/Vago/libs/BasicXMLSyntaxHighlighter/BasicXMLSyntaxHighlighter.cpp
===================================================================
--- s10k/Vago/libs/BasicXMLSyntaxHighlighter/BasicXMLSyntaxHighlighter.cpp (revision 1092)
+++ s10k/Vago/libs/BasicXMLSyntaxHighlighter/BasicXMLSyntaxHighlighter.cpp (revision 1092)
@@ -0,0 +1,89 @@
+#include "BasicXMLSyntaxHighlighter.h"
+
+BasicXMLSyntaxHighlighter::BasicXMLSyntaxHighlighter(QObject * parent) :
+ QSyntaxHighlighter(parent)
+{
+ setRegexes();
+ setFormats();
+}
+
+BasicXMLSyntaxHighlighter::BasicXMLSyntaxHighlighter(QTextDocument * parent) :
+ QSyntaxHighlighter(parent)
+{
+ setRegexes();
+ setFormats();
+}
+
+BasicXMLSyntaxHighlighter::BasicXMLSyntaxHighlighter(QTextEdit * parent) :
+ QSyntaxHighlighter(parent)
+{
+ setRegexes();
+ setFormats();
+}
+
+void BasicXMLSyntaxHighlighter::highlightBlock(const QString & text)
+{
+ // Special treatment for xml element regex as we use captured text to emulate lookbehind
+ int xmlElementIndex = m_xmlElementRegex.indexIn(text);
+ while(xmlElementIndex >= 0)
+ {
+ int matchedPos = m_xmlElementRegex.pos(1);
+ int matchedLength = m_xmlElementRegex.cap(1).length();
+ setFormat(matchedPos, matchedLength, m_xmlElementFormat);
+
+ xmlElementIndex = m_xmlElementRegex.indexIn(text, matchedPos + matchedLength);
+ }
+
+ // Highlight xml keywords *after* xml elements to fix any occasional / captured into the enclosing element
+ typedef QList::const_iterator Iter;
+ Iter xmlKeywordRegexesEnd = m_xmlKeywordRegexes.end();
+ for(Iter it = m_xmlKeywordRegexes.begin(); it != xmlKeywordRegexesEnd; ++it) {
+ const QRegExp & regex = *it;
+ highlightByRegex(m_xmlKeywordFormat, regex, text);
+ }
+
+ highlightByRegex(m_xmlAttributeFormat, m_xmlAttributeRegex, text);
+ highlightByRegex(m_xmlCommentFormat, m_xmlCommentRegex, text);
+ highlightByRegex(m_xmlValueFormat, m_xmlValueRegex, text);
+}
+
+void BasicXMLSyntaxHighlighter::highlightByRegex(const QTextCharFormat & format,
+ const QRegExp & regex, const QString & text)
+{
+ int index = regex.indexIn(text);
+
+ while(index >= 0)
+ {
+ int matchedLength = regex.matchedLength();
+ setFormat(index, matchedLength, format);
+
+ index = regex.indexIn(text, index + matchedLength);
+ }
+}
+
+void BasicXMLSyntaxHighlighter::setRegexes()
+{
+ m_xmlElementRegex.setPattern("<[\\s]*[/]?[\\s]*([^\\n]\\w*)(?=[\\s/>])");
+ m_xmlAttributeRegex.setPattern("\\w+(?=\\=)");
+ m_xmlValueRegex.setPattern("\"[^\\n\"]+\"(?=[\\s/>])");
+ m_xmlCommentRegex.setPattern("");
+
+ m_xmlKeywordRegexes = QList() << QRegExp("<\\?") << QRegExp("/>")
+ << QRegExp(">") << QRegExp("<") << QRegExp("");
+}
+
+void BasicXMLSyntaxHighlighter::setFormats()
+{
+ m_xmlKeywordFormat.setForeground(Qt::blue);
+
+ m_xmlElementFormat.setForeground(Qt::blue);
+
+ m_xmlAttributeFormat.setForeground(Qt::red);
+
+ m_xmlValueFormat.setForeground(QColor(0x8055FF));
+ m_xmlValueFormat.setFontWeight(QFont::Bold);
+
+ m_xmlCommentFormat.setForeground(Qt::gray);
+}
+
Index: s10k/Vago/libs/BasicXMLSyntaxHighlighter/BasicXMLSyntaxHighlighter.h
===================================================================
--- s10k/Vago/libs/BasicXMLSyntaxHighlighter/BasicXMLSyntaxHighlighter.h (revision 1092)
+++ s10k/Vago/libs/BasicXMLSyntaxHighlighter/BasicXMLSyntaxHighlighter.h (revision 1092)
@@ -0,0 +1,39 @@
+#ifndef BASIC_XML_SYNTAX_HIGHLIGHTER_H
+#define BASIC_XML_SYNTAX_HIGHLIGHTER_H
+
+#include
+#include
+
+class BasicXMLSyntaxHighlighter : public QSyntaxHighlighter
+{
+ Q_OBJECT
+public:
+ BasicXMLSyntaxHighlighter(QObject * parent);
+ BasicXMLSyntaxHighlighter(QTextDocument * parent);
+ BasicXMLSyntaxHighlighter(QTextEdit * parent);
+
+protected:
+ virtual void highlightBlock(const QString & text);
+
+private:
+ void highlightByRegex(const QTextCharFormat & format,
+ const QRegExp & regex, const QString & text);
+
+ void setRegexes();
+ void setFormats();
+
+private:
+ QTextCharFormat m_xmlKeywordFormat;
+ QTextCharFormat m_xmlElementFormat;
+ QTextCharFormat m_xmlAttributeFormat;
+ QTextCharFormat m_xmlValueFormat;
+ QTextCharFormat m_xmlCommentFormat;
+
+ QList m_xmlKeywordRegexes;
+ QRegExp m_xmlElementRegex;
+ QRegExp m_xmlAttributeRegex;
+ QRegExp m_xmlValueRegex;
+ QRegExp m_xmlCommentRegex;
+};
+
+#endif // BASIC_XML_SYNTAX_HIGHLIGHTER_H
Index: s10k/Vago/libs/DropLineEdit/droplineedit.cpp
===================================================================
--- s10k/Vago/libs/DropLineEdit/droplineedit.cpp (revision 1092)
+++ s10k/Vago/libs/DropLineEdit/droplineedit.cpp (revision 1092)
@@ -0,0 +1,49 @@
+#include "DropLineEdit.h"
+
+DropLineEdit::DropLineEdit(QWidget *parent) : QLineEdit(parent)
+{
+ //setDragDropMode(QAbstractItemView::DropOnly);
+ setAcceptDrops(true);
+}
+
+void DropLineEdit::dragEnterEvent(QDragEnterEvent *event) {
+
+ const QMimeData* mimeData = event->mimeData();
+
+ // We only accept if our widget is enabled and it is only one file
+ if(
+ !this->isEnabled() ||
+ mimeData->urls().size() != 1 ||
+ // checks if it is a file (folders are ignored)
+ QDir(mimeData->urls().at(0).toLocalFile()).exists()
+ )
+ {
+ event->ignore();
+ }
+ else{
+ event->acceptProposedAction();
+ }
+}
+
+void DropLineEdit::dragMoveEvent(QDragMoveEvent *event) {
+ event->acceptProposedAction();
+}
+
+void DropLineEdit::dropEvent(QDropEvent *event) {
+
+ const QMimeData* mimeData = event->mimeData();
+
+ event->acceptProposedAction();
+
+ QStringList pathList = QStringList();
+
+ if (mimeData->hasUrls())
+ {
+ this->setText(mimeData->urls().at(0).toLocalFile());
+ }
+
+}
+
+void DropLineEdit::dragLeaveEvent(QDragLeaveEvent *event) {
+ event->accept();
+}
Index: s10k/Vago/libs/DropLineEdit/droplineedit.h
===================================================================
--- s10k/Vago/libs/DropLineEdit/droplineedit.h (revision 1092)
+++ s10k/Vago/libs/DropLineEdit/droplineedit.h (revision 1092)
@@ -0,0 +1,21 @@
+#ifndef DROPLINEEDIT_H
+#define DROPLINEEDIT_H
+
+#include
+#include
+
+class DropLineEdit : public QLineEdit {
+
+ Q_OBJECT
+
+public:
+ DropLineEdit(QWidget *parent = 0);
+
+protected:
+ void dragEnterEvent(QDragEnterEvent *event);
+ void dragMoveEvent(QDragMoveEvent *event);
+ void dragLeaveEvent(QDragLeaveEvent *event);
+ void dropEvent(QDropEvent *event);
+};
+
+#endif // DROPLINEEDIT_H
Index: s10k/Vago/libs/DropTableWidget/droptablewidget.cpp
===================================================================
--- s10k/Vago/libs/DropTableWidget/droptablewidget.cpp (revision 1092)
+++ s10k/Vago/libs/DropTableWidget/droptablewidget.cpp (revision 1092)
@@ -0,0 +1,174 @@
+#include "droptablewidget.h"
+
+//Original dn'd from here: http://www.qtcentre.org/threads/17536-Drag-and-Drop-QTableWidget-in-UI-file
+//This constructor also initialize c++ constants (http://stackoverflow.com/questions/1423696/how-to-initialize-a-const-field-in-constructor)
+
+DropTableWidget::DropTableWidget(QWidget *parent, QBrush _disabledBackStyle,
+ QBrush _disabledTextStyle) : QTableWidget(parent),
+ disabledBackStyle(_disabledBackStyle),
+ disabledTextStyle(_disabledTextStyle){
+
+ //set widget default properties:
+ // setFrameStyle(QFrame::Sunken | QFrame::StyledPanel);
+ // setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+ setEditTriggers(QAbstractItemView::NoEditTriggers);
+ setDragDropMode(QAbstractItemView::DropOnly);
+ setAlternatingRowColors(true);
+ // setSelectionMode(QAbstractItemView::NoSelection);
+ // setShowGrid(false);
+ // setWordWrap(false);
+ setAcceptDrops(true);
+
+ //Custom added for Vago
+ setColumnCount(3);
+
+ //set Header of tables
+ setHorizontalHeaderLabels(QStringList()<<"File/Folder"<<"From/To"<<"Command");
+ horizontalHeader()->setStretchLastSection(true);
+}
+
+void DropTableWidget::dragEnterEvent(QDragEnterEvent *event) {
+ event->acceptProposedAction();
+ emit changed(event->mimeData());
+}
+
+void DropTableWidget::dragMoveEvent(QDragMoveEvent *event) {
+ event->acceptProposedAction();
+}
+
+void DropTableWidget::dropEvent(QDropEvent *event) {
+
+ const QMimeData* mimeData = event->mimeData();
+
+ event->acceptProposedAction();
+
+ QStringList pathList = QStringList();
+
+ // check for our needed mime type, here a file or a list of files
+ if (mimeData->hasUrls())
+ {
+ QList urlList = mimeData->urls();
+
+ // extract the local paths of the files
+ for (int i = 0; i < urlList.size() && i < 2048; ++i)
+ {
+ pathList.append(urlList.at(i).toLocalFile());
+ }
+ }
+
+ emit dropped(this, pathList);
+}
+
+void DropTableWidget::dragLeaveEvent(QDragLeaveEvent *event) {
+ event->accept();
+}
+
+void DropTableWidget::clear() {
+ emit changed();
+}
+
+//Context menu actions
+void DropTableWidget::contextMenuEvent(QContextMenuEvent *event){
+ //All the context menu is processed at the mainwindow class
+ emit dtContextMenu(this,event);
+}
+
+//Custom function to swap items positions in the table
+void DropTableWidget::swapPositions(QList rowsSelected, int numUnitsToMove){
+ QList orderedList = QList();
+
+ //Make a copy of the actual list to swap
+ for(int i=0; irowCount(); i++){
+ orderedList.append(tableRowProperties()); //Add each row property (initialize)
+ for(int j=0; jcolumnCount(); j++){
+ orderedList[i].cells.append(this->item(i,j)->text());
+
+ if(this->item(i,j)->background()==this->disabledBackStyle){ //Is it disabled?
+ orderedList[i].isDisabled=true;
+ }
+
+ }
+ }
+
+ //Swap the copied list for each item
+ if(numUnitsToMove<0){ //if going up we need to start from the first item
+ for(int i=0; i=0; i--){
+ orderedList.swap(rowsSelected.at(i),rowsSelected.at(i)+numUnitsToMove);
+ }
+ }
+
+ this->clear(); //clear previous selections
+
+ //Switch with the ordered one
+ for(int i=0; irowCount(); i++){
+ for(int j=0; jcolumnCount(); j++){
+ QTableWidgetItem *orderedItem = new QTableWidgetItem(orderedList[i].cells.at(j));
+ this->setItem(i,j,orderedItem);
+
+ if(orderedList[i].isDisabled){ //Restored disabled style
+ setDisableStyleWidgetItem(orderedItem);
+ }
+ }
+ this->updateTableToolTips(i);
+ }
+
+ this->clearSelection(); //clear previous selections
+
+ //Select the moved rows
+ this->setRangeSelected(QTableWidgetSelectionRange(rowsSelected.at(0)+numUnitsToMove,this->columnCount()-1,rowsSelected.at(rowsSelected.size()-1)+numUnitsToMove,0),true);
+ //Top > top row number, Left > num colums to select to left, Bottom > bottom row number, Right > start at each column (from right)
+}
+
+//Reset a item to its initial style
+void DropTableWidget::resetStyleWidgetItem(QTableWidgetItem *currentItem){
+ if((currentItem->row()+1)%2==0){ //if the row number is par it use the alternate color scheme
+ currentItem->setBackground(QPalette().brush(QPalette::Normal,QPalette::AlternateBase));
+ }
+ else{
+ currentItem->setBackground(QPalette().brush(QPalette::Normal,QPalette::Base));
+ }
+ currentItem->setForeground(QPalette().brush(QPalette::Normal,QPalette::WindowText));
+}
+
+//Disable a table widget item
+void DropTableWidget::setDisableStyleWidgetItem(QTableWidgetItem *currentItem){
+ currentItem->setBackground(this->disabledBackStyle);
+ currentItem->setForeground(this->disabledTextStyle);
+}
+
+QString DropTableWidget::getFileAbsolute(int row){
+ QString fileCommand=this->item(row,2)->text();
+
+ int idxFileName=fileCommand.indexOf(this->item(row,0)->text()); //Search first for the file name
+ int fileAbsoluteStartIdx=Util::indexOfBackward(fileCommand,"\"",idxFileName);
+
+ fileCommand.remove(0,fileAbsoluteStartIdx);
+ int fileAbsoluteEndIdx=fileCommand.indexOf('"',1); //1 to find the end quoate and not the start
+
+ return fileCommand.remove(fileAbsoluteEndIdx,(fileCommand.size()-1)-fileAbsoluteEndIdx);
+}
+
+QString DropTableWidget::getOutputAbsolute(int row){
+ QString command=this->item(row,2)->text();
+
+ int fileAbsoluteEndIdx=command.indexOf("/\"",0); //let's find the /" (end of path)
+
+ command.remove(fileAbsoluteEndIdx,command.size()-1);
+
+ int fileAbsoluteStartIdx=Util::indexOfBackward(command,"\"",command.size()-1)+1;
+
+ return command.remove(0,fileAbsoluteStartIdx);
+}
+
+
+void DropTableWidget::updateTableToolTips(int row){
+ for(int i=0; icolumnCount(); i++){
+ this->item(row,i)->setToolTip(this->item(row,i)->text());
+ }
+}
+
Index: s10k/Vago/libs/DropTableWidget/droptablewidget.h
===================================================================
--- s10k/Vago/libs/DropTableWidget/droptablewidget.h (revision 1092)
+++ s10k/Vago/libs/DropTableWidget/droptablewidget.h (revision 1092)
@@ -0,0 +1,63 @@
+#ifndef DROPTABLEWIDGET_H
+#define DROPTABLEWIDGET_H
+
+#include
+#include
+
+#include "utilvago.h"
+
+
+//Used in swapPositions function, for switching orders and maintain the disabled style
+struct tableRowProperties{ //No need for typedef in c++ :)
+ QStringList cells;
+ bool isDisabled;
+
+ tableRowProperties(){
+ cells = QStringList(); //initialize the list on the constructor
+ isDisabled=false; //if you don't initialize a variable at c++ it is random assigned!
+ }
+};
+
+class QMimeData;
+
+class DropTableWidget : public QTableWidget {
+
+ Q_OBJECT
+
+public:
+ DropTableWidget(QWidget *parent = 0,
+ QBrush _disabledBackStyle = QPalette().brush(QPalette::Disabled,QPalette::Base),
+ QBrush _disabledTextStyle = QPalette().brush(QPalette::Disabled,QPalette::WindowText));
+
+ const QBrush disabledBackStyle;
+ const QBrush disabledTextStyle;
+
+ void swapPositions(QList rowsSelected, int numUnitsToMove);
+ void resetStyleWidgetItem(QTableWidgetItem *currentItem);
+ void setDisableStyleWidgetItem(QTableWidgetItem *currentItem);
+ void updateTableToolTips(int row);
+ QString getFileAbsolute(int row);
+ QString getOutputAbsolute(int row);
+
+public slots:
+ void clear();
+
+signals:
+ void changed(const QMimeData *mimeData = 0);
+ void dropped(DropTableWidget *myTable, QStringList pathList);
+ QString getTypeConversion(DropTableWidget *thisTable);
+ void changeToCurrentSettings(int rows[], DropTableWidget* thisTable);
+ void dtContextMenu(DropTableWidget* thisTable, QContextMenuEvent *event);
+
+protected:
+ void dragEnterEvent(QDragEnterEvent *event);
+ void dragMoveEvent(QDragMoveEvent *event);
+ void dragLeaveEvent(QDragLeaveEvent *event);
+ void dropEvent(QDropEvent *event);
+ void contextMenuEvent(QContextMenuEvent * event);
+
+private:
+ QTableWidget *tablewidget;
+};
+
+#endif // DROPTABLEWIDGET_H
Index: s10k/Vago/libs/LineNumberDisplay/LineNumberDisplay.cpp
===================================================================
--- s10k/Vago/libs/LineNumberDisplay/LineNumberDisplay.cpp (revision 1092)
+++ s10k/Vago/libs/LineNumberDisplay/LineNumberDisplay.cpp (revision 1092)
@@ -0,0 +1,127 @@
+/***************************************************************************
+ File : LineNumberDisplay.cpp
+ Project : QtiPlot
+ --------------------------------------------------------------------
+ Copyright : (C) 2008 by Ion Vasilief
+ Email (use @ for *) : ion_vasilief*yahoo.fr
+ Description : A widget displaying line numbers for a QTextEdit
+
+ ***************************************************************************/
+
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ * This program is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with this program; if not, write to the Free Software *
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, *
+ * Boston, MA 02110-1301 USA *
+ * *
+ ***************************************************************************/
+#include "LineNumberDisplay.h"
+#include
+#include
+#include
+
+LineNumberDisplay::LineNumberDisplay(QTextEdit *te, QWidget *parent)
+ : QTextEdit(parent), d_text_edit(te)
+{
+ setReadOnly(true);
+ setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+ setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+ setFrameStyle(QFrame::Panel | QFrame::Raised);
+ setMaximumWidth(0);
+ setLineWidth(0);
+ setFocusPolicy(Qt::NoFocus);
+ setCurrentFont(te->currentFont());
+ viewport()->setCursor(Qt::ArrowCursor);
+
+ QPalette palette = this->palette();
+ palette.setColor(QPalette::Highlight, palette.color(QPalette::Base));
+ setPalette(palette);
+
+ if (te){
+ connect(this, SIGNAL(selectionChanged()), this, SLOT(updateDocumentSelection()));
+
+ connect(te->document(), SIGNAL(contentsChanged()), this, SLOT(updateLineNumbers()));
+ connect((QObject *)te->verticalScrollBar(), SIGNAL(valueChanged(int)),
+ (QObject *)verticalScrollBar(), SLOT(setValue(int)));
+ connect(te, SIGNAL(currentCharFormatChanged (const QTextCharFormat &)),
+ this, SLOT(changeCharFormat (const QTextCharFormat &)));
+ }
+
+ // Disable manual user scrolls
+ this->verticalScrollBar()->setEnabled(false);
+ this->horizontalScrollBar()->setEnabled(false);
+}
+
+void LineNumberDisplay::updateDocumentSelection()
+{
+ if (!isVisible() || !d_text_edit)
+ return;
+
+ QTextCursor c = textCursor();
+#if QT_VERSION >= 0x040500
+ int selectionStart = document()->findBlock(c.selectionStart()).firstLineNumber();
+ int selectionEnd = document()->findBlock(c.selectionEnd()).firstLineNumber();
+#else
+ int selectionStart = document()->findBlock(c.selectionStart()).blockNumber();
+ int selectionEnd = document()->findBlock(c.selectionEnd()).blockNumber();
+#endif
+ int selectedLines = abs(selectionEnd - selectionStart);
+
+ QTextCursor cursor(d_text_edit->textCursor());
+ cursor.movePosition(QTextCursor::Start);
+ for (int i = 0; i < selectionStart; i++)
+ cursor.movePosition(QTextCursor::Down);
+
+ for (int i = 0; i < selectedLines; i++)
+ cursor.movePosition(QTextCursor::Down, QTextCursor::KeepAnchor);
+
+ cursor.movePosition(QTextCursor::EndOfLine, QTextCursor::KeepAnchor);
+
+ if (selectionEnd == d_text_edit->document()->blockCount() - 1)
+ cursor.movePosition(QTextCursor::End, QTextCursor::KeepAnchor);
+
+ d_text_edit->setTextCursor(cursor);
+}
+
+void LineNumberDisplay::updateLineNumbers(bool force)
+{
+ if (!isVisible() || !d_text_edit)
+ return;
+
+ int lines = d_text_edit->document()->blockCount();
+ if (document()->blockCount() - 1 == lines && !force)
+ return;
+
+ QString aux;
+ for(int i = 0; i < lines; i++)
+ aux += QString::number(i + 1) + "\n";
+
+ setPlainText(aux);
+
+ QFontMetrics fm(d_text_edit->currentFont(), this);
+ setMaximumWidth(2.5*fm.boundingRect(QString::number(lines)).width()); // 2.5 small fix to display numbers correctly on macos
+ verticalScrollBar()->setValue(d_text_edit->verticalScrollBar()->value());
+}
+
+void LineNumberDisplay::showEvent(QShowEvent *e)
+{
+ e->accept();
+ if (isVisible())
+ updateLineNumbers();
+}
+
+void LineNumberDisplay::changeCharFormat (const QTextCharFormat &f)
+{
+ setCurrentFont(f.font());
+}
Index: s10k/Vago/libs/LineNumberDisplay/LineNumberDisplay.h
===================================================================
--- s10k/Vago/libs/LineNumberDisplay/LineNumberDisplay.h (revision 1092)
+++ s10k/Vago/libs/LineNumberDisplay/LineNumberDisplay.h (revision 1092)
@@ -0,0 +1,62 @@
+/***************************************************************************
+ File : LineNumberDisplay.h
+ Project : QtiPlot
+ --------------------------------------------------------------------
+ Copyright : (C) 2008 by Ion Vasilief
+ Email (use @ for *) : ion_vasilief*yahoo.fr
+ Description : A widget displaying line numbers for a QTextEdit
+
+ ***************************************************************************/
+
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ * This program is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with this program; if not, write to the Free Software *
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, *
+ * Boston, MA 02110-1301 USA *
+ * *
+ ***************************************************************************/
+#ifndef LineNumberDisplay_H
+#define LineNumberDisplay_H
+
+#include
+#include
+
+//! A QTextEdit displaying line numbers.
+/**
+ * It must be used in connection with another "source" QTextEdit.
+ */
+class LineNumberDisplay: public QTextEdit
+{
+ Q_OBJECT
+
+public:
+ //! Constructor
+ /**
+ * \param te the "source" QTextEdit for which we want to display the line numbers
+ * \param parent parent widget (only affects placement of the dialog)
+ */
+ LineNumberDisplay(QTextEdit *te, QWidget *parent = 0);
+
+public slots:
+ void updateLineNumbers(bool force = false);
+ void updateDocumentSelection();
+
+private slots:
+ void changeCharFormat (const QTextCharFormat &);
+
+private:
+ void showEvent(QShowEvent *);
+ QTextEdit *d_text_edit;
+};
+#endif
Index: s10k/Vago/logger.cpp
===================================================================
--- s10k/Vago/logger.cpp (revision 1092)
+++ s10k/Vago/logger.cpp (revision 1092)
@@ -0,0 +1,41 @@
+#include "logger.h"
+
+Logger::Logger(QString appDir, QString logFileName)
+{
+ myLogFile = std::make_unique(appDir+"/"+logFileName);
+
+ if (!myLogFile->open(QIODevice::WriteOnly | QIODevice::Text)){ //open to write
+ return;
+ }
+
+ logStream = std::make_unique(myLogFile.get());
+ //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("yyyy-MM-dd HH:mm:ss") << "\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("yyyy-MM-dd HH:mm:ss") << "\n" << arrToWrite << "\nEvent End.\n";
+ *this->logStream << "--------------------------------------------";
+ this->logStream->flush();
+ mutex.unlock();
+}
+
+Logger::~Logger(){
+
+}
Index: s10k/Vago/logger.h
===================================================================
--- s10k/Vago/logger.h (revision 1092)
+++ s10k/Vago/logger.h (revision 1092)
@@ -0,0 +1,22 @@
+#ifndef LOGGER_H
+#define LOGGER_H
+#include
+#include
+#include
+#include
+#include
+
+class Logger
+{
+public:
+ Logger(QString appDir, QString logFileName);
+ ~Logger();
+ void writeString(QString strToWrite);
+ void writeBytes(QByteArray arrToWrite);
+private:
+ std::unique_ptr myLogFile;
+ std::unique_ptr logStream;
+ QMutex mutex; //mutex for control writes to the logs
+};
+
+#endif // LOGGER_H
Index: s10k/Vago/main.cpp
===================================================================
--- s10k/Vago/main.cpp (revision 1092)
+++ s10k/Vago/main.cpp (revision 1092)
@@ -0,0 +1,16 @@
+#include
+#include "mainwindow.h"
+
+// TODO add lineedit to other lineedits that can receive files or folders, create additional funtions in lineedit where we can specify what kind of argument it accepts
+// Example: setAllowFolders(), setAllowFiles() or setAcceptedTypes(Enum from QtFiles)
+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: s10k/Vago/mainwindow.cpp
===================================================================
--- s10k/Vago/mainwindow.cpp (revision 1092)
+++ s10k/Vago/mainwindow.cpp (revision 1092)
@@ -0,0 +1,2285 @@
+#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->myLogger = new Logger(UtilVago::getAppPath(), GlobalVars::AppLogName); //start logger
+
+ this->myLogger->writeString("Detected AppDir: "+UtilVago::getAppPath());
+ this->myLogger->writeString("True app dir: "+QDir::currentPath());
+
+ setVagoWindowTitle();
+
+ if(!QFile::exists(UtilVago::getOniSplitExecutableAbsolutePath())){
+ UtilVago::showAndLogErrorPopUp(this->myLogger, "OniSplit not found. Please download it at "+GlobalVars::ModsDomain+" and put it the Vago's tools folder. \n\nProgram will now exit.");
+ exit(1);
+ }
+
+ if(!QFile::exists(UtilVago::getXmlToolsExecutableAbsolutePath())){
+ UtilVago::showAndLogErrorPopUp(this->myLogger, "XmlTools not found. Please download it at "+GlobalVars::ModsDomain+" and put it the Vago's tools folder. \n\nProgram will now exit.");
+ exit(1);
+ }
+
+ this->vagoSettings = new QSettings(UtilVago::getAppPath() + "/" + 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", UtilVago::getAppPath()+"/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()){
+ UtilVago::showAndLogErrorPopUp(this->myLogger, "AE folder is mandatory. Application will now 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("WindowWidth")){
+ this->vagoSettings->setValue("WindowWidth", GlobalVars::DefaultWindowWidth);
+ iniChanged=true;
+ }
+ if(!this->vagoSettings->contains("WindowHeight")){
+ this->vagoSettings->setValue("WindowHeight", GlobalVars::DefaultWindowHeight);
+ 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("AskSaveProject")){
+ this->vagoSettings->setValue("AskSaveProject", true);
+ iniChanged=true;
+ }
+ if(!this->vagoSettings->contains("AskToOpenLastProject")){
+ this->vagoSettings->setValue("AskToOpenLastProject", false);
+ iniChanged=true;
+ }
+ if(!this->vagoSettings->contains("LastProjectPath")){
+ this->vagoSettings->setValue("LastProjectPath", this->vagoSettings->value("Workspace"));
+ iniChanged=true;
+ }
+ for(int i=0; irecentProjectsMaxSize; i++){
+ if(!this->vagoSettings->contains("RecentProject" + QString::number(i+1))){
+ this->vagoSettings->setValue("RecentProject" + QString::number(i+1), "");
+ iniChanged=true;
+ }
+ }
+#ifdef Q_OS_MAC
+ if(!this->vagoSettings->contains("useYesAsDefaultWhenRemovingItems")){
+ this->vagoSettings->setValue("useYesAsDefaultWhenRemovingItems", false);
+ iniChanged=true;
+ }
+#endif
+
+ 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;
+ this->startedWindowWidth=this->vagoSettings->value("WindowWidth").toInt();
+ this->startedWindowHeight=this->vagoSettings->value("WindowHeight").toInt();
+#ifdef Q_OS_MAC
+ this->useYesAsDefaultWhenRemovingItems=this->vagoSettings->value("useYesAsDefaultWhenRemovingItems").toBool();
+#endif
+
+ //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->tbAbortConversion->hide(); //hide while not being used
+
+ ui->statusBar->addPermanentWidget(this->myBar); //this adds automatically in right
+ ui->statusBar->addPermanentWidget(ui->tbAbortConversion);
+
+ // User interface
+ 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->tbXmlToolsInterface); //add option to manual onisplit commands
+ ui->mainToolBar->addWidget(ui->emptySpacerLabel4); //same as before
+ ui->mainToolBar->addWidget(ui->tbOpenFolder); //add option to open folder with files converted etc
+
+ ui->mainToolBar->setLayoutDirection(Qt::RightToLeft);
+
+ ui->pbConvert->setMinimumHeight(ui->pbConvert->sizeHint().height()*1.5); // This is OS indepented. It maintain size ratio over the Windows and Mac.
+
+
+#ifdef Q_OS_MAC
+ // setUnifiedTitleAndToolBarOnMac(true); // Qt suggests to use it on mac | http://www.slideshare.net/qtbynokia/how-to-make-your-qt-app-look-native // align on left doesn't work if active
+ ui->tbOni->setIcon(QIcon(":/new/icons/oni_icon_mac.png")); // Oni executable on mac have a different icon than windows
+ // Set mac platform the first one in the menu, and also make it checkable by default
+ ui->menuTarget_Platform->removeAction(ui->actionWindows);
+ ui->menuTarget_Platform->addAction(ui->actionWindows);
+ ui->actionWindows->setChecked(false);
+ ui->actionMac_Windows_demo->setChecked(true);
+ // resize(800,600); // Mac OS pcs should be able to render this resolution without any problem. It's also better
+ //// because the components on mac use more space
+#endif
+
+ resize(this->startedWindowWidth,this->startedWindowHeight);
+
+#ifdef Q_OS_MAC
+ ui->pbConvert->setToolTip(ui->pbConvert->toolTip() + " (⌘ + Enter)");
+#else
+ ui->pbConvert->setToolTip(ui->pbConvert->toolTip() + " (Ctrl + Enter)");
+#endif
+
+ //Commands Mapping
+ this->commandMap = QHash();
+ mapCommands();
+
+ updateItemsLoaded(ui->twSourcesXML);
+
+ loadRecentProjects();
+}
+
+MainWindow::~MainWindow()
+{
+ delete ui;
+ this->myLogger->writeString("Application Exited.");
+}
+
+
+void MainWindow::showEvent(QShowEvent *e)
+{
+ // If we don't have a converter yet, application wasn't started.
+ if(!this->applicationIsFullyLoaded)
+ {
+ // Apparently Qt doesn't contains a slot to when the application was fully load (mainwindow). So we do our own implementation instead.
+ connect(this, SIGNAL(signalAppIsLoaded()), this, SLOT(applicationWasLoaded()), Qt::ConnectionType::QueuedConnection);
+ emit signalAppIsLoaded();
+ }
+
+ e->accept();
+}
+
+// Called only when the MainWindow was fully loaded and painted on the screen. This slot is only called once.
+void MainWindow::applicationWasLoaded(){
+#ifdef Q_OS_WIN
+ // QProgressBar only works after the windows was shown
+ // http://stackoverflow.com/questions/24840941/qwintaskbarprogress-wont-show (Kervala answer)
+
+ this->win7TaskBarButton = new QWinTaskbarButton();
+
+ this->win7TaskBarButton->setWindow(this->windowHandle());
+
+ this->win7TaskBarProgress = this->win7TaskBarButton->progress();
+
+ //Create a thread for do the conversion in background
+ this->myConverter = new Converter(UtilVago::getAppPath(), this->myLogger, &this->listToProccess, this->win7TaskBarProgress);
+#else
+ this->myConverter = new Converter(UtilVago::getAppPath(), this->myLogger, &this->listToProccess);
+#endif
+
+ connectSlots();
+
+ this->myLogger->writeString("Application started.");
+
+ this->applicationIsFullyLoaded = true;
+
+ QString lastSavedProject = this->vagoSettings->value("RecentProject1").toString();
+
+ if(!lastSavedProject.isEmpty() && this->vagoSettings->value("AskToOpenLastProject").toBool()){
+ if(Util::showQuestionPopUp(this,"Do you want to load latest project?\n\nLatest project was '" + Util::cutNameWithoutBackSlash(lastSavedProject) + "'.")){
+ loadProjectState(lastSavedProject);
+ }
+ }
+}
+
+
+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()
+{
+ // it deletes itself once closed
+ WizardFactory::startInstance(UtilVago::getAppPath(), this->workspaceWizardsLocation, this->vagoSettings, this->myLogger);
+}
+
+void MainWindow::on_actionSound_Wizard_triggered()
+{
+ // it deletes itself once closed
+ WizardFactory::startInstance(UtilVago::getAppPath(), this->workspaceWizardsLocation, this->vagoSettings, this->myLogger, &this->commandMap);
+}
+
+void MainWindow::on_actionBackground_Image_Wizard_triggered()
+{
+ // it deletes itself once closed
+ WizardFactory::startInstance(UtilVago::getAppPath(), this->workspaceWizardsLocation, this->vagoSettings, this->myLogger);
+}
+
+void MainWindow::on_actionWindow_Messages_Wizard_triggered()
+{
+ // it deletes itself once closed
+ WizardFactory::startInstance(UtilVago::getAppPath(), this->workspaceWizardsLocation, this->vagoSettings, this->myLogger);
+}
+
+void MainWindow::on_tbOni_clicked()
+{
+ QStringList arguments;
+
+ if(this->vagoSettings->value("OniWindow").toBool()){ // Run in a window?
+ arguments << "-noswitch";
+ }
+#ifdef Q_OS_WIN
+ else{
+ arguments << "-switch"; // only supported on windows. Was added by daodan dll.
+ }
+#endif
+
+ arguments << "-debugfiles";
+
+ if(!QProcess::startDetached(this->AeLocation+"/"+GlobalVars::OniExe,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("file:///"+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_tbXmlToolsInterface_clicked()
+{
+ //We pass no parent because we want to have an independent window for XmlToolsInterface,
+ //so we can minimize it or maximize indepently from the MainWindow
+ XmlToolsInterface *xmlToolsWindow = new XmlToolsInterface(this->myLogger);
+ xmlToolsWindow->show(); //it destroys itself when finished.
+}
+
+void MainWindow::on_tbAbortConversion_clicked()
+{
+ if(Util::showQuestionPopUp(this,"Are you sure you want to abort the current conversion?")){
+ emit terminateCurrProcess();
+ }
+}
+
+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_cbSpecificFilesLevels_toggled(bool checked)
+{
+ ui->leSpecificFilesLevels->setEnabled(checked);
+}
+
+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{
+ UtilVago::showAndLogErrorPopUp(this->myLogger, "An error occurred checking last version:\n\n"+result->errorString());
+ }
+ result->deleteLater();
+}
+
+void MainWindow::on_pbAddSourceXML_clicked()
+{
+ addFilesSource( ui->twSourcesXML,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_pbAddSourceObjects_clicked()
+{
+ addFilesSource( ui->twSourcesObjects,QFileDialog::getOpenFileNames(this,"Choose the files...","./" , "All Files (*.*)"));
+}
+
+void MainWindow::on_pbAddSourceCharacters_clicked()
+{
+ addFilesSource( ui->twSourcesCharacters,QFileDialog::getOpenFileNames(this,"Choose the files...","./" , "All Files (*.*)"));
+}
+
+void MainWindow::on_pbAddSourceLevels_clicked()
+{
+ if(QString::compare(ui->cbFromLevels->currentText(),"ONI FILES",Qt::CaseSensitive)==0 && QString::compare(ui->cbToLevels->currentText(),"DAT",Qt::CaseSensitive)==0){ //CaseSensitive is faster)
+ addFilesSource(ui->twSourcesLevels,Util::multipleDirDialog("Choose folders with ONIs..."));
+ }
+ else{
+ 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(from=="ONI FILES" && to=="DAT"){
+ //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);
+ rowsWereChangedInDropTableWidget();
+}
+
+QString MainWindow::fileParsingXML(QString tabTitle, QString myOutputFolder, QString from, QString to , QString file){
+
+ QString command;
+
+ if(from=="ONI" && to=="XML"){
+ return command=this->commandMap.value(tabTitle+"->"+from+"->"+to)+" "+myOutputFolder+" "+file;
+ }
+ else if(from=="XML" && to=="ONI"){
+ return command=this->commandMap.value(tabTitle+"->"+from+"->"+to)+" "+myOutputFolder+" "+file;
+ }
+
+ return "";
+
+}
+
+QString MainWindow::fileParsingTextures(QString tabTitle, QString myOutputFolder, QString from, QString to , QString file){
+
+ QString command=this->commandMap.value(tabTitle+"->"+from+"->"+to)+" "+myOutputFolder;
+
+ if(ui->gbTextures->isEnabled()){ //faster than compare strings (if is DAT/ONI)
+
+ if(ui->cbMipMapsTextures->isChecked()){
+ command+=" "+this->commandMap.value(tabTitle+"->"+ui->cbMipMapsTextures->text());
+ }
+
+ if(ui->cbNoUwrap->isChecked()){
+ command+=" "+this->commandMap.value(tabTitle+"->"+ui->cbNoUwrap->text());
+ }
+
+ if(ui->cbNoVwrap->isChecked()){
+ command+=" "+this->commandMap.value(tabTitle+"->"+ui->cbNoVwrap->text());
+ }
+
+ if(ui->cbLarge->isChecked()){
+ command+=" "+this->commandMap.value(tabTitle+"->"+ui->cbLarge->text());
+ }
+
+ command+=" "+this->commandMap.value(tabTitle+"->"+getTextureRBCheckedTypeTexture()->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(tabTitle+"->"+ui->cbEnvMap->text()) + ui->leEnvMapTexture->text().remove(".oni",Qt::CaseInsensitive);
+ }
+ }
+
+ return command+=" "+file; //add source
+}
+
+QString MainWindow::fileParsingCharacters(QString tabTitle, QString myOutputFolder, QString from, QString to , QString file){
+
+ QString command=this->commandMap.value(tabTitle+"->"+from+"->"+to)+" "+myOutputFolder + " " + file ;
+
+
+ if(ui->cbCellShading->isChecked()){
+ command+=" "+this->commandMap.value(tabTitle+"->"+ui->cbCellShading->text());
+ }
+
+ if(ui->cbNormals->isChecked()){
+ command+=" "+this->commandMap.value(tabTitle+"->"+ui->cbNormals->text());
+ }
+
+ if(ui->cbWithTRBS_ONCC->isChecked()){
+ if(ui->leTRBS_ONCC->text().isEmpty()){
+ showErrStatusMessage("Checkbox '"+ui->cbWithTRBS_ONCC->text()+"' is selected. The name cannot be empty.");
+ return "";
+ }
+
+ command+=" "+this->commandMap.value(tabTitle+"->"+ui->cbWithTRBS_ONCC->text())+Util::normalizeAndQuote(ui->leTRBS_ONCC->text());
+ }
+
+ return command;
+}
+
+
+QString MainWindow::fileParsingObjects(QString tabTitle, QString myOutputFolder, QString from, QString to , QString file){
+
+ QString command=this->commandMap.value(tabTitle+"->"+from+"->"+to)+" "+myOutputFolder;
+
+ if(ui->cbTexture->isChecked()){
+ if(ui->leTextureName->text().isEmpty()){
+ showErrStatusMessage("Checkbox '"+ui->cbTexture->text()+"' is selected. The file source cannot be empty.");
+ return "";
+ }
+ command+=" "+this->commandMap.value(tabTitle+"->"+ui->cbTexture->text()) + ui->leTextureName->text();
+ }
+ else if(ui->cbWithAnimation->isChecked()){
+ if(ui->leAnimationName->text().isEmpty()){
+ showErrStatusMessage("Checkbox '"+ui->cbWithAnimation->text()+"' is selected. The file source cannot be empty.");
+ return "";
+ }
+ command+=" "+Util::normalizeAndQuote(ui->leAnimationName->text()) + " " + this->commandMap.value(tabTitle+"->"+ui->cbWithAnimation->text()) + file;
+ return command;
+ }
+
+ if(from=="OBAN ONI (cam)"){
+ command+=" -geom:camera";
+ }
+
+ return command+=" "+file; //add source
+}
+
+QString MainWindow::fileParsingLevels(QString tabTitle, QString myOutputFolder, QString from, QString to , QString file){
+
+ QString datName, command;
+
+ if(!(from=="ONI FILES" && to=="DAT")){ // to all except this one
+
+ command=this->commandMap.value(tabTitle+"->"+from+"->"+to);
+
+ if(ui->cbSpecificFilesLevels->isChecked()){
+
+ if(ui->leSpecificFilesLevels->text().isEmpty()){
+ showErrStatusMessage("Checkbox '"+ui->cbSpecificFilesLevels->text()+"' is selected. The files pattern cannot be empty.");
+ return "";
+ }
+
+ command+=":"+ui->leSpecificFilesLevels->text();
+ }
+
+ if(from=="DAT" && to=="ONI FILES"){ // extract files to a subdir with the files name ex: level0_Final
+ command += " " + myOutputFolder.insert(myOutputFolder.size()-2,QString(Util::cutName(file)).replace(".dat","")) + " " + file;
+ }
+ else{
+ command+=" "+myOutputFolder+" "+file;
+ }
+
+ }
+
+ if((from=="ONI FILES" || from=="MASTER XML") && to=="DAT"){ // almost the same command for both
+ QString datName;
+
+ if(from=="MASTER XML"){
+ command+=GlobalVars::OniSplitProcSeparator; //insert mark so we know this action will take 2 commands
+ }
+
+ 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{
+ if(from=="ONI FILES"){
+ datName=QString(myOutputFolder).insert(myOutputFolder.size()-1,Util::cutName(file).remove("/")+".dat"); //if none iputted set the same name of input file
+ }
+ else if(from=="MASTER XML"){
+ 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(from=="ONI FILES"){
+ if(ui->actionWindows->isChecked()){ //is target plataform select windows?
+ return command=this->commandMap.value(tabTitle+"->"+from+"->"+to+"(PC)")+" "+ file + " "+datName;
+ }
+ else{
+ return command=this->commandMap.value(tabTitle+"->"+from+"->"+to+"(demoPCMAC)")+" "+ file + " "+datName;
+ }
+ }
+ else if(from=="MASTER XML"){
+ if(ui->actionWindows->isChecked()){ //is target plataform select windows?
+ command+=this->commandMap.value(tabTitle+"->ONI FILES->"+to+"(PC)")+" "+myOutputFolder+" "+datName; //add second command
+ }
+ else{
+ command+=this->commandMap.value(tabTitle+"->ONI FILES->"+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(tabTitle+"->"+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, bool isToDisabled){
+ //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);
+
+ if(isToDisabled){
+ myTable->setDisableStyleWidgetItem(newFile);
+ myTable->setDisableStyleWidgetItem(newConversion);
+ myTable->setDisableStyleWidgetItem(newCommand);
+ }
+
+ myTable->setItem(twSize,0,newFile);
+ myTable->setItem(twSize,1,newConversion);
+ myTable->setItem(twSize,2,newCommand);
+
+ myTable->updateTableToolTips(twSize); //Update tool tips
+}
+
+void MainWindow::on_pbConvert_clicked()
+{
+ startConversion();
+}
+
+void MainWindow::startConversion(){
+
+ DropTableWidget* currTable = getCurrentTableWidget();
+
+ bool ready=false;
+ for(int i=0; irowCount(); i++){ //There are items to process?
+ if(currTable->item(i,2)->background()!=currTable->disabledBackStyle){
+ ready=true;
+ break;
+ }
+ }
+
+ if(!ready){
+ showErrStatusMessage("Please add sources to convert first.");
+ return;
+ }
+
+ if(this->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(currTable->item(i,2)->background()!=currTable->disabledBackStyle){
+ this->listToProccess.append(currTable->item(i,2)->text());
+ }
+ }
+
+ this->myConverter->start();
+}
+
+void MainWindow::TsetupProgressBar(int max){
+ this->myBar->setValue(0);
+ this->myBar->show();
+ this->myBar->setMaximum(max);
+ ui->tbAbortConversion->show();
+}
+
+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();
+ ui->tbAbortConversion->hide();
+
+ if(numErrors!=0){
+ QString sNumErrors=QString::number(numErrors);
+ if(numErrors>1){
+ UtilVago::showErrorPopUpLogButton(result+"\n This is the last of "+sNumErrors+" errors.");
+ showErrStatusMessage("Something gone wrong. Check log file ("+sNumErrors+" errors).");
+ }
+ else{
+ UtilVago::showErrorPopUpLogButton(result);
+ showErrStatusMessage("Something gone wrong. Check log file.");
+ }
+ }
+ else{
+ showSuccessStatusMessage("Everything went well!");
+ }
+}
+
+void MainWindow::TconversionAborted(){
+ this->myBar->hide();
+ ui->tbAbortConversion->hide();
+
+ showErrStatusMessage("Conversion was aborted.");
+}
+
+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(){
+ ////////////////////////////////////////////////////////////////////////XML Commands
+ this->commandMap.insert("xml->ONI->XML","-extract:xml");
+ this->commandMap.insert("xml->XML->ONI","-create");
+ //######################General Options
+
+ //Possible Combinations
+ this->commandMap.insertMulti("xml->ONI","XML");
+ this->commandMap.insertMulti("xml->XML","ONI");
+
+ ////////////////////////////////////////////////////////////////////////Textures Commands
+ this->commandMap.insert("textures->DAT / TXMP ONI->DDS","-extract:dds");
+ this->commandMap.insert("textures->DAT / TXMP ONI->TGA","-extract:tga");
+ this->commandMap.insert("textures->DAT / TXMP ONI->PNG","-extract:png");
+ this->commandMap.insert("textures->DAT / TXMP ONI->JPG","-extract:jpg");
+ this->commandMap.insert("textures->TGA / DDS / PNG / JPG->TXMP 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 / TXMP ONI","TGA");
+ this->commandMap.insertMulti("textures->DAT / TXMP ONI","DDS");
+ this->commandMap.insertMulti("textures->DAT / TXMP ONI","PNG");
+ this->commandMap.insertMulti("textures->DAT / TXMP ONI","JPG");
+ this->commandMap.insertMulti("textures->TGA / DDS / PNG / JPG","TXMP ONI");
+
+ ////////////////////////////////////////////////////////////////////////Characters Commands
+ this->commandMap.insert("characters->TRAM ONI->XML / XML & DAE","-extract:xml");
+ this->commandMap.insert("characters->TRBS / ONCC ONI->DAE","-extract:dae");
+ this->commandMap.insert("characters->TRBS XML->TRBS ONI","-create");
+ this->commandMap.insert("characters->TRBS DAE->TRBS ONI","-create:trbs");
+ this->commandMap.insert("characters->FILM DAT->XML","film2xml");
+
+ //######################Characters Options
+ this->commandMap.insert("characters->"+ui->cbWithTRBS_ONCC->text(),"-anim-body:");
+ this->commandMap.insert("characters->"+ui->cbCellShading->text(),"-cel");
+ this->commandMap.insert("characters->"+ui->cbNormals->text(),"-normals");
+ //Possible Combinations
+ this->commandMap.insertMulti("characters->TRAM ONI","XML / XML & DAE");
+ this->commandMap.insertMulti("characters->TRBS / ONCC ONI","DAE");
+ this->commandMap.insertMulti("characters->DAE","TRBS ONI");
+ this->commandMap.insertMulti("characters->TRBS DAE","TRBS ONI");
+ this->commandMap.insertMulti("characters->TRBS XML","TRBS ONI");
+ this->commandMap.insertMulti("characters->FILM DAT","XML");
+
+ ////////////////////////////////////////////////////////////////////////Objects Commands
+ this->commandMap.insert("objects->M3GM ONI->OBJ","-extract:obj");
+ this->commandMap.insert("objects->M3GM ONI->DAE","-extract:dae");
+ this->commandMap.insert("objects->ONWC ONI->OBJ","-extract:obj");
+ this->commandMap.insert("objects->ONWC ONI->DAE","-extract:dae");
+ this->commandMap.insert("objects->OBAN ONI (cam)->DAE","-extract:dae");
+ this->commandMap.insert("objects->OBJ->M3GM ONI","-create:m3gm");
+ //######################Characters Options
+ this->commandMap.insert("objects->"+ui->cbTexture->text(),"-tex:");
+ this->commandMap.insert("objects->"+ui->cbWithAnimation->text(),"-geom:");
+ //Possible Combinations
+ this->commandMap.insertMulti("objects->M3GM ONI","OBJ");
+ this->commandMap.insertMulti("objects->M3GM ONI","DAE");
+ this->commandMap.insertMulti("objects->ONWC ONI","OBJ");
+ this->commandMap.insertMulti("objects->ONWC ONI","DAE");
+ this->commandMap.insertMulti("objects->OBAN ONI (cam)","DAE");
+ this->commandMap.insertMulti("objects->OBJ","M3GM ONI");
+
+
+ ////////////////////////////////////////////////////////////////////////Levels Commands
+ this->commandMap.insert("levels->DAT->ONI FILES","-export");
+ //this->commandMap.insert("levels->ONI FILES->DAT","-import"); //Not used.
+ this->commandMap.insert("levels->ONI FILES->DAT(PC)","-import:nosep");
+ this->commandMap.insert("levels->ONI FILES->DAT(demoPCMAC)","-import:sep");
+ this->commandMap.insert("levels->AKEV ONI->DAE","-extract:dae");
+ this->commandMap.insert("levels->DAE->AKEV 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->DAT","ONI FILES");
+ this->commandMap.insertMulti("levels->ONI FILES","DAT");
+ this->commandMap.insertMulti("levels->AKEV ONI","DAE");
+ this->commandMap.insertMulti("levels->DAE","AKEV ONI");
+ this->commandMap.insertMulti("levels->MASTER XML","DAT");
+ this->commandMap.insertMulti("levels->MASTER XML","ONI FILES");
+
+ ////////////////////////////////////////////////////////////////////////Misc Commands
+ this->commandMap.insert("misc->DAT / SNDD ONI->WAV","-extract:wav");
+ this->commandMap.insert("misc->DAT / SNDD ONI->AIF","-extract:aif");
+ this->commandMap.insert("misc->DAT / SUBT ONI->TXT","-extract:txt");
+ this->commandMap.insert("misc->WAV / AIF->SNDD ONI","-create");
+ this->commandMap.insert("misc->TXT->SUBT ONI","-create:subt");
+ //Possible Combinations
+ this->commandMap.insertMulti("misc->DAT / SNDD ONI","WAV");
+ this->commandMap.insertMulti("misc->DAT / SNDD ONI","AIF");
+ this->commandMap.insertMulti("misc->DAT / SUBT ONI","TXT");
+ this->commandMap.insertMulti("misc->WAV / AIF","SNDD ONI");
+ this->commandMap.insertMulti("misc->TXT","SUBT ONI");
+
+}
+
+void MainWindow::on_cbFromXML_currentIndexChanged(const QString &arg1)
+{
+ updateComboBox(arg1, ui->cbToXML);
+}
+
+
+void MainWindow::on_cbFromTextures_currentIndexChanged(const QString &arg1)
+{
+ updateComboBox(arg1, ui->cbToTextures);
+}
+
+void MainWindow::on_cbFromObjects_currentIndexChanged(const QString &arg1)
+{
+ updateComboBox(arg1, ui->cbToObjects);
+}
+
+void MainWindow::on_cbFromCharacters_currentIndexChanged(const QString &arg1)
+{
+ updateComboBox(arg1, ui->cbToCharacters);
+}
+
+void MainWindow::on_cbFromLevels_currentIndexChanged(const QString &arg1)
+{
+ updateComboBox(arg1, ui->cbToLevels);
+}
+
+void MainWindow::on_cbFromMisc_currentIndexChanged(const QString &arg1)
+{
+ updateComboBox(arg1, ui->cbToMisc);
+}
+
+void MainWindow::updateComboBox(const QString &arg1, QComboBox *comboBox){
+
+ QString identifier;
+
+ if(comboBox == ui->cbToXML){
+ identifier = ui->tabWidget->tabText(XMLTabIndex);
+ }
+ else if(comboBox == ui->cbToTextures){
+ identifier = ui->tabWidget->tabText(TexturesTabIndex);
+
+ //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);
+ }
+ }
+ else if(comboBox == ui->cbToCharacters){
+ identifier = ui->tabWidget->tabText(CharactersTabIndex);
+
+ ui->cbWithTRBS_ONCC->setEnabled(false);
+ ui->cbWithTRBS_ONCC->setChecked(false);
+ ui->cbCellShading->setEnabled(false);
+ ui->cbCellShading->setChecked(false);
+ ui->cbNormals->setEnabled(false);
+ ui->cbNormals->setChecked(false);
+//#error add drag and drop to Extract TRAM with TRBS/ONCC
+ if(QString::compare(arg1,"TRAM ONI",Qt::CaseSensitive)==0){ //case sensitive is faster
+ ui->cbWithTRBS_ONCC->setEnabled(true);
+ }
+ else if(QString::compare(arg1,"TRBS DAE",Qt::CaseSensitive)==0){
+ ui->cbNormals->setEnabled(true);
+ ui->cbCellShading->setEnabled(true);
+ }
+
+ }
+ else if(comboBox == ui->cbToObjects){
+ identifier = ui->tabWidget->tabText(ObjectsTabIndex);
+
+ ui->cbTexture->setEnabled(false);
+ ui->cbTexture->setChecked(false);
+ ui->cbWithAnimation->setEnabled(false);
+ ui->cbWithAnimation->setChecked(false);
+
+ if(QString::compare(arg1,"M3GM ONI",Qt::CaseSensitive)==0){ //case sensitive is faster
+ ui->cbWithAnimation->setEnabled(true);
+ }
+ else if(QString::compare(arg1,"OBJ",Qt::CaseSensitive)==0){
+ ui->cbTexture->setEnabled(true);
+ }
+ }
+ else if(comboBox == ui->cbToLevels){
+ identifier = ui->tabWidget->tabText(LevelsTabIndex);
+
+ ui->cbSpecificFilesLevels->setEnabled(false);
+ ui->cbSpecificFilesLevels->setChecked(false);
+ 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(arg1=="DAT"){ //case sensitive is faster
+ ui->cbSpecificFilesLevels->setEnabled(true);
+ }
+ else if(arg1=="ONI FILES"){ //case sensitive is faster
+ ui->cbDatLevels->setEnabled(true);
+ }
+ else if(arg1=="DAE"){
+ ui->cbBnvLevels->setEnabled(true);
+ ui->cbAdditionalSourcesLevels->setEnabled(true);
+ }
+ }
+ else{ // Misc
+ identifier = ui->tabWidget->tabText(MiscTabIndex);
+ }
+
+ identifier = identifier.toLower(); // get current tab title text (lower case)
+
+ 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_pbRemoveSourceXML_clicked()
+{
+ removeTableContents( ui->twSourcesXML);
+}
+
+void MainWindow::on_pbRemoveSourceTextures_clicked()
+{
+ removeTableContents(ui->twSourcesTextures);
+}
+
+void MainWindow::on_pbRemoveSourceObjects_clicked()
+{
+ removeTableContents(ui->twSourcesObjects);
+}
+
+void MainWindow::on_pbRemoveSourceCharacters_clicked()
+{
+ removeTableContents(ui->twSourcesCharacters);
+}
+
+void MainWindow::on_pbRemoveSourceLevels_clicked()
+{
+ removeTableContents(ui->twSourcesLevels);
+}
+
+void MainWindow::on_pbRemoveSourceMisc_clicked()
+{
+ removeTableContents(ui->twSourcesMisc);
+}
+
+void MainWindow::on_pbClearSourcesXML_clicked()
+{
+ clearTableContents(ui->twSourcesXML);
+}
+
+void MainWindow::on_pbClearSourcesTextures_clicked()
+{
+ clearTableContents(ui->twSourcesTextures);
+}
+
+void MainWindow::on_pbClearSourcesObjects_clicked()
+{
+ clearTableContents(ui->twSourcesObjects);
+}
+
+void MainWindow::on_pbClearSourcesCharacters_clicked()
+{
+ clearTableContents(ui->twSourcesCharacters);
+}
+
+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();
+
+ QMessageBox::StandardButton defaultButton = QMessageBox::NoButton; // default button for clear asking question, only customizable in mac os
+
+ if(size==0){
+ Util::showPopUp("Select a row first.");
+ return;
+ }
+
+#ifdef Q_OS_MAC
+ if(this->useYesAsDefaultWhenRemovingItems){
+ defaultButton = QMessageBox::Yes;
+ }
+ else{
+ defaultButton = QMessageBox::No;
+ }
+#endif
+
+
+ if(Util::showQuestionPopUp(this,"Are you sure you want to delete the selected rows?",defaultButton)){
+ for(int i=0; iremoveRow(myTable->selectedItems().at(size-i-1)->row());
+ myTable->removeRow(myTable->selectionModel()->selectedRows().at(size-i-1).row());
+ }
+ updateItemsLoaded(myTable);
+ rowsWereChangedInDropTableWidget();
+ }
+}
+
+void MainWindow::clearTableContents(DropTableWidget *myTable){
+
+ QMessageBox::StandardButton defaultButton = QMessageBox::NoButton; // default button for clear asking question, only customizable in mac os
+
+ if(myTable->rowCount()==0){
+ Util::showPopUp("Nothing to clear.");
+ return;
+ }
+
+#ifdef Q_OS_MAC
+ if(this->useYesAsDefaultWhenRemovingItems){
+ defaultButton = QMessageBox::Yes;
+ }
+ else{
+ defaultButton = QMessageBox::No;
+ }
+#endif
+
+ if(Util::showQuestionPopUp(this,"Are you sure you want to clear the content?",defaultButton)){
+ clearTableNoPrompt(myTable);
+ updateItemsLoaded(myTable);
+ rowsWereChangedInDropTableWidget();
+ }
+
+}
+
+void MainWindow::clearTableNoPrompt(DropTableWidget *myTable){
+ myTable->clearContents();
+ myTable->setRowCount(0);
+}
+
+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("AskSaveProject").toBool() && this->unsavedChangesExist){
+ QMessageBox::StandardButton result = askToSaveCurrentProject();
+ if(result == QMessageBox::StandardButton::Cancel){
+ event->ignore();
+ return;
+ }
+ }
+
+ // Exit application (this will also close all other windows which don't have parent, for instance ManualCommands)
+ QApplication::quit();
+}
+
+QMessageBox::StandardButton MainWindow::askToSaveCurrentProject(){
+ QMessageBox::StandardButton result =
+ Util::showQuestionPopUpWithCancel(this,"There are unsaved changes. Do you want to save the current project?", QMessageBox::StandardButton::Yes);
+
+ if(result == QMessageBox::StandardButton::Yes){
+ on_actionSave_triggered();
+ }
+
+ return result;
+}
+
+void MainWindow::on_cbToLevels_currentIndexChanged(const QString &arg1)
+{
+
+ if(ui->cbFromLevels->currentText()=="MASTER XML" && arg1=="DAT"){
+ ui->cbDatLevels->setEnabled(true);
+ }
+ else if(ui->cbFromLevels->currentText()=="MASTER XML" && arg1=="ONI FILES"){
+ ui->cbDatLevels->setEnabled(false);
+ ui->cbDatLevels->setChecked(false);
+ }
+
+}
+
+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 && !projectIsLoading){
+ 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 && !projectIsLoading){
+ 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_cbWithTRBS_ONCC_toggled(bool checked)
+{
+ ui->leTRBS_ONCC->setEnabled(checked);
+}
+
+void MainWindow::on_actionCheck_OniSplit_version_triggered()
+{
+ QProcess myProcess;
+ myProcess.setWorkingDirectory(UtilVago::getAppPath());
+ myProcess.start(UtilVago::getOniSplitExecutable()+" -version");
+ myProcess.waitForFinished();
+
+ QString result=myProcess.readAllStandardOutput();
+
+ Util::showPopUp("This Vago version was built with base in OniSplit version "+GlobalVars::BuiltOniSplitVersion+"\n\nCurrent version is:\n"+result.trimmed());
+}
+
+void MainWindow::on_actionCheck_xmlTools_version_triggered()
+{
+ QProcess myProcess;
+ myProcess.setWorkingDirectory(UtilVago::getAppPath());
+ myProcess.start(UtilVago::getXmlToolsExecutable()+" --version");
+ myProcess.waitForFinished();
+ QString result=myProcess.readLine();
+
+ Util::showPopUp("This Vago version was built with base in XmlTools version "+GlobalVars::BuiltXmlToolsVersion+"\n\nCurrent version is:\n"+result.trimmed());
+}
+
+/**
+ Update items loaded
+**/
+void MainWindow::on_tabWidget_currentChanged(int)
+{
+ updateItemsLoaded(getCurrentTableWidget());
+}
+
+void MainWindow::updateItemsLoaded(DropTableWidget *currentTable){
+
+ int numItems=currentTable->rowCount();
+
+ this->itemsLoaded->setText(QString().setNum(numItems)+ (numItems==1?" item ":" items ") +"loaded");
+}
+
+void MainWindow::rowsWereChangedInDropTableWidget(){
+ // We have changed rows, we have now unsaved changes.
+ if(!this->unsavedChangesExist){
+ this->unsavedChangesExist = true;
+ setVagoWindowTitle();
+ }
+}
+
+void MainWindow::on_tbCommand_clicked()
+{
+ //We pass no parent because we want to have an independent window for ManualCommands,
+ //so we can minimize it or maximize indepently from the MainWindow
+ ManualCommands *commandsWindow = new ManualCommands();
+ 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()
+{
+ UtilVago::openLogFile();
+}
+
+void MainWindow::on_actionOpen_AE_folder_triggered()
+{
+ QDesktopServices::openUrl(QUrl("file:///"+this->AeLocation));
+}
+
+void MainWindow::on_actionSave_Project_triggered()
+{
+
+ QString filePath = QFileDialog::getSaveFileName(this, tr("Save File"),
+ this->vagoSettings->value("LastProjectPath").toString(),
+ tr("Vago project files (*.vgp)"));
+
+ if(!filePath.isEmpty()){
+ saveProjectState(filePath);
+ }
+
+}
+
+// New Project
+void MainWindow::on_actionNew_Project_triggered()
+{
+ if(this->vagoSettings->value("AskSaveProject").toBool() && this->unsavedChangesExist){
+ QMessageBox::StandardButton result = askToSaveCurrentProject();
+ if(result == QMessageBox::StandardButton::Cancel){
+ return;
+ }
+ }
+
+ QList myTables = getAllTableWidgets();
+
+ for(DropTableWidget* const currTable : myTables){
+ clearTableNoPrompt(currTable);
+ }
+
+ this->lastProjectFilePath=""; // clear last project file path
+ this->unsavedChangesExist = false;
+
+ setVagoWindowTitle(); // update vago title
+}
+
+void MainWindow::on_actionSave_triggered()
+{
+ if(this->lastProjectFilePath.isEmpty()){
+ on_actionSave_Project_triggered();
+ return;
+ }
+
+ saveProjectState(this->lastProjectFilePath);
+}
+
+void MainWindow::on_actionLoad_Project_triggered()
+{
+
+ QString filePath = QFileDialog::getOpenFileName(this, tr("Load File"),
+ this->vagoSettings->value("LastProjectPath").toString(),
+ tr("Vago project files (*.vgp)"));
+ if(!filePath.isEmpty()){
+ loadProjectState(filePath);
+ }
+}
+
+void MainWindow::on_actionProject1_triggered()
+{
+ loadProjectState(this->ui->actionProject1->text());
+}
+
+void MainWindow::on_actionProject2_triggered()
+{
+ loadProjectState(this->ui->actionProject2->text());
+}
+
+void MainWindow::on_actionProject3_triggered()
+{
+ loadProjectState(this->ui->actionProject3->text());
+}
+
+void MainWindow::on_actionProject4_triggered()
+{
+ loadProjectState(this->ui->actionProject4->text());
+}
+
+void MainWindow::on_actionProject5_triggered()
+{
+ loadProjectState(this->ui->actionProject5->text());
+}
+
+QString MainWindow::getTypeConversion(DropTableWidget *myTable){
+ QString from,to;
+
+ if(myTable==ui->twSourcesXML){
+ from=ui->cbFromXML->currentText();
+ to=ui->cbToXML->currentText();
+ }
+ else if(myTable==ui->twSourcesTextures){
+ from=ui->cbFromTextures->currentText();
+ to=ui->cbToTextures->currentText();
+ }
+ else if(myTable==ui->twSourcesObjects){
+ from=ui->cbFromObjects->currentText();
+ to=ui->cbToObjects->currentText();
+ }
+ else if(myTable==ui->twSourcesCharacters){
+ from=ui->cbFromCharacters->currentText();
+ to=ui->cbToCharacters->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();
+ }
+
+ std::unique_ptr menu = std::make_unique();
+ std::unique_ptr copy = std::make_unique("Copy",myTable);
+ std::unique_ptr moveUp = std::make_unique("Move Up",myTable);
+ std::unique_ptr moveDown = std::make_unique("Move Down",myTable);
+ std::unique_ptr changeOptions = std::make_unique("Change To Current Options",myTable);
+ std::unique_ptr changeOutput = std::make_unique("Change Output for:");
+ std::unique_ptr outWorkspace = std::make_unique("Workspace",myTable);
+ std::unique_ptr outCurrOutput = std::make_unique("Current Output Folder",myTable);
+ std::unique_ptr outOther = std::make_unique("Other...",myTable);
+ std::unique_ptr edisable = std::make_unique("Enable/Disable",myTable);
+
+ menu->addAction(copy.get());
+ menu->addSeparator();
+ menu->addAction(moveUp.get());
+ menu->addAction(moveDown.get());
+ menu->addSeparator();
+ menu->addAction(changeOptions.get());
+ menu->addMenu(changeOutput.get());
+ changeOutput->addActions(QList() << outWorkspace.get() << outCurrOutput.get() << outOther.get());
+ menu->addAction(edisable.get());
+
+
+ //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.get()){
+ //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.get()){
+ qSort(selectedRows); //let's order the selections by the row number, so we know exactly how to swap it
+ myTable->swapPositions(selectedRows,-1);
+ rowsWereChangedInDropTableWidget();
+ }
+ else if(selectedOption==moveDown.get()){
+ qSort(selectedRows);
+ myTable->swapPositions(selectedRows,+1);
+ rowsWereChangedInDropTableWidget();
+ }
+ else if(selectedOption==changeOptions.get()){
+ changeToCurrentSettings(selectedRows,myTable);
+ }
+ else if(selectedOption==outWorkspace.get()){
+ changeItemsOutput(myTable,selectedRows,this->workspaceLocation);
+ }
+ else if(selectedOption==outCurrOutput.get()){
+ changeItemsOutput(myTable,selectedRows,this->outputFolder);
+ }
+ else if(selectedOption==outOther.get()){
+
+ 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.get()){
+
+ 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";
+ }
+
+ rowsWereChangedInDropTableWidget();
+ showSuccessStatusMessage(result);
+ }
+}
+
+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);
+ }
+
+ rowsWereChangedInDropTableWidget();
+ 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);
+ }
+
+ rowsWereChangedInDropTableWidget();
+ 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){
+
+ QString tabTitle=ui->tabWidget->tabText(ui->tabWidget->currentIndex()).toLower(); // get current tab title
+
+ if(myTable==ui->twSourcesXML){ //So we only need to parse one command.
+ return fileParsingXML(tabTitle, myOutputFolder,from,to,file);
+ }
+ else if(myTable==ui->twSourcesTextures){
+ return fileParsingTextures(tabTitle, myOutputFolder,from,to,file);
+ }
+ else if(myTable==ui->twSourcesObjects){
+ return fileParsingObjects(tabTitle, myOutputFolder,from,to,file);
+ }
+ else if(myTable==ui->twSourcesCharacters){
+ return fileParsingCharacters(tabTitle, myOutputFolder,from,to,file);
+ }
+ else if(myTable==ui->twSourcesLevels){
+ return fileParsingLevels(tabTitle, 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)));
+
+ //This signal is for thread that is working notify the gui thread that the conversion was aborted with sucess
+ connect(myConverter, SIGNAL(conversionAborted()), this, SLOT(TconversionAborted()));
+
+ // This signal is to the user be able to terminate a conversion (OniSplit process in class myConverter will be terminated)
+ connect(this, SIGNAL(terminateCurrProcess()), myConverter, SLOT(terminateCurrProcess()));
+
+ //Drop signal for General table
+ connect(ui->twSourcesXML, 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 Objects table
+ connect(ui->twSourcesObjects, SIGNAL(dropped(DropTableWidget*,QStringList)), this, SLOT(addFilesSource(DropTableWidget*,QStringList)));
+
+ //Drop signal for Characters table
+ connect(ui->twSourcesCharacters, 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->twSourcesXML, 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 Objects table
+ connect(ui->twSourcesObjects, SIGNAL(dtContextMenu(DropTableWidget*,QContextMenuEvent*)), this, SLOT(dtContextMenu(DropTableWidget*,QContextMenuEvent*)));
+
+ //Context menu for Characters table
+ connect(ui->twSourcesCharacters, 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*)));
+}
+
+void MainWindow::saveProjectState(const QString &filePath)
+{
+
+ QList tableWidgets = getAllTableWidgets();
+
+ pugi::xml_document doc;
+
+ pugi::xml_node rootNode = doc.append_child("VagoProject");
+ rootNode.append_attribute("vagoVersion").set_value(GlobalVars::LastCompatibleVersion.toUtf8().constData());
+
+ foreach(DropTableWidget* const &myTable, tableWidgets){
+ saveProjectWidget(rootNode, myTable);
+ }
+
+ if(!doc.save_file(filePath.toUtf8().constData(), PUGIXML_TEXT("\t"), pugi::format_default | pugi::format_write_bom, pugi::xml_encoding::encoding_utf8)){
+ UtilVago::showAndLogErrorPopUpLogButton(this->myLogger, "An error ocurred while trying to save the project file. Please try another path.");
+ return;
+ }
+
+ this->vagoSettings->setValue("LastProjectPath",QFileInfo(filePath).absoluteDir().path());
+
+ this->lastProjectFilePath = filePath;
+ this->unsavedChangesExist = false;
+
+ addNewRecentProject(filePath);
+
+ setVagoWindowTitle();
+
+ showSuccessStatusMessage("Project saved sucessfully.");
+}
+
+void MainWindow::saveProjectWidget(pugi::xml_node &rootNode, DropTableWidget* table)
+{
+ QString from;
+ QString to;
+ QString tabName = getTabNameByTableWidget(table);
+
+ pugi::xml_node currentNodeTable = rootNode.append_child("tempName");
+ pugi::xml_node options;
+
+ if(table==ui->twSourcesXML){ //So we only need to parse one command.
+ from = ui->cbFromXML->currentText().toUtf8().constData();
+ to = ui->cbToXML->currentText().toUtf8().constData();
+ }
+ else if(table==ui->twSourcesTextures){
+ from = ui->cbFromTextures->currentText().toUtf8().constData();
+ to = ui->cbToTextures->currentText().toUtf8().constData();
+ options = currentNodeTable.append_child("Options");
+ options.append_attribute("type").set_value(Util::qStrToCstr(getTextureRBCheckedTypeTexture()->text()));
+ options.append_attribute("genMipMaps").set_value(Util::boolToCstr(ui->cbMipMapsTextures->isChecked()));
+ options.append_attribute("noUwrap").set_value(Util::boolToCstr(ui->cbNoUwrap->isChecked()));
+ options.append_attribute("noVwrap").set_value(Util::boolToCstr(ui->cbNoVwrap->isChecked()));
+ options.append_attribute("large").set_value(Util::boolToCstr(ui->cbLarge->isChecked()));
+ options.append_attribute("envMap").set_value(Util::boolToCstr(ui->cbEnvMap->isChecked()));
+ options.append_attribute("envMapValue").set_value(Util::qStrToCstr(ui->leEnvMapTexture->text()));
+ }
+ else if(table==ui->twSourcesCharacters){
+ from = ui->cbFromCharacters->currentText().toUtf8().constData();
+ to = ui->cbToCharacters->currentText().toUtf8().constData();
+ options = currentNodeTable.append_child("Options");
+ options.append_attribute("cellShading").set_value(Util::boolToCstr(ui->cbCellShading->isChecked()));
+ options.append_attribute("normals").set_value(Util::boolToCstr(ui->cbNormals->isChecked()));
+ options.append_attribute("extractTRBSONCC").set_value(Util::boolToCstr(ui->cbWithTRBS_ONCC->isChecked()));
+ options.append_attribute("extractTRBSONCCValue").set_value(Util::qStrToCstr(ui->leTRBS_ONCC->text()));
+ }
+ else if(table==ui->twSourcesObjects){
+ from = ui->cbFromObjects->currentText().toUtf8().constData();
+ to = ui->cbToObjects->currentText().toUtf8().constData();
+ options = currentNodeTable.append_child("Options");
+ options.append_attribute("texture").set_value(Util::boolToCstr(ui->cbTexture->isChecked()));
+ options.append_attribute("textureValue").set_value(Util::qStrToCstr(ui->leTextureName->text()));
+ options.append_attribute("withAnimation").set_value(Util::boolToCstr(ui->cbWithAnimation->isChecked()));
+ options.append_attribute("withAnimationValue").set_value(Util::qStrToCstr(ui->leAnimationName->text()));
+ }
+ else if(table==ui->twSourcesLevels){
+ from = ui->cbFromLevels->currentText().toUtf8().constData();
+ to = ui->cbToLevels->currentText().toUtf8().constData();
+ options = currentNodeTable.append_child("Options");
+ options.append_attribute("extractWithFiles").set_value(Util::boolToCstr(ui->cbSpecificFilesLevels->isChecked()));
+ options.append_attribute("extractWithFilesValue").set_value(Util::qStrToCstr(ui->leSpecificFilesLevels->text()));
+ options.append_attribute("datFilename").set_value(Util::boolToCstr(ui->cbDatLevels->isChecked()));
+ options.append_attribute("datFilenameValue").set_value(Util::qStrToCstr(ui->leTargetDatLevels->text()));
+ options.append_attribute("bnvSource").set_value(Util::boolToCstr(ui->cbBnvLevels->isChecked()));
+ options.append_attribute("bnvSourceValue").set_value(Util::qStrToCstr(ui->leBnvLevels->text()));
+ options.append_attribute("generateGrids").set_value(Util::boolToCstr(ui->cbGridsLevels->isChecked()));
+ options.append_attribute("additionalSources").set_value(Util::boolToCstr(ui->cbAdditionalSourcesLevels->isChecked()));
+ options.append_attribute("additionalSourcesValue").set_value(Util::qStrToCstr(ui->leAdditSourcesLevels->text()));
+ }
+ else{
+ from = ui->cbFromMisc->currentText().toUtf8().constData();
+ to = ui->cbToMisc->currentText().toUtf8().constData();
+ }
+
+ currentNodeTable.set_name(tabName.toUtf8().constData());
+
+ currentNodeTable.append_attribute("from").set_value(from.toUtf8().constData());
+ currentNodeTable.append_attribute("to").set_value(to.toUtf8().constData());
+
+
+ for(int i=0; irowCount(); i++){
+
+ QString currFileFolder = table->item(i,0)->text();
+ QString currFromTo = table->item(i,1)->text();
+ QString currCommand = table->item(i,2)->text();
+
+ pugi::xml_node currentRow = currentNodeTable.append_child("Row");
+
+
+ currentRow.append_attribute("fileFolder").set_value(Util::qStrToCstr(currFileFolder));
+ currentRow.append_attribute("fromTo").set_value(Util::qStrToCstr(currFromTo));
+ currentRow.append_attribute("command").set_value(Util::qStrToCstr(currCommand));
+
+ if(table->item(i,2)->background()==table->disabledBackStyle){
+ currentRow.append_attribute("disabled").set_value(true);
+ }
+
+ }
+}
+
+QRadioButton* MainWindow::getTextureRBCheckedTypeTexture()
+{
+ if(ui->rbBGR32->isChecked()){
+ return ui->rbBGR32;
+ }
+ else if(ui->rbBGRA32->isChecked()){
+ return ui->rbBGRA32;
+ }
+ else if(ui->rbBGR555->isChecked()){
+ return ui->rbBGR555;
+ }
+ else if(ui->rbBGRA5551->isChecked()){
+ return ui->rbBGRA5551;
+ }
+ else if(ui->rbBGRA444->isChecked()){
+ return ui->rbBGRA444;
+ }
+ else{ //dxt1 checked
+ return ui->rbDxt1;
+ }
+}
+
+QRadioButton* MainWindow::getTextureRBTypeTextureByName(const QString &texType)
+{
+ if(QString::compare(texType,ui->rbBGR32->text(),Qt::CaseSensitive)==0){
+ return ui->rbBGR32;
+ }
+ else if(QString::compare(texType,ui->rbBGRA32->text(),Qt::CaseSensitive)==0){
+ return ui->rbBGRA32;
+ }
+ else if(QString::compare(texType, ui->rbBGR555->text(),Qt::CaseSensitive)==0){
+ return ui->rbBGR555;
+ }
+ else if(QString::compare(texType,ui->rbBGRA5551->text(),Qt::CaseSensitive)==0){
+ return ui->rbBGRA5551;
+ }
+ else if(QString::compare(texType,ui->rbBGRA444->text(),Qt::CaseSensitive)==0){
+ return ui->rbBGRA444;
+ }
+ else{ //dxt1
+ return ui->rbDxt1;
+ }
+
+}
+
+void MainWindow::setVagoWindowTitle(){
+
+ QString vagoTitle = "Vago v"+GlobalVars::AppVersion + " - ";
+
+ if(this->lastProjectFilePath.isEmpty()){
+ vagoTitle += "Untitled";
+ }
+ else{
+ vagoTitle += Util::cutNameWithoutBackSlash(this->lastProjectFilePath);
+ }
+
+ if(this->unsavedChangesExist){
+ vagoTitle += "*";
+ }
+
+ setWindowTitle(vagoTitle);
+}
+
+DropTableWidget* MainWindow::getCurrentTableWidget(){
+
+ return getTableWidgetByTabName(ui->tabWidget->tabText(ui->tabWidget->currentIndex()));
+
+}
+
+DropTableWidget* MainWindow::getTableWidgetByTabName(const QString &tabName){
+
+ if(tabName.compare("XML",Qt::CaseSensitive)==0){ //case sentive is faster
+ return ui->twSourcesXML;
+ }
+ else if(tabName.compare("Textures",Qt::CaseSensitive)==0){
+ return ui->twSourcesTextures;
+ }
+ else if(tabName.compare("Characters",Qt::CaseSensitive)==0){
+ return ui->twSourcesCharacters;
+ }
+ else if(tabName.compare("Objects",Qt::CaseSensitive)==0){
+ return ui->twSourcesObjects;
+ }
+ else if(tabName.compare("Levels",Qt::CaseSensitive)==0){
+ return ui->twSourcesLevels;
+ }
+ else{
+ return ui->twSourcesMisc;
+ }
+
+}
+
+QString MainWindow::getCurrentTabName(){
+ return ui->tabWidget->tabText(ui->tabWidget->currentIndex());
+}
+
+QString MainWindow::getTabNameByTableWidget(DropTableWidget* table){
+
+ if(table == ui->twSourcesXML){
+ return ui->tabWidget->tabText(XMLTabIndex);
+ }
+ else if(table == ui->twSourcesTextures){
+ return ui->tabWidget->tabText(TexturesTabIndex);
+ }
+ else if(table == ui->twSourcesCharacters){
+ return ui->tabWidget->tabText(CharactersTabIndex);
+ }
+ else if(table == ui->twSourcesObjects){
+ return ui->tabWidget->tabText(ObjectsTabIndex);
+ }
+ else if(table == ui->twSourcesLevels){
+ return ui->tabWidget->tabText(LevelsTabIndex);
+ }
+ else{
+ return ui->tabWidget->tabText(MiscTabIndex);
+ }
+
+}
+
+QList MainWindow::getAllTableWidgets()
+{
+ QList tableWidgets;
+
+ tableWidgets << ui->twSourcesXML << ui->twSourcesTextures << ui->twSourcesCharacters
+ << ui->twSourcesObjects << ui->twSourcesLevels << ui->twSourcesMisc;
+
+ return tableWidgets;
+}
+
+void MainWindow::loadProjectState(const QString &filePath)
+{
+
+ this->projectIsLoading = true;
+
+ if(this->vagoSettings->value("AskSaveProject").toBool() && this->unsavedChangesExist){
+ QMessageBox::StandardButton result = askToSaveCurrentProject();
+ if(result == QMessageBox::StandardButton::Cancel){
+ this->projectIsLoading = false;
+ return;
+ }
+ }
+
+ QString statusError = "Couldn't load project.";
+
+ pugi::xml_document doc;
+
+ pugi::xml_parse_result result = doc.load_file(Util::qStrToCstr(filePath));
+
+ if(result.status!=pugi::status_ok){
+ UtilVago::showAndLogErrorPopUpLogButton(this->myLogger, "An error ocurred while loading project file.\n" + QString(result.description()));
+ showErrStatusMessage(statusError);
+ this->projectIsLoading = false;
+ return;
+ }
+
+
+ if(QString(doc.root().first_child().name()) != "VagoProject"){
+ UtilVago::showAndLogErrorPopUpLogButton(this->myLogger, QString(doc.root().name()) + "The file opened is not a valid VagoProject file. Load aborted.");
+ showErrStatusMessage(statusError);
+ this->projectIsLoading = false;
+ return;
+ }
+
+ QString projVagoVersion;
+
+ try{
+ projVagoVersion = QString(doc.select_node("/VagoProject/@vagoVersion").attribute().value());
+ }
+ catch (const pugi::xpath_exception& e)
+ {
+ UtilVago::showAndLogErrorPopUpLogButton(this->myLogger, "Couldn't find the vagoVersion of the current project. Load aborted.\n" + QString(e.what()));
+ showErrStatusMessage(statusError);
+ this->projectIsLoading = false;
+ return;
+ }
+
+ if(!projVagoVersion.startsWith(GlobalVars::LastCompatibleVersion)){
+ UtilVago::showAndLogErrorPopUpLogButton(this->myLogger, "The project that you are trying to load seems it is not compatible with your Vago Version. Please update Vago and try again.");
+ showErrStatusMessage(statusError);
+ this->projectIsLoading = false;
+ return;
+ }
+
+ // After the initial validations begin loading the project data
+
+ QList tableWidgets = getAllTableWidgets();
+
+ try{
+ foreach(DropTableWidget* const &myTable, tableWidgets){
+ loadProjectWidget(doc, myTable);
+ }
+ }
+ catch(const std::exception& e){
+ UtilVago::showAndLogErrorPopUpLogButton(this->myLogger, "Couldn't load the vago project. Error: " + QString(e.what()));
+ showErrStatusMessage(statusError);
+ this->projectIsLoading = false;
+ return;
+ }
+
+ this->vagoSettings->setValue("LastProjectPath",QFileInfo(filePath).absoluteDir().path());
+
+ this->lastProjectFilePath = filePath;
+ this->unsavedChangesExist = false;
+
+ addNewRecentProject(filePath);
+
+ setVagoWindowTitle();
+
+ this->projectIsLoading = false;
+
+ showSuccessStatusMessage("Project loaded sucessfully.");
+}
+
+
+void MainWindow::loadProjectWidget(pugi::xml_document &doc, DropTableWidget* table)
+{
+ QString tabName = getTabNameByTableWidget(table);
+ QString from (doc.select_node(Util::qStrToCstr("/VagoProject/"+tabName+"/@from")).attribute().value());
+ QString to (doc.select_node(Util::qStrToCstr("/VagoProject/"+tabName+"/@to")).attribute().value());
+
+ if(table==ui->twSourcesXML){
+ ui->cbFromXML->setCurrentText(from);
+ on_cbFromXML_currentIndexChanged(from);
+ ui->cbToXML->setCurrentText(to);
+ }
+ else if(table==ui->twSourcesTextures){
+ //ui->cbFromTextures->setCurrentText(from);
+ on_cbFromTextures_currentIndexChanged(from);
+ ui->cbToTextures->setCurrentText(to);
+
+ getTextureRBTypeTextureByName((doc.select_node(Util::qStrToCstr("/VagoProject/"+tabName+"/Options/@type")).attribute().value()))->setChecked(true);
+ ui->cbMipMapsTextures->setChecked(doc.select_node(Util::qStrToCstr("/VagoProject/"+tabName+"/Options/@genMipMaps")).attribute().as_bool());
+ ui->cbNoUwrap->setChecked(doc.select_node(Util::qStrToCstr("/VagoProject/"+tabName+"/Options/@noUwrap")).attribute().as_bool());
+ ui->cbNoVwrap->setChecked(doc.select_node(Util::qStrToCstr("/VagoProject/"+tabName+"/Options/@noVwrap")).attribute().as_bool());
+ ui->cbLarge->setChecked(doc.select_node(Util::qStrToCstr("/VagoProject/"+tabName+"/Options/@large")).attribute().as_bool());
+ ui->cbEnvMap->setChecked(doc.select_node(Util::qStrToCstr("/VagoProject/"+tabName+"/Options/@envMap")).attribute().as_bool());
+ ui->leEnvMapTexture->setText(QString(doc.select_node(Util::qStrToCstr("/VagoProject/"+tabName+"/Options/@envMapValue")).attribute().value()));
+ }
+ else if(table==ui->twSourcesCharacters){
+ ui->cbFromCharacters->setCurrentText(from);
+ on_cbFromCharacters_currentIndexChanged(from);
+ ui->cbToCharacters->setCurrentText(to);
+
+
+ ui->cbCellShading->setChecked(doc.select_node(Util::qStrToCstr("/VagoProject/"+tabName+"/Options/@cellShading")).attribute().as_bool());
+ ui->cbNormals->setChecked(doc.select_node(Util::qStrToCstr("/VagoProject/"+tabName+"/Options/@normals")).attribute().as_bool());
+ ui->cbWithTRBS_ONCC->setChecked(doc.select_node(Util::qStrToCstr("/VagoProject/"+tabName+"/Options/@extractTRBSONCC")).attribute().as_bool());
+ ui->leTRBS_ONCC->setText(QString(doc.select_node(Util::qStrToCstr("/VagoProject/"+tabName+"/Options/@extractTRBSONCCValue")).attribute().value()));
+ }
+ else if(table==ui->twSourcesObjects){
+ ui->cbFromObjects->setCurrentText(from);
+ on_cbFromObjects_currentIndexChanged(from);
+ ui->cbToObjects->setCurrentText(to);
+
+ ui->cbTexture->setChecked(doc.select_node(Util::qStrToCstr("/VagoProject/"+tabName+"/Options/@texture")).attribute().as_bool());
+ ui->leTextureName->setText(QString(doc.select_node(Util::qStrToCstr("/VagoProject/"+tabName+"/Options/@textureValue")).attribute().value()));
+ ui->cbWithAnimation->setChecked(doc.select_node(Util::qStrToCstr("/VagoProject/"+tabName+"/Options/@withAnimation")).attribute().as_bool());
+ ui->leAnimationName->setText(QString(doc.select_node(Util::qStrToCstr("/VagoProject/"+tabName+"/Options/@withAnimationValue")).attribute().value()));
+ }
+ else if(table==ui->twSourcesLevels){
+ ui->cbFromLevels->setCurrentText(from);
+ on_cbFromLevels_currentIndexChanged(from);
+ ui->cbToLevels->setCurrentText(to);
+
+ ui->cbSpecificFilesLevels->setChecked(doc.select_node(Util::qStrToCstr("/VagoProject/"+tabName+"/Options/@extractWithFiles")).attribute().as_bool());
+ ui->leSpecificFilesLevels->setText(QString(doc.select_node(Util::qStrToCstr("/VagoProject/"+tabName+"/Options/@extractWithFilesValue")).attribute().value()));
+ ui->cbDatLevels->setChecked(doc.select_node(Util::qStrToCstr("/VagoProject/"+tabName+"/Options/@datFilename")).attribute().as_bool());
+ ui->leTargetDatLevels->setText(QString(doc.select_node(Util::qStrToCstr("/VagoProject/"+tabName+"/Options/@datFilenameValue")).attribute().value()));
+ ui->cbBnvLevels->setChecked(doc.select_node(Util::qStrToCstr("/VagoProject/"+tabName+"/Options/@bnvSource")).attribute().as_bool());
+ ui->leBnvLevels->setText(QString(doc.select_node(Util::qStrToCstr("/VagoProject/"+tabName+"/Options/@bnvSourceValue")).attribute().value()));
+ ui->cbGridsLevels->setChecked(doc.select_node(Util::qStrToCstr("/VagoProject/"+tabName+"/Options/@generateGrids")).attribute().as_bool());
+ ui->cbAdditionalSourcesLevels->setChecked(doc.select_node(Util::qStrToCstr("/VagoProject/"+tabName+"/Options/@additionalSources")).attribute().as_bool());
+ ui->leAdditSourcesLevels->setText(QString(doc.select_node(Util::qStrToCstr("/VagoProject/"+tabName+"/Options/@additionalSourcesValue")).attribute().value()));
+ }
+ else{
+ ui->cbFromMisc->setCurrentText(from);
+ on_cbFromMisc_currentIndexChanged(from);
+ ui->cbToMisc->setCurrentText(to);
+ }
+
+ // Clean previous rows
+ clearTableNoPrompt(table);
+
+ for(const pugi::xpath_node &xPathNode : doc.select_nodes(Util::qStrToCstr("/VagoProject/"+tabName+"/Row"))){
+ pugi::xml_node currNode = xPathNode.node();
+
+ QString currFileFolder = currNode.attribute("fileFolder").value();
+ QString currFromTo = currNode.attribute("fromTo").value();
+ QString currCommand = currNode.attribute("command").value();
+
+ bool isToDisable = false;
+ pugi::xml_attribute disabledAttr = currNode.attribute("disabled");
+ isToDisable = disabledAttr.empty() ? false : disabledAttr.as_bool();
+
+ addRowTable(table,currFileFolder,currFromTo,currCommand, isToDisable);
+ }
+}
+
+void MainWindow::saveRecentProjects(){
+ for(int i=0; irecentProjectsList.size(); i++){
+ this->vagoSettings->setValue("RecentProject" + QString::number(i+1), recentProjectsList[i]);
+ }
+}
+
+void MainWindow::loadRecentProjects(){
+ for(int i=0; irecentProjectsMaxSize; i++){
+
+ QString currProj = this->vagoSettings->value("RecentProject" + QString::number(i+1)).toString();
+
+ if(!currProj.isEmpty()){
+ recentProjectsList.append(currProj);
+ }
+ else{
+ break;
+ }
+ }
+
+ reloadRecentProjectsMenu();
+
+}
+
+void MainWindow::addNewRecentProject(const QString &filePath){
+
+ // If the new project is equal to the last one simply ignore
+ if(filePath == this->vagoSettings->value("RecentProject1").toString()){
+ return;
+ }
+
+ // If the item already exists in our list remove it, so it can go to the top again
+ for(auto it = this->recentProjectsList.begin(); it != this->recentProjectsList.end();){
+ if(*it == filePath){
+ it = this->recentProjectsList.erase(it);
+ }
+ else{
+ it++;
+ }
+ }
+
+ // if we gonna overflow our list, remove the older item to reserve space to the new one
+ if(this->recentProjectsList.size()==this->recentProjectsMaxSize){
+ this->recentProjectsList.removeLast();
+ }
+
+ this->vagoSettings->setValue("LastProjectPath",QFileInfo(filePath).absoluteDir().path());
+
+ // add new recent file
+ this->recentProjectsList.prepend(filePath);
+
+ reloadRecentProjectsMenu();
+
+ saveRecentProjects();
+}
+
+void MainWindow::reloadRecentProjectsMenu(){
+
+ ui->menuRecent_Projects->setEnabled(false);
+ ui->actionProject1->setVisible(false);
+ ui->actionProject2->setVisible(false);
+ ui->actionProject3->setVisible(false);
+ ui->actionProject4->setVisible(false);
+ ui->actionProject5->setVisible(false);
+
+ {
+ QList::const_iterator it;
+ int i;
+ for(it = recentProjectsList.cbegin(), i=0; it != recentProjectsList.cend(); it++, i++){
+
+ QAction* currAction = nullptr;
+
+ switch (i){
+ case 0:
+ currAction = ui->actionProject1;
+ break;
+ case 1:
+ currAction = ui->actionProject2;
+ break;
+ case 2:
+ currAction = ui->actionProject3;
+ break;
+ case 3:
+ currAction = ui->actionProject4;
+ break;
+ case 4:
+ currAction = ui->actionProject5;
+ break;
+ }
+
+ if(currAction){
+ ui->menuRecent_Projects->setEnabled(true);
+ currAction->setText(*it);
+ currAction->setVisible(true);
+ }
+ }
+ }
+
+}
Index: s10k/Vago/mainwindow.h
===================================================================
--- s10k/Vago/mainwindow.h (revision 1092)
+++ s10k/Vago/mainwindow.h (revision 1092)
@@ -0,0 +1,292 @@
+#ifndef MAINWINDOW_H
+#define MAINWINDOW_H
+
+#include "utilvago.h"
+#include "preferences.h"
+#include "manualcommands.h"
+#include "about.h"
+#include "packagewizard.h"
+#include "soundwizard.h"
+#include "bgimagewizard.h"
+#include "wmwizard.h"
+#include "converter.h"
+#include "xmltoolsinterface.h"
+#include "wizardfactory.h"
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#ifdef Q_OS_WIN
+#include
+#include
+#endif
+
+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 applicationWasLoaded();
+
+ 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_pbAddSourceXML_clicked();
+
+ void on_pbConvert_clicked();
+
+ void TsetupProgressBar(int max);
+
+ void TupdateProgressBar();
+
+ void TresultConversion(QString result, int numErrors);
+
+ void TconversionAborted();
+
+ void on_actionWindows_triggered();
+
+ void on_actionMac_Windows_demo_triggered();
+
+ void on_pbClearSourcesXML_clicked();
+
+ void on_pbRemoveSourceXML_clicked();
+
+ void on_pbAddSourceTextures_clicked();
+
+ void on_pbRemoveSourceTextures_clicked();
+
+ void on_pbClearSourcesTextures_clicked();
+
+ void on_cbFromTextures_currentIndexChanged(const QString &arg1);
+
+ void on_cbFromObjects_currentIndexChanged(const QString &arg1);
+
+ void on_cbFromLevels_currentIndexChanged(const QString &arg1);
+
+ void on_cbFromMisc_currentIndexChanged(const QString &arg1);
+
+ void on_pbAddSourceObjects_clicked();
+
+ void on_pbAddSourceLevels_clicked();
+
+ void on_pbAddSourceMisc_clicked();
+
+ void on_pbRemoveSourceObjects_clicked();
+
+ void on_pbRemoveSourceLevels_clicked();
+
+ void on_pbRemoveSourceMisc_clicked();
+
+ void on_pbClearSourcesObjects_clicked();
+
+ void on_pbClearSourcesLevels_clicked();
+
+ void on_pbClearSourcesMisc_clicked();
+
+ void on_actionPreferences_triggered();
+
+ void on_cbToLevels_currentIndexChanged(const QString &arg1);
+
+ 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 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_actionAE_Package_Creator_triggered();
+
+ void on_cbFromCharacters_currentIndexChanged(const QString &arg1);
+
+ void on_pbAddSourceCharacters_clicked();
+
+ void on_pbRemoveSourceCharacters_clicked();
+
+ void on_pbClearSourcesCharacters_clicked();
+
+ void on_actionSound_Wizard_triggered();
+
+ void on_actionCheck_xmlTools_version_triggered();
+
+ void on_actionOpen_AE_folder_triggered();
+
+ void on_cbWithTRBS_ONCC_toggled(bool checked);
+
+ void on_cbWithAnimation_toggled(bool checked);
+
+ void on_cbFromXML_currentIndexChanged(const QString &arg1);
+
+ void on_cbSpecificFilesLevels_toggled(bool checked);
+
+ void on_tbAbortConversion_clicked();
+
+ void on_tabWidget_currentChanged(int);
+
+ void on_actionSave_Project_triggered();
+
+ void on_actionSave_triggered();
+
+ void on_actionLoad_Project_triggered();
+
+ void on_actionProject1_triggered();
+
+ void on_actionProject2_triggered();
+
+ void on_actionProject3_triggered();
+
+ void on_actionProject4_triggered();
+
+ void on_actionProject5_triggered();
+
+ void on_actionBackground_Image_Wizard_triggered();
+
+ void on_actionNew_Project_triggered();
+
+ void on_tbXmlToolsInterface_clicked();
+
+ void on_actionWindow_Messages_Wizard_triggered();
+
+private:
+ Ui::MainWindow *ui;
+ Logger *myLogger;
+ QString workspaceLocation; //Workspace location
+ QString workspaceWizardsLocation; //Workspace wizard location
+ QString outputFolder; //Output folder
+ QString AeLocation; //Workspace location
+ QString lastProjectFilePath;
+ int startedWindowWidth;
+ int startedWindowHeight;
+#ifdef Q_OS_MAC
+ bool useYesAsDefaultWhenRemovingItems;
+#endif
+ QLabel *itemsLoaded;
+ QProgressBar *myBar; //Progress Bar
+ QHash commandMap; //Map the commands for fast retreive
+ QStringList listToProccess; //items to proccess
+ Converter *myConverter = nullptr;
+ QSettings *vagoSettings;
+ static const QString VagoSettingsName;
+ static constexpr int recentProjectsMaxSize=5;
+ QList recentProjectsList;
+#ifdef Q_OS_WIN
+ // These are deleted automatically by the window (since button is attached to it)
+ QWinTaskbarProgress *win7TaskBarProgress;
+ QWinTaskbarButton *win7TaskBarButton;
+#endif
+ bool unsavedChangesExist = false;
+ // Indicates that the application is fully loaded which includes painting the main window
+ bool applicationIsFullyLoaded = false;
+ // This variable indicates that we have a project being loaded. It should only be set by MainWindow thread.
+ // It allow us to ignore certain gui slots like when checking checkbox that ask the user for input
+ bool projectIsLoading = false;
+
+ // anonymous enum
+ enum {XMLTabIndex, TexturesTabIndex, CharactersTabIndex, ObjectsTabIndex, LevelsTabIndex, MiscTabIndex};
+
+ void connectSlots();
+ void showErrStatusMessage(QString message);
+ void showSuccessStatusMessage(QString message);
+ void mapCommands();
+ void addRowTable(DropTableWidget *myTable, QString file, QString fromTo, QString command, bool isToDisabled=false);
+ void clearTableContents(DropTableWidget *myTable);
+ void clearTableNoPrompt(DropTableWidget *myTable);
+ void removeTableContents(DropTableWidget *myTable);
+ void updateComboBox(const QString &arg1, QComboBox *comboBox);
+ void startConversion();
+ 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);
+ void setConverterButtonsSize();
+ void saveProjectState(const QString &filePath);
+ void saveProjectWidget(pugi::xml_node &rootNode, DropTableWidget* table);
+ void loadProjectState(const QString &filePath);
+ void setVagoWindowTitle();
+ void loadProjectWidget(pugi::xml_document &doc, DropTableWidget* table);
+ void saveRecentProjects();
+ void loadRecentProjects();
+ void addNewRecentProject(const QString &filePath);
+ void reloadRecentProjectsMenu();
+ void showEvent(QShowEvent *e);
+ void rowsWereChangedInDropTableWidget();
+ QString getFileOutputFolder(QString fromTo, QString myOutputFolder="");
+ QString fileParsingXML(QString tabTitle, QString myOutputFolder, QString from, QString to , QString file);
+ QString fileParsingTextures(QString tabTitle, QString myOutputFolder, QString from, QString to , QString file);
+ QString fileParsingObjects(QString tabTitle, QString myOutputFolder, QString from, QString to , QString file);
+ QString fileParsingCharacters(QString tabTitle, QString myOutputFolder, QString from, QString to , QString file);
+ QString fileParsingLevels(QString tabTitle, 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
+ QString getOSIndependentAppPath();
+ QString getTabNameByTableWidget(DropTableWidget* table);
+ QString getCurrentTabName();
+ QRadioButton* getTextureRBCheckedTypeTexture();
+ QRadioButton *getTextureRBTypeTextureByName(const QString &texType);
+ DropTableWidget *getCurrentTableWidget();
+ DropTableWidget* getTableWidgetByTabName(const QString &tabName);
+ QList getAllTableWidgets();
+ QMessageBox::StandardButton askToSaveCurrentProject();
+
+signals:
+ void terminateCurrProcess();
+ void signalAppIsLoaded();
+};
+
+#endif // MAINWINDOW_H
Index: s10k/Vago/mainwindow.ui
===================================================================
--- s10k/Vago/mainwindow.ui (revision 1092)
+++ s10k/Vago/mainwindow.ui (revision 1092)
@@ -0,0 +1,1710 @@
+
+
+ MainWindow
+
+
+
+ 0
+ 0
+ 800
+ 600
+
+
+
+ Vago
+
+
+
+ :/new/icons/vago_icon.png:/new/icons/vago_icon.png
+
+
+
+ -
+
+
-
+
+
+ Abort current conversion
+
+
+
+
+
+
+ :/new/icons/abort.png:/new/icons/abort.png
+
+
+ true
+
+
+
+ -
+
+
+ Open Vago workspace
+
+
+ ...
+
+
+
+ :/new/icons/folder_icon.png:/new/icons/folder_icon.png
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 20
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+
+
+
+
+ -
+
+
+ XmlTools Interface
+
+
+ ...
+
+
+
+ :/new/icons/xmltoolsinterface.png:/new/icons/xmltoolsinterface.png
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 20
+ 0
+
+
+
+
+
+
+
+ -
+
+
+ Manual Tools Commands
+
+
+ ...
+
+
+
+ :/new/icons/command_icon.png:/new/icons/command_icon.png
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 20
+ 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
+
+
+
+ XML
+
+
+
-
+
+
-
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ From
+
+
+
+ -
+
+
-
+
+ ONI
+
+
+ -
+
+ XML
+
+
+
+
+
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ To
+
+
+
+ -
+
+
-
+
+ XML
+
+
+
+
+
+
+
+
+ -
+
+
-
+
+
+ Sources
+
+
+
-
+
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ Add
+
+
+
+ -
+
+
+ Remove
+
+
+
+ -
+
+
+ Clear
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Textures
+
+
+ -
+
+
-
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ From
+
+
+
+ -
+
+
-
+
+ DAT / TXMP ONI
+
+
+ -
+
+ TGA / DDS / PNG / JPG
+
+
+
+
+
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ To
+
+
+
+ -
+
+
-
+
+ TGA
+
+
+ -
+
+ DDS
+
+
+ -
+
+ PNG
+
+
+ -
+
+ JPG
+
+
+
+
+
+
+
+
+ -
+
+
+ Sources
+
+
+
-
+
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ Add
+
+
+
+ -
+
+
+ Remove
+
+
+
+ -
+
+
+ Clear
+
+
+
+
+
+
+
+
+ -
+
+
+ false
+
+
+ Options
+
+
+
-
+
+
-
+
+
-
+
+
+ BGR32
+
+
+ true
+
+
+
+ -
+
+
+ BGRA32
+
+
+
+ -
+
+
+ BGR555
+
+
+
+ -
+
+
+ BGRA5551
+
+
+
+ -
+
+
+ BGRA444
+
+
+
+ -
+
+
+ dxt1
+
+
+
+
+
+ -
+
+
-
+
+
+ GenMipMaps
+
+
+ true
+
+
+
+ -
+
+
+ NoUwrap
+
+
+
+ -
+
+
+ NoVwrap
+
+
+
+ -
+
+
+ Large
+
+
+
+ -
+
+
+ Used for reflection in armors. The armor texture has an alpha channel which is transparent and the envmap texture is shown.
+It's the name of a TXMP.oni file, don't include the extension.
+
+
+ EnvMap:
+
+
+
+ -
+
+
+ false
+
+
+ Used for reflection in armors. The armor texture has an alpha channel which is transparent and the envmap texture is shown.
+It's the name of a TXMP.oni file, don't include the extension.
+
+
+ EnvMap texture name
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Characters
+
+
+ -
+
+
-
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ From
+
+
+
+ -
+
+
-
+
+ TRBS / ONCC ONI
+
+
+ -
+
+ TRBS XML
+
+
+ -
+
+ TRBS DAE
+
+
+ -
+
+ TRAM ONI
+
+
+ -
+
+ FILM DAT
+
+
+
+
+
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ To
+
+
+
+ -
+
+
-
+
+ DAE
+
+
+
+
+
+
+
+
+ -
+
+
+ Sources
+
+
+
-
+
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ Add
+
+
+
+ -
+
+
+ Remove
+
+
+
+ -
+
+
+ Clear
+
+
+
+
+
+
+
+
+ -
+
+
+ Options
+
+
+
-
+
+
+ false
+
+
+ Cell Shading
+
+
+
+ -
+
+
+ false
+
+
+ Normals
+
+
+
+ -
+
+
+ false
+
+
+ Extract a TRAM (animation) with character's TRBS / ONCC
+For example extract a Muro's TRAM with Konoko's ONCC
+(input the full path for the TRBS / ONCC.oni file)
+
+
+ Extract with TRBS / ONCC:
+
+
+
+ -
+
+
+ false
+
+
+ Extract a TRAM (animation) with character's TRBS / ONCC
+For example extract a Muro's TRAM with Konoko's ONCC
+(input the full path for the TRBS / ONCC.oni file)
+
+
+ Full path to TRBS / ONCC.oni source file
+
+
+
+
+
+
+
+
+
+
+ Objects
+
+
+ -
+
+
-
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ From
+
+
+
+ -
+
+
-
+
+ M3GM ONI
+
+
+ -
+
+ ONWC ONI
+
+
+ -
+
+ OBAN ONI (cam)
+
+
+ -
+
+ OBJ
+
+
+
+
+
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ To
+
+
+
+ -
+
+
-
+
+ OBJ
+
+
+ -
+
+ DAE
+
+
+
+
+
+
+
+
+ -
+
+
+ Sources
+
+
+
-
+
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ Add
+
+
+
+ -
+
+
+ Remove
+
+
+
+ -
+
+
+ Clear
+
+
+
+
+
+
+
+
+ -
+
+
+ Options
+
+
+
-
+
+
+ false
+
+
+ Give model a texture.
+It's the name of a TXMP.oni file, don't include the extension.
+
+
+ Texture:
+
+
+
+ -
+
+
+ false
+
+
+ Give model a texture.
+It's the name of a TXMP.oni file, don't include the extension.
+
+
+ TXMP.oni source file
+
+
+ Texture name
+
+
+
+ -
+
+
+ true
+
+
+ Give model a texture.
+It's the name of a TXMP.oni file, don't include the extension.
+
+
+ With Animation:
+
+
+
+ -
+
+
+ false
+
+
+ Give model a texture.
+It's the name of a TXMP.oni file, don't include the extension.
+
+
+ OBAN.oni source file
+
+
+
+
+
+
+
+
+
+
+ Levels
+
+
+ -
+
+
-
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ From
+
+
+
+ -
+
+
-
+
+ DAT
+
+
+ -
+
+ ONI FILES
+
+
+ -
+
+ MASTER XML
+
+
+ -
+
+ AKEV ONI
+
+
+ -
+
+ DAE
+
+
+
+
+
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ To
+
+
+
+ -
+
+
-
+
+ ONI FILES
+
+
+
+
+
+
+
+
+ -
+
+
+ Sources
+
+
+
-
+
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ Add
+
+
+
+ -
+
+
+ Remove
+
+
+
+ -
+
+
+ Clear
+
+
+
+
+
+
+
+
+ -
+
+
+ true
+
+
+ Options
+
+
+
-
+
+
-
+
+
+ true
+
+
+
+ 122
+ 0
+
+
+
+ Extract specific files oni files from the DAT file
+
+Example of input:
+AKEVEnvWarehouse
+This will extract only the file AKEVEnvWarehouse.oni from the dat.
+
+You can extract multiple files using wildcards e.g.:
+M3GM*
+This will extract all files which begin with M3GM.
+
+
+ Extract specific files:
+
+
+
+ -
+
+
+ false
+
+
+ Extract specific files oni files from the DAT file
+
+Example of input:
+AKEVEnvWarehouse
+This will extract only the file AKEVEnvWarehouse.oni from the dat.
+
+You can extract multiple files using wildcards e.g.:
+M3GM*
+This will extract all files which begin with M3GM.
+
+
+
+
+
+ Pattern to file or files (e.g. AKEVEnvWarehouse)
+
+
+
+
+
+ -
+
+
-
+
+
+ false
+
+
+
+ 122
+ 0
+
+
+
+ DAT Filename:
+
+
+
+ -
+
+
+ false
+
+
+ Custom .dat level filename
+
+
+
+ -
+
+
+ false
+
+
+ Bnv Source:
+
+
+
+ -
+
+
+ false
+
+
+ Bnv .dae source file
+
+
+
+ -
+
+
+ false
+
+
+ Generate pathfinding grids (master xml generates them automatically). Needs Bnv source.
+
+
+ Generate Grids
+
+
+
+
+
+ -
+
+
-
+
+
+ false
+
+
+
+ 122
+ 0
+
+
+
+ Additional Sources:
+
+
+
+ -
+
+
+ false
+
+
+ Use ";" as separator for each file
+
+
+ Additional .dae sources for akev (e.g. env_markers.dae)
+
+
+
+
+
+
+
+
+
+
+
+
+ Misc
+
+
+ -
+
+
-
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ From
+
+
+
+ -
+
+
-
+
+ DAT / SNDD ONI
+
+
+ -
+
+ DAT / SUBT ONI
+
+
+ -
+
+ WAV / AIF
+
+
+ -
+
+ TXT
+
+
+
+
+
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ To
+
+
+
+ -
+
+
-
+
+ WAV
+
+
+ -
+
+ AIF
+
+
+
+
+
+
+
+
+ -
+
+
+ Sources
+
+
+
-
+
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ Add
+
+
+
+ -
+
+
+ Remove
+
+
+
+ -
+
+
+ Clear
+
+
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ -
+
+
+
+ 0
+ 30
+
+
+
+ Convert the sources above
+
+
+ Convert
+
+
+ Ctrl+Return
+
+
+
+
+
+
+
+
+ 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
+
+
+
+
+ Open AE folder
+
+
+
+
+ Save Project As...
+
+
+
+
+ Load Project...
+
+
+ Load Project...
+
+
+ Load Project...
+
+
+
+
+ true
+
+
+ Save Project
+
+
+ Ctrl+S
+
+
+
+
+ Placeholder1
+
+
+
+
+ Project1
+
+
+
+
+ Project2
+
+
+
+
+ Project3
+
+
+
+
+ Project4
+
+
+
+
+ Project5
+
+
+
+
+
+ :/new/icons/background_image.png:/new/icons/background_image.png
+
+
+ Background Image Wizard
+
+
+
+
+ New Project
+
+
+ Ctrl+N
+
+
+
+
+
+ :/new/icons/xmltoolsinterface.png:/new/icons/xmltoolsinterface.png
+
+
+ XmlTools Interface
+
+
+
+
+
+ :/new/icons/windowmessages.png:/new/icons/windowmessages.png
+
+
+ Window Messages Wizard
+
+
+
+
+
+
+ DropTableWidget
+ QTableWidget
+
+
+
+ DropLineEdit
+ QLineEdit
+
+
+
+
+
+
+
+
Index: s10k/Vago/manualcommands.cpp
===================================================================
--- s10k/Vago/manualcommands.cpp (revision 1092)
+++ s10k/Vago/manualcommands.cpp (revision 1092)
@@ -0,0 +1,171 @@
+#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);
+ this->myProcess->setWorkingDirectory(UtilVago::getAppPath());
+ 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 toolExecutable;
+
+ if(ui->cbTargetTool->currentText() == "OniSplit"){
+ toolExecutable = UtilVago::getOniSplitExecutable();
+ }
+ else{
+ toolExecutable = UtilVago::getXmlToolsExecutable();
+ }
+
+ 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(toolExecutable+" "+ui->leManualCommand->text());
+ this->myProcess->waitForFinished(120000); //wait 2 minutes at maximum
+ ui->ptOutput->appendPlainText("> " + ui->cbTargetTool->currentText() + " " + 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: s10k/Vago/manualcommands.h
===================================================================
--- s10k/Vago/manualcommands.h (revision 1092)
+++ s10k/Vago/manualcommands.h (revision 1092)
@@ -0,0 +1,44 @@
+#ifndef MANUALCOMMANDS_H
+#define MANUALCOMMANDS_H
+
+#include
+#include
+#include
+#include
+
+#include "utilvago.h"
+
+
+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: s10k/Vago/manualcommands.ui
===================================================================
--- s10k/Vago/manualcommands.ui (revision 1092)
+++ s10k/Vago/manualcommands.ui (revision 1092)
@@ -0,0 +1,182 @@
+
+
+ ManualCommands
+
+
+
+ 0
+ 0
+ 640
+ 480
+
+
+
+ Manual Tools Commands
+
+
+
+ :/new/icons/command_icon.png:/new/icons/command_icon.png
+
+
+
+ -
+
+
+ Input
+
+
+
-
+
+
+ Target Tool:
+
+
+
+ -
+
+
-
+
+ OniSplit
+
+
+ -
+
+ XmlTools
+
+
+
+
+ -
+
+
-
+
+
+ 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: s10k/Vago/packageWizard/packagepage2.cpp
===================================================================
--- s10k/Vago/packageWizard/packagepage2.cpp (revision 1092)
+++ s10k/Vago/packageWizard/packagepage2.cpp (revision 1092)
@@ -0,0 +1,191 @@
+#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);
+
+ ui->lbFieldsReadOnly->setText("* Fields read only by AEI2 when the package "
+ "isn't at the mod depot."); // Don't use rich text in qtdesigner because it generates platform dependent code
+ QString htmlAsterisk="*";
+ ui->lbAsteriscAuthors->setText(htmlAsterisk);
+ ui->lbAsteriscModName->setText(htmlAsterisk);
+ ui->lbAsteriscVersion->setText(htmlAsterisk);
+ ui->lbAsteriscDescription->setText(htmlAsterisk);
+}
+
+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 numeric characters.");
+ return;
+ }
+
+ if(Util::isStringInteger(number)){
+
+ bool necessaryToRedownload=false;
+
+ QFile file(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)
+ }
+
+ 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(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)){
+ UtilVago::showAndLogErrorPopUp(this->myLogger, "Error fetching package data: creating cache file.");
+ return;
+ }
+ file.write(result->readAll());
+ file.close();
+
+ //Let's extract the cache data
+ if(JlCompress::extractFile(GlobalVars::VagoTemporaryDir+"/"+this->ZipCacheFile, "/"+this->CacheFile ,GlobalVars::VagoTemporaryDir+"/"+this->CacheFile).isEmpty()){
+ UtilVago::showAndLogErrorPopUp(this->myLogger, "An error occurred while unzipping the package data.");
+ }
+
+ checkForPackagesInCache();
+
+ }
+ else{
+ UtilVago::showAndLogErrorPopUpLogButton(this->myLogger, "An error occurred checking number availability:\n\n"+result->errorString());
+ }
+
+ result->deleteLater();
+}
+
+void PackagePage2::checkForPackagesInCache(){
+ QString packageNumber=ui->lePackageNumber->text();
+
+ QFile file(GlobalVars::VagoTemporaryDir+"/"+this->CacheFile); //let's read the chache unzipped
+ if(!file.open(QIODevice::ReadOnly)){
+ UtilVago::showAndLogErrorPopUp(this->myLogger, "Error reading downloaded package cache data.");
+ 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("It seems that the package number " + packageNumber + " is not being used yet! :)");
+ }
+}
+
+void PackagePage2::on_cbType_currentIndexChanged(int index)
+{
+ ui->lePackageNumber->setText(QString().setNum(index+1)+"XXXX");
+}
Index: s10k/Vago/packageWizard/packagepage2.h
===================================================================
--- s10k/Vago/packageWizard/packagepage2.h (revision 1092)
+++ s10k/Vago/packageWizard/packagepage2.h (revision 1092)
@@ -0,0 +1,43 @@
+#ifndef PACKAGEPAGE2_H
+#define PACKAGEPAGE2_H
+
+#include "utilvago.h"
+
+#include
+#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 checkForPackagesInCache();
+};
+
+#endif // PACKAGEPAGE2_H
Index: s10k/Vago/packageWizard/packagepage2.ui
===================================================================
--- s10k/Vago/packageWizard/packagepage2.ui (revision 1092)
+++ s10k/Vago/packageWizard/packagepage2.ui (revision 1092)
@@ -0,0 +1,266 @@
+
+
+ PackagePage2
+
+
+
+ 0
+ 0
+ 451
+ 398
+
+
+
+
+ 0
+ 0
+
+
+
+ WizardPage
+
+
+ -
+
+
+ Mod Name:
+
+
+
+ -
+
+
-
+
+
+ -
+
+
+ <html><span style="color:#0000ff;">*</span></html>
+
+
+
+
+
+ -
+
+
+ Author(s):
+
+
+
+ -
+
+
-
+
+
+ -
+
+
+ <html><span style="color:#0000ff;">*</span></html>
+
+
+
+
+
+ -
+
+
+ Version:
+
+
+
+ -
+
+
-
+
+
+ -
+
+
+ <html><span style="color:#0000ff;">*</span></html>
+
+
+
+
+
+ -
+
+
+ Description:
+
+
+
+ -
+
+
-
+
+
+
+ 16777215
+ 100
+
+
+
+
+ -
+
+
+ <html><span style="color:#0000ff;">*</span></html>
+
+
+
+
+
+ -
+
+
+ Type:
+
+
+
+ -
+
+
-
+
+ Weapons
+
+
+ -
+
+ Characters
+
+
+ -
+
+ Particles
+
+
+ -
+
+ Animations (non-combat)
+
+
+ -
+
+ Animations (combat)
+
+
+ -
+
+ Sounds
+
+
+ -
+
+ User Interface
+
+
+ -
+
+ New Levels
+
+
+ -
+
+ Scenarios
+
+
+
+
+ -
+
+
+ Package Number:
+
+
+
+ -
+
+
-
+
+
+ 1XXXX
+
+
+
+ -
+
+
+ Check if the current number is available using a online database
+
+
+ Check
+
+
+
+
+
+ -
+
+
+ Scripts:
+
+
+
+ -
+
+
-
+
+
+ The Installer considers your mod a scenario and takes steps to exclude other BSL scenario mods from being installed for the same level
+
+
+ Replace
+
+
+ true
+
+
+
+ -
+
+
+ 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)
+
+
+ Add
+
+
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+ QSizePolicy::Expanding
+
+
+
+ 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=" color:#0000ff;">* Edit this text in packagepage2.cpp</span></p></body></html>
+
+
+ true
+
+
+
+
+
+
+
+
Index: s10k/Vago/packageWizard/packagepage3.cpp
===================================================================
--- s10k/Vago/packageWizard/packagepage3.cpp (revision 1092)
+++ s10k/Vago/packageWizard/packagepage3.cpp (revision 1092)
@@ -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: s10k/Vago/packageWizard/packagepage3.ui
===================================================================
--- s10k/Vago/packageWizard/packagepage3.ui (revision 1092)
+++ s10k/Vago/packageWizard/packagepage3.ui (revision 1092)
@@ -0,0 +1,72 @@
+
+
+ PackagePage3
+
+
+
+ 0
+ 0
+ 364
+ 113
+
+
+
+ WizardPage
+
+
+ -
+
+
+ Fill with the packages number which this package will depend
+
+
+ Dependent Packages:
+
+
+
+ -
+
+
+ Fill with the packages number which this package will depend
+
+
+
+ -
+
+
+ Fill with the packages number that will conflict with this package
+
+
+ Incompatible Packages:
+
+
+
+ -
+
+
+ Fill with the packages number that will conflict with this package
+
+
+
+ -
+
+
+ If this package use new levels, specify its number to get them unlocked automatically
+
+
+ Unlock Levels:
+
+
+
+ -
+
+
+ If this package use new levels, specify its number to get them unlocked automatically
+
+
+
+
+
+
+
+
Index: s10k/Vago/packageWizard/packagepage4.cpp
===================================================================
--- s10k/Vago/packageWizard/packagepage4.cpp (revision 1092)
+++ s10k/Vago/packageWizard/packagepage4.cpp (revision 1092)
@@ -0,0 +1,173 @@
+#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 the resources to the corresponding platform 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");
+
+ ui->lbCommon->setText("Common"); // Don't use rich text in qtdesigner because it generates platform dependent code
+ ui->lbWindowsOnly->setText("Windows Only");
+ ui->lbMacOnly->setText("Mac OS Only");
+
+
+
+ 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: s10k/Vago/packageWizard/packagepage4.h
===================================================================
--- s10k/Vago/packageWizard/packagepage4.h (revision 1092)
+++ s10k/Vago/packageWizard/packagepage4.h (revision 1092)
@@ -0,0 +1,46 @@
+#ifndef PACKAGEPAGE4_H
+#define PACKAGEPAGE4_H
+
+#include
+#include
+
+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: s10k/Vago/packageWizard/packagepage4.ui
===================================================================
--- s10k/Vago/packageWizard/packagepage4.ui (revision 1092)
+++ s10k/Vago/packageWizard/packagepage4.ui (revision 1092)
@@ -0,0 +1,195 @@
+
+
+ PackagePage4
+
+
+
+ 0
+ 0
+ 413
+ 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-weight:600;">Common [edit this text in packagepage4.cpp]</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
+
+
+
+
+
+
+
+
+
+ -
+
+
-
+
+
-
+
+
+ <html><b>Windows Only</b></html>
+
+
+
+ -
+
+
-
+
+
+ -
+
+
-
+
+
+ ...
+
+
+
+ :/new/icons/plus.png:/new/icons/plus.png
+
+
+
+ -
+
+
+ ...
+
+
+
+ :/new/icons/minus.png:/new/icons/minus.png
+
+
+
+
+
+
+
+
+
+ -
+
+
-
+
+
+ <html><b>Mac OS Only</b></html>
+
+
+
+
+ -
+
+
-
+
+
+ -
+
+
-
+
+
+ ...
+
+
+
+ :/new/icons/plus.png:/new/icons/plus.png
+
+
+
+ -
+
+
+ ...
+
+
+
+ :/new/icons/minus.png:/new/icons/minus.png
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ DropTableWidget
+ QTableWidget
+
+
+
+
+
+
+
+
Index: s10k/Vago/packageWizard/packagepagefinal.cpp
===================================================================
--- s10k/Vago/packageWizard/packagepagefinal.cpp (revision 1092)
+++ s10k/Vago/packageWizard/packagepagefinal.cpp (revision 1092)
@@ -0,0 +1,37 @@
+#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");
+
+ ui->lbComplete->setText(""
+ "The wizard is now complete. The package will be created when you click in finish.
"
+ "After that you can upload the package to "
+ +GlobalVars::ModsDomain+" to get your mod listed in the AEI."
+ ""); // Don't use rich text in qtdesigner because it generates platform dependent code
+
+ 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: s10k/Vago/packageWizard/packagepagefinal.h
===================================================================
--- s10k/Vago/packageWizard/packagepagefinal.h (revision 1092)
+++ s10k/Vago/packageWizard/packagepagefinal.h (revision 1092)
@@ -0,0 +1,25 @@
+#ifndef PACKAGEPAGEFINAL_H
+#define PACKAGEPAGEFINAL_H
+
+#include "utilvago.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: s10k/Vago/packageWizard/packagepagefinal.ui
===================================================================
--- s10k/Vago/packageWizard/packagepagefinal.ui (revision 1092)
+++ s10k/Vago/packageWizard/packagepagefinal.ui (revision 1092)
@@ -0,0 +1,70 @@
+
+
+ PackagePageFinal
+
+
+
+ 0
+ 0
+ 595
+ 300
+
+
+
+ WizardPage
+
+
+ -
+
+
+ The wizard is now complete. Edit this text in packagepagefinal.cpp
+
+
+ true
+
+
+
+ -
+
+
+ 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: s10k/Vago/packageWizard/packagewizard.cpp
===================================================================
--- s10k/Vago/packageWizard/packagewizard.cpp (revision 1092)
+++ s10k/Vago/packageWizard/packagewizard.cpp (revision 1092)
@@ -0,0 +1,179 @@
+#include "packagewizard.h"
+
+PackageWizard::PackageWizard(const QString &appDir, QString workspaceWizardLocation, QSettings *vagoSettings, Logger *myLogger)
+ :AbstractWizard(appDir, workspaceWizardLocation, vagoSettings, myLogger, false)
+{
+ this->packagesLocation=this->workspaceWizardLocation+"/Packages";
+}
+
+void PackageWizard::exec(){
+ PackagePage2 *page2 = new PackagePage2(this->myLogger);
+ PackagePage3 *page3 = new PackagePage3();
+ PackagePage4 *page4 = new PackagePage4();
+ this->page4Pointer = page4; // save the pointer in class variable
+ PackagePageFinal *pageFinal = new PackagePageFinal(this->vagoSettings);
+
+ myWizard.addPage(
+ createIntroPage(
+ "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."
+ )
+ );
+ myWizard.addPage(page2);
+ myWizard.addPage(page3);
+ myWizard.addPage(page4);
+ myWizard.addPage(pageFinal);
+
+ showWizard("AIE2 Package Creator", ":/new/icons/package.png");
+}
+
+
+void PackageWizard::createPackage(){
+ const QString aeVersion="2.0";
+
+ //Get info page 2
+ QString modName=this->myWizard.field("leModName").toString();
+ QString authors=this->myWizard.field("leAuthors").toString();
+ QString version=this->myWizard.field("leVersion").toString();
+ QString description=this->myWizard.field("ptDescription").toString();
+ QString packageNumber=this->myWizard.field("lePackageNumber").toString();
+ bool bslReplace=this->myWizard.field("rbReplace").toBool();
+
+ //Get info page 3
+ QString dependentPackages=this->myWizard.field("leDependentPackages").toString();
+ QString incompatiblePackages=this->myWizard.field("leIncompatiblePackages").toString();
+ QString unlockLevels=this->myWizard.field("leUnlockLevels").toString();
+
+ //Get info page 4
+ const DropTableWidget *commonTable=this->page4Pointer->commonTable;
+ const DropTableWidget *windowsTable=this->page4Pointer->windowsTable;
+ const DropTableWidget *macTable=this->page4Pointer->macTable;
+
+ //Get info from final page
+ bool openFolder=this->myWizard.field("cbOpenFolder").toBool();
+ bool createZip=this->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(modDir+"Mod_Info.cfg");
+
+ if (!modInfo.open(QIODevice::WriteOnly | QIODevice::Text)){ //open to write
+ UtilVago::showAndLogErrorPopUp(this->myLogger, "Couldn't create Mod_Info.cfg file when creating AE Package.");
+ return;
+ }
+
+ QTextStream modWriteStream(&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;
+
+ modInfo.close();
+
+ if(createZip){
+ if(!JlCompress::compressDir(this->packagesLocation+"/"+packageName+".zip", modDir)){
+ UtilVago::showAndLogErrorPopUp(this->myLogger, "An error occurred while zipping the package.");
+ }
+ }
+
+ 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::copyDir(sourceFolder,path,false)){//copy contents (creates dest destination automatically if not exists yet)
+
+ UtilVago::showAndLogErrorPopUpLogButton(this->myLogger, "An error occurred while copying the folder/files to the package folder: \n"
+ "Copying from "+sourceFolder+"\n to "+path);
+ }
+ }
+}
+
+void PackageWizard::beforeClose(QDialog::DialogCode resultStatus){
+
+ //If wizard finished with sucess, create the package
+ if(resultStatus == QDialog::Accepted){
+ createPackage();
+ }
+}
+
Index: s10k/Vago/packageWizard/packagewizard.h
===================================================================
--- s10k/Vago/packageWizard/packagewizard.h (revision 1092)
+++ s10k/Vago/packageWizard/packagewizard.h (revision 1092)
@@ -0,0 +1,26 @@
+#ifndef PACKAGEWIZARD_H
+#define PACKAGEWIZARD_H
+
+#include "abstractwizard.h"
+#include "packagepage2.h"
+#include "packagepage3.h"
+#include "packagepage4.h"
+#include "packagepagefinal.h"
+
+#include
+
+class PackageWizard: public AbstractWizard // for signals and slots
+{
+private:
+ QString packagesLocation;
+ PackagePage4 *page4Pointer = nullptr;
+private:
+ void copyPackageFolders(const DropTableWidget *myTable, QString tableDir, QString modDir, bool &bslExist);
+ void createPackage();
+ void beforeClose(QDialog::DialogCode resultStatus);
+protected:
+ PackageWizard(const QString &appDir, QString workspaceWizardLocation, QSettings *vagoSettings, Logger *myLogger);
+ void exec();
+};
+
+#endif // PACKAGEWIZARD_H
Index: s10k/Vago/preferences.cpp
===================================================================
--- s10k/Vago/preferences.cpp (revision 1092)
+++ s10k/Vago/preferences.cpp (revision 1092)
@@ -0,0 +1,105 @@
+#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->leWidth->setText(this->vagoSettings->value("WindowWidth").toString());
+ ui->leHeight->setText(this->vagoSettings->value("WindowHeight").toString());
+ ui->cbOniWindow->setChecked(this->vagoSettings->value("OniWindow").toBool());
+ ui->cbSeparate->setChecked(this->vagoSettings->value("SeparateInWorkspace").toBool());
+ ui->cbAskSaveProject->setChecked(this->vagoSettings->value("AskSaveProject").toBool());
+ ui->cbAskOpenLastProject->setChecked(this->vagoSettings->value("AskToOpenLastProject").toBool());
+#ifdef Q_OS_MAC
+ ui->cbUseYesAsDefaultWhenRemovingItems->setChecked(this->vagoSettings->value("useYesAsDefaultWhenRemovingItems").toBool());
+#endif
+
+#ifdef Q_OS_WIN
+ ui->cbUseYesAsDefaultWhenRemovingItems->hide(); // don't display this mac os only option in windows
+#endif
+
+}
+
+Preferences::~Preferences()
+{
+ delete ui;
+}
+
+// Need to override to do the verification
+// http://stackoverflow.com/questions/3261676/how-to-make-qdialogbuttonbox-not-close-its-parent-qdialog
+void Preferences::accept (){
+ QStringList options;
+ QRect screenRes = Util::getScreenResolution();
+
+ options << ui->leAEfolder->text() << ui->leWorkspace->text() << ui->leWidth->text() << ui->leHeight->text();
+
+ if(Util::checkEmptySpaces(options)){
+ Util::showErrorPopUp("Setting not saved! There are empty settings.");
+ return;
+ }
+
+ if(Util::checkIfIntegers(QStringList() << ui->leWidth->text() << ui->leHeight->text() )){
+ Util::showErrorPopUp("Setting not saved! Width and Height must be numbers.");
+ return;
+ }
+
+ if(ui->leWidth->text().toInt() > screenRes.width() || ui->leHeight->text().toInt() > screenRes.height()){
+ Util::showErrorPopUp("Setting not saved! Width or Height specified are greater than actual screen resolution.");
+ return;
+ }
+
+ if(ui->leWidth->text().toInt() <= 0 || ui->leHeight->text().toInt() <= 0 ){
+ Util::showErrorPopUp("Settings not saved! Width and Height must be greater than 0.");
+ return;
+ }
+
+ this->vagoSettings->setValue("AeFolder",ui->leAEfolder->text());
+ this->vagoSettings->setValue("Workspace",ui->leWorkspace->text());
+ this->vagoSettings->setValue("WindowWidth",ui->leWidth->text());
+ this->vagoSettings->setValue("WindowHeight",ui->leHeight->text());
+ this->vagoSettings->setValue("OniWindow",ui->cbOniWindow->isChecked());
+ this->vagoSettings->setValue("SeparateInWorkspace",ui->cbSeparate->isChecked());
+ this->vagoSettings->setValue("AskSaveProject",ui->cbAskSaveProject->isChecked());
+ this->vagoSettings->setValue("AskToOpenLastProject",ui->cbAskOpenLastProject->isChecked());
+#ifdef Q_OS_MAC
+ this->vagoSettings->setValue("useYesAsDefaultWhenRemovingItems",ui->cbUseYesAsDefaultWhenRemovingItems->isChecked());
+#endif
+
+ Util::showPopUp("You need to restart the application to all changes take effect.");
+
+ QDialog::accept();
+}
+
+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: s10k/Vago/preferences.h
===================================================================
--- s10k/Vago/preferences.h (revision 1092)
+++ s10k/Vago/preferences.h (revision 1092)
@@ -0,0 +1,39 @@
+#ifndef PREFERENCES_H
+#define PREFERENCES_H
+
+#include
+#include
+#include
+#include
+
+#include "utilvago.h"
+
+namespace Ui {
+class Preferences;
+}
+
+class Preferences : public QDialog
+{
+ Q_OBJECT
+
+public:
+ Preferences(QWidget *parent, QSettings *vagoSettings);
+ ~Preferences();
+
+public slots:
+ void accept ();
+
+private slots:
+
+ void on_pbChooseWorkspace_clicked();
+
+ void on_pbChooseAE_clicked();
+
+ void on_buttonBox_rejected();
+
+private:
+ Ui::Preferences *ui;
+ QSettings *vagoSettings;
+};
+
+#endif // PREFERENCES_H
Index: s10k/Vago/preferences.ui
===================================================================
--- s10k/Vago/preferences.ui (revision 1092)
+++ s10k/Vago/preferences.ui (revision 1092)
@@ -0,0 +1,204 @@
+
+
+ Preferences
+
+
+
+ 0
+ 0
+ 493
+ 297
+
+
+
+ Vago Preferences
+
+
+ -
+
+
+ Preferences
+
+
+
-
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ Vago Workspace Folder:
+
+
+
+ -
+
+
+ Anniversary Edition Folder:
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Default Vago Window Resolution:
+
+
+
+ -
+
+
-
+
+
+ -
+
+
+ Choose
+
+
+
+
+
+ -
+
+
-
+
+
+ -
+
+
+ Choose
+
+
+
+
+
+ -
+
+
-
+
+
+ Width
+
+
+
+ -
+
+
+ x
+
+
+
+ -
+
+
+ Height
+
+
+
+
+
+
+
+ -
+
+
+ Launch Oni in a window
+
+
+
+ -
+
+
+ Separate conversions by folders. For example: "Textures" -> "DAT_ONI - DDS"
+
+
+ Separate different conversions in workspace
+
+
+
+ -
+
+
+ Use Yes button as default when removing items
+
+
+
+ -
+
+
+ Shows a questions prompt to save current project if any unsaved changes are found. Asked when user tries to create a new project, load a project or exit the application.
+
+
+ Ask to save project if there are unsaved changes
+
+
+
+ -
+
+
+ Ask to open last saved project at startup
+
+
+
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+ QDialogButtonBox::Cancel|QDialogButtonBox::Ok
+
+
+
+
+
+
+
+
+ buttonBox
+ accepted()
+ Preferences
+ accept()
+
+
+ 248
+ 254
+
+
+ 157
+ 274
+
+
+
+
+ buttonBox
+ rejected()
+ Preferences
+ reject()
+
+
+ 316
+ 260
+
+
+ 286
+ 274
+
+
+
+
+
Index: s10k/Vago/readme.txt
===================================================================
--- s10k/Vago/readme.txt (revision 1092)
+++ s10k/Vago/readme.txt (revision 1092)
@@ -0,0 +1,202 @@
+Readme.txt
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Vago GUI v1.3
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+----------------------------------
+Description:
+----------------------------------
+
+An user interface application to use OniSplit in Windows / Mac OS.
+
+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:
+----------------------------------
+
+s10k, "faob2@hotmail.com"
+
+Oni Central Forum:
+http://oni.bungie.org
+->Select forum
+
+Oni Wiki:
+http://wiki.oni2.net
+
+----------------------------------
+Change Log:
+----------------------------------
+1.3, 09-12-2016
+- Changed Sound Wizard default settings to create files that are playable as music ingame
+- Now wizards have no longer modal windows. You can minimize and open multiple at the same time
+- Added some tooltips to XmlTools interface
+- Added wizard to create ingame pages like weapon / item pages or text for consoles
+- Added drag and drop support to Extract TRAM with TRBS/ONCC
+- Changed the layout of about dialog
+----------------------------------
+1.2, 30-10-2016
+- Upgraded to XmlTools 2.0c
+- Added a XmlTools interface. Click in the XML icon in the main window.
+- Now in manual commands you can choose if you want to call OniSplit or XmlTools
+- Now manual commands behaves likes an independent window
+- Fixed additional sources in levels tab when loading project
+- Interface was asking user for additional sources and bnv source files when this
+options were checked in levels tab when a project was loading. This was fixed.
+- Fixed background image page 2 layout when the image name is large
+----------------------------------
+1.1, 12-10-2016
+- Added wizard to create background images
+- Added OSBD imp creation to Sound wizard page
+- Added option to Vago ask at the startup if the user wants to load lastest saved project
+- Added new project action to file menu
+- Replaced "Always confirm Vago exit" option with an option to save the current
+project (if there are unsaved changes)
+- Fixed drag and drop bug wich caused the multiplication of the dropped files
+- Moved preferences from file to options menu
+- Fixed Max ElapsedTime property recognition in Sound Wizard (Amb page)
+- Now the sound wizard drops all the files used in the user workspace
+(including the XML files used to create the OSBD oni files)
+----------------------------------
+1.0, 17-09-2016
+- Added feature to save and restore vago projects (plus load recent projects)
+Projects are in XML format and are read with the pugixml library
+- Added keyboard shortchut to the convert button
+- Some code refactoring and started using C++14
+- Fixed zip support for anniversary edition packages, switched to the zip library QuaZIP
+- Fixed the anniversary edition packages creation on Windows {windows-change}
+- Added extra logging
+- Added Windows 7 and above conversions progress in taskbar {windows-change}
+- Upgraded XmlTools from 0.8d to 2.0b
+- Fixed libpng warning: iCCP: known incorrect sRGB profile
+----------------------------------
+0.9c, 02-04-2016
+- Fixed ONI FILES to DAT - Add button does not let to select a folder
+- Some minor fixes in the AEI Mod Package Wizard
+----------------------------------
+0.9b, 24-03-2016
+- Fixes for Mac OS X 10.11: fixed OniSplit integration, fixed startup bug (Iritsen's fix),
+fixed bug when copying and creating AEI packages
+- Fixed OniSplit command in Sound Package Wizard
+----------------------------------
+0.9a, 25-04-2014
+-Upgraded Qt libraries to version 5
+-Updated OniSplit to 0.9.96.0 version
+-Fixed the bug where the items loaded counter in status bar wasn't updated
+when changing tabs
+-Now levels->dat - oni files get extracted to a subfolder with the level's
+extracted name (requested by paradox)
+-Now in Mac OS is possible to choose Yes button by default when clearing the
+files contents (requested by edt)
+----------------------------------
+0.9, 08-01-2014
+-Updated OniSplit to 0.9.94.0 version
+-Added option to open AE folder
+-Redesigned the tabs of file conversions and its options (thanks paradox!)
+-Windows version also starts with a resolution of 800x600 as Mac did before
+-Added option in preferences to user set up the default window resolution
+-Added option to abort conversion
+-Textures tab: TGA made as default image type for .oni conversions
+-Levels tab: Added option to extract only specific files from DAT files
+-Characters tab: Added option to convert TRAM XML > TRBS ONI
+-Characters tab: Added option to convert TRAM ONI > XML / XML & DAE
+----------------------------------
+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: s10k/Vago/resources.qrc
===================================================================
--- s10k/Vago/resources.qrc (revision 1092)
+++ s10k/Vago/resources.qrc (revision 1092)
@@ -0,0 +1,33 @@
+
+
+ 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
+ oni_icon_mac.png
+ abort.png
+ background_image.png
+ xmltoolsinterface.png
+ windowmessages.png
+ formatting_bold.png
+ formatting_color.png
+ formatting_italic.png
+ formatting_underline.png
+
+
+ about.png
+
+
+ sampleFiles/OSBDsample_file.amb.xml
+ sampleFiles/OSBDsample_file.grp.xml
+ sampleFiles/OSBDsample_file.imp.xml
+
+
Index: s10k/Vago/sampleFiles/OSBDsample_file.amb.xml
===================================================================
--- s10k/Vago/sampleFiles/OSBDsample_file.amb.xml (revision 1092)
+++ s10k/Vago/sampleFiles/OSBDsample_file.amb.xml (revision 1092)
@@ -0,0 +1,27 @@
+
+
+
+ Normal
+
+
+ 10
+
+ 1
+ 1
+
+
+
+
+ 10
+ 50
+
+
+
+ sample_file
+
+
+
+ 1
+ 0
+
+
Index: s10k/Vago/sampleFiles/OSBDsample_file.grp.xml
===================================================================
--- s10k/Vago/sampleFiles/OSBDsample_file.grp.xml (revision 1092)
+++ s10k/Vago/sampleFiles/OSBDsample_file.grp.xml (revision 1092)
@@ -0,0 +1,23 @@
+
+
+
+ 1
+ 0
+
+ 2
+
+
+ 1
+
+ 1
+ 1
+
+
+ 0
+ 0
+
+ sample_file.wav
+
+
+
+
Index: s10k/Vago/sampleFiles/OSBDsample_file.imp.xml
===================================================================
--- s10k/Vago/sampleFiles/OSBDsample_file.imp.xml (revision 1092)
+++ s10k/Vago/sampleFiles/OSBDsample_file.imp.xml (revision 1092)
@@ -0,0 +1,24 @@
+
+
+
+ sample_file
+ Normal
+
+
+ 15
+ 80
+
+
+ 360
+ 360
+ 1
+
+
+
+ 0
+
+
+ 0
+ 0
+
+
Index: s10k/Vago/soundWizard/soundpage2.cpp
===================================================================
--- s10k/Vago/soundWizard/soundpage2.cpp (revision 1092)
+++ s10k/Vago/soundWizard/soundpage2.cpp (revision 1092)
@@ -0,0 +1,146 @@
+#include "soundpage2.h"
+#include "ui_soundpage2.h"
+
+const QStringList SoundPage2::allowedFiles = QStringList() << "*.wav" << "*.aif" << "*.aifc" << "*.afc";
+
+SoundPage2::SoundPage2(QString appLocation, QWidget *parent) :
+ QWizardPage(parent),
+ ui(new Ui::soundpage2)
+{
+ ui->setupUi(this);
+ this->soundTable=ui->twSoundFiles;
+ this->codecLocalHelpFile=appLocation+"/"+GlobalVars::HelpDir + "/XMLSNDD.html#Source_file_creation";
+ ui->twSoundFiles->removeColumn(2); // Only two columns
+
+ ui->label->setText("Add here the files you want to convert. "
+ "All the files will have the same properties applied.
"
+ "Don't forget to first convert the files to an oni compatible codec. "
+ "More information here."); // Don't use rich text in qtdesigner because it generates platform dependent code
+
+ // 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(currFileExt.endsWith(vext)){
+ 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: s10k/Vago/soundWizard/soundpage2.h
===================================================================
--- s10k/Vago/soundWizard/soundpage2.h (revision 1092)
+++ s10k/Vago/soundWizard/soundpage2.h (revision 1092)
@@ -0,0 +1,44 @@
+#ifndef SOUNDPAGE2_H
+#define SOUNDPAGE2_H
+
+#include
+#include
+
+#include "util.h"
+
+namespace Ui {
+class soundpage2;
+}
+
+class SoundPage2 : public QWizardPage
+{
+ Q_OBJECT
+
+public:
+ DropTableWidget *soundTable;
+
+ explicit SoundPage2(QString appLocation, 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;
+ QString codecLocalHelpFile;
+
+ bool validatePage();
+};
+
+#endif // SOUNDPAGE2_H
Index: s10k/Vago/soundWizard/soundpage2.ui
===================================================================
--- s10k/Vago/soundWizard/soundpage2.ui (revision 1092)
+++ s10k/Vago/soundWizard/soundpage2.ui (revision 1092)
@@ -0,0 +1,181 @@
+
+
+ soundpage2
+
+
+
+ 0
+ 0
+ 640
+ 480
+
+
+
+ WizardPage
+
+
+ Sound files to process
+
+
+ -
+
+
+ Edit this text in soundpage2.cpp
+
+
+ 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: s10k/Vago/soundWizard/soundpage3.cpp
===================================================================
--- s10k/Vago/soundWizard/soundpage3.cpp (revision 1092)
+++ s10k/Vago/soundWizard/soundpage3.cpp (revision 1092)
@@ -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: s10k/Vago/soundWizard/soundpage3.h
===================================================================
--- s10k/Vago/soundWizard/soundpage3.h (revision 1092)
+++ s10k/Vago/soundWizard/soundpage3.h (revision 1092)
@@ -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: s10k/Vago/soundWizard/soundpage3.ui
===================================================================
--- s10k/Vago/soundWizard/soundpage3.ui (revision 1092)
+++ s10k/Vago/soundWizard/soundpage3.ui (revision 1092)
@@ -0,0 +1,208 @@
+
+
+ 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
+
+
+
-
+
+
+ Sphere radious:
+
+
+
+ -
+
+
+ 10
+
+
+
+ -
+
+
+ Min elapsed time:
+
+
+
+ -
+
+
+ 1
+
+
+
+ -
+
+
+ Max elapsed time:
+
+
+
+ -
+
+
+ 1
+
+
+
+ -
+
+
+ Min volume distance:
+
+
+
+ -
+
+
+ 10
+
+
+
+ -
+
+
+ Max volume distance:
+
+
+
+ -
+
+
+ 50
+
+
+
+ -
+
+
+ Min occlusion:
+
+
+
+ -
+
+
+ 0
+
+
+
+ -
+
+
+ Treshold:
+
+
+
+ -
+
+
+ 1
+
+
+
+
+
+
+
+
+
+
+
Index: s10k/Vago/soundWizard/soundpage4.cpp
===================================================================
--- s10k/Vago/soundWizard/soundpage4.cpp (revision 1092)
+++ s10k/Vago/soundWizard/soundpage4.cpp (revision 1092)
@@ -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: s10k/Vago/soundWizard/soundpage4.h
===================================================================
--- s10k/Vago/soundWizard/soundpage4.h (revision 1092)
+++ s10k/Vago/soundWizard/soundpage4.h (revision 1092)
@@ -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: s10k/Vago/soundWizard/soundpage4.ui
===================================================================
--- s10k/Vago/soundWizard/soundpage4.ui (revision 1092)
+++ s10k/Vago/soundWizard/soundpage4.ui (revision 1092)
@@ -0,0 +1,174 @@
+
+
+ soundpage4
+
+
+
+ 0
+ 0
+ 640
+ 480
+
+
+
+ WizardPage
+
+
+ OSBD.grp file properties
+
+
+ -
+
+
+ Properties
+
+
+
-
+
+
+ Volume:
+
+
+
+ -
+
+
+ 1
+
+
+
+ -
+
+
+ Min volume:
+
+
+
+ -
+
+
+ 1
+
+
+
+ -
+
+
+ Max volume:
+
+
+
+ -
+
+
+ 1
+
+
+
+ -
+
+
+ Pitch:
+
+
+
+ -
+
+
+ 0
+
+
+
+ -
+
+
+ Min pitch:
+
+
+
+ -
+
+
+ 0
+
+
+
+ -
+
+
+ Max pitch:
+
+
+
+ -
+
+
+ 0
+
+
+
+ -
+
+
+ Weight:
+
+
+
+ -
+
+
+ 1
+
+
+
+ -
+
+
+ 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: s10k/Vago/soundWizard/soundpage5.cpp
===================================================================
--- s10k/Vago/soundWizard/soundpage5.cpp (revision 1092)
+++ s10k/Vago/soundWizard/soundpage5.cpp (revision 1092)
@@ -0,0 +1,47 @@
+#include "soundpage5.h"
+#include "ui_soundpage5.h"
+
+SoundPage5::SoundPage5(QWidget *parent) :
+ QWizardPage(parent),
+ ui(new Ui::soundpage5)
+{
+ ui->setupUi(this);
+
+ //Register fields to be accessible in another pages
+ registerField("rbPriorityLowImp", ui->rbPriorityLow);
+ registerField("rbPriorityNormalImp", ui->rbPriorityNormal);
+ registerField("rbPriorityHighImp", ui->rbPriorityHigh);
+ registerField("rbPriorityHighestImp", ui->rbPriorityHighest);
+
+ registerField("leMinVolumeDistanceImp", ui->leMinVolumeDistance);
+ registerField("leMaxVolumeDistanceImp", ui->leMaxVolumeDistance);
+ registerField("leMinAngleImp", ui->leMinAngle);
+ registerField("leMaxAngleImp", ui->leMaxAngle);
+ registerField("leMinAttenuationImp", ui->leMinAttenuation);
+ registerField("leImpactVelocityImp", ui->leImpactVelocity);
+ registerField("leMinOcclusionImp", ui->leMinOcclusion);
+}
+
+bool SoundPage5::validatePage(){
+ QStringList leContents;
+ leContents << ui->leMinVolumeDistance->text() << ui->leMaxVolumeDistance->text() <<
+ ui->leMinAngle->text() << ui->leMaxAngle->text() << ui->leMinAttenuation->text() <<
+ ui->leImpactVelocity->text() << ui->leMinOcclusion->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;
+}
+
+SoundPage5::~SoundPage5()
+{
+ delete ui;
+}
Index: s10k/Vago/soundWizard/soundpage5.h
===================================================================
--- s10k/Vago/soundWizard/soundpage5.h (revision 1092)
+++ s10k/Vago/soundWizard/soundpage5.h (revision 1092)
@@ -0,0 +1,26 @@
+#ifndef SOUNDPAGE5_H
+#define SOUNDPAGE5_H
+
+#include
+
+#include "util.h"
+
+namespace Ui {
+class soundpage5;
+}
+
+class SoundPage5 : public QWizardPage
+{
+ Q_OBJECT
+
+public:
+ explicit SoundPage5(QWidget *parent = 0);
+ ~SoundPage5();
+
+private:
+ Ui::soundpage5 *ui;
+
+ bool validatePage();
+};
+
+#endif // SOUNDPAGE5_H
Index: s10k/Vago/soundWizard/soundpage5.ui
===================================================================
--- s10k/Vago/soundWizard/soundpage5.ui (revision 1092)
+++ s10k/Vago/soundWizard/soundpage5.ui (revision 1092)
@@ -0,0 +1,175 @@
+
+
+ soundpage5
+
+
+
+ 0
+ 0
+ 640
+ 478
+
+
+
+ WizardPage
+
+
+ OSBD.imp file properties
+
+
+ -
+
+
+ Sound priority
+
+
+
-
+
+
-
+
+
+ Low
+
+
+
+ -
+
+
+ Normal
+
+
+ true
+
+
+
+ -
+
+
+ High
+
+
+
+ -
+
+
+ Highest
+
+
+
+
+
+
+
+
+ -
+
+
+ Properties
+
+
+
-
+
+
+ Min volume distance:
+
+
+
+ -
+
+
+ 15
+
+
+
+ -
+
+
+ Max volume distance:
+
+
+
+ -
+
+
+ 80
+
+
+
+ -
+
+
+ Min angle:
+
+
+
+ -
+
+
+ 360
+
+
+
+ -
+
+
+ Max angle:
+
+
+
+ -
+
+
+ 360
+
+
+
+ -
+
+
+ Min attenuation:
+
+
+
+ -
+
+
+ 1
+
+
+
+ -
+
+
+ Impact velocity:
+
+
+
+ -
+
+
+ 0
+
+
+
+ -
+
+
+ Min occlusion:
+
+
+
+ -
+
+
+ 0
+
+
+
+
+
+
+
+
+
+
+
Index: s10k/Vago/soundWizard/soundpagefinal.cpp
===================================================================
--- s10k/Vago/soundWizard/soundpagefinal.cpp (revision 1092)
+++ s10k/Vago/soundWizard/soundpagefinal.cpp (revision 1092)
@@ -0,0 +1,301 @@
+#include "soundpagefinal.h"
+#include "ui_soundpagefinal.h"
+
+SoundPageFinal::SoundPageFinal(QString AppDir, 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(AppDir, this->myLogger,this->xmlCommands);
+ this->myConverter = new Converter(AppDir, this->myLogger,this->oniSplitCommands);
+
+ ui->lbComplete->setText("The wizard is now complete. The sounds have been converted. "
+ "You can view all converted files clicking here.
"
+ "
Click restart to create more sounds from the wizard beggining, "
+ "otherwise click finish."); // Don't use rich text in qtdesigner because it generates platform dependent code
+
+ 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 impFile="OSBDsample_file.imp.xml";
+ QString ambFileLocation=GlobalVars::VagoTemporaryDir+"/"+ambFile;
+ QString grpFileLocation=GlobalVars::VagoTemporaryDir+"/"+grpFile;
+ QString impFileLocation=GlobalVars::VagoTemporaryDir+"/"+impFile;
+
+ // 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;
+
+ // Page 5 variables
+ QString minVolumeDistanceImp, maxVolumeDistanceImp, minAngleImp,
+ maxAngleImp, minAttenuationImp, impactVelocityImp,
+ minOcclusionImp, priorityImp;
+ bool priorityLowImp = false, priorityNormalImp = false,
+ priorityHighImp = false, priorityHighestImp = false;
+
+ // Create temp folder if it doesn't exist
+ if(!QDir(GlobalVars::VagoTemporaryDir).exists()){
+ QDir().mkdir(GlobalVars::VagoTemporaryDir);
+ }
+
+ // Get data page 2
+ if(field("rbOther").toBool()){
+ outputFolder=field("leOtherLocation").toString();
+ }
+ else{
+ outputFolder=this->soundsLocation;
+ }
+
+ // Get data page 3
+
+ priorityLow=field("rbPriorityLow").toBool();
+ priorityNormal=field("rbPriorityNormal").toBool();
+ priorityHigh=field("rbPriorityHigh").toBool();
+ priorityHighest=field("rbPriorityHighest").toBool();
+ interruptOnStop=field("cbInterruptOnStop").toBool();
+ playOnce=field("cbPlayOnce").toBool();
+ canPan=field("cbCanPan").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";
+ }
+
+ 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";
+ }
+
+ // Get data page 5
+ priorityLowImp=field("rbPriorityLowImp").toBool();
+ priorityNormalImp=field("rbPriorityNormalImp").toBool();
+ priorityHighImp=field("rbPriorityHighImp").toBool();
+ priorityHighestImp=field("rbPriorityHighestImp").toBool();
+
+ if(priorityNormalImp){
+ priorityImp="Normal";
+ }
+ else if(priorityLowImp){
+ priorityImp="Low";
+ }
+ else if(priorityHighImp){
+ priorityImp="High";
+ }
+ else if(priorityHighestImp){
+ priorityImp="Highest";
+ }
+
+ minVolumeDistanceImp=Util::normalizeDecimalSeparator(field("leMinVolumeDistanceImp").toString());
+ maxVolumeDistanceImp=Util::normalizeDecimalSeparator(field("leMaxVolumeDistanceImp").toString());
+ minAngleImp=Util::normalizeDecimalSeparator(field("leMinAngleImp").toString());
+ maxAngleImp=Util::normalizeDecimalSeparator(field("leMaxAngleImp").toString());
+ minAttenuationImp=Util::normalizeDecimalSeparator(field("leMinAttenuationImp").toString());
+ impactVelocityImp=Util::normalizeDecimalSeparator(field("leImpactVelocityImp").toString());
+ minOcclusionImp=Util::normalizeDecimalSeparator(field("leMinOcclusionImp").toString());
+
+ //######################################################### Starting xml processing
+
+ // Clean tmp dir
+ if(!Util::rmDir(GlobalVars::VagoTemporaryDir)){
+ UtilVago::showAndLogErrorPopUpLogButton(this->myLogger, "Couldn't clean vago temp dir for complete sound wizard. Aborting.\n"+GlobalVars::VagoTemporaryDir);
+ return;
+ }
+
+ if(!QDir(QDir::tempPath()).mkpath("VagoTemp")){
+ UtilVago::showAndLogErrorPopUpLogButton(this->myLogger, "Couldn't reconstruct vago temp dir for complete sound wizard. Aborting.\n"+GlobalVars::VagoTemporaryDir);
+ }
+
+ // Copy sample xml files to tmp dir
+ QFile::copy(":/new/sampleFiles/"+ambFile , ambFileLocation);
+ QFile::copy(":/new/sampleFiles/"+grpFile , grpFileLocation);
+ QFile::copy(":/new/sampleFiles/"+impFile , impFileLocation);
+ QFile::setPermissions(ambFileLocation, QFile::ReadOwner | QFile::WriteOwner); //remove read only attribute that come from resources
+ QFile::setPermissions(grpFileLocation, QFile::ReadOwner | QFile::WriteOwner);
+ QFile::setPermissions(impFileLocation, QFile::ReadOwner | QFile::WriteOwner);
+
+ (*this->xmlCommands)
+ << "--replace-all-values -e Priority -n "+Util::insertQuotes(priority)+" -f "+Util::insertQuotes(ambFileLocation)+" --no-backups --no-verbose"
+ << "--replace-all-values -e Flags -n "+(flags.join(" ").isEmpty() ? Util::insertQuotes("") : Util::insertQuotes(flags.join(" ")))+" -f "+Util::insertQuotes(ambFileLocation)+" --no-backups --no-verbose"
+ << "--replace-all-values -e SphereRadius -n "+Util::insertQuotes(sphereRadious)+" -f "+Util::insertQuotes(ambFileLocation)+" --no-backups --no-verbose"
+ << "--replace-all-values -e Treshold -n "+Util::insertQuotes(treshold)+" -f "+Util::insertQuotes(ambFileLocation)+" --no-backups --no-verbose"
+ << "--replace-all-values -e MinOcclusion -n "+Util::insertQuotes(minOcclusion)+" -f "+Util::insertQuotes(ambFileLocation)+" --no-backups --no-verbose"
+ << "--replace-all-values --parent-element-name ElapsedTime -e Max -n "+Util::insertQuotes(maxElapsedTime)+" -f "+Util::insertQuotes(ambFileLocation)+" --no-backups --no-verbose"
+ << "--replace-all-values --parent-element-name ElapsedTime -e Min -n "+Util::insertQuotes(minElapsedTime)+" -f "+Util::insertQuotes(ambFileLocation)+" --no-backups --no-verbose"
+ << "--replace-all-values --parent-element-name Distance -e Max -n "+Util::insertQuotes(maxVolumeDistance)+" -f "+Util::insertQuotes(ambFileLocation)+" --no-backups --no-verbose"
+ << "--replace-all-values --parent-element-name Distance -e Min -n "+Util::insertQuotes(minVolumeDistance)+" -f "+Util::insertQuotes(ambFileLocation)+" --no-backups --no-verbose"
+ << "--replace-all-values --parent-element-name SoundGroup -e Volume -n "+Util::insertQuotes(volume)+" -f "+Util::insertQuotes(grpFileLocation)+" --no-backups --no-verbose"
+ << "--replace-all-values --parent-element-name SoundGroup -e Pitch -n "+Util::insertQuotes(pitch)+" -f "+Util::insertQuotes(grpFileLocation)+" --no-backups --no-verbose"
+ << "--replace-all-values --parent-element-name SoundGroup -e NumberOfChannels -n "+Util::insertQuotes(numberChannels)+" -f "+Util::insertQuotes(grpFileLocation)+" --no-backups --no-verbose"
+ << "--replace-all-values --parent-element-name Volume -e Min -n "+Util::insertQuotes(minVolume)+" -f "+Util::insertQuotes(grpFileLocation)+" --no-backups --no-verbose"
+ << "--replace-all-values --parent-element-name Volume -e Max -n "+Util::insertQuotes(maxVolume)+" -f "+Util::insertQuotes(grpFileLocation)+" --no-backups --no-verbose"
+ << "--replace-all-values --parent-element-name Pitch -e Min -n "+Util::insertQuotes(minPitch)+" -f "+Util::insertQuotes(grpFileLocation)+" --no-backups --no-verbose"
+ << "--replace-all-values --parent-element-name Pitch -e Max -n "+Util::insertQuotes(maxPitch)+" -f "+Util::insertQuotes(grpFileLocation)+" --no-backups --no-verbose"
+ << "--replace-all-values -e Weight -n "+Util::insertQuotes(weight)+" -f "+Util::insertQuotes(grpFileLocation)+" --no-backups --no-verbose"
+ << "--replace-all-values -e Priority -n "+Util::insertQuotes(priorityImp)+" -f "+Util::insertQuotes(impFileLocation)+" --no-backups --no-verbose"
+ << "--replace-all-values --parent-element-name Distance -e Min -n "+Util::insertQuotes(minVolumeDistanceImp)+" -f "+Util::insertQuotes(impFileLocation)+" --no-backups --no-verbose"
+ << "--replace-all-values --parent-element-name Distance -e Max -n "+Util::insertQuotes(maxVolumeDistanceImp)+" -f "+Util::insertQuotes(impFileLocation)+" --no-backups --no-verbose"
+ << "--replace-all-values --parent-element-name Angle -e Min -n "+Util::insertQuotes(minAngleImp)+" -f "+Util::insertQuotes(impFileLocation)+" --no-backups --no-verbose"
+ << "--replace-all-values --parent-element-name Angle -e Max -n "+Util::insertQuotes(maxAngleImp)+" -f "+Util::insertQuotes(impFileLocation)+" --no-backups --no-verbose"
+ << "--replace-all-values -e MinAttenuation -n "+Util::insertQuotes(minAttenuationImp)+" -f "+Util::insertQuotes(impFileLocation)+" --no-backups --no-verbose"
+ << "--replace-all-values -e ImpactVelocity -n "+Util::insertQuotes(impactVelocityImp)+" -f "+Util::insertQuotes(impFileLocation)+" --no-backups --no-verbose"
+ << "--replace-all-values -e MinOcclusion -n "+Util::insertQuotes(minOcclusionImp)+" -f "+Util::insertQuotes(impFileLocation)+" --no-backups --no-verbose";
+
+ if(preventRepeat){
+ (*this->xmlCommands) << "--replace-all-values --parent-element-name SoundGroup -e Flags -n PreventRepeat -f "+Util::insertQuotes(grpFileLocation)+" --no-backups --no-verbose";
+ }
+
+ myXmlProcessor->start();
+ myXmlProcessor->wait(); // Wait until all xml is edited
+
+ QString currFileName;
+ QString currGrpFileLocation;
+ QString currAmbFileLocation;
+ QString currImpFileLocation;
+
+ for(int i=0; ipage2Table->rowCount(); i++){
+
+ (*this->oniSplitCommands) << this->commandMap->value("xml->XML->ONI")+" "+Util::insertQuotes(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 = outputFolder + "/" + QString(ambFile).replace("sample_file",currFileName); // get the new files, filenames
+ currGrpFileLocation = outputFolder + "/" + QString(grpFile).replace("sample_file",currFileName);
+ currImpFileLocation = outputFolder + "/" + QString(impFile).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);
+ QFile::copy(impFileLocation, currImpFileLocation);
+
+ (*this->xmlCommands) << "--replace-all-values -e BaseTrack1 -n "+Util::insertQuotes(currFileName)+" -f "+Util::insertQuotes(currAmbFileLocation)+" --no-backups --no-verbose" // process the xml
+ << "--replace-all-values -e Sound -n "+Util::insertQuotes(currFileName)+" -f "+Util::insertQuotes(currGrpFileLocation)+" --no-backups --no-verbose"
+ << "--replace-all-values -e Group -n "+Util::insertQuotes(currFileName)+" -f "+Util::insertQuotes(currImpFileLocation)+" --no-backups --no-verbose";
+
+ myXmlProcessor->start();
+ myXmlProcessor->wait(); // Wait until all xml is edited
+
+ (*this->oniSplitCommands) << this->commandMap->value("xml->XML->ONI")+" "+Util::insertQuotes(outputFolder)+" "+Util::insertQuotes(currAmbFileLocation);
+ (*this->oniSplitCommands) << this->commandMap->value("xml->XML->ONI")+" "+Util::insertQuotes(outputFolder)+" "+Util::insertQuotes(currGrpFileLocation);
+ (*this->oniSplitCommands) << this->commandMap->value("xml->XML->ONI")+" "+Util::insertQuotes(outputFolder)+" "+Util::insertQuotes(currImpFileLocation);
+ }
+
+ this->myConverter->start(); // finally process the onisplit commands
+ this->myConverter->wait(); // wait for it to complete
+}
+
+void SoundPageFinal::catchXmlAndOSplitProcessingError(QString result, int numErrors){
+
+ if(numErrors!=0){
+ QString sNumErrors=QString::number(numErrors);
+ if(numErrors>1){
+ UtilVago::showErrorPopUpLogButton(result+"\n This is the last of " + sNumErrors + " errors.");
+ }
+ else{
+ UtilVago::showErrorPopUpLogButton(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: s10k/Vago/soundWizard/soundpagefinal.h
===================================================================
--- s10k/Vago/soundWizard/soundpagefinal.h (revision 1092)
+++ s10k/Vago/soundWizard/soundpagefinal.h (revision 1092)
@@ -0,0 +1,45 @@
+#ifndef SOUNDPAGEFINAL_H
+#define SOUNDPAGEFINAL_H
+
+#include
+#include
+#include
+#include
+
+#include "logger.h"
+#include "xmlprocessor.h"
+#include "converter.h"
+
+namespace Ui {
+class soundpagefinal;
+}
+
+class SoundPageFinal : public QWizardPage
+{
+ Q_OBJECT
+
+public:
+ explicit SoundPageFinal(QString AppDir, 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: s10k/Vago/soundWizard/soundpagefinal.ui
===================================================================
--- s10k/Vago/soundWizard/soundpagefinal.ui (revision 1092)
+++ s10k/Vago/soundWizard/soundpagefinal.ui (revision 1092)
@@ -0,0 +1,47 @@
+
+
+ soundpagefinal
+
+
+
+ 0
+ 0
+ 640
+ 480
+
+
+
+ WizardPage
+
+
+ -
+
+
+ The wizard is now complete. Edit this text in soundpagefinal.cpp
+
+
+ true
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+ QSizePolicy::Fixed
+
+
+
+ 20
+ 30
+
+
+
+
+
+
+
+
+
Index: s10k/Vago/soundWizard/soundwizard.cpp
===================================================================
--- s10k/Vago/soundWizard/soundwizard.cpp (revision 1092)
+++ s10k/Vago/soundWizard/soundwizard.cpp (revision 1092)
@@ -0,0 +1,40 @@
+#include "soundwizard.h"
+
+SoundWizard::SoundWizard(QString appDir, QString workspaceWizardLocation, QSettings *vagoSettings, Logger *myLogger, QHash *commandMap)
+ :AbstractWizard(appDir, workspaceWizardLocation, vagoSettings, myLogger, true)
+{
+ this->appDir=appDir;
+ this->soundsLocation=this->workspaceWizardLocation+"/Sounds";
+ this->commandMap=commandMap;
+}
+void SoundWizard::exec(){
+
+ SoundPage2 *page2 = new SoundPage2(this->appDir);
+ SoundPage3 *page3 = new SoundPage3();
+ SoundPage4 *page4 = new SoundPage4();
+ SoundPage5 *page5 = new SoundPage5();
+ SoundPageFinal *pageFinal = new SoundPageFinal(this->appDir, this->soundsLocation,page2->soundTable,this->myLogger, this->commandMap);
+
+ this->myWizard.addPage
+ (
+ createIntroPage
+ (
+ "Welcome to the Oni Sound wizard.\n"
+ "This wizard will allow you to convert in a few and simple steps sounds to oni format."
+ )
+ );
+
+ this->myWizard.addPage(page2);
+ this->myWizard.addPage(page3);
+ this->myWizard.addPage(page4);
+ this->myWizard.addPage(page5);
+ this->myWizard.addPage(pageFinal);
+
+ this->myWizard.setWindowTitle("Sound wizard");
+
+ showWizard("Sound wizard", ":/new/icons/sound.png");
+}
+
+void SoundWizard::beforeClose(QDialog::DialogCode){
+
+}
Index: s10k/Vago/soundWizard/soundwizard.h
===================================================================
--- s10k/Vago/soundWizard/soundwizard.h (revision 1092)
+++ s10k/Vago/soundWizard/soundwizard.h (revision 1092)
@@ -0,0 +1,34 @@
+#ifndef SOUNDWIZARD_H
+#define SOUNDWIZARD_H
+
+// System includes
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+// Local includes
+#include "util.h"
+#include "abstractwizard.h"
+#include "logger.h"
+#include "soundpage2.h"
+#include "soundpage3.h"
+#include "soundpage4.h"
+#include "soundpage5.h"
+#include "soundpagefinal.h"
+
+class SoundWizard: public AbstractWizard
+{
+protected:
+ SoundWizard(QString appLocation, QString workspaceWizardLocation, QSettings *vagoSettings, Logger *myLogger, QHash *commandMap);
+ void exec();
+ QHash *commandMap;
+private:
+ QString soundsLocation;
+ void beforeClose(QDialog::DialogCode resultStatus);
+};
+
+#endif // SOUNDWIZARD_H
Index: s10k/Vago/util.cpp
===================================================================
--- s10k/Vago/util.cpp (revision 1092)
+++ s10k/Vago/util.cpp (revision 1092)
@@ -0,0 +1,250 @@
+#include "util.h"
+
+namespace Util{
+
+QString normalizePath(QString path){
+ return path.replace("\\","/");
+}
+
+QString cutName(QString path){
+ return path.remove(0,path.lastIndexOf('/')).remove('"');
+}
+
+QString cutNameWithoutBackSlash(QString path){
+ return cutName(path).remove('/');
+}
+
+QString insertQuotes(const QString &currString){
+ return "\""+currString+"\"";
+}
+
+QString normalizeAndQuote(QString path){
+ return insertQuotes(normalizePath(path));
+}
+
+void showPopUp(const QString &message){
+ QMessageBox msgBox;
+ msgBox.setIcon(QMessageBox::Information);
+ msgBox.setText(message);
+ msgBox.exec();
+}
+
+void showRichPopUp(const QString &message){
+ QMessageBox msgBox;
+ msgBox.setTextFormat(Qt::RichText);
+ msgBox.setIcon(QMessageBox::Information);
+ msgBox.setText(message);
+ msgBox.exec();
+}
+
+void showWarningPopUp(const QString &message){
+ QMessageBox msgBox;
+ msgBox.setIcon(QMessageBox::Warning);
+ msgBox.setText(message);
+ msgBox.exec();
+}
+
+void showErrorPopUp(const QString &message){
+ QMessageBox msgBox;
+ msgBox.setIcon(QMessageBox::Critical);
+ msgBox.setText(message);
+ msgBox.exec();
+}
+
+void showRichErrorPopUp(const QString &message){
+ QMessageBox msgBox;
+ msgBox.setIcon(QMessageBox::Critical);
+ msgBox.setText(message);
+ msgBox.exec();
+}
+
+bool showQuestionPopUp(QWidget * parent, QString message, QMessageBox::StandardButton standardButton){
+ return QMessageBox::question (parent, "Are you sure?", message, QMessageBox::Yes | QMessageBox::No, standardButton)==QMessageBox::Yes;
+}
+
+QMessageBox::StandardButton showQuestionPopUpWithCancel(QWidget * parent, QString message, QMessageBox::StandardButton standardButton){
+ return QMessageBox::question (parent, "Are you sure?", message, QMessageBox::Yes | QMessageBox::No | QMessageBox::Cancel, standardButton);
+}
+
+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 checkIfIntegers(QStringList toCheck){
+ foreach (QString current, toCheck){
+ if(!isStringInteger(current)){
+ return true; // Some aren't valid integers
+ }
+ }
+ 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;
+}
+
+// Created from scratch
+bool copyDir(const QString &fromPath, QString toPath, const bool isRecursive){
+ QDir fromDir(fromPath);
+ QDir toDir(toPath);
+
+ if(!toDir.mkdir(fromDir.dirName())){ // create the folder in the destination
+ return false;
+ }
+
+ // Update toPath to include the folder from "fromPath"
+ toPath = toPath + "/" + fromDir.dirName();
+ toDir = QDir(toPath);
+
+ for(const QFileInfo &currFileInfo : fromDir.entryInfoList(QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot)){
+
+ if(currFileInfo.isFile()){
+
+ QFile destFile(toPath + "/" + currFileInfo.fileName());
+
+ if(!QFile::copy(currFileInfo.absoluteFilePath(),toPath + "/" + currFileInfo.fileName())){
+ return false;
+ }
+ }
+ else if(isRecursive && currFileInfo.isDir() && currFileInfo.absoluteFilePath() != fromDir.absolutePath()){
+
+ if(!copyDir(currFileInfo.absoluteFilePath(), toPath, isRecursive)){
+ return false;
+ }
+ }
+ }
+
+ 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;
+}
+
+//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(',','.');
+}
+
+// From here: http://stackoverflow.com/questions/17893328/qt-getting-the-screen-resolution-without-the-extended-monitor ty Chris
+QRect getScreenResolution(){
+ QDesktopWidget widget;
+ return widget.availableGeometry(widget.primaryScreen()); // or screenGeometry(), depending on your needs
+}
+
+}
Index: s10k/Vago/util.h
===================================================================
--- s10k/Vago/util.h (revision 1092)
+++ s10k/Vago/util.h (revision 1092)
@@ -0,0 +1,60 @@
+#ifndef UTIL_H
+#define UTIL_H
+
+#include // for debug macros
+#ifdef QT_DEBUG
+ #include
+#endif
+#include
+#include 
+
+
