diff options
Diffstat (limited to 'cui')
-rw-r--r-- | cui/source/options/optgdlg.cxx | 13 | ||||
-rw-r--r-- | cui/source/options/optinet2.cxx | 11 | ||||
-rw-r--r-- | cui/uiconfig/ui/optviewpage.ui | 528 |
3 files changed, 293 insertions, 259 deletions
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index f4599e117e3a..6b3a1a14d438 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -545,6 +545,19 @@ OfaViewTabPage::OfaViewTabPage(Window* pParent, const SfxItemSet& rSet) get(m_pIconSizeLB, "iconsize"); get(m_pIconStyleLB, "iconstyle"); get(m_pSystemFont, "systemfont"); + + VclContainer *pRef = get<VclContainer>("refgrid"); + //fdo#65595, we need height-for-width support here, but for now we can + //bodge it + Size aPrefSize(m_pSystemFont->get_preferred_size()); + Size aSize(pRef->get_preferred_size()); + if (aPrefSize.Width() > aSize.Width()) + { + aSize = m_pSystemFont->CalcMinimumSize(aSize.Width()); + m_pSystemFont->set_width_request(aSize.Width()); + m_pSystemFont->set_height_request(aSize.Height()); + } + get(m_pFontAntiAliasing, "aafont"); get(m_pAAPointLimitLabel, "aafrom"); get(m_pAAPointLimit, "aanf"); diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx index 3dc09596b5a9..3064bca79c86 100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx @@ -585,11 +585,16 @@ SvxSecurityTabPage::SvxSecurityTabPage(Window* pParent, const SfxItemSet& rSet) get(m_pSecurityOptionsPB, "options"); get(m_pSavePasswordsCB, "savepassword"); - //fdo#65595, we height-for-width support here, but for now we can + //fdo#65595, we need height-for-width support here, but for now we can //bodge it + Size aPrefSize(m_pSavePasswordsCB->get_preferred_size()); Size aSize(m_pSavePasswordsCB->CalcMinimumSize(56*approximate_char_width())); - m_pSavePasswordsCB->set_width_request(aSize.Width()); - m_pSavePasswordsCB->set_height_request(aSize.Height()); + if (aPrefSize.Width() > aSize.Width()) + { + fprintf(stderr, "FOO\n"); + m_pSavePasswordsCB->set_width_request(aSize.Width()); + m_pSavePasswordsCB->set_height_request(aSize.Height()); + } get(m_pShowConnectionsPB, "connections"); get(m_pMasterPasswordCB, "usemasterpassword"); diff --git a/cui/uiconfig/ui/optviewpage.ui b/cui/uiconfig/ui/optviewpage.ui index 31b8ecde9482..0c68af7442d2 100644 --- a/cui/uiconfig/ui/optviewpage.ui +++ b/cui/uiconfig/ui/optviewpage.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.16.0 on Thu Jan 9 11:17:49 2014 --> +<!-- Generated with glade 3.16.0 on Thu Jan 9 14:01:27 2014 --> <interface> <!-- interface-requires gtk+ 3.0 --> <object class="GtkAdjustment" id="adjustment1"> @@ -16,136 +16,44 @@ <property name="step_increment">1</property> <property name="page_increment">10</property> </object> - <object class="GtkAdjustment" id="adjustment3"> - <property name="lower">10</property> - <property name="upper">90</property> - <property name="value">75</property> - <property name="step_increment">1</property> - <property name="page_increment">10</property> - </object> - <object class="GtkBox" id="OptViewPage"> + <object class="GtkGrid" id="OptViewPage"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="valign">start</property> <property name="border_width">6</property> - <property name="spacing">12</property> + <property name="column_spacing">12</property> <child> - <object class="GtkBox" id="box3"> + <object class="GtkGrid" id="grid1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">18</property> + <property name="row_spacing">18</property> <child> - <object class="GtkFrame" id="frame1"> + <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="alignment1"> + <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="grid4"> + <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="GtkGrid" id="grid5"> + <object class="GtkCheckButton" id="useaccel"> + <property name="label" translatable="yes">Use hard_ware acceleration</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkLabel" id="label7"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Sc_aling</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">windowsize:0%</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="GtkSpinButton" id="windowsize:0%"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="halign">start</property> - <property name="invisible_char">•</property> - <property name="adjustment">adjustment1</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="GtkLabel" id="label8"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Icon _size and style</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">iconsize</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - <property name="width">2</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="iconsize"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <items> - <item translatable="yes">Automatic</item> - <item translatable="yes">Small</item> - <item translatable="yes">Large</item> - </items> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="iconstyle"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <items> - <item translatable="yes">Automatic</item> - <item translatable="yes">Galaxy</item> - <item translatable="yes">High Contrast</item> - <item translatable="yes">Industrial</item> - <item translatable="yes">Crystal</item> - <item translatable="yes">Tango</item> - <item translatable="yes">Oxygen</item> - <item translatable="yes">Classic</item> - <item translatable="yes">Human</item> - <item translatable="yes">Sifr</item> - <item translatable="yes">Tango Testing</item> - </items> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> + <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> @@ -155,8 +63,8 @@ </packing> </child> <child> - <object class="GtkCheckButton" id="systemfont"> - <property name="label" translatable="yes">Use system _font for user interface</property> + <object class="GtkCheckButton" id="useaa"> + <property name="label" translatable="yes">Use Anti-A_liasing</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -171,9 +79,48 @@ <property name="height">1</property> </packing> </child> + </object> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="label2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Graphics output</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="frame7"> + <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="alignment7"> + <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="grid11"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="column_spacing">12</property> <child> - <object class="GtkCheckButton" id="aafont"> - <property name="label" translatable="yes">Screen font antialiasin_g</property> + <object class="GtkCheckButton" id="trans"> + <property name="label" translatable="yes">_Transparency</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -183,50 +130,23 @@ </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">2</property> + <property name="top_attach">0</property> <property name="width">1</property> <property name="height">1</property> </packing> </child> <child> - <object class="GtkGrid" id="fromft"> + <object class="GtkSpinButton" id="transmf:0%"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_left">12</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkLabel" id="aafrom"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">fro_m</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">aanf:0pixels</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="GtkSpinButton" id="aanf:0pixels"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="invisible_char">•</property> - <property name="adjustment">adjustment2</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> + <property name="can_focus">True</property> + <property name="invisible_char">•</property> + <property name="text" translatable="yes">75</property> + <property name="adjustment">adjustment3</property> + <property name="value">75</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> + <property name="left_attach">1</property> + <property name="top_attach">0</property> <property name="width">1</property> <property name="height">1</property> </packing> @@ -236,10 +156,10 @@ </object> </child> <child type="label"> - <object class="GtkLabel" id="label1"> + <object class="GtkLabel" id="label14"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">User Interface</property> + <property name="label" translatable="yes">Selection</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -247,9 +167,10 @@ </child> </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">3</property> + <property name="width">1</property> + <property name="height">1</property> </packing> </child> <child> @@ -317,9 +238,10 @@ </child> </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> <child> @@ -389,63 +311,173 @@ </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + <property name="width">1</property> + <property name="height">1</property> </packing> </child> </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> - <object class="GtkBox" id="box4"> + <object class="GtkGrid" id="grid2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">center</property> <property name="hexpand">True</property> - <property name="orientation">vertical</property> - <property name="spacing">18</property> + <property name="row_spacing">18</property> <child> - <object class="GtkFrame" id="frame2"> + <object class="GtkFrame" id="frame1"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="hexpand">True</property> <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment2"> + <object class="GtkAlignment" id="alignment1"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="hexpand">True</property> <property name="top_padding">6</property> <property name="left_padding">12</property> <child> - <object class="GtkGrid" id="grid3"> + <object class="GtkGrid" id="grid4"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="hexpand">True</property> <property name="row_spacing">6</property> <child> - <object class="GtkCheckButton" id="useaccel"> - <property name="label" translatable="yes">Use hard_ware acceleration</property> + <object class="GtkGrid" id="refgrid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <child> + <object class="GtkLabel" id="label7"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Sc_aling</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">windowsize:0%</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="GtkSpinButton" id="windowsize:0%"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="halign">start</property> + <property name="invisible_char">•</property> + <property name="adjustment">adjustment1</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="GtkLabel" id="label8"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Icon _size and style</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">iconsize</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + <property name="width">2</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="iconsize"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <items> + <item translatable="yes">Automatic</item> + <item translatable="yes">Small</item> + <item translatable="yes">Large</item> + </items> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="iconstyle"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="hexpand">True</property> + <items> + <item translatable="yes">Automatic</item> + <item translatable="yes">Galaxy</item> + <item translatable="yes">High Contrast</item> + <item translatable="yes">Industrial</item> + <item translatable="yes">Crystal</item> + <item translatable="yes">Tango</item> + <item translatable="yes">Oxygen</item> + <item translatable="yes">Classic</item> + <item translatable="yes">Human</item> + <item translatable="yes">Sifr</item> + <item translatable="yes">Tango Testing</item> + </items> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</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> + <child> + <object class="GtkCheckButton" id="systemfont:wrap"> + <property name="label" translatable="yes">Use system _font for user interface</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="hexpand">True</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">0</property> + <property name="top_attach">1</property> <property name="width">1</property> <property name="height">1</property> </packing> </child> <child> - <object class="GtkCheckButton" id="useaa"> - <property name="label" translatable="yes">Use Anti-A_liasing</property> + <object class="GtkCheckButton" id="aafont"> + <property name="label" translatable="yes">Screen font antialiasin_g</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -455,7 +487,50 @@ </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="top_attach">2</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkGrid" id="fromft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_left">12</property> + <property name="column_spacing">12</property> + <child> + <object class="GtkLabel" id="aafrom"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">fro_m</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">aanf:0pixels</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="GtkSpinButton" id="aanf:0pixels"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="invisible_char">•</property> + <property name="adjustment">adjustment2</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> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> <property name="width">1</property> <property name="height">1</property> </packing> @@ -465,10 +540,10 @@ </object> </child> <child type="label"> - <object class="GtkLabel" id="label2"> + <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Graphics output</property> + <property name="label" translatable="yes">User Interface</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -476,9 +551,10 @@ </child> </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> @@ -587,88 +663,28 @@ </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkFrame" id="frame7"> - <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="alignment7"> - <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="grid11"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkCheckButton" id="trans"> - <property name="label" translatable="yes">_Transparency</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">0</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="transmf:0%"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="invisible_char">•</property> - <property name="adjustment">adjustment3</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> - </child> - </object> - </child> - <child type="label"> - <object class="GtkLabel" id="label14"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Selection</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</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="expand">False</property> - <property name="fill">True</property> - <property name="position">1</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> </object> + <object class="GtkAdjustment" id="adjustment3"> + <property name="lower">10</property> + <property name="upper">90</property> + <property name="value">75</property> + <property name="step_increment">1</property> + <property name="page_increment">10</property> + </object> <object class="GtkSizeGroup" id="sizegroup1"> <property name="ignore_hidden">True</property> <widgets> |