[Libreoffice-commits] core.git: 3 commits - cui/source cui/uiconfig cui/UIConfig_cui.mk helpcontent2 sc/inc sc/source sc/uiconfig
Caolán McNamara
caolanm at redhat.com
Fri Jul 19 07:58:13 PDT 2013
cui/UIConfig_cui.mk | 1
cui/source/inc/cuires.hrc | 1
cui/source/tabpages/autocdlg.cxx | 28 ++----
cui/source/tabpages/autocdlg.src | 47 -----------
cui/uiconfig/ui/percentdialog.ui | 114 ++++++++++++++++++++++++++++
helpcontent2 | 2
sc/inc/helpids.h | 1
sc/source/ui/dbgui/tpsubt.cxx | 3
sc/uiconfig/scalc/ui/sortoptionspage.ui | 11 +-
sc/uiconfig/scalc/ui/subtotaloptionspage.ui | 12 ++
10 files changed, 143 insertions(+), 77 deletions(-)
New commits:
commit 420c0b184210b8cdd48527536dc36a444573f408
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jul 19 13:55:27 2013 +0100
convert percent dialog to .ui
Change-Id: I28d15741f4d5408afc5f628bd7416724f7ab2eef
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index 0b0e978..3ab4196 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -68,6 +68,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/paraindentspacing \
cui/uiconfig/ui/paratabspage \
cui/uiconfig/ui/pastespecial \
+ cui/uiconfig/ui/percentdialog \
cui/uiconfig/ui/personalization_tab \
cui/uiconfig/ui/pickbulletpage \
cui/uiconfig/ui/pickgraphicpage \
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
index a79c503..7b6c52d 100644
--- a/cui/source/inc/cuires.hrc
+++ b/cui/source/inc/cuires.hrc
@@ -117,7 +117,6 @@
#define RID_OFAPAGE_AUTOFMT_APPLY (RID_OFA_START + 110)
#define RID_OFAPAGE_AUTOCORR_QUOTE (RID_OFA_START + 109)
-#define RID_OFADLG_PRCNT_SET (RID_OFA_START + 111)
// options
#define RID_SVXSTR_DIAGRAM_ROW (RID_SVX_START + 1162)
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 5650ae9..1693f46 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -288,25 +288,19 @@ struct ImpUserData
class OfaAutoFmtPrcntSet : public ModalDialog
{
- OKButton aOKPB;
- CancelButton aCancelPB;
- FixedLine aPrcntFL;
- MetricField aPrcntMF;
-
- public:
- OfaAutoFmtPrcntSet(Window* pParent) :
- ModalDialog(pParent, CUI_RES(RID_OFADLG_PRCNT_SET)),
- aOKPB(this, CUI_RES(BT_OK)),
- aCancelPB(this, CUI_RES(BT_CANCEL)),
- aPrcntFL(this, CUI_RES(FL_PRCNT)),
- aPrcntMF(this, CUI_RES(ED_RIGHT_MARGIN))
- {
- FreeResource();
- }
- MetricField& GetPrcntFld(){return aPrcntMF;}
+ MetricField* m_pPrcntMF;
+public:
+ OfaAutoFmtPrcntSet(Window* pParent)
+ : ModalDialog(pParent, "PercentDialog","cui/ui/percentdialog.ui")
+ {
+ get(m_pPrcntMF, "margin");
+ }
+ MetricField& GetPrcntFld()
+ {
+ return *m_pPrcntMF;
+ }
};
-
/*********************************************************************/
/* */
/* changed LBoxString */
diff --git a/cui/source/tabpages/autocdlg.src b/cui/source/tabpages/autocdlg.src
index e7bfebd..0f37b43 100644
--- a/cui/source/tabpages/autocdlg.src
+++ b/cui/source/tabpages/autocdlg.src
@@ -163,53 +163,6 @@ TabPage RID_OFAPAGE_AUTOFMT_APPLY
};
};
-ModalDialog RID_OFADLG_PRCNT_SET
-{
- HelpID = CMD_SID_AUTOFORMAT ;
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Size = MAP_APPFONT ( 155 , 43 ) ;
- Moveable = TRUE ;
- FixedLine FL_PRCNT
- {
- Pos = MAP_APPFONT ( 4 , 3 ) ;
- Size = MAP_APPFONT ( 87 , 8 ) ;
- Text [ en-US ] = "Minimum size" ;
- };
- OKButton BT_OK
- {
- Pos = MAP_APPFONT ( 99 , 6 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- DefButton = TRUE ;
- };
- CancelButton BT_CANCEL
- {
- Pos = MAP_APPFONT ( 99 , 23 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- };
- MetricField ED_RIGHT_MARGIN
- {
- HelpID = "cui:MetricField:RID_OFADLG_PRCNT_SET:ED_RIGHT_MARGIN";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 7 , 14 ) ;
- Size = MAP_APPFONT ( 31 , 12 ) ;
- TabStop = TRUE ;
- Left = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Maximum = 100 ;
- Value = 77 ;
- Unit = FUNIT_CUSTOM ;
- CustomUnitText = "%" ;
- First = 10 ;
- Last = 100 ;
- SpinSize = 5 ;
- };
- Text [ en-US ] = "Combine" ;
-};
-
/**************************************************************************/
/* */
/* Beschreibung: Typografische Anfuehrungszeichen */
diff --git a/cui/uiconfig/ui/percentdialog.ui b/cui/uiconfig/ui/percentdialog.ui
new file mode 100644
index 0000000..12a8daf
--- /dev/null
+++ b/cui/uiconfig/ui/percentdialog.ui
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkAdjustment" id="adjustment1">
+ <property name="upper">100</property>
+ <property name="value">77</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkDialog" id="PercentDialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+ <property name="title" translatable="yes">Combine</property>
+ <property name="type_hint">dialog</property>
+ <child internal-child="vbox">
+ <object class="GtkBox" id="dialog-vbox1">
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">12</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area1">
+ <property name="can_focus">False</property>
+ <property name="layout_style">start</property>
+ <child>
+ <object class="GtkButton" id="ok">
+ <property name="label">gtk-ok</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_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ <property name="secondary">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="cancel">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ <property name="secondary">True</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment1">
+ <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="GtkSpinButton" id="margin:0%">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="halign">start</property>
+ <property name="valign">start</property>
+ <property name="invisible_char">â—</property>
+ <property name="adjustment">adjustment1</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Minimum size</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">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="0">ok</action-widget>
+ <action-widget response="0">cancel</action-widget>
+ </action-widgets>
+ </object>
+</interface>
commit 6f28fa72d68c893dc284a5b47ba08bde0f4a074f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jul 19 13:42:52 2013 +0100
use VclComboBoxText to set max width on listbox
This is to avoid the problem that happened as fdo#60764 in a similar dialog
Change-Id: I88e68032467f06429b49f89a658212b0d6222f15
diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h
index eae705d..358887c 100644
--- a/sc/inc/helpids.h
+++ b/sc/inc/helpids.h
@@ -58,7 +58,6 @@
#define HID_SC_PIVOTFILTER "SC_HID_SC_PIVOTFILTER"
#define HID_SC_INPORTOPT "SC_HID_SC_INPORTOPT"
#define HID_SC_PIVOTSUBT "SC_HID_SC_PIVOTSUBT"
-#define HID_SCPAGE_SUBT_OPTIONS "SC_HID_SCPAGE_SUBT_OPTIONS"
#define HID_SCPAGE_SUBT_GROUP "SC_HID_SCPAGE_SUBT_GROUP"
#define HID_SCPAGE_SUBT_GROUP1 "SC_HID_SCPAGE_SUBT_GROUP1"
#define HID_SCPAGE_SUBT_GROUP2 "SC_HID_SCPAGE_SUBT_GROUP2"
diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx
index 36d4f6d..9bdc44c 100644
--- a/sc/source/ui/dbgui/tpsubt.cxx
+++ b/sc/source/ui/dbgui/tpsubt.cxx
@@ -484,9 +484,6 @@ ScTpSubTotalOptions::ScTpSubTotalOptions( Window* pParent,
get(pLbUserDef,"lbuserdef");
Init();
-
- pLbUserDef->SetAccessibleRelationLabeledBy(pBtnUserDef);
- pLbUserDef->SetAccessibleName(pBtnUserDef->GetText());
}
// -----------------------------------------------------------------------
diff --git a/sc/uiconfig/scalc/ui/sortoptionspage.ui b/sc/uiconfig/scalc/ui/sortoptionspage.ui
index f6815af..44128d0 100644
--- a/sc/uiconfig/scalc/ui/sortoptionspage.ui
+++ b/sc/uiconfig/scalc/ui/sortoptionspage.ui
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
+ <!-- interface-requires LibreOffice 1.0 -->
<object class="GtkBox" id="SortOptionsPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -113,7 +114,7 @@
<object class="GtkComboBox" id="outarealb">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_left">20</property>
+ <property name="margin_left">12</property>
<accessibility>
<relation type="labelled-by" target="copyresult"/>
<relation type="label-for" target="outareaed"/>
@@ -167,7 +168,7 @@
<object class="VclComboBoxText" id="sortuserlb">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_left">20</property>
+ <property name="margin_left">12</property>
<property name="max_width_chars">65</property>
<accessibility>
<relation type="labelled-by" target="sortuser"/>
@@ -214,9 +215,9 @@
</child>
<child>
<object class="svxcorelo-SvxLanguageBox" id="language">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">9</property>
diff --git a/sc/uiconfig/scalc/ui/subtotaloptionspage.ui b/sc/uiconfig/scalc/ui/subtotaloptionspage.ui
index 5962bc2..447e8e1 100644
--- a/sc/uiconfig/scalc/ui/subtotaloptionspage.ui
+++ b/sc/uiconfig/scalc/ui/subtotaloptionspage.ui
@@ -1,12 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
+ <!-- interface-requires LibreOffice 1.0 -->
<object class="GtkBox" id="SubTotalOptionsPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="border_width">6</property>
<property name="orientation">vertical</property>
<property name="spacing">12</property>
- <property name="border_width">6</property>
<child>
<object class="GtkFrame" id="frame1">
<property name="visible">True</property>
@@ -195,6 +196,9 @@
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
+ <accessibility>
+ <relation type="label-for" target="lbuserdef"/>
+ </accessibility>
</object>
<packing>
<property name="left_attach">0</property>
@@ -204,12 +208,16 @@
</packing>
</child>
<child>
- <object class="GtkComboBoxText" id="lbuserdef">
+ <object class="VclComboBoxText" id="lbuserdef">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">12</property>
<property name="entry_text_column">0</property>
<property name="id_column">1</property>
+ <property name="max_width_chars">65</property>
+ <accessibility>
+ <relation type="labelled-by" target="btnuserdef"/>
+ </accessibility>
</object>
<packing>
<property name="left_attach">0</property>
commit 538dedcc295fd6943e4277d8517acfb72fc3f3a8
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jul 19 14:00:52 2013 +0100
Updated core
Project: help ed0bd6de3bb8442aa3a2a6009e88d424ff323ac1
diff --git a/helpcontent2 b/helpcontent2
index 59090e4..ed0bd6d 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 59090e419fef3a6ec7a5270585d72312dafb78d2
+Subproject commit ed0bd6de3bb8442aa3a2a6009e88d424ff323ac1
More information about the Libreoffice-commits
mailing list