Skip to content

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

convert outline numbering numbering tab over fully 

Change-Id: I8ff97ad9ecc6367d98dc31829f82d074f99f5934
üst 49e235c0
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 47 additions and 259 deletions
sw/Module_sw.mk
Dosyayı görüntüle @ 84fd33b7
......@@ -26,7 +26,6 @@ $(eval $(call gb_Module_add_targets,sw,\
Library_swd \
Library_swui \
Package_uiconfig \
UI_sw \
UI_swriter \
))
......
sw/UI_sw.mk deleted 100644 → 0
Dosyayı görüntüle @ 49e235c0
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# 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/.
#
$(eval $(call gb_UI_UI,sw))
$(eval $(call gb_UI_add_uifiles,sw,\
sw/uiconfig/sw/ui/20876 \
))
# vim: set noet sw=4 ts=4:
sw/UI_swriter.mk
Dosyayı görüntüle @ 84fd33b7
......@@ -24,7 +24,8 @@ $(eval $(call gb_UI_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/insertscript \
sw/uiconfig/swriter/ui/inserttable \
sw/uiconfig/swriter/ui/linenumbering \
sw/uiconfig/swriter/ui/numberingpositionpage \
sw/uiconfig/swriter/ui/outlinenumberingpage \
sw/uiconfig/swriter/ui/outlinepositionpage \
sw/uiconfig/swriter/ui/printeroptions \
sw/uiconfig/swriter/ui/sortdialog \
sw/uiconfig/swriter/ui/splittable \
......
sw/inc/globals.hrc
Dosyayı görüntüle @ 84fd33b7
......@@ -67,6 +67,8 @@
#define STR_REMOVE_WARNING (RC_GLOBALS_BEGIN + 40)
#define STR_NO_COLL (RC_GLOBALS_BEGIN + 41)
// DIALOGS -----------------------------------------------------------
#define DLG_THESAURUS (RC_GLOBALS_BEGIN + 2)
......
sw/inc/helpid.h
Dosyayı görüntüle @ 84fd33b7
......@@ -197,7 +197,6 @@
#define HID_EDIT_FLD_FUNC "SW_HID_EDIT_FLD_FUNC"
#define HID_EDIT_FLD_REF "SW_HID_EDIT_FLD_REF"
#define HID_REDLINE_CTRL "SW_HID_REDLINE_CTRL"
#define HID_TP_OUTLINE_NUM "SW_HID_TP_OUTLINE_NUM"
#define HID_OPTCAPTION_PAGE "SW_HID_OPTCAPTION_PAGE"
#define HID_OPTLOAD_PAGE "SW_HID_OPTLOAD_PAGE"
#define HID_INSERT_SECTION_PAGE "SW_HID_INSERT_SECTION_PAGE"
......
sw/source/ui/app/app.src
Dosyayı görüntüle @ 84fd33b7
......@@ -235,6 +235,11 @@ String STR_REMOVE_WARNING
Text [ en-US ] = "The following characters are not valid and have been removed: ";
};
String STR_NO_COLL
{
Text [ en-US ] = "(none)" ;
};
InfoBox MSG_ERROR_SEND_MAIL
{
BUTTONS = WB_OK ;
......
sw/source/ui/inc/num.hxx
Dosyayı görüntüle @ 84fd33b7
......@@ -137,8 +137,8 @@ public:
{ bModified = sal_True;
if(bRepaint)
{
aPreviewWIN.SetLevel(nActNumLvl);
aPreviewWIN.Invalidate();
m_pPreviewWIN->SetLevel(nActNumLvl);
m_pPreviewWIN->Invalidate();
}
}
#endif
......
sw/source/ui/inc/outline.hxx
Dosyayı görüntüle @ 84fd33b7
......@@ -81,26 +81,17 @@ class SwOutlineTabDialog : public SfxTabDialog
class SwOutlineSettingsTabPage : public SfxTabPage
{
FixedLine aLevelFL;
ListBox aLevelLB;
FixedLine aNumberFL;
FixedText aCollLbl;
ListBox aCollBox;
FixedText aNumberLbl;
SwNumberingTypeListBox aNumberBox;
FixedText aCharFmtFT;
ListBox aCharFmtLB;
FixedText aAllLevelFT;
NumericField aAllLevelNF;
FixedText aDelim;
FixedText aPrefixFT;
Edit aPrefixED;
FixedText aSuffixFT;
Edit aSuffixED;
FixedText aStartLbl;
NumericField aStartEdit;
NumberingPreview aPreviewWIN;
ListBox* m_pLevelLB;
ListBox* m_pCollBox;
SwNumberingTypeListBox* m_pNumberBox;
ListBox* m_pCharFmtLB;
FixedText* m_pAllLevelFT;
NumericField* m_pAllLevelNF;
Edit* m_pPrefixED;
Edit* m_pSuffixED;
NumericField* m_pStartEdit;
NumberingPreview* m_pPreviewWIN;
String aNoFmtName;
String aSaveCollNames[MAXLEVEL];
......@@ -120,7 +111,7 @@ class SwOutlineSettingsTabPage : public SfxTabPage
void Update();
void SetModified(){aPreviewWIN.Invalidate();}
void SetModified(){m_pPreviewWIN->Invalidate();}
void CheckForStartValue_Impl(sal_uInt16 nNumberingType);
using SfxTabPage::ActivatePage;
......
sw/source/ui/misc/num.cxx
Dosyayı görüntüle @ 84fd33b7
......@@ -59,8 +59,8 @@ static sal_Bool bLastRelative = sal_False;
SwNumPositionTabPage::SwNumPositionTabPage(Window* pParent,
const SfxItemSet& rSet)
: SfxTabPage(pParent, "NumberingPositionPage",
"modules/swriter/ui/numberingpositionpage.ui", rSet)
: SfxTabPage(pParent, "OutlinePositionPage",
"modules/swriter/ui/outlinepositionpage.ui", rSet)
, pActNum(0)
, pSaveNum(0)
, pWrtSh(0)
......
sw/source/ui/misc/outline.cxx
Dosyayı görüntüle @ 84fd33b7
This diff is collapsed.
sw/source/ui/misc/outline.hrc
Dosyayı görüntüle @ 84fd33b7
......@@ -55,16 +55,4 @@
#define MN_FORM8 118
#define MN_FORM9 119
#define MN_SAVE 120
#define FL_LEVEL 130
#define LB_LEVEL 131
#define WIN_PREVIEW 132
#define FT_SUFFIX 134
#define ED_SUFFIX 135
#define FT_PREFIX 136
#define ED_PREFIX 137
#define ST_NO_COLL 138
#define ST_FORM 140
#define FT_CHARFMT 141
#define LB_CHARFMT 142
#define ST_FORM 121
sw/source/ui/misc/outline.src
Dosyayı görüntüle @ 84fd33b7
......@@ -186,184 +186,3 @@ TabDialog DLG_TAB_OUTLINE
};
};
};
/**************************************************************************/
/* */
/* TabPage */
/* */
/**************************************************************************/
TabPage TP_OUTLINE_NUM
{
HelpID = HID_TP_OUTLINE_NUM ;
SVLook = TRUE ;
Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Hide = TRUE;
ListBox LB_LEVEL
{
HelpID = "sw:ListBox:TP_OUTLINE_NUM:LB_LEVEL";
Pos = MAP_APPFONT ( 12 , 14 ) ;
Size = MAP_APPFONT ( 23 , 129 ) ;
TabStop = TRUE ;
DropDown = FALSE ;
Border = TRUE ;
};
FixedLine FL_LEVEL
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
Size = MAP_APPFONT ( 32 , 8 ) ;
Text [ en-US ] = "Level" ;
};
FixedText FT_COLL
{
Pos = MAP_APPFONT ( 50 , 14 ) ;
Size = MAP_APPFONT ( 120 , 8 ) ;
Text [ en-US ] = "~Paragraph Style" ;
Group = TRUE ;
Left = TRUE ;
};
ListBox LB_COLL
{
HelpID = "sw:ListBox:TP_OUTLINE_NUM:LB_COLL";
Border = TRUE ;
Pos = MAP_APPFONT ( 50 , 25 ) ;
Size = MAP_APPFONT ( 120 , 75 ) ;
TabStop = TRUE ;
Group = TRUE ;
Sort = TRUE ;
DropDown = TRUE ;
CurPos = 0 ;
};
FixedText FT_NUMBER
{
Pos = MAP_APPFONT ( 50 , 43 ) ;
Size = MAP_APPFONT ( 52 , 8 ) ;
Text [ en-US ] = "~Number" ;
Left = TRUE ;
};
ListBox LB_NUMBER
{
HelpID = "sw:ListBox:TP_OUTLINE_NUM:LB_NUMBER";
Pos = MAP_APPFONT ( 104 , 41 ) ;
Size = MAP_APPFONT ( 66 , 65 ) ;
TabStop = TRUE ;
Group = TRUE ;
DropDown = TRUE ;
CurPos = 0 ;
};
FixedText FT_CHARFMT
{
Pos = MAP_APPFONT ( 50 , 59 ) ;
Size = MAP_APPFONT ( 52 , 8 ) ;
Text [ en-US ] = "~Character Style" ;
};
ListBox LB_CHARFMT
{
HelpID = "sw:ListBox:TP_OUTLINE_NUM:LB_CHARFMT";
TabStop = TRUE ;
DropDown = TRUE ;
Pos = MAP_APPFONT ( 104 , 57 ) ;
Size = MAP_APPFONT ( 66 , 65 ) ;
};
FixedText FT_ALL_LEVEL
{
Pos = MAP_APPFONT ( 50 , 75 ) ;
Size = MAP_APPFONT ( 52 , 8 ) ;
Text [ en-US ] = "Sho~w sublevels" ;
};
NumericField NF_ALL_LEVEL
{
HelpID = "sw:NumericField:TP_OUTLINE_NUM:NF_ALL_LEVEL";
Border = TRUE ;
Pos = MAP_APPFONT ( 104 , 73 ) ;
Size = MAP_APPFONT ( 66 , 12 ) ;
TabStop = TRUE ;
Left = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
Minimum = 1 ;
Maximum = 10 ;
Value = 1 ;
First = 1 ;
Last = 10 ;
};
FixedText FT_DELIM
{
Pos = MAP_APPFONT ( 50 , 89 ) ;
Size = MAP_APPFONT ( 52 , 8 ) ;
Text [ en-US ] = "Separator" ;
Left = TRUE ;
};
FixedText FT_PREFIX
{
Pos = MAP_APPFONT ( 56 , 102 ) ;
Size = MAP_APPFONT ( 46 , 8 ) ;
Text [ en-US ] = "~Before" ;
Left = TRUE ;
};
Edit ED_PREFIX
{
HelpID = "sw:Edit:TP_OUTLINE_NUM:ED_PREFIX";
Border = TRUE ;
Pos = MAP_APPFONT ( 104 , 100 ) ;
Size = MAP_APPFONT ( 66 , 12 ) ;
TabStop = TRUE ;
Group = TRUE ;
Left = TRUE ;
};
FixedText FT_SUFFIX
{
Pos = MAP_APPFONT ( 56 , 117 ) ;
Size = MAP_APPFONT ( 46 , 8 ) ;
Text [ en-US ] = "~After" ;
Left = TRUE ;
};
Edit ED_SUFFIX
{
HelpID = "sw:Edit:TP_OUTLINE_NUM:ED_SUFFIX";
Border = TRUE ;
Pos = MAP_APPFONT ( 104 , 115 ) ;
Size = MAP_APPFONT ( 66 , 12 ) ;
TabStop = TRUE ;
Group = TRUE ;
Left = TRUE ;
};
FixedText FT_START
{
Pos = MAP_APPFONT ( 50 , 133 ) ;
Size = MAP_APPFONT ( 52 , 8 ) ;
Text [ en-US ] = "~Start at" ;
Left = TRUE ;
};
NumericField ED_START
{
HelpID = "sw:NumericField:TP_OUTLINE_NUM:ED_START";
Border = TRUE ;
Pos = MAP_APPFONT ( 104 , 131 ) ;
Size = MAP_APPFONT ( 66 , 12 ) ;
TabStop = TRUE ;
Left = TRUE ;
Spin = TRUE ;
Repeat = TRUE ;
Maximum = 999 ;
Value = 0 ;
First = 0 ;
Last = 99 ;
SpinSize = 1 ;
};
FixedLine FL_NUMBER
{
Pos = MAP_APPFONT ( 44 , 3 ) ;
Size = MAP_APPFONT ( 210 , 8 ) ;
Text [ en-US ] = "Numbering" ;
Group = TRUE ;
};
Window WIN_PREVIEW
{
Pos = MAP_APPFONT ( 179 , 14 ) ;
Size = MAP_APPFONT ( 72 , 129 ) ;
};
String ST_NO_COLL
{
Text [ en-US ] = "(none)" ;
};
};
sw/uiconfig/sw/ui/20876.ui → sw/uiconfig/swriter/ui/outlinenumberingpage.ui
Dosyayı görüntüle @ 84fd33b7
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkBox" id="20876">
<object class="GtkBox" id="OutlineNumberingPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">10</property>
......@@ -18,7 +18,7 @@
<property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
<object class="GtkTreeView" id="131">
<object class="GtkTreeView" id="level">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="headers_visible">False</property>
......@@ -31,7 +31,7 @@
</object>
</child>
<child type="label">
<object class="GtkLabel" id="130">
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Level</property>
......@@ -75,7 +75,7 @@
<property name="row_spacing">6</property>
<property name="column_spacing">10</property>
<child>
<object class="GtkLabel" id="20">
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
......@@ -90,7 +90,7 @@
</packing>
</child>
<child>
<object class="GtkComboBox" id="21">
<object class="GtkComboBox" id="style">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
......@@ -102,7 +102,7 @@
</packing>
</child>
<child>
<object class="GtkLabel" id="22">
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
......@@ -116,7 +116,7 @@
</packing>
</child>
<child>
<object class="GtkLabel" id="141">
<object class="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
......@@ -130,7 +130,7 @@
</packing>
</child>
<child>
<object class="GtkLabel" id="108">
<object class="GtkLabel" id="sublevelsft">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
......@@ -144,7 +144,7 @@
</packing>
</child>
<child>
<object class="GtkLabel" id="24">
<object class="GtkLabel" id="label7">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
......@@ -158,7 +158,7 @@
</packing>
</child>
<child>
<object class="GtkComboBox" id="23">
<object class="swlo:SwNumberingTypeListBox" id="numbering">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
......@@ -170,7 +170,7 @@
</packing>
</child>
<child>
<object class="GtkComboBox" id="142">
<object class="GtkComboBox" id="charstyle">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
......@@ -182,7 +182,7 @@
</packing>
</child>
<child>
<object class="GtkSpinButton" id="109">
<object class="GtkSpinButton" id="sublevelsnf">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
......@@ -197,7 +197,7 @@
</packing>
</child>
<child>
<object class="GtkEntry" id="137">
<object class="GtkEntry" id="prefix">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
......@@ -211,7 +211,7 @@
</packing>
</child>
<child>
<object class="GtkEntry" id="135">
<object class="GtkEntry" id="suffix">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
......@@ -225,7 +225,7 @@
</packing>
</child>
<child>
<object class="GtkSpinButton" id="41">
<object class="GtkSpinButton" id="startat">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
......@@ -244,7 +244,7 @@
<property name="can_focus">False</property>
<property name="left_padding">20</property>
<child>
<object class="GtkLabel" id="136">
<object class="GtkLabel" id="label8">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
......@@ -265,7 +265,7 @@
<property name="can_focus">False</property>
<property name="left_padding">20</property>
<child>
<object class="GtkLabel" id="134">
<object class="GtkLabel" id="label9">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
......@@ -281,7 +281,7 @@
</packing>
</child>
<child>
<object class="GtkLabel" id="40">
<object class="GtkLabel" id="label10">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
......@@ -309,7 +309,7 @@
</packing>
</child>
<child>
<object class="GtkDrawingArea" id="132">
<object class="swuilo:NumberingPreview" id="preview">
<property name="width_request">150</property>
<property name="height_request">300</property>
<property name="visible">True</property>
......@@ -326,7 +326,7 @@
</object>
</child>
<child type="label">
<object class="GtkLabel" id="30">
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Numbering</property>
......
sw/uiconfig/swriter/ui/numberingpositionpage.ui → sw/uiconfig/swriter/ui/outlinepositionpage.ui
Dosyayı görüntüle @ 84fd33b7
......@@ -12,7 +12,7 @@
<property name="step_increment">0.050000000000000003</property>
<property name="page_increment">10</property>
</object>
<object class="GtkBox" id="NumberingPositionPage">
<object class="GtkBox" id="OutlinePositionPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">10</property>
......
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