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

make line ends preview correctly again

Change-Id: Id6516aec9a4c79d1ccceb06b06582eb00dd8c5eb
üst 0651e83d
...@@ -392,7 +392,8 @@ public: ...@@ -392,7 +392,8 @@ public:
void SetLineEndChgd( ChangeType* pIn ) { pnLineEndListState = pIn; } void SetLineEndChgd( ChangeType* pIn ) { pnLineEndListState = pIn; }
virtual void DataChanged( const DataChangedEvent& rDCEvt ); virtual void DataChanged( const DataChangedEvent& rDCEvt );
virtual void Resize();
}; };
#endif // _CUI_TAB_LINE_HXX #endif // _CUI_TAB_LINE_HXX
......
...@@ -100,6 +100,13 @@ SvxLineEndDefTabPage::SvxLineEndDefTabPage ...@@ -100,6 +100,13 @@ SvxLineEndDefTabPage::SvxLineEndDefTabPage
} }
void SvxLineEndDefTabPage::Resize()
{
rXLSet.Put(XLineStartWidthItem(m_pCtlPreview->GetOutputSize().Height() / 2 ));
rXLSet.Put(XLineEndWidthItem(m_pCtlPreview->GetOutputSize().Height() / 2 ));
SfxTabPage::Resize();
}
//------------------------------------------------------------------------ //------------------------------------------------------------------------
SvxLineEndDefTabPage::~SvxLineEndDefTabPage() SvxLineEndDefTabPage::~SvxLineEndDefTabPage()
......
...@@ -2,19 +2,11 @@ ...@@ -2,19 +2,11 @@
<interface> <interface>
<!-- interface-requires gtk+ 3.0 --> <!-- interface-requires gtk+ 3.0 -->
<!-- interface-requires LibreOffice 1.0 --> <!-- interface-requires LibreOffice 1.0 -->
<object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="pixbuf">res/sc05501.png</property>
</object>
<object class="GtkImage" id="image2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="pixbuf">res/sc05502.png</property>
</object>
<object class="GtkFrame" id="LineEndPage"> <object class="GtkFrame" id="LineEndPage">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="border_width">6</property> <property name="border_width">6</property>
<property name="label_xalign">0</property> <property name="label_xalign">0</property>
<property name="shadow_type">none</property> <property name="shadow_type">none</property>
...@@ -22,25 +14,31 @@ ...@@ -22,25 +14,31 @@
<object class="GtkAlignment" id="alignment1"> <object class="GtkAlignment" id="alignment1">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</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="top_padding">6</property>
<property name="left_padding">12</property> <property name="left_padding">12</property>
<child> <child>
<object class="GtkBox" id="box1"> <object class="GtkBox" id="box1">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<property name="spacing">6</property> <property name="spacing">6</property>
<child> <child>
<object class="GtkBox" id="box2"> <object class="GtkBox" id="box2">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="spacing">12</property> <property name="spacing">12</property>
<child> <child>
<object class="GtkGrid" id="grid1"> <object class="GtkGrid" id="grid1">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="halign">start</property>
<property name="valign">start</property> <property name="valign">start</property>
<property name="hexpand">True</property>
<property name="row_spacing">6</property> <property name="row_spacing">6</property>
<property name="column_spacing">12</property> <property name="column_spacing">12</property>
<child> <child>
...@@ -78,7 +76,10 @@ ...@@ -78,7 +76,10 @@
<object class="GtkEntry" id="EDT_NAME"> <object class="GtkEntry" id="EDT_NAME">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="halign">start</property>
<property name="hexpand">True</property>
<property name="invisible_char"></property> <property name="invisible_char"></property>
<property name="width_chars">30</property>
</object> </object>
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
...@@ -91,6 +92,7 @@ ...@@ -91,6 +92,7 @@
<object class="svxlo-LineEndLB" id="LB_LINEENDS"> <object class="svxlo-LineEndLB" id="LB_LINEENDS">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="halign">start</property>
</object> </object>
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
...@@ -110,6 +112,7 @@ ...@@ -110,6 +112,7 @@
<object class="GtkButtonBox" id="buttonbox1"> <object class="GtkButtonBox" id="buttonbox1">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="vexpand">True</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<property name="spacing">6</property> <property name="spacing">6</property>
<property name="layout_style">start</property> <property name="layout_style">start</property>
...@@ -157,39 +160,55 @@ ...@@ -157,39 +160,55 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkButton" id="BTN_LOAD"> <object class="GtkGrid" id="grid2">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">False</property>
<property name="receives_default">True</property> <property name="row_spacing">6</property>
<property name="has_tooltip">True</property> <property name="column_spacing">6</property>
<property name="tooltip_markup" translatable="yes">Load arrow styles</property> <child>
<property name="tooltip_text" translatable="yes">Load arrow styles</property> <object class="GtkButton" id="BTN_LOAD">
<property name="halign">center</property> <property name="visible">True</property>
<property name="hexpand">True</property> <property name="can_focus">True</property>
<property name="image">image1</property> <property name="receives_default">True</property>
<property name="has_tooltip">True</property>
<property name="tooltip_markup" translatable="yes">Load arrow styles</property>
<property name="tooltip_text" translatable="yes">Load arrow styles</property>
<property name="halign">center</property>
<property name="hexpand">True</property>
<property name="image">image1</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>
<child>
<object class="GtkButton" id="BTN_SAVE">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
<property name="tooltip_markup" translatable="yes">Save arrow styles</property>
<property name="tooltip_text" translatable="yes">Save arrow styles</property>
<property name="halign">center</property>
<property name="hexpand">True</property>
<property name="image">image2</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>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">3</property> <property name="position">3</property>
</packing> <property name="secondary">True</property>
</child>
<child>
<object class="GtkButton" id="BTN_SAVE">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
<property name="tooltip_markup" translatable="yes">Save arrow styles</property>
<property name="tooltip_text" translatable="yes">Save arrow styles</property>
<property name="halign">center</property>
<property name="hexpand">True</property>
<property name="image">image2</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">4</property>
</packing> </packing>
</child> </child>
</object> </object>
...@@ -210,6 +229,7 @@ ...@@ -210,6 +229,7 @@
<object class="GtkBox" id="box3"> <object class="GtkBox" id="box3">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="valign">end</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<property name="spacing">6</property> <property name="spacing">6</property>
<child> <child>
...@@ -259,4 +279,14 @@ ...@@ -259,4 +279,14 @@
</object> </object>
</child> </child>
</object> </object>
<object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="pixbuf">res/sc05501.png</property>
</object>
<object class="GtkImage" id="image2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="pixbuf">res/sc05502.png</property>
</object>
</interface> </interface>
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