Skip to content

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

convert condition page to .ui 

Change-Id: Ifd05bdb46cd0cbbce09bd91a3fbf78d6eac0d8c5
üst 209ca76f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 219 deletions
sw/AllLangResTarget_sw.mk
Dosyayı görüntüle @ 6243704c
...@@ -67,7 +67,6 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\ ...@@ -67,7 +67,6 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\
sw/source/ui/app/app.src \ sw/source/ui/app/app.src \
sw/source/ui/app/error.src \ sw/source/ui/app/error.src \
sw/source/ui/app/mn.src \ sw/source/ui/app/mn.src \
sw/source/ui/chrdlg/ccoll.src \
sw/source/ui/chrdlg/chrdlg.src \ sw/source/ui/chrdlg/chrdlg.src \
sw/source/ui/config/mailconfigpage.src \ sw/source/ui/config/mailconfigpage.src \
sw/source/ui/config/optcomp.src \ sw/source/ui/config/optcomp.src \
......
sw/UIConfig_swriter.mk
Dosyayı görüntüle @ 6243704c
...@@ -76,6 +76,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\ ...@@ -76,6 +76,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/columndialog \ sw/uiconfig/swriter/ui/columndialog \
sw/uiconfig/swriter/ui/columnpage \ sw/uiconfig/swriter/ui/columnpage \
sw/uiconfig/swriter/ui/columnwidth \ sw/uiconfig/swriter/ui/columnwidth \
sw/uiconfig/swriter/ui/conditionpage \
sw/uiconfig/swriter/ui/converttexttable \ sw/uiconfig/swriter/ui/converttexttable \
sw/uiconfig/swriter/ui/createauthorentry \ sw/uiconfig/swriter/ui/createauthorentry \
sw/uiconfig/swriter/ui/createautomarkdialog \ sw/uiconfig/swriter/ui/createautomarkdialog \
......
sw/inc/globals.hrc
Dosyayı görüntüle @ 6243704c
...@@ -129,7 +129,6 @@ ...@@ -129,7 +129,6 @@
#define TP_CONTENT_OPT (RC_GLOBALS_BEGIN + 45) #define TP_CONTENT_OPT (RC_GLOBALS_BEGIN + 45)
#define TP_STD_FONT (RC_GLOBALS_BEGIN + 47) #define TP_STD_FONT (RC_GLOBALS_BEGIN + 47)
#define TP_CONDCOLL (RC_GLOBALS_BEGIN + 48)
#define TP_NUMBER (RC_GLOBALS_BEGIN + 57) #define TP_NUMBER (RC_GLOBALS_BEGIN + 57)
......
sw/inc/helpid.h
Dosyayı görüntüle @ 6243704c
...@@ -136,8 +136,6 @@ ...@@ -136,8 +136,6 @@
// TabPage Help-IDs // TabPage Help-IDs
#define HID_COND_COLL "SW_HID_COND_COLL"
#define HID_REDLINE_CTRL "SW_HID_REDLINE_CTRL" #define HID_REDLINE_CTRL "SW_HID_REDLINE_CTRL"
#define HID_OPTCAPTION_PAGE "SW_HID_OPTCAPTION_PAGE" #define HID_OPTCAPTION_PAGE "SW_HID_OPTCAPTION_PAGE"
#define HID_TP_TOX_SELECT "SW_HID_TP_TOX_SELECT" #define HID_TP_TOX_SELECT "SW_HID_TP_TOX_SELECT"
...@@ -307,8 +305,6 @@ ...@@ -307,8 +305,6 @@
#define HID_CALC_TOOLBOX "SW_HID_CALC_TOOLBOX" #define HID_CALC_TOOLBOX "SW_HID_CALC_TOOLBOX"
#define HID_PVIEW_TOOLBOX "SW_HID_PVIEW_TOOLBOX" #define HID_PVIEW_TOOLBOX "SW_HID_PVIEW_TOOLBOX"
#define HID_COND_COLL_TABLIST "SW_HID_COND_COLL_TABLIST"
#define HID_SELECT_TEMPLATE "SW_HID_SELECT_TEMPLATE" #define HID_SELECT_TEMPLATE "SW_HID_SELECT_TEMPLATE"
#define HID_AP_INSERT_DB_SEL "SW_HID_AP_INSERT_DB_SEL" #define HID_AP_INSERT_DB_SEL "SW_HID_AP_INSERT_DB_SEL"
......
sw/source/ui/chrdlg/ccoll.cxx
Dosyayı görüntüle @ 6243704c
...@@ -36,7 +36,6 @@ ...@@ -36,7 +36,6 @@
#include "hints.hxx" #include "hints.hxx"
#include "chrdlg.hrc" #include "chrdlg.hrc"
#include "ccoll.hrc"
#include <vcl/svapp.hxx> #include <vcl/svapp.hxx>
#include <unomid.h> #include <unomid.h>
......
sw/source/ui/chrdlg/ccoll.hrc deleted 100644 → 0
Dosyayı görüntüle @ 209ca76f
/* -*- 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 .
*/
#ifndef _CCOLL_HRC
#define _CCOLL_HRC
// #define ******************************************************************
#define CB_CONDITION 1
#define FL_CONDITION 2
#define FT_CONTEXT 3
#define FT_USED 4
#define TB_CONDCOLLS 5
#define FT_STYLE 6
#define LB_STYLE 7
#define LB_FILTER 8
#define PB_REMOVE 9
#define PB_ASSIGN 10
#define STR_REGIONS 11
#define STR_NOTEMPL 12
// ********************************************************************** EOF
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
sw/source/ui/chrdlg/ccoll.src deleted 100644 → 0
Dosyayı görüntüle @ 209ca76f
/* -*- 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 "chrdlg.hrc"
#include "ccoll.hrc"
#include "helpid.h"
// TabPage ******************************************************************
TabPage TP_CONDCOLL
{
HelpID = HID_COND_COLL ;
Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Hide = TRUE ;
FixedLine FL_CONDITION
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
Size = MAP_APPFONT ( 248 , 8 ) ;
Text [ en-US ] = "Options";
};
CheckBox CB_CONDITION
{
HelpID = "sw:CheckBox:TP_CONDCOLL:CB_CONDITION";
Pos = MAP_APPFONT ( 12 , 14 ) ;
Size = MAP_APPFONT ( 100 , 10 ) ;
TabStop = TRUE ;
Disable = TRUE ;
Text [ en-US ] = "~Conditional Style" ;
};
FixedText FT_CONTEXT
{
Pos = MAP_APPFONT ( 12 , 28 ) ;
Size = MAP_APPFONT ( 50 , 8 ) ;
Disable = TRUE ;
Text [ en-US ] = "Conte~xt" ;
};
FixedText FT_USED
{
Pos = MAP_APPFONT ( 100 , 28 ) ;
Size = MAP_APPFONT ( 80 , 8 ) ;
Disable = TRUE ;
Text [ en-US ] = "Applied Styles" ;
};
Control TB_CONDCOLLS
{
Border = TRUE ;
Pos = MAP_APPFONT ( 12 , 39 ) ;
Size = MAP_APPFONT ( 173 , 123 ) ;
TabStop = TRUE ;
ClipChildren = TRUE ;
Disable = TRUE ;
Border = TRUE ;
};
FixedText FT_STYLE
{
Pos = MAP_APPFONT ( 190 , 28 ) ;
Size = MAP_APPFONT ( 58 , 8 ) ;
Disable = TRUE ;
Text [ en-US ] = "~Paragraph Styles" ;
};
ListBox LB_STYLE
{
HelpID = "sw:ListBox:TP_CONDCOLL:LB_STYLE";
Pos = MAP_APPFONT ( 188 , 39 ) ;
Size = MAP_APPFONT ( 60 , 108 ) ;
TabStop = TRUE ;
Border = TRUE ;
Sort = TRUE ;
Disable = TRUE ;
HScroll = TRUE ;
};
ListBox LB_FILTER
{
HelpID = "sw:ListBox:TP_CONDCOLL:LB_FILTER";
Pos = MAP_APPFONT ( 188 , 150 ) ;
Size = MAP_APPFONT ( 60 , 50 ) ;
DropDown = TRUE ;
TabStop = TRUE ;
Border = TRUE ;
Disable = TRUE ;
HScroll = TRUE ;
};
PushButton PB_REMOVE
{
HelpID = "sw:PushButton:TP_CONDCOLL:PB_REMOVE";
Pos = MAP_APPFONT ( 129 , 165 ) ;
Size = MAP_APPFONT ( 50 , 12 ) ;
TabStop = TRUE ;
Disable = TRUE ;
Text [ en-US ] = "Re~move" ;
};
PushButton PB_ASSIGN
{
HelpID = "sw:PushButton:TP_CONDCOLL:PB_ASSIGN";
Pos = MAP_APPFONT ( 185 , 165 ) ;
Size = MAP_APPFONT ( 50 , 12 ) ;
TabStop = TRUE ;
Disable = TRUE ;
Text [ en-US ] = "~Apply" ;
};
StringArray STR_REGIONS
{
ItemList [ en-US ] =
{
< "Table Header" ; > ;
< "Table" ; > ;
< "Frame" ; > ;
< "Section" ; > ;
< "Footnote" ; > ;
< "Endnote" ; > ;
< "Header" ; > ;
< "Footer" ; > ;
< " 1st Outline Level" ; > ;
< " 2nd Outline Level" ; > ;
< " 3rd Outline Level" ; > ;
< " 4th Outline Level" ; > ;
< " 5th Outline Level" ; > ;
< " 6th Outline Level" ; > ;
< " 7th Outline Level" ; > ;
< " 8th Outline Level" ; > ;
< " 9th Outline Level" ; > ;
< "10th Outline Level" ; > ;
< " 1st Numbering Level" ; > ;
< " 2nd Numbering Level" ; > ;
< " 3rd Numbering Level" ; > ;
< " 4th Numbering Level" ; > ;
< " 5th Numbering Level" ; > ;
< " 6th Numbering Level" ; > ;
< " 7th Numbering Level" ; > ;
< " 8th Numbering Level" ; > ;
< " 9th Numbering Level" ; > ;
< "10th Numbering Level" ; > ;
};
};
String STR_NOTEMPL
{
Text [ en-US ] = "<none>" ;
};
};
// ********************************************************************** EOF
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
sw/source/ui/inc/swuiccoll.hxx
Dosyayı görüntüle @ 6243704c
...@@ -26,22 +26,20 @@ class SwFmt; ...@@ -26,22 +26,20 @@ class SwFmt;
class SwCondCollPage : public SfxTabPage class SwCondCollPage : public SfxTabPage
{ {
FixedLine aConditionFL; CheckBox* m_pConditionCB;
CheckBox aConditionCB;
FixedText aContextFT; FixedText* m_pContextFT;
FixedText aUsedFT; FixedText* m_pUsedFT;
SvTabListBox aTbLinks; SvTabListBox* m_pTbLinks;
FixedText aStyleFT; FixedText* m_pStyleFT;
ListBox aStyleLB; ListBox* m_pStyleLB;
ListBox aFilterLB; ListBox* m_pFilterLB;
PushButton aRemovePB; PushButton* m_pRemovePB;
PushButton aAssignPB; PushButton* m_pAssignPB;
String sNoTmpl; std::vector<OUString> m_aStrArr;
ResStringArray aStrArr;
SwWrtShell &rSh; SwWrtShell &rSh;
const CommandStruct*pCmds; const CommandStruct*pCmds;
......
sw/uiconfig/swriter/ui/conditionpage.ui 0 → 100644
Dosyayı görüntüle @ 6243704c
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