Kaydet (Commit) d856ae2f authored tarafından Caolán McNamara's avatar Caolán McNamara

deploy maingrid hack to align previews within similar tabpages in a dialog

and move some accessibility resources into the .ui files

Change-Id: I139a7df4c8c18110fcd576a69a565b2e7baea0db
üst 5d63514c
......@@ -121,6 +121,4 @@
#define CB_HATCHBCKGRD 21
#define LB_HATCHBCKGRDCOLOR 22
#define STR_LB_HATCHINGSTYLE 5031
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
......@@ -881,9 +881,4 @@ TabDialog RID_SVXDLG_AREA
};
};
String STR_LB_HATCHINGSTYLE
{
Text [ en-US ] = "Hatching Style" ;
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
......@@ -23,6 +23,7 @@
#include <vcl/msgbox.hxx>
#include <unotools/pathoptions.hxx>
#include <sfx2/app.hxx>
#include <sfx2/dialoghelper.hxx>
#include <sfx2/filedlghelper.hxx>
#include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
......@@ -93,8 +94,7 @@ SvxGradientTabPage::SvxGradientTabPage
get(m_pBtnLoad, "load");
get(m_pBtnSave, "save");
m_pCtlPreview->SetAccessibleName(String(CUI_RES(STR_EXAMPLE)));
m_pLbGradients->SetAccessibleName( GetText());
m_pLbGradients->SetAccessibleName(GetText());
// this page needs ExchangeSupport
......@@ -137,6 +137,8 @@ SvxGradientTabPage::SvxGradientTabPage
// #i76307# always paint the preview in LTR, because this is what the document does
m_pCtlPreview->EnableRTL( sal_False );
setPreviewsToSamePlace(pParent, this);
}
// -----------------------------------------------------------------------
......
......@@ -22,8 +22,9 @@
#include <vcl/msgbox.hxx>
#include <unotools/pathoptions.hxx>
#include <sfx2/app.hxx>
#include <sfx2/module.hxx>
#include <sfx2/dialoghelper.hxx>
#include <sfx2/filedlghelper.hxx>
#include <sfx2/module.hxx>
#include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
#include <cuires.hrc>
......@@ -134,8 +135,7 @@ SvxHatchTabPage::SvxHatchTabPage
m_pCtlPreview->SetDrawMode( GetSettings().GetStyleSettings().GetHighContrastMode() ? OUTPUT_DRAWMODE_CONTRAST : OUTPUT_DRAWMODE_COLOR );
m_pCtlPreview->SetAccessibleName(String(CUI_RES(STR_EXAMPLE)));
m_pLbHatchings->SetAccessibleName( String(CUI_RES(STR_LB_HATCHINGSTYLE)) );
setPreviewsToSamePlace(pParent, this);
}
// -----------------------------------------------------------------------
......
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
<!-- interface-requires LibreOffice 1.0 -->
<object class="GtkAdjustment" id="angleadjustment">
<property name="upper">359</property>
<property name="step_increment">15</property>
......@@ -36,12 +37,12 @@
<property name="vexpand">True</property>
<property name="spacing">12</property>
<child>
<object class="GtkGrid" id="grid2">
<object class="GtkGrid" id="maingrid">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="vexpand">True</property>
<property name="row_spacing">6</property>
<property name="column_spacing">6</property>
<property name="column_spacing">12</property>
<child>
<object class="GtkLabel" id="typeft">
<property name="visible">True</property>
......@@ -361,6 +362,11 @@
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="previewctl-atkobject">
<property name="AtkObject::accessible-name" translatable="yes">Example</property>
</object>
</child>
</object>
<packing>
<property name="left_attach">0</property>
......
This diff is collapsed.
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