summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sw/inc/helpid.h1
-rw-r--r--sw/source/ui/config/optpage.cxx12
-rw-r--r--sw/uiconfig/swriter/ui/viewoptionspage.ui174
3 files changed, 92 insertions, 95 deletions
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index 66574aa17402..1340e25483d9 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -158,7 +158,6 @@
#define HID_ENV_ENV "SW_HID_ENV_ENV"
#define HID_ENV_FMT "SW_HID_ENV_FMT"
#define HID_FRM_URL "SW_HID_FRM_URL"
-#define HID_CONTENT_OPT "SW_HID_CONTENT_OPT"
#define HID_STD_FONT "SW_HID_STD_FONT"
#define HID_COND_COLL "SW_HID_COND_COLL"
#define HID_FRM_ADD "SW_HID_FRM_ADD"
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 82ef325125a7..055150e7d0cf 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -111,13 +111,7 @@ SwContentOptPage::SwContentOptPage( Window* pParent,
}
SvtCJKOptions aCJKOptions;
- if(aCJKOptions.IsVerticalTextEnabled() )
- {
- Point aSmoothPos(m_pSmoothCBox->GetPosPixel());
- aSmoothPos.Y() += aSmoothPos.Y() - m_pVRulerCBox->GetPosPixel().Y();
- m_pSmoothCBox->SetPosPixel(aSmoothPos);
- }
- else
+ if(!aCJKOptions.IsVerticalTextEnabled() )
m_pVRulerRightCBox->Hide();
m_pVRulerCBox->SetClickHdl(LINK(this, SwContentOptPage, VertRulerHdl ));
m_pAnyRulerCB->SetClickHdl(LINK(this, SwContentOptPage, AnyRulerHdl));
@@ -351,10 +345,6 @@ SwAddPrinterTabPage::SwAddPrinterTabPage(Window* pParent,
m_pRightPageCB->Hide();
m_pPrintHiddenTextCB->Hide();
m_pPrintTextPlaceholderCB->Hide();
- m_pProspectCB->SetPosPixel(m_pLeftPageCB->GetPosPixel());
- Point aPt( m_pRightPageCB->GetPosPixel() );
- aPt.setX(aPt.getX() + 15); // indent
- m_pProspectCB_RTL->SetPosPixel(aPt);
// hide m_pPrintEmptyPagesCB
m_pPrintEmptyPagesCB->Hide();
diff --git a/sw/uiconfig/swriter/ui/viewoptionspage.ui b/sw/uiconfig/swriter/ui/viewoptionspage.ui
index 22832717d8c0..6b11ae2316ce 100644
--- a/sw/uiconfig/swriter/ui/viewoptionspage.ui
+++ b/sw/uiconfig/swriter/ui/viewoptionspage.ui
@@ -12,13 +12,14 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="row_spacing">6</property>
- <property name="column_spacing">6</property>
+ <property name="column_spacing">12</property>
<property name="column_homogeneous">True</property>
<child>
<object class="GtkBox" id="box1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
+ <property name="spacing">12</property>
<child>
<object class="GtkFrame" id="guidesframe">
<property name="visible">True</property>
@@ -37,10 +38,11 @@
<property name="can_focus">False</property>
<child>
<object class="GtkCheckButton" id="helplines">
- <property name="label" translatable="yes">Helplines While Moving</property>
+ <property name="label" translatable="yes">Helplines _While Moving</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>
</object>
@@ -88,12 +90,14 @@
<object class="GtkGrid" id="grid3">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
<child>
<object class="GtkCheckButton" id="graphics">
- <property name="label" translatable="yes">Graphics and objects</property>
+ <property name="label" translatable="yes">_Graphics and objects</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>
</object>
@@ -106,10 +110,11 @@
</child>
<child>
<object class="GtkCheckButton" id="tables">
- <property name="label" translatable="yes">Tables</property>
+ <property name="label" translatable="yes">_Tables</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>
</object>
@@ -122,10 +127,11 @@
</child>
<child>
<object class="GtkCheckButton" id="drawings">
- <property name="label" translatable="yes">Drawings and controls</property>
+ <property name="label" translatable="yes">Dra_wings and controls</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>
</object>
@@ -138,10 +144,11 @@
</child>
<child>
<object class="GtkCheckButton" id="fieldcodes">
- <property name="label" translatable="yes">Field codes</property>
+ <property name="label" translatable="yes">_Field codes</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>
</object>
@@ -154,10 +161,11 @@
</child>
<child>
<object class="GtkCheckButton" id="comments">
- <property name="label" translatable="yes">Comments</property>
+ <property name="label" translatable="yes">_Comments</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>
</object>
@@ -202,6 +210,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
+ <property name="spacing">12</property>
<child>
<object class="GtkFrame" id="viewframe">
<property name="visible">True</property>
@@ -218,12 +227,14 @@
<object class="GtkGrid" id="grid4">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
<child>
<object class="GtkCheckButton" id="hscrollbar">
- <property name="label" translatable="yes">Horizontal scrollbar</property>
+ <property name="label" translatable="yes">H_orizontal scrollbar</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>
</object>
@@ -236,10 +247,11 @@
</child>
<child>
<object class="GtkCheckButton" id="vscrollbar">
- <property name="label" translatable="yes">Vertical scrollbar</property>
+ <property name="label" translatable="yes">_Vertical scrollbar</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>
</object>
@@ -252,10 +264,11 @@
</child>
<child>
<object class="GtkCheckButton" id="ruler">
- <property name="label" translatable="yes">Ruler</property>
+ <property name="label" translatable="yes">R_uler</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>
</object>
@@ -267,64 +280,73 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="box3">
+ <object class="GtkCheckButton" id="smoothscroll">
+ <property name="label" translatable="yes">S_mooth scroll</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>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">4</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="grid6">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_left">18</property>
- <property name="homogeneous">True</property>
+ <property name="margin_left">12</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
<child>
<object class="GtkCheckButton" id="hruler">
- <property name="label" translatable="yes">Horizontal ruler</property>
+ <property name="label" translatable="yes">Hori_zontal ruler</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>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
+ <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="GtkComboBox" id="hrulercombobox">
+ <object class="GtkCheckButton" id="vruler">
+ <property name="label" translatable="yes">Verti_cal ruler</property>
<property name="visible">True</property>
- <property name="can_focus">False</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>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <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">3</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="box4">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_left">18</property>
- <property name="homogeneous">True</property>
<child>
- <object class="GtkCheckButton" id="vruler">
- <property name="label" translatable="yes">Vertical ruler</property>
+ <object class="GtkComboBox" id="hrulercombobox">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
+ <property name="can_focus">False</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
+ <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>
@@ -333,48 +355,34 @@
<property name="can_focus">False</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <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="GtkCheckButton" id="vrulerright">
+ <property name="label" translatable="yes">Right-aligned</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="margin_left">12</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</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>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">4</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="vrulerright">
- <property name="label" translatable="yes">Right-aligned</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="margin_left">36</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">5</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="smoothscroll">
- <property name="label" translatable="yes">Smooth scroll</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">6</property>
+ <property name="top_attach">3</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
@@ -416,7 +424,7 @@
<object class="GtkGrid" id="grid5">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="column_spacing">10</property>
+ <property name="column_spacing">12</property>
<child>
<object class="GtkComboBox" id="measureunit">
<property name="visible">True</property>
generated by cgit (git 2.34.1) at 2024-08-15 08:55:12 +0000