Skip to content

C
core
Kaydet (Commit) ad0c6359 authored tarafından Olivier Hallot's avatar Olivier Hallot Kaydeden (comit) Caolán McNamara
Dosyalara gözat
Seçenekler

Convert Area Tab Page to widget UI 

Change-Id: I543e575bb2e081e4c0b60c2a094c379b01a1894e
Reviewed-on: https://gerrit.libreoffice.org/5005Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 40dd3d6e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 125 additions and 396 deletions
cui/UIConfig_cui.mk
Dosyayı görüntüle @ ad0c6359
...@@ -13,6 +13,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\ ...@@ -13,6 +13,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/aboutdialog \ cui/uiconfig/ui/aboutdialog \
cui/uiconfig/ui/acorexceptpage \ cui/uiconfig/ui/acorexceptpage \
cui/uiconfig/ui/acorreplacepage \ cui/uiconfig/ui/acorreplacepage \
cui/uiconfig/ui/areatabpage \
cui/uiconfig/ui/asiantypography \ cui/uiconfig/ui/asiantypography \
cui/uiconfig/ui/autocorrectdialog \ cui/uiconfig/ui/autocorrectdialog \
cui/uiconfig/ui/backgroundpage \ cui/uiconfig/ui/backgroundpage \
......
cui/source/inc/cuitabarea.hxx
Dosyayı görüntüle @ ad0c6359
...@@ -179,43 +179,48 @@ class SvxAreaTabPage : public SvxTabPage ...@@ -179,43 +179,48 @@ class SvxAreaTabPage : public SvxTabPage
using TabPage::DeactivatePage; using TabPage::DeactivatePage;
private: private:
FixedLine aFlProp; ListBox* m_pTypeLB;
ListBox aTypeLB;
ColorLB aLbColor; VclBox* m_pFillLB;
GradientLB aLbGradient; ColorLB* m_pLbColor;
HatchingLB aLbHatching; GradientLB* m_pLbGradient;
BitmapLB aLbBitmap; HatchingLB* m_pLbHatching;
SvxXRectPreview aCtlBitmapPreview; BitmapLB* m_pLbBitmap;
SvxXRectPreview* m_pCtlBitmapPreview;
TriStateBox aTsbStepCount;
FixedLine aFlStepCount; TriStateBox* m_pTsbStepCount;
NumericField aNumFldStepCount; VclFrame* m_pFlStepCount;
NumericField* m_pNumFldStepCount;
CheckBox aCbxHatchBckgrd;
ColorLB aLbHatchBckgrdColor; VclFrame* m_pFlHatchBckgrd;
CheckBox* m_pCbxHatchBckgrd;
FixedLine aFlSize; ColorLB* m_pLbHatchBckgrdColor;
TriStateBox aTsbOriginal;
TriStateBox aTsbScale; VclBox* m_pBxBitmap;
FixedText aFtXSize;
MetricField aMtrFldXSize; VclFrame* m_pFlSize;
FixedText aFtYSize; TriStateBox* m_pTsbOriginal;
MetricField aMtrFldYSize; TriStateBox* m_pTsbScale;
FixedLine aFlPosition; VclGrid* m_pGridX_Y;
SvxRectCtl aCtlPosition; FixedText* m_pFtXSize;
FixedText aFtXOffset; MetricField* m_pMtrFldXSize;
MetricField aMtrFldXOffset; FixedText* m_pFtYSize;
FixedText aFtYOffset; MetricField* m_pMtrFldYSize;
MetricField aMtrFldYOffset;
TriStateBox aTsbTile; VclFrame* m_pFlPosition;
TriStateBox aTsbStretch; SvxRectCtl* m_pCtlPosition;
FixedLine aFlOffset; VclGrid* m_pGridOffset;
RadioButton aRbtRow; MetricField* m_pMtrFldXOffset;
RadioButton aRbtColumn; MetricField* m_pMtrFldYOffset;
MetricField aMtrFldOffset; VclBox* m_pBxTile;
TriStateBox* m_pTsbTile;
SvxXRectPreview aCtlXRectPreview; TriStateBox* m_pTsbStretch;
VclFrame* m_pFlOffset;
RadioButton* m_pRbtRow;
RadioButton* m_pRbtColumn;
MetricField* m_pMtrFldOffset;
SvxXRectPreview* m_pCtlXRectPreview;
const SfxItemSet& rOutAttrs; const SfxItemSet& rOutAttrs;
RECT_POINT eRP; RECT_POINT eRP;
......
cui/source/inc/helpid.hrc
Dosyayı görüntüle @ ad0c6359
...@@ -246,7 +246,6 @@ ...@@ -246,7 +246,6 @@
#define HID_MEASURE_CTL_PREVIEW "CUI_HID_MEASURE_CTL_PREVIEW" #define HID_MEASURE_CTL_PREVIEW "CUI_HID_MEASURE_CTL_PREVIEW"
#define HID_SVXPAGE_SWPOSSIZE "CUI_HID_SVXPAGE_SWPOSSIZE" #define HID_SVXPAGE_SWPOSSIZE "CUI_HID_SVXPAGE_SWPOSSIZE"
#define HID_AREA_AREA "CUI_HID_AREA_AREA"
#define HID_AREA_SHADOW "CUI_HID_AREA_SHADOW" #define HID_AREA_SHADOW "CUI_HID_AREA_SHADOW"
#define HID_AREA_BITMAP "CUI_HID_AREA_BITMAP" #define HID_AREA_BITMAP "CUI_HID_AREA_BITMAP"
#define HID_TPSHADOW_CTRL "CUI_HID_TPSHADOW_CTRL" #define HID_TPSHADOW_CTRL "CUI_HID_TPSHADOW_CTRL"
......
cui/source/tabpages/tabarea.hrc
Dosyayı görüntüle @ ad0c6359
...@@ -27,10 +27,6 @@ ...@@ -27,10 +27,6 @@
#define MTR_FLD_DISTANCE 1 #define MTR_FLD_DISTANCE 1
#define TSB_INVISIBLE 1 #define TSB_INVISIBLE 1
#define TSB_SHOW_SHADOW 2 #define TSB_SHOW_SHADOW 2
#define TSB_STEPCOUNT 3
#define TSB_TILE 4
#define TSB_STRETCH 5
#define TSB_ORIGINAL 6
#define LB_COLOR 1 #define LB_COLOR 1
#define LB_GRADIENT 2 #define LB_GRADIENT 2
...@@ -57,9 +53,6 @@ ...@@ -57,9 +53,6 @@
#define LB_SHADOW_COLOR 10 #define LB_SHADOW_COLOR 10
#define FL_PROP 2 #define FL_PROP 2
#define FL_SIZE 3 #define FL_SIZE 3
#define FL_POSITION 4
#define FL_OFFSET 5
#define FL_STEPCOUNT 7
#define BTN_WORK_ON 2 #define BTN_WORK_ON 2
#define CTL_COLORTABLE 3 #define CTL_COLORTABLE 3
...@@ -77,27 +70,10 @@ ...@@ -77,27 +70,10 @@
#define MTR_FLD_3 3 #define MTR_FLD_3 3
#define MTR_FLD_4 4 #define MTR_FLD_4 4
#define FT_TABLE_NAME 7 #define FT_TABLE_NAME 7
#define MTR_FLD_X_SIZE 4
#define MTR_FLD_Y_SIZE 5
#define TSB_SCALE 1
#define FT_X_OFFSET 1
#define FT_Y_OFFSET 2
#define MTR_FLD_X_OFFSET 1
#define MTR_FLD_Y_OFFSET 2
#define LB_AREA_TYPE 19
#define RBT_ROW 6
#define RBT_COLUMN 7
#define MTR_FLD_OFFSET 3
#define FT_TRANSPARENT 9 #define FT_TRANSPARENT 9
#define FT_X_SIZE 10
#define FT_Y_SIZE 11
#define FT_BITMAPS_HIDDEN 12 #define FT_BITMAPS_HIDDEN 12
#define MTR_SHADOW_TRANSPARENT 11 #define MTR_SHADOW_TRANSPARENT 11
// Hatch-Background on Area-TabPage
#define CB_HATCHBCKGRD 21
#define LB_HATCHBCKGRDCOLOR 22
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
cui/source/tabpages/tabarea.src
Dosyayı görüntüle @ ad0c6359
...@@ -28,327 +28,6 @@ ...@@ -28,327 +28,6 @@
#define TRANS_GRAD_OFFSET_X 6 #define TRANS_GRAD_OFFSET_X 6
#define TRANS_GRAD_OFFSET_Y 64 #define TRANS_GRAD_OFFSET_Y 64
// ------------------------------------------------------
TabPage RID_SVXPAGE_AREA
{
Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
HelpID = HID_AREA_AREA ;
Hide = TRUE ;
Text [ en-US ] = "Area" ;
FixedLine FL_PROP
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
Size = MAP_APPFONT ( 120, 8 ) ;
Text [ en-US ] = "Fill";
};
ListBox LB_AREA_TYPE
{
HelpID = "cui:ListBox:RID_SVXPAGE_AREA:LB_AREA_TYPE";
Pos = MAP_APPFONT ( 12 , 14 ) ;
Size = MAP_APPFONT ( 108 , 60 ) ;
DropDown = TRUE;
Border = TRUE;
StringList [ en-US ] =
{
< "None" ; Default ; > ;
< "Color" ; Default ; > ;
< "Gradient" ; Default ; > ;
< "Hatching" ; Default ; > ;
< "Bitmap" ; Default ; > ;
};
};
ListBox LB_COLOR
{
HelpID = "cui:ListBox:RID_SVXPAGE_AREA:LB_COLOR";
Border = TRUE ;
Pos = MAP_APPFONT ( 12 , 30 ) ;
Size = MAP_APPFONT ( 108 , 103 ) ;
TabStop = TRUE ;
};
ListBox LB_GRADIENT
{
HelpID = "cui:ListBox:RID_SVXPAGE_AREA:LB_GRADIENT";
Border = TRUE ;
Pos = MAP_APPFONT ( 12 , 30 ) ;
Size = MAP_APPFONT ( 108 , 103 ) ;
TabStop = TRUE ;
};
ListBox LB_HATCHING
{
HelpID = "cui:ListBox:RID_SVXPAGE_AREA:LB_HATCHING";
Border = TRUE ;
Pos = MAP_APPFONT ( 12 , 30 ) ;
Size = MAP_APPFONT ( 108 , 103 ) ;
TabStop = TRUE ;
};
ListBox LB_BITMAP
{
HelpID = "cui:ListBox:RID_SVXPAGE_AREA:LB_BITMAP";
Border = TRUE ;
Pos = MAP_APPFONT ( 12 , 30 ) ;
Size = MAP_APPFONT ( 108 , 103 ) ;
TabStop = TRUE ;
};
// ---------- preview ----------
Control CTL_COLOR_PREVIEW
{
Border = TRUE;
Pos = MAP_APPFONT ( 12 , 137 ) ;
Size = MAP_APPFONT ( 110 , 42 ) ;
};
Control CTL_BITMAP_PREVIEW
{
Border = TRUE;
Pos = MAP_APPFONT ( 12 , 137 ) ;
Size = MAP_APPFONT ( 110 , 42 ) ;
Hide = TRUE ;
};
// ---------- for gradients ----------
FixedLine FL_STEPCOUNT
{
Pos = MAP_APPFONT ( 132 , 3 ) ;
Size = MAP_APPFONT ( 122 , 8 ) ;
Text [ en-US ] = "Increments" ;
};
TriStateBox TSB_STEPCOUNT
{
HelpID = "cui:TriStateBox:RID_SVXPAGE_AREA:TSB_STEPCOUNT";
Pos = MAP_APPFONT ( 138 , 15 ) ;
Size = MAP_APPFONT ( 68 , 10 ) ;
TabStop = TRUE ;
Text [ en-US ] = "A~utomatic" ;
};
NumericField NUM_FLD_STEPCOUNT
{
HelpID = "cui:NumericField:RID_SVXPAGE_AREA:NUM_FLD_STEPCOUNT";
Border = TRUE ;
Pos = MAP_APPFONT ( 208 , 14 ) ;
Size = MAP_APPFONT ( 40 , 12 ) ;
TabStop = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
Minimum = 3 ;
First = 3 ;
Maximum = 256 ;
Last = 256 ;
StrictFormat = TRUE ;
};
// ---------- for hatches ----------
CheckBox CB_HATCHBCKGRD
{
HelpID = "cui:CheckBox:RID_SVXPAGE_AREA:CB_HATCHBCKGRD";
Pos = MAP_APPFONT ( 132 , 3 ) ;
Size = MAP_APPFONT ( 122 , 10 ) ;
TabStop = TRUE ;
Text [ en-US ] = "~Background color" ;
};
ListBox LB_HATCHBCKGRDCOLOR
{
HelpID = "cui:ListBox:RID_SVXPAGE_AREA:LB_HATCHBCKGRDCOLOR";
Border = TRUE ;
Pos = MAP_APPFONT ( 141 , 16 ) ;
Size = MAP_APPFONT ( 70 , 100 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
DDExtraWidth = TRUE ;
};
// ---------- for bitmaps ----------
FixedLine FL_SIZE
{
Pos = MAP_APPFONT ( 132 , 3 ) ;
Size = MAP_APPFONT ( 122 , 8 ) ;
Text [ en-US ] = "Size" ;
};
TriStateBox TSB_ORIGINAL
{
HelpID = "cui:TriStateBox:RID_SVXPAGE_AREA:TSB_ORIGINAL";
Pos = MAP_APPFONT ( 138 , 15 ) ;
Size = MAP_APPFONT ( 48 , 10 ) ;
TabStop = TRUE ;
Text [ en-US ] = "~Original" ;
};
TriStateBox TSB_SCALE
{
HelpID = "cui:TriStateBox:RID_SVXPAGE_AREA:TSB_SCALE";
Pos = MAP_APPFONT ( 138 , 30 ) ;
Size = MAP_APPFONT ( 48 , 10 ) ;
TabStop = TRUE ;
Text [ en-US ] = "Re~lative" ;
};
FixedText FT_X_SIZE
{
Pos = MAP_APPFONT ( 187 , 15 ) ;
Size = MAP_APPFONT ( 24 , 8 ) ;
Text [ en-US ] = "Wi~dth" ;
};
MetricField MTR_FLD_X_SIZE
{
HelpID = "cui:MetricField:RID_SVXPAGE_AREA:MTR_FLD_X_SIZE";
Border = TRUE ;
Pos = MAP_APPFONT ( 212 , 14 ) ;
Size = MAP_APPFONT ( 36 , 12 ) ;
TabStop = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
StrictFormat = TRUE ;
DecimalDigits = 2 ;
Unit = FUNIT_MM ;
CustomUnitText = "%" ;
Minimum = 5 ;
Maximum = 100 ;
First = 5 ;
Last = 100 ;
SpinSize = 5 ;
};
FixedText FT_Y_SIZE
{
Pos = MAP_APPFONT ( 187 , 31 ) ;
Size = MAP_APPFONT ( 24 , 8 ) ;
Text [ en-US ] = "H~eight" ;
};
MetricField MTR_FLD_Y_SIZE
{
HelpID = "cui:MetricField:RID_SVXPAGE_AREA:MTR_FLD_Y_SIZE";
Border = TRUE ;
Pos = MAP_APPFONT ( 212 , 29 ) ;
Size = MAP_APPFONT ( 36 , 12 ) ;
TabStop = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
StrictFormat = TRUE ;
DecimalDigits = 2 ;
Unit = FUNIT_MM ;
CustomUnitText = "%" ;
Minimum = 5 ;
Maximum = 100 ;
First = 5 ;
Last = 100 ;
SpinSize = 5 ;
SpinSize = 5 ;
};
FixedLine FL_POSITION
{
Pos = MAP_APPFONT ( 132 , 47 ) ;
Size = MAP_APPFONT ( 122 , 8 ) ;
Text [ en-US ] = "Position" ;
};
Control CTL_POSITION
{
Border = TRUE ;
Pos = MAP_APPFONT ( 138 , 57 ) ;
Size = MAP_APPFONT ( 40 , 27 ) ;
TabStop = TRUE ;
};
FixedText FT_X_OFFSET
{
Pos = MAP_APPFONT ( 138 , 89 ) ;
Size = MAP_APPFONT ( 39 , 8 ) ;
Text [ en-US ] = "~X Offset" ;
};
FixedText FT_Y_OFFSET
{
Pos = MAP_APPFONT ( 139 , 104 ) ;
Size = MAP_APPFONT ( 78 , 8 ) ;
Text [ en-US ] = "~Y Offset" ;
};
MetricField MTR_FLD_X_OFFSET
{
HelpID = "cui:MetricField:RID_SVXPAGE_AREA:MTR_FLD_X_OFFSET";
Border = TRUE ;
Pos = MAP_APPFONT ( 219 , 87 ) ;
Size = MAP_APPFONT ( 29 , 12 ) ;
TabStop = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
StrictFormat = TRUE ;
Unit = FUNIT_CUSTOM ;
CustomUnitText = "%" ;
Maximum = 100 ;
Last = 100 ;
SpinSize = 5 ;
};
MetricField MTR_FLD_Y_OFFSET
{
HelpID = "cui:MetricField:RID_SVXPAGE_AREA:MTR_FLD_Y_OFFSET";
Border = TRUE ;
Pos = MAP_APPFONT ( 219 , 102 ) ;
Size = MAP_APPFONT ( 29 , 12 ) ;
TabStop = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
Maximum = 100 ;
StrictFormat = TRUE ;
Unit = FUNIT_CUSTOM ;
CustomUnitText = "%" ;
Last = 100 ;
SpinSize = 5 ;
};
TriStateBox TSB_TILE
{
HelpID = "cui:TriStateBox:RID_SVXPAGE_AREA:TSB_TILE";
Pos = MAP_APPFONT ( 138 , 117 ) ;
Size = MAP_APPFONT ( 54 , 10 ) ;
TabStop = TRUE ;
Text [ en-US ] = "~Tile" ;
};
TriStateBox TSB_STRETCH
{
HelpID = "cui:TriStateBox:RID_SVXPAGE_AREA:TSB_STRETCH";
Pos = MAP_APPFONT ( 194 , 117 ) ;
Size = MAP_APPFONT ( 54 , 10 ) ;
TabStop = TRUE ;
Text [ en-US ] = "Auto~Fit" ;
};
FixedLine FL_OFFSET
{
Pos = MAP_APPFONT ( 132 , 133 ) ;
Size = MAP_APPFONT ( 122 , 8 ) ;
Text [ en-US ] = "Offset" ;
};
RadioButton RBT_ROW
{
HelpID = "cui:RadioButton:RID_SVXPAGE_AREA:RBT_ROW";
Pos = MAP_APPFONT ( 138 , 144 ) ;
Size = MAP_APPFONT ( 75 , 10 ) ;
Text [ en-US ] = "Ro~w" ;
};
RadioButton RBT_COLUMN
{
HelpID = "cui:RadioButton:RID_SVXPAGE_AREA:RBT_COLUMN";
Pos = MAP_APPFONT ( 138 , 158 ) ;
Size = MAP_APPFONT ( 75 , 10 ) ;
Text [ en-US ] = "Colu~mn" ;
};
MetricField MTR_FLD_OFFSET
{
HelpID = "cui:MetricField:RID_SVXPAGE_AREA:MTR_FLD_OFFSET";
Border = TRUE ;
Pos = MAP_APPFONT ( 219 , 157 ) ;
Size = MAP_APPFONT ( 29 , 12 ) ;
TabStop = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
Maximum = 100 ;
StrictFormat = TRUE ;
Unit = FUNIT_CUSTOM ;
CustomUnitText = "%" ;
Last = 100 ;
SpinSize = 5 ;
};
};
// ------------------------------------------------------ // ------------------------------------------------------
TabPage RID_SVXPAGE_SHADOW TabPage RID_SVXPAGE_SHADOW
{ {
......
cui/source/tabpages/tparea.cxx
Dosyayı görüntüle @ ad0c6359
This diff is collapsed.
cui/uiconfig/ui/areatabpage.ui 0 → 100644
Dosyayı görüntüle @ ad0c6359
This diff is collapsed.
extras/source/glade/libreoffice-catalog.xml.in
Dosyayı görüntüle @ ad0c6359
...@@ -71,7 +71,11 @@ ...@@ -71,7 +71,11 @@
generic-name="Color ListBox" parent="GtkComboBox" generic-name="Color ListBox" parent="GtkComboBox"
icon-name="widget-gtk-combobox"> icon-name="widget-gtk-combobox">
<properties> <properties>
<property id="dropdown" default="True" common="True"/> <property save="True" query="False" id="dropdown" default="True" name="Use DropDown">
<parameter-spec>
<type>GParamBoolean</type>
</parameter-spec>
</property>
</properties> </properties>
</glade-widget-class> </glade-widget-class>
...@@ -79,15 +83,55 @@ ...@@ -79,15 +83,55 @@
generic-name="Other Color ListBox" parent="GtkComboBox" generic-name="Other Color ListBox" parent="GtkComboBox"
icon-name="widget-gtk-combobox"> icon-name="widget-gtk-combobox">
<properties> <properties>
<property id="dropdown" default="True" common="True"/> <property save="True" query="False" id="dropdown" default="True" name="Use DropDown">
<parameter-spec>
<type>GParamBoolean</type>
</parameter-spec>
</property>
</properties>
</glade-widget-class>
<glade-widget-class title="Gradient ListBox" name="svxlo-GradientLB"
generic-name="GradientListBox" parent="GtkComboBox"
icon-name="widget-gtk-combobox">
<properties>
<property save="True" query="False" id="dropdown" default="True" name="Use DropDown">
<parameter-spec>
<type>GParamBoolean</type>
</parameter-spec>
</property>
</properties>
</glade-widget-class>
<glade-widget-class title="Hatching ListBox" name="svxlo-HatchingLB"
generic-name="HatchingListBox" parent="GtkComboBox"
icon-name="widget-gtk-combobox">
<properties>
<property save="True" query="False" id="dropdown" default="True" name="Use DropDown">
<parameter-spec>
<type>GParamBoolean</type>
</parameter-spec>
</property>
</properties>
</glade-widget-class>
<glade-widget-class title="Bitmap ListBox" name="svxlo-BitmapLB"
generic-name="BitmapListBox" parent="GtkComboBox"
icon-name="widget-gtk-combobox">
<properties>
<property save="True" query="False" id="dropdown" default="True" name="Use DropDown">
<parameter-spec>
<type>GParamBoolean</type>
</parameter-spec>
</property>
</properties> </properties>
</glade-widget-class> </glade-widget-class>
<glade-widget-class title="Font Name ListBox" name="svtlo-FontNameBox" <glade-widget-class title="Font Name ListBox" name="svtlo-FontNameBox"
generic-name="Font name ListBox" parent="GtkComboBox" generic-name="Font name ListBox" parent="GtkComboBox"
icon-name="widget-gtk-combobox"> icon-name="widget-gtk-combobox">
<properties> <properties>
<property id="dropdown" default="True" common="True"/> <property save="True" query="False" id="dropdown" default="True" name="Use DropDown">
<parameter-spec>
<type>GParamBoolean</type>
</parameter-spec>
</property>
</properties> </properties>
</glade-widget-class> </glade-widget-class>
...@@ -99,7 +143,11 @@ ...@@ -99,7 +143,11 @@
generic-name="Font Size ListBox" parent="GtkComboBox" generic-name="Font Size ListBox" parent="GtkComboBox"
icon-name="widget-gtk-combobox"> icon-name="widget-gtk-combobox">
<properties> <properties>
<property id="dropdown" default="True" common="True"/> <property save="True" query="False" id="dropdown" default="True" name="Use DropDown">
<parameter-spec>
<type>GParamBoolean</type>
</parameter-spec>
</property>
</properties> </properties>
</glade-widget-class> </glade-widget-class>
...@@ -107,7 +155,11 @@ ...@@ -107,7 +155,11 @@
generic-name="Line ListBox" parent="GtkComboBox" generic-name="Line ListBox" parent="GtkComboBox"
icon-name="widget-gtk-combobox"> icon-name="widget-gtk-combobox">
<properties> <properties>
<property id="dropdown" default="True" common="True"/> <property save="True" query="False" id="dropdown" default="True" name="Use DropDown">
<parameter-spec>
<type>GParamBoolean</type>
</parameter-spec>
</property>
</properties> </properties>
</glade-widget-class> </glade-widget-class>
...@@ -119,7 +171,11 @@ ...@@ -119,7 +171,11 @@
generic-name="FontStyleBox" parent="GtkComboBox" generic-name="FontStyleBox" parent="GtkComboBox"
icon-name="widget-gtk-combobox"> icon-name="widget-gtk-combobox">
<properties> <properties>
<property id="dropdown" default="True" common="True"/> <property save="True" query="False" id="dropdown" default="True" name="Use DropDown">
<parameter-spec>
<type>GParamBoolean</type>
</parameter-spec>
</property>
</properties> </properties>
</glade-widget-class> </glade-widget-class>
...@@ -228,12 +284,6 @@ ...@@ -228,12 +284,6 @@
<glade-widget-class title="Numbering Type ListBox" name="swlo-SwNumberingTypeListBox" <glade-widget-class title="Numbering Type ListBox" name="swlo-SwNumberingTypeListBox"
generic-name="NumberingTypeListBox" parent="GtkComboBox" generic-name="NumberingTypeListBox" parent="GtkComboBox"
icon-name="widget-gtk-combobox"/> icon-name="widget-gtk-combobox"/>
<glade-widget-class title="Gradiant ListBox" name="svxlo-GradientLB"
generic-name="GradiantListBox" parent="GtkComboBox"
icon-name="widget-gtk-combobox"/>
<glade-widget-class title="Hatching ListBox" name="svxlo-HatchingLB"
generic-name="HatchingListBox" parent="GtkComboBox"
icon-name="widget-gtk-combobox"/>
<glade-widget-class title="Category ComboBox" name="swuilo-CategoryBox" <glade-widget-class title="Category ComboBox" name="swuilo-CategoryBox"
generic-name="CategoryComboBox" parent="GtkComboBox" generic-name="CategoryComboBox" parent="GtkComboBox"
icon-name="widget-gtk-combobox"/> icon-name="widget-gtk-combobox"/>
...@@ -281,7 +331,7 @@ ...@@ -281,7 +331,7 @@
icon-name="widget-gtk-spinbutton"/> icon-name="widget-gtk-spinbutton"/>
<glade-widget-class title="Relative Numeric Field" name="svxlo-SvxRelativeField" <glade-widget-class title="Relative Numeric Field" name="svxlo-SvxRelativeField"
generic-name="Relative Numeric Field" parent="GtkSpinButton" generic-name="Relative Numeric Field" parent="GtkSpinButton"
icon-name="widget-gtk-spinbutton"/> icon-name="widget-gtk-spinbutton"/>
<glade-widget-class title="SvtURLBox" name="svtlo-SvtURLBox" <glade-widget-class title="SvtURLBox" name="svtlo-SvtURLBox"
generic-name="URLBox" parent="VclComboBoxText" generic-name="URLBox" parent="VclComboBoxText"
......
include/svx/dlgctrl.hxx
Dosyayı görüntüle @ ad0c6359
...@@ -252,6 +252,7 @@ class SVX_DLLPUBLIC BitmapLB : public ListBox ...@@ -252,6 +252,7 @@ class SVX_DLLPUBLIC BitmapLB : public ListBox
{ {
public: public:
explicit BitmapLB(Window* pParent, ResId Id); explicit BitmapLB(Window* pParent, ResId Id);
explicit BitmapLB(Window* pParent, WinBits aWB);
virtual void Fill(const XBitmapListRef &pList); virtual void Fill(const XBitmapListRef &pList);
......
svx/source/dialog/dlgctrl.cxx
Dosyayı görüntüle @ ad0c6359
...@@ -1228,6 +1228,24 @@ BitmapLB::BitmapLB(Window* pParent, ResId Id) ...@@ -1228,6 +1228,24 @@ BitmapLB::BitmapLB(Window* pParent, ResId Id)
{ {
SetEdgeBlending(true); SetEdgeBlending(true);
} }
BitmapLB::BitmapLB( Window* pParent, WinBits aWB)
: ListBox( pParent, aWB ),
maBitmapEx(),
mpList(NULL)
{
SetEdgeBlending(true);
}
extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeBitmapLB(Window *pParent, VclBuilder::stringmap &rMap)
{
WinBits nWinStyle = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE;
OString sBorder = VclBuilder::extractCustomProperty(rMap);
if (!sBorder.isEmpty())
nWinStyle |= WB_BORDER;
BitmapLB *pListBox = new BitmapLB(pParent, nWinStyle);
pListBox->EnableAutoSize(true);
return pListBox;
}
/************************************************************************/ /************************************************************************/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment