[Libreoffice-commits] core.git: icon-themes/galaxy icon-themes/tango officecfg/registry svx/sdi sw/sdi sw/source sw/uiconfig
Tomaž Vajngerl
quikee at gmail.com
Sat May 11 10:15:45 PDT 2013
icon-themes/galaxy/cmd/lc_rotateleft.png |binary
icon-themes/galaxy/cmd/lc_rotateright.png |binary
icon-themes/galaxy/cmd/sc_rotateleft.png |binary
icon-themes/galaxy/cmd/sc_rotateright.png |binary
icon-themes/tango/cmd/lc_rotateleft.png |binary
icon-themes/tango/cmd/lc_rotateright.png |binary
icon-themes/tango/cmd/sc_rotateleft.png |binary
icon-themes/tango/cmd/sc_rotateright.png |binary
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 5
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu | 16 ++
svx/sdi/svx.sdi | 4
sw/sdi/_grfsh.sdi | 9 +
sw/source/ui/app/mn.src | 6 -
sw/source/ui/inc/grfsh.hxx | 5
sw/source/ui/shells/grfsh.cxx | 57 +++++++---
sw/uiconfig/sglobal/menubar/menubar.xml | 6 +
sw/uiconfig/sglobal/toolbar/graphicobjectbar.xml | 2
sw/uiconfig/sweb/menubar/menubar.xml | 6 +
sw/uiconfig/swform/menubar/menubar.xml | 6 +
sw/uiconfig/swform/toolbar/graphicobjectbar.xml | 2
sw/uiconfig/swreport/menubar/menubar.xml | 6 +
sw/uiconfig/swreport/toolbar/graphicobjectbar.xml | 2
sw/uiconfig/swriter/menubar/menubar.xml | 6 +
sw/uiconfig/swriter/toolbar/graphicobjectbar.xml | 2
sw/uiconfig/swxform/menubar/menubar.xml | 6 +
sw/uiconfig/swxform/toolbar/graphicobjectbar.xml | 2
26 files changed, 123 insertions(+), 25 deletions(-)
New commits:
commit 4bdbf360360bcc39929a18a4226a6ad1a22d8630
Author: Tomaž Vajngerl <quikee at gmail.com>
Date: Sat May 11 19:02:34 2013 +0200
fdo#34423 Add Rotate Left/Right to toolbar and menubar.
Additionally added Tango and Galaxy icon and some renaming to be
more general (not just specific to Graphic).
Change-Id: I5886246e25457ca5412be8743dcb001b02ebd65b
diff --git a/icon-themes/galaxy/cmd/lc_rotateleft.png b/icon-themes/galaxy/cmd/lc_rotateleft.png
new file mode 100644
index 0000000..aaa4c24
Binary files /dev/null and b/icon-themes/galaxy/cmd/lc_rotateleft.png differ
diff --git a/icon-themes/galaxy/cmd/lc_rotateright.png b/icon-themes/galaxy/cmd/lc_rotateright.png
new file mode 100644
index 0000000..334dcab
Binary files /dev/null and b/icon-themes/galaxy/cmd/lc_rotateright.png differ
diff --git a/icon-themes/galaxy/cmd/sc_rotateleft.png b/icon-themes/galaxy/cmd/sc_rotateleft.png
new file mode 100644
index 0000000..2ff5570
Binary files /dev/null and b/icon-themes/galaxy/cmd/sc_rotateleft.png differ
diff --git a/icon-themes/galaxy/cmd/sc_rotateright.png b/icon-themes/galaxy/cmd/sc_rotateright.png
new file mode 100644
index 0000000..d51aaa5
Binary files /dev/null and b/icon-themes/galaxy/cmd/sc_rotateright.png differ
diff --git a/icon-themes/tango/cmd/lc_rotateleft.png b/icon-themes/tango/cmd/lc_rotateleft.png
new file mode 100644
index 0000000..aaa4c24
Binary files /dev/null and b/icon-themes/tango/cmd/lc_rotateleft.png differ
diff --git a/icon-themes/tango/cmd/lc_rotateright.png b/icon-themes/tango/cmd/lc_rotateright.png
new file mode 100644
index 0000000..334dcab
Binary files /dev/null and b/icon-themes/tango/cmd/lc_rotateright.png differ
diff --git a/icon-themes/tango/cmd/sc_rotateleft.png b/icon-themes/tango/cmd/sc_rotateleft.png
new file mode 100644
index 0000000..2ff5570
Binary files /dev/null and b/icon-themes/tango/cmd/sc_rotateleft.png differ
diff --git a/icon-themes/tango/cmd/sc_rotateright.png b/icon-themes/tango/cmd/sc_rotateright.png
new file mode 100644
index 0000000..d51aaa5
Binary files /dev/null and b/icon-themes/tango/cmd/sc_rotateright.png differ
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 3a1e15f..8ff9b74 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -5354,6 +5354,11 @@
<value xml:lang="en-US">~Flip</value>
</prop>
</node>
+ <node oor:name=".uno:RotateMenu" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Ro~tate</value>
+ </prop>
+ </node>
<node oor:name=".uno:AnchorMenu" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">A~nchor</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 29c886b..5b33a62 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -736,6 +736,22 @@
<value>1</value>
</prop>
</node>
+ <node oor:name=".uno:RotateLeft" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Rotate 90° ~Left</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:RotateRight" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Rotate 90° ~Right</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
+ </node>
<node oor:name=".uno:NewHtmlDoc" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Create ~HTML Document</value>
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index 0778bb4..3705878 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -5964,7 +5964,7 @@ SfxVoidItem ExternalEdit SID_EXTERNAL_EDIT
GroupId = GID_GRAPHIC;
]
-SfxVoidItem RotateGraphicLeft SID_ROTATE_GRAPHIC_LEFT
+SfxVoidItem RotateLeft SID_ROTATE_GRAPHIC_LEFT
[
/* flags: */
@@ -5988,7 +5988,7 @@ SfxVoidItem RotateGraphicLeft SID_ROTATE_GRAPHIC_LEFT
GroupId = GID_GRAPHIC;
]
-SfxVoidItem RotateGraphicRight SID_ROTATE_GRAPHIC_RIGHT
+SfxVoidItem RotateRight SID_ROTATE_GRAPHIC_RIGHT
[
/* flags: */
diff --git a/sw/sdi/_grfsh.sdi b/sw/sdi/_grfsh.sdi
index 491d01a..508b995 100644
--- a/sw/sdi/_grfsh.sdi
+++ b/sw/sdi/_grfsh.sdi
@@ -46,30 +46,35 @@ interface BaseTextGraphic
[
ExecMethod = Execute ;
StateMethod = GetAttrState ;
+ DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
SID_COMPRESS_GRAPHIC
[
ExecMethod = Execute ;
StateMethod = GetAttrState ;
+ DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
SID_EXTERNAL_EDIT
[
ExecMethod = Execute ;
StateMethod = GetAttrState ;
+ DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
SID_ROTATE_GRAPHIC_LEFT
[
ExecMethod = ExecuteRotation ;
- StateMethod = GetAttrState ;
+ StateMethod = GetAttrStateForRotation ;
+ DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
SID_ROTATE_GRAPHIC_RIGHT
[
ExecMethod = ExecuteRotation ;
- StateMethod = GetAttrState ;
+ StateMethod = GetAttrStateForRotation ;
+ DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
SID_INSERT_GRAPHIC // zeigt auf FN_FORMAT_GRAFIC_DLG
diff --git a/sw/source/ui/app/mn.src b/sw/source/ui/app/mn.src
index 3c230f9..630411e 100644
--- a/sw/source/ui/app/mn.src
+++ b/sw/source/ui/app/mn.src
@@ -1294,7 +1294,7 @@ Menu MN_GRF_POPUPMENU
{
Identifier = SID_MENU_MANAGE_GRAPHIC ;
Command = ".uno:ManageGraphicMenu" ;
- Text [ en-US ] = "~Manage Graphic" ;
+ Text [ en-US ] = "~Rotate Image" ;
SubMenu = Menu
{
ItemList =
@@ -1302,13 +1302,13 @@ Menu MN_GRF_POPUPMENU
MenuItem
{
Identifier = SID_ROTATE_GRAPHIC_LEFT ;
- Command = ".uno:RotateGraphicLeft" ;
+ Command = ".uno:RotateLeft" ;
Text [ en-US ] = "Rotate 90° Left" ;
};
MenuItem
{
Identifier = SID_ROTATE_GRAPHIC_RIGHT ;
- Command = ".uno:RotateGraphicRight" ;
+ Command = ".uno:RotateRight" ;
Text [ en-US ] = "Rotate 90° Right" ;
};
};
diff --git a/sw/source/ui/inc/grfsh.hxx b/sw/source/ui/inc/grfsh.hxx
index b956786..a963d95 100644
--- a/sw/source/ui/inc/grfsh.hxx
+++ b/sw/source/ui/inc/grfsh.hxx
@@ -27,11 +27,12 @@ public:
SFX_DECL_INTERFACE(SW_GRFSHELL)
void Execute(SfxRequest& rRequest);
- void ExecuteRotation(SfxRequest &rRequest);
void ExecAttr(SfxRequest& rRequest);
-
void GetAttrState(SfxItemSet& rRequest);
+ void ExecuteRotation(SfxRequest &rRequest);
+ void GetAttrStateForRotation(SfxItemSet& rRequest);
+
SwGrfShell(SwView &rView);
};
diff --git a/sw/source/ui/shells/grfsh.cxx b/sw/source/ui/shells/grfsh.cxx
index 17c441c..feceaae 100644
--- a/sw/source/ui/shells/grfsh.cxx
+++ b/sw/source/ui/shells/grfsh.cxx
@@ -595,22 +595,6 @@ void SwGrfShell::GetAttrState(SfxItemSet &rSet)
if( rSh.GetGraphicType() == GRAPHIC_NONE )
bDisable = true;
break;
- case SID_ROTATE_GRAPHIC_LEFT:
- case SID_ROTATE_GRAPHIC_RIGHT:
- if( rSh.GetGraphicType() == GRAPHIC_NONE )
- {
- bDisable = true;
- }
- else
- {
- Graphic aGraphic = *rSh.GetGraphic();
- GraphicNativeTransform aTransform(aGraphic);
- if (!aTransform.canBeRotated())
- {
- bDisable = true;
- }
- }
- break;
case SID_COLOR_SETTINGS:
{
if ( bParentCntProt || !bIsGrfCntnt )
@@ -787,6 +771,47 @@ void SwGrfShell::ExecuteRotation(SfxRequest &rReq)
rShell.EndAllAction();
}
+void SwGrfShell::GetAttrStateForRotation(SfxItemSet &rSet)
+{
+ SwWrtShell& rShell = GetShell();
+ bool bIsParentContentProtected = 0 != rShell.IsSelObjProtected( FLYPROTECT_CONTENT|FLYPROTECT_PARENT );
+
+ SetGetStateSet( &rSet );
+
+ SfxWhichIter aIterator( rSet );
+ sal_uInt16 nWhich = aIterator.FirstWhich();
+ while( nWhich )
+ {
+ bool bDisable = bIsParentContentProtected;
+ switch( nWhich )
+ {
+ case SID_ROTATE_GRAPHIC_LEFT:
+ case SID_ROTATE_GRAPHIC_RIGHT:
+ if( rShell.GetGraphicType() == GRAPHIC_NONE )
+ {
+ bDisable = true;
+ }
+ else
+ {
+ Graphic aGraphic = *rShell.GetGraphic();
+ GraphicNativeTransform aTransform(aGraphic);
+ if (!aTransform.canBeRotated())
+ {
+ bDisable = true;
+ }
+ }
+ break;
+ default:
+ bDisable = false;
+ }
+
+ if( bDisable )
+ rSet.DisableItem( nWhich );
+ nWhich = aIterator.NextWhich();
+ }
+ SetGetStateSet( 0 );
+}
+
SwGrfShell::SwGrfShell(SwView &_rView) :
SwBaseShell(_rView)
diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml b/sw/uiconfig/sglobal/menubar/menubar.xml
index 92d6d01..51acde7 100644
--- a/sw/uiconfig/sglobal/menubar/menubar.xml
+++ b/sw/uiconfig/sglobal/menubar/menubar.xml
@@ -319,6 +319,12 @@
<menu:menuitem menu:id=".uno:FlipVertical"/>
</menu:menupopup>
</menu:menu>
+ <menu:menu menu:id=".uno:RotateMenu">
+ <menu:menupopup>
+ <menu:menuitem menu:id=".uno:RotateLeft"/>
+ <menu:menuitem menu:id=".uno:RotateRight"/>
+ </menu:menupopup>
+ </menu:menu>
<menu:menu menu:id=".uno:GroupMenu">
<menu:menupopup>
<menu:menuitem menu:id=".uno:FormatGroup"/>
diff --git a/sw/uiconfig/sglobal/toolbar/graphicobjectbar.xml b/sw/uiconfig/sglobal/toolbar/graphicobjectbar.xml
index 4b942df..6e7201c 100644
--- a/sw/uiconfig/sglobal/toolbar/graphicobjectbar.xml
+++ b/sw/uiconfig/sglobal/toolbar/graphicobjectbar.xml
@@ -28,6 +28,8 @@
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:FlipVertical" toolbar:helpid="20426"/>
<toolbar:toolbaritem xlink:href=".uno:FlipHorizontal" toolbar:helpid="20425"/>
+ <toolbar:toolbaritem xlink:href=".uno:RotateLeft" toolbar:helpid=""/>
+ <toolbar:toolbaritem xlink:href=".uno:RotateRight" toolbar:helpid=""/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:FrameDialog" toolbar:helpid="20458"/>
</toolbar:toolbar>
diff --git a/sw/uiconfig/sweb/menubar/menubar.xml b/sw/uiconfig/sweb/menubar/menubar.xml
index e51a1c7..6022a3d 100644
--- a/sw/uiconfig/sweb/menubar/menubar.xml
+++ b/sw/uiconfig/sweb/menubar/menubar.xml
@@ -264,6 +264,12 @@
<menu:menuitem menu:id=".uno:FlipVertical"/>
</menu:menupopup>
</menu:menu>
+ <menu:menu menu:id=".uno:RotateMenu">
+ <menu:menupopup>
+ <menu:menuitem menu:id=".uno:RotateLeft"/>
+ <menu:menuitem menu:id=".uno:RotateRight"/>
+ </menu:menupopup>
+ </menu:menu>
<menu:menu menu:id=".uno:GroupMenu">
<menu:menupopup>
<menu:menuitem menu:id=".uno:FormatGroup"/>
diff --git a/sw/uiconfig/swform/menubar/menubar.xml b/sw/uiconfig/swform/menubar/menubar.xml
index bd471d4..870dad3 100644
--- a/sw/uiconfig/swform/menubar/menubar.xml
+++ b/sw/uiconfig/swform/menubar/menubar.xml
@@ -318,6 +318,12 @@
<menu:menuitem menu:id=".uno:FlipVertical"/>
</menu:menupopup>
</menu:menu>
+ <menu:menu menu:id=".uno:RotateMenu">
+ <menu:menupopup>
+ <menu:menuitem menu:id=".uno:RotateLeft"/>
+ <menu:menuitem menu:id=".uno:RotateRight"/>
+ </menu:menupopup>
+ </menu:menu>
<menu:menu menu:id=".uno:GroupMenu">
<menu:menupopup>
<menu:menuitem menu:id=".uno:FormatGroup"/>
diff --git a/sw/uiconfig/swform/toolbar/graphicobjectbar.xml b/sw/uiconfig/swform/toolbar/graphicobjectbar.xml
index 4b942df..6e7201c 100644
--- a/sw/uiconfig/swform/toolbar/graphicobjectbar.xml
+++ b/sw/uiconfig/swform/toolbar/graphicobjectbar.xml
@@ -28,6 +28,8 @@
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:FlipVertical" toolbar:helpid="20426"/>
<toolbar:toolbaritem xlink:href=".uno:FlipHorizontal" toolbar:helpid="20425"/>
+ <toolbar:toolbaritem xlink:href=".uno:RotateLeft" toolbar:helpid=""/>
+ <toolbar:toolbaritem xlink:href=".uno:RotateRight" toolbar:helpid=""/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:FrameDialog" toolbar:helpid="20458"/>
</toolbar:toolbar>
diff --git a/sw/uiconfig/swreport/menubar/menubar.xml b/sw/uiconfig/swreport/menubar/menubar.xml
index 788612e..8b81c84 100644
--- a/sw/uiconfig/swreport/menubar/menubar.xml
+++ b/sw/uiconfig/swreport/menubar/menubar.xml
@@ -319,6 +319,12 @@
<menu:menuitem menu:id=".uno:FlipVertical"/>
</menu:menupopup>
</menu:menu>
+ <menu:menu menu:id=".uno:RotateMenu">
+ <menu:menupopup>
+ <menu:menuitem menu:id=".uno:RotateLeft"/>
+ <menu:menuitem menu:id=".uno:RotateRight"/>
+ </menu:menupopup>
+ </menu:menu>
<menu:menu menu:id=".uno:GroupMenu">
<menu:menupopup>
<menu:menuitem menu:id=".uno:FormatGroup"/>
diff --git a/sw/uiconfig/swreport/toolbar/graphicobjectbar.xml b/sw/uiconfig/swreport/toolbar/graphicobjectbar.xml
index 4b942df..6e7201c 100644
--- a/sw/uiconfig/swreport/toolbar/graphicobjectbar.xml
+++ b/sw/uiconfig/swreport/toolbar/graphicobjectbar.xml
@@ -28,6 +28,8 @@
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:FlipVertical" toolbar:helpid="20426"/>
<toolbar:toolbaritem xlink:href=".uno:FlipHorizontal" toolbar:helpid="20425"/>
+ <toolbar:toolbaritem xlink:href=".uno:RotateLeft" toolbar:helpid=""/>
+ <toolbar:toolbaritem xlink:href=".uno:RotateRight" toolbar:helpid=""/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:FrameDialog" toolbar:helpid="20458"/>
</toolbar:toolbar>
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml
index 284cfe7..3c43740 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -327,6 +327,12 @@
<menu:menuitem menu:id=".uno:FlipVertical"/>
</menu:menupopup>
</menu:menu>
+ <menu:menu menu:id=".uno:RotateMenu">
+ <menu:menupopup>
+ <menu:menuitem menu:id=".uno:RotateLeft"/>
+ <menu:menuitem menu:id=".uno:RotateRight"/>
+ </menu:menupopup>
+ </menu:menu>
<menu:menu menu:id=".uno:GroupMenu">
<menu:menupopup>
<menu:menuitem menu:id=".uno:FormatGroup"/>
diff --git a/sw/uiconfig/swriter/toolbar/graphicobjectbar.xml b/sw/uiconfig/swriter/toolbar/graphicobjectbar.xml
index 4b942df..6e7201c 100644
--- a/sw/uiconfig/swriter/toolbar/graphicobjectbar.xml
+++ b/sw/uiconfig/swriter/toolbar/graphicobjectbar.xml
@@ -28,6 +28,8 @@
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:FlipVertical" toolbar:helpid="20426"/>
<toolbar:toolbaritem xlink:href=".uno:FlipHorizontal" toolbar:helpid="20425"/>
+ <toolbar:toolbaritem xlink:href=".uno:RotateLeft" toolbar:helpid=""/>
+ <toolbar:toolbaritem xlink:href=".uno:RotateRight" toolbar:helpid=""/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:FrameDialog" toolbar:helpid="20458"/>
</toolbar:toolbar>
diff --git a/sw/uiconfig/swxform/menubar/menubar.xml b/sw/uiconfig/swxform/menubar/menubar.xml
index e651ae6..d74d3c8 100644
--- a/sw/uiconfig/swxform/menubar/menubar.xml
+++ b/sw/uiconfig/swxform/menubar/menubar.xml
@@ -320,6 +320,12 @@
<menu:menuitem menu:id=".uno:FlipVertical"/>
</menu:menupopup>
</menu:menu>
+ <menu:menu menu:id=".uno:RotateMenu">
+ <menu:menupopup>
+ <menu:menuitem menu:id=".uno:RotateLeft"/>
+ <menu:menuitem menu:id=".uno:RotateRight"/>
+ </menu:menupopup>
+ </menu:menu>
<menu:menu menu:id=".uno:GroupMenu">
<menu:menupopup>
<menu:menuitem menu:id=".uno:FormatGroup"/>
diff --git a/sw/uiconfig/swxform/toolbar/graphicobjectbar.xml b/sw/uiconfig/swxform/toolbar/graphicobjectbar.xml
index 4b942df..6e7201c 100644
--- a/sw/uiconfig/swxform/toolbar/graphicobjectbar.xml
+++ b/sw/uiconfig/swxform/toolbar/graphicobjectbar.xml
@@ -28,6 +28,8 @@
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:FlipVertical" toolbar:helpid="20426"/>
<toolbar:toolbaritem xlink:href=".uno:FlipHorizontal" toolbar:helpid="20425"/>
+ <toolbar:toolbaritem xlink:href=".uno:RotateLeft" toolbar:helpid=""/>
+ <toolbar:toolbaritem xlink:href=".uno:RotateRight" toolbar:helpid=""/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:FrameDialog" toolbar:helpid="20458"/>
</toolbar:toolbar>
More information about the Libreoffice-commits
mailing list