inlineParameters now available

Author: jesusjda

clients/web/css/ei.default.css

@@ -240,13 +240,30 @@ pre {
 }
 
 /* the outline area */
+.ei-outline-setting {
+  float: left; 
+  width: 20%;
+  height: 100%;
+}
 .ei-outline-holder {
   position:relative;
   overflow: auto;
   border:1px solid #a6c9e2;
   border-radius:5px;
-  float: left; 
-  width: 20%;
+  width: 100%;
+  height: 100%;
+  -moz-box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+  -ms-box-sizing: border-box;
+  box-sizing: border-box;
+}
+.ei-setting-holder {
+  position:relative;
+  overflow: auto;
+  border:1px solid #a6c9e2;
+  border-radius:5px;
+  padding: 6px;
+  width: 100%;
   height: 100%;
   -moz-box-sizing: border-box;
   -webkit-box-sizing: border-box;

clients/web/html/eitheme.default.html

@@ -13,7 +13,10 @@
 <div class="ei-file-code-outline" id="up">
  <div class="ei-filemanager-holder" id="filemanager"></div>
  <div class="ei-codearea-holder" id="codearea"></div>
- <div class="ei-outline-holder" id="outline"></div>
+ <div class="" id="up-right">
+   <div class="ei-setting-holder" id="setting"></div>
+   <div class="ei-outline-holder" id="outline"></div>
+ </div>
 </div>
 <div class="ei-console-holder" id="console"></div>
 

clients/web/html/eitheme.resizable.html

@@ -15,7 +15,11 @@
 <div class="ei-file-code-outline" id ="up" >
  <div class="ei-filemanager-holder" id="filemanager"></div>
  <div class="ei-codearea-holder" id="codearea"></div>
- <div class="ei-outline-holder" id="outline"></div>
+  <div class="ei-outline-setting" id="up-right">
+   <div class="ei-setting-holder" id="setting"></div>
+   <div class="ei-outline-holder" id="outline"></div>
+ </div>
+
 </div>
 
 <div class="ei-console-holder" id="console"></div>

clients/web/index.html

@@ -120,6 +120,7 @@
     apps: _ei_data.apps,
     examples: _ei_data.examples,
     outline: _ei_data.outline,
+    inlineSetting: _ei_data.inlineSetting,
     language: _ei_data.language,
     outlineapp: _ei_data.outlineapp,
     outlineserver: _ei_data.outlineserver,

clients/web/js/config.js

@@ -14,7 +14,11 @@ var loadConfig = function(){
 
     if(!data.outline)
       _ei_data.outline = "on";
+    
+    if(!data.inlineSetting)
+      _ei_data.inlineSetting = "on";
 
+    
     if(!data.language)
       _ei_data.language = "text/x-csrc";
   }

clients/web/js/constants.js

@@ -136,6 +136,9 @@ var _ei = {
     server: "",
     app: "absoutline"
   },
+  inlineSetting:{
+    active: !false
+  },
   general_settings : {
     show_svg_in_new_window: "no",
     file_selection_mode: "file"

clients/web/js/easyinterface.js

@@ -48,11 +48,13 @@ window.EasyInterface = (function() {
         this.helpButtonHolder = this.holder.find("#help");
 	this.optionsButtonHolder = this.holder.find("#options");
 	this.applyButtonHolder = this.holder.find("#apply");
-	this.toolSelectHolder = this.holder.find("#toolselector");
+        this.toolSelectHolder = this.holder.find("#toolselector");
+      	this.settingHolder = this.holder.find("#setting");
 	this.outlineHolder = this.holder.find("#outline");
 	this.outlineButtonHolder = this.holder.find("#refreshoutline");
 	this.clearButtonHolder = this.holder.find("#clearanno");
         this.upSectionHolder = this.holder.find("#up");
+        this.rightSectionHolder = this.holder.find("#up-right");
 	// create/installl the different widgets
 	this.initCmdEngine();
 	this.initCodeAreaWidget();
@@ -63,10 +65,27 @@ window.EasyInterface = (function() {
 	this.initConsoleWidget();
 	this.initToolSelectorWidget();
 	this.initOutputManager();
-      if(_ei.outline.active)
-	this.initOutlineWidget();
-	this.initTools();
-	this.filemanager.setProperties(this.outline,this.tools);
+        if(_ei.outline.active)
+	  this.initOutlineWidget();
+        this.initTools();
+        this.filemanager.setProperties(this.outline,this.tools);
+        // check Right
+        if(_ei.outline.active && _ei.inlineSetting.active){
+	  //set heights
+	  this.outlineHolder.css("height","49%");
+	  this.settingHolder.css("height","49%");
+        }else if(_ei.outline.active){
+  	  //remove inlineSetting
+	  this.settingHolder.remove();
+	}else if(_ei.inlineSetting.active){
+	  //remove outline
+	  this.outlineHolder.remove();
+	}else{
+	  // codearea expand
+	  this.rightSectionHolder.remove();
+	  this.codeareaHolder = this.codeareaHolder.css("width","78%");
+	}
+      
 	// connect the buttons to the corresponding operations
 	this.applyButtonHolder.button(
 	    {
@@ -77,13 +96,19 @@ window.EasyInterface = (function() {
 		var ids = [self.codearea.getCurrentTabId()];
 		self.tools.apply(ids); 
 	    } );
-
+      if( !_ei.inlineSetting.active ) {
 	this.optionsButtonHolder.button( 
 	    {
 		icons: {
 		    primary: "ui-icon-gear"
 		}
-	    } ).click(function() { self.parametersHolder.dialog( "open" ); } );
+	    } ).click(function() {
+	      self.parametersHolder.dialog( "open" );
+	    } );
+        }else{
+	  this.optionsButtonHolder.remove();
+	}
+
         this.helpButtonHolder.button( 
 	    {
 		icons: {
@@ -136,12 +161,13 @@ window.EasyInterface = (function() {
 	    _ei.language = options.language || "text/x-csrc";
 	    _ei.serverPath = options.apps || serverPath;
 	    _ei.exampleServerPath = options.examples || examplesPath;
+
 	    _ei.outline.active = (options.outline=="on")? true : false;
+	    _ei.inlineSetting.active = (options.inlineSetting=="on")? true : false;
 	    if(_ei.outline.active){
 	      _ei.outline.app = options.outlineapp || "outline";
-	    _ei.outline.server = options.outlineserver || _ei.serverPath[0].server;
-	  }
-
+	      _ei.outline.server = options.outlineserver || _ei.serverPath[0].server;
+	    }
 	},
 
 	//
@@ -352,7 +378,8 @@ window.EasyInterface = (function() {
 	function() {
 	    var self = this;
 	    this.tools = new Tools({
-		"parameters": this.parameters,
+	        "parameters": this.parameters,
+		"inlineParameters": this.settingHolder,
 		"selector": this.toolSelector,
 		"filemanager": this.filemanager,
 		"outline": this.outline,
@@ -400,7 +427,8 @@ window.EasyInterface = (function() {
 		      self.initTool( $(this),currentServer.server );
 		    });// */
 	      });
-	  }}
+	    }}
+	  this.tools.ready();
 	},
 
 	initTool:
@@ -486,8 +514,11 @@ window.EasyInterface = (function() {
 	  var self = this;
 	  var RE = new ResizeEffect({holder:self.holder});
 	  RE.addHorizontalEffect(self.filemanagerHolder,self.codeareaHolder);
-	  if(_ei.outline.active)
-	    RE.addHorizontalEffect(self.codeareaHolder,self.outlineHolder);
+	  if(_ei.outline.active || _ei.inlineSetting.active)
+	    RE.addHorizontalEffect(self.codeareaHolder,self.rightSectionHolder);
+	  if(_ei.outline.active && _ei.inlineSetting.active){
+	    RE.addVerticalEffect(self.settingHolder,self.outlineHolder);
+	  }
 	  RE.addVerticalEffect(self.upSectionHolder,self.consoleHolder);
 	},
 	removeOutline:

clients/web/js/parameters.js

@@ -10,7 +10,7 @@ window.Parameters = (function() {
 
 	this.paramsId = "OPTS-"+parametersId;
 	this.paramsHolder = place;
-	this.accord = null;
+        this.accord = null;
 	this.sectionInfoById = new Array();
 	this.secId = 0;
 	this.setOptions(options);
@@ -457,7 +457,7 @@ window.Parameters = (function() {
 	//
 	setActiveParameSet:
 	function(sectionId) {
-	    if ( sectionId != undefined ) {
+	  if ( sectionId != undefined ) {
 		this.accord.accordion({active: this.sectionInfoById[sectionId].secId });
 	    } else {
 		this.accord.accordion({active: false});
@@ -475,6 +475,24 @@ window.Parameters = (function() {
 		    r[p]=sectionParams[p].getValue();
 	    }
 	    return r;
+	},
+
+
+	//
+	placeParamSet:
+	function(toolId,holder){
+	  var tagId = this.sectionId_to_sectionTag( toolId );
+	  this.accord.find("#"+tagId).append($(holder).contents());
+	},
+	     
+	//
+	getParamSet:
+	function(toolId,holder){
+	  var tagId = this.sectionId_to_sectionTag( toolId );
+	  var cont = this.accord.find("#"+tagId).contents();
+	  cont.show();
+	  $(holder).append(cont);
+	  
 	}
     };
 

clients/web/js/tools.js

@@ -10,8 +10,9 @@ window.Tools = (function() {
 	this.filemanager = null;
 	this.outline = null;
 	this.cmdengine = null;
-	this.console = null;
-	this.setOptions(options);
+        this.console = null;
+        this.inlineParams = null;
+        this.setOptions(options);
     };
 
     Tools.prototype = {
@@ -25,13 +26,20 @@ window.Tools = (function() {
 	setOptions:
 	function(options) {
 	    this.parameters = options.parameters;
+	    this.inlineParams = options.inlineParameters;
 	    this.selector = options.selector;
 	    this.filemanager = options.filemanager;
 	    this.outline = options.outline;
 	    this.cmdengine = options.cmdengine;
 	    this.outputmanager = options.outputmanager;
 	    this.helps = options.helps;
-	    this.selector.setToolsObj( this );
+	  this.selector.setToolsObj( this );
+	},
+
+	//
+	ready:
+	function(){
+	  this.setActiveTool(this.selector.getTool());
 	},
 
 	//
@@ -69,9 +77,17 @@ window.Tools = (function() {
 	//
 	setActiveTool:
 	function(toolId) {
-	  if( !this.tools[toolId]) return;
-	    this.currToolId = toolId;
-	    this.parameters.setActiveParameSet( toolId );
+	  console.log("tool",toolId);
+	  if( !this.tools[toolId])
+	    return;
+	  if( _ei.inlineSetting.active && this.tools[this.currToolId] ){
+	    this.parameters.placeParamSet(this.currToolId,this.inlineParams);
+	  }
+	  this.currToolId = toolId;
+	  this.parameters.setActiveParameSet( toolId );
+	  if( _ei.inlineSetting.active){
+	    this.parameters.getParamSet(toolId,this.inlineParams);
+	  }
 	},
 
 	apply:

clients/web/js/toolselectorwidget.js

@@ -46,6 +46,16 @@ window.ToolSelector = (function() {
 	addTool:
 	function(toolId, toolDesc) {
 	    this.selector.append("<option value='"+toolId+"'>"+toolDesc+"</option>");
+	},
+
+	//
+	getTool:
+	function(){
+	  var val = this.selector.val();
+	  if(!val)
+	    val = $("option",this.selector).value();
+	  console.log(val,"-------");
+	  return val;
 	}
     }