Skip to content

S
sdkjs
Commit 0902a736 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@47967 954022d7-b5bf-4e40-9824-e11837661b57
parent 847f91cb
Hide whitespace changes
Inline Side-by-side
Showing with 48 additions and 8 deletions
Excel/SpreadsheetTestMenu.html
View file @ 0902a736
......@@ -1710,6 +1710,26 @@
</td>
<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>
</td>
<td style="min-width: 211px;vertical-align:middle;">
<ul id="textMenu2">
<li id="cellStyleSelect" class="item main textSelect textSelectBoard ToolbarIconOut" value="Normal">
<span id="cellStyleSelectVal">Normal</span>
<ul style="width: 220px; height: 220px;overflow-y: scroll;">
<li id="Arial" class="SubItem" style="font-family:Arial;" value="Arial">Arial</li>
<li id="ArialBlack" class="SubItem" value="Arial Black" style="font-family:Arial Black;">Arial Black</li>
<li id="ArialCyr" class="SubItem" value="Arial Cyr" style="font-family:Arial Cyr;">Arial Cyr</li>
<li id="Calibri" class="SubItem" style="font-family:Calibri;" value="Calibri">Calibri</li>
<li id="CourierNew" class="SubItem" style="font-family:Courier New;" value="Courier New">Courier New</li>
<li id="LucidaConsole" class="SubItem" value="Lucida Console" style="font-family:Lucida Console;">Lucida Console</li>
<li id="MsSansSerif" class="SubItem" value="Ms Sans Serif" style="font-family:Ms Sans Serif;">Ms Sans Serif</li>
<li id="Tahoma" class="SubItem" style="font-family:Tahoma;" value="Tahoma">Tahoma</li>
<li id="TimesNewRoman" class="SubItem" style="font-family:Times New Roman;" value="Times New Roman">Times New Roman</li>
<li id="Verdana" class="SubItem" style="font-family:Verdana;" value="Verdana">Verdana</li>
</ul>
<div class="ToolbarDropDown dropdown" style="margin-top: 5px;margin-right: -3px;"></div>
</li>
</ul>
</td>
</tr>
</table>
......
Excel/menu/menu.js
View file @ 0902a736
......@@ -373,6 +373,7 @@
$("#fontSelectVal").text(info.asc_getFont().asc_getName());
$("#fontSizeSelectVal").text(info.asc_getFont().asc_getSize()+"pt");
$("#cellStyleSelectVal").text(info.asc_getStyleName());
switch(info.asc_getHorAlign()){
case "right":
......@@ -494,6 +495,16 @@
api.asc_registerCallback("asc_onSelectionRangeChanged", function (val) {
$("#formatTableRange").val(val);
});
api.asc_registerCallback("asc_onInitEditorStyles", function (styles) {
var cellStyleContent = "";
var styleName;
for (var i = 0; i < styles.defaultStyles.length; i++) {
styleName = styles.defaultStyles[i].asc_getName();
cellStyleContent += '<li id="'+styleName.replace(/\s/g,"")+'"index="'+i+'" class="SubItem fontListElement" style="font-family:Arial;" nameFont="'+styleName+'">'+styleName+'</li>';
}
$("#cellStyleSelect ul").empty().append(cellStyleContent);
});
api.asc_Init("../Fonts/");
//api.asc_setViewerMode(true);
......@@ -644,6 +655,9 @@
}
}
return false;
}});
$("#textMenu2").clickMenu({onClick:function(){
}});
$("#dialogRenameWS").dialog({ autoOpen: false,
resizable: false, modal: true, closeOnEscape: false, dialogClass: 'dialogClass',
......
Excel/menu/styles/MenuStyle.css
View file @ 0902a736
......@@ -13,7 +13,7 @@
}
#textMenu, #shapeMenu, #AutoShapesMenu
#textMenu, #shapeMenu, #AutoShapesMenu, #textMenu2
{
background: none repeat scroll 0 0 #E3E9FF;
clear: both;
......@@ -47,6 +47,12 @@
height: 26px;
}
#cellStyleSelect {
min-width: 80px;
width: 80px;
height: 26px;
}
.PopUpMenuStyle
{
font: 13px Arial,sans-serif;
......@@ -612,7 +618,7 @@ li.SubItem.hover
border-radius-topleft: 5px;*/
}
#textMenu .item, #shapeMenu .item
#textMenu .item, #shapeMenu .item, #textMenu2 .item
{
margin-left: 2px;
vertical-align: top;
......@@ -631,7 +637,7 @@ li.SubItem.hover
user-select: none;
min-width: 254px;
}
#textMenu span, #AutoShapesMenu span, #shapeMenu span
#textMenu span, #AutoShapesMenu span, #shapeMenu span, #textMenu2 span
{
border-top: 15px;
margin-top: 3px;
......@@ -689,7 +695,7 @@ li.SubItem.hover
border-bottom-color:#ACACAC !important;
border-right-color: #ACACAC !important;
}
#textMenu .innerBox, #shapeMenu .innerBox, #AutoShapesMenu .innerBox
#textMenu .innerBox, #shapeMenu .innerBox, #AutoShapesMenu .innerBox, #textMenu2 .innerBox
{
font:12px Arial,sans-serif;
background:none repeat scroll 0 0 #FFFFFF;
......@@ -736,7 +742,7 @@ li.SubItem.hover
padding:4px 7em 4px 28px;
}
#textMenu .SubItem, #shapeMenu .SubItem, #AutoShapesMenu .SubItem
#textMenu .SubItem, #shapeMenu .SubItem, #AutoShapesMenu .SubItem, #textMenu2 .SubItem
{
list-style:none outside none;
margin:0 3px;
......@@ -879,7 +885,7 @@ li.SubItem.hover
margin-top:6px;
}
#textMenu ul, #shapeMenu ul, #AutoShapesMenu ul{min-width:15px !important; }
#textMenu ul, #shapeMenu ul, #AutoShapesMenu ul, #textMenu2 ul{min-width:15px !important; }
a.big_button3 {
cursor: pointer;
display: block;
......
Excel/menu/styles/docStyles.css
View file @ 0902a736
......@@ -278,7 +278,7 @@ table {
height:7px;
margin:4px 0;
}
#fontFormat, #fontSelect, #fontSizeSelect{ -moz-border-radius: 0px;-webkit-border-radius: 0px;-pie-border-radius: 0px; behavior: url(../js/PIE.htc);height:21px;background-color:#fff;}
#fontFormat, #fontSelect, #fontSizeSelect, #cellStyleSelect{ -moz-border-radius: 0px;-webkit-border-radius: 0px;-pie-border-radius: 0px; behavior: url(../js/PIE.htc);height:21px;background-color:#fff;}
#fontSizeSelect .SubItem{text-align:center;}
#fontFormat .innerBox{width:120px;}
......
Excel/menu/styles/xlStyles.css
View file @ 0902a736
......@@ -198,7 +198,7 @@ p{ margin: 2px; padding: 2px; vertical-align:top;}
#newSheet .shspFirst.sheetSPassive{background-image: url(../img/dtab_green_left.png);}
#newSheet .shspLast.sheetSPassive{background-image: url(../img/dtab_green_right.png);}
#newSheet .sheetIPassive{background-image: url(../img/dtab_green_mid.png);background-repeat: repeat-x;}
#fontSelect, #fontSizeSelect{-moz-border-radius: 0px;-webkit-border-radius: 0px;-pie-border-radius: 0px;behavior: url(../js/PIE.htc);height:21px;background-color:#fff;}
#fontSelect, #fontSizeSelect, #cellStyleSelect{-moz-border-radius: 0px;-webkit-border-radius: 0px;-pie-border-radius: 0px;behavior: url(../js/PIE.htc);height:21px;background-color:#fff;}
#addHyperlink_url {width:427px;}
#dialogAddHyperlink select{width:137px;}
#addHyperlink_text{width: 280px;}
......
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