Skip to content

C
core
Kaydet (Commit) 943c60e5 authored tarafından Faisal M. Al-Otaibi's avatar Faisal M. Al-Otaibi Kaydeden (comit) Caolán McNamara
Dosyalara gözat
Seçenekler

Convert Hyphenation dialogs to .ui 

Change-Id: I086a99c391185cb213ad63a66a954f8e66f8fc9e
Reviewed-on: https://gerrit.libreoffice.org/5672Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 617c5e44
Hide whitespace changes
Inline Side-by-side
Showing with 270 additions and 74 deletions
cui/UIConfig_cui.mk
Dosyayı görüntüle @ 943c60e5
...@@ -25,6 +25,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\ ...@@ -25,6 +25,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/backgroundpage \ cui/uiconfig/ui/backgroundpage \
cui/uiconfig/ui/bitmaptabpage \ cui/uiconfig/ui/bitmaptabpage \
cui/uiconfig/ui/borderpage \ cui/uiconfig/ui/borderpage \
cui/uiconfig/ui/breaknumberoption \
cui/uiconfig/ui/cellalignment \ cui/uiconfig/ui/cellalignment \
cui/uiconfig/ui/charnamepage \ cui/uiconfig/ui/charnamepage \
cui/uiconfig/ui/colorpage \ cui/uiconfig/ui/colorpage \
......
cui/source/inc/cuires.hrc
Dosyayı görüntüle @ 943c60e5
...@@ -161,7 +161,6 @@ ...@@ -161,7 +161,6 @@
#define RID_SVXDLG_JAVA_CLASSPATH (RID_SVX_START + 255) #define RID_SVXDLG_JAVA_CLASSPATH (RID_SVX_START + 255)
#define RID_SVXERR_JRE_NOT_RECOGNIZED (RID_SVX_START + 256) #define RID_SVXERR_JRE_NOT_RECOGNIZED (RID_SVX_START + 256)
#define RID_SVXERR_JRE_FAILED_VERSION (RID_SVX_START + 257) #define RID_SVXERR_JRE_FAILED_VERSION (RID_SVX_START + 257)
#define RID_SVXDLG_LNG_ED_NUM_PREBREAK (RID_SVX_START + 830)
#define RID_SVXDLG_EDIT_MODULES (RID_SVX_START + 831) #define RID_SVXDLG_EDIT_MODULES (RID_SVX_START + 831)
#define RID_SVXSTR_PATH_NAME_START (RID_SVX_START + 1003) #define RID_SVXSTR_PATH_NAME_START (RID_SVX_START + 1003)
#define RID_SVXBMP_LOCK (RID_SVX_START + 118) #define RID_SVXBMP_LOCK (RID_SVX_START + 118)
...@@ -423,6 +422,11 @@ ...@@ -423,6 +422,11 @@
#define RID_SVXSTR_DEL_SPACES_AT_STT_END (RID_SVX_START + 1223) #define RID_SVXSTR_DEL_SPACES_AT_STT_END (RID_SVX_START + 1223)
#define RID_SVXSTR_DEL_SPACES_BETWEEN_LINES (RID_SVX_START + 1224) #define RID_SVXSTR_DEL_SPACES_BETWEEN_LINES (RID_SVX_START + 1224)
// from optlingu.src
#define STR_NUM_PRE_BREAK_DLG (RID_SVX_START + 1225)
#define STR_NUM_POST_BREAK_DLG (RID_SVX_START + 1226)
#define STR_NUM_MIN_WORDLEN_DLG (RID_SVX_START + 1227)
#endif #endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
cui/source/inc/helpid.hrc
Dosyayı görüntüle @ 943c60e5
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
#define HID_CLB_LINGU_MODULES "CUI_HID_CLB_LINGU_MODULES" #define HID_CLB_LINGU_MODULES "CUI_HID_CLB_LINGU_MODULES"
#define HID_CLB_LINGU_OPTIONS "CUI_HID_CLB_LINGU_OPTIONS" #define HID_CLB_LINGU_OPTIONS "CUI_HID_CLB_LINGU_OPTIONS"
#define HID_EDIT_MODULES "CUI_HID_EDIT_MODULES" #define HID_EDIT_MODULES "CUI_HID_EDIT_MODULES"
#define HID_LNGDLG_NUM_PREBREAK "CUI_HID_LNGDLG_NUM_PREBREAK"
#define HID_OPTIONS_COLORCONFIG_SAVE_SCHEME "CUI_HID_OPTIONS_COLORCONFIG_SAVE_SCHEME" #define HID_OPTIONS_COLORCONFIG_SAVE_SCHEME "CUI_HID_OPTIONS_COLORCONFIG_SAVE_SCHEME"
#define HID_OPTIONS_JAVA_PARAMETER "CUI_HID_OPTIONS_JAVA_PARAMETER" #define HID_OPTIONS_JAVA_PARAMETER "CUI_HID_OPTIONS_JAVA_PARAMETER"
#define HID_OPTIONS_JAVA_CLASSPATH "CUI_HID_OPTIONS_JAVA_CLASSPATH" #define HID_OPTIONS_JAVA_CLASSPATH "CUI_HID_OPTIONS_JAVA_CLASSPATH"
......
cui/source/options/optlingu.cxx
Dosyayı görüntüle @ 943c60e5
...@@ -308,29 +308,48 @@ void BrwStringDic_Impl::Paint( ...@@ -308,29 +308,48 @@ void BrwStringDic_Impl::Paint(
class OptionsBreakSet : public ModalDialog class OptionsBreakSet : public ModalDialog
{ {
OKButton aOKPB; VclFrame* m_pBeforeFrame;
CancelButton aCancelPB; VclFrame* m_pAfterFrame;
FixedLine aValFL; VclFrame* m_pMinimalFrame;
NumericField aValNF; NumericField* m_pBreakNF;
public: public:
OptionsBreakSet(Window* pParent, int nRID) : OptionsBreakSet(Window* pParent, int nRID) :
ModalDialog(pParent, CUI_RES(RID_SVXDLG_LNG_ED_NUM_PREBREAK )), ModalDialog(pParent, "BreakNumberOption", "cui/ui/breaknumberoption.ui")
aOKPB (this, CUI_RES(BT_OK_PREBREAK)),
aCancelPB (this, CUI_RES(BT_CANCEL_PREBREAK)),
aValFL (this, CUI_RES(FL_NUMVAL_PREBREAK)),
aValNF (this, CUI_RES(ED_PREBREAK))
{ {
get( m_pBeforeFrame, "beforeframe");
get( m_pAfterFrame, "afterframe");
get( m_pMinimalFrame, "miniframe");
get( m_pBreakNF, "breaknumber");
DBG_ASSERT( STR_NUM_PRE_BREAK_DLG == nRID || DBG_ASSERT( STR_NUM_PRE_BREAK_DLG == nRID ||
STR_NUM_POST_BREAK_DLG == nRID || STR_NUM_POST_BREAK_DLG == nRID ||
STR_NUM_MIN_WORDLEN_DLG == nRID, "unexpected RID" ); STR_NUM_MIN_WORDLEN_DLG == nRID, "unexpected RID" );
if (nRID != -1) if ( nRID != -1 )
aValFL.SetText( String( CUI_RES(nRID) ) ); {
FreeResource(); if( nRID == STR_NUM_PRE_BREAK_DLG )
{
m_pAfterFrame ->Hide();
m_pMinimalFrame->Hide();
}
if( nRID == STR_NUM_POST_BREAK_DLG )
{
m_pBeforeFrame ->Hide();
m_pMinimalFrame->Hide();
}
if( nRID == STR_NUM_MIN_WORDLEN_DLG )
{
m_pAfterFrame ->Hide();
m_pBeforeFrame->Hide();
}
}
} }
NumericField& GetNumericFld() { return aValNF; } NumericField& GetNumericFld()
{
return *m_pBreakNF;
}
}; };
......
cui/source/options/optlingu.hrc
Dosyayı görüntüle @ 943c60e5
...@@ -38,10 +38,6 @@ ...@@ -38,10 +38,6 @@
#define STR_HYPH_SPECIAL 212 #define STR_HYPH_SPECIAL 212
#define STR_NUM_MIN_WORDLEN 213 #define STR_NUM_MIN_WORDLEN 213
#define STR_NUM_PRE_BREAK_DLG 214
#define STR_NUM_POST_BREAK_DLG 215
#define STR_NUM_MIN_WORDLEN_DLG 216
#define STR_GRAMMAR_AUTO 217 #define STR_GRAMMAR_AUTO 217
#define PB_OK 70 #define PB_OK 70
...@@ -52,10 +48,6 @@ ...@@ -52,10 +48,6 @@
#define ST_THES 84 #define ST_THES 84
#define ST_GRAMMAR 85 #define ST_GRAMMAR 85
#define FL_NUMVAL_PREBREAK 305
#define BT_OK_PREBREAK 306
#define BT_CANCEL_PREBREAK 307
#define ED_PREBREAK 308
#define PB_EDIT_MODULES_PRIO_UP 309 #define PB_EDIT_MODULES_PRIO_UP 309
#define PB_EDIT_MODULES_PRIO_DOWN 310 #define PB_EDIT_MODULES_PRIO_DOWN 310
#define PB_EDIT_MODULES_PRIO_BACK 311 #define PB_EDIT_MODULES_PRIO_BACK 311
......
cui/source/options/optlingu.src
Dosyayı görüntüle @ 943c60e5
...@@ -129,59 +129,19 @@ ModalDialog RID_SVXDLG_EDIT_MODULES ...@@ -129,59 +129,19 @@ ModalDialog RID_SVXDLG_EDIT_MODULES
}; };
}; };
// RID_SVXDLG_LNG_ED_NUM_PREBREAK ------------------------------------------- // Strings ---------------------------------------------------------------
ModalDialog RID_SVXDLG_LNG_ED_NUM_PREBREAK String STR_NUM_PRE_BREAK_DLG
{ {
HelpID = HID_LNGDLG_NUM_PREBREAK ; Text [ en-US ] = "Characters before break";
SVLook = TRUE ; };
Moveable = TRUE ; String STR_NUM_POST_BREAK_DLG
Size = MAP_APPFONT ( 155 , 43 ) ; {
Text [ en-US ] = "Hyphenation"; Text [ en-US ] = "Characters after break";
FixedLine FL_NUMVAL_PREBREAK };
{ String STR_NUM_MIN_WORDLEN_DLG
Pos = MAP_APPFONT ( 6 , 3 ) ; {
Size = MAP_APPFONT ( 87 , 8 ) ; Text [ en-US ] = "Minimal word length";
};
OKButton BT_OK_PREBREAK
{
Pos = MAP_APPFONT ( 99 , 6 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
DefButton = TRUE ;
};
CancelButton BT_CANCEL_PREBREAK
{
Pos = MAP_APPFONT ( 99 , 23 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
};
NumericField ED_PREBREAK
{
HelpID = "cui:NumericField:RID_SVXDLG_LNG_ED_NUM_PREBREAK:ED_PREBREAK";
Border = TRUE ;
Pos = MAP_APPFONT ( 56 , 14 ) ;
Size = MAP_APPFONT ( 31 , 12 ) ;
Left = TRUE ;
Minimum = 2 ;
Maximum = 9 ;
Last = 9 ;
Repeat = TRUE ;
Spin = TRUE ;
SpinSize = 1;
};
String STR_NUM_PRE_BREAK_DLG
{
Text [ en-US ] = "Characters before break";
};
String STR_NUM_POST_BREAK_DLG
{
Text [ en-US ] = "Characters after break";
};
String STR_NUM_MIN_WORDLEN_DLG
{
Text [ en-US ] = "Minimal word length";
};
}; };
// RID_SFXPAGE_LINGU -------------------------------------------------------- // RID_SFXPAGE_LINGU --------------------------------------------------------
......
cui/uiconfig/ui/breaknumberoption.ui 0 → 100644
Dosyayı görüntüle @ 943c60e5
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkAdjustment" id="adjustment1">
<property name="lower">2</property>
<property name="upper">9</property>
<property name="value">1</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
<object class="GtkDialog" id="BreakNumberOption">
<property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="title" translatable="yes">Hyphenation</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="spacing">12</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area1">
<property name="can_focus">False</property>
<property name="orientation">vertical</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>
</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>
</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="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkFrame" id="beforeframe">
<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="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>
<placeholder/>
</child>
</object>
</child>
<child type="label">
<object class="GtkLabel" id="beforelabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Characters before break</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="afterframe">
<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">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
<placeholder/>
</child>
</object>
</child>
<child type="label">
<object class="GtkLabel" id="afterlabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Characters after break</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
<packing>
<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>
<object class="GtkFrame" id="miniframe">
<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="alignment3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
<placeholder/>
</child>
</object>
</child>
<child type="label">
<object class="GtkLabel" id="minimallabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Minimal word length</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</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="GtkAlignment" id="alignment4">
<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="grid5">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="column_spacing">12</property>
<child>
<object class="GtkSpinButton" id="breaknumber">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">•</property>
<property name="adjustment">adjustment1</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>
</object>
</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>
</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>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment