Skip to content

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

align load/save buttons across dialogs 

and restore strange custom unit multi unit mode
to these metricfields

Change-Id: I7e228f6fd658374e3f1588c757ef2ed1e6ba78c8
üst bd759651
Show whitespace changes
Inline Side-by-side
Showing with 64 additions and 29 deletions
cui/source/tabpages/tplnedef.cxx
Dosyayı görüntüle @ f0118b43
...@@ -73,8 +73,11 @@ SvxLineDefTabPage::SvxLineDefTabPage ...@@ -73,8 +73,11 @@ SvxLineDefTabPage::SvxLineDefTabPage
get(m_pNumFldNumber1 ,"NUM_FLD_1"); get(m_pNumFldNumber1 ,"NUM_FLD_1");
get(m_pNumFldNumber2 ,"NUM_FLD_2"); get(m_pNumFldNumber2 ,"NUM_FLD_2");
get(m_pMtrLength1 ,"MTR_FLD_LENGTH_1"); get(m_pMtrLength1 ,"MTR_FLD_LENGTH_1");
m_pMtrLength1->SetCustomUnitText("%");
get(m_pMtrLength2 ,"MTR_FLD_LENGTH_2"); get(m_pMtrLength2 ,"MTR_FLD_LENGTH_2");
m_pMtrLength2->SetCustomUnitText("%");
get(m_pMtrDistance ,"MTR_FLD_DISTANCE"); get(m_pMtrDistance ,"MTR_FLD_DISTANCE");
m_pMtrDistance->SetCustomUnitText("%");
get(m_pCbxSynchronize ,"CBX_SYNCHRONIZE"); get(m_pCbxSynchronize ,"CBX_SYNCHRONIZE");
get(m_pBtnAdd ,"BTN_ADD"); get(m_pBtnAdd ,"BTN_ADD");
get(m_pBtnModify ,"BTN_MODIFY"); get(m_pBtnModify ,"BTN_MODIFY");
......
cui/uiconfig/ui/lineendstabpage.ui
Dosyayı görüntüle @ f0118b43
...@@ -37,8 +37,8 @@ ...@@ -37,8 +37,8 @@
<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="valign">start</property>
<property name="hexpand">True</property> <property name="hexpand">True</property>
<property name="vexpand">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>
...@@ -101,6 +101,22 @@ ...@@ -101,6 +101,22 @@
<property name="height">1</property> <property name="height">1</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkLabel" id="FI_TIP">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">end</property>
<property name="vexpand">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Add a selected object to create new arrow styles.</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
<property name="width">2</property>
<property name="height">1</property>
</packing>
</child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
...@@ -232,19 +248,6 @@ ...@@ -232,19 +248,6 @@
<property name="valign">end</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>
<object class="GtkLabel" id="FI_TIP">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Add a selected object to create new arrow styles.</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child> <child>
<object class="svxlo-SvxXLinePreview" id="CTL_PREVIEW"> <object class="svxlo-SvxXLinePreview" id="CTL_PREVIEW">
<property name="visible">True</property> <property name="visible">True</property>
...@@ -253,7 +256,7 @@ ...@@ -253,7 +256,7 @@
<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">1</property> <property name="position">0</property>
</packing> </packing>
</child> </child>
</object> </object>
......
cui/uiconfig/ui/linestyletabpage.ui
Dosyayı görüntüle @ f0118b43
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
<!-- interface-requires gtk+ 3.0 --> <!-- interface-requires gtk+ 3.0 -->
<!-- interface-requires LibreOffice 1.0 --> <!-- interface-requires LibreOffice 1.0 -->
<object class="GtkAdjustment" id="adjustmentDIST"> <object class="GtkAdjustment" id="adjustmentDIST">
<property name="upper">5000</property> <property name="upper">5</property>
<property name="step_increment">1</property> <property name="step_increment">0.10000000000000001</property>
<property name="page_increment">10</property> <property name="page_increment">1</property>
</object> </object>
<object class="GtkAdjustment" id="adjustmentNUM"> <object class="GtkAdjustment" id="adjustmentNUM">
<property name="upper">99</property> <property name="upper">99</property>
...@@ -43,6 +43,8 @@ ...@@ -43,6 +43,8 @@
<object class="GtkFrame" id="LineStylePage"> <object class="GtkFrame" id="LineStylePage">
<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>
...@@ -50,23 +52,31 @@ ...@@ -50,23 +52,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="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="hexpand">True</property>
<property name="vexpand">True</property>
<property name="spacing">12</property> <property name="spacing">12</property>
<child> <child>
<object class="GtkBox" id="box4"> <object class="GtkBox" id="box4">
<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="orientation">vertical</property> <property name="orientation">vertical</property>
<property name="spacing">6</property> <property name="spacing">6</property>
<child> <child>
...@@ -151,7 +161,7 @@ ...@@ -151,7 +161,7 @@
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="label" translatable="yes">_Length:</property> <property name="label" translatable="yes">_Length:</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="mnemonic_widget">MTR_FLD_LENGTH_1:0cm</property> <property name="mnemonic_widget">MTR_FLD_LENGTH_1:0.00cm</property>
</object> </object>
<packing> <packing>
<property name="left_attach">0</property> <property name="left_attach">0</property>
...@@ -167,7 +177,7 @@ ...@@ -167,7 +177,7 @@
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="label" translatable="yes">_Spacing:</property> <property name="label" translatable="yes">_Spacing:</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="mnemonic_widget">MTR_FLD_DISTANCE:0cm</property> <property name="mnemonic_widget">MTR_FLD_DISTANCE:0.00cm</property>
</object> </object>
<packing> <packing>
<property name="left_attach">0</property> <property name="left_attach">0</property>
...@@ -248,7 +258,7 @@ ...@@ -248,7 +258,7 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkSpinButton" id="MTR_FLD_LENGTH_1:0cm"> <object class="GtkSpinButton" id="MTR_FLD_LENGTH_1:0.00cm">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="invisible_char">•</property> <property name="invisible_char">•</property>
...@@ -263,7 +273,7 @@ ...@@ -263,7 +273,7 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkSpinButton" id="MTR_FLD_LENGTH_2:0cm"> <object class="GtkSpinButton" id="MTR_FLD_LENGTH_2:0.00cm">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="invisible_char">•</property> <property name="invisible_char">•</property>
...@@ -278,7 +288,7 @@ ...@@ -278,7 +288,7 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkSpinButton" id="MTR_FLD_DISTANCE:0cm"> <object class="GtkSpinButton" id="MTR_FLD_DISTANCE:0.00cm">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="invisible_char">•</property> <property name="invisible_char">•</property>
...@@ -319,6 +329,8 @@ ...@@ -319,6 +329,8 @@
<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="halign">end</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>
...@@ -365,6 +377,12 @@ ...@@ -365,6 +377,12 @@
<property name="position">2</property> <property name="position">2</property>
</packing> </packing>
</child> </child>
<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">6</property>
<child> <child>
<object class="GtkButton" id="BTN_LOAD"> <object class="GtkButton" id="BTN_LOAD">
<property name="visible">True</property> <property name="visible">True</property>
...@@ -373,14 +391,15 @@ ...@@ -373,14 +391,15 @@
<property name="has_tooltip">True</property> <property name="has_tooltip">True</property>
<property name="tooltip_markup" translatable="yes">Load Line Styles</property> <property name="tooltip_markup" translatable="yes">Load Line Styles</property>
<property name="tooltip_text" translatable="yes">Load Line Styles</property> <property name="tooltip_text" translatable="yes">Load Line Styles</property>
<property name="halign">start</property> <property name="halign">center</property>
<property name="hexpand">True</property> <property name="hexpand">True</property>
<property name="image">image1</property> <property name="image">image1</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="left_attach">0</property>
<property name="fill">True</property> <property name="top_attach">0</property>
<property name="position">3</property> <property name="width">1</property>
<property name="height">1</property>
</packing> </packing>
</child> </child>
<child> <child>
...@@ -391,14 +410,23 @@ ...@@ -391,14 +410,23 @@
<property name="has_tooltip">True</property> <property name="has_tooltip">True</property>
<property name="tooltip_markup" translatable="yes">Save Line Styles</property> <property name="tooltip_markup" translatable="yes">Save Line Styles</property>
<property name="tooltip_text" translatable="yes">Save Line Styles</property> <property name="tooltip_text" translatable="yes">Save Line Styles</property>
<property name="halign">start</property> <property name="halign">center</property>
<property name="hexpand">True</property> <property name="hexpand">True</property>
<property name="image">image2</property> <property name="image">image2</property>
</object> </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>
<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">4</property> <property name="position">3</property>
<property name="secondary">True</property>
</packing> </packing>
</child> </child>
</object> </object>
...@@ -419,6 +447,7 @@ ...@@ -419,6 +447,7 @@
<object class="svxlo-SvxXLinePreview" id="CTL_PREVIEW"> <object class="svxlo-SvxXLinePreview" id="CTL_PREVIEW">
<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>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
......
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