* RECORDS: rewrite handling of commands

* skins: adapt command rconvert to common method
* jason: add rconvert
* jason: reorder context menus

12 files changed, 76 insertions, 43 deletions

diff --git a/skins/deltab/rdisplay.tmpl b/skins/deltab/rdisplay.tmpl
index f73e9ae..7800680 100644
--- a/skins/deltab/rdisplay.tmpl
+++ b/skins/deltab/rdisplay.tmpl
@@ -172,10 +172,10 @@
 									<?% IF allow( 'rconvert' ) && param.reccmds.size > 0 %?>
 									<form action="">
 									<p>
-										<select name='data' onchange="di('?cmd=rconvert&amp;data=',this.form.data.options[this.form.data.options.selectedIndex].value)"> 
+										<select name='data' onchange="di('?cmd=rconvert&amp;data=<?% id %?>&amp;__action=save&amp;__cmd=',this.form.data.options[this.form.data.options.selectedIndex].value)"> 
 											<option value='0'><?% gettext("Choose a command to edit this recording ...") %?></option>
 											<?% FOREACH cmd = param.reccmds %?>
-											<option value='<?% loop.count %?>_<?% id %?>'><?% cmd %?></option>
+                      <option value='<?% loop.count %?>'><?% cmd %?></option>
 											<?% END %?>
 										</select>
 									</p>
diff --git a/skins/jason/autotimers.js b/skins/jason/autotimers.js
index 0a4ff28..1f6c13e 100644
--- a/skins/jason/autotimers.js
+++ b/skins/jason/autotimers.js
@@ -175,13 +175,6 @@ Ext.extend(Ext.xxv.autotimerGrid,  Ext.grid.EditorGridPanel, {
             this.menu = new Ext.menu.Menu({

                 id:'grid-ctx',

                 items: [{

-                     itemId:'s'

-                    ,text:  this.szFindReRun

-                    ,iconCls: 'find-icon'

-                    ,scope:this

-                    ,disabled: true
-                    ,handler: function(){ this.viewer.searchTab(this.ctxRecord);}
-                   },{

                      itemId:'ae'

                     ,text:  this.szEdit

                     ,iconCls: 'edit-icon'

@@ -195,7 +188,14 @@ Ext.extend(Ext.xxv.autotimerGrid,  Ext.grid.EditorGridPanel, {
                     ,scope:this

                     ,disabled: true
                     ,handler: function() { this.DeleteItem(this.ctxRecord); }

-                  }
+                  },'-',{

+                     itemId:'s'

+                    ,text:  this.szFindReRun

+                    ,iconCls: 'find-icon'

+                    ,scope:this

+                    ,disabled: true
+                    ,handler: function(){ this.viewer.searchTab(this.ctxRecord);}
+                   }
                 ]

             });

             this.menu.on('hide', this.onContextHide, this);

diff --git a/skins/jason/form.js b/skins/jason/form.js
index 37740d7..5155ec3 100644
--- a/skins/jason/form.js
+++ b/skins/jason/form.js
@@ -40,11 +40,12 @@ Ext.xxv.Question = function(item,parentstore) {
          stateful: false
         ,title: item.title

         ,width: 600

-        ,height:500

+        //,height:500

+        ,autoHeight:true

         ,minWidth: 300

-        ,minHeight: 200

+        ,minHeight: 100

         ,layout: 'anchor'

-        ,plain:true

+        ,plain:true
         //,bodyStyle:'padding:5px;'

         ,buttonAlign:'right'

         ,buttons: [{

@@ -255,7 +256,6 @@ Ext.extend(Ext.xxv.Question, Ext.Window, {
             config.height = 200;  // anchor width by percentage and height by raw adjustment
             config.readOnly = true;

         }
-
         this.form.add(config);
       }
       if(i) {
diff --git a/skins/jason/jason.css b/skins/jason/jason.css
index 3b11764..979048e 100644
--- a/skins/jason/jason.css
+++ b/skins/jason/jason.css
@@ -164,6 +164,7 @@ background-repeat:no-repeat;
 .new-icon {             background-image:url(pic/new.png) !important;  }
 .edit-icon {            background-image:url(pic/edit.png) !important;  }
 .cut-icon {             background-image:url(pic/cut.png) !important;  }
+.convert-icon {         background-image:url(pic/convert.png) !important;  }
 .chronicle-icon {       background-image:url(pic/chronicle.png) !important; }

 .remote-icon {          background-image:url(pic/remote.png) !important; }
 .monitor-icon {         background-image:url(pic/monitor.png) !important; }
diff --git a/skins/jason/locale/lang-de.js b/skins/jason/locale/lang-de.js
index 804b2e4..8add744 100644
--- a/skins/jason/locale/lang-de.js
+++ b/skins/jason/locale/lang-de.js
@@ -148,6 +148,7 @@ Ext.xxv.recordingsDataView.prototype.szToolTip = "Zeigt Aufnahmen";
 Ext.xxv.recordingsDataView.prototype.szFindReRun = "Suche Wiederholung";
 Ext.xxv.recordingsDataView.prototype.szEdit = "Bearbeiten";
 Ext.xxv.recordingsDataView.prototype.szCut = "Schneiden";
+Ext.xxv.recordingsDataView.prototype.szConvert = "Konvertieren";
 Ext.xxv.recordingsDataView.prototype.szDelete = "Löschen";
 Ext.xxv.recordingsDataView.prototype.szRecover = "Gelöschte Aufnahmen wiederherstellen";
 Ext.xxv.recordingsDataView.prototype.szStream = "Aufnahme streamen";
diff --git a/skins/jason/locale/lang-en.js b/skins/jason/locale/lang-en.js
index e785517..0386249 100644
--- a/skins/jason/locale/lang-en.js
+++ b/skins/jason/locale/lang-en.js
@@ -148,6 +148,7 @@ Ext.xxv.recordingsDataView.prototype.szToolTip = "Display recordings";
 Ext.xxv.recordingsDataView.prototype.szFindReRun = "Find rerun";
 Ext.xxv.recordingsDataView.prototype.szEdit = "Edit";
 Ext.xxv.recordingsDataView.prototype.szCut = "Cut";
+Ext.xxv.recordingsDataView.prototype.szConvert = "Convert";
 Ext.xxv.recordingsDataView.prototype.szDelete = "Delete";
 Ext.xxv.recordingsDataView.prototype.szRecover = "Recover deleted recordings";
 Ext.xxv.recordingsDataView.prototype.szStream = "Stream recording";
diff --git a/skins/jason/locale/lang-it.js b/skins/jason/locale/lang-it.js
index 29a0665..770296f 100755
--- a/skins/jason/locale/lang-it.js
+++ b/skins/jason/locale/lang-it.js
@@ -148,6 +148,7 @@ Ext.xxv.recordingsDataView.prototype.szToolTip = "Mostra registrazioni";
 Ext.xxv.recordingsDataView.prototype.szFindReRun = "Cerca repliche";
 Ext.xxv.recordingsDataView.prototype.szEdit = "Modifica";
 Ext.xxv.recordingsDataView.prototype.szCut = "Taglia";
+/*NEED TO TRANSLATE*/ Ext.xxv.recordingsDataView.prototype.szConvert = "Convert";
 Ext.xxv.recordingsDataView.prototype.szDelete = "Elimina";
 Ext.xxv.recordingsDataView.prototype.szRecover = "Recupera registrazioni eliminate";
 Ext.xxv.recordingsDataView.prototype.szStream = "Trasmetti registrazione";
diff --git a/skins/jason/pic/convert.png b/skins/jason/pic/convert.png
new file mode 100644
index 0000000..a5dcb72
--- /dev/null
+++ b/skins/jason/pic/convert.png
diff --git a/skins/jason/recordings.js b/skins/jason/recordings.js
index d17f7d7..255de22 100644
--- a/skins/jason/recordings.js
+++ b/skins/jason/recordings.js
@@ -516,6 +516,7 @@ Ext.extend(Ext.xxv.recordingsDataView,  Ext.DataView, {
     ,szFindReRun     : "Find rerun"
     ,szEdit          : "Edit"
     ,szCut           : "Cut"
+    ,szConvert       : "Convert"
     ,szDelete        : "Delete"
     ,szRecover       : "Recover deleted recordings"
     ,szStream        : "Stream recording"
@@ -728,14 +729,7 @@ Ext.extend(Ext.xxv.recordingsDataView,  Ext.DataView, {
             this.menu = new Ext.menu.Menu({

                 id:'grid-ctx',

                 items: [
-                   {
-                     itemId: 's'

-                    ,text: this.szFindReRun

-                    ,iconCls: 'find-icon'

-                    ,scope:this
-                    ,disabled: true

-                    ,handler: function(){ this.viewer.searchTab(this.ctxRecord);}
-                   },{

+                   {

                      itemId: 're'
                     ,text: this.szEdit

                     ,iconCls: 'edit-icon'

@@ -750,12 +744,26 @@ Ext.extend(Ext.xxv.recordingsDataView,  Ext.DataView, {
                     ,disabled: true

                     ,handler: function() { this.CutItem(null); }

                    },{
+                     itemId: 'rc'
+                    ,text: this.szConvert

+                    ,iconCls: 'convert-icon'

+                    ,scope:this
+                    ,disabled: true

+                    ,handler: function() { this.ConvertItem(this.ctxRecord); }

+                   },{
                      itemId: 'rr'
                     ,text: this.szDelete

                     ,iconCls: 'delete-icon'

                     ,scope:this
                     ,disabled: true

                     ,handler: function() { this.DeleteItem(null); }

+                   },'-',{
+                     itemId: 's'

+                    ,text: this.szFindReRun

+                    ,iconCls: 'find-icon'

+                    ,scope:this
+                    ,disabled: true

+                    ,handler: function(){ this.viewer.searchTab(this.ctxRecord);}
                    },'-',{

                      itemId: 'pre'

                     ,text: this.szStream

@@ -793,6 +801,7 @@ Ext.extend(Ext.xxv.recordingsDataView,  Ext.DataView, {
                 switch(f.itemId) {
                   case 're':  enable = (record.data.isrecording == 0) ? false : true; break;
                   case 'rcu': enable = (record.data.isrecording == 0) ? false : true; break;
+                  case 'rc':  enable = (record.data.isrecording == 0) ? false : true; break;
                   case 'rpv': enable = (record.data.isrecording == 0) ? false : true; break;
                   case 'pre': enable = (record.data.isrecording == 0) ? false : true; break;
                 }
@@ -1015,7 +1024,7 @@ Ext.extend(Ext.xxv.recordingsDataView,  Ext.DataView, {
       var item = {
          cmd:   're'
         ,id:    record.data.id
-        ,title: record.data.fulltitle
+        ,title: this.szEdit + " : " + record.data.fulltitle
       };
 
       if(this.viewer.formwin){
@@ -1023,7 +1032,19 @@ Ext.extend(Ext.xxv.recordingsDataView,  Ext.DataView, {
       }

       this.viewer.formwin = new Ext.xxv.Question(item,this.store);

     }
+    ,ConvertItem : function(record) {
 
+      var item = {
+         cmd:   'rc'
+        ,id:    record.data.id
+        ,title: this.szConvert + " : " + record.data.fulltitle
+      };
+
+      if(this.viewer.formwin){
+        this.viewer.formwin.close();

+      }

+      this.viewer.formwin = new Ext.xxv.Question(item,this.store);

+    }
     ,Recover : function() {
 
       var item = {
@@ -1190,6 +1211,14 @@ function createRecordingsView(viewer,id) {
             ,handler: function(){ this.gridRecordings.CutItem(this.gridRecordings.preview.record);  }

         }
         ,{

+             id:'rc'

+            ,iconCls: 'convert-icon'

+            ,tooltip: Ext.xxv.recordingsDataView.prototype.szConvert

+            ,scope: viewer

+            ,disabled:true

+            ,handler: function(){ this.gridRecordings.ConvertItem(this.gridRecordings.preview.record);  }

+        }
+        ,{

              id:'rr'

             ,iconCls: 'delete-icon'

             ,tooltip: Ext.xxv.recordingsDataView.prototype.szDelete

diff --git a/skins/jason/timers.js b/skins/jason/timers.js
index 9caf622..5530b32 100644
--- a/skins/jason/timers.js
+++ b/skins/jason/timers.js
@@ -242,13 +242,6 @@ Ext.extend(Ext.xxv.timerGrid,  Ext.grid.GridPanel, { // Ext.grid.EditorGridPanel
             this.menu = new Ext.menu.Menu({

                 id:'grid-ctx',

                 items: [{

-                     itemId:'s'

-                    ,text: this.szFindReRun

-                    ,iconCls: 'find-icon'

-                    ,scope:this
-                    ,disabled: true

-                    ,handler: function(){ this.viewer.searchTab(this.ctxRecord);}
-                   },{

                      itemId:'te'

                     ,text: this.szEdit

                     ,iconCls: 'edit-icon'

@@ -256,12 +249,12 @@ Ext.extend(Ext.xxv.timerGrid,  Ext.grid.GridPanel, { // Ext.grid.EditorGridPanel
                     ,disabled: true

                     ,handler: function() { this.EditItem(this.ctxRecord); }
                    },{

-                     itemId:'ae'

-                    ,text: Ext.xxv.autotimerGrid.prototype.szEdit

-                    ,iconCls: 'autotimer-icon'

+                     itemId:'tt'

+                    ,text: this.szToggle

+                    ,iconCls: 'timer-toggle-icon'

                     ,scope:this
                     ,disabled: true

-                    ,handler: function() { this.EditAutoTimerItem(this.ctxRecord); }
+                    ,handler: function() { this.ToggleItem(this.ctxRecord); }
                    },{

                      itemId:'td'

                     ,text: this.szDelete

@@ -269,14 +262,21 @@ Ext.extend(Ext.xxv.timerGrid,  Ext.grid.GridPanel, { // Ext.grid.EditorGridPanel
                     ,scope:this
                     ,disabled: true

                     ,handler: function() { this.DeleteItem(this.ctxRecord); }
+                   },'-',{

+                     itemId:'ae'

+                    ,text: Ext.xxv.autotimerGrid.prototype.szEdit

+                    ,iconCls: 'autotimer-icon'

+                    ,scope:this
+                    ,disabled: true

+                    ,handler: function() { this.EditAutoTimerItem(this.ctxRecord); }
                    },{

-                     itemId:'tt'

-                    ,text: this.szToggle

-                    ,iconCls: 'timer-toggle-icon'

+                     itemId:'s'

+                    ,text: this.szFindReRun

+                    ,iconCls: 'find-icon'

                     ,scope:this
                     ,disabled: true

-                    ,handler: function() { this.ToggleItem(this.ctxRecord); }
-                   }
+                    ,handler: function(){ this.viewer.searchTab(this.ctxRecord);}
+                   },
                 ]

             });

             this.menu.on('hide', this.onContextHide, this);

diff --git a/skins/stone/rdisplay.tmpl b/skins/stone/rdisplay.tmpl
index ed992c3..04138e9 100644
--- a/skins/stone/rdisplay.tmpl
+++ b/skins/stone/rdisplay.tmpl
@@ -234,10 +234,10 @@
 									<?% IF allow('rconvert') && param.reccmds.size > 0 %?>
 									<p>
 									<form action="">
-										<select name='data' onchange="di('?cmd=rconvert&amp;data=',this.form.data.options[this.form.data.options.selectedIndex].value)"> 
+										<select name='data' onchange="di('?cmd=rconvert&amp;data=<?% id %?>&amp;__action=save&amp;__cmd=',this.form.data.options[this.form.data.options.selectedIndex].value)"> 
 											<option value='0'><?% gettext("Choose a command to edit this recording ...") %?></option>
 											<?% FOREACH cmd = param.reccmds %?>
-											<option value='<?% loop.count %?>_<?% id %?>'><?% cmd %?></option>
+                      <option value='<?% loop.count %?>'><?% cmd %?></option>
 											<?% END %?>
 										</select>
 									</form>
diff --git a/skins/xstyle/rdisplay.tmpl b/skins/xstyle/rdisplay.tmpl
index 967b5db..79bc01b 100644
--- a/skins/xstyle/rdisplay.tmpl
+++ b/skins/xstyle/rdisplay.tmpl
@@ -109,10 +109,10 @@
 <tr>
     <td colspan="2">
 <?% IF allow('rconvert') %?>
-    <select name='data' onChange="di(this.form.data.options[this.form.data.options.selectedIndex].value, '?cmd=rconvert&amp;data=')">
+    <select name='data' onChange="di(this.form.data.options[this.form.data.options.selectedIndex].value, '?cmd=rconvert&amp;data=<?% data.RecordId %?>&amp;__action=save&amp;__cmd=')">
         <option value='0'><?% gettext("Choose a command to edit this recording ...") %?>:</option>
     <?% FOREACH cmd = param.reccmds %?>
-        <option value='<?% loop.count %?>_<?% data.RecordId %?>'><?% cmd %?></option>
+        <option value='<?% loop.count %?>'><?% cmd %?></option>
     <?% END %?>
     </select>
 <?% END %?>