Re: The mouse-centered zooming work from last year
Hi Tor, On 03/01/2013 05:48 PM, Tor Lillqvist wrote: Last year there was work by Tim Hardeck to implement mouse-centered zooming. See http://nabble.documentfoundation.org/Libreoffice-ux-advise-PATCH-Mouse-centered-zooming-td3906261.html for instance. For some reason that work never got included in the sources, I guess there were some glitches still in it and then Tim didn't have more time to work on it, or something. the patch/concept was not accepted by ux-advise. I have talked to Michael Meeks at the time and he suggested that people would expect something similar to pinch to zoom, like Google Earth. The problem was that a zooming implementation like this would have needed a pixel based approach so I would have needed to start all over again and I didn't have the time afterward. Is there any reason to not have another go at it? You most likely would have to start from scratch to implement pinch to zoom but except of that it would be great to have something like this in Libreoffice. (Tim, is the patch attached to the email linked to above the last version of this work?) Yes it is. Regards Tim -- SUSE LINUX Products GmbH, GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer, HRB 16746 (AG Nürnberg) Maxfeldstr. 5, 90409 Nürnberg, Germany T: +49 (0) 911 74053-0 F: +49 (0) 911 74053-483 http://www.suse.de/ ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
fix Writer table functions printed wrongly
Tim Hardeck has abandoned this change. Change subject: fix Writer table functions printed wrongly .. Patch Set 1: Abandoned Like I have mentioned in the bug report I wasn't sure if it is the right fix and I didn't had much time to look into it. Thanks for the review and the correct fix. -- To view, visit https://gerrit.libreoffice.org/1597 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: Idd3a634f1e8a1f97e4ee8359a11da9793f9ac307 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Tim Hardeck Gerrit-Reviewer: Michael Stahl ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fix Writer table functions printed wrongly
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1597 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/97/1597/1 fix Writer table functions printed wrongly This patch fixes fdo#58074: Writer table functions are not calculated before printing. Change-Id: Idd3a634f1e8a1f97e4ee8359a11da9793f9ac307 --- M sw/source/core/doc/docfld.cxx 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx index 3fe8a0b..14a5a4f 100644 --- a/sw/source/core/doc/docfld.cxx +++ b/sw/source/core/doc/docfld.cxx @@ -347,7 +347,9 @@ if( !pNewHt ) break; default: -(*pFldTypes)[i]->ModifyNotification ( 0, pNewHt ); +if( pNewHt ) { +(*pFldTypes)[i]->ModifyNotification ( 0, pNewHt ); +} } } -- To view, visit https://gerrit.libreoffice.org/1597 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idd3a634f1e8a1f97e4ee8359a11da9793f9ac307 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Tim Hardeck ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] added zoom submenu to View
Hi Kendy, thanks for the review. I have pushed it to master. Regards Tim On 06/14/2012 05:54 PM, Jan Holesovsky wrote: > Hi Tim, > > On 2012-06-13 at 15:49 +0200, Tim Hardeck wrote: > >> I have added a zoom submenu to View with the same entries of the zoom >> status bar right mouse button menu. >> Additionally the zoom menu entries were sorted in a more logical way. > > Looks good to me - do you have a push access? If yes, please go ahead, > and push the changes :-) > >> During testing I found out that LO does crash if the function "Page >> Width" is used in Calc in the "Page Preview" but this also does happen >> with the current master branch so it should be unrelated. > > Sounds like worth a Most Annoying Bug report, if you haven't filed it > yet. > > All the best, > Kendy > > ___ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/libreoffice -- SUSE LINUX Products GmbH, GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer, HRB 16746 (AG Nürnberg) Maxfeldstr. 5, 90409 Nürnberg, Germany T: +49 (0) 911 74053-0 F: +49 (0) 911 74053-483 http://www.suse.de/ signature.asc Description: OpenPGP digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
How to change zoom from sfx2 appserv?
Hi, I am working on a new zoom sub menu which should have the same functionality as the Zoom dialog. http://www.mail-archive.com/design@global.libreoffice.org/msg03561.html I have added the sub menu globally so I am able to react to inputs in sfx2/source/appl/appserv.cxx but the problem is that I am unable to pass along the SvxZoomItem because it depends on sfx2. Does anybody have an idea how to change the Zoom from appserv.cxx? Maybe it is possible to use the functions of the original zoom dialog ( cui/source/dialogs/zoom.cxx )? Otherwise I would have to add the menu to every LO app locally and create the needed Execute points for each of them. Regards Tim -- SUSE LINUX Products GmbH, GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer, HRB 16746 (AG Nürnberg) Maxfeldstr. 5, 90409 Nürnberg, Germany T: +49 (0) 911 74053-0 F: +49 (0) 911 74053-483 http://www.suse.de/ From caa4e8ca64c8405f2b30e81899a5f8f9d212c8be Mon Sep 17 00:00:00 2001 From: Tim Hardeck Date: Wed, 2 May 2012 11:39:19 +0200 Subject: [PATCH] Added Zoom sub-menu to View Added Zoom sub-menu to View with the same entries of the zoom status bar right mouse button menu. Additionally the zoom menu entries were sorted in a more logical way. Change-Id: I88c8fa1af98a89b260adf72e61b1987a42156d67 --- configmgr/qa/unit/data.xcd |6 +- .../org/openoffice/Office/UI/GenericCommands.xcu | 26 ++- reportdesign/uiconfig/dbreport/menubar/menubar.xml | 15 +- sc/uiconfig/scalc/menubar/menubar.xml | 15 +- sd/uiconfig/sdraw/menubar/menubar.xml | 15 +- sd/uiconfig/simpress/menubar/menubar.xml | 15 +- sfx2/inc/sfx2/sfxsids.hrc | 14 +- sfx2/sdi/appslots.sdi | 32 +++ sfx2/sdi/sfx.sdi | 222 sfx2/source/appl/appserv.cxx | 12 ++ starmath/uiconfig/smath/menubar/menubar.xml| 15 +- svx/source/stbctrls/stbctrls.src | 48 ++--- sw/uiconfig/sglobal/menubar/menubar.xml| 15 +- sw/uiconfig/sweb/menubar/menubar.xml | 15 +- sw/uiconfig/swform/menubar/menubar.xml | 15 +- sw/uiconfig/swreport/menubar/menubar.xml | 15 +- sw/uiconfig/swriter/menubar/menubar.xml| 15 +- sw/uiconfig/swxform/menubar/menubar.xml| 15 +- 18 files changed, 482 insertions(+), 43 deletions(-) diff --git a/configmgr/qa/unit/data.xcd b/configmgr/qa/unit/data.xcd index f4d5461..700339d 100755 --- a/configmgr/qa/unit/data.xcd +++ b/configmgr/qa/unit/data.xcd @@ -1787,7 +1787,7 @@ - Zoom 100% + 100% 1 @@ -1803,7 +1803,7 @@ - Zoom Page + Entire Page 1 @@ -2660,7 +2660,7 @@ - Zoom Page Width + Page Width 1 diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu index 58ad5be..ea498f3 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -1698,14 +1698,34 @@ ~Options... + + +200% + + + + +150% + + -Zoom 100% +100% 1 + + +75% + + + + +50% + + Gamma @@ -1716,7 +1736,7 @@ -Zoom Page +Entire Page 1 @@ -2612,7 +2632,7 @@ -Zoom Page Width +Page Width 1 diff --git a/reportdesign/uiconfig/dbreport/menubar/menubar.xml b/reportdesign/uiconfig/dbreport/menubar/menubar.xml index 1ac58e4..9d29b31 100644 --- a/reportdesign/uiconfig/dbreport/menubar/menubar.xml +++ b/reportdesign/uiconfig/dbreport/menubar/menubar.xml @@ -142,7 +142,20
Re: [Libreoffice-ux-advise] [PATCH] Mouse centered zooming
Hi, so I did some testing and I think the most confusing part is the reversed shifting during zoom out. Since the image section is increased during zoom out normally no additional focus is needed that's why I have disabled shifting during zoom out. This again might result into a little problem with Calc since it doesn't focus the center during zoom but always keeps the upper left cell where it is. But the upper left cell anchor only does make sense for Calc without mouse centered zooming because with it the user can control the focus during zooming in. For example without mouse centered zooming if a user wants to increase the view of a cell on the right or bottom it does get shifted out of the screen while zooming in so s/he would always have to use the scroll bars afterwards. I haven't changed the focus of Calc with this patch yet but if my current concept looks more promising then the last I can implement screen centered zooming for Calc so all LO apps would act the same. So what do you think? Regards Tim On 04/16/2012 01:29 PM, Michael Meeks wrote: > Hi Tim, > > On Thu, 2012-04-12 at 21:35 +0200, Tim Hardeck wrote: >> During zoom out the direction is reversed to get back near the starting >> point. This is disabled for Calc since it doesn't focus the center but >> instead keeps the upper left cell where it is so reversing the zoom >> direction feels not intuitive. > > I gave this a test, and it's unclear quite what to expect here. eg. I > create a draw document, insert a stock box shape in the top right, move > my mouse to over the top of a specific corner of that, and scroll-in. > > What I'd expect (perhaps) is that the point that the mouse is over > grows large around that point, ie. that point would be the equivalent of > the center between two fingers of 'pinch to zoom' ;-) it seems instead > that what is (was) underneath the mouse moves to the centre of the > screen - is that intended ? > > Also - if I zoom in, move the mouse and zoom in again - then zoom out > the behaviour can seem a little strange ... > > IMHO we need some more UI thought / testing around this before merging > (sorry to be a pain ! ;-) hopefully there are other, easier things to be > done in parallel while the spec. firms up - and sorry for landing you > with this deeply vague task ;-) > > Thanks ! > > Michael. > -- SUSE LINUX Products GmbH, GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer, HRB 16746 (AG Nürnberg) Maxfeldstr. 5, 90409 Nürnberg, Germany T: +49 (0) 911 74053-0 F: +49 (0) 911 74053-483 http://www.suse.de/ From 700f5c6b1695042176f61ebdc6a459ea439a3534 Mon Sep 17 00:00:00 2001 From: Tim Hardeck Date: Thu, 22 Mar 2012 16:50:19 +0100 Subject: [PATCH] Mouse centered zooming This patch integrates mouse centered zooming which means that the position of the mouse is used as a target during zooming. So the screen position is shifted in the direction of the pointer. If the mouse is near the center (currently 20% to each side) the focus isn't changed. During zoom out the mouse position is ignored since the image section is increased and not narrowed. Except of Writer only the the mouse wheel scrolling is affected by this patch. The zooming behavior of Writer was changed to focus the screen center instead of the upper left corner. --- basegfx/inc/basegfx/tools/zoomtools.hxx |8 ++- basegfx/source/tools/zoomtools.cxx | 38 ++- sc/source/ui/inc/tabview.hxx|2 +- sc/source/ui/inc/viewdata.hxx |4 ++-- sc/source/ui/view/tabview.cxx |9 +++- sc/source/ui/view/tabview5.cxx |4 ++-- sc/source/ui/view/viewdata.cxx | 19 +--- sd/source/ui/inc/ViewShell.hxx |2 +- sd/source/ui/inc/Window.hxx |2 +- sd/source/ui/view/sdwindow.cxx | 20 +--- sd/source/ui/view/viewshe2.cxx |4 ++-- sd/source/ui/view/viewshel.cxx |2 +- sw/source/ui/inc/view.hxx |6 +++-- sw/source/ui/uiview/viewmdi.cxx | 31 + sw/source/ui/uiview/viewport.cxx|6 - 15 files changed, 131 insertions(+), 26 deletions(-) diff --git a/basegfx/inc/basegfx/tools/zoomtools.hxx b/basegfx/inc/basegfx/tools/zoomtools.hxx index 44d9052..ec11043 100644 --- a/basegfx/inc/basegfx/tools/zoomtools.hxx +++ b/basegfx/inc/basegfx/tools/zoomtools.hxx @@ -36,12 +36,18 @@ namespace basegfx { -/** This namespace provides functions for optimized geometric zooming +/** +* This namespace provides functions for optimized geometric and +* mouse centered zooming. */ namespace zoomtools { +// geometric zooming BASEGFX_DLLPUBLIC long zoomOut(long nCurrent); BA
Re: [Libreoffice-ux-advise] [PATCH] Mouse centered zooming
On 04/16/2012 01:29 PM, Michael Meeks wrote: > I gave this a test, and it's unclear quite what to expect here. eg. I > create a draw document, insert a stock box shape in the top right, move > my mouse to over the top of a specific corner of that, and scroll-in. > > What I'd expect (perhaps) is that the point that the mouse is over > grows large around that point, ie. that point would be the equivalent of > the center between two fingers of 'pinch to zoom' ;-) it seems instead > that what is (was) underneath the mouse moves to the centre of the > screen - is that intended ? The origin was to fix the unintuitive zooming in Writer. Instead of zooming to the upper left corner it now zooms to the center of the screen by default. But often the problem is that when zooming in the object you wanted to see gets partly moved out of screen if it wasn't perfectly in focus before. So that's where the mouse centered zooming comes into play so the user just moves the mouse where s/he wants to look. At first I thought too that it might make sense to jump directly to the mouse position but in this case LO would have to move the mouse around otherwise the user would land somewhere else if the mouse wheel is moved more then once which is often the case. And I am not sure if it is easy possible let alone desired to let LO move the mouse around. That's why the mouse position is used as a target for shifting so the user is able to move the mouse back on its own as soon the target is focused. Right now the shift speed is static but it could be changed to consider the mouse distance from the center. > Also - if I zoom in, move the mouse and zoom in again - then zoom out > the behaviour can seem a little strange ... > > IMHO we need some more UI thought / testing around this before merging > (sorry to be a pain ! ;-) hopefully there are other, easier things to be > done in parallel while the spec. firms up - and sorry for landing you > with this deeply vague task ;-) Yes, it is not perfect that's why I have sent it to ux-advise to get more feedback. Nevertheless I think after getting used to it should work fine for most use cases (maybe after some optimizations of the center area and shift speed). Anyway I could create a patch to enabled just the screen centered zooming in Writer, which is imho the only LO app with an unintuitive zooming behavior. Regards Tim -- SUSE LINUX Products GmbH, GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer, HRB 16746 (AG Nürnberg) Maxfeldstr. 5, 90409 Nürnberg, Germany T: +49 (0) 911 74053-0 F: +49 (0) 911 74053-483 http://www.suse.de/ signature.asc Description: OpenPGP digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Mouse centered zooming
Hi, this patch integrates mouse centered zooming which means that the position of the mouse is used as a target during zooming. So the screen position is shifted in the direction of the pointer. If the mouse is near the center (currently 20% to each side) the focus isn't changed. During zoom out the direction is reversed to get back near the starting point. This is disabled for Calc since it doesn't focus the center but instead keeps the upper left cell where it is so reversing the zoom direction feels not intuitive. To have the same behavior in Calc as in all other LO applications the slashes in front of "bZoomIn = false" in sc/source/ui/view/tabview.cxx have to be removed. Except of Writer only the the mouse wheel scrolling is affected by this patch. The zooming behavior of Writer was changed to focus the screen center instead of the upper left corner. It was suggested that there shouldn't be an option for this new zooming behavior so there is none. Regards Tim -- SUSE LINUX Products GmbH, GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer, HRB 16746 (AG Nürnberg) Maxfeldstr. 5, 90409 Nürnberg, Germany T: +49 (0) 911 74053-0 F: +49 (0) 911 74053-483 http://www.suse.de/ From cb8726c9aac044b0a13d35b69186985a8c844061 Mon Sep 17 00:00:00 2001 From: Tim Hardeck Date: Thu, 22 Mar 2012 16:50:19 +0100 Subject: [PATCH] Mouse centered zooming This patch integrates mouse centered zooming which means that the position of the mouse is used as a target during zooming. So the screen position is shifted in the direction of the pointer. If the mouse is near the center (currently 20% to each side) the focus isn't changed. During zoom out the direction is reversed to get back near the starting point. This is disabled for Calc since it doesn't focus the center but instead keeps the upper left cell where it is so reversing the zoom direction feels not intuitive. Except of Writer only the the mouse wheel scrolling is affected by this patch. The zooming behavior of Writer was changed to focus the screen center instead of the upper left corner. --- basegfx/inc/basegfx/tools/zoomtools.hxx |8 ++- basegfx/source/tools/zoomtools.cxx | 36 ++- sc/source/ui/inc/tabview.hxx|2 +- sc/source/ui/inc/viewdata.hxx |4 +- sc/source/ui/view/tabview.cxx |9 +++- sc/source/ui/view/tabview5.cxx |4 +- sc/source/ui/view/viewdata.cxx | 19 +-- sd/source/ui/inc/ViewShell.hxx |2 +- sd/source/ui/inc/Window.hxx |2 +- sd/source/ui/view/sdwindow.cxx | 20 ++-- sd/source/ui/view/viewshe2.cxx |4 +- sd/source/ui/view/viewshel.cxx |2 +- sw/source/ui/inc/view.hxx |6 +++- sw/source/ui/uiview/viewmdi.cxx | 31 +++--- sw/source/ui/uiview/viewport.cxx|6 - 15 files changed, 129 insertions(+), 26 deletions(-) diff --git a/basegfx/inc/basegfx/tools/zoomtools.hxx b/basegfx/inc/basegfx/tools/zoomtools.hxx index 44d9052..ec11043 100644 --- a/basegfx/inc/basegfx/tools/zoomtools.hxx +++ b/basegfx/inc/basegfx/tools/zoomtools.hxx @@ -36,12 +36,18 @@ namespace basegfx { -/** This namespace provides functions for optimized geometric zooming +/** +* This namespace provides functions for optimized geometric and +* mouse centered zooming. */ namespace zoomtools { +// geometric zooming BASEGFX_DLLPUBLIC long zoomOut(long nCurrent); BASEGFX_DLLPUBLIC long zoomIn(long nCurrent); + +// mouse centered zooming +BASEGFX_DLLPUBLIC long shiftZoomPos( long nMousePos, long nWinSize, long nShiftSpeed, bool bZoomIn ); } } diff --git a/basegfx/source/tools/zoomtools.cxx b/basegfx/source/tools/zoomtools.cxx index 34b0b8c..856ff1d 100644 --- a/basegfx/source/tools/zoomtools.cxx +++ b/basegfx/source/tools/zoomtools.cxx @@ -32,7 +32,6 @@ namespace basegfx { namespace zoomtools { - /** 2^(1/6) as the default step This ensures (unless the rounding is used) that 6 steps lead @@ -129,6 +128,41 @@ long zoomOut(long nCurrent) nNew = enforceStep(nNew, nCurrent, 25); return nNew; } + + +/** +* Returns how far and in which direction to move the screen position by +* considering the current mouse location in relation to the center. +* 0 is returned if the difference between the mouse position and the center +* is below nMouseTolerance. +* If bZoomIn is false the return value is reversed to allow getting back +* near the starting position. +* +* @param nMousePos mouse position on the appropriate axis +* @param nWinSize length of the appropriate window size +* @param nShiftSpeeddistance to move in one direction +* @param bZoomIntrue if zooming in +*/ +long shiftZoomPos( long nMousePos, long nWinSize, long nShiftSpeed, bool bZoomIn) +{ +// the toleranc
Re: [Libreoffice] [PUSHED] Re: [PATCH] optimized zoom to use more common intervals
Hi Kendy, thanks for the commit and cleanup. I also thought that 1.2 was a better fit so fine with me. Regards Tim On Wednesday 25 January 2012 12:46:02 Jan Holesovsky wrote: > Hi Tim, > > On 2012-01-24 at 17:38 +0100, Tim Hardeck wrote: > > > thanks for the information, I have attached a new patch and also 25% is > > enforced like Stefan requested. > > Great stuff - I've pushed that: > > http://cgit.freedesktop.org/libreoffice/core/commit/?id=315d2ddc161e4b296febe9e54c3cfc9270310bfe > > I did a minor stylistic cleanup - I've hidden the helper functions > (supposedly you did not want to make them public?), and reduced the > indentation in zoomtools.cxx; no point in having the entire file > starting at 8th position - I hope it is OK for you :-) > > Also I changed the ZOOM_FACTOR from 1.1 to 2^(1/4), it feels better > here, the 1.1 means way too much wheel rotation to increase / decrease > the zoom considerably; but of course can be changed easily when another > value feels better. And now with your nice embedding of this stuff, > even the pre-defined values would be easy to implement, should there be > demand for that - nice work! > > Thank you, > Kendy > > ___ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/libreoffice > -- SUSE LINUX Products GmbH, GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer, HRB 16746 (AG Nürnberg) Maxfeldstr. 5, 90409 Nürnberg, Germany T: +49 (0) 911 74053-0 F: +49 (0) 911 74053-483 http://www.suse.de/ signature.asc Description: This is a digitally signed message part. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] optimized zoom to use more common intervals
Hi Korrawit, thanks for the information, I have attached a new patch and also 25% is enforced like Stefan requested. Regards Tim On Tuesday 24 January 2012 12:13:20 Korrawit Pruegsanusak wrote: > Hello Tim, > > Thanks for your patch. :-) > I didn't test it yet, but just my nitpick: could you please remove the > #include > which I added to make the build success ? > It seems to be unused now. > > And FYI, Jan Holesovsky changed the zoom factor to 2^(1/4). > http://cgit.freedesktop.org/libreoffice/core/commit/?id=a18c8a06073650e12f3c1f9f8990670484ac5cf1 > > Best Regards, > -- SUSE LINUX Products GmbH, GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer, HRB 16746 (AG Nürnberg) Maxfeldstr. 5, 90409 Nürnberg, Germany T: +49 (0) 911 74053-0 F: +49 (0) 911 74053-483 http://www.suse.de/ From 31f1589af188ff87ebbde08b956fa73a34d96745 Mon Sep 17 00:00:00 2001 From: Tim Hardeck Date: Wed, 18 Jan 2012 16:42:55 +0100 Subject: [PATCH] optimized zoom to use more common intervals Round zoom values beginning with 50 to a multiple of 5, with 100 to one of 10, with 500 to one of 50 and with 1000 to one of 100. The step 100 is enforced to have one fixed point. The zoom factor was also changed from 1.2 to 1.1. --- basegfx/Library_basegfx.mk |1 + basegfx/Package_inc.mk |1 + basegfx/StaticLibrary_basegfx_s.mk |1 + basegfx/inc/basegfx/tools/zoomtools.hxx | 57 + basegfx/source/tools/zoomtools.cxx | 141 +++ sc/source/ui/view/prevwsh.cxx |6 +- sc/source/ui/view/tabview.cxx |7 +- sd/source/ui/view/viewshel.cxx |7 +- svx/inc/svx/zoom_def.hxx|4 - svx/source/stbctrls/zoomsliderctrl.cxx |7 +- sw/source/ui/uiview/viewport.cxx|7 +- 11 files changed, 216 insertions(+), 23 deletions(-) create mode 100644 basegfx/inc/basegfx/tools/zoomtools.hxx create mode 100644 basegfx/source/tools/zoomtools.cxx diff --git a/basegfx/Library_basegfx.mk b/basegfx/Library_basegfx.mk index fa0607b..fc6a479 100644 --- a/basegfx/Library_basegfx.mk +++ b/basegfx/Library_basegfx.mk @@ -66,6 +66,7 @@ $(eval $(call gb_Library_add_linked_libs,basegfx,\ $(eval $(call gb_Library_add_exception_objects,basegfx,\ basegfx/source/tools/b2dclipstate \ basegfx/source/tools/canvastools \ + basegfx/source/tools/zoomtools \ basegfx/source/tools/gradienttools \ basegfx/source/tools/keystoplerp \ basegfx/source/tools/liangbarsky \ diff --git a/basegfx/Package_inc.mk b/basegfx/Package_inc.mk index 5767a8f..13b5ff8 100644 --- a/basegfx/Package_inc.mk +++ b/basegfx/Package_inc.mk @@ -37,6 +37,7 @@ $(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/tools/unopolypolygon.h $(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/tools/tools.hxx,basegfx/tools/tools.hxx)) $(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/tools/unotools.hxx,basegfx/tools/unotools.hxx)) $(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/tools/gradienttools.hxx,basegfx/tools/gradienttools.hxx)) +$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/tools/zoomtools.hxx,basegfx/tools/zoomtools.hxx)) $(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/numeric/ftools.hxx,basegfx/numeric/ftools.hxx)) $(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/tuple/b3i64tuple.hxx,basegfx/tuple/b3i64tuple.hxx)) $(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/tuple/b3dtuple.hxx,basegfx/tuple/b3dtuple.hxx)) diff --git a/basegfx/StaticLibrary_basegfx_s.mk b/basegfx/StaticLibrary_basegfx_s.mk index 79d6ed9..69616f7 100644 --- a/basegfx/StaticLibrary_basegfx_s.mk +++ b/basegfx/StaticLibrary_basegfx_s.mk @@ -72,6 +72,7 @@ $(WORKDIR)/CustomTarget/basegfx/source/%.cxx : $(SRCDIR)/basegfx/source/%.cxx $(eval $(call gb_StaticLibrary_add_generated_exception_objects,basegfx_s,\ CustomTarget/basegfx/source/tools/liangbarsky \ CustomTarget/basegfx/source/tools/canvastools \ + CustomTarget/basegfx/source/tools/zoomtools \ CustomTarget/basegfx/source/tools/gradienttools \ CustomTarget/basegfx/source/tools/keystoplerp \ CustomTarget/basegfx/source/tools/unopolypolygon \ diff --git a/basegfx/inc/basegfx/tools/zoomtools.hxx b/basegfx/inc/basegfx/tools/zoomtools.hxx new file mode 100644 index 000..8deb385 --- /dev/null +++ b/basegfx/inc/basegfx/tools/zoomtools.hxx @@ -0,0 +1,57 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * Version: MPL 1.1 / GPLv3+ / LGPLv3+ + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License or as specified alternatively below. You may obtain a copy of + * the License at http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND,
Re: [Libreoffice] [PATCH] optimized zoom to use more common intervals
Hi Stefan, thanks for testing. If 25% is an important number the function enforceStep could be used, if my patch gets accepted. But if other/more specific numbers are also important we really should consider using static/preprocessed zooming levels instead like the Adobe Reader seems to have. Regards Tim On Sunday 22 January 2012 13:21:22 Stefan Knorr (Astron) wrote: > Hi Tim, > > finally got around to compiling with your patch in and testing the > whole thing a bit and think I like the experience. Although, I would > still love if you could make sure that we in all cases reach exactly > 25% zoom at some point (not just 24 and 26). > Thanks for your work. > > Astron. > -- SUSE LINUX Products GmbH, GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer, HRB 16746 (AG Nürnberg) Maxfeldstr. 5, 90409 Nürnberg, Germany T: +49 (0) 911 74053-0 F: +49 (0) 911 74053-483 http://www.suse.de/ signature.asc Description: This is a digitally signed message part. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH] optimized zoom to use more common intervals
Hi, this patch does round zoom values beginning with 50 to a multiple of 5, with 100 to one of 10, with 500 to one of 50 and with 1000 to one of 100. The step 100 is enforced to have one fixed point. The zoom factor was also changed from 1.2 to 1.1. Regards Tim -- SUSE LINUX Products GmbH, GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer, HRB 16746 (AG Nürnberg) Maxfeldstr. 5, 90409 Nürnberg, Germany T: +49 (0) 911 74053-0 F: +49 (0) 911 74053-483 http://www.suse.de/ From 594d7b4f6821cbe98b65c3a8c235f86ad7f2dcbc Mon Sep 17 00:00:00 2001 From: Tim Hardeck Date: Wed, 18 Jan 2012 16:42:55 +0100 Subject: [PATCH] optimized zoom to use more common intervals Round zoom values beginning with 50 to a multiple of 5, with 100 to one of 10, with 500 to one of 50 and with 1000 to one of 100. The step 100 is enforced to have one fixed point. The zoom factor was also changed from 1.2 to 1.1. --- basegfx/Library_basegfx.mk |1 + basegfx/Package_inc.mk |1 + basegfx/StaticLibrary_basegfx_s.mk |1 + basegfx/inc/basegfx/tools/zoomtools.hxx | 57 + basegfx/source/tools/zoomtools.cxx | 139 +++ sc/source/ui/view/prevwsh.cxx |5 +- sc/source/ui/view/tabview.cxx |6 +- sd/source/ui/view/viewshel.cxx |6 +- svx/inc/svx/zoom_def.hxx|3 - svx/source/stbctrls/zoomsliderctrl.cxx |6 +- sw/source/ui/uiview/viewport.cxx|6 +- 11 files changed, 214 insertions(+), 17 deletions(-) create mode 100644 basegfx/inc/basegfx/tools/zoomtools.hxx create mode 100644 basegfx/source/tools/zoomtools.cxx diff --git a/basegfx/Library_basegfx.mk b/basegfx/Library_basegfx.mk index fa0607b..fc6a479 100644 --- a/basegfx/Library_basegfx.mk +++ b/basegfx/Library_basegfx.mk @@ -66,6 +66,7 @@ $(eval $(call gb_Library_add_linked_libs,basegfx,\ $(eval $(call gb_Library_add_exception_objects,basegfx,\ basegfx/source/tools/b2dclipstate \ basegfx/source/tools/canvastools \ + basegfx/source/tools/zoomtools \ basegfx/source/tools/gradienttools \ basegfx/source/tools/keystoplerp \ basegfx/source/tools/liangbarsky \ diff --git a/basegfx/Package_inc.mk b/basegfx/Package_inc.mk index 5767a8f..13b5ff8 100644 --- a/basegfx/Package_inc.mk +++ b/basegfx/Package_inc.mk @@ -37,6 +37,7 @@ $(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/tools/unopolypolygon.h $(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/tools/tools.hxx,basegfx/tools/tools.hxx)) $(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/tools/unotools.hxx,basegfx/tools/unotools.hxx)) $(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/tools/gradienttools.hxx,basegfx/tools/gradienttools.hxx)) +$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/tools/zoomtools.hxx,basegfx/tools/zoomtools.hxx)) $(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/numeric/ftools.hxx,basegfx/numeric/ftools.hxx)) $(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/tuple/b3i64tuple.hxx,basegfx/tuple/b3i64tuple.hxx)) $(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/tuple/b3dtuple.hxx,basegfx/tuple/b3dtuple.hxx)) diff --git a/basegfx/StaticLibrary_basegfx_s.mk b/basegfx/StaticLibrary_basegfx_s.mk index 79d6ed9..69616f7 100644 --- a/basegfx/StaticLibrary_basegfx_s.mk +++ b/basegfx/StaticLibrary_basegfx_s.mk @@ -72,6 +72,7 @@ $(WORKDIR)/CustomTarget/basegfx/source/%.cxx : $(SRCDIR)/basegfx/source/%.cxx $(eval $(call gb_StaticLibrary_add_generated_exception_objects,basegfx_s,\ CustomTarget/basegfx/source/tools/liangbarsky \ CustomTarget/basegfx/source/tools/canvastools \ + CustomTarget/basegfx/source/tools/zoomtools \ CustomTarget/basegfx/source/tools/gradienttools \ CustomTarget/basegfx/source/tools/keystoplerp \ CustomTarget/basegfx/source/tools/unopolypolygon \ diff --git a/basegfx/inc/basegfx/tools/zoomtools.hxx b/basegfx/inc/basegfx/tools/zoomtools.hxx new file mode 100644 index 000..8deb385 --- /dev/null +++ b/basegfx/inc/basegfx/tools/zoomtools.hxx @@ -0,0 +1,57 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * Version: MPL 1.1 / GPLv3+ / LGPLv3+ + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License or as specified alternatively below. You may obtain a copy of + * the License at http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * Major Contributor(s): + * Copyright (C) 2012 Tim Hardeck + * + * All Rights Reserved. + * + * For minor contributions see the git repository. + * + * Alternatively, the contents of this file may be used under the terms of + * ei
Re: [Libreoffice] There is no round() in msvc library (fdo#44173)
Hi Korrawit, thanks for testing and your hints how to address the problem. The reason why I was using round was to reduce the difference between the positions while scrolling in one direction and then back. With round it takes more steps to reach a position where they will differ slightly. Since this is not a big problem round could be removed. To my knowledge the type conversion does already act like floor() so a simple removal should be enough. But if ::boost::math::iround will be used in other places or if there is already another usable round function - what does Calc use? - I would replace the function with the os independent counter part. Regards Tim On Sunday 15 January 2012 16:03:33 Korrawit Pruegsanusak wrote: > Hello Tim, all, > > Your patch addressing fdo#44173 regarding zoom level [1] cause the > windows msvc tinderbox failure. > [1] > http://cgit.freedesktop.org/libreoffice/core/commit/?id=022ce7d362f146ed69f54aae20cf2b8c582e9f8d > > Actually, the one to blame is the msvc library, because it doesn't > have round() function. > And I have two methods to resolve this: > > 1. Use ::boost::math::iround. (patch attached) > This solution comes from http://stackoverflow.com/a/5849630 > This has advantage that it won't fail in any platform, I hope ;-), and > it's really "round" the value. > > But as the round.hpp header isn't delivered yet, we have to modify > some boost makefile, then we have to: > > A. Clean boost (rm -rf $INPATH), then rebuild it. I've tried > incremental `build && deliver` but it didn't help. > But this led to almost all rebuild in tail_build, IMHO because it > triggered the dependency tree, ie boost header is just delivered => > rebuild all files which include the boost! I don't think anyone > (except tinderbox) love this. :-) > > OR B. Change the added line into real command (variables > substitution) and run it, then `deliver`. Such as: > @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/format > $(INCCOM)$/$(PRJNAME) > I run it as: > ./libo/boost/wntmsci12.pro/ $ cp -r > ./misc/build/boost_1_44_0/boost/format ./inc/boost > etc. This wouldn't trigger the dependency tree to rebuild. It just > delivered only new files. > > Note: I don't know why we have to "normalize" and deliver just > only some part of boost library. Because the rest is unused? This > cause the problem when we want to use more library than the delivered > ones, as in this case. ;-) > > Since I discovered the (B.) too late, so I'm in the middle of ~clean > tail_build, but a build passed the modified files well ... > > 2. Instead of round(), take it as ceil() or floor(). This has > advantage that you don't need to rebuild. But it won't really > "round()". > Anyway, I don't think it will cause much difference, except in a very > large/small number. > > Or will we use floor(x+0.5); ? This behaves like round() only for > positive numbers, which we don't have negative zoom factor anyway. :-) > > I don't test this method yet, and I don't know whether we have to > #include or something. But the linux/mac build passed well > (in tinderbox), so maybe we don't need including? > > Please feel free to comment or correct me if I'm wrong :-) > Best Regards, > -- SUSE LINUX Products GmbH, GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer, HRB 16746 (AG Nürnberg) Maxfeldstr. 5, 90409 Nürnberg, Germany T: +49 (0) 911 74053-0 F: +49 (0) 911 74053-483 http://www.suse.de/ signature.asc Description: This is a digitally signed message part. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] make dev-install error, dict-xx.oxt files not found
Hi Winfried, I think running "git pull -r" in core/dictionaries should fix this. Tim On 01/03/2012 12:10 PM, Winfried Donkers wrote: > > I often get a failed make dev_install when building following a git > pull --rebase. > > The error is that dict-xx.oxt (today they were dict-an.oxt, > dict-be.oxt, dict-el.oxt, dict-gd.oxt, dict-si.oxt and dict-te.oxt) > files cannot be found. > > This occurred also after a clean git clone on a new machine. > > > > My quick and dirty solution is to copy dict-en.oxt to the missing > ones, as I am not currently interested in these dictionaries. > > But there should be a proper solution/cause to be fixed. > > > > Can anyone help me on this? > > > > > > Winfried > > > > > > ___ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/libreoffice -- SUSE LINUX Products GmbH, GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer, HRB 16746 (AG Nürnberg) Maxfeldstr. 5, 90409 Nürnberg, Germany T: +49 (0) 911 74053-0 F: +49 (0) 911 74053-483 http://www.suse.de/ signature.asc Description: OpenPGP digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH] Fixed wrong scaling of the anchor icons
Hi , the size of the anchor icons, handles and similar were always one pixel too small which resulted in a blurry image. This should be fixed but I am not sure why 1.0 was subtracted in the first place. Tim -- SUSE LINUX Products GmbH, GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer, HRB 16746 (AG Nürnberg) Maxfeldstr. 5, 90409 Nürnberg, Germany T: +49 (0) 911 74053-0 F: +49 (0) 911 74053-483 http://www.suse.de/ From 7411e0f0fd840d43a6fdc47bf9cbe76a984dd51e Mon Sep 17 00:00:00 2001 From: Tim Hardeck Date: Wed, 23 Nov 2011 18:33:54 +0100 Subject: [PATCH] Fixed wrong scaling of the anchor icons The size of the anchor icons, handles and similar were always one pixel too small which resulted in a blurry image. --- svx/source/sdr/overlay/overlaytools.cxx |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/svx/source/sdr/overlay/overlaytools.cxx b/svx/source/sdr/overlay/overlaytools.cxx index cdaea55..f431ff2 100644 --- a/svx/source/sdr/overlay/overlaytools.cxx +++ b/svx/source/sdr/overlay/overlaytools.cxx @@ -72,8 +72,8 @@ namespace drawinglayer // and unrotated, more like a marker const double fLeft(((0.0 - getCenterX()) * getDiscreteUnit()) + getBasePosition().getX()); const double fTop(((0.0 - getCenterY()) * getDiscreteUnit()) + getBasePosition().getY()); -const double fRightaBitmapSize.getWidth() - 1.0) - getCenterX()) * getDiscreteUnit()) + getBasePosition().getX()); -const double fBottomaBitmapSize.getHeight() - 1.0) - getCenterY()) * getDiscreteUnit()) + getBasePosition().getY()); +const double fRight(((aBitmapSize.getWidth() - getCenterX()) * getDiscreteUnit()) + getBasePosition().getX()); +const double fBottom(((aBitmapSize.getHeight() - getCenterY()) * getDiscreteUnit()) + getBasePosition().getY()); // create a BitmapPrimitive2D using those positions basegfx::B2DHomMatrix aTransform; -- 1.7.3.4 signature.asc Description: OpenPGP digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] Start Impress without the wizard by default
Hi Michael, On 11/18/2011 04:54 PM, Michael Meeks wrote: > Right, just changing that default would be easier. Tim - the best way > (or at least what I'd do) to find that is to cp -a your > ~/.config/libreoffice to somewhere else; change the setting, exit, then > diff -ur on the files, perhaps xmlint --format them, and diff -u again - > then hack the default setting in officecfg. > > Any chance you can tweak your patch to that ? sure, that should be it. Tim -- SUSE LINUX Products GmbH, GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer, HRB 16746 (AG Nürnberg) Maxfeldstr. 5, 90409 Nürnberg, Germany T: +49 (0) 911 74053-0 F: +49 (0) 911 74053-483 http://www.suse.de/ From 7de6c6cd01cc34c62d03a7dcb2a1c9fa27befc1b Mon Sep 17 00:00:00 2001 From: Tim Hardeck Date: Fri, 18 Nov 2011 15:20:10 +0100 Subject: [PATCH] Start Impress without the wizard by default This one-liner prevents the Impress Wizard from getting started automatically. The assistant should now only appear if File -> Wizards -> Presentation is used. --- .../schema/org/openoffice/Office/Impress.xcs |2 +- sd/source/ui/app/optsitem.cxx |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs index 16634f5..2876a29 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs @@ -588,7 +588,7 @@ Indicates whether to show the autopilot when creating a new presentation. Start with AutoPilots - true + false diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx index d5eec0a..666ea0d 100644 --- a/sd/source/ui/app/optsitem.cxx +++ b/sd/source/ui/app/optsitem.cxx @@ -488,7 +488,7 @@ SdOptionsMisc::SdOptionsMisc( sal_uInt16 nConfigId, sal_Bool bUseConfig ) : OUString() ), nDefaultObjectSizeWidth(8000), nDefaultObjectSizeHeight(5000), -bStartWithTemplate( sal_True ), +bStartWithTemplate( sal_False ), bMarkedHitMovesAlways( sal_True ), bMoveOnlyDragging( sal_False ), bCrookNoContortion( sal_False ), -- 1.7.3.4 signature.asc Description: OpenPGP digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [Libreoffice-ux-advise] [PATCH] Make the toolbars not popping-up randomly
Hi, On 11/21/2011 04:40 PM, Cor Nouws wrote: > Hi Kendy :-) > > Jan Holesovsky wrote (21-11-11 16:25) > >> The problem with docking them there is that if you let the behavior as >> it is now (pop-up when you are in the bullet list / table / etc., and >> disappear when you leave that), then your document will be jumping left >> and right, which would be incredibly annoying :-( > > I know the effect. > But from my own experience (if I was too lay to just hide the tool > bars) and from what I have read from others, it is far less annoying > then when the toolbar is docked at the top. > And the advantages compared to docking them at the bottom... well, I > wrote about that already. > But it's a choice. I'm fine with both. Yes, I have tried to position the toolbar at the left and right and unlike at the bottom the page gets rescaled which I would find annoying too. Another thing is that most people have wide screens in which case the bottom should be at least as fast accessible as the side so I wouldn't change the current position. If the page wouldn't be rescaled though the side would be fine with me too. > >> That's why I thought of the 'context icons'. > > Great idea - no objections from me against that. Just some extra work ;-) > And yes, Kendy's suggestion looks great although there have to be a fallback for full screen, higher zoom level and similar. Tim -- SUSE LINUX Products GmbH, GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer, HRB 16746 (AG Nürnberg) Maxfeldstr. 5, 90409 Nürnberg, Germany T: +49 (0) 911 74053-0 F: +49 (0) 911 74053-483 http://www.suse.de/ signature.asc Description: OpenPGP digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH] Start Impress without the wizard by default
Hi, this one-liner should prevent the Impress Wizard from getting started automatically. The assistant should now only appear if File -> Wizards -> Presentation is used. Tim -- SUSE LINUX Products GmbH, GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer, HRB 16746 (AG Nürnberg) Maxfeldstr. 5, 90409 Nürnberg, Germany T: +49 (0) 911 74053-0 F: +49 (0) 911 74053-483 http://www.suse.de/ From a315467b9bf3459f9327933710b9082bea186a10 Mon Sep 17 00:00:00 2001 From: Tim Hardeck Date: Fri, 18 Nov 2011 15:20:10 +0100 Subject: [PATCH] Start Impress without the wizard by default This one-liner prevents the Impress Wizard from getting started automatically. The assistant should now only appear if File -> Wizards -> Presentation is used. --- sd/source/ui/app/sdmod1.cxx |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx index e9bb01a..563475a 100644 --- a/sd/source/ui/app/sdmod1.cxx +++ b/sd/source/ui/app/sdmod1.cxx @@ -574,7 +574,7 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq ) bool bStartWithTemplate = pOpt->IsStartWithTemplate(); bool bNewDocDirect = rReq.GetSlot() == SID_NEWSD; -if( bNewDocDirect && !bStartWithTemplate ) +if( bNewDocDirect ) { //we start without wizard -- 1.7.3.4 signature.asc Description: OpenPGP digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH] Make the toolbars not popping-up randomly
Hi, Undocked, context sensitive toolbars often tend to overlay important parts of the document. With this patch these toolbars should be docked to the bottom to prevent the document from being moved each time the toolbar is displayed. Furthermore the findbar setting was changed to make sure that it stays on top of the other toolbars at the bottom. After working with these files I would suggest to consolidate them if possible. Like one global default file for all applications, since many toolbars are shared and evenly treated. For every application and the dialogs which really need a special default configuration only the difference to the global one is stored and not parts of it. In this case for example I could have moved the tableobjectbar with one instead of eight changes to the bottom. This change should also have no influence on the user configuration since these files are only relevant for the default settings. So what do you think? Tim -- SUSE LINUX Products GmbH, GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer, HRB 16746 (AG Nürnberg) Maxfeldstr. 5, 90409 Nürnberg, Germany T: +49 (0) 911 74053-0 F: +49 (0) 911 74053-483 http://www.suse.de/ From 77d26829e9b8872cc80a151a2dbbaced998e44b7 Mon Sep 17 00:00:00 2001 From: Tim Hardeck Date: Wed, 16 Nov 2011 19:12:06 +0100 Subject: [PATCH] Make the toolbars not popping-up randomly Undocked, context sensitive toolbars often tend to overlay important parts of a document. With this patch these toolbars are docked to the bottom to prevent the document from being moved each time the toolbar is displayed. Furthermore the findbar setting was changed to make sure that it stays on top of the other toolbars at the bottom. --- .../openoffice/Office/UI/BasicIDEWindowState.xcu | 10 ++- .../org/openoffice/Office/UI/CalcWindowState.xcu | 10 ++- .../org/openoffice/Office/UI/DrawWindowState.xcu | 49 +++-- .../openoffice/Office/UI/ImpressWindowState.xcu| 49 +++-- .../openoffice/Office/UI/WriterFormWindowState.xcu | 66 +++--- .../Office/UI/WriterGlobalWindowState.xcu | 73 +--- .../Office/UI/WriterReportWindowState.xcu | 67 +++--- .../openoffice/Office/UI/WriterWebWindowState.xcu | 45 +++-- .../org/openoffice/Office/UI/WriterWindowState.xcu | 71 --- .../org/openoffice/Office/UI/XFormsWindowState.xcu | 58 +-- 10 files changed, 423 insertions(+), 75 deletions(-) diff --git a/officecfg/registry/data/org/openoffice/Office/UI/BasicIDEWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/BasicIDEWindowState.xcu index 031a01a..4debaed 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/BasicIDEWindowState.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/BasicIDEWindowState.xcu @@ -112,8 +112,14 @@ Toolbox + +0,0 + + +1 + -false +true true @@ -148,7 +154,7 @@ -1,0 +0,3 1 diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu index ace87a1a..81736a6 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu @@ -295,7 +295,7 @@ -1,0 +0,3 true @@ -540,8 +540,14 @@ + +0,0 + + +1 + -false +true Fontwork diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu index 0a7f591..5ac84cb 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu @@ -30,11 +30,14 @@ + +0,0 + -0 +1 -false +true true @@ -108,7 +111,7 @@ -1,0 +0,3
Re: [Libreoffice] SolidMarkHandles - [PATCH] removed Simple Handles option entries from help
On 11/10/2011 05:10 PM, Michael Meeks wrote: >> I miss changes in the help files > Right ! any chance you can dig into that Tim ? (wow you'll have seen > ~all of the suite after this task ;-). Sure, I think this should be it. Tim -- SUSE LINUX Products GmbH, GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer, HRB 16746 (AG Nürnberg) Maxfeldstr. 5, 90409 Nürnberg, Germany T: +49 (0) 911 74053-0 F: +49 (0) 911 74053-483 http://www.suse.de/ From 10c290fad0812802b62385e2bf4e8070448288e9 Mon Sep 17 00:00:00 2001 From: Tim Hardeck Date: Thu, 10 Nov 2011 19:04:02 +0100 Subject: [PATCH] removed Simple Handles option entries from help Removed the help entries and files about the Simple Handles option. --- helpcontent2/helpers/help_hid.lst |3 - helpcontent2/helpers/longnames_commands.csv|1 - helpcontent2/helpers/uno-commands.csv |1 - helpcontent2/helpers/uno_hid.lst |1 - helpcontent2/helpers/unocmds.txt |1 - helpcontent2/source/text/sdraw/main0213.xhp|2 - .../source/text/shared/optionen/01040200.xhp |3 - .../source/text/shared/optionen/01060100.xhp |8 +-- helpcontent2/source/text/simpress/02/1307.xhp | 66 helpcontent2/source/text/simpress/02/makefile.mk |1 - helpcontent2/source/text/simpress/main0213.xhp |2 - helpcontent2/util/sdraw/makefile.mk|1 - helpcontent2/util/simpress/makefile.mk |1 - 13 files changed, 2 insertions(+), 89 deletions(-) delete mode 100644 helpcontent2/source/text/simpress/02/1307.xhp diff --git a/helpcontent2/helpers/help_hid.lst b/helpcontent2/helpers/help_hid.lst index ffb9de2..769934d 100644 --- a/helpcontent2/helpers/help_hid.lst +++ b/helpcontent2/helpers/help_hid.lst @@ -5359,7 +5359,6 @@ SID_GRID_VISIBLE,27322,.uno:GridVisible SID_GROUP,10454,.uno:FormatGroup SID_GROUPVIEW,6621, SID_GROW_FONT_SIZE,11042, -SID_HANDLES_DRAFT,27150,.uno:HandlesDraft SID_HANDOUTMODE,27070,.uno:HandoutMode SID_HANDOUT_MASTERPAGE,27349,.uno:HandoutMasterPage SID_HANGUL_HANJA_CONVERSION,10959,.uno:HangulHanjaConversion @@ -7082,7 +7081,6 @@ sc_CheckBox_RID_SCPAGE_CONTENT_CB_CLIP,958186529, sc_CheckBox_RID_SCPAGE_CONTENT_CB_FORMULA,958186517, sc_CheckBox_RID_SCPAGE_CONTENT_CB_GRID,958186553, sc_CheckBox_RID_SCPAGE_CONTENT_CB_GUIDELINE,958186556, -sc_CheckBox_RID_SCPAGE_CONTENT_CB_HANDLES,958186563, sc_CheckBox_RID_SCPAGE_CONTENT_CB_HSCROLL,958186548, sc_CheckBox_RID_SCPAGE_CONTENT_CB_NIL,958186518, sc_CheckBox_RID_SCPAGE_CONTENT_CB_OUTLINE,958186551, @@ -9377,7 +9375,6 @@ sw_CheckBox_TP_CONTENT_OPT_CB_CROSS,878396430, sw_CheckBox_TP_CONTENT_OPT_CB_DRWFAST,878396419, sw_CheckBox_TP_CONTENT_OPT_CB_FIELD,878396420, sw_CheckBox_TP_CONTENT_OPT_CB_GRF,878396417, -sw_CheckBox_TP_CONTENT_OPT_CB_HANDLE,878396475, sw_CheckBox_TP_CONTENT_OPT_CB_HRULER,878396433, sw_CheckBox_TP_CONTENT_OPT_CB_HSCROLL,878396431, sw_CheckBox_TP_CONTENT_OPT_CB_POSTIT,878396439, diff --git a/helpcontent2/helpers/longnames_commands.csv b/helpcontent2/helpers/longnames_commands.csv index 92a9e84..e29afda 100644 --- a/helpcontent2/helpers/longnames_commands.csv +++ b/helpcontent2/helpers/longnames_commands.csv @@ -1221,7 +1221,6 @@ SID_GRID_FRONT,.uno:GridFront SID_GRID_USE,.uno:GridUse SID_GRID_VISIBLE,.uno:GridVisible SID_GROUP,.uno:FormatGroup -SID_HANDLES_DRAFT,.uno:HandlesDraft SID_HANDOUTMODE,.uno:HandoutMode SID_HANDOUT_MASTERPAGE,.uno:HandoutMasterPage SID_HANGUL_HANJA_CONVERSION,.uno:HangulHanjaConversion diff --git a/helpcontent2/helpers/uno-commands.csv b/helpcontent2/helpers/uno-commands.csv index 5baf4c2..364f169 100644 --- a/helpcontent2/helpers/uno-commands.csv +++ b/helpcontent2/helpers/uno-commands.csv @@ -856,7 +856,6 @@ .uno:HScroll .uno:HScrollbar .uno:HalfSphere -.uno:HandlesDraft .uno:HandoutMasterPage .uno:HandoutMode .uno:HangulHanjaConversion diff --git a/helpcontent2/helpers/uno_hid.lst b/helpcontent2/helpers/uno_hid.lst index 06cb093..8d59158 100644 --- a/helpcontent2/helpers/uno_hid.lst +++ b/helpcontent2/helpers/uno_hid.lst @@ -1219,7 +1219,6 @@ SID_GRID_FRONT,27323,.uno:GridFront SID_GRID_USE,27154,.uno:GridUse SID_GRID_VISIBLE,27322,.uno:GridVisible SID_GROUP,10454,.uno:FormatGroup -SID_HANDLES_DRAFT,27150,.uno:HandlesDraft SID_HANDOUTMODE,27070,.uno:HandoutMode SID_HANDOUT_MASTERPAGE,27349,.uno:HandoutMasterPage SID_HANGUL_HANJA_CONVERSION,10959,.uno:HangulHanjaConversion diff --git a/helpcontent2/helpers/unocmds.txt b/helpcontent2/helpers/unocmds.txt index 014f2ca..08d8f51 100644 --- a/helpcontent2/helpers/unocmds.txt +++ b/helpcontent2/helpers/unocmds.txt @@ -484,7 +484,6 @@ .uno:HFixedLine;sbasic/shared/02/2000.xhp .uno:HScrollbar;sbasic/shared/02/2000.xhp .uno:HalfSphere;simpress/02/1009.xhp -.uno:HandlesDraft;simpress/02/1307.xhp .uno:HangulHanjaConversion;shared/01/0620.xhp .uno:HeadingRowsRepeat;swr
Re: [Libreoffice] SolidMarkHandles - [PATCH] removed leftovers of the Simple Handles option
Hi, I have created a patch to remove the leftovers mentioned here and some additional I have found. Tim On 11/08/2011 10:29 PM, Stephan Bergmann wrote: > Hi all, > > Looks like > <http://cgit.freedesktop.org/libreoffice/core/commit/?id=ec4f69493b50c15861b0cdcc290ecedd00efb51d> > "removed Simple Handles option" removed support for SolidMarkHandles > property from sw/source/ui/uno/unomod.cxx while it is still listed in > offapi/com/sun/star/text/ViewSettings.idl and checked in qadevOOo > (mentioned in > qadevOOo/objdsc/sw/com.sun.star.comp.office.SwXViewSettings.csv, > qadevOOo/tests/basic/ifc/text/ViewSettings/test_ViewSettings.xba, and > qadevOOo/tests/java/ifc/text/_ViewSettings.java), and so broke > sw_unoapi subsequenttest: > >> Creating: sw.SwXViewSettings >> [...] >> LOG> Execute: SolidMarkHandles >> LOG> Tested XPropertySet does not contain'SolidMarkHandles' property >> Method SolidMarkHandles finished with state FAILED >> LOG> SolidMarkHandles: PASSED.FAILED >> [...] >> * State for >> sw.SwXViewSettings::com::sun::star::text::ViewSettings ** >> [sw.SwXViewSettings::com::sun::star::text::ViewSettings::SolidMarkHandles] >> is testcode: [SolidMarkHandles] - PASSED.FAILED > > Given that SolidMarkHandles is listed in > com.sun.star.text.ViewSettings, it is unclear to me whether it should > indeed be removed? > > (Btw, "SolidMarkHandles" is also still mentioned in > sw/source/core/unocore/unoprnms.cxx, > binfilter/bf_sw/source/core/unocore/sw_unoprnms.cxx, and > binfilter/bf_sw/source/ui/uno/sw_unomod.cxx.) > > Stephan > ___ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/libreoffice -- SUSE LINUX Products GmbH, GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer, HRB 16746 (AG Nürnberg) Maxfeldstr. 5, 90409 Nürnberg, Germany T: +49 (0) 911 74053-0 F: +49 (0) 911 74053-483 http://www.suse.de/ From 1d07fcbd6b3db376b0baa01817bea1c93cea07bb Mon Sep 17 00:00:00 2001 From: Tim Hardeck Date: Wed, 9 Nov 2011 17:50:55 +0100 Subject: [PATCH] removed leftovers of the Simple Handles option Removed leftovers of the Simple Handles option which weren't delete by the previous patch. --- .../com/sun/star/sheet/SpreadsheetViewSettings.idl |7 -- offapi/com/sun/star/text/ViewSettings.idl |6 - .../sc/com.sun.star.comp.office.ScTabViewObj.csv |1 - .../com.sun.star.comp.office.SwXViewSettings.csv |1 - .../sheet_SpreadsheetViewSettings.xba |2 - .../ifc/text/ViewSettings/text_ViewSettings.xba|2 - .../java/ifc/sheet/_SpreadsheetViewSettings.java |1 - qadevOOo/tests/java/ifc/text/_ViewSettings.java|1 - sc/source/ui/inc/optdlg.hrc|1 - sc/source/ui/src/optdlg.src|7 -- svx/inc/svx/svdhdl.hxx |3 -- svx/inc/svx/svdstr.hrc |4 --- svx/source/svdraw/svdhdl.cxx | 17 --- svx/source/svdraw/svdmrkv.cxx | 22 sw/inc/unoprnms.hxx|1 - sw/inc/viewopt.hxx |1 - sw/source/core/unocore/unoprnms.cxx|1 - sw/source/ui/config/optpage.cxx|3 -- sw/source/ui/config/viewopt.cxx|2 +- sw/source/ui/inc/optpage.hxx |1 - .../OpenOffice.org_help_topics_en-US.txt |8 --- .../Oracle_Open_Office_help_topics_en-US.txt |8 --- testautomation/global/win/tab_h_o.win |1 - 23 files changed, 1 insertions(+), 100 deletions(-) diff --git a/offapi/com/sun/star/sheet/SpreadsheetViewSettings.idl b/offapi/com/sun/star/sheet/SpreadsheetViewSettings.idl index 208d7ac..a967568 100644 --- a/offapi/com/sun/star/sheet/SpreadsheetViewSettings.idl +++ b/offapi/com/sun/star/sheet/SpreadsheetViewSettings.idl @@ -137,13 +137,6 @@ published service SpreadsheetViewSettings //- -/** enables solid (colored) handles when drawing -objects are selected. - */ -[property] boolean SolidHandles; - -//- - /** enables display of embedded objects in the view. @see SpreadsheetViewObjectsMode diff --git a/offapi/com/sun/star/text/ViewSettings.idl b/offapi/com/sun/star/text/ViewSettings.idl index 3ffa73d..7b15794 100644 --- a/offapi/com/sun/star/text/ViewSettings.idl +++ b/offapi/com/sun/star/text/ViewSettings.idl @@ -215,12 +215,6 @@ published service ViewSettings [property] boolean Sm