tdf#86083 Add group buttons for column and row operation.

Change-Id: Ic95618f37b1b76d320a90c318301644847253edd Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com> Reviewed-on: https://gerrit.libreoffice.org/27570 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Yousuf Philips <philipz85@hotmail.com> Tested-by: Yousuf Philips <philipz85@hotmail.com> Reviewed-by: Samuel Mehrbrodt <s.mehrbrodt@gmail.com>
2016-07-26 23:40:38 +03:00
parent 9bc591fa1e
commit d01d60be27
19 changed files with 213 additions and 7 deletions
--- a/icon-themes/breeze/links.txt
+++ b/icon-themes/breeze/links.txt
@@ -1339,4 +1339,7 @@ vcl/res/index.png cmd/sc_insertmultiindex.png
 xmlsecurity/res/key_12.png dbaccess/res/pkey.png
 xmlsecurity/res/signet_11x16.png xmlsecurity/res/notcertificate_16.png

-
+cmd/lc_columnoperations.png cmd/lc_entirecolumn.png
+cmd/sc_columnoperations.png cmd/sc_entirecolumn.png 
+cmd/lc_rowoperations.png cmd/lc_entirerow.png 
+cmd/sc_rowoperations.png cmd/sc_entirerow.png
--- a/icon-themes/crystal/links.txt
+++ b/icon-themes/crystal/links.txt
@@ -20,3 +20,8 @@ cmd/lc_mailmergenextentry.png cmd/lc_nextrecord.png
 cmd/sc_mailmergenextentry.png cmd/sc_nextrecord.png
 cmd/lc_mailmergepreventry.png cmd/lc_prevrecord.png
 cmd/sc_mailmergepreventry.png cmd/sc_prevrecord.png
+
+cmd/lc_columnoperations.png cmd/lc_entirecolumn.png
+cmd/sc_columnoperations.png cmd/sc_entirecolumn.png 
+cmd/lc_rowoperations.png cmd/lc_entirerow.png 
+cmd/sc_rowoperations.png cmd/sc_entirerow.png
--- a/icon-themes/elementary/links.txt
+++ b/icon-themes/elementary/links.txt
@@ -653,3 +653,8 @@ cmd/sc_lastslide.png cmd/sc_lastpage.png
 cmd/sc_previousslide.png cmd/sc_navigateback.png
 cmd/sc_nextslide.png cmd/sc_navigateforward.png
 cmd/sc_slidesetup.png cmd/sc_setdocumentproperties.png
+
+cmd/lc_columnoperations.png cmd/lc_entirecolumn.png
+cmd/sc_columnoperations.png cmd/sc_entirecolumn.png
+cmd/lc_rowoperations.png cmd/lc_entirerow.png
+cmd/sc_rowoperations.png cmd/sc_entirerow.png
--- a/icon-themes/galaxy/links.txt
+++ b/icon-themes/galaxy/links.txt
@@ -138,3 +138,8 @@ cmd/sc_lastslide.png cmd/sc_lastpage.png
 cmd/sc_previousslide.png cmd/sc_previouspage.png
 cmd/sc_nextslide.png cmd/sc_nextpage.png
 cmd/sc_slidesetup.png cmd/sc_setdocumentproperties.png
+
+cmd/lc_columnoperations.png cmd/lc_entirecolumn.png
+cmd/sc_columnoperations.png cmd/sc_entirecolumn.png 
+cmd/lc_rowoperations.png cmd/lc_entirerow.png 
+cmd/sc_rowoperations.png cmd/sc_entirerow.png
--- a/icon-themes/hicontrast/links.txt
+++ b/icon-themes/hicontrast/links.txt
@@ -43,3 +43,8 @@ cmd/sc_lastslide.png cmd/sc_lastpage.png
 cmd/sc_previousslide.png cmd/sc_previouspage.png
 cmd/sc_nextslide.png cmd/sc_nextpage.png
 cmd/sc_slidesetup.png cmd/sc_setdocumentproperties.png
+
+cmd/lc_columnoperations.png cmd/lc_entirecolumn.png
+cmd/sc_columnoperations.png cmd/sc_entirecolumn.png 
+cmd/lc_rowoperations.png cmd/lc_entirerow.png 
+cmd/sc_rowoperations.png cmd/sc_entirerow.png
--- a/icon-themes/human/links.txt
+++ b/icon-themes/human/links.txt
@@ -42,3 +42,8 @@ cmd/sc_lastslide.png cmd/sc_lastpage.png
 cmd/sc_previousslide.png cmd/sc_previouspage.png
 cmd/sc_nextslide.png cmd/sc_nextpage.png
 cmd/sc_slidesetup.png cmd/sc_setdocumentproperties.png
+
+cmd/lc_columnoperations.png cmd/lc_entirecolumn.png
+cmd/sc_columnoperations.png cmd/sc_entirecolumn.png 
+cmd/lc_rowoperations.png cmd/lc_entirerow.png 
+cmd/sc_rowoperations.png cmd/sc_entirerow.png
--- a/icon-themes/oxygen/links.txt
+++ b/icon-themes/oxygen/links.txt
@@ -38,3 +38,8 @@ cmd/sc_lastslide.png cmd/sc_lastpage.png
 cmd/sc_previousslide.png cmd/sc_previouspage.png
 cmd/sc_nextslide.png cmd/sc_nextpage.png
 cmd/sc_slidesetup.png cmd/sc_setdocumentproperties.png
+
+cmd/lc_columnoperations.png cmd/lc_entirecolumn.png
+cmd/sc_columnoperations.png cmd/sc_entirecolumn.png 
+cmd/lc_rowoperations.png cmd/lc_entirerow.png 
+cmd/sc_rowoperations.png cmd/sc_entirerow.png
--- a/icon-themes/sifr/links.txt
+++ b/icon-themes/sifr/links.txt
@@ -192,3 +192,8 @@ cmd/sc_deleteslide.png cmd/sc_deletepage.png
 cmd/sc_firstslide.png cmd/sc_firstpage.png
 cmd/sc_lastslide.png cmd/sc_lastpage.png
 cmd/sc_slidesetup.png cmd/sc_pagesetup.png
+
+cmd/lc_columnoperations.png cmd/lc_entirecolumn.png
+cmd/sc_columnoperations.png cmd/sc_entirecolumn.png 
+cmd/lc_rowoperations.png cmd/lc_entirerow.png 
+cmd/sc_rowoperations.png cmd/sc_entirerow.png
--- a/icon-themes/tango/links.txt
+++ b/icon-themes/tango/links.txt
@@ -592,3 +592,8 @@ cmd/sc_displaymode.png cmd/sc_ok.png
 cmd/sc_legend.png cmd/sc_ok.png
 cmd/sc_dataranges.png cmd/sc_ok.png
 cmd/sc_jumptospecificpage.png cmd/sc_ok.png
+
+cmd/lc_columnoperations.png cmd/lc_entirecolumn.png
+cmd/sc_columnoperations.png cmd/sc_entirecolumn.png 
+cmd/lc_rowoperations.png cmd/lc_entirerow.png 
+cmd/sc_rowoperations.png cmd/sc_entirerow.png
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -2173,6 +2173,22 @@
          <value xml:lang="en-US">~Number</value>
        </prop>
      </node>
+      <node oor:name=".uno:ColumnOperations" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Column Operations</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:RowOperations" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Row Operations</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
    </node>
  </node>
 </oor:component-data>
--- a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
@@ -358,6 +358,34 @@
          <value>com.sun.star.comp.framework.NotebookbarMenuController</value>
        </prop>
      </node>
+      <node oor:name="c30" oor:op="replace">
+        <prop oor:name="Command">
+          <value>.uno:ColumnOperations</value>
+        </prop>
+        <prop oor:name="Module">
+          <value>com.sun.star.sheet.SpreadsheetDocument</value>
+        </prop>
+        <prop oor:name="Controller">
+          <value>com.sun.star.comp.framework.ResourceMenuController</value>
+        </prop>
+        <prop oor:name="Value">
+          <value>column_operations</value>
+        </prop>
+      </node>
+      <node oor:name="c31" oor:op="replace">
+        <prop oor:name="Command">
+          <value>.uno:RowOperations</value>
+        </prop>
+        <prop oor:name="Module">
+          <value>com.sun.star.sheet.SpreadsheetDocument</value>
+        </prop>
+        <prop oor:name="Controller">
+          <value>com.sun.star.comp.framework.ResourceMenuController</value>
+        </prop>
+        <prop oor:name="Value">
+          <value>row_operations</value>
+        </prop>
+      </node>
    </node>
    <node oor:name="ToolBar">
      <node oor:name="ZoomToolBox" oor:op="replace">
@@ -1231,6 +1259,28 @@
          <value>com.sun.star.comp.framework.GenericPopupToolbarController</value>
        </prop>
      </node>
+      <node oor:name="ColumnOperationsControl" oor:op="replace">
+        <prop oor:name="Command">
+          <value>.uno:ColumnOperations</value>
+        </prop>
+        <prop oor:name="Module">
+          <value>com.sun.star.sheet.SpreadsheetDocument</value>
+        </prop>
+        <prop oor:name="Controller">
+          <value>com.sun.star.comp.framework.GenericPopupToolbarController</value>
+        </prop>
+      </node>
+      <node oor:name="RowOperationsControl" oor:op="replace">
+        <prop oor:name="Command">
+          <value>.uno:RowOperations</value>
+        </prop>
+        <prop oor:name="Module">
+          <value>com.sun.star.sheet.SpreadsheetDocument</value>
+        </prop>
+        <prop oor:name="Controller">
+          <value>com.sun.star.comp.framework.GenericPopupToolbarController</value>
+        </prop>
+      </node>
    </node>
    <node oor:name="StatusBar">
      <node oor:name="c5" oor:op="replace">
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -26,6 +26,7 @@ $(eval $(call gb_UIConfig_add_popupmenufiles,modules/scalc,\
 	sc/uiconfig/scalc/popupmenu/celledit \
 	sc/uiconfig/scalc/popupmenu/chart \
 	sc/uiconfig/scalc/popupmenu/colheader \
+	sc/uiconfig/scalc/popupmenu/column_operations \
 	sc/uiconfig/scalc/popupmenu/conditional \
 	sc/uiconfig/scalc/popupmenu/draw \
 	sc/uiconfig/scalc/popupmenu/drawtext \
@@ -39,6 +40,7 @@ $(eval $(call gb_UIConfig_add_popupmenufiles,modules/scalc,\
 	sc/uiconfig/scalc/popupmenu/pivot \
 	sc/uiconfig/scalc/popupmenu/preview \
 	sc/uiconfig/scalc/popupmenu/rowheader \
+	sc/uiconfig/scalc/popupmenu/row_operations \
 	sc/uiconfig/scalc/popupmenu/sheettab \
 ))

--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -277,6 +277,8 @@
 #define SID_SEARCH_RESULTS_DIALOG           (SC_MESSAGE_START + 83)
 #define SID_WINDOW_FIX_ROW                  (SC_MESSAGE_START + 84)
 #define SID_WINDOW_FIX_COL                  (SC_MESSAGE_START + 85)
+#define SID_COLUMN_OPERATIONS               (SC_MESSAGE_START + 86)
+#define SID_ROW_OPERATIONS                  (SC_MESSAGE_START + 87)

 // functions

--- a/sc/sdi/cellsh.sdi
+++ b/sc/sdi/cellsh.sdi
@@ -201,6 +201,8 @@ interface CellSelection
    SID_CANCEL      [ ExecMethod = Execute; ]
    SID_TOGGLE_REL  [ ExecMethod = ExecuteEdit; StateMethod = GetState; ]
    SID_POPUP_CONDFRMT []
+    SID_COLUMN_OPERATIONS   [ ExecMethod = ExecuteEdit; StateMethod = GetBlockState; ]
+    SID_ROW_OPERATIONS      [ ExecMethod = ExecuteEdit; StateMethod = GetBlockState; ]
    SID_OPENDLG_CONDFRMT    [ ExecMethod = ExecuteEdit; StateMethod = GetState; ]
    SID_OPENDLG_COLORSCALE  [ ExecMethod = ExecuteEdit; ]
    SID_OPENDLG_DATABAR     [ ExecMethod = ExecuteEdit; ]
--- a/sc/sdi/scalc.sdi
+++ b/sc/sdi/scalc.sdi
@@ -971,6 +971,20 @@ SfxVoidItem CreateSWDrawView SID_CREATE_SW_DRAWVIEW
    GroupId = GID_INSERT;
 ]

+SfxVoidItem ColumnOperations SID_COLUMN_OPERATIONS
+[
+    AutoUpdate = FALSE,
+    FastCall = FALSE,
+    ReadOnlyDoc = FALSE,
+    Toggle = FALSE,
+    Container = FALSE,
+    NoRecord;
+
+    AccelConfig = FALSE,
+    MenuConfig = TRUE,
+    ToolBoxConfig = TRUE,
+    GroupId = GID_OPTIONS;
+]

 SfxObjectItem CurrentRegion SID_RANGE_REGION

@@ -2339,6 +2353,21 @@ SfxVoidItem RegressionDialog SID_REGRESSION_DIALOG
    GroupId = GID_OPTIONS;
 ]

+SfxVoidItem RowOperations SID_ROW_OPERATIONS
+[
+    AutoUpdate = FALSE,
+    FastCall = FALSE,
+    ReadOnlyDoc = FALSE,
+    Toggle = FALSE,
+    Container = FALSE,
+    NoRecord;
+
+    AccelConfig = FALSE,
+    MenuConfig = TRUE,
+    ToolBoxConfig = TRUE,
+    GroupId = GID_OPTIONS;
+]
+
 SfxVoidItem TTestDialog SID_TTEST_DIALOG
 ()
 [
--- a/sc/source/ui/view/cellsh.cxx
+++ b/sc/source/ui/view/cellsh.cxx
@@ -230,6 +230,7 @@ void ScCellShell::GetBlockState( SfxItemSet& rSet )
            case FID_INS_ROWS_BEFORE:           // insert rows
            case FID_INS_ROWS_AFTER:
            case FID_INS_CELLSDOWN:
+            case SID_ROW_OPERATIONS:
                bDisable = (!bSimpleArea) || GetViewData()->SimpleColMarked();
                break;

@@ -237,6 +238,7 @@ void ScCellShell::GetBlockState( SfxItemSet& rSet )
            case FID_INS_COLUMNS_BEFORE:        // insert columns
            case FID_INS_COLUMNS_AFTER:
            case FID_INS_CELLSRIGHT:
+            case SID_COLUMN_OPERATIONS:
                bDisable = (!bSimpleArea) || GetViewData()->SimpleRowMarked();
                break;

--- a/sc/uiconfig/scalc/popupmenu/column_operations.xml
+++ b/sc/uiconfig/scalc/popupmenu/column_operations.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+-->
+<menu:menupopup xmlns:menu="http://openoffice.org/2001/menu">
+  <menu:menuitem menu:id=".uno:InsertColumnsBefore"/>
+  <menu:menuitem menu:id=".uno:InsertColumnsAfter"/>
+  <menu:menuitem menu:id=".uno:DeleteColumns"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:ColumnWidth"/>
+  <menu:menuitem menu:id=".uno:SetOptimalColumnWidth"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:HideColumn"/>
+  <menu:menuitem menu:id=".uno:ShowColumn"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:InsertColumnBreak"/>
+  <menu:menuitem menu:id=".uno:DeleteColumnbreak"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:FillUp"/>
+  <menu:menuitem menu:id=".uno:FillDown"/>
+  <menu:menuitem menu:id=".uno:FillLeft"/>
+  <menu:menuitem menu:id=".uno:FillRight"/>
+  <menu:menuitem menu:id=".uno:FillSeries"/>
+  <menu:menuitem menu:id=".uno:RandomNumberGeneratorDialog"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:FreezePanesFirstColumn"/>
+</menu:menupopup>
--- a/sc/uiconfig/scalc/popupmenu/row_operations.xml
+++ b/sc/uiconfig/scalc/popupmenu/row_operations.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+-->
+<menu:menupopup xmlns:menu="http://openoffice.org/2001/menu">
+  <menu:menuitem menu:id=".uno:InsertRowsBefore"/>
+  <menu:menuitem menu:id=".uno:InsertRowsAfter"/>
+  <menu:menuitem menu:id=".uno:DeleteRows"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:RowHeight"/>
+  <menu:menuitem menu:id=".uno:SetOptimalRowHeight"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:HideRow"/>
+  <menu:menuitem menu:id=".uno:ShowRow"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:InsertRowBreak"/>
+  <menu:menuitem menu:id=".uno:DeleteRowbreak"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:FillUp"/>
+  <menu:menuitem menu:id=".uno:FillDown"/>
+  <menu:menuitem menu:id=".uno:FillLeft"/>
+  <menu:menuitem menu:id=".uno:FillRight"/>
+  <menu:menuitem menu:id=".uno:FillSeries"/>
+  <menu:menuitem menu:id=".uno:RandomNumberGeneratorDialog"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:FreezePanesFirstRow"/>
+</menu:menupopup>
--- a/sc/uiconfig/scalc/toolbar/standardbar.xml
+++ b/sc/uiconfig/scalc/toolbar/standardbar.xml
@@ -47,12 +47,8 @@
 <toolbar:toolbaritem xlink:href=".uno:SpellOnline" toolbar:visible="false"/>
 <toolbar:toolbaritem xlink:href=".uno:Navigator" toolbar:visible="false"/>
 <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:InsertRowsBefore"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertRowsAfter" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertColumnsBefore"/>
- <toolbar:toolbaritem xlink:href=".uno:InsertColumnsAfter" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:DeleteRows"/>
- <toolbar:toolbaritem xlink:href=".uno:DeleteColumns"/>
+ <toolbar:toolbaritem xlink:href=".uno:RowOperations"/>
+ <toolbar:toolbaritem xlink:href=".uno:ColumnOperations"/>
 <toolbar:toolbarseparator/>
 <toolbar:toolbaritem xlink:href=".uno:DataSort"/>
 <toolbar:toolbaritem xlink:href=".uno:SortAscending"/>