use getPasteIndex; add sort mapping to columns; include annotation property

source/Ox.UI/js/Video/ClipPanel.js

@@ -79,6 +79,9 @@ Ox.ClipPanel = function(options, self) {
             align: 'right',
             id: 'index',
             operator: '+',
+            sort: function(value, data) {
+                return data.sort;
+            },
             title: Ox._('Index'),
             visible: false,
             width: 60
@@ -87,17 +90,26 @@ Ox.ClipPanel = function(options, self) {
             addable: false,
             id: 'id',
             operator: '+',
+            sort: function(value, data) {
+                return data.sort;
+            },
             unique: true,
         },
         {
             addable: false,
             id: 'item',
             operator: '+',
+            sort: function(value, data) {
+                return data.sort;
+            },
         },
         {
             id: 'title',
             format: self.options.formatTitle,
             operator: '+',
+            sort: function(value, data) {
+                return data.sort;
+            },
             title: Ox._('Title'),
             visible: true,
             width: 120
@@ -113,6 +125,9 @@ Ox.ClipPanel = function(options, self) {
             },
             id: 'in',
             operator: '+',
+            sort: function(value, data) {
+                return data.sort;
+            },
             title: Ox._('In'),
             visible: true,
             width: 90
@@ -142,6 +157,9 @@ Ox.ClipPanel = function(options, self) {
             },
             id: 'duration',
             operator: '+',
+            sort: function(value, data) {
+                return data.sort;
+            },
             title: Ox._('Duration'),
             visible: true,
             width: 90
@@ -375,7 +393,7 @@ Ox.ClipPanel = function(options, self) {
                     };
                 },
                 items: self.options.clips,
-                keys: ['id', 'in', 'out'],
+                keys: ['annotation', 'id', 'in', 'out'],
                 orientation: 'both',
                 selected: self.options.selected,
                 sort: getListSort(),
@@ -600,6 +618,10 @@ Ox.ClipPanel = function(options, self) {
         );
     }
 
+    that.getPasteIndex = function() {
+        return self.$list.getPasteIndex();
+    };
+
     that.invertSelection = function() {
         self.$list.invertSelection();
     };

source/Ox.UI/js/Video/VideoEditPanel.js

@@ -638,6 +638,10 @@ Ox.VideoEditPanel = function(options, self) {
         });
     }
 
+    that.getPasteIndex = function() {
+        return self.$clipPanel.getPasteIndex();
+    };
+
     that.getSelectedClips = function() {
         return self.options.selected.length ? self.options.selected.map(function(id) {
             var clip = getClipById(id);