[Libreoffice-commits] core.git: Branch 'aoo/trunk' - default_images/sw ooo_custom_images/classic packimages/pack sw/source
Matthias Seidel (via logerrit)
logerrit at kemper.freedesktop.org
Sun Jul 21 12:08:32 UTC 2019
ooo_custom_images/classic/classic_images.tar.gz |binary
packimages/pack/image-sort.lst | 10 +--
sw/source/ui/ribbar/workctrl.src | 80 +++++++++---------------
3 files changed, 35 insertions(+), 55 deletions(-)
New commits:
commit 732a62d93c84fc8d403c7d252f210b5173c4be9d
Author: Matthias Seidel <mseidel at apache.org>
AuthorDate: Sun Jul 21 11:59:22 2019 +0000
Commit: Matthias Seidel <mseidel at apache.org>
CommitDate: Sun Jul 21 11:59:22 2019 +0000
Rename graphics (punkt->point), general cleanup
diff --git a/default_images/sw/res/punkt.png b/default_images/sw/res/point.png
similarity index 100%
rename from default_images/sw/res/punkt.png
rename to default_images/sw/res/point.png
diff --git a/default_images/sw/res/punkt_h.png b/default_images/sw/res/point_h.png
similarity index 100%
rename from default_images/sw/res/punkt_h.png
rename to default_images/sw/res/point_h.png
diff --git a/ooo_custom_images/classic/classic_images.tar.gz b/ooo_custom_images/classic/classic_images.tar.gz
index d01e3879e387..425e06fcabb7 100644
Binary files a/ooo_custom_images/classic/classic_images.tar.gz and b/ooo_custom_images/classic/classic_images.tar.gz differ
diff --git a/packimages/pack/image-sort.lst b/packimages/pack/image-sort.lst
index d7a615be3bda..b66eeaf55de4 100644
--- a/packimages/pack/image-sort.lst
+++ b/packimages/pack/image-sort.lst
@@ -1,9 +1,9 @@
#
# This file exists to help improve the ordering of
-# icons inside the OO.o theme / images.zip file.
+# icons inside the AOO theme / images.zip file.
#
# Sections are processed together, and are delimited
-# by '-- <tag> [small]' a 'group' tage denotes equal
+# by '-- <tag> [small]' a 'group' tag denotes equal
# importance: icons must be interleaved, 'ordered'
# denotes a simple best-fit order. 'literal' denotes
# a list of explicit image loads
@@ -11,8 +11,8 @@
res/mainapp_16.png
res/mainapp_32.png
-sw/res/punkt.png
-sw/res/punkt_h.png
+sw/res/point.png
+sw/res/point_h.png
res/sx03251.png
res/lx03251.png
@@ -46,7 +46,7 @@ svtools/res/bmpfont.png
svtools/res/scalfont.png
svx/res/signet_11x16.png
svx/res/caution_11x16.png
-svx/res/notcertificate_16.png
+svx/res/notcertificate_11x16.png
res/sc10223.png
res/sc10224.png
res/sx03250.png
diff --git a/sw/source/ui/ribbar/workctrl.src b/sw/source/ui/ribbar/workctrl.src
index aa3321fd4294..b0e21b0b4ba1 100644
--- a/sw/source/ui/ribbar/workctrl.src
+++ b/sw/source/ui/ribbar/workctrl.src
@@ -47,7 +47,7 @@ Menu RID_INSERT_FIELD_CTRL
HelpId = CMD_FN_INSERT_FLD_TIME ;
Text [ en-US ] = "Time" ;
};
- //#ifndef MN_SW_WEB
+ //#ifndef MN_SW_WEB
MenuItem
{
Identifier = FN_INSERT_FLD_PGNUMBER ;
@@ -72,7 +72,7 @@ Menu RID_INSERT_FIELD_CTRL
HelpId = CMD_FN_INSERT_FLD_TITLE ;
Text [ en-US ] = "Title" ;
};
- //#endif
+ //#endif
MenuItem
{
Identifier = FN_INSERT_FLD_AUTHOR ;
@@ -91,7 +91,7 @@ Menu RID_INSERT_FIELD_CTRL
};
};
};
-#define SCROLL_IMAGE_IDLIST \
+#define SCROLL_IMAGE_IDLIST \
IdList = \
{ \
NID_NEXT ; \
@@ -111,9 +111,9 @@ Menu RID_INSERT_FIELD_CTRL
NID_MARK ; \
NID_POSTIT ; \
NID_SRCH_REP ; \
- NID_INDEX_ENTRY; \
- NID_TABLE_FORMULA; \
- NID_TABLE_FORMULA_ERROR; \
+ NID_INDEX_ENTRY ; \
+ NID_TABLE_FORMULA ; \
+ NID_TABLE_FORMULA_ERROR ; \
}; \
IdCount = { 20 ; };
@@ -126,26 +126,26 @@ FloatingWindow RID_SCROLL_NAVIGATION_WIN
HelpID = HID_INSERT_CTRL ;
ImageList IL_VALUES
{
- Prefix = "sr";
+ Prefix = "sr" ;
MaskColor = IMAGE_MASK_COLOR ;
SCROLL_IMAGE_IDLIST
};
ImageList ILH_VALUES
{
- Prefix = "srh";
+ Prefix = "srh" ;
MaskColor = IMAGE_MASK_COLOR ;
SCROLL_IMAGE_IDLIST
};
FixedLine FL_SEP
{
//no position, no text
- Size = MAP_APPFONT ( 20 , 4 ) ;
+ Size = MAP_APPFONT ( 20, 4 ) ;
};
FixedText FI_INFO
{
//no position, no text
- Size = MAP_APPFONT ( 20 , 8 ) ;
- Center = TRUE;
+ Size = MAP_APPFONT ( 20, 8 ) ;
+ Center = TRUE ;
};
String ST_TBL
{
@@ -185,7 +185,6 @@ FloatingWindow RID_SCROLL_NAVIGATION_WIN
};
String ST_OUTL
{
- /* ### ACHTUNG: Neuer Text in Resource? Überschrift : šberschrift */
Text [ en-US ] = "Headings" ;
};
String ST_SEL
@@ -194,7 +193,6 @@ FloatingWindow RID_SCROLL_NAVIGATION_WIN
};
String ST_FTN
{
- /* ### ACHTUNG: Neuer Text in Resource? Fußnote : Fu˜note */
Text [ en-US ] = "Footnote" ;
};
String ST_MARK
@@ -211,15 +209,15 @@ FloatingWindow RID_SCROLL_NAVIGATION_WIN
};
String ST_INDEX_ENTRY
{
- Text [ en-US ] = "Index entry";
+ Text [ en-US ] = "Index entry" ;
};
String ST_TABLE_FORMULA
{
- Text [ en-US ] = "Table formula";
+ Text [ en-US ] = "Table formula" ;
};
String ST_TABLE_FORMULA_ERROR
{
- Text [ en-US ] = "Wrong table formula";
+ Text [ en-US ] = "Wrong table formula" ;
};
Text [ en-US ] = "Navigation" ;
};
@@ -227,22 +225,22 @@ FloatingWindow RID_SCROLL_NAVIGATION_WIN
Noch ein paar Reserven
ToolBoxItem
{
- Identifier = NID_NEXT;
+ Identifier = NID_NEXT;
Text = "Vorwärts" ;
};
ToolBoxItem
{
- Identifier = NID_PREV;
+ Identifier = NID_PREV;
Text = "Rückwärts" ;
};
ToolBoxItem
{
- Identifier = NID_CTRL;
+ Identifier = NID_CTRL;
Text = "Control" ;
};
ToolBoxItem
{
- Identifier = NID_DRW;
+ Identifier = NID_DRW;
Text = "Zeichenobjekt" ;
};
@@ -261,73 +259,58 @@ String STR_IMGBTN_PREV_DOWN
};
String STR_IMGBTN_TBL_DOWN
{
- /* ### ACHTUNG: Neuer Text in Resource? Nächste Tabelle : Nõchste Tabelle */
Text [ en-US ] = "Next table" ;
};
String STR_IMGBTN_FRM_DOWN
{
- /* ### ACHTUNG: Neuer Text in Resource? Nächster Textrahmen : Nõchster Textrahmen */
Text [ en-US ] = "Next text frame" ;
};
String STR_IMGBTN_PGE_DOWN
{
- /* ### ACHTUNG: Neuer Text in Resource? Nächste Seite : Nõchste Seite */
Text [ en-US ] = "Next page" ;
};
String STR_IMGBTN_DRW_DOWN
{
- /* ### ACHTUNG: Neuer Text in Resource? Nächstes Zeichenobjekt : Nõchstes Zeichenobjekt */
Text [ en-US ] = "Next drawing" ;
};
String STR_IMGBTN_CTRL_DOWN
{
- /* ### ACHTUNG: Neuer Text in Resource? Nächstes Kontrollfeld : Nõchstes Kontrollfeld */
Text [ en-US ] = "Next control" ;
};
String STR_IMGBTN_REG_DOWN
{
- /* ### ACHTUNG: Neuer Text in Resource? Nächster Bereich : Nõchster Bereich */
Text [ en-US ] = "Next section" ;
};
String STR_IMGBTN_BKM_DOWN
{
- /* ### ACHTUNG: Neuer Text in Resource? Nächste Textmarke : Nõchste Textmarke */
Text [ en-US ] = "Next bookmark" ;
};
String STR_IMGBTN_GRF_DOWN
{
- /* ### ACHTUNG: Neuer Text in Resource? Nächste Grafik : Nõchste Grafik */
Text [ en-US ] = "Next graphic" ;
};
String STR_IMGBTN_OLE_DOWN
{
- /* ### ACHTUNG: Neuer Text in Resource? Nächstes OLE-Objekt : Nächstes OLE object */
- /* ### ACHTUNG: Neuer Text in Resource? Nächstes OLE-Objekt : Nõchstes OLE-Objekt */
Text [ en-US ] = "Next OLE object" ;
};
String STR_IMGBTN_OUTL_DOWN
{
- /* ### ACHTUNG: Neuer Text in Resource? Nächste Überschrift : Nõchste šberschrift */
Text [ en-US ] = "Next heading" ;
};
String STR_IMGBTN_SEL_DOWN
{
- /* ### ACHTUNG: Neuer Text in Resource? Nächste Markierung : Nõchste Markierung */
Text [ en-US ] = "Next selection" ;
};
String STR_IMGBTN_FTN_DOWN
{
- /* ### ACHTUNG: Neuer Text in Resource? Nächste Fußnote : Nõchste Fu˜note */
Text [ en-US ] = "Next footnote" ;
};
String STR_IMGBTN_MARK_DOWN
{
- /* ### ACHTUNG: Neuer Text in Resource? Nächster Merker : Nõchster Merker */
Text [ en-US ] = "Next Reminder" ;
};
String STR_IMGBTN_POSTIT_DOWN
{
- /* ### ACHTUNG: Neuer Text in Resource? Nächste Notiz : Nõchste Notiz */
Text [ en-US ] = "Next Note" ;
};
String STR_IMGBTN_SRCH_REP_DOWN
@@ -336,7 +319,7 @@ String STR_IMGBTN_SRCH_REP_DOWN
};
String STR_IMGBTN_INDEX_ENTRY_DOWN
{
- Text [ en-US ] = "Next index entry";
+ Text [ en-US ] = "Next index entry" ;
};
String STR_IMGBTN_NEXT_UP
{
@@ -380,12 +363,10 @@ String STR_IMGBTN_GRF_UP
};
String STR_IMGBTN_OLE_UP
{
- /* ### ACHTUNG: Neuer Text in Resource? Voriges OLE-Objekt : Voriges OLE object */
Text [ en-US ] = "Previous OLE object" ;
};
String STR_IMGBTN_OUTL_UP
{
- /* ### ACHTUNG: Neuer Text in Resource? Vorige Überschrift : Vorige šberschrift */
Text [ en-US ] = "Previous heading" ;
};
String STR_IMGBTN_SEL_UP
@@ -394,7 +375,6 @@ String STR_IMGBTN_SEL_UP
};
String STR_IMGBTN_FTN_UP
{
- /* ### ACHTUNG: Neuer Text in Resource? Vorige Fußnote : Vorige Fu˜note */
Text [ en-US ] = "Previous footnote" ;
};
String STR_IMGBTN_MARK_UP
@@ -411,23 +391,23 @@ String STR_IMGBTN_SRCH_REP_UP
};
String STR_IMGBTN_INDEX_ENTRY_UP
{
- Text [ en-US ] = "Previous index entry";
+ Text [ en-US ] = "Previous index entry" ;
};
String STR_IMGBTN_TBLFML_UP
{
- Text [ en-US ] = "Previous table formula";
+ Text [ en-US ] = "Previous table formula" ;
};
String STR_IMGBTN_TBLFML_DOWN
{
- Text [ en-US ] = "Next table formula";
+ Text [ en-US ] = "Next table formula" ;
};
String STR_IMGBTN_TBLFML_ERR_UP
{
- Text [ en-US ] = "Previous faulty table formula";
+ Text [ en-US ] = "Previous faulty table formula" ;
};
String STR_IMGBTN_TBLFML_ERR_DOWN
{
- Text [ en-US ] = "Next faulty table formula";
+ Text [ en-US ] = "Next faulty table formula" ;
};
ImageButton BTN_NAVI
{
@@ -438,13 +418,11 @@ ImageButton BTN_NAVI
SmallStyle = TRUE ;
Image IMG_BTN
{
- ImageBitmap = Bitmap { File = "punkt.bmp" ; };
- MaskColor = IMAGE_MASK_COLOR ;
+ ImageBitmap = Bitmap { File = "point.png" ; } ;
};
Image IMG_BTN_H
{
- ImageBitmap = Bitmap { File = "punkt_h.bmp" ; };
- MaskColor = IMAGE_MASK_COLOR ;
+ ImageBitmap = Bitmap { File = "point_h.png" ; } ;
};
String ST_QUICK
{
@@ -453,11 +431,13 @@ ImageButton BTN_NAVI
};
ComboBox RID_PVIEW_ZOOM_LB
{
- HelpId = HID_PVIEW_ZOOM_LB;
- Size = MAP_APPFONT ( 30 , 86 ) ;
+ HelpId = HID_PVIEW_ZOOM_LB ;
+ Size = MAP_APPFONT ( 30, 86 ) ;
DropDown = TRUE ;
AutoHScroll = TRUE ;
DDExtraWidth = TRUE ;
Border = TRUE ;
Hide = TRUE ;
};
+
+// ********************************************************************** EOF
More information about the Libreoffice-commits
mailing list