officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 2 +- sc/source/ui/app/scdll.cxx | 2 +- sc/uiconfig/scalc/menubar/menubar.xml | 2 +- sc/uiconfig/scalc/toolbar/standardbar.xml | 4 ++-- sd/source/ui/app/sddll.cxx | 2 +- sd/uiconfig/sdraw/menubar/menubar.xml | 2 +- sd/uiconfig/sdraw/toolbar/standardbar.xml | 4 ++-- sd/uiconfig/simpress/menubar/menubar.xml | 2 +- sd/uiconfig/simpress/toolbar/standardbar.xml | 4 ++-- sw/source/uibase/app/swmodule.cxx | 2 +- sw/uiconfig/swriter/menubar/menubar.xml | 2 +- sw/uiconfig/swriter/toolbar/standardbar.xml | 4 ++-- uui/uiconfig/ui/logindialog.ui | 8 ++++---- 13 files changed, 20 insertions(+), 20 deletions(-)
New commits: commit 66d05f8372c9d7b9b40566156e84d28081133a88 Author: Szymon KÅos <[email protected]> Date: Thu Aug 13 16:28:14 2015 +0200 Move dropdown menu from 'Save As' to 'Save' button Change-Id: I24e9b16ea38811791804e6c85205b304bd781617 diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx index 33e035e..8523868 100644 --- a/sc/source/ui/app/scdll.cxx +++ b/sc/source/ui/app/scdll.cxx @@ -149,7 +149,7 @@ void ScDLL::Init() ScPageBreakShell ::RegisterInterface(pMod); SfxRecentFilesToolBoxControl::RegisterControl(SID_OPEN_CALC, pMod); - SfxSaveAsToolBoxControl::RegisterControl(SID_SAVEASDOC, pMod ); + SfxSaveAsToolBoxControl::RegisterControl(SID_SAVEDOC, pMod ); // Own Controller ScZoomSliderControl ::RegisterControl(SID_PREVIEW_SCALINGFACTOR, pMod); diff --git a/sc/uiconfig/scalc/toolbar/standardbar.xml b/sc/uiconfig/scalc/toolbar/standardbar.xml index 6c19cbd..43a997a 100644 --- a/sc/uiconfig/scalc/toolbar/standardbar.xml +++ b/sc/uiconfig/scalc/toolbar/standardbar.xml @@ -23,8 +23,8 @@ <toolbar:toolbaritem xlink:href=".uno:NewDoc" toolbar:visible="false"/> <toolbar:toolbaritem xlink:href=".uno:OpenFromCalc" toolbar:style="dropdown"/> <toolbar:toolbaritem xlink:href=".uno:OpenRemote" toolbar:visible="false"/> - <toolbar:toolbaritem xlink:href=".uno:Save"/> - <toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:style="dropdown"/> + <toolbar:toolbaritem xlink:href=".uno:Save" toolbar:style="dropdown"/> + <toolbar:toolbaritem xlink:href=".uno:SaveAs"/> <toolbar:toolbaritem xlink:href=".uno:SendMail" toolbar:visible="false"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:EditDoc" toolbar:visible="false"/> diff --git a/sd/source/ui/app/sddll.cxx b/sd/source/ui/app/sddll.cxx index 1564f37..32badfe 100644 --- a/sd/source/ui/app/sddll.cxx +++ b/sd/source/ui/app/sddll.cxx @@ -244,7 +244,7 @@ void SdDLL::RegisterControllers() SvxColorToolBoxControl::RegisterControl(SID_FRAME_LINECOLOR, pMod ); SvxFrameToolBoxControl::RegisterControl(SID_ATTR_BORDER, pMod ); - SfxSaveAsToolBoxControl::RegisterControl(SID_SAVEASDOC, pMod ); + SfxSaveAsToolBoxControl::RegisterControl(SID_SAVEDOC, pMod ); } void SdDLL::Init() diff --git a/sd/uiconfig/sdraw/toolbar/standardbar.xml b/sd/uiconfig/sdraw/toolbar/standardbar.xml index 49b95b4..63d93ea 100644 --- a/sd/uiconfig/sdraw/toolbar/standardbar.xml +++ b/sd/uiconfig/sdraw/toolbar/standardbar.xml @@ -23,8 +23,8 @@ <toolbar:toolbaritem xlink:href=".uno:NewDoc" toolbar:visible="false" toolbar:helpid="5500"/> <toolbar:toolbaritem xlink:href=".uno:Open" toolbar:style="dropdown"/> <toolbar:toolbaritem xlink:href=".uno:OpenRemote" toolbar:visible="false"/> - <toolbar:toolbaritem xlink:href=".uno:Save" toolbar:helpid="5505"/> - <toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:style="dropdown" toolbar:helpid="5502"/> + <toolbar:toolbaritem xlink:href=".uno:Save" toolbar:style="dropdown" toolbar:helpid="5505"/> + <toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:helpid="5502"/> <toolbar:toolbaritem xlink:href=".uno:SendMail" toolbar:visible="false" toolbar:helpid="5331"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:EditDoc" toolbar:helpid="6312" toolbar:visible="false"/> diff --git a/sd/uiconfig/simpress/toolbar/standardbar.xml b/sd/uiconfig/simpress/toolbar/standardbar.xml index bbcc000..96189f3 100644 --- a/sd/uiconfig/simpress/toolbar/standardbar.xml +++ b/sd/uiconfig/simpress/toolbar/standardbar.xml @@ -23,8 +23,8 @@ <toolbar:toolbaritem xlink:href=".uno:NewDoc" toolbar:visible="false"/> <toolbar:toolbaritem xlink:href=".uno:Open" toolbar:style="dropdown"/> <toolbar:toolbaritem xlink:href=".uno:OpenRemote" toolbar:visible="false"/> - <toolbar:toolbaritem xlink:href=".uno:Save"/> - <toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:style="dropdown"/> + <toolbar:toolbaritem xlink:href=".uno:Save" toolbar:style="dropdown"/> + <toolbar:toolbaritem xlink:href=".uno:SaveAs"/> <toolbar:toolbaritem xlink:href=".uno:SendMail" toolbar:visible="false"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:EditDoc" toolbar:visible="false"/> diff --git a/sw/source/uibase/app/swmodule.cxx b/sw/source/uibase/app/swmodule.cxx index 5236516..3f768c3 100644 --- a/sw/source/uibase/app/swmodule.cxx +++ b/sw/source/uibase/app/swmodule.cxx @@ -292,7 +292,7 @@ void SwDLL::RegisterControls() SvxColorToolBoxControl::RegisterControl( SID_EXTRUSION_3D_COLOR, pMod ); - SfxSaveAsToolBoxControl::RegisterControl(SID_SAVEASDOC, pMod ); + SfxSaveAsToolBoxControl::RegisterControl(SID_SAVEDOC, pMod ); SvxClipBoardControl::RegisterControl(SID_PASTE, pMod ); SvxUndoRedoControl::RegisterControl(SID_UNDO, pMod ); SvxUndoRedoControl::RegisterControl(SID_REDO, pMod ); diff --git a/sw/uiconfig/swriter/toolbar/standardbar.xml b/sw/uiconfig/swriter/toolbar/standardbar.xml index b1f7d45..1a9a955 100644 --- a/sw/uiconfig/swriter/toolbar/standardbar.xml +++ b/sw/uiconfig/swriter/toolbar/standardbar.xml @@ -23,8 +23,8 @@ <toolbar:toolbaritem xlink:href=".uno:NewDoc" toolbar:visible="false" toolbar:helpid="5500"/> <toolbar:toolbaritem xlink:href=".uno:OpenFromWriter" toolbar:style="dropdown"/> <toolbar:toolbaritem xlink:href=".uno:OpenRemote" toolbar:visible="false"/> - <toolbar:toolbaritem xlink:href=".uno:Save" toolbar:helpid="5505"/> - <toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:style="dropdown" toolbar:helpid="5502"/> + <toolbar:toolbaritem xlink:href=".uno:Save" toolbar:style="dropdown" toolbar:helpid="5505"/> + <toolbar:toolbaritem xlink:href=".uno:SaveAs" toolbar:helpid="5502"/> <toolbar:toolbaritem xlink:href=".uno:SendMail" toolbar:visible="false" toolbar:helpid="5331"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:EditDoc" toolbar:helpid="6312" toolbar:visible="false"/> commit 70adc1b7f164d9570ae090592f79687ec6f4c3f1 Author: Szymon KÅos <[email protected]> Date: Thu Aug 13 14:37:13 2015 +0200 Rename 'Save as Remote File' to 'Save to Remote Server' Change-Id: Ifc2ac4df5b1800dbc1890c44c86fdfb5bcf2478f diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu index 3ee4ec3..c308833 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -1974,7 +1974,7 @@ </node> <node oor:name=".uno:SaveAsRemote" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> - <value xml:lang="en-US">~Save As Remote File...</value> + <value xml:lang="en-US">~Save to Remote Server</value> </prop> <prop oor:name="Properties" oor:type="xs:int"> <value>1</value> commit 67400c3e950c65f00fe5f116afdc237274c14c89 Author: Szymon KÅos <[email protected]> Date: Thu Aug 13 14:34:27 2015 +0200 reorder of File menu Change-Id: I8265b291554765775871905b0349564131dfa8c7 diff --git a/sc/uiconfig/scalc/menubar/menubar.xml b/sc/uiconfig/scalc/menubar/menubar.xml index 593f71c..09e63ec 100644 --- a/sc/uiconfig/scalc/menubar/menubar.xml +++ b/sc/uiconfig/scalc/menubar/menubar.xml @@ -38,9 +38,9 @@ <!-- .uno:Collaborate menuitem, see CustomTarget_uiconfig.mk --> <menu:menuseparator/> <menu:menuitem menu:id=".uno:Save"/> + <menu:menuitem menu:id=".uno:SaveAsRemote"/> <menu:menuitem menu:id=".uno:SaveAs"/> <menu:menuitem menu:id=".uno:SaveACopy"/> - <menu:menuitem menu:id=".uno:SaveAsRemote"/> <menu:menuitem menu:id=".uno:SaveAll"/> <menu:menuitem menu:id=".uno:CheckOut"/> <menu:menuitem menu:id=".uno:CancelCheckOut"/> diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml b/sd/uiconfig/sdraw/menubar/menubar.xml index c1a9be9..13ee972 100644 --- a/sd/uiconfig/sdraw/menubar/menubar.xml +++ b/sd/uiconfig/sdraw/menubar/menubar.xml @@ -35,9 +35,9 @@ <menu:menuseparator/> <menu:menuitem menu:id=".uno:CloseDoc"/> <menu:menuitem menu:id=".uno:Save"/> + <menu:menuitem menu:id=".uno:SaveAsRemote"/> <menu:menuitem menu:id=".uno:SaveAs"/> <menu:menuitem menu:id=".uno:SaveACopy"/> - <menu:menuitem menu:id=".uno:SaveAsRemote"/> <menu:menuitem menu:id=".uno:SaveAll"/> <menu:menuitem menu:id=".uno:CheckOut"/> <menu:menuitem menu:id=".uno:CancelCheckOut"/> diff --git a/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml index ef87919..42b81b2 100644 --- a/sd/uiconfig/simpress/menubar/menubar.xml +++ b/sd/uiconfig/simpress/menubar/menubar.xml @@ -37,9 +37,9 @@ <menu:menuitem menu:id=".uno:VersionDialog"/> <menu:menuseparator/> <menu:menuitem menu:id=".uno:Save"/> + <menu:menuitem menu:id=".uno:SaveAsRemote"/> <menu:menuitem menu:id=".uno:SaveAs"/> <menu:menuitem menu:id=".uno:SaveACopy"/> - <menu:menuitem menu:id=".uno:SaveAsRemote"/> <menu:menuitem menu:id=".uno:SaveAll"/> <menu:menuitem menu:id=".uno:CheckOut"/> <menu:menuitem menu:id=".uno:CancelCheckOut"/> diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml index 8300196..972a1b0 100644 --- a/sw/uiconfig/swriter/menubar/menubar.xml +++ b/sw/uiconfig/swriter/menubar/menubar.xml @@ -37,9 +37,9 @@ <menu:menuitem menu:id=".uno:VersionDialog"/> <menu:menuseparator/> <menu:menuitem menu:id=".uno:Save"/> + <menu:menuitem menu:id=".uno:SaveAsRemote"/> <menu:menuitem menu:id=".uno:SaveAs"/> <menu:menuitem menu:id=".uno:SaveACopy"/> - <menu:menuitem menu:id=".uno:SaveAsRemote"/> <menu:menuitem menu:id=".uno:SaveAll"/> <menu:menuitem menu:id=".uno:CheckOut"/> <menu:menuitem menu:id=".uno:CancelCheckOut"/> commit 293a0d184fd2d2ef49222a9a47bfde5e2a33995a Author: Szymon KÅos <[email protected]> Date: Thu Aug 13 14:00:16 2015 +0200 left align in the login box Change-Id: I77248f371ffb714a09cce0ef72e1018b4bbc7498 diff --git a/uui/uiconfig/ui/logindialog.ui b/uui/uiconfig/ui/logindialog.ui index 6ce2dea..ca47ea5 100644 --- a/uui/uiconfig/ui/logindialog.ui +++ b/uui/uiconfig/ui/logindialog.ui @@ -123,7 +123,7 @@ <object class="GtkLabel" id="accountft"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">1</property> + <property name="xalign">0</property> <property name="label" translatable="yes">A_ccount:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">accounted</property> @@ -137,7 +137,7 @@ <object class="GtkLabel" id="passwordft"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">1</property> + <property name="xalign">0</property> <property name="label" translatable="yes">Pass_word:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">passworded</property> @@ -176,7 +176,7 @@ <object class="GtkLabel" id="nameft"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">1</property> + <property name="xalign">0</property> <property name="label" translatable="yes">_User name:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">nameed</property> @@ -190,7 +190,7 @@ <object class="GtkLabel" id="pathft"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">1</property> + <property name="xalign">0</property> <property name="label" translatable="yes">_Path:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">pathed</property>
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
