summaryrefslogtreecommitdiff
path: root/vcl/inc/vcl
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-09-10 16:59:55 +0100
committerCaolán McNamara <caolanm@redhat.com>2012-09-28 08:48:44 +0100
commit87b5cdd5ed13f5d05fe90b11b01e3832e5725b72 (patch)
tree3ce67b9dd7f1c9378a09b0d55bafb8d416f7d894 /vcl/inc/vcl
parent644cb58ac6ea53abab37c61e49d047eab0a1735c (diff)
convert writer, draw, impress, calc and starmath printer dialogs
to new-style widget layout mostly described in .ui format Change-Id: I8ead53a246a8ac3e2d446d158f06d7e2e436ce60
Diffstat (limited to 'vcl/inc/vcl')
-rw-r--r--vcl/inc/vcl/builder.hxx1
-rw-r--r--vcl/inc/vcl/layout.hxx1
-rw-r--r--vcl/inc/vcl/print.hxx109
-rw-r--r--vcl/inc/vcl/tabctrl.hxx2
4 files changed, 64 insertions, 49 deletions
diff --git a/vcl/inc/vcl/builder.hxx b/vcl/inc/vcl/builder.hxx
index ae0bc7fb7e51..364e75211792 100644
--- a/vcl/inc/vcl/builder.hxx
+++ b/vcl/inc/vcl/builder.hxx
@@ -223,6 +223,7 @@ protected:
public:
VclBuilderContainer();
virtual ~VclBuilderContainer();
+ static rtl::OUString getUIRootDir();
static VclBuilder* overrideResourceWithUIXML(Window *pWindow, const ResId& rResId);
static bool replace_buildable(Window *pParent, const ResId& rResId, Window &rReplacement);
template <typename T> T* get(T*& ret, rtl::OString sID)
diff --git a/vcl/inc/vcl/layout.hxx b/vcl/inc/vcl/layout.hxx
index 3da9edd96832..278379dbe9f7 100644
--- a/vcl/inc/vcl/layout.hxx
+++ b/vcl/inc/vcl/layout.hxx
@@ -411,6 +411,7 @@ class VCL_DLLPUBLIC VclFrame : public VclBin
{
public:
VclFrame(Window *pParent) : VclBin(pParent) {}
+ void set_label(const rtl::OUString &rLabel);
protected:
virtual Size calculateRequisition() const;
virtual void setAllocation(const Size &rAllocation);
diff --git a/vcl/inc/vcl/print.hxx b/vcl/inc/vcl/print.hxx
index 7959e9b8f33c..3590dbe9d01e 100644
--- a/vcl/inc/vcl/print.hxx
+++ b/vcl/inc/vcl/print.hxx
@@ -616,63 +616,74 @@ class VCL_DLLPUBLIC PrinterOptionsHelper
// are passed over UNO interfaces. UNO does not know a byte string, hence the string is
// transported via UTF16 strings.
- // general control
- static com::sun::star::uno::Any getUIControlOpt( const rtl::OUString& i_rTitle,
+ // Show general control
+ static com::sun::star::uno::Any setUIControlOpt( const com::sun::star::uno::Sequence< rtl::OUString >& i_rIDs,
+ const rtl::OUString& i_rTitle,
const com::sun::star::uno::Sequence< rtl::OUString >& i_rHelpId,
const rtl::OUString& i_rType,
const com::sun::star::beans::PropertyValue* i_pValue = NULL,
const UIControlOptions& i_rControlOptions = UIControlOptions()
);
- // create a group (e.g. a TabPage); following controls will be grouped in it until the next
- // group begins
- static com::sun::star::uno::Any getGroupControlOpt( const rtl::OUString& i_rTitle, const rtl::OUString& i_rHelpId );
-
- // create a subgroup (e.g. a FixedLine); following controls will be grouped in it until the next
- // subgroup or group begins
- // setting bJobPage = true will make the subgroup appear on the first page of the print dialog
- static com::sun::star::uno::Any getSubgroupControlOpt( const rtl::OUString& i_rTitle,
- const rtl::OUString& i_rHelpId,
- const UIControlOptions& i_rControlOptions = UIControlOptions()
- );
-
- // create a bool option (usually a checkbox)
- static com::sun::star::uno::Any getBoolControlOpt( const rtl::OUString& i_rTitle,
- const rtl::OUString& i_rHelpId,
- const rtl::OUString& i_rProperty,
- sal_Bool i_bValue,
- const UIControlOptions& i_rControlOptions = UIControlOptions()
- );
-
- // create a set of choices (either a radio button group or a list box)
- static com::sun::star::uno::Any getChoiceControlOpt( const rtl::OUString& i_rTitle,
- const com::sun::star::uno::Sequence< rtl::OUString >& i_rHelpId,
- const rtl::OUString& i_rProperty,
- const com::sun::star::uno::Sequence< rtl::OUString >& i_rChoices,
- sal_Int32 i_nValue,
- const rtl::OUString& i_rType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Radio" ) ),
- const com::sun::star::uno::Sequence< sal_Bool >& i_rDisabledChoices = com::sun::star::uno::Sequence< sal_Bool >(),
- const UIControlOptions& i_rControlOptions = UIControlOptions()
- );
-
- // create an integer range (e.g. a spin field)
- // note: max value < min value means do not apply min/max values
- static com::sun::star::uno::Any getRangeControlOpt( const rtl::OUString& i_rTitle,
- const rtl::OUString& i_rHelpId,
- const rtl::OUString& i_rProperty,
- sal_Int32 i_nValue,
- sal_Int32 i_nMinValue = -1,
- sal_Int32 i_nMaxValue = -2,
- const UIControlOptions& i_rControlOptions = UIControlOptions()
- );
-
- // create a string field
+
+ // Show and set the title of a TagPage of id i_rID
+ static com::sun::star::uno::Any setGroupControlOpt(const rtl::OUString& i_rID,
+ const rtl::OUString& i_rTitle,
+ const rtl::OUString& i_rHelpId);
+
+ // Show and set the label of a VclFrame of id i_rID
+ static com::sun::star::uno::Any setSubgroupControlOpt(const rtl::OUString& i_rID,
+ const rtl::OUString& i_rTitle,
+ const rtl::OUString& i_rHelpId,
+ const UIControlOptions& i_rControlOptions = UIControlOptions());
+
+ // Show a bool option as a checkbox
+ static com::sun::star::uno::Any setBoolControlOpt(const rtl::OUString& i_rID,
+ const rtl::OUString& i_rTitle,
+ const rtl::OUString& i_rHelpId,
+ const rtl::OUString& i_rProperty,
+ sal_Bool i_bValue,
+ const UIControlOptions& i_rControlOptions = UIControlOptions());
+
+ // Show a set of choices in a list box
+ static com::sun::star::uno::Any setChoiceListControlOpt(const rtl::OUString& i_rID,
+ const rtl::OUString& i_rTitle,
+ const com::sun::star::uno::Sequence< rtl::OUString >& i_rHelpId,
+ const rtl::OUString& i_rProperty,
+ const com::sun::star::uno::Sequence< rtl::OUString >& i_rChoices,
+ sal_Int32 i_nValue,
+ const com::sun::star::uno::Sequence< sal_Bool >& i_rDisabledChoices = com::sun::star::uno::Sequence< sal_Bool >(),
+ const UIControlOptions& i_rControlOptions = UIControlOptions());
+
+ // show a set of choices as radio buttons
+ static com::sun::star::uno::Any setChoiceRadiosControlOpt(const com::sun::star::uno::Sequence< rtl::OUString >& i_rIDs,
+ const rtl::OUString& i_rTitle,
+ const com::sun::star::uno::Sequence< rtl::OUString >& i_rHelpId,
+ const rtl::OUString& i_rProperty,
+ const com::sun::star::uno::Sequence< rtl::OUString >& i_rChoices,
+ sal_Int32 i_nValue,
+ const com::sun::star::uno::Sequence< sal_Bool >& i_rDisabledChoices = com::sun::star::uno::Sequence< sal_Bool >(),
+ const UIControlOptions& i_rControlOptions = UIControlOptions());
+
+
+ // show an integer range (e.g. a spin field)
// note: max value < min value means do not apply min/max values
- static com::sun::star::uno::Any getEditControlOpt( const rtl::OUString& i_rTitle,
+ static com::sun::star::uno::Any setRangeControlOpt(const rtl::OUString& i_rID,
+ const rtl::OUString& i_rTitle,
const rtl::OUString& i_rHelpId,
const rtl::OUString& i_rProperty,
- const rtl::OUString& i_rValue,
- const UIControlOptions& i_rControlOptions = UIControlOptions()
- );
+ sal_Int32 i_nValue,
+ sal_Int32 i_nMinValue = -1,
+ sal_Int32 i_nMaxValue = -2,
+ const UIControlOptions& i_rControlOptions = UIControlOptions());
+
+ // show a string field
+ // note: max value < min value means do not apply min/max values
+ static com::sun::star::uno::Any setEditControlOpt(const rtl::OUString& i_rID,
+ const rtl::OUString& i_rTitle,
+ const rtl::OUString& i_rHelpId,
+ const rtl::OUString& i_rProperty,
+ const rtl::OUString& i_rValue,
+ const UIControlOptions& i_rControlOptions = UIControlOptions());
};
}
diff --git a/vcl/inc/vcl/tabctrl.hxx b/vcl/inc/vcl/tabctrl.hxx
index c10f0361e126..1de45f3f9d84 100644
--- a/vcl/inc/vcl/tabctrl.hxx
+++ b/vcl/inc/vcl/tabctrl.hxx
@@ -142,6 +142,7 @@ public:
sal_uInt16 GetPageId( sal_uInt16 nPos ) const;
sal_uInt16 GetPagePos( sal_uInt16 nPageId ) const;
sal_uInt16 GetPageId( const Point& rPos ) const;
+ sal_uInt16 GetPageId( const TabPage& rPage ) const;
void SetCurPageId( sal_uInt16 nPageId );
sal_uInt16 GetCurPageId() const;
@@ -162,6 +163,7 @@ public:
void SetHelpText( sal_uInt16 nPageId, const XubString& rText );
const XubString& GetHelpText( sal_uInt16 nPageId ) const;
+ void SetHelpId( sal_uInt16 nPageId, const rtl::OString& rId ) const;
rtl::OString GetHelpId( sal_uInt16 nPageId ) const;
void SetPageImage( sal_uInt16 nPageId, const Image& rImage );