Skip to content

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

convert field var page to .ui 

Change-Id: I56be21c0e5b74b03b0c7f8cca873fc4fd553f3a7
üst 86450f9f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 256 deletions
extras/source/glade/libreoffice-catalog.xml.in
Dosyayı görüntüle @ 400b3acb
......@@ -391,6 +391,10 @@
generic-name="URLBox" parent="VclComboBoxText"
icon-name="widget-gtk-comboboxtext"/>
<glade-widget-class title="SelectionListBox" name="swuilo-SelectionListBox"
generic-name="SelectionListBox" parent="VclComboBoxText"
icon-name="widget-gtk-comboboxtext"/>
<glade-widget-class title="PropertyControl" name="sdlo-PropertyControl"
generic-name="PropertyControl" parent="VclComboBoxText"
icon-name="widget-gtk-comboboxtext"/>
......
sw/AllLangResTarget_sw.mk
Dosyayı görüntüle @ 400b3acb
......@@ -104,7 +104,6 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\
sw/source/ui/fldui/flddb.src \
sw/source/ui/fldui/fldtdlg.src \
sw/source/ui/fldui/fldui.src \
sw/source/ui/fldui/fldvar.src \
sw/source/ui/frmdlg/frmpage.src \
sw/source/ui/frmdlg/frmui.src \
sw/source/ui/globdoc/globdoc.src \
......
sw/UIConfig_swriter.mk
Dosyayı görüntüle @ 400b3acb
......@@ -94,6 +94,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/flddocumentpage \
sw/uiconfig/swriter/ui/fldfuncpage \
sw/uiconfig/swriter/ui/fldrefpage \
sw/uiconfig/swriter/ui/fldvarpage \
sw/uiconfig/swriter/ui/formatsectiondialog \
sw/uiconfig/swriter/ui/formattablepage \
sw/uiconfig/swriter/ui/footendnotedialog \
......
sw/inc/helpid.h
Dosyayı görüntüle @ 400b3acb
......@@ -112,8 +112,6 @@
#define HID_NAVI_CONTENT "SW_HID_NAVI_CONTENT"
#define HID_NAVI_GLOBAL "SW_HID_NAVI_GLOBAL"
#define HID_LTEMPL_NUMBERING "SW_HID_LTEMPL_NUMBERING"
#define HID_FLDVAR_APPLY "SW_HID_FLDVAR_APPLY"
#define HID_FLDVAR_DELETE "SW_HID_FLDVAR_DELETE"
#define HID_FLDEDT_ADDRESS "SW_HID_FLDEDT_ADDRESS"
#define HID_SORT_ACTION "SW_HID_SORT_ACTION"
#define HID_SORT_AUTHOR "SW_HID_SORT_AUTHOR"
......@@ -144,7 +142,6 @@
#define HID_COND_COLL "SW_HID_COND_COLL"
#define HID_FLD_DB "SW_HID_FLD_DB"
#define HID_FLD_VAR "SW_HID_FLD_VAR"
#define HID_EDIT_FLD_DB "SW_HID_EDIT_FLD_DB"
#define HID_EDIT_FLD_DOKINF "SW_HID_EDIT_FLD_DOKINF"
......
sw/source/ui/fldui/fldtdlg.hrc
Dosyayı görüntüle @ 400b3acb
......@@ -44,31 +44,7 @@
#define FT_ADDDB (RC_TP_DB_START + 16)
#define PB_ADDDB (RC_TP_DB_START + 17)
// Variable-TabPage:
#define RC_TP_VAR_START (RC_TP_DB_END)
#define FT_VARTYPE (RC_TP_VAR_START + 1)
#define LB_VARTYPE (RC_TP_VAR_START + 2)
#define FT_VARSELECTION (RC_TP_VAR_START + 3)
#define LB_VARSELECTION (RC_TP_VAR_START + 4)
#define FT_VARNAME (RC_TP_VAR_START + 5)
#define ED_VARNAME (RC_TP_VAR_START + 6)
#define FT_VARVALUE (RC_TP_VAR_START + 7)
#define ED_VARVALUE (RC_TP_VAR_START + 8)
#define FT_VARFORMAT (RC_TP_VAR_START + 9)
#define LB_VARNUMFORMAT (RC_TP_VAR_START + 10)
#define LB_VARFORMAT (RC_TP_VAR_START + 11)
#define FT_VARCHAPTERHEADER (RC_TP_VAR_START + 12)
#define FT_VARCHAPTERLEVEL (RC_TP_VAR_START + 13)
#define LB_VARCHAPTERLEVEL (RC_TP_VAR_START + 14)
#define CB_VARINVISIBLE (RC_TP_VAR_START + 15)
#define FT_VARSEPARATOR (RC_TP_VAR_START + 16)
#define ED_VARSEPARATOR (RC_TP_VAR_START + 17)
#define TBX_VARNEWDEL (RC_TP_VAR_START + 18)
#define BT_VARAPPLY (RC_TP_VAR_START + 19)
#define BT_VARDELETE (RC_TP_VAR_START + 20)
#define RC_TP_VAR_END (RC_TP_VAR_START + 21)
#define RC_TP_END (RC_TP_VAR_END)
#define RC_TP_END (RC_TP_DB_END)
// Strings ------------------------------------------------------------------
......
sw/source/ui/fldui/fldvar.cxx
Dosyayı görüntüle @ 400b3acb
This diff is collapsed.
sw/source/ui/fldui/fldvar.hxx
Dosyayı görüntüle @ 400b3acb
......@@ -37,10 +37,10 @@ class SelectionListBox : public ListBox
{
bool bCallAddSelection;
virtual long PreNotify( NotifyEvent& rNEvt );
virtual long PreNotify( NotifyEvent& rNEvt );
public:
SelectionListBox( SwFldVarPage* pDialog, const ResId& rResId );
SelectionListBox(Window* pParent, WinBits nStyle);
// detect selection via Ctrl or Alt and evaluate with SelectHdl
bool IsCallAddSelection() const {return bCallAddSelection;}
......@@ -51,24 +51,24 @@ class SwFldVarPage : public SwFldPage
{
friend class SelectionListBox;
FixedText aTypeFT;
ListBox aTypeLB;
FixedText aSelectionFT;
SelectionListBox aSelectionLB;
FixedText aNameFT;
Edit aNameED;
FixedText aValueFT;
ConditionEdit aValueED;
FixedText aFormatFT;
NumFormatListBox aNumFormatLB;
ListBox aFormatLB;
FixedText aChapterHeaderFT;
FixedText aChapterLevelFT;
ListBox aChapterLevelLB;
CheckBox aInvisibleCB;
FixedText aSeparatorFT;
Edit aSeparatorED;
ToolBox aNewDelTBX;
ListBox* m_pTypeLB;
VclContainer* m_pSelection;
SelectionListBox* m_pSelectionLB;
FixedText* m_pNameFT;
Edit* m_pNameED;
FixedText* m_pValueFT;
ConditionEdit* m_pValueED;
VclContainer* m_pFormat;
NumFormatListBox* m_pNumFormatLB;
ListBox* m_pFormatLB;
VclContainer* m_pChapterFrame;
ListBox* m_pChapterLevelLB;
CheckBox* m_pInvisibleCB;
FixedText* m_pSeparatorFT;
Edit* m_pSeparatorED;
ToolBox* m_pNewDelTBX;
sal_uInt16 m_nApplyId;
sal_uInt16 m_nDeleteId;
String sOldValueFT;
String sOldNameFT;
......
sw/source/ui/fldui/fldvar.src deleted 100644 → 0
Dosyayı görüntüle @ 86450f9f
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include "globals.hrc"
#include "fldtdlg.hrc"
#include "helpid.h"
#include "cmdid.h"
TabPage TP_FLD_VAR
{
HelpID = HID_FLD_VAR ;
SVLook = TRUE ;
Hide = TRUE ;
Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
FixedText FT_VARTYPE
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
Size = MAP_APPFONT ( 76 , 8 ) ;
Text [ en-US ] = "~Type" ;
Left = TRUE ;
};
ListBox LB_VARTYPE
{
HelpID = "sw:ListBox:TP_FLD_VAR:LB_VARTYPE";
Border = TRUE ;
Pos = MAP_APPFONT ( 6 , 14 ) ;
Size = MAP_APPFONT ( 76 , 135 ) ;
TabStop = TRUE ;
Sort = FALSE ;
AutoHScroll = TRUE ;
};
FixedText FT_VARSELECTION
{
Pos = MAP_APPFONT ( 88 , 3 ) ;
Size = MAP_APPFONT ( 76 , 8 ) ;
Left = TRUE ;
Text [ en-US ] = "S~election" ;
};
ListBox LB_VARSELECTION
{
HelpID = "sw:ListBox:TP_FLD_VAR:LB_VARSELECTION";
Border = TRUE ;
Pos = MAP_APPFONT ( 88 , 14 ) ;
Size = MAP_APPFONT ( 76 , 135 ) ;
TabStop = TRUE ;
Sort = TRUE ;
};
FixedText FT_VARFORMAT
{
Pos = MAP_APPFONT ( 170 , 3 ) ;
Size = MAP_APPFONT ( 84 , 8 ) ;
Left = TRUE ;
Text [ en-US ] = "Format" ;
};
ListBox LB_VARFORMAT
{
HelpID = "sw:ListBox:TP_FLD_VAR:LB_VARFORMAT";
Border = TRUE ;
Pos = MAP_APPFONT ( 170 , 14 ) ;
Size = MAP_APPFONT ( 84 , 123 ) ;
TabStop = TRUE ;
DropDown = FALSE ;
};
ListBox LB_VARNUMFORMAT
{
HelpID = "sw:ListBox:TP_FLD_VAR:LB_VARNUMFORMAT";
Border = TRUE ;
Pos = MAP_APPFONT ( 170 , 14 ) ;
Size = MAP_APPFONT ( 84 , 123 ) ;
TabStop = TRUE ;
DropDown = FALSE ;
};
CheckBox CB_VARINVISIBLE
{
HelpID = "sw:CheckBox:TP_FLD_VAR:CB_VARINVISIBLE";
Pos = MAP_APPFONT ( 170 , 141 ) ;
Size = MAP_APPFONT ( 84 , 10 ) ;
Text [ en-US ] = "Invisi~ble" ;
TabStop = TRUE ;
};
FixedText FT_VARCHAPTERHEADER
{
Pos = MAP_APPFONT ( 170 , 112 ) ;
Size = MAP_APPFONT ( 84 , 8 ) ;
Hide = TRUE ;
Text [ en-US ] = "Numbering by chapter" ;
};
FixedText FT_VARCHAPTERLEVEL
{
Pos = MAP_APPFONT ( 175 , 125 ) ;
Size = MAP_APPFONT ( 30 , 8 ) ;
Hide = TRUE ;
Text [ en-US ] = "~Level" ;
};
ListBox LB_VARCHAPTERLEVEL
{
HelpID = "sw:ListBox:TP_FLD_VAR:LB_VARCHAPTERLEVEL";
Border = TRUE ;
Hide = TRUE ;
Pos = MAP_APPFONT ( 208 , 123 ) ;
Size = MAP_APPFONT ( 46 , 76 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
StringList [ en-US ] =
{
< "None" ; > ;
};
};
FixedText FT_VARSEPARATOR
{
Pos = MAP_APPFONT ( 175 , 140 ) ;
Size = MAP_APPFONT ( 30 , 10 ) ;
Hide = TRUE ;
Text [ en-US ] = "~Separator" ;
};
Edit ED_VARSEPARATOR
{
HelpID = "sw:Edit:TP_FLD_VAR:ED_VARSEPARATOR";
Pos = MAP_APPFONT ( 208 , 138 ) ;
Size = MAP_APPFONT ( 46 , 12 ) ;
Border = TRUE ;
Hide = TRUE ;
MaxTextLength = 1 ;
TEXT = "." ;
};
FixedText FT_VARNAME
{
Pos = MAP_APPFONT ( 6 , 155 ) ;
Size = MAP_APPFONT ( 76 , 8 ) ;
Left = TRUE ;
Text [ en-US ] = "Na~me" ;
};
Edit ED_VARNAME
{
HelpID = "sw:Edit:TP_FLD_VAR:ED_VARNAME";
Border = TRUE ;
Pos = MAP_APPFONT ( 6 , 166 ) ;
Size = MAP_APPFONT ( 76 , 12 ) ;
TabStop = TRUE ;
Left = TRUE ;
};
FixedText FT_VARVALUE
{
Pos = MAP_APPFONT ( 88 , 155 ) ;
Size = MAP_APPFONT ( 76 , 8 ) ;
Text [ en-US ] = "~Value" ;
Left = TRUE ;
};
Edit ED_VARVALUE
{
HelpID = "sw:Edit:TP_FLD_VAR:ED_VARVALUE";
Border = TRUE ;
Pos = MAP_APPFONT ( 88 , 166 ) ;
Size = MAP_APPFONT ( 76 , 12 ) ;
TabStop = TRUE ;
Left = TRUE ;
};
ToolBox TBX_VARNEWDEL
{
Pos = MAP_APPFONT ( 167 , 167 ) ;
SVLook = TRUE ;
Border = FALSE ;
ItemList =
{
ToolBoxItem
{
Identifier = BT_VARAPPLY ;
HelpID = HID_FLDVAR_APPLY ;
ItemImage = Image
{
ImageBitmap = Bitmap{ File = "sc20558.bmp" ;};
MaskColor = IMAGE_MASK_COLOR ;
};
Text [ en-US ] = "Apply" ;
};
ToolBoxItem
{
Identifier = BT_VARDELETE ;
HelpID = HID_FLDVAR_DELETE ;
ItemImage = Image
{
ImageBitmap = Bitmap{ File = "sc20557.bmp" ;};
MaskColor = IMAGE_MASK_COLOR ;
};
Text [ en-US ] = "Delete" ;
};
};
};
Text [ en-US ] = "Variables" ;
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
sw/uiconfig/swriter/ui/fldvarpage.ui 0 → 100644
Dosyayı görüntüle @ 400b3acb
This diff is collapsed.
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