[Libreoffice-commits] core.git: officecfg/registry sc/source sc/uiconfig sc/UIConfig_scalc.mk

2018-10-11 Thread Libreoffice Gerrit user 
 officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu |5 
 sc/UIConfig_scalc.mk |1 
 sc/source/ui/drawfunc/chartsh.cxx|2 
 sc/uiconfig/scalc/popupmenu/chart.xml|   58 
--
 4 files changed, 1 insertion(+), 65 deletions(-)

New commits:
commit 18446d16ea801f465bb79471f7cf9f3b95ea2e92
Author: Maxim Monastirsky 
AuthorDate: Thu Oct 11 11:00:00 2018 +0300
Commit: Maxim Monastirsky 
CommitDate: Thu Oct 11 23:17:21 2018 +0200

tdf#119580 sc: Use the regular object popupmenu for charts

Context menu of a chart is supposed to be the same as for
other ole objects, except the additional .uno:ExportAsGraphic.
Given that .uno:ExportAsGraphic is hidden when non-chart
object is selected, we can just place it in the regular ole
object popupmenu (done already), and use that menu also for
charts.

Discussion is in https://gerrit.libreoffice.org/60128 .

Change-Id: I8a07c550998e1db0d2af7f87c625dbd258454bdd
Reviewed-on: https://gerrit.libreoffice.org/61678
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky 

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
index b9948964babf..254d52c07e20 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
@@ -35,11 +35,6 @@
   Cell Edit
 
   
-  
-
-  Chart
-
-  
   
 
   Column Header
diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 8a4100f9e209..d6aabe949204 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -18,7 +18,6 @@ $(eval $(call gb_UIConfig_add_popupmenufiles,modules/scalc,\
sc/uiconfig/scalc/popupmenu/audit \
sc/uiconfig/scalc/popupmenu/cell \
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 \
diff --git a/sc/source/ui/drawfunc/chartsh.cxx 
b/sc/source/ui/drawfunc/chartsh.cxx
index 4e9edfad103b..9ab065d3fa80 100644
--- a/sc/source/ui/drawfunc/chartsh.cxx
+++ b/sc/source/ui/drawfunc/chartsh.cxx
@@ -52,7 +52,7 @@ void ScChartShell::InitInterface_Impl()
 SfxVisibilityFlags::Standard | 
SfxVisibilityFlags::Server,
 ToolbarId::Draw_Objectbar);
 
-GetStaticInterface()->RegisterPopupMenu("chart");
+GetStaticInterface()->RegisterPopupMenu("oleobject");
 }
 
 
diff --git a/sc/uiconfig/scalc/popupmenu/chart.xml 
b/sc/uiconfig/scalc/popupmenu/chart.xml
deleted file mode 100644
index e7ddbc87a272..
--- a/sc/uiconfig/scalc/popupmenu/chart.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-
-
-http://openoffice.org/2001/menu;>
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-
-  
-  
-  
-  
-  
-  
-  
-
-  
-  
-
-  
-  
-  
-  
-  
-  
-  
-
-  
-  
-  
-  
-
-  
-  
-  
-  
-
-  
-  
-
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry sc/source sc/uiconfig sc/UIConfig_scalc.mk

2018-04-26 Thread Maxim Monastirsky 
 officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu |5 ++
 sc/UIConfig_scalc.mk |1 
 sc/source/ui/app/inputwin.cxx|   14 

 sc/uiconfig/scalc/popupmenu/formulabar.xml   |   17 
++
 4 files changed, 37 insertions(+)

New commits:
commit 9d9076cb00c474ba7f13d458f1e280e31f5d4bac
Author: Maxim Monastirsky 
Date:   Wed Apr 18 02:49:37 2018 +0300

tdf#57000 Add a context menu to the formula bar input field

As a side effect also fixes tdf#70597

Change-Id: Idd872d93f7a9da50f67c91a11e7e0231c7ac924e
Reviewed-on: https://gerrit.libreoffice.org/53513
Tested-by: Jenkins 
Reviewed-by: Maxim Monastirsky 

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
index 7614ea3827c0..b9948964babf 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
@@ -65,6 +65,11 @@
   Text Box Formatting
 
   
+  
+
+  Formula Bar
+
+  
   
 
   Image
diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index bfbf46305226..6eb7c34d49f9 100644
--- 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/drawtext \
sc/uiconfig/scalc/popupmenu/form \
sc/uiconfig/scalc/popupmenu/formrichtext \
+   sc/uiconfig/scalc/popupmenu/formulabar \
sc/uiconfig/scalc/popupmenu/freezepanes \
sc/uiconfig/scalc/popupmenu/graphic \
sc/uiconfig/scalc/popupmenu/media \
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index fd97dc58d21c..4389cb643cec 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -1418,6 +1418,20 @@ void ScTextWnd::Command( const CommandEvent& rCEvt )
 rBindings.Invalidate( SID_ATTR_CHAR_FONTHEIGHT );
 }
 }
+else if ( nCommand == CommandEventId::ContextMenu )
+{
+SfxViewFrame* pViewFrm = SfxViewFrame::Current();
+if (pViewFrm)
+{
+Point aPos = rCEvt.GetMousePosPixel();
+if (!rCEvt.IsMouseEvent())
+{
+Size aSize = GetOutputSizePixel();
+aPos = Point(aSize.Width() / 2, aSize.Height() / 2);
+}
+pViewFrm->GetDispatcher()->ExecutePopup("formulabar", this, 
);
+}
+}
 else if ( nCommand == CommandEventId::Wheel )
 {
 //don't call InputChanged for CommandEventId::Wheel
diff --git a/sc/uiconfig/scalc/popupmenu/formulabar.xml 
b/sc/uiconfig/scalc/popupmenu/formulabar.xml
new file mode 100644
index ..ce6abf1d393d
--- /dev/null
+++ b/sc/uiconfig/scalc/popupmenu/formulabar.xml
@@ -0,0 +1,17 @@
+
+
+http://openoffice.org/2001/menu;>
+  
+  
+  
+  
+  
+  
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry sc/source sc/uiconfig sc/UIConfig_scalc.mk

2015-12-14 Thread Maxim Monastirsky 
 officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu|   
72 
 officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu |   
65 +++
 officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu |
5 
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |   
10 +
 sc/UIConfig_scalc.mk |   
16 +
 sc/source/ui/drawfunc/chartsh.cxx|
2 
 sc/source/ui/drawfunc/drawsh.cxx |
2 
 sc/source/ui/drawfunc/drformsh.cxx   |
2 
 sc/source/ui/drawfunc/drtxtob.cxx|
2 
 sc/source/ui/drawfunc/graphsh.cxx|
2 
 sc/source/ui/drawfunc/mediash.cxx|
2 
 sc/source/ui/drawfunc/oleobjsh.cxx   |
2 
 sc/source/ui/view/auditsh.cxx|
2 
 sc/source/ui/view/cellsh.cxx |
2 
 sc/source/ui/view/editsh.cxx |
2 
 sc/source/ui/view/pgbrksh.cxx|
2 
 sc/source/ui/view/pivotsh.cxx|
2 
 sc/source/ui/view/prevwsh.cxx|
2 
 sc/uiconfig/scalc/popupmenu/audit.xml|   
17 ++
 sc/uiconfig/scalc/popupmenu/cell.xml |   
40 
 sc/uiconfig/scalc/popupmenu/celledit.xml |   
28 +++
 sc/uiconfig/scalc/popupmenu/chart.xml|   
62 +++
 sc/uiconfig/scalc/popupmenu/draw.xml |   
74 +
 sc/uiconfig/scalc/popupmenu/drawtext.xml |   
24 ++
 sc/uiconfig/scalc/popupmenu/form.xml |   
61 +++
 sc/uiconfig/scalc/popupmenu/graphic.xml  |   
82 ++
 sc/uiconfig/scalc/popupmenu/media.xml|   
63 +++
 sc/uiconfig/scalc/popupmenu/oleobject.xml|   
61 +++
 sc/uiconfig/scalc/popupmenu/pagebreak.xml|   
32 +++
 sc/uiconfig/scalc/popupmenu/pivot.xml|   
15 +
 sc/uiconfig/scalc/popupmenu/preview.xml  |   
17 ++
 31 files changed, 749 insertions(+), 21 deletions(-)

New commits:
commit 1c035f1b0eb6f5e5fbb6c54bf2eea9a6c983eb8f
Author: Maxim Monastirsky 
Date:   Mon Dec 14 17:29:03 2015 +0200

tdf#93837 Convert some Calc context menus to xml

TODO:

- Clean the now unused defines/resources.
- Several submenus are duplicated (in the menubar too). Makes
  sense to refactor them to separate popup menu controllers.

Change-Id: I85505eda1c5fb707b1e6064007f27af7b31452bf
Reviewed-on: https://gerrit.libreoffice.org/20704
Reviewed-by: Maxim Monastirsky 
Tested-by: Maxim Monastirsky 

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index fb15369..80f887c 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -86,6 +86,31 @@
   1
 
   
+  
+
+  Trace ~Precedent
+
+  
+  
+
+  ~Remove Precedent
+
+  
+  
+
+  ~Trace Dependent
+
+  
+  
+
+  Remove Dependent
+
+  
+  
+
+  Exit Fill Mode
+
+  
   
 
   Remove ~All Traces
@@ -180,6 +205,9 @@
 
   Pivot Table Filter
 
+
+  ~Filter...
+
   
   
 
@@ -336,6 +364,9 @@
 
   Pi~vot Table...
 
+
+  ~Edit Layout...
+
 
   1
 
@@ -605,6 +636,9 @@
 
   Delete C~ells...
 
+
+  De~lete...
+
   
   
 
@@ -872,6 +906,9 @@
 
   Comm~ent
 
+
+  Insert Co~mment
+
 
   1
 
@@ -977,6 +1014,9 @@
 
   Cle~ar Cells...
 
+
+  Cl~ear Contents...
+
 
   1
 
@@ -1051,6 +1091,9 @@
 
   Insert ~Cells...
 
+
+  ~Insert...
+
   
   
 
@@ -1212,6 +1255,9 @@
 
   Ce~lls...
 
+