summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-12-10 13:19:48 +0000
committerCaolán McNamara <caolanm@redhat.com>2012-12-10 13:36:11 +0000
commit8f7855b61a29e47db70be92541422594ad99d13f (patch)
treecd56b0c40b9099ded19f1991ebe89d657fb49a56 /sw
parent6bf7198ebd12d4ac60f9039a30339867e8a3ce8e (diff)
some minor cleanup of caption dialog
ensure that some button in the dialog is the default button ensure the CategoryBox is sorted like the original was drop HID_DLG_CAPTION help id put a big more spacing between groups Change-Id: Id9e020a9dcad50c0d0b0ecb3bdbe7fd5434c8100
Diffstat (limited to 'sw')
-rw-r--r--sw/inc/helpid.h1
-rw-r--r--sw/source/ui/frmdlg/cption.cxx2
-rw-r--r--sw/uiconfig/swriter/ui/insertcaption.ui5
3 files changed, 6 insertions, 2 deletions
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index 8c31ca4f448d..917d9deb628c 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -60,7 +60,6 @@
#define HID_INSERT_CHART "SW_HID_INSERT_CHART"
#define HID_NAVIGATOR_TREELIST "SW_HID_NAVIGATOR_TREELIST"
-#define HID_DLG_CAPTION "SW_HID_DLG_CAPTION"
#define HID_DLG_GLOSS_DECIDE "SW_HID_DLG_GLOSS_DECIDE"
#define HID_NAVIGATOR_TOOLBOX "SW_HID_NAVIGATOR_TOOLBOX"
#define HID_NAVIGATOR_LISTBOX "SW_HID_NAVIGATOR_LISTBOX"
diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx
index 84bbbe670b88..404b36d11479 100644
--- a/sw/source/ui/frmdlg/cption.cxx
+++ b/sw/source/ui/frmdlg/cption.cxx
@@ -551,7 +551,7 @@ long CategoryBox::PreNotify( NotifyEvent& rNEvt )
extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeCategoryBox(Window* pParent)
{
- CategoryBox* pCategoryBox = new CategoryBox(pParent, WB_LEFT | WB_DROPDOWN | WB_VCENTER | WB_3DLOOK);
+ CategoryBox* pCategoryBox = new CategoryBox(pParent, WB_LEFT | WB_DROPDOWN | WB_VCENTER | WB_3DLOOK | WB_SORT);
pCategoryBox->EnableAutoSize(true);
return pCategoryBox;
}
diff --git a/sw/uiconfig/swriter/ui/insertcaption.ui b/sw/uiconfig/swriter/ui/insertcaption.ui
index 7a95855fa3d3..9af1ea58d6e8 100644
--- a/sw/uiconfig/swriter/ui/insertcaption.ui
+++ b/sw/uiconfig/swriter/ui/insertcaption.ui
@@ -15,6 +15,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="frame1">
<property name="visible">True</property>
@@ -71,6 +72,8 @@
<object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">6</property>
<child>
<object class="GtkLabel" id="numbering_label">
<property name="visible">True</property>
@@ -290,6 +293,8 @@
<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>