rather than use pixel widths, use appfont units

Change-Id: If9551f63ac59ffedd0bd614e4f4fe05c9047e1dc

4 files changed, 36 insertions, 32 deletions

diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx
index 1c62c1fc59a6..91553257015a 100644
--- a/cui/source/dialogs/linkdlg.cxx
+++ b/cui/source/dialogs/linkdlg.cxx
@@ -90,8 +90,10 @@ SvBaseLinksDlg::SvBaseLinksDlg( Window * pParent, LinkManager* pMgr, bool bHtml
     pLinkMgr( NULL ),
     bHtmlMode(bHtml)
 {
-    get(m_pFtFiles, "FILES");
     get(m_pTbLinks, "TB_LINKS");
+    Size aSize(LogicToPixel(Size(257, 87), MAP_APPFONT));
+    m_pTbLinks->set_width_request(aSize.Width());
+    m_pTbLinks->set_height_request(aSize.Height());
     get(m_pFtFullFileName, "FULL_FILE_NAME");
     get(m_pFtFullSourceName, "FULL_SOURCE_NAME");
     get(m_pFtFullTypeName, "FULL_TYPE_NAME");
@@ -102,20 +104,20 @@ SvBaseLinksDlg::SvBaseLinksDlg( Window * pParent, LinkManager* pMgr, bool bHtml
     get(m_pPbChangeSource, "CHANGE_SOURCE");
     get(m_pPbBreakLink, "BREAK_LINK");
 
-    m_pTbLinks->SetHelpId(HID_LINKDLG_TABLB);
     m_pTbLinks->SetSelectionMode( MULTIPLE_SELECTION );
     m_pTbLinks->SetTabs( &nTabs[0], MAP_APPFONT );
+    FixedText *pFtFiles = get<FixedText>("FILES");
+    pFtFiles->set_width_request(LogicToPixel(Size(nTabs[2] - nTabs[1] - 2, 0), MAP_APPFONT).Width());
+    FixedText *pFtLinks = get<FixedText>("LINKS");
+    pFtLinks->set_width_request(LogicToPixel(Size(nTabs[3] - nTabs[2] - 2, 0), MAP_APPFONT).Width());
+    FixedText *pFtTypes = get<FixedText>("TYPE");
+    pFtTypes->set_width_request(LogicToPixel(Size(nTabs[4] - nTabs[3] - 2, 0), MAP_APPFONT).Width());
     m_pTbLinks->Resize();  // OS: hack for correct selection
 
     // UpdateTimer for DDE-/Grf-links, which are waited for
     aUpdateTimer.SetTimeoutHdl( LINK( this, SvBaseLinksDlg, UpdateWaitingHdl ) );
     aUpdateTimer.SetTimeout( 1000 );
 
-    // Set the ZOrder, and accessible name to the dialog's title
-    m_pTbLinks->SetZOrder(0, WINDOW_ZORDER_FIRST);
-    m_pTbLinks->SetAccessibleName(this->GetText());
-    m_pTbLinks->SetAccessibleRelationLabeledBy(m_pFtFiles);
-
     m_pPbOpenSource->Hide();
 
     m_pTbLinks->SetSelectHdl( LINK( this, SvBaseLinksDlg, LinksSelectHdl ) );
diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
index bc15fab66256..deec50c6069f 100644
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpid.hrc
@@ -75,7 +75,6 @@
 #define HID_HYPERLINK_MARKWND_APPLY "CUI_HID_HYPERLINK_MARKWND_APPLY"
 #define HID_HYPERLINK_MARKWND_CLOSE "CUI_HID_HYPERLINK_MARKWND_CLOSE"
 #define HID_HYPERLINK_MARKWND_TREE "CUI_HID_HYPERLINK_MARKWND_TREE"
-#define HID_LINKDLG_TABLB "CUI_HID_LINKDLG_TABLB"
 #define HID_MACRO_HEADERTABLISTBOX "CUI_HID_MACRO_HEADERTABLISTBOX"
 
 #define HID_HYPERLINK_DIALOG                                        "CUI_HID_HYPERLINK_DIALOG"
diff --git a/cui/source/inc/linkdlg.hxx b/cui/source/inc/linkdlg.hxx
index 6c045ce5eb8c..f42889593a31 100644
--- a/cui/source/inc/linkdlg.hxx
+++ b/cui/source/inc/linkdlg.hxx
@@ -41,7 +41,6 @@ class SvBaseLinksDlg : public ModalDialog
 {
     using Window::SetType;
 
-    FixedText *m_pFtFiles;
     SvTabListBox *m_pTbLinks;
     FixedText *m_pFtFullFileName;
     FixedText *m_pFtFullSourceName;
diff --git a/cui/uiconfig/ui/baselinksdialog.ui b/cui/uiconfig/ui/baselinksdialog.ui
index 8fb8b8381d01..1d77a0a68c54 100644
--- a/cui/uiconfig/ui/baselinksdialog.ui
+++ b/cui/uiconfig/ui/baselinksdialog.ui
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.1 -->
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
+  <requires lib="gtk+" version="3.0"/>
   <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkDialog" id="BaseLinksDialog">
     <property name="can_focus">False</property>
@@ -22,8 +23,9 @@
                 <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="has_default">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -39,7 +41,6 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -55,7 +56,6 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -71,7 +71,6 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -87,7 +86,6 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -103,7 +101,6 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -129,7 +126,6 @@
             <property name="spacing">6</property>
             <child>
               <object class="GtkBox" id="box2">
-                <property name="width_request">580</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
@@ -140,13 +136,14 @@
                   <object class="GtkGrid" id="grid1">
                     <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">6</property>
                     <child>
                       <object class="GtkLabel" id="FILES">
-                        <property name="width_request">140</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
+                        <property name="xalign">0</property>
                         <property name="label" translatable="yes">Source file</property>
                       </object>
                       <packing>
@@ -158,9 +155,9 @@
                     </child>
                     <child>
                       <object class="GtkLabel" id="LINKS">
-                        <property name="width_request">140</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
+                        <property name="xalign">0</property>
                         <property name="label" translatable="yes">Element:</property>
                       </object>
                       <packing>
@@ -172,9 +169,9 @@
                     </child>
                     <child>
                       <object class="GtkLabel" id="TYPE">
-                        <property name="width_request">140</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
+                        <property name="xalign">0</property>
                         <property name="label" translatable="yes">Type</property>
                       </object>
                       <packing>
@@ -186,9 +183,10 @@
                     </child>
                     <child>
                       <object class="GtkLabel" id="STATUS">
-                        <property name="width_request">140</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
+                        <property name="hexpand">True</property>
+                        <property name="xalign">0</property>
                         <property name="label" translatable="yes">Status</property>
                       </object>
                       <packing>
@@ -198,9 +196,6 @@
                         <property name="height">1</property>
                       </packing>
                     </child>
-                    <child>
-                      <placeholder/>
-                    </child>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -217,6 +212,11 @@
                     <child internal-child="selection">
                       <object class="GtkTreeSelection" id="Tab List-selection1"/>
                     </child>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="TB_LINKS:border-atkobject">
+                        <property name="AtkObject::accessible-name" translatable="yes">Edit Links</property>
+                      </object>
+                    </child>
                   </object>
                   <packing>
                     <property name="expand">True</property>
@@ -237,12 +237,15 @@
                 <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>
                 <child>
                   <object class="GtkLabel" id="FILES2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
                     <property name="label" translatable="yes">Source file</property>
+                    <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">TB_LINKS:border</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -255,6 +258,7 @@
                   <object class="GtkLabel" id="SOURCE2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
                     <property name="label" translatable="yes">Element:</property>
                   </object>
                   <packing>
@@ -268,6 +272,7 @@
                   <object class="GtkLabel" id="TYPE2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
                     <property name="label" translatable="yes">Type:</property>
                   </object>
                   <packing>
@@ -281,6 +286,7 @@
                   <object class="GtkLabel" id="UPDATE">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
                     <property name="label" translatable="yes">Update:</property>
                   </object>
                   <packing>
@@ -294,7 +300,7 @@
                   <object class="GtkLabel" id="FULL_FILE_NAME">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">label</property>
+                    <property name="xalign">0</property>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
@@ -307,7 +313,7 @@
                   <object class="GtkLabel" id="FULL_SOURCE_NAME">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">label</property>
+                    <property name="xalign">0</property>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
@@ -320,7 +326,7 @@
                   <object class="GtkLabel" id="FULL_TYPE_NAME">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">label</property>
+                    <property name="xalign">0</property>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
@@ -333,8 +339,7 @@
                   <object class="GtkGrid" id="grid3">
                     <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>
                     <child>
                       <object class="GtkRadioButton" id="AUTOMATIC">
                         <property name="label" translatable="yes">_Automatic</property>
@@ -342,11 +347,11 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
                         <property name="xalign">0</property>
                         <property name="active">True</property>
                         <property name="draw_indicator">True</property>
+                        <property name="group">MANUAL</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -362,7 +367,6 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
                         <property name="xalign">0</property>
                         <property name="active">True</property>