Skip to content

S
sdkjs
Commit c93099ac authored by Alexander.Trofimov's avatar Alexander.Trofimov Committed by Alexander.Trofimov
Browse files
Options 

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@47077 954022d7-b5bf-4e40-9824-e11837661b57
parent 081cfdb8
Hide whitespace changes
Inline Side-by-side
Showing with 68 additions and 42 deletions
Excel/SpreadsheetTestMenu.html
View file @ c93099ac
...@@ -1539,44 +1539,56 @@ ...@@ -1539,44 +1539,56 @@
<td class="cp toolbarSep" style="vertical-align: top; width: 15px;min-width:15px;"> <td class="cp toolbarSep" style="vertical-align: top; width: 15px;min-width:15px;">
<div class="sepMenu ToolbarIconOut" style="position: absolute; background: url('menu/img/sep.png') repeat-y scroll 0pt 0pt transparent; margin-top: -7px; height: 65px; margin-left: 6px;"></div> <div class="sepMenu ToolbarIconOut" style="position: absolute; background: url('menu/img/sep.png') repeat-y scroll 0pt 0pt transparent; margin-top: -7px; height: 65px; margin-left: 6px;"></div>
</td> </td>
<td id="td_add_hyperlink" class="ToolbarIconOut selectableIcon iconToolbar" title="Link"> <td>
<img class="ToolbarIcon ToolbarLink" src="menu/img/spacer.gif"/> <ul class="noListStyle">
<li class="ToolbarIconOut selectableIcon" title="Insert image url">
<div id="td_insert_image_url" class="iconToolbar">
<img class="ToolbarIcon ToolbarImage" src="menu/img/spacer.gif"/>
</div>
</li>
<li class="ToolbarIconOut selectableIcon" title="Insert image file">
<div id="td_insert_image_file" class="iconToolbar">
<img class="ToolbarIcon ToolbarImage" src="menu/img/spacer.gif"/>
</div>
</li>
</ul>
<ul class="noListStyle">
<li class="ToolbarIconOut selectableIcon" title="Insert chart(need icon!)">
<div id="td_insert_chart" class="iconToolbar">
<img class="ToolbarIcon ToolbarIconAsc ToolbarInsertChart" src="menu/img/spacer.gif"/>
</div>
</li>
<li class="ToolbarIconOut selectableIcon" title="Drawing Object Layer">
<div id="td_drawing_object_layer" class="iconToolbar">
<img class="ToolbarIcon ToolbarIconAsc ToolbarInsertChart" src="menu/img/spacer.gif"/>
</div>
</li>
</ul>
</td> </td>
<td class="ToolbarIconOut selectableIcon" title="Insert image url"> <td class="cp toolbarSep" style="vertical-align: top; width: 15px;min-width:15px;">
<div id="td_insert_image_url" class="iconToolbar"> <div class="sepMenu ToolbarIconOut" style="position: absolute; background: url('menu/img/sep.png') repeat-y scroll 0pt 0pt transparent; margin-top: -7px; height: 65px; margin-left: 6px;"></div>
<img class="ToolbarIcon ToolbarImage" src="menu/img/spacer.gif"/> </td>
</div> <td>
</td> <ul class="noListStyle">
<td class="ToolbarIconOut selectableIcon" title="Insert image file"> <li class="ToolbarIconOut selectableIcon" title="Add cell comment">
<div id="td_insert_image_file" class="iconToolbar"> <div id="td_add_cell_comment" class="iconToolbar">
<img class="ToolbarIcon ToolbarImage" src="menu/img/spacer.gif"/> <img class="ToolbarIcon ToolbarIconMenuAsc ToolbarInsertComment" src="menu/img/spacer.gif"/>
</div> </div>
</td> </li>
<td class="ToolbarIconOut selectableIcon" title="Insert chart(need icon!)"> <li class="ToolbarIconOut selectableIcon" title="Add document comment">
<div id="td_insert_chart" class="iconToolbar"> <div id="td_add_document_comment" class="iconToolbar">
<img class="ToolbarIcon ToolbarImage" src="menu/img/spacer.gif"/> <img class="ToolbarIcon ToolbarIconMenuAsc ToolbarInsertComment" src="menu/img/spacer.gif"/>
</div> </div>
</td> </li>
<td class="ToolbarIconOut selectableIcon" title="Drawing Object Layer"> </ul>
<div id="td_drawing_object_layer" class="iconToolbar"> <ul class="noListStyle">
<img class="ToolbarIcon ToolbarImage" src="menu/img/spacer.gif"/> <li id="td_add_hyperlink" class="ToolbarIconOut selectableIcon iconToolbar" title="Link">
</div> <img class="ToolbarIcon ToolbarIconAsc ToolbarLinkAsc" src="menu/img/spacer.gif"/>
</td> </li>
<td class="ToolbarIconOut selectableIcon" title="Add cell comment"> <li id="td_recalc" class="ToolbarIconOut selectableIcon iconToolbar" title="Recalc formulas">
<div id="td_add_cell_comment" class="iconToolbar"> <img class="toolbarImg recalc" src="menu/img/spacer.gif"/>
<img class="ToolbarIcon ToolbarImage" src="menu/img/spacer.gif"/> </li>
</div> </ul>
</td>
<td class="ToolbarIconOut selectableIcon" title="Add document comment">
<div id="td_add_document_comment" class="iconToolbar">
<img class="ToolbarIcon ToolbarImage" src="menu/img/spacer.gif"/>
</div>
</td>
<td id="td_recalc" class="ToolbarIconOut selectableIcon iconToolbar" title="Recalc formulas">
<img class="toolbarImg recalc" src="menu/img/spacer.gif"/>
</td>
<td id="td_print_pdf" class="ToolbarIconOut selectableIcon iconToolbar" title="Print PDF">
<img class="ToolbarIcon ToolbarPrint" src="menu/img/spacer.gif"/>
</td> </td>
<td class="cp toolbarSep" style="vertical-align: top; width: 15px;min-width:15px;"> <td class="cp toolbarSep" style="vertical-align: top; width: 15px;min-width:15px;">
<div class="sepMenu ToolbarIconOut" style="position: absolute; background: url('menu/img/sep.png') repeat-y scroll 0pt 0pt transparent; margin-top: -7px; height: 65px; margin-left: 6px;"></div> <div class="sepMenu ToolbarIconOut" style="position: absolute; background: url('menu/img/sep.png') repeat-y scroll 0pt 0pt transparent; margin-top: -7px; height: 65px; margin-left: 6px;"></div>
......
Excel/menu/menu.js
View file @ c93099ac
...@@ -632,7 +632,7 @@ ...@@ -632,7 +632,7 @@
function addClassIconPress(a){ function addClassIconPress(a){
a.addClass("iconPressed"); a.addClass("iconPressed");
} }
$("#td_sort_desc,#td_sort_asc,#td_text_wrap, #td_redo, #td_undo, #td_bold, #td_italic, #td_underline, #td_print, #td_copy, #td_paste,#td_cut, #td_ta_center, #td_ta_right, #td_ta_left, #td_ta_justify, #td_mergeCells, #td_recalc, #td_insert_chart, #td_insert_image_url, #td_insert_image_file, #td_drawing_object_layer, #td_add_cell_comment, #td_add_document_comment, #td_add_hyperlink, #td_print_pdf, #td_auto_filter, #td_auto_filter_local").click(function(){ $("#td_sort_desc,#td_sort_asc,#td_text_wrap, #td_redo, #td_undo, #td_bold, #td_italic, #td_underline, #td_print, #td_copy, #td_paste,#td_cut, #td_ta_center, #td_ta_right, #td_ta_left, #td_ta_justify, #td_mergeCells, #td_recalc, #td_insert_chart, #td_insert_image_url, #td_insert_image_file, #td_drawing_object_layer, #td_add_cell_comment, #td_add_document_comment, #td_add_hyperlink, #td_auto_filter, #td_auto_filter_local").click(function(){
switch (this.id){ switch (this.id){
case "td_bold":{ case "td_bold":{
if ($(this).hasClass("iconPressed")){ if ($(this).hasClass("iconPressed")){
...@@ -668,7 +668,7 @@ ...@@ -668,7 +668,7 @@
break; break;
} }
case "td_print":{ case "td_print":{
// editor.Print(); api.asc_Print();
break; break;
} }
case "td_copy":{ case "td_copy":{
...@@ -826,9 +826,6 @@ ...@@ -826,9 +826,6 @@
$("#dialogAddHyperlink").dialog("open"); $("#dialogAddHyperlink").dialog("open");
break; break;
} }
case "td_print_pdf":
api.asc_Print();
break;
case "td_auto_filter":{ case "td_auto_filter":{
api.asc_addAutoFilter() api.asc_addAutoFilter()
break; break;
......
Excel/menu/styles/MenuStyle.css
View file @ c93099ac
...@@ -305,6 +305,13 @@ ...@@ -305,6 +305,13 @@
} }
.ToolbarIconAsc { .ToolbarIconAsc {
background: url(../img/toolbar-btns.png) no-repeat scroll 0 0 transparent; background: url(../img/toolbar-btns.png) no-repeat scroll 0 0 transparent;
width: 20px;
margin-left: 1px;
}
.ToolbarIconMenuAsc {
background: url(../img/main-menu.png) no-repeat scroll 0 0 transparent;
width: 24px;
margin-left: 0px;
} }
.ToolbarIcon2 .ToolbarIcon2
{ {
...@@ -402,6 +409,12 @@ ...@@ -402,6 +409,12 @@
.MenubarFilter, .ToolbarFilter { .MenubarFilter, .ToolbarFilter {
background-position: 0 -800px; background-position: 0 -800px;
} }
.MenubarInsertChart, .ToolbarInsertChart {
background-position: 0 -720px;
}
.MenubarInsertComment, .ToolbarInsertComment {
background-position: 0 -99px;
}
.MenubarUnwritten, .ToolbarUnwritten .MenubarUnwritten, .ToolbarUnwritten
{ {
background-position: -802px 50%; background-position: -802px 50%;
...@@ -419,6 +432,10 @@ ...@@ -419,6 +432,10 @@
{ {
background-position: -336px 50%; background-position: -336px 50%;
} }
.MenubarLinkAsc, .ToolbarLinkAsc
{
background-position: 0 -700px;
}
.MenubarLine, .ToolbarLine .MenubarLine, .ToolbarLine
{ {
background-position: -945px 50%; background-position: -945px 50%;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7