Fixing even more merge issues.

ScriptUI Panels/yToolBox.jsx

@@ -1,128 +1,5 @@
 var scriptUIPanel = this;
 YTB =
-{   
-    info :
-    {
-        name : "yToolBox",
-        ver : 0.5,
-        status : "alpha",
-        url : "yorchnet.com",
-        description : "My mixed bag of tools"
-    },
-    resources :
-    {
-        icon : new File('../yScripts/yNet.png'),
-        header :  new File('../yScripts/header.png')
-    },
-    appearence :
-    {
-      buttonHeight : 30,
-      buttonWidth : 126  
-    },
-    tools : [],
-    createUI : function createUI()
-    {
-        var res ="group\
-        {\
-        orientation:'column',\
-        alignment:['fill','fill'],\
-        margins:[0,0,0,0]\
-        header: Group\
-        {\
-            orientation:'column',\
-            alignment:['center','top'],\
-            margins:[0,0,0,0]\
-            title: Image\
-            {\
-                icon:'" + this.resources.header.path + '/' + this.resources.header.name + "',\
-                preferredSize: [175, 35]},\
-                ver: StaticText\
-                {\
-                    text:'" + this.info.ver + "',\
-                    alignment:['center','center']\
-                }\
-                desc: StaticText\
-                {\
-                    text:'" + this.info.description + "',\
-                    alignment:['center','center']\
-                },\
-        },\
-        main: Group\
-        {\
-            orientation:'column',\
-            alignment:['fill','fill'],\
-            alignChildren:['center','center'],\
-        },\
-        footer: Group\
-        {\
-        alignment:['center','bottom'], \
-                icn_app: Image {icon:'" + this.resources.icon.path + '/' + this.resources.icon.name + "',preferredSize: [15, 18]},\
-                txt_info: StaticText { text:'"+ this.info.url + "', alignment:['fill','center'] },\
-            }, \
-        }";
-        this.window.grp = this.window.add( res );
-        
-        this.window.layout.layout(true);
-        this.customizeUI();
-        
-        //EventHandlerAssignment
-        this.window.onResize = this.resize;
-        this.window.onClose = this.close;
-        this.window.onDraw = this.autoLayout;
-    },
-    customizeUI : function customizeUI()
-    {
-        var g  = this.window.graphics;    
-        var orange = g.newBrush(g.BrushType.SOLID_COLOR, [1, .45, 0, 1]);    
-        this.window.grp.main.graphics.backgroundColor = orange;
-    },
-    addTool : function addTool( aTool )
-    {
-        /**** TO DO ****/
-        // Check that the tool object is unique.
-        // Call for a window resize so it refreshes propperly.
-        
-        this.tools.push( aTool );
-
-        var btn  = this.window.grp.main.add( aTool.btnLauyout );
-        
-        btn.onClick = aTool.activate;
-        btn.yTool = aTool; // add a reference to the tool so I can access info on it later...
-        
-        //alert(btn.onClick);
-
-        this.window.layout.layout(true);
-        
-    },
-    //EVENT HANDLERS
-    resize : function resize()
-    {
-        this.layout.resize();
-    },
-    close : function close()
-    {
-        YTB = null;
-        delete this;
-    },
-    init : function init()
-    {
-        this.window = ( scriptUIPanel instanceof Panel ) ? scriptUIPanel: new Window( "palette" , this.info.name , undefined, { resizeable : true } );
-        this.createUI();
-    }
-    
-};
-
-YTB.init();
-
-#include "../yScripts/y_setStructure.jsx";
-#include "../yScripts/y_colorProbe.jsx";
-#include "../yScripts/y_BindBetween2.jsx";
-#include "../yScripts/y_CPOffset.jsx";
-#include "../yScripts/y_puppetRig.jsx";
-#include "../yScripts/y_GenericNewScript.jsx";
-=======
-var scriptUIPanel = this;
-YTB =
 {   
     info :
     {
@@ -244,4 +121,4 @@ YTB.init();
 #include "../yScripts/y_BindBetween2.jsx";
 #include "../yScripts/y_CPOffset.jsx";
 #include "../yScripts/y_puppetRig.jsx";
-#include "../yScripts/y_GenericNewScript.jsx";
+#include "../yScripts/y_stopMotionLayer.jsx";

yScripts/y_puppetRig.jsx

@@ -4,15 +4,9 @@ function YPuppetRigTool()
     this.info =
     {
 	name : "yPuppetRig",
-<<<<<<< HEAD
 	version : 0.33,
 	stage : "development",
 	description : "Tools for streamlining puppet-based animation rigs.",
-=======
-	version : 0.1,
-	stage : "development",
-	description : "Tool to create nulls at puppet pin locations, and link the latter to the former.",
->>>>>>> 841484771586f75c140288b329d54c96d3cb3925
 	url : "yorchnet.com"
     };
     this.appearence =

yScripts/y_setStructure.jsx

@@ -1,131 +1 @@
-<<<<<<< HEAD
+#include "../yScripts/y_JSExtensions.jsx";
function YSetProjectTool()
{
    this.info =
    {
	name : "YSetStructure",
	version : 0.11,
	stage : "alpha",
	description : "Set the Folder Structure for a new Project",
	url : "yorchnet.com"
    };
    this.appearence =
    {
	buttonHeight : 30,
	buttonWidth : 126
    };
    this.resources = 
    {
	icon : new File('yNet.png'),
    };
    this.init = function init()
    {
	//alert("my name is:" + this.info.name);
	this.btnLauyout = 
	"button\
	 {\
	    preferredSize: ['" + this.appearence.buttonWidth + "','" + this.appearence.buttonHeight + "'],\
	    text:'" + this.info.name + "',\
	    helpTip:'" + this.info.description + "'\
	 }";
	
	this. res = 
	 "window\
	{\
	    type:'palette',\
	    text:'" + this.info.name + ' ' + this.info.ver + ' ' + this.info.stage + "',\
	    info: Group \
	    {\
		alignment:['center','bottom'],\
		icon: Image \
		{\
		    icon:'" + this.resources.icon.path + '/' + this.resources.icon.name + "',\
		    preferredSize: [15, 18]\
		},\
		website: StaticText\
		{\
		    text:'" + this.info.url + "',\
		    alignment:['fill','center']\
		},\
	    }\
	}";
    }
    this.createUI = function createUI()
    {
	this.window = new Window ( this.res );
	this.window.show() ;
    }
    this.ySetProject = function ySetProject()
    {
	//alert("is this working");
	app.beginUndoGroup('ySetProject');
	var preStruct = ["01 MAIN","02 PComp","03 Source Layers" ,"04 Movies","05 Other Projects","06 Audio" , "07 Reference"];
	var newStruct = [];
	var projectItems = [];

	for(i=1;i<=app.project.items.length;i++)
	{
	    if(app.project.items[i].parentFolder.name=='Root')
	    {
		projectItems.push(app.project.items[i].name);
	    }
	}

	//to start a new organized project since the beginning

	if (projectItems.length == 0)
	{
	    newStruct = preStruct;
	}
	else
	{
	    for(a=0;a<preStruct.length;a++)
	    {
		if ((projectItems.getOne(preStruct[a]))==-1)
		{
		    newStruct.push(preStruct[a]);
		}
	    }
	}

	for(i = 1;i<=newStruct.length;i++)
	{
	    app.project.items.addFolder(newStruct[i-1]);
         if ( app.project.items[i].name == "01 MAIN" )
        {
            //alert("yes");
                app.project.items[i].items.addComp("JOBCODE_TYPE_[Scene_name]_vA_r000",1920,1080,1,30,23.976);
         }  
     
	}
	
	saveNow = confirm("Project Succesfully Set, Save Project?",true,"ySetProject");
	
	if(saveNow==true){
	    app.project.save()
	}else{
	    
	}
	app.endUndoGroup();
    }
    
    this.activate = this.ySetProject;
    
    this.init();
    return this;
}

//CHECKS that the toolbox exists, and if it doesn´t it runs the script on its own.
if (typeof(YTB)=='undefined')
{
    ySetProjectTool = new YSetProjectTool();
    ySetProjectTool.activate();
}
else
{
    ySetProjectTool = YTB.addTool(new YSetProjectTool());
}
-#include "../yScripts/y_JSExtensions.jsx";
function YSetProjectTool()
{
    this.info =
    {
	name : "YSetStructure",
	version : 0.11,
	stage : "alpha",
	description : "Set the Folder Structure for a new Project",
	url : "yorchnet.com"
    };
    this.appearence =
    {
	buttonHeight : 30,
	buttonWidth : 126
    };
    this.resources = 
    {
	icon : new File('yNet.png'),
    };
    this.init = function init()
    {
	//alert("my name is:" + this.info.name);
	this.btnLauyout = 
	"button\
	 {\
	    preferredSize: ['" + this.appearence.buttonWidth + "','" + this.appearence.buttonHeight + "'],\
	    text:'" + this.info.name + "',\
	    helpTip:'" + this.info.description + "'\
	 }";
	
	this. res = 
	 "window\
	{\
	    type:'palette',\
	    text:'" + this.info.name + ' ' + this.info.ver + ' ' + this.info.stage + "',\
	    info: Group \
	    {\
		alignment:['center','bottom'],\
		icon: Image \
		{\
		    icon:'" + this.resources.icon.path + '/' + this.resources.icon.name + "',\
		    preferredSize: [15, 18]\
		},\
		website: StaticText\
		{\
		    text:'" + this.info.url + "',\
		    alignment:['fill','center']\
		},\
	    }\
	}";
    }
    this.createUI = function createUI()
    {
	this.window = new Window ( this.res );
	this.window.show() ;
    }
    this.ySetProject = function ySetProject()
    {
	//alert("is this working");
	app.beginUndoGroup('ySetProject');
	var preStruct = ["01 MAIN","02 PComp","03 Source Layers" ,"04 Movies","05 Other Projects","06 Audio" , "07 Reference"];
	var newStruct = [];
	var projectItems = [];

	for(i=1;i<=app.project.items.length;i++)
	{
	    if(app.project.items[i].parentFolder.name=='Root')
	    {
		projectItems.push(app.project.items[i].name);
	    }
	}

	//to start a new organized project since the beginning

	if (projectItems.length == 0)
	{
	    newStruct = preStruct;
	}
	else
	{
	    for(a=0;a<preStruct.length;a++)
	    {
		if ((projectItems.getOne(preStruct[a]))==-1)
		{
		    newStruct.push(preStruct[a]);
		}
	    }
	}

	for(i = 1;i<=newStruct.length;i++)
	{
	    app.project.items.addFolder(newStruct[i-1]);
         if ( app.project.items[i].name == "01 MAIN" )
        {
            //alert("yes");
                app.project.items[i].items.addComp("JOBCODE_TYPE_[Scene_name]_vA_r000",1920,1080,1,30,23.976);
         }  
     
	}
	
	saveNow = confirm("Project Succesfully Set, Save Project?",true,"ySetProject");
	
	if(saveNow==true){
	    app.project.save()
	}else{
	    
	}
	app.endUndoGroup();
    }
    
    this.activate = this.ySetProject;
    
    this.init();
    return this;
}

//CHECKS that the toolbox exists, and if it doesn´t it runs the script on its own.
if (typeof(YTB)=='undefined')
{
    ySetProjectTool = new YSetProjectTool();
    ySetProjectTool.activate();
}
else
{
    ySetProjectTool = YTB.addTool(new YSetProjectTool());
}
-=======
-#include "../yScripts/y_JSExtensions.jsx";
-function YSetProjectTool()
-{
-    this.info =
-    {
-	name : "YSetStructure",
-	version : 0.11,
-	stage : "alpha",
-	description : "Set the Folder Structure for a new Project",
-	url : "yorchnet.com"
-    };
-    this.appearence =
-    {
-	buttonHeight : 30,
-	buttonWidth : 126
-    };
-    this.resources = 
-    {
-	icon : new File('yNet.png'),
-    };
-    this.init = function init()
-    {
-	//alert("my name is:" + this.info.name);
-	this.btnLauyout = 
-	"button\
-	 {\
-	    preferredSize: ['" + this.appearence.buttonWidth + "','" + this.appearence.buttonHeight + "'],\
-	    text:'" + this.info.name + "',\
-	    helpTip:'" + this.info.description + "'\
-	 }";
-	
-	this. res = 
-	 "window\
-	{\
-	    type:'palette',\
-	    text:'" + this.info.name + ' ' + this.info.ver + ' ' + this.info.stage + "',\
-	    info: Group \
-	    {\
-		alignment:['center','bottom'],\
-		icon: Image \
-		{\
-		    icon:'" + this.resources.icon.path + '/' + this.resources.icon.name + "',\
-		    preferredSize: [15, 18]\
-		},\
-		website: StaticText\
-		{\
-		    text:'" + this.info.url + "',\
-		    alignment:['fill','center']\
-		},\
-	    }\
-	}";
-    }
-    this.createUI = function createUI()
-    {
-	this.window = new Window ( this.res );
-	this.window.show() ;
-    }
-    this.ySetProject = function ySetProject()
-    {
-	//alert("is this working");
-	app.beginUndoGroup('ySetProject');
-	var preStruct = ["01 MAIN","02 PComp","03 Source Layers" ,"04 Movies","05 Other Projects","06 Audio" , "07 Reference"];
-	var newStruct = [];
-	var projectItems = [];
-
-	for(i=1;i<=app.project.items.length;i++)
-	{
-	    if(app.project.items[i].parentFolder.name=='Root')
-	    {
-		projectItems.push(app.project.items[i].name);
-	    }
-	}
-
-	//to start a new organized project since the beginning
-
-	if (projectItems.length == 0)
-	{
-	    newStruct = preStruct;
-	}
-	else
-	{
-	    for(a=0;a<preStruct.length;a++)
-	    {
-		if ((projectItems.getOne(preStruct[a]))==-1)
-		{
-		    newStruct.push(preStruct[a]);
-		}
-	    }
-	}
-
-	for(i = 1;i<=newStruct.length;i++)
-	{
-	    app.project.items.addFolder(newStruct[i-1]);
-         if ( app.project.items[i].name == "01 MAIN" )
-        {
-            //alert("yes");
-                app.project.items[i].items.addComp("JOBCODE_TYPE_[Scene_name]_vA_r000",1920,1080,1,30,23.976);
-         }  
-     
-	}
-	
-	saveNow = confirm("Project Succesfully Set, Save Project?",true,"ySetProject");
-	
-	if(saveNow==true){
-	    app.project.save()
-	}else{
-	    
-	}
-	app.endUndoGroup();
-    }
-    
-    this.activate = this.ySetProject;
-    
-    this.init();
-    return this;
-}
-
-//CHECKS that the toolbox exists, and if it doesn´t it runs the script on its own.
-if (typeof(YTB)=='undefined')
-{
-    ySetProjectTool = new YSetProjectTool();
-    ySetProjectTool.activate();
-}
-else
-{
-    YTB.addTool(new YSetProjectTool());
-}
->>>>>>> 841484771586f75c140288b329d54c96d3cb3925