group/ungroup graphic objects

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@47615 954022d7-b5bf-4e40-9824-e11837661b57

Excel/SpreadsheetTestMenu.html

@@ -1632,6 +1632,30 @@
             </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>
+				<ul class="noListStyle">
+                    <li class="ToolbarIconOut selectableIcon" title="Add shape">
+                        <div id="td_shape" class="ToolbarIconOut selectableIcon iconToolbar">
+                            <img class="ToolbarIcon ToolbarAddShape" src="menu/img/spacer.gif"/>
+                        </div>
+                    </li>
+                </ul>
+				<ul class="noListStyle">
+                    <li class="ToolbarIconOut selectableIcon" title="Group">
+                        <div id="td_group" class="iconToolbar">
+                            <img class="ToolbarIcon ToolbarShapeGroup" src="menu/img/spacer.gif"/>
+                        </div>
+                    </li>
+                    <li class="ToolbarIconOut selectableIcon" title="Ungroup">
+                        <div id="td_ungroup" class="iconToolbar">
+                            <img class="ToolbarIcon ToolbarShapeUnGroup" src="menu/img/spacer.gif"/>
+                        </div>
+                    </li>
+                </ul>
+			</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>
                 <ul class="noListStyle">
@@ -1645,20 +1669,11 @@
                             <img class="ToolbarIcon FixedAreaClean" src="menu/img/spacer.gif"/>
                         </div>
                     </li>
-                </ul>
-				<ul class="noListStyle">
-                    <li class="ToolbarIconOut selectableIcon" title="Add shape">
-                        <div id="td_shape" class="ToolbarIconOut selectableIcon iconToolbar">
-                            <img class="ToolbarIcon ToolbarIconMenuAsc ToolbarAddShape" src="menu/img/spacer.gif"/>
-                        </div>
-                    </li>
                 </ul>
 			</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>
-
-
 		</tr>
 		</table>
 		<div id="toolSelector"></div>

Excel/api.js

@@ -2071,6 +2071,15 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
 				this.isStartAddShape = false;
 			},
 			
+			asc_groupGraphicsObjects: function() {
+				var ws = this.wb.getWorksheet();
+				ws.objectRender.addGraphicGroup();
+			},
+			
+			asc_unGroupGraphicsObjects: function() {
+				var ws = this.wb.getWorksheet();
+			},
+			
 			// Cell interface
 			asc_getCellInfo: function (bExt) {
 				return this.wb.getWorksheet().getSelectionInfo(!!bExt);
@@ -2820,6 +2829,8 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
 		// Shapes
 		prot["asc_startAddShape"] = prot.asc_startAddShape;
 		prot["asc_endAddShape"] = prot.asc_endAddShape;
+		prot["asc_groupGraphicsObjects"] = prot.asc_groupGraphicsObjects;
+		prot["asc_unGroupGraphicsObjects"] = prot.asc_unGroupGraphicsObjects;
 
 		// Cell interface
 		prot["asc_getCellInfo"] = prot.asc_getCellInfo;

Excel/menu/menu.js

@@ -2567,4 +2567,16 @@
             $(this).css("border", "0px solid #000");
         }
     );
+	
+	$("#td_group").click(
+        function() {
+			api.asc_groupGraphicsObjects();
+        }
+    );
+	
+	$("#td_ungroup").click(
+        function() {
+			api.asc_unGroupGraphicsObjects();
+        }
+    );
 });
\ No newline at end of file

Excel/menu/styles/MenuStyle.css

@@ -304,16 +304,6 @@
 	width: 16px;
 }
 
-.FixedArea
-{
-	background: url(../img/Table_Merge.png) no-repeat scroll 0 0 transparent;	
-}
-
-.FixedAreaClean
-{
-	background: url(../img/Table_MergeDisable.png) no-repeat scroll 0 0 transparent;	
-}
-
 .ToolbarIconAsc {
 	background: url(../img/toolbar-btns.png) no-repeat scroll 0 0 transparent;
 	width: 20px;
@@ -982,10 +972,14 @@ input, textarea {outline:none;}
 	background-position: 0px 0px;
 }
 
-.menuChartFont {
-	cursor: pointer;
-}
+.FixedArea { background: url(../img/Table_Merge.png) no-repeat scroll 0 0 transparent); }
 
-.ToolbarAddShape{
-	background: url("../img/drawing-16.png") no-repeat scroll 0 0 transparent;
-}
\ No newline at end of file
+.FixedAreaClean { background: url(../img/Table_MergeDisable.png) no-repeat scroll 0 0 transparent; }
+
+.menuChartFont { cursor: pointer; }
+
+.ToolbarAddShape { background: url("../img/drawing-16.png") no-repeat scroll 0 0 transparent; }
+
+.ToolbarShapeGroup { background: url("../img/group.png") no-repeat scroll 0 0 transparent; }
+
+.ToolbarShapeUnGroup { background: url("../img/ungroup.png") no-repeat scroll 0 0 transparent; }
\ No newline at end of file