[Libreoffice-commits] core.git: 2 commits - cui/AllLangResTarget_cui.mk cui/source cui/uiconfig cui/UIConfig_cui.mk include/svx
Caolán McNamara
caolanm at redhat.com
Wed Jan 8 02:14:15 PST 2014
cui/AllLangResTarget_cui.mk | 1
cui/UIConfig_cui.mk | 2
cui/source/factory/dlgfact.cxx | 2
cui/source/inc/dstribut.hxx | 44 +--
cui/source/inc/helpid.hrc | 2
cui/source/tabpages/dstribut.cxx | 152 ++++--------
cui/source/tabpages/dstribut.hrc | 40 ---
cui/source/tabpages/dstribut.src | 212 -----------------
cui/uiconfig/ui/distributiondialog.ui | 82 ++++++
cui/uiconfig/ui/distributionpage.ui | 412 ++++++++++++++++++++++++++++++++++
include/svx/dialogs.hrc | 1
11 files changed, 571 insertions(+), 379 deletions(-)
New commits:
commit 094869634d491a96e9de109a14fe4fc8db90a30a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Jan 8 09:22:59 2014 +0000
can drop SfxNoLayoutSingleTabDialog use here now
Change-Id: I668b4f0b767d3a93a1407ae4ba7922235815a28b
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index e5f5c42..0b59749 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -44,6 +44,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/connpooloptions \
cui/uiconfig/ui/customizedialog \
cui/uiconfig/ui/dbregisterpage \
+ cui/uiconfig/ui/distributiondialog \
cui/uiconfig/ui/distributionpage \
cui/uiconfig/ui/effectspage \
cui/uiconfig/ui/formatcellsdialog \
diff --git a/cui/source/inc/dstribut.hxx b/cui/source/inc/dstribut.hxx
index c3133b6..1222841 100644
--- a/cui/source/inc/dstribut.hxx
+++ b/cui/source/inc/dstribut.hxx
@@ -56,15 +56,14 @@ public:
SvxDistributeVertical GetDistributeVer() const { return m_eDistributeVer; }
};
-class SvxDistributeDialog : public SfxNoLayoutSingleTabDialog
+class SvxDistributeDialog : public SfxSingleTabDialog
{
- SvxDistributePage* mpPage;
+ SvxDistributePage* mpPage;
public:
SvxDistributeDialog(Window* pParent, const SfxItemSet& rAttr,
SvxDistributeHorizontal eHor = SvxDistributeHorizontalNone,
SvxDistributeVertical eVer = SvxDistributeVerticalNone);
- ~SvxDistributeDialog();
SvxDistributeHorizontal GetDistributeHor() const { return mpPage->GetDistributeHor(); }
SvxDistributeVertical GetDistributeVer() const { return mpPage->GetDistributeVer(); }
diff --git a/cui/source/tabpages/dstribut.cxx b/cui/source/tabpages/dstribut.cxx
index 8604b87..20dfb45 100644
--- a/cui/source/tabpages/dstribut.cxx
+++ b/cui/source/tabpages/dstribut.cxx
@@ -38,27 +38,15 @@ static sal_uInt16 pRanges[] =
|*
\************************************************************************/
-SvxDistributeDialog::SvxDistributeDialog(
- Window* pParent,
- const SfxItemSet& rInAttrs,
- SvxDistributeHorizontal eHor,
+SvxDistributeDialog::SvxDistributeDialog(Window* pParent,
+ const SfxItemSet& rInAttrs, SvxDistributeHorizontal eHor,
SvxDistributeVertical eVer)
-: SfxNoLayoutSingleTabDialog(pParent, rInAttrs, RID_SVXPAGE_DISTRIBUTE ),
- mpPage(0L)
-{
- mpPage = new SvxDistributePage(this, rInAttrs, eHor, eVer);
- SetTabPage(mpPage);
- SetText(mpPage->GetText());
-}
-
-/*************************************************************************
-|*
-|* Dtor
-|*
-\************************************************************************/
-
-SvxDistributeDialog::~SvxDistributeDialog()
+ : SfxSingleTabDialog(pParent, rInAttrs, "DistributionDialog",
+ "cui/ui/distributiondialog.ui")
+ , mpPage(NULL)
{
+ mpPage = new SvxDistributePage(get_content_area(), rInAttrs, eHor, eVer);
+ setTabPage(mpPage);
}
/*************************************************************************
@@ -97,12 +85,12 @@ SvxDistributePage::SvxDistributePage(Window* pWindow,
SfxTabPage* SvxDistributePage::Create(Window* pWindow, const SfxItemSet& rAttrs,
SvxDistributeHorizontal eHor, SvxDistributeVertical eVer)
{
- return(new SvxDistributePage(pWindow, rAttrs, eHor, eVer));
+ return new SvxDistributePage(pWindow, rAttrs, eHor, eVer);
}
sal_uInt16* SvxDistributePage::GetRanges()
{
- return(pRanges);
+ return pRanges;
}
void SvxDistributePage::PointChanged(Window* /*pWindow*/, RECT_POINT /*eRP*/)
diff --git a/cui/uiconfig/ui/distributiondialog.ui b/cui/uiconfig/ui/distributiondialog.ui
new file mode 100644
index 0000000..49e2dfa
--- /dev/null
+++ b/cui/uiconfig/ui/distributiondialog.ui
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.0 on Wed Jan 8 09:29:54 2014 -->
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkDialog" id="DistributionDialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+ <property name="title" translatable="yes">Distribution</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>
+ <placeholder/>
+ </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>
diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc
index a48c0f3..3a2307a 100644
--- a/include/svx/dialogs.hrc
+++ b/include/svx/dialogs.hrc
@@ -87,7 +87,6 @@
#define RID_SVXPAGE_HATCH (RID_SVX_START + 57)
#define RID_SVXPAGE_BITMAP (RID_SVX_START + 58)
#define RID_SVXPAGE_GRADIENT (RID_SVX_START + 59)
-#define RID_SVXPAGE_DISTRIBUTE (RID_SVX_START + 236)
#define RID_SVXPAGE_MACROASSIGN (RID_SVX_START + 296)
commit 3d4753f551914d0841552fcd37f569cea16a9a9d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Jan 8 09:18:58 2014 +0000
convert distribute tab page to .ui
Change-Id: I6269f199bddcf13c1e412b14f9a5935c62c63fe0
diff --git a/cui/AllLangResTarget_cui.mk b/cui/AllLangResTarget_cui.mk
index 804180e..4d16fd8 100644
--- a/cui/AllLangResTarget_cui.mk
+++ b/cui/AllLangResTarget_cui.mk
@@ -57,7 +57,6 @@ $(eval $(call gb_SrsTarget_add_files,cui/res,\
cui/source/options/treeopt.src \
cui/source/tabpages/autocdlg.src \
cui/source/tabpages/border.src \
- cui/source/tabpages/dstribut.src \
cui/source/tabpages/frmdirlbox.src \
cui/source/tabpages/macroass.src \
cui/source/tabpages/page.src \
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index 3f1ba6d..e5f5c42 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -44,6 +44,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/connpooloptions \
cui/uiconfig/ui/customizedialog \
cui/uiconfig/ui/dbregisterpage \
+ cui/uiconfig/ui/distributionpage \
cui/uiconfig/ui/effectspage \
cui/uiconfig/ui/formatcellsdialog \
cui/uiconfig/ui/gallerysearchprogress \
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index a7a96c3f..3a7bca7 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -1778,8 +1778,6 @@ GetTabPageRanges AbstractDialogFactory_Impl::GetTabPageRangesFunc( sal_uInt16 nI
{
case RID_SVXPAGE_TEXTANIMATION :
return SvxTextAnimationPage::GetRanges;
- case RID_SVXPAGE_DISTRIBUTE:
- return SvxDistributePage::GetRanges;
case RID_SVXPAGE_TRANSPARENCE :
return SvxTransparenceTabPage::GetRanges;
case RID_SVXPAGE_AREA :
diff --git a/cui/source/inc/dstribut.hxx b/cui/source/inc/dstribut.hxx
index 042cfad..c3133b6 100644
--- a/cui/source/inc/dstribut.hxx
+++ b/cui/source/inc/dstribut.hxx
@@ -26,35 +26,24 @@
class SvxDistributePage : public SvxTabPage
{
- SvxDistributeHorizontal meDistributeHor;
- SvxDistributeVertical meDistributeVer;
+ SvxDistributeHorizontal m_eDistributeHor;
+ SvxDistributeVertical m_eDistributeVer;
- FixedLine maFlHorizontal ;
- RadioButton maBtnHorNone ;
- RadioButton maBtnHorLeft ;
- RadioButton maBtnHorCenter ;
- RadioButton maBtnHorDistance ;
- RadioButton maBtnHorRight ;
- FixedImage maHorLow ;
- FixedImage maHorCenter ;
- FixedImage maHorDistance ;
- FixedImage maHorHigh ;
- FixedLine maFlVertical ;
- RadioButton maBtnVerNone ;
- RadioButton maBtnVerTop ;
- RadioButton maBtnVerCenter ;
- RadioButton maBtnVerDistance ;
- RadioButton maBtnVerBottom ;
- FixedImage maVerLow ;
- FixedImage maVerCenter ;
- FixedImage maVerDistance ;
- FixedImage maVerHigh ;
+ RadioButton* m_pBtnHorNone;
+ RadioButton* m_pBtnHorLeft;
+ RadioButton* m_pBtnHorCenter;
+ RadioButton* m_pBtnHorDistance;
+ RadioButton* m_pBtnHorRight;
+ RadioButton* m_pBtnVerNone;
+ RadioButton* m_pBtnVerTop;
+ RadioButton* m_pBtnVerCenter;
+ RadioButton* m_pBtnVerDistance;
+ RadioButton* m_pBtnVerBottom;
public:
SvxDistributePage(Window* pWindow, const SfxItemSet& rInAttrs,
SvxDistributeHorizontal eHor = SvxDistributeHorizontalNone,
SvxDistributeVertical eVer = SvxDistributeVerticalNone);
- ~SvxDistributePage();
static SfxTabPage* Create(Window*, const SfxItemSet&,
SvxDistributeHorizontal eHor, SvxDistributeVertical eVer);
@@ -63,8 +52,8 @@ public:
virtual void Reset(const SfxItemSet&);
virtual void PointChanged(Window* pWindow, RECT_POINT eRP);
- SvxDistributeHorizontal GetDistributeHor() const { return meDistributeHor; }
- SvxDistributeVertical GetDistributeVer() const { return meDistributeVer; }
+ SvxDistributeHorizontal GetDistributeHor() const { return m_eDistributeHor; }
+ SvxDistributeVertical GetDistributeVer() const { return m_eDistributeVer; }
};
class SvxDistributeDialog : public SfxNoLayoutSingleTabDialog
diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
index c1262d5..80990b5 100644
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpid.hrc
@@ -204,8 +204,6 @@
#define HID_TPCOLOR_CMYK_3 "CUI_HID_TPCOLOR_CMYK_3"
#define HID_OFAPAGE_AUTOCOMPLETE_OPTIONS "CUI_HID_OFAPAGE_AUTOCOMPLETE_OPTIONS"
-#define HID_PAGE_DISTRIBUTE "CUI_HID_PAGE_DISTRIBUTE"
-
#define HID_MEASURE_CTL_POSITION "CUI_HID_MEASURE_CTL_POSITION"
#define HID_VALUESET_NUM "CUI_HID_VALUESET_NUM"
#define HID_MEASURE_CTL_PREVIEW "CUI_HID_MEASURE_CTL_PREVIEW"
diff --git a/cui/source/tabpages/dstribut.cxx b/cui/source/tabpages/dstribut.cxx
index bde1590..8604b87 100644
--- a/cui/source/tabpages/dstribut.cxx
+++ b/cui/source/tabpages/dstribut.cxx
@@ -20,7 +20,6 @@
#include <sfx2/basedlgs.hxx>
#include <cuires.hrc>
#include "dstribut.hxx"
-#include "dstribut.hrc"
#include <svx/dialogs.hrc>
#include <svx/svddef.hxx>
#include <dialmgr.hxx>
@@ -68,46 +67,25 @@ SvxDistributeDialog::~SvxDistributeDialog()
|*
\************************************************************************/
-SvxDistributePage::SvxDistributePage(
- Window* pWindow,
- const SfxItemSet& rInAttrs,
- SvxDistributeHorizontal eHor,
+SvxDistributePage::SvxDistributePage(Window* pWindow,
+ const SfxItemSet& rInAttrs, SvxDistributeHorizontal eHor,
SvxDistributeVertical eVer)
-: SvxTabPage(pWindow, CUI_RES(RID_SVXPAGE_DISTRIBUTE), rInAttrs),
- meDistributeHor(eHor),
- meDistributeVer(eVer),
- maFlHorizontal (this, CUI_RES(FL_HORIZONTAL )),
- maBtnHorNone (this, CUI_RES(BTN_HOR_NONE )),
- maBtnHorLeft (this, CUI_RES(BTN_HOR_LEFT )),
- maBtnHorCenter (this, CUI_RES(BTN_HOR_CENTER )),
- maBtnHorDistance (this, CUI_RES(BTN_HOR_DISTANCE )),
- maBtnHorRight (this, CUI_RES(BTN_HOR_RIGHT )),
- maHorLow (this, CUI_RES(IMG_HOR_LOW )),
- maHorCenter (this, CUI_RES(IMG_HOR_CENTER )),
- maHorDistance (this, CUI_RES(IMG_HOR_DISTANCE )),
- maHorHigh (this, CUI_RES(IMG_HOR_HIGH )),
- maFlVertical (this, CUI_RES(FL_VERTICAL )),
- maBtnVerNone (this, CUI_RES(BTN_VER_NONE )),
- maBtnVerTop (this, CUI_RES(BTN_VER_TOP )),
- maBtnVerCenter (this, CUI_RES(BTN_VER_CENTER )),
- maBtnVerDistance (this, CUI_RES(BTN_VER_DISTANCE )),
- maBtnVerBottom (this, CUI_RES(BTN_VER_BOTTOM )),
- maVerLow (this, CUI_RES(IMG_VER_LOW )),
- maVerCenter (this, CUI_RES(IMG_VER_CENTER )),
- maVerDistance (this, CUI_RES(IMG_VER_DISTANCE )),
- maVerHigh (this, CUI_RES(IMG_VER_HIGH ))
-{
- FreeResource();
-}
-
-/*************************************************************************
-|*
-|* Dtor
-|*
-\************************************************************************/
-
-SvxDistributePage::~SvxDistributePage()
+ : SvxTabPage(pWindow, "DistributionPage", "cui/ui/distributionpage.ui",
+ rInAttrs)
+ , m_eDistributeHor(eHor)
+ , m_eDistributeVer(eVer)
{
+ get(m_pBtnHorNone, "hornone");
+ get(m_pBtnHorLeft, "horleft");
+ get(m_pBtnHorCenter, "horcenter");
+ get(m_pBtnHorDistance, "hordistance");
+ get(m_pBtnHorRight, "horright");
+
+ get(m_pBtnVerNone, "vernone");
+ get(m_pBtnVerTop, "vertop");
+ get(m_pBtnVerCenter, "vercenter");
+ get(m_pBtnVerDistance, "verdistance");
+ get(m_pBtnVerBottom, "verbottom");
}
/*************************************************************************
@@ -139,34 +117,34 @@ void SvxDistributePage::PointChanged(Window* /*pWindow*/, RECT_POINT /*eRP*/)
void SvxDistributePage::Reset(const SfxItemSet& )
{
- maBtnHorNone.SetState(sal_False);
- maBtnHorLeft.SetState(sal_False);
- maBtnHorCenter.SetState(sal_False);
- maBtnHorDistance.SetState(sal_False);
- maBtnHorRight.SetState(sal_False);
+ m_pBtnHorNone->SetState(sal_False);
+ m_pBtnHorLeft->SetState(sal_False);
+ m_pBtnHorCenter->SetState(sal_False);
+ m_pBtnHorDistance->SetState(sal_False);
+ m_pBtnHorRight->SetState(sal_False);
- switch(meDistributeHor)
+ switch(m_eDistributeHor)
{
- case SvxDistributeHorizontalNone : maBtnHorNone.SetState(sal_True); break;
- case SvxDistributeHorizontalLeft : maBtnHorLeft.SetState(sal_True); break;
- case SvxDistributeHorizontalCenter : maBtnHorCenter.SetState(sal_True); break;
- case SvxDistributeHorizontalDistance : maBtnHorDistance.SetState(sal_True); break;
- case SvxDistributeHorizontalRight : maBtnHorRight.SetState(sal_True); break;
+ case SvxDistributeHorizontalNone : m_pBtnHorNone->SetState(sal_True); break;
+ case SvxDistributeHorizontalLeft : m_pBtnHorLeft->SetState(sal_True); break;
+ case SvxDistributeHorizontalCenter : m_pBtnHorCenter->SetState(sal_True); break;
+ case SvxDistributeHorizontalDistance : m_pBtnHorDistance->SetState(sal_True); break;
+ case SvxDistributeHorizontalRight : m_pBtnHorRight->SetState(sal_True); break;
}
- maBtnVerNone.SetState(sal_False);
- maBtnVerTop.SetState(sal_False);
- maBtnVerCenter.SetState(sal_False);
- maBtnVerDistance.SetState(sal_False);
- maBtnVerBottom.SetState(sal_False);
+ m_pBtnVerNone->SetState(sal_False);
+ m_pBtnVerTop->SetState(sal_False);
+ m_pBtnVerCenter->SetState(sal_False);
+ m_pBtnVerDistance->SetState(sal_False);
+ m_pBtnVerBottom->SetState(sal_False);
- switch(meDistributeVer)
+ switch(m_eDistributeVer)
{
- case SvxDistributeVerticalNone : maBtnVerNone.SetState(sal_True); break;
- case SvxDistributeVerticalTop : maBtnVerTop.SetState(sal_True); break;
- case SvxDistributeVerticalCenter : maBtnVerCenter.SetState(sal_True); break;
- case SvxDistributeVerticalDistance : maBtnVerDistance.SetState(sal_True); break;
- case SvxDistributeVerticalBottom : maBtnVerBottom.SetState(sal_True); break;
+ case SvxDistributeVerticalNone : m_pBtnVerNone->SetState(sal_True); break;
+ case SvxDistributeVerticalTop : m_pBtnVerTop->SetState(sal_True); break;
+ case SvxDistributeVerticalCenter : m_pBtnVerCenter->SetState(sal_True); break;
+ case SvxDistributeVerticalDistance : m_pBtnVerDistance->SetState(sal_True); break;
+ case SvxDistributeVerticalBottom : m_pBtnVerBottom->SetState(sal_True); break;
}
}
@@ -181,28 +159,28 @@ sal_Bool SvxDistributePage::FillItemSet( SfxItemSet& )
SvxDistributeHorizontal eDistributeHor(SvxDistributeHorizontalNone);
SvxDistributeVertical eDistributeVer(SvxDistributeVerticalNone);
- if(maBtnHorLeft.IsChecked())
+ if(m_pBtnHorLeft->IsChecked())
eDistributeHor = SvxDistributeHorizontalLeft;
- else if(maBtnHorCenter.IsChecked())
+ else if(m_pBtnHorCenter->IsChecked())
eDistributeHor = SvxDistributeHorizontalCenter;
- else if(maBtnHorDistance.IsChecked())
+ else if(m_pBtnHorDistance->IsChecked())
eDistributeHor = SvxDistributeHorizontalDistance;
- else if(maBtnHorRight.IsChecked())
+ else if(m_pBtnHorRight->IsChecked())
eDistributeHor = SvxDistributeHorizontalRight;
- if(maBtnVerTop.IsChecked())
+ if(m_pBtnVerTop->IsChecked())
eDistributeVer = SvxDistributeVerticalTop;
- else if(maBtnVerCenter.IsChecked())
+ else if(m_pBtnVerCenter->IsChecked())
eDistributeVer = SvxDistributeVerticalCenter;
- else if(maBtnVerDistance.IsChecked())
+ else if(m_pBtnVerDistance->IsChecked())
eDistributeVer = SvxDistributeVerticalDistance;
- else if(maBtnVerBottom.IsChecked())
+ else if(m_pBtnVerBottom->IsChecked())
eDistributeVer = SvxDistributeVerticalBottom;
- if(eDistributeHor != meDistributeHor || eDistributeVer != meDistributeVer)
+ if(eDistributeHor != m_eDistributeHor || eDistributeVer != m_eDistributeVer)
{
- meDistributeHor = eDistributeHor;
- meDistributeVer = eDistributeVer;
+ m_eDistributeHor = eDistributeHor;
+ m_eDistributeVer = eDistributeVer;
return sal_True;
}
diff --git a/cui/source/tabpages/dstribut.hrc b/cui/source/tabpages/dstribut.hrc
deleted file mode 100644
index 220e8ce..0000000
--- a/cui/source/tabpages/dstribut.hrc
+++ /dev/null
@@ -1,40 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#define FL_HORIZONTAL 1
-#define BTN_HOR_NONE 2
-#define BTN_HOR_LEFT 3
-#define BTN_HOR_CENTER 4
-#define BTN_HOR_DISTANCE 5
-#define BTN_HOR_RIGHT 6
-#define FL_VERTICAL 7
-#define BTN_VER_NONE 8
-#define BTN_VER_TOP 9
-#define BTN_VER_CENTER 10
-#define BTN_VER_DISTANCE 11
-#define BTN_VER_BOTTOM 12
-#define IMG_HOR_LOW 14
-#define IMG_HOR_CENTER 15
-#define IMG_HOR_DISTANCE 16
-#define IMG_HOR_HIGH 17
-#define IMG_VER_LOW 18
-#define IMG_VER_CENTER 19
-#define IMG_VER_DISTANCE 20
-#define IMG_VER_HIGH 21
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/tabpages/dstribut.src b/cui/source/tabpages/dstribut.src
deleted file mode 100644
index c8e268c..0000000
--- a/cui/source/tabpages/dstribut.src
+++ /dev/null
@@ -1,212 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <cuires.hrc>
-#include "dstribut.hrc"
-#include "helpid.hrc"
-#include <svx/dialogs.hrc>
-
-// RID_SVXPAGE_DISTRIBUTE ---------------------------------------------------
-#define STD_MASKCOLOR Color { Red=0xffff; Green=0x0000; Blue=0xffff; }
-TabPage RID_SVXPAGE_DISTRIBUTE
-{
- HelpId = HID_PAGE_DISTRIBUTE ;
- Hide = TRUE ;
- Size = MAP_APPFONT ( 260 , 81 ) ;
- Text [ en-US ] = "Distribution" ;
-
- FixedLine FL_HORIZONTAL
- {
- Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 248 , 8 ) ;
- Text [ en-US ] = "Horizontal" ;
- };
-
- RadioButton BTN_HOR_NONE
- {
- HelpID = "cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_NONE";
- Pos = MAP_APPFONT ( 12 , 14 ) ;
- Size = MAP_APPFONT ( 48 , 10 ) ;
- Text [ en-US ] = "~None" ;
- };
-
- RadioButton BTN_HOR_LEFT
- {
- HelpID = "cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_LEFT";
- Pos = MAP_APPFONT ( 56 , 26 ) ;
- Size = MAP_APPFONT ( 45 , 10 ) ;
- Text [ en-US ] = "~Left" ;
- };
-
- RadioButton BTN_HOR_CENTER
- {
- HelpID = "cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_CENTER";
- Pos = MAP_APPFONT ( 105 , 26 ) ;
- Size = MAP_APPFONT ( 45 , 10 ) ;
- Text [ en-US ] = "~Center" ;
- };
-
- RadioButton BTN_HOR_DISTANCE
- {
- HelpID = "cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_DISTANCE";
- Pos = MAP_APPFONT ( 154 , 26 ) ;
- Size = MAP_APPFONT ( 45 , 10 ) ;
- Text [ en-US ] = "~Spacing" ;
- };
-
- RadioButton BTN_HOR_RIGHT
- {
- HelpID = "cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_RIGHT";
- Pos = MAP_APPFONT ( 203 , 26 ) ;
- Size = MAP_APPFONT ( 45 , 10 ) ;
- Text [ en-US ] = "~Right" ;
- };
-
- FixedImage IMG_HOR_LOW {
- Pos = MAP_APPFONT ( 65 , 10 );
- Size = MAP_APPFONT ( 15 , 16 );
- Hide = FALSE;
- Fixed = Image {
- ImageBitmap = Bitmap { File = "dsth_low.bmp"; };
- MaskColor = STD_MASKCOLOR;
- };
- };
-
- FixedImage IMG_HOR_CENTER {
- Pos = MAP_APPFONT ( 114 , 10 );
- Size = MAP_APPFONT ( 15 , 16 );
- Hide = FALSE;
- Fixed = Image {
- ImageBitmap = Bitmap { File = "dsth_cen.bmp"; };
- MaskColor = STD_MASKCOLOR;
- };
- };
-
- FixedImage IMG_HOR_DISTANCE {
- Pos = MAP_APPFONT ( 163 , 10 );
- Size = MAP_APPFONT ( 15 , 16 );
- Hide = FALSE;
- Fixed = Image {
- ImageBitmap = Bitmap { File = "dsth_dst.bmp"; };
- MaskColor = STD_MASKCOLOR;
- };
- };
-
- FixedImage IMG_HOR_HIGH {
- Pos = MAP_APPFONT ( 212 , 10 );
- Size = MAP_APPFONT ( 15 , 16 );
- Hide = FALSE;
- Fixed = Image {
- ImageBitmap = Bitmap { File = "dsth_hig.bmp"; };
- MaskColor = STD_MASKCOLOR;
- };
- };
-
- FixedLine FL_VERTICAL
- {
- Pos = MAP_APPFONT ( 6 , 42 ) ;
- Size = MAP_APPFONT ( 248 , 8 ) ;
- Text [ en-US ] = "Vertical" ;
- };
-
- RadioButton BTN_VER_NONE
- {
- HelpID = "cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_VER_NONE";
- Pos = MAP_APPFONT ( 12 , 53 ) ;
- Size = MAP_APPFONT ( 46 , 10 ) ;
- Text [ en-US ] = "N~one" ;
- };
-
- RadioButton BTN_VER_TOP
- {
- HelpID = "cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_VER_TOP";
- Pos = MAP_APPFONT ( 56 , 65 ) ;
- Size = MAP_APPFONT ( 45 , 10 ) ;
- Text [ en-US ] = "~Top" ;
- };
-
- RadioButton BTN_VER_CENTER
- {
- HelpID = "cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_VER_CENTER";
- Pos = MAP_APPFONT ( 105 , 65 ) ;
- Size = MAP_APPFONT ( 45 , 10 ) ;
- Text [ en-US ] = "C~enter" ;
- };
-
- RadioButton BTN_VER_DISTANCE
- {
- HelpID = "cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_VER_DISTANCE";
- Pos = MAP_APPFONT ( 154 , 65 ) ;
- Size = MAP_APPFONT ( 45 , 10 ) ;
- Text [ en-US ] = "S~pacing" ;
- };
-
- RadioButton BTN_VER_BOTTOM
- {
- HelpID = "cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_VER_BOTTOM";
- Pos = MAP_APPFONT ( 203 , 65 ) ;
- Size = MAP_APPFONT ( 45 , 10 ) ;
- Text [ en-US ] = "~Bottom" ;
- };
-
- FixedImage IMG_VER_HIGH {
- Pos = MAP_APPFONT ( 65 , 49 );
- Size = MAP_APPFONT ( 15 , 16 );
- Hide = FALSE;
- Fixed = Image {
- ImageBitmap = Bitmap { File = "dstv_hig.bmp"; };
- MaskColor = STD_MASKCOLOR;
- };
- };
-
- FixedImage IMG_VER_CENTER {
- Pos = MAP_APPFONT ( 114 , 49 );
- Size = MAP_APPFONT ( 15 , 16 );
- Hide = FALSE;
- Fixed = Image {
- ImageBitmap = Bitmap { File = "dstv_cen.bmp"; };
- MaskColor = STD_MASKCOLOR;
- };
- };
-
- FixedImage IMG_VER_DISTANCE {
- Pos = MAP_APPFONT ( 163 , 49 );
- Size = MAP_APPFONT ( 15 , 16 );
- Hide = FALSE;
- Fixed = Image {
- ImageBitmap = Bitmap { File = "dstv_dst.bmp"; };
- MaskColor = STD_MASKCOLOR;
- };
- };
-
- FixedImage IMG_VER_LOW {
- Pos = MAP_APPFONT ( 212 , 49 );
- Size = MAP_APPFONT ( 15 , 16 );
- Hide = FALSE;
- Fixed = Image {
- ImageBitmap = Bitmap { File = "dstv_low.bmp"; };
- MaskColor = STD_MASKCOLOR;
- };
- };
-
-};
-
-// ********************************************************************** EOF
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/uiconfig/ui/distributionpage.ui b/cui/uiconfig/ui/distributionpage.ui
new file mode 100644
index 0000000..455bcb1
--- /dev/null
+++ b/cui/uiconfig/ui/distributionpage.ui
@@ -0,0 +1,412 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.0 on Wed Jan 8 10:07:23 2014 -->
+<interface>
+ <!-- interface-requires gtk+ 3.6 -->
+ <object class="GtkGrid" id="DistributionPage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+ <property name="row_spacing">12</property>
+ <child>
+ <object class="GtkGrid" id="grid1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">12</property>
+ <child>
+ <object class="GtkFrame" id="frame1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</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="top_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkGrid" id="grid2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <property name="row_homogeneous">True</property>
+ <child>
+ <object class="GtkRadioButton" id="hornone">
+ <property name="label" translatable="yes">_None</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">horleft</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="GtkRadioButton" id="horleft">
+ <property name="label" translatable="yes">_Left</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">horcenter</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="horcenter">
+ <property name="label" translatable="yes">_Center</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">hordistance</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="horright">
+ <property name="label" translatable="yes">_Right</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">hornone</property>
+ </object>
+ <packing>
+ <property name="left_attach">4</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="image1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="pixbuf">svx/res/dsth_low.png</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="GtkImage" id="image3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="pixbuf">svx/res/dsth_cen.png</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="hordistance">
+ <property name="label" translatable="yes">_Spacing</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">horright</property>
+ </object>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="image2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="pixbuf">svx/res/dsth_cen.png</property>
+ </object>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="image4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="pixbuf">svx/res/dsth_hig.png</property>
+ </object>
+ <packing>
+ <property name="left_attach">4</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Horizontal</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </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>
+ <child>
+ <object class="GtkFrame" id="frame2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkGrid" id="grid3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <property name="row_homogeneous">True</property>
+ <child>
+ <object class="GtkRadioButton" id="vernone">
+ <property name="label" translatable="yes">N_one</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">vertop</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="GtkRadioButton" id="vertop">
+ <property name="label" translatable="yes">_Top</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">vercenter</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="vercenter">
+ <property name="label" translatable="yes">C_enter</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.56000000238418579</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">verdistance</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="verdistance">
+ <property name="label" translatable="yes">S_pacing</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">verbottom</property>
+ </object>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="verbottom">
+ <property name="label" translatable="yes">_Bottom</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">vernone</property>
+ </object>
+ <packing>
+ <property name="left_attach">4</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="image9">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="pixbuf">svx/res/dstv_hig.png</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="GtkImage" id="image10">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="pixbuf">svx/res/dstv_cen.png</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="image11">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="pixbuf">svx/res/dstv_dst.png</property>
+ </object>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="image12">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="pixbuf">svx/res/dstv_low.png</property>
+ </object>
+ <packing>
+ <property name="left_attach">4</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </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">Vertical</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </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>
+ </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>
+ <object class="GtkSizeGroup" id="sizegroup1">
+ <widgets>
+ <widget name="hornone"/>
+ <widget name="horleft"/>
+ <widget name="horcenter"/>
+ <widget name="horright"/>
+ <widget name="hordistance"/>
+ <widget name="vernone"/>
+ <widget name="vertop"/>
+ <widget name="vercenter"/>
+ <widget name="verdistance"/>
+ <widget name="verbottom"/>
+ </widgets>
+ </object>
+</interface>
More information about the Libreoffice-commits
mailing list