Skip to content

C
core
Kaydet (Commit) 599d66fd authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

convert autocorrect replace tabpage to .ui format 

Change-Id: I962fae2d4d177a7ca364d0dece0c15132a199497
üst 33cc263f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 111 additions and 272 deletions
cui/UIConfig_cui.mk
Dosyayı görüntüle @ 599d66fd
...@@ -11,6 +11,7 @@ $(eval $(call gb_UIConfig_UIConfig,cui)) ...@@ -11,6 +11,7 @@ $(eval $(call gb_UIConfig_UIConfig,cui))
$(eval $(call gb_UIConfig_add_uifiles,cui,\ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/aboutdialog \ cui/uiconfig/ui/aboutdialog \
cui/uiconfig/ui/acorexceptpage \
cui/uiconfig/ui/acorreplacepage \ cui/uiconfig/ui/acorreplacepage \
cui/uiconfig/ui/asiantypography \ cui/uiconfig/ui/asiantypography \
cui/uiconfig/ui/autocorrectdialog \ cui/uiconfig/ui/autocorrectdialog \
......
cui/source/inc/autocdlg.hxx
Dosyayı görüntüle @ 599d66fd
...@@ -301,23 +301,21 @@ class OfaAutocorrExceptPage : public SfxTabPage ...@@ -301,23 +301,21 @@ class OfaAutocorrExceptPage : public SfxTabPage
using TabPage::DeactivatePage; using TabPage::DeactivatePage;
private: private:
FixedLine aAbbrevFL; AutoCorrEdit* m_pAbbrevED;
AutoCorrEdit aAbbrevED; ListBox* m_pAbbrevLB;
ListBox aAbbrevLB; PushButton* m_pNewAbbrevPB;
PushButton aNewAbbrevPB; PushButton* m_pDelAbbrevPB;
PushButton aDelAbbrevPB; CheckBox* m_pAutoAbbrevCB;
CheckBox aAutoAbbrevCB;
AutoCorrEdit* m_pDoubleCapsED;
FixedLine aDoubleCapsFL; ListBox* m_pDoubleCapsLB;
AutoCorrEdit aDoubleCapsED; PushButton* m_pNewDoublePB;
ListBox aDoubleCapsLB; PushButton* m_pDelDoublePB;
PushButton aNewDoublePB; CheckBox* m_pAutoCapsCB;
PushButton aDelDoublePB;
CheckBox aAutoCapsCB; StringsTable aStringsTable;
CollatorWrapper* pCompareClass;
StringsTable aStringsTable; LanguageType eLang;
CollatorWrapper* pCompareClass;
LanguageType eLang;
DECL_LINK(NewDelHdl, PushButton*); DECL_LINK(NewDelHdl, PushButton*);
DECL_LINK(SelectHdl, ListBox*); DECL_LINK(SelectHdl, ListBox*);
......
cui/source/inc/cuires.hrc
Dosyayı görüntüle @ 599d66fd
...@@ -116,7 +116,6 @@ ...@@ -116,7 +116,6 @@
#define RID_OFAPAGE_AUTOCORR_OPTIONS (RID_OFA_START + 102) #define RID_OFAPAGE_AUTOCORR_OPTIONS (RID_OFA_START + 102)
#define RID_OFAPAGE_AUTOFMT_APPLY (RID_OFA_START + 110) #define RID_OFAPAGE_AUTOFMT_APPLY (RID_OFA_START + 110)
#define RID_OFAPAGE_AUTOCORR_EXCEPT (RID_OFA_START + 104)
#define RID_OFAPAGE_AUTOCORR_QUOTE (RID_OFA_START + 109) #define RID_OFAPAGE_AUTOCORR_QUOTE (RID_OFA_START + 109)
#define RID_OFADLG_PRCNT_SET (RID_OFA_START + 111) #define RID_OFADLG_PRCNT_SET (RID_OFA_START + 111)
......
cui/source/inc/helpid.hrc
Dosyayı görüntüle @ 599d66fd
...@@ -238,7 +238,6 @@ ...@@ -238,7 +238,6 @@
#define HID_TPCOLOR_CMYK_3 "CUI_HID_TPCOLOR_CMYK_3" #define HID_TPCOLOR_CMYK_3 "CUI_HID_TPCOLOR_CMYK_3"
#define HID_OFAPAGE_AUTOCORR_OPTIONS "CUI_HID_OFAPAGE_AUTOCORR_OPTIONS" #define HID_OFAPAGE_AUTOCORR_OPTIONS "CUI_HID_OFAPAGE_AUTOCORR_OPTIONS"
#define HID_OFAPAGE_AUTOFMT_OPTIONS "CUI_HID_OFAPAGE_AUTOFMT_OPTIONS" #define HID_OFAPAGE_AUTOFMT_OPTIONS "CUI_HID_OFAPAGE_AUTOFMT_OPTIONS"
#define HID_OFAPAGE_AUTOCORR_EXCEPT "CUI_HID_OFAPAGE_AUTOCORR_EXCEPT"
#define HID_OFAPAGE_AUTOCORR_QUOTE "CUI_HID_OFAPAGE_AUTOCORR_QUOTE" #define HID_OFAPAGE_AUTOCORR_QUOTE "CUI_HID_OFAPAGE_AUTOCORR_QUOTE"
#define HID_OFAPAGE_AUTOCOMPLETE_OPTIONS "CUI_HID_OFAPAGE_AUTOCOMPLETE_OPTIONS" #define HID_OFAPAGE_AUTOCOMPLETE_OPTIONS "CUI_HID_OFAPAGE_AUTOCOMPLETE_OPTIONS"
#define HID_PAGE_CONNECTION "CUI_HID_PAGE_CONNECTION" #define HID_PAGE_CONNECTION "CUI_HID_PAGE_CONNECTION"
......
cui/source/tabpages/autocdlg.hrc
Dosyayı görüntüle @ 599d66fd
...@@ -31,30 +31,8 @@ ...@@ -31,30 +31,8 @@
#define FT_ENDQUOTE 14 #define FT_ENDQUOTE 14
#define PB_ENDQUOTE 15 #define PB_ENDQUOTE 15
#define FL_ABBREV 16
#define ED_ABBREV 17
#define LB_ABBREV 18
#define PB_NEWABBREV 19
#define PB_DELABBREV 20
#define FL_DOUBLECAPS 21
#define ED_DOUBLE_CAPS 22
#define LB_DOUBLE_CAPS 23
#define PB_NEWDOUBLECAPS 24
#define PB_DELDOUBLECAPS 25
#define ED_SHORT 31
#define ED_REPLACE 32
#define TLB_REPLACE 33
#define CB_TEXT_ONLY 34
#define PB_NEW_REPLACE 35
#define PB_DELETE_REPLACE 36
#define STR_MODIFY 37
#define FT_SHORT 39
#define FT_REPLACE 40
#define STR_CHANGE_START 41 #define STR_CHANGE_START 41
#define STR_CHANGE_END 42 #define STR_CHANGE_END 42
#define CB_AUTOABBREV 43
#define CB_AUTOCAPS 44
#define FT_SGL_STARTQUOTE 45 #define FT_SGL_STARTQUOTE 45
#define PB_SGL_STARTQUOTE 46 #define PB_SGL_STARTQUOTE 46
......
cui/source/tabpages/autocdlg.src
Dosyayı görüntüle @ 599d66fd
...@@ -210,132 +210,6 @@ ModalDialog RID_OFADLG_PRCNT_SET ...@@ -210,132 +210,6 @@ ModalDialog RID_OFADLG_PRCNT_SET
Text [ en-US ] = "Combine" ; Text [ en-US ] = "Combine" ;
}; };
/**************************************************************************/
/* */
/* Beschreibung: Ausnahmelisten */
/* */
/**************************************************************************/
TabPage RID_OFAPAGE_AUTOCORR_EXCEPT
{
HelpId = HID_OFAPAGE_AUTOCORR_EXCEPT ;
OutputSize = TRUE ;
Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
SVLook = TRUE ;
Hide = TRUE ;
FixedLine FL_ABBREV
{
Pos = MAP_APPFONT ( 4 , 3 ) ;
Size = MAP_APPFONT ( 252 , 8 ) ;
Text [ en-US ] = "Abbreviations (no subsequent capital)" ;
};
Edit ED_ABBREV
{
HelpID = "cui:Edit:RID_OFAPAGE_AUTOCORR_EXCEPT:ED_ABBREV";
Pos = MAP_APPFONT ( 7 , 14 ) ;
Size = MAP_APPFONT ( 123 , 12 ) ;
TabStop = TRUE ;
Border = TRUE ;
};
ListBox LB_ABBREV
{
HelpID = "cui:ListBox:RID_OFAPAGE_AUTOCORR_EXCEPT:LB_ABBREV";
Pos = MAP_APPFONT ( 7 , 30 ) ;
Size = MAP_APPFONT ( 123 , 58 ) ;
TabStop = TRUE ;
AutoHScroll = TRUE ;
SORT = TRUE ;
Border = TRUE ;
};
PushButton PB_NEWABBREV
{
HelpID = "cui:PushButton:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_NEWABBREV";
Pos = MAP_APPFONT ( 198 , 14 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
Disable = TRUE ;
Text [ en-US ] = "~New" ;
};
PushButton PB_DELABBREV
{
HelpID = "cui:PushButton:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_DELABBREV";
Pos = MAP_APPFONT ( 198 , 31 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
Disable = TRUE ;
Text [ en-US ] = "~Delete" ;
};
CheckBox CB_AUTOABBREV
{
HelpID = "cui:CheckBox:RID_OFAPAGE_AUTOCORR_EXCEPT:CB_AUTOABBREV";
Pos = MAP_APPFONT ( 137 , 78 ) ;
Size = MAP_APPFONT ( 111 , 10 ) ;
Text [ en-US ] = "~AutoInclude";
TabStop = TRUE ;
};
FixedLine FL_DOUBLECAPS
{
Pos = MAP_APPFONT ( 4 , 94 ) ;
Size = MAP_APPFONT ( 252 , 8 ) ;
Text [ en-US ] = "Words with TWo INitial CApitals" ;
};
Edit ED_DOUBLE_CAPS
{
HelpID = "cui:Edit:RID_OFAPAGE_AUTOCORR_EXCEPT:ED_DOUBLE_CAPS";
Pos = MAP_APPFONT ( 7 , 105 ) ;
Size = MAP_APPFONT ( 123 , 12 ) ;
TabStop = TRUE ;
Border = TRUE ;
};
ListBox LB_DOUBLE_CAPS
{
HelpID = "cui:ListBox:RID_OFAPAGE_AUTOCORR_EXCEPT:LB_DOUBLE_CAPS";
Pos = MAP_APPFONT ( 7 , 120 ) ;
Size = MAP_APPFONT ( 123 , 59 ) ;
TabStop = TRUE ;
AutoHScroll = TRUE ;
SORT = TRUE ;
Border = TRUE ;
};
PushButton PB_NEWDOUBLECAPS
{
HelpID = "cui:PushButton:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_NEWDOUBLECAPS";
Pos = MAP_APPFONT ( 198 , 105 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Disable = TRUE ;
Text [ en-US ] = "Ne~w" ;
};
PushButton PB_DELDOUBLECAPS
{
HelpID = "cui:PushButton:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_DELDOUBLECAPS";
Pos = MAP_APPFONT ( 198 , 122 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Disable = TRUE ;
Text [ en-US ] = "Dele~te" ;
};
CheckBox CB_AUTOCAPS
{
HelpID = "cui:CheckBox:RID_OFAPAGE_AUTOCORR_EXCEPT:CB_AUTOCAPS";
Pos = MAP_APPFONT ( 137 , 169 ) ;
Size = MAP_APPFONT ( 111 , 10 ) ;
Text [ en-US ] = "A~utoInclude";
};
String STR_PB_NEWABBREV
{
Text [ en-US ] = "New abbreviations" ;
};
String STR_PB_DELABBREV
{
Text [ en-US ] = "Delete abbreviations" ;
};
String STR_PB_NEWDOUBLECAPS
{
Text [ en-US ] = "New words with two initial capitals" ;
};
String STR_PB_DELDOUBLECAPS
{
Text [ en-US ] = "Delete words with two initial capitals" ;
};
};
/**************************************************************************/ /**************************************************************************/
/* */ /* */
/* Beschreibung: Typografische Anfuehrungszeichen */ /* Beschreibung: Typografische Anfuehrungszeichen */
......
cui/uiconfig/ui/acorexceptpage.ui 0 → 100644
Dosyayı görüntüle @ 599d66fd
This diff is collapsed.
cui/uiconfig/ui/acorreplacepage.ui
Dosyayı görüntüle @ 599d66fd
...@@ -2,120 +2,105 @@ ...@@ -2,120 +2,105 @@
<interface> <interface>
<!-- interface-requires gtk+ 3.0 --> <!-- interface-requires gtk+ 3.0 -->
<!-- interface-requires LibreOffice 1.0 --> <!-- interface-requires LibreOffice 1.0 -->
<object class="GtkBox" id="AcorReplacePage"> <object class="GtkGrid" id="AcorReplacePage">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="hexpand">True</property> <property name="hexpand">True</property>
<property name="vexpand">True</property> <property name="vexpand">True</property>
<property name="border_width">6</property> <property name="border_width">6</property>
<property name="spacing">12</property> <property name="row_spacing">6</property>
<property name="column_spacing">12</property>
<child> <child>
<object class="GtkGrid" id="grid1"> <object class="GtkLabel" id="label1">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Repla_ce</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">origtext</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="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_With:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">newtext</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="GtkCheckButton" id="textonly">
<property name="label" translatable="yes">_Text only</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="halign">end</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="left_attach">2</property>
<property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="cuilo-AutoCorrEdit" id="origtext">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="max_length">30</property>
<property name="invisible_char">●</property>
</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="cuilo-AutoCorrEdit" id="newtext">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="invisible_char">●</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">1</property>
<property name="width">2</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="svtlo-SvTabListBox" id="tabview:border">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property> <property name="hexpand">True</property>
<property name="vexpand">True</property> <property name="vexpand">True</property>
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
<child>
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Repla_ce</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">origtext</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="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_With:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">newtext</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="GtkCheckButton" id="textonly">
<property name="label" translatable="yes">_Text only</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="halign">end</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="left_attach">2</property>
<property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="cuilo-AutoCorrEdit" id="origtext">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="max_length">30</property>
<property name="invisible_char">●</property>
</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="cuilo-AutoCorrEdit" id="newtext">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">1</property>
<property name="width">2</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="svtlo-SvTabListBox" id="tabview:border">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<child internal-child="selection">
<object class="GtkTreeSelection" id="Tab List-selection1"/>
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
<property name="width">3</property>
<property name="height">1</property>
</packing>
</child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="left_attach">0</property>
<property name="fill">True</property> <property name="top_attach">2</property>
<property name="position">0</property> <property name="width">3</property>
<property name="height">1</property>
</packing> </packing>
</child> </child>
<child> <child>
...@@ -132,6 +117,7 @@ ...@@ -132,6 +117,7 @@
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">True</property> <property name="receives_default">True</property>
<property name="use_stock">True</property> <property name="use_stock">True</property>
<property name="image_position">right</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
...@@ -170,11 +156,15 @@ ...@@ -170,11 +156,15 @@
</child> </child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="left_attach">3</property>
<property name="fill">True</property> <property name="top_attach">1</property>
<property name="position">1</property> <property name="width">1</property>
<property name="height">2</property>
</packing> </packing>
</child> </child>
<child>
<placeholder/>
</child>
</object> </object>
<object class="GtkSizeGroup" id="sizegroup1"> <object class="GtkSizeGroup" id="sizegroup1">
<widgets> <widgets>
......
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