Changeset 1106

Timestamp:

11/06/08 22:39:27 (5 years ago)

Author:

douglas

Message:

UPDATED Ticket #1318 Added some icons designed by the talented Andy Cochran and switched Xinha over to use them...

Location:

trunk

Files:

• XinhaCore.js (modified) (2 diffs)
• images/tango/16x16/actions/format-text-background-color.png (added)
• images/tango/16x16/actions/format-text-color.png (added)
• images/tango/16x16/actions/format-text-subscript.png (added)
• images/tango/16x16/actions/format-text-superscript.png (added)
• images/tango/16x16/actions/view-fullscreen.png (added)
• images/tango/16x16/actions/view-restore.png (added)
• modules/FullScreen/full-screen.js (modified) (3 diffs)

trunk/XinhaCore.js

@@ -1038 +1038 @@
     underline: [ "Underline", Xinha._lc({key: 'button_underline', string: 'tango/16x16/actions/format-text-underline.png'}, 'Xinha'), false, function(e) { e.execCommand("underline"); } ],
     strikethrough: [ "Strikethrough", Xinha._lc({key: 'button_strikethrough', string: 'tango/16x16/actions/format-text-strikethrough.png'}, 'Xinha'), false, function(e) { e.execCommand("strikethrough"); } ],
-    subscript: [ "Subscript", Xinha._lc({key: 'button_subscript', string: ["ed_buttons_main.gif",3,1]}, 'Xinha'), false, function(e) { e.execCommand("subscript"); } ],
-    superscript: [ "Superscript", Xinha._lc({key: 'button_superscript', string: ["ed_buttons_main.gif",2,1]}, 'Xinha'), false, function(e) { e.execCommand("superscript"); } ],
+    subscript: [ "Subscript", Xinha._lc({key: 'button_subscript', string:  'tango/16x16/actions/format-text-subscript.png'}, 'Xinha'), false, function(e) { e.execCommand("subscript"); } ],
+    superscript: [ "Superscript", Xinha._lc({key: 'button_superscript', string:  'tango/16x16/actions/format-text-superscript.png'}, 'Xinha'), false, function(e) { e.execCommand("superscript"); } ],
 
     justifyleft: [ "Justify Left", 'tango/16x16/actions/format-justify-left.png', false, function(e) { e.execCommand("justifyleft"); } ],
@@ -1053 +1053 @@
     outdent: [ "Decrease Indent", 'tango/16x16/actions/format-indent-less.png', false, function(e) { e.execCommand("outdent"); } ],
     indent: [ "Increase Indent",'tango/16x16/actions/format-indent-more.png', false, function(e) { e.execCommand("indent"); } ],
-    forecolor: [ "Font Color", ["ed_buttons_main.gif",3,3], false, function(e) { e.execCommand("forecolor"); } ],
-    hilitecolor: [ "Background Color", ["ed_buttons_main.gif",2,3], false, function(e) { e.execCommand("hilitecolor"); } ],
+    forecolor: [ "Font Color", 'tango/16x16/actions/format-text-color.png', false, function(e) { e.execCommand("forecolor"); } ],
+    hilitecolor: [ "Background Color",  'tango/16x16/actions/format-text-background-color.png', false, function(e) { e.execCommand("hilitecolor"); } ],
 
     undo: [ "Undoes your last action", 'tango/16x16/actions/edit-undo.png', false, function(e) { e.execCommand("undo"); } ],

trunk/modules/FullScreen/full-screen.js

@@ -8 +8 @@
   ( 'fullscreen',
     this._lc("Maximize/Minimize Editor"),
-    [_editor_url + cfg.imgURL + 'ed_buttons_main.gif',8,0], true,
+    _editor_url + 'images/tango/16x16/actions/view-fullscreen.png', true,
       function(e, objname, obj)
       {
@@ -57 +57 @@
     e.sizeEditor(w + 'px', h + 'px',true,true);
     e._sizing = false;
-    if ( e._toolbarObjects.fullscreen ) e._toolbarObjects.fullscreen.swapImage([_editor_url + cfg.imgURL + 'ed_buttons_main.gif',9,0]); 
+    if ( e._toolbarObjects.fullscreen ) e._toolbarObjects.fullscreen.swapImage(_editor_url + 'images/tango/16x16/actions/view-restore.png'); 
   }
 
@@ -66 +66 @@
     e.initSize();
     e._sizing = false;
-    if ( e._toolbarObjects.fullscreen ) e._toolbarObjects.fullscreen.swapImage([_editor_url + cfg.imgURL + 'ed_buttons_main.gif',8,0]); 
+    if ( e._toolbarObjects.fullscreen ) e._toolbarObjects.fullscreen.swapImage(_editor_url + 'images/tango/16x16/actions/view-fullscreen.png'); 
   }