Skip to content

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

convert sepia dialog to .ui 

Change-Id: I6032ea0da029e5bff145e582892655143400f710
üst 8df7e6ce
Hide whitespace changes
Inline Side-by-side
Showing with 224 additions and 128 deletions
cui/UIConfig_cui.mk
Dosyayı görüntüle @ b775e061
......@@ -13,6 +13,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/aboutdialog \
cui/uiconfig/ui/aboutconfigdialog\
cui/uiconfig/ui/aboutconfigvaluedialog \
cui/uiconfig/ui/agingdialog \
cui/uiconfig/ui/acorexceptpage \
cui/uiconfig/ui/acoroptionspage \
cui/uiconfig/ui/acorreplacepage \
......
cui/source/dialogs/cuigrfflt.cxx
Dosyayı görüntüle @ b775e061
......@@ -476,21 +476,14 @@ Graphic GraphicFilterSolarize::GetFilteredGraphic( const Graphic& rGraphic,
// ----------------------
GraphicFilterSepia::GraphicFilterSepia( Window* pParent, const Graphic& rGraphic,
sal_uInt16 nSepiaPercent ) :
oldGraphicFilterDialog ( pParent, CUI_RES( RID_SVX_GRFFILTER_DLG_SEPIA ), rGraphic ),
maFtSepia ( this, CUI_RES( DLG_FILTERSEPIA_FT_SEPIA ) ),
maMtrSepia ( this, CUI_RES( DLG_FILTERSEPIA_MTR_SEPIA ) )
sal_uInt16 nSepiaPercent )
: GraphicFilterDialog(pParent, "AgingDialog",
"cui/ui/agingdialog.ui", rGraphic)
{
FreeResource();
maMtrSepia.SetValue( nSepiaPercent );
maMtrSepia.SetModifyHdl( GetModifyHdl() );
}
get(mpMtrSepia, "value");
// -----------------------------------------------------------------------------
GraphicFilterSepia::~GraphicFilterSepia()
{
mpMtrSepia->SetValue( nSepiaPercent );
mpMtrSepia->SetModifyHdl( GetModifyHdl() );
}
// -----------------------------------------------------------------------------
......
cui/source/dialogs/grfflt.hrc
Dosyayı görüntüle @ b775e061
......@@ -40,13 +40,6 @@
#define DLG_FILTERMOSAIC_MTR_HEIGHT 4
#define DLG_FILTERMOSAIC_CBX_EDGES 5
// -------------------
// - DLG_FILTERSEPIA -
// -------------------
#define DLG_FILTERSEPIA_FT_SEPIA 1
#define DLG_FILTERSEPIA_MTR_SEPIA 2
// --------------------
// - DLG_FILTERPOSTER -
// --------------------
......
cui/source/dialogs/grfflt.src
Dosyayı görüntüle @ b775e061
......@@ -130,74 +130,6 @@ ModalDialog RID_SVX_GRFFILTER_DLG_MOSAIC
};
};
ModalDialog RID_SVX_GRFFILTER_DLG_SEPIA
{
HelpID = CMD_SID_GRFFILTER_SEPIA;
OutputSize = TRUE ;
Moveable = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT ( 250, 100 ) ;
Text [ en-US ] = "Aging" ;
FixedLine FL_PARAMETER
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
Size = MAP_APPFONT ( 182, RSC_CD_FIXEDLINE_HEIGHT ) ;
Text [ en-US ] = "Parameters";
};
Control CTL_PREVIEW
{
Pos = MAP_APPFONT ( 104 , 3 + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP ) ;
Size = MAP_APPFONT ( 81, 73 ) ;
};
#define MA_Y8 3 + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP
FixedText DLG_FILTERSEPIA_FT_SEPIA
{
Pos = MAP_APPFONT ( 12 , MA_Y8 ) ;
Size = MAP_APPFONT ( 77 , 10 ) ;
Text [ en-US ] = "Aging degree" ;
};
#define MA_Y9 MA_Y8 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y
MetricField DLG_FILTERSEPIA_MTR_SEPIA
{
HelpID = "cui:MetricField:RID_SVX_GRFFILTER_DLG_SEPIA:DLG_FILTERSEPIA_MTR_SEPIA";
Border = TRUE ;
Pos = MAP_APPFONT ( 12 , MA_Y9 ) ;
Size = MAP_APPFONT ( 35 , 12 ) ;
TabStop = TRUE ;
Right = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
Minimum = 1 ;
Maximum = 100 ;
StrictFormat = TRUE ;
Unit = FUNIT_PERCENT ;
First = 1 ;
Last = 100 ;
SpinSize = 1 ;
};
OKButton BTN_OK
{
Pos = MAP_APPFONT ( 194, 6 ) ;
Size = MAP_APPFONT ( 50, 14 ) ;
TabStop = TRUE ;
DefButton = TRUE ;
};
CancelButton BTN_CANCEL
{
Pos = MAP_APPFONT ( 194, 23 ) ;
Size = MAP_APPFONT ( 50, 14 ) ;
TabStop = TRUE ;
};
HelpButton BTN_HELP
{
Pos = MAP_APPFONT ( 194, 43 ) ;
Size = MAP_APPFONT ( 50, 14 ) ;
TabStop = TRUE ;
};
};
// --------------------
// - DLG_FILTERPOSTER -
// --------------------
......
cui/source/factory/dlgfact.cxx
Dosyayı görüntüle @ b775e061
......@@ -1512,28 +1512,20 @@ AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterEmb
return new oldAbstractGraphicFilterDialog_Impl( pDlg );
}
AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterPosterSepia (Window* pParent,
AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterPoster(Window* pParent,
const Graphic& rGraphic,
sal_uInt16 nCount,
sal_uInt32 nResId)
sal_uInt16 nCount)
{
oldGraphicFilterDialog* pDlg=NULL;
switch ( nResId )
{
case RID_SVX_GRFFILTER_DLG_POSTER :
pDlg = new GraphicFilterPoster( pParent, rGraphic, nCount );
break;
case RID_SVX_GRFFILTER_DLG_SEPIA :
pDlg = new GraphicFilterSepia( pParent, rGraphic, nCount );
break;
default:
break;
}
oldGraphicFilterDialog* pDlg = new GraphicFilterPoster( pParent, rGraphic, nCount );
return new oldAbstractGraphicFilterDialog_Impl( pDlg );
}
if ( pDlg )
return new oldAbstractGraphicFilterDialog_Impl( pDlg );
return 0;
AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterSepia (Window* pParent,
const Graphic& rGraphic,
sal_uInt16 nCount)
{
GraphicFilterDialog* pDlg = new GraphicFilterSepia( pParent, rGraphic, nCount );
return new AbstractGraphicFilterDialog_Impl( pDlg );
}
AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterSmooth(Window* pParent,
......
cui/source/factory/dlgfact.hxx
Dosyayı görüntüle @ b775e061
......@@ -663,9 +663,10 @@ public:
virtual AbstractGraphicFilterDialog * CreateGraphicFilterEmboss (Window* pParent,
const Graphic& rGraphic, RECT_POINT eLightSource,
sal_uInt32 nResId);
virtual AbstractGraphicFilterDialog * CreateGraphicFilterPosterSepia (Window* pParent,
const Graphic& rGraphic, sal_uInt16 nCount,
sal_uInt32 nResId);
virtual AbstractGraphicFilterDialog * CreateGraphicFilterPoster(Window* pParent,
const Graphic& rGraphic, sal_uInt16 nCount);
virtual AbstractGraphicFilterDialog * CreateGraphicFilterSepia (Window* pParent,
const Graphic& rGraphic, sal_uInt16 nCount);
virtual AbstractGraphicFilterDialog * CreateGraphicFilterSmooth (Window* pParent,
const Graphic& rGraphic, double nRadius);
virtual AbstractGraphicFilterDialog * CreateGraphicFilterSolarize (Window* pParent,
......
cui/source/inc/cuigrfflt.hxx
Dosyayı görüntüle @ b775e061
......@@ -205,22 +205,18 @@ public:
// - GraphicFilterSepia -
// ----------------------
class GraphicFilterSepia : public oldGraphicFilterDialog
class GraphicFilterSepia : public GraphicFilterDialog
{
private:
FixedText maFtSepia;
MetricField maMtrSepia;
MetricField* mpMtrSepia;
public:
GraphicFilterSepia( Window* pParent, const Graphic& rGraphic,
sal_uInt16 nSepiaPercent );
~GraphicFilterSepia();
GraphicFilterSepia( Window* pParent, const Graphic& rGraphic,
sal_uInt16 nSepiaPercent );
virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY );
sal_uInt16 GetSepiaPercent() const
{ return sal::static_int_cast< sal_uInt16 >(maMtrSepia.GetValue()); }
sal_uInt16 GetSepiaPercent() const
{
return sal::static_int_cast< sal_uInt16 >(mpMtrSepia->GetValue());
}
};
// -----------------------
......
cui/uiconfig/ui/agingdialog.ui 0 → 100644
Dosyayı görüntüle @ b775e061
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.16.1 -->
<interface>
<requires lib="gtk+" version="3.0"/>
<!-- interface-requires LibreOffice 1.0 -->
<object class="GtkAdjustment" id="adjustment1">
<property name="lower">1</property>
<property name="upper">100</property>
<property name="value">1</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
<object class="GtkDialog" id="AgingDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="title" translatable="yes">Aging</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">12</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area1">
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="ok">
<property name="label">gtk-ok</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="cancel">
<property name="label">gtk-cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkButton" id="help">
<property name="label">gtk-help</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="frame1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
<object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="column_spacing">24</property>
<child>
<object class="cuilo-GraphicPreviewWindow" id="preview">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkGrid" id="grid2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="row_spacing">6</property>
<child>
<object class="GtkSpinButton" id="value:%">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="adjustment">adjustment1</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Aging degree</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">value:%</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
</object>
</child>
</object>
</child>
<child type="label">
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Parameters</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
<action-widgets>
<action-widget response="0">ok</action-widget>
<action-widget response="0">cancel</action-widget>
<action-widget response="0">help</action-widget>
</action-widgets>
</object>
</interface>
include/svx/dialogs.hrc
Dosyayı görüntüle @ b775e061
......@@ -98,7 +98,6 @@
#define RID_SVXPAGE_GRID (RID_SVX_START + 152)
// factory IDs of dialogs implemented in CUI
#define RID_SVX_GRFFILTER_DLG_SEPIA (RID_SVX_START + 334)
#define RID_SVX_GRFFILTER_DLG_POSTER (RID_SVX_START + 335)
#define RID_SVX_GRFFILTER_DLG_MOSAIC (RID_SVX_START + 332)
#define RID_SVX_GRFFILTER_DLG_EMBOSS (RID_SVX_START + 336)
......
include/svx/svxdlg.hxx
Dosyayı görüntüle @ b775e061
......@@ -415,10 +415,12 @@ public:
virtual AbstractGraphicFilterDialog * CreateGraphicFilterEmboss (Window* pParent,
const Graphic& rGraphic,
RECT_POINT eLightSource, sal_uInt32 nResId )=0;
virtual AbstractGraphicFilterDialog * CreateGraphicFilterPosterSepia (Window* pParent,
virtual AbstractGraphicFilterDialog * CreateGraphicFilterPoster(Window* pParent,
const Graphic& rGraphic,
sal_uInt16 nCount,
sal_uInt32 nResId)=0;
sal_uInt16 nCount)=0;
virtual AbstractGraphicFilterDialog * CreateGraphicFilterSepia (Window* pParent,
const Graphic& rGraphic,
sal_uInt16 nCount)=0;
virtual AbstractGraphicFilterDialog * CreateGraphicFilterSmooth (Window* pParent,
const Graphic& rGraphic,
double nRadius)=0;
......
svx/source/dialog/grfflt.cxx
Dosyayı görüntüle @ b775e061
......@@ -194,7 +194,7 @@ sal_uIntPtr SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObj
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact)
{
AbstractGraphicFilterDialog* aDlg = pFact->CreateGraphicFilterPosterSepia( pWindow, rGraphic, 16, RID_SVX_GRFFILTER_DLG_POSTER );
AbstractGraphicFilterDialog* aDlg = pFact->CreateGraphicFilterPoster(pWindow, rGraphic, 16);
DBG_ASSERT(aDlg, "Dialogdiet fail!");
if( aDlg->Execute() == RET_OK )
aGraphic = aDlg->GetFilteredGraphic( rGraphic, 1.0, 1.0 );
......@@ -233,7 +233,7 @@ sal_uIntPtr SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObj
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact)
{
AbstractGraphicFilterDialog* aDlg = pFact->CreateGraphicFilterPosterSepia( pWindow, rGraphic, 10, RID_SVX_GRFFILTER_DLG_SEPIA );
AbstractGraphicFilterDialog* aDlg = pFact->CreateGraphicFilterSepia(pWindow, rGraphic, 10);
DBG_ASSERT(aDlg, "Dialogdiet fail!");
if( aDlg->Execute() == RET_OK )
aGraphic = aDlg->GetFilteredGraphic( rGraphic, 1.0, 1.0 );
......
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