Skip to content

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

adapt sort-dialog code to use new layout 

Change-Id: I925ebfaf1343be84d47736bd0d5703adfd1692d7
üst 09d7f549
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 53 additions and 361 deletions
sw/UI_swriter.mk
Dosyayı görüntüle @ ce8b87b0
......@@ -17,6 +17,7 @@ $(eval $(call gb_UI_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/inserttable \
sw/uiconfig/swriter/ui/linenumbering \
sw/uiconfig/swriter/ui/printeroptions \
sw/uiconfig/swriter/ui/sortdialog \
sw/uiconfig/swriter/ui/splittable \
sw/uiconfig/swriter/ui/stringinput \
sw/uiconfig/swriter/ui/titlepage \
......
sw/source/ui/app/app.src
Dosyayı görüntüle @ ce8b87b0
......@@ -640,6 +640,21 @@ String STR_INVALID_AUTOFORMAT_NAME
Text [ en-US ] = "You have entered an invalid name.\nThe desired AutoFormat could not be created. \nTry again using a different name." ;
};
String STR_NUMERIC
{
Text [ en-US ] = "Numeric";
};
String STR_ROW
{
Text [ en-US ] = "Rows" ;
};
String STR_COL
{
Text [ en-US ] = "Column" ;
};
ToolBox RID_MODULE_TOOLBOX
{
HelpID = HID_MODULE_TOOLBOX ;
......
sw/source/ui/inc/app.hrc
Dosyayı görüntüle @ ce8b87b0
......@@ -111,8 +111,11 @@
#define STR_MID (RC_APP_BEGIN + 123)
#define STR_SOUTH (RC_APP_BEGIN + 124)
#define STR_SUM (RC_APP_BEGIN + 125)
#define STR_NUMERIC (RC_APP_BEGIN + 126)
#define STR_COL (RC_APP_BEGIN + 127)
#define STR_ROW (RC_APP_BEGIN + 128)
#define APP_ACT_END STR_SUM
#define APP_ACT_END STR_ROW
#if APP_ACT_END > RC_APP_END
#error Resource-Id Ueberlauf in #file, #line
......
sw/source/ui/inc/srtdlg.hxx
Dosyayı görüntüle @ ce8b87b0
......@@ -40,49 +40,38 @@ class CollatorResource;
class SwSortDlg : public SvxStandardDialog
{
FixedText aColLbl;
FixedText aTypLbl;
FixedText aDirLbl;
FixedLine aSortFL;
CheckBox aKeyCB1;
NumericField aColEdt1;
ListBox aTypDLB1;
RadioButton aSortUpRB;
RadioButton aSortDnRB;
CheckBox aKeyCB2;
NumericField aColEdt2;
ListBox aTypDLB2;
RadioButton aSortUp2RB;
RadioButton aSortDn2RB;
CheckBox aKeyCB3;
NumericField aColEdt3;
ListBox aTypDLB3;
RadioButton aSortUp3RB;
RadioButton aSortDn3RB;
FixedLine aDirFL;
RadioButton aColumnRB;
RadioButton aRowRB;
FixedLine aDelimFL;
RadioButton aDelimTabRB;
RadioButton aDelimFreeRB;
Edit aDelimEdt;
PushButton aDelimPB;
FixedLine aLangFL;
SvxLanguageBox aLangLB;
FixedLine aSortOptFL;
CheckBox aCaseCB;
OKButton aOkBtn;
CancelButton aCancelBtn;
HelpButton aHelpBtn;
FixedText* m_pColLbl;
FixedText* m_pTypLbl;
CheckBox* m_pKeyCB1;
NumericField* m_pColEdt1;
ListBox* m_pTypDLB1;
RadioButton* m_pSortUp1RB;
RadioButton* m_pSortDn1RB;
CheckBox* m_pKeyCB2;
NumericField* m_pColEdt2;
ListBox* m_pTypDLB2;
RadioButton* m_pSortUp2RB;
RadioButton* m_pSortDn2RB;
CheckBox* m_pKeyCB3;
NumericField* m_pColEdt3;
ListBox* m_pTypDLB3;
RadioButton* m_pSortUp3RB;
RadioButton* m_pSortDn3RB;
RadioButton* m_pColumnRB;
RadioButton* m_pRowRB;
RadioButton* m_pDelimTabRB;
RadioButton* m_pDelimFreeRB;
Edit* m_pDelimEdt;
PushButton* m_pDelimPB;
SvxLanguageBox* m_pLangLB;
CheckBox* m_pCaseCB;
String aColTxt;
String aRowTxt;
......
sw/source/ui/misc/srtdlg.cxx
Dosyayı görüntüle @ ce8b87b0
This diff is collapsed.
sw/source/ui/misc/srtdlg.src
Dosyayı görüntüle @ ce8b87b0
......@@ -26,324 +26,9 @@
************************************************************************/
#include "misc.hrc"
#include "srtdlg.hrc"
#include "cmdid.h"
#include "helpid.h"
ModalDialog DLG_SORTING
{
HelpID = CMD_FN_SORTING_DLG ;
OutputSize = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT ( 268 , 193 ) ;
Text [ en-US ] = "Sort" ;
Moveable = TRUE ;
OKButton BT_OK
{
Pos = MAP_APPFONT ( 212 , 6 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
DefButton = TRUE ;
};
CancelButton BT_CANCEL
{
Pos = MAP_APPFONT ( 212 , 23 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
};
HelpButton BT_HELP
{
Pos = MAP_APPFONT ( 212 , 43 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
};
FixedText FT_COL
{
Pos = MAP_APPFONT ( 68 , 12 ) ;
Size = MAP_APPFONT ( 25 , 8 ) ;
Text [ en-US ] = "Column" ;
Left = TRUE ;
};
FixedText FT_KEYTYP
{
Pos = MAP_APPFONT ( 101, 12 ) ;
Size = MAP_APPFONT ( 48 , 8 ) ;
Text [ en-US ] = "Key type" ;
Left = TRUE ;
};
FixedText FT_DIR
{
Pos = MAP_APPFONT ( 155 , 12 ) ;
Size = MAP_APPFONT ( 49 , 10 ) ;
Text [ en-US ] = "Order" ;
};
CheckBox CB_KEY1
{
HelpID = "sw:CheckBox:DLG_SORTING:CB_KEY1";
Pos = MAP_APPFONT ( 12 , 25 ) ;
Size = MAP_APPFONT ( 49 , 8 ) ;
Text [ en-US ] = "Key ~1" ;
Check = TRUE ;
};
NumericField ED_KEY1
{
HelpID = "sw:NumericField:DLG_SORTING:ED_KEY1";
Border = TRUE ;
Pos = MAP_APPFONT ( 66 , 23 ) ;
Size = MAP_APPFONT ( 25 , 12 ) ;
Text = "10" ;
TabStop = TRUE ;
Left = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
Minimum = 1 ;
Maximum = 99 ;
Value = 1 ;
First = 1 ;
Last = 99 ;
SpinSize = 1 ;
};
String STR_NUMERIC
{
Text [ en-US ] = "Numeric";
};
ListBox DLB_KEY1
{
HelpID = "sw:ListBox:DLG_SORTING:DLB_KEY1";
Pos = MAP_APPFONT ( 96 , 23 ) ;
Size = MAP_APPFONT ( 55 , 45 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
CurPos = 0 ;
Sort = TRUE;
};
RadioButton RB_UP
{
HelpID = "sw:RadioButton:DLG_SORTING:RB_UP";
Pos = MAP_APPFONT ( 155 , 23 ) ;
Size = MAP_APPFONT ( 50 , 10 ) ;
Text [ en-US ] = "~Ascending" ;
TabStop = TRUE ;
Check = TRUE ;
};
RadioButton RB_DN
{
HelpID = "sw:RadioButton:DLG_SORTING:RB_DN";
Pos = MAP_APPFONT ( 155 , 35 ) ;
Size = MAP_APPFONT ( 50 , 10 ) ;
Text [ en-US ] = "~Descending" ;
TabStop = TRUE ;
};
CheckBox CB_KEY2
{
HelpID = "sw:CheckBox:DLG_SORTING:CB_KEY2";
Pos = MAP_APPFONT ( 12 , 52 ) ;
Size = MAP_APPFONT ( 49 , 8 ) ;
Text [ en-US ] = "Key ~2" ;
};
NumericField ED_KEY2
{
HelpID = "sw:NumericField:DLG_SORTING:ED_KEY2";
Border = TRUE ;
Pos = MAP_APPFONT ( 66 , 50 ) ;
Size = MAP_APPFONT ( 25 , 12 ) ;
TabStop = TRUE ;
Left = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
Minimum = 1 ;
Maximum = 99 ;
Value = 1 ;
First = 1 ;
Last = 99 ;
SpinSize = 1 ;
};
ListBox DLB_KEY2
{
HelpID = "sw:ListBox:DLG_SORTING:DLB_KEY2";
Pos = MAP_APPFONT ( 96 , 50 ) ;
Size = MAP_APPFONT ( 55 , 45 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
CurPos = 0 ;
Sort = TRUE;
};
RadioButton RB_UP2
{
HelpID = "sw:RadioButton:DLG_SORTING:RB_UP2";
Pos = MAP_APPFONT ( 155 , 50 ) ;
Size = MAP_APPFONT ( 50 , 10 ) ;
Text [ en-US ] = "Ascending" ;
TabStop = TRUE ;
Check = TRUE ;
};
RadioButton RB_DN2
{
HelpID = "sw:RadioButton:DLG_SORTING:RB_DN2";
Pos = MAP_APPFONT ( 155 , 62 ) ;
Size = MAP_APPFONT ( 50 , 10 ) ;
Text [ en-US ] = "Descending" ;
TabStop = TRUE ;
};
CheckBox CB_KEY3
{
HelpID = "sw:CheckBox:DLG_SORTING:CB_KEY3";
Pos = MAP_APPFONT ( 12 , 81 ) ;
Size = MAP_APPFONT ( 49 , 8 ) ;
Text [ en-US ] = "Key ~3" ;
};
NumericField ED_KEY3
{
HelpID = "sw:NumericField:DLG_SORTING:ED_KEY3";
Border = TRUE ;
Pos = MAP_APPFONT ( 66 , 79 ) ;
Size = MAP_APPFONT ( 25 , 12 ) ;
TabStop = TRUE ;
Left = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
Minimum = 1 ;
Maximum = 99 ;
Value = 1 ;
First = 1 ;
Last = 99 ;
SpinSize = 1 ;
};
ListBox DLB_KEY3
{
HelpID = "sw:ListBox:DLG_SORTING:DLB_KEY3";
Pos = MAP_APPFONT ( 96 , 79 ) ;
Size = MAP_APPFONT ( 55 , 45 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
CurPos = 0 ;
Sort = TRUE;
};
RadioButton RB_UP3
{
HelpID = "sw:RadioButton:DLG_SORTING:RB_UP3";
Pos = MAP_APPFONT ( 155 , 79 ) ;
Size = MAP_APPFONT ( 50 , 10 ) ;
Text [ en-US ] = "Ascending" ;
TabStop = TRUE ;
Check = TRUE ;
};
RadioButton RB_DN3
{
HelpID = "sw:RadioButton:DLG_SORTING:RB_DN3";
Pos = MAP_APPFONT ( 155 , 91 ) ;
Size = MAP_APPFONT ( 50 , 10 ) ;
Text [ en-US ] = "Descending" ;
TabStop = TRUE ;
};
FixedLine FL_SORT_2
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
Size = MAP_APPFONT ( 200 , 8 ) ;
Text [ en-US ] = "Sort criteria" ;
};
RadioButton RB_COL
{
HelpID = "sw:RadioButton:DLG_SORTING:RB_COL";
Pos = MAP_APPFONT ( 12 , 120 ) ;
Size = MAP_APPFONT ( 38 , 10 ) ;
Text [ en-US ] = "Col~umns" ;
TabStop = TRUE ;
};
RadioButton RB_ROW
{
HelpID = "sw:RadioButton:DLG_SORTING:RB_ROW";
Pos = MAP_APPFONT ( 12 , 133 ) ;
Size = MAP_APPFONT ( 34 , 10 ) ;
Text [ en-US ] = "~Rows" ;
TabStop = TRUE ;
Check = TRUE ;
};
FixedLine FL_DIR
{
Pos = MAP_APPFONT ( 6 , 108 ) ;
Size = MAP_APPFONT ( 95 , 8 ) ;
Text [ en-US ] = "Direction" ;
};
RadioButton RB_TAB
{
HelpID = "sw:RadioButton:DLG_SORTING:RB_TAB";
Pos = MAP_APPFONT ( 113 , 120 ) ;
Size = MAP_APPFONT ( 44 , 9 ) ;
Text [ en-US ] = "~Tabs" ;
TabStop = TRUE ;
Check = TRUE ;
};
RadioButton RB_TABCH
{
HelpID = "sw:RadioButton:DLG_SORTING:RB_TABCH";
Pos = MAP_APPFONT ( 113 , 133 ) ;
Size = MAP_APPFONT ( 38 , 10 ) ;
Text [ en-US ] = "~Character" ;
TabStop = TRUE ;
};
Edit ED_TABCH
{
HelpID = "sw:Edit:DLG_SORTING:ED_TABCH";
Border = TRUE ;
Pos = MAP_APPFONT ( 180 , 133 ) ;
Size = MAP_APPFONT ( 12 , 12 ) ;
TabStop = TRUE ;
Left = TRUE ;
};
FixedLine FL_DELIM
{
Pos = MAP_APPFONT ( 107 , 108 ) ;
Size = MAP_APPFONT ( 99 , 8 ) ;
Text [ en-US ] = "Separator" ;
};
String STR_ROW
{
Text [ en-US ] = "Rows" ;
};
String STR_COL
{
Text [ en-US ] = "Column" ;
};
PushButton PB_DELIM
{
HelpID = "sw:PushButton:DLG_SORTING:PB_DELIM";
Pos = MAP_APPFONT ( 195 , 133 ) ;
Size = MAP_APPFONT ( 12 , 12 ) ;
TabStop = TRUE ;
Text = "...";
};
FixedLine FL_LANG
{
Pos = MAP_APPFONT ( 6 , 147 ) ;
Size = MAP_APPFONT ( 95 , 8 ) ;
Text [ en-US ] = "Language";
};
ListBox LB_LANG
{
HelpID = "sw:ListBox:DLG_SORTING:LB_LANG";
Pos = MAP_APPFONT ( 12 , 158 ) ;
Size = MAP_APPFONT ( 83 , 61 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
Sort = TRUE ;
};
FixedLine FL_SORT
{
Pos = MAP_APPFONT ( 107 , 147 ) ;
Size = MAP_APPFONT ( 99 , 8 ) ;
Text [ en-US ] = "Setting";
};
CheckBox CB_CASE
{
HelpID = "sw:CheckBox:DLG_SORTING:CB_CASE";
Pos = MAP_APPFONT ( 113 , 159 ) ;
Size = MAP_APPFONT ( 147 , 10 ) ;
TabStop = TRUE ;
Text [ en-US ] = "Match case";
};
};
InfoBox MSG_SRTERR
{
BUTTONS = WB_OK ;
......
sw/source/ui/misc/titlepage.cxx
Dosyayı görüntüle @ ce8b87b0
......@@ -148,8 +148,7 @@ sal_uInt16 SwTitlePageDlg::GetInsertPosition() const
}
SwTitlePageDlg::SwTitlePageDlg( Window *pParent ) :
SfxModalDialog( pParent, rtl::OString("DLG_TITLEPAGE"),
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("modules/swriter/ui/titlepage.ui")) ),
SfxModalDialog( pParent, "DLG_TITLEPAGE", "modules/swriter/ui/titlepage.ui"),
mpPageFmtDesc(0)
{
get(m_pUseExistingPagesRB, "RB_USE_EXISTING_PAGES");
......
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