chart2/source/controller/drawinglayer/DrawViewWrapper.cxx | 3 icon-themes/galaxy/svx/res/cropmarkers.png |binary icon-themes/galaxy/svx/res/cropmarkers2.png |binary icon-themes/galaxy/svx/res/markers.png |binary icon-themes/galaxy/svx/res/markers2.png |binary icon-themes/hicontrast/svx/res/cropmarkers.png |binary icon-themes/hicontrast/svx/res/markers.png |binary include/svx/svdhdl.hxx | 4 - officecfg/registry/schema/org/openoffice/Office/Calc.xcs | 4 - officecfg/registry/schema/org/openoffice/Office/Writer.xcs | 8 +- officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs | 8 +- svx/source/svdraw/svdhdl.cxx | 32 +++++++++- sw/source/ui/config/viewopt.cxx | 27 +++++--- sw/source/ui/docvw/edtwin.cxx | 9 ++ uui/uiconfig/ui/setmasterpassworddlg.ui | 1 15 files changed, 73 insertions(+), 23 deletions(-)
New commits: commit 5bf554a89183c983cc492bcdcbc78967f3dbc415 Author: Caolán McNamara <[email protected]> Date: Thu Jun 13 10:25:19 2013 +0100 Related: fdo#65595 password dialog has truncated label Change-Id: I7b18bebb878fc5027109121595e444ef1d6a7cfc diff --git a/uui/uiconfig/ui/setmasterpassworddlg.ui b/uui/uiconfig/ui/setmasterpassworddlg.ui index a5670a7..e8c5ae9 100644 --- a/uui/uiconfig/ui/setmasterpassworddlg.ui +++ b/uui/uiconfig/ui/setmasterpassworddlg.ui @@ -152,7 +152,6 @@ <property name="xalign">0</property> <property name="label" translatable="yes">Caution: If you forget the master password, you will be unable to access any of the information protected by it. Passwords are case sensitive.</property> <property name="wrap">True</property> - <property name="width_chars">56</property> <property name="max_width_chars">62</property> </object> <packing> commit 67608078a857fc128efc6bf4172f9ce4384d25c7 Author: Armin Le Grand <[email protected]> Date: Thu Dec 13 08:47:57 2012 +0000 Resolves: #i121463# Enhanced handle visualization.. and some fixes in that region (cherry picked from commit 2ece2411aa1ab78e6aec269d08d8a9b526390939) Conflicts: default_images/svx/res/cropmarkers.png default_images/svx/res/cropmarkers2.png default_images/svx/res/cropmarkersACC.png default_images/svx/res/markers.png default_images/svx/res/markers2.png default_images/svx/res/markersACC.png officecfg/registry/schema/org/openoffice/Office/Calc.xcs officecfg/registry/schema/org/openoffice/Office/Draw.xcs officecfg/registry/schema/org/openoffice/Office/Impress.xcs officecfg/registry/schema/org/openoffice/Office/Writer.xcs officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs sc/source/core/tool/viewopti.cxx sd/source/ui/app/optsitem.cxx svx/inc/svx/svdhdl.hxx svx/source/svdraw/svdhdl.cxx svx/source/svdraw/svdstr.src sw/source/ui/config/viewopt.cxx sw/source/ui/docvw/edtwin.cxx Change-Id: I4094c2ca18a3c29e8e24a15ddeb040808ce4605d diff --git a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx index fa8d1eb..ccecd3e 100644 --- a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx +++ b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx @@ -133,6 +133,9 @@ DrawViewWrapper::DrawViewWrapper( SdrModel* pSdrModel, OutputDevice* pOut, bool pOutlinerPool->SetPoolDefaultItem( SvxFontHeightItem( 423, 100, EE_CHAR_FONTHEIGHT ) ); // 12pt } + // #i121463# Use big handles by default + SetMarkHdlSizePixel(9); + ReInit(); } diff --git a/icon-themes/galaxy/svx/res/cropmarkers.png b/icon-themes/galaxy/svx/res/cropmarkers.png index 38cb5b3..3048e01 100644 Binary files a/icon-themes/galaxy/svx/res/cropmarkers.png and b/icon-themes/galaxy/svx/res/cropmarkers.png differ diff --git a/icon-themes/galaxy/svx/res/cropmarkers2.png b/icon-themes/galaxy/svx/res/cropmarkers2.png new file mode 100644 index 0000000..c0f37ef Binary files /dev/null and b/icon-themes/galaxy/svx/res/cropmarkers2.png differ diff --git a/icon-themes/galaxy/svx/res/markers.png b/icon-themes/galaxy/svx/res/markers.png index af608b2..c954065 100644 Binary files a/icon-themes/galaxy/svx/res/markers.png and b/icon-themes/galaxy/svx/res/markers.png differ diff --git a/icon-themes/galaxy/svx/res/markers2.png b/icon-themes/galaxy/svx/res/markers2.png new file mode 100644 index 0000000..f52b91b Binary files /dev/null and b/icon-themes/galaxy/svx/res/markers2.png differ diff --git a/icon-themes/hicontrast/svx/res/cropmarkers.png b/icon-themes/hicontrast/svx/res/cropmarkers.png index f4c5fb4..27ccf02 100644 Binary files a/icon-themes/hicontrast/svx/res/cropmarkers.png and b/icon-themes/hicontrast/svx/res/cropmarkers.png differ diff --git a/icon-themes/hicontrast/svx/res/markers.png b/icon-themes/hicontrast/svx/res/markers.png index 112591d..391689e 100644 Binary files a/icon-themes/hicontrast/svx/res/markers.png and b/icon-themes/hicontrast/svx/res/markers.png differ diff --git a/include/svx/svdhdl.hxx b/include/svx/svdhdl.hxx index 2a58f612..207b3f4 100644 --- a/include/svx/svdhdl.hxx +++ b/include/svx/svdhdl.hxx @@ -128,7 +128,9 @@ enum BitmapMarkerKind AnchorPressedTR, // for SJ and the CustomShapeHandles: - Customshape1 + Customshape_7x7, + Customshape_9x9, + Customshape_11x11 }; //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs index 463b6e4..8ee1809 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs @@ -320,7 +320,7 @@ <!-- OldLocation: Soffice.cfg --> <!-- UIHints: Tools - Options -Spreadsheets - Layout - [Section] Lines --> <info> - <desc>Specifies whether control points are displayed as simple squares without 3D effect.</desc> + <desc>Specifies whether control points are displayed simple or enhanced.</desc> <label>Simple control points</label> </info> <value>false</value> @@ -333,7 +333,7 @@ <desc>Specifies whether control points are displayed as larger than the default size.</desc> <label>Large control points</label> </info> - <value>false</value> + <value>true</value> </prop> </group> <group oor:name="Window"> diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs index fad816c..93034ef 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs @@ -1233,20 +1233,20 @@ <!-- OldLocation: Soffice.cfg --> <!-- UIHints: Tools - Options - Text document - Layout - [Section] Lines --> <info> - <desc>Displays the control points as simple squares without a 3D effect.</desc> + <desc>Specifies whether control points are displayed simple or enhanced.</desc> <label>Simple control points</label> </info> - <value>false</value> + <value>true</value> </prop> <prop oor:name="LargeControlPoint" oor:type="xs:boolean"> <!-- OldPath: Writer/Layout/Lines --> <!-- OldLocation: Soffice.cfg --> <!-- UIHints: Tools - Options - Text document - Layout - [Section] Lines --> <info> - <desc>Displays larger control points.</desc> + <desc>Specifies whether control points are displayed as larger than the default size.</desc> <label>Large control points</label> </info> - <value>false</value> + <value>true</value> </prop> </group> <group oor:name="Window"> diff --git a/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs b/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs index ea3eeb1..aa3db40 100644 --- a/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs @@ -192,20 +192,20 @@ <!-- OldLocation: Soffice.cfg --> <!-- UIHints: Tools - Option - HTML-Document - Layout - [Section] Lines --> <info> - <desc>Displays the control points as simple squares without a 3D effect.</desc> + <desc>Specifies whether control points are displayed simple or enhanced.</desc> <label>Simple control points</label> </info> - <value>false</value> + <value>true</value> </prop> <prop oor:name="LargeControlPoint" oor:type="xs:boolean"> <!-- OldPath: HTML_Editor/Layout/Lines --> <!-- OldLocation: Soffice.cfg --> <!-- UIHints: Tools - Option - HTML-Document - Layout - [Section] Lines --> <info> - <desc>Displays larger control points.</desc> + <desc>Specifies whether control points are displayed as larger than the default size.</desc> <label>Large control points</label> </info> - <value>false</value> + <value>true</value> </prop> </group> <group oor:name="Window"> diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx index 4559e69..4911fab 100644 --- a/svx/source/svdraw/svdhdl.cxx +++ b/svx/source/svdraw/svdhdl.cxx @@ -175,17 +175,19 @@ const BitmapEx& SdrHdlBitmapSet::GetBitmapEx(BitmapMarkerKind eKindOfMarker, sal } case Circ_7x7: + case Customshape_7x7: { return impGetOrCreateTargetBitmap((4 * INDEX_COUNT) + nInd, Rectangle(Point(27, nYPos), Size(7, 7))); } case Circ_9x9: - case Customshape1: + case Customshape_9x9: { return impGetOrCreateTargetBitmap((5 * INDEX_COUNT) + nInd, Rectangle(Point(34, nYPos), Size(9, 9))); } case Circ_11x11: + case Customshape_11x11: { return impGetOrCreateTargetBitmap((6 * INDEX_COUNT) + nInd, Rectangle(Point(43, nYPos), Size(11, 11))); } @@ -523,7 +525,7 @@ void SdrHdl::CreateB2dIAObject() // for SJ and the CustomShapeHandles: case HDL_CUSTOMSHAPE1: { - eKindOfMarker = Customshape1; + eKindOfMarker = (b1PixMore) ? Customshape_7x7 : Customshape_9x9; eColIndex = Yellow; break; } @@ -597,6 +599,10 @@ BitmapMarkerKind SdrHdl::GetNextBigger(BitmapMarkerKind eKnd) const case Circ_7x7: eRetval = Circ_9x9; break; case Circ_9x9: eRetval = Circ_11x11; break; + case Customshape_7x7: eRetval = Customshape_9x9; break; + case Customshape_9x9: eRetval = Customshape_11x11; break; + //case Customshape_11x11: eRetval = ; break; + case Elli_7x9: eRetval = Elli_9x11; break; case Elli_9x7: eRetval = Elli_11x9; break; @@ -633,7 +639,27 @@ BitmapEx SdrHdl::ImpGetBitmapEx( BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd if(pHdlList->GetHdlSize() > 3) { - bForceBiggerSize = true; + switch(eKindOfMarker) + { + case Anchor: + case AnchorPressed: + case AnchorTR: + case AnchorPressedTR: + { + // #i121463# For anchor, do not simply make bigger because of HdlSize, + // do it dependent of IsSelected() which Writer can set in drag mode + if(IsSelected()) + { + bForceBiggerSize = true; + } + break; + } + default: + { + bForceBiggerSize = true; + break; + } + } } if(bForceBiggerSize) diff --git a/sw/source/ui/config/viewopt.cxx b/sw/source/ui/config/viewopt.cxx index 09bb78e..83ef2e8 100644 --- a/sw/source/ui/config/viewopt.cxx +++ b/sw/source/ui/config/viewopt.cxx @@ -171,14 +171,25 @@ SwViewOption::SwViewOption() : { // Initialisation is a little simpler now // all Bits to 0 - nCoreOptions = VIEWOPT_1_HARDBLANK | VIEWOPT_1_SOFTHYPH | - VIEWOPT_1_REF | - VIEWOPT_1_GRAPHIC | - VIEWOPT_1_TABLE | VIEWOPT_1_DRAW | VIEWOPT_1_CONTROL | - VIEWOPT_1_PAGEBACK | - VIEWOPT_1_POSTITS; - nCore2Options = VIEWOPT_CORE2_BLACKFONT | VIEWOPT_CORE2_HIDDENPARA; - nUIOptions = VIEWOPT_2_MODIFIED | VIEWOPT_2_GRFKEEPZOOM |VIEWOPT_2_ANY_RULER; + nCoreOptions = + VIEWOPT_1_HARDBLANK | + VIEWOPT_1_SOFTHYPH | + VIEWOPT_1_REF | + VIEWOPT_1_GRAPHIC | + VIEWOPT_1_TABLE | + VIEWOPT_1_DRAW | + VIEWOPT_1_CONTROL | + VIEWOPT_1_PAGEBACK | + VIEWOPT_1_POSTITS; + + nCore2Options = + VIEWOPT_CORE2_BLACKFONT | + VIEWOPT_CORE2_HIDDENPARA; + + nUIOptions = + VIEWOPT_2_MODIFIED | + VIEWOPT_2_GRFKEEPZOOM | + VIEWOPT_2_ANY_RULER; if(MEASURE_METRIC != SvtSysLocale().GetLocaleData().getMeasurementSystemEnum()) aSnapSize.Width() = aSnapSize.Height() = 720; // 1/2" diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx index 152ee16..80cac74 100644 --- a/sw/source/ui/docvw/edtwin.cxx +++ b/sw/source/ui/docvw/edtwin.cxx @@ -206,6 +206,7 @@ public: void SetPos( const Point& rNew ) { pHdl->SetPos( rNew ); } const Point& GetPos() { return pHdl->GetPos(); } const Point& GetHdlPos() { return aHdlPos; } + SdrHdl* GetHdl() const { return pHdl; } void ChgHdl( SdrHdl* pNew ) { pHdl = pNew; @@ -2981,6 +2982,8 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt) ( pHdl->GetKind() == HDL_ANCHOR || pHdl->GetKind() == HDL_ANCHOR_TR ) ) { + // #i121463# Set selected during drag + pHdl->SetSelected(true); m_pAnchorMarker = new SwAnchorMarker( pHdl ); UpdatePointer( aDocPos, rMEvt.GetModifier() ); return; @@ -4165,6 +4168,12 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt) if( m_pAnchorMarker ) { + if(m_pAnchorMarker->GetHdl()) + { + // #i121463# delete selected after drag + m_pAnchorMarker->GetHdl()->SetSelected(false); + } + Point aPnt( m_pAnchorMarker->GetLastPos() ); DELETEZ( m_pAnchorMarker ); if( aPnt.X() || aPnt.Y() )
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
