rpms/libreoffice
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use far simpler size group

Browse Source
This commit is contained in:
Caolán McNamara 2015-10-20 10:13:59 +01:00
parent f3ea85e9c0
commit c798e3b7a5
1 changed files with 36 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
0001-implement-dialog-control-over-enhanced-shape-control.patch
View File

@ -1,4 +1,4 @@
From 5181f093a8792b17fb4192770f2e968849e6f015 Mon Sep 17 00:00:00 2001
From e9680d99c4403bd07ab4d50939a5d7791bceb98c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Tue, 13 Oct 2015 13:16:31 +0100
Subject: [PATCH] implement dialog control over enhanced shape control points
@ -10,10 +10,10 @@ Change-Id: I7e6a4db0699076950adf5869a61825159766c46a
(cherry picked from commit b859d84e471fdb70b61607d2d919a7907d074bd0)
---
cui/source/inc/transfrm.hxx | 6 +
cui/source/tabpages/transfrm.cxx | 137 +++++++++++++-
cui/uiconfig/ui/slantcornertabpage.ui | 334 +++++++++++++++++++++++++++++-----
cui/source/tabpages/transfrm.cxx | 137 ++++++++++++++-
cui/uiconfig/ui/slantcornertabpage.ui | 310 ++++++++++++++++++++++++++++++----
include/svx/EnhancedCustomShape2d.hxx | 1 +
4 files changed, 429 insertions(+), 49 deletions(-)
4 files changed, 416 insertions(+), 38 deletions(-)
diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx
index 2945d28..2fe2524 100644
@ -225,24 +225,13 @@ index 950a4b2..43375c2 100644
get(m_pMtrPosX, "MTR_FLD_POS_X");
get(m_pMtrPosY, "MTR_FLD_POS_Y");
diff --git a/cui/uiconfig/ui/slantcornertabpage.ui b/cui/uiconfig/ui/slantcornertabpage.ui
index 37b7b0e..27814a5 100644
index 37b7b0e..b3ce646 100644
--- a/cui/uiconfig/ui/slantcornertabpage.ui
+++ b/cui/uiconfig/ui/slantcornertabpage.ui
@@ -2,23 +2,132 @@
<!-- Generated with glade 3.18.3 -->
<interface>
<requires lib="gtk+" version="3.0"/>
- <object class="GtkAdjustment" id="adjustmentRADIUS">
- <property name="upper">500</property>
- <property name="step_increment">10</property>
- <property name="page_increment">10</property>
- </object>
- <object class="GtkAdjustment" id="adjustmentSLANT">
- <property name="lower">-89</property>
- <property name="upper">89</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
@@ -13,12 +13,132 @@
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
- <object class="GtkBox" id="SlantAndCornerRadius">
+ <object class="GtkGrid" id="SlantAndCornerRadius">
<property name="visible">True</property>
@ -375,7 +364,7 @@ index 37b7b0e..27814a5 100644
<child>
<object class="GtkFrame" id="FL_RADIUS">
<property name="visible">True</property>
@@ -32,37 +141,36 @@
@@ -32,37 +152,36 @@
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
@ -422,7 +411,7 @@ index 37b7b0e..27814a5 100644
</packing>
</child>
</object>
@@ -73,8 +181,8 @@
@@ -73,8 +192,8 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
@ -432,7 +421,7 @@ index 37b7b0e..27814a5 100644
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -82,9 +190,8 @@
@@ -82,9 +201,8 @@
</child>
</object>
<packing>
@ -444,7 +433,7 @@ index 37b7b0e..27814a5 100644
</packing>
</child>
<child>
@@ -100,37 +207,36 @@
@@ -100,37 +218,36 @@
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
@ -491,7 +480,7 @@ index 37b7b0e..27814a5 100644
</packing>
</child>
</object>
@@ -141,8 +247,128 @@
@@ -141,8 +258,128 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
@ -621,7 +610,7 @@ index 37b7b0e..27814a5 100644
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -150,12 +376,36 @@
@@ -150,16 +387,19 @@
</child>
</object>
<packing>
@ -633,34 +622,30 @@ index 37b7b0e..27814a5 100644
</packing>
</child>
</object>
+ <object class="GtkSizeGroup" id="sizegroup3">
+ <widgets>
+ <widget name="label5"/>
+ <widget name="label6"/>
+ <widget name="FT_RADIUS"/>
+ </widgets>
+ </object>
+ <object class="GtkSizeGroup" id="sizegroup4">
+ <widgets>
+ <widget name="FT_ANGLE"/>
+ <widget name="label4"/>
+ <widget name="label7"/>
+ </widgets>
+ </object>
+ <object class="GtkAdjustment" id="adjustmentRADIUS">
+ <property name="upper">500</property>
+ <property name="step_increment">10</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustmentSLANT">
+ <property name="lower">-89</property>
+ <property name="upper">89</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
<object class="GtkSizeGroup" id="sizegroup1">
<widgets>
+ <widget name="label5"/>
+ <widget name="label6"/>
<widget name="FT_RADIUS"/>
<widget name="FT_ANGLE"/>
+ <widget name="label4"/>
+ <widget name="label7"/>
</widgets>
</object>
<object class="GtkSizeGroup" id="sizegroup2">
@@ -168,4 +408,12 @@
<widget name="MTR_FLD_ANGLE:0.00degrees"/>
</widgets>
</object>
+ <object class="GtkSizeGroup" id="sizegroup5">
+ <widgets>
+ <widget name="controlx1:0.00cm"/>
+ <widget name="controly1:0.00cm"/>
+ <widget name="controlx2:0.00cm"/>
+ <widget name="controly2:0.00cm"/>
+ </widgets>
+ </object>
</interface>
diff --git a/include/svx/EnhancedCustomShape2d.hxx b/include/svx/EnhancedCustomShape2d.hxx
index b9ed6f2..b1cc1b7 100644
--- a/include/svx/EnhancedCustomShape2d.hxx