You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2019/07/21 11:59:22 UTC
svn commit: r1863520 - in /openoffice/trunk/main: default_images/sw/res/
ooo_custom_images/classic/ packimages/pack/ sw/source/ui/ribbar/
Author: mseidel
Date: Sun Jul 21 11:59:22 2019
New Revision: 1863520
URL: http://svn.apache.org/viewvc?rev=1863520&view=rev
Log:
Rename graphics (punkt->point), general cleanup
Added:
openoffice/trunk/main/default_images/sw/res/point.png (with props)
openoffice/trunk/main/default_images/sw/res/point_h.png (with props)
Removed:
openoffice/trunk/main/default_images/sw/res/punkt.png
openoffice/trunk/main/default_images/sw/res/punkt_h.png
Modified:
openoffice/trunk/main/ooo_custom_images/classic/classic_images.tar.gz
openoffice/trunk/main/packimages/pack/image-sort.lst
openoffice/trunk/main/sw/source/ui/ribbar/workctrl.src
Added: openoffice/trunk/main/default_images/sw/res/point.png
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/default_images/sw/res/point.png?rev=1863520&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/trunk/main/default_images/sw/res/point.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/trunk/main/default_images/sw/res/point_h.png
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/default_images/sw/res/point_h.png?rev=1863520&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/trunk/main/default_images/sw/res/point_h.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Modified: openoffice/trunk/main/ooo_custom_images/classic/classic_images.tar.gz
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/ooo_custom_images/classic/classic_images.tar.gz?rev=1863520&r1=1863519&r2=1863520&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/trunk/main/packimages/pack/image-sort.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/packimages/pack/image-sort.lst?rev=1863520&r1=1863519&r2=1863520&view=diff
==============================================================================
--- openoffice/trunk/main/packimages/pack/image-sort.lst (original)
+++ openoffice/trunk/main/packimages/pack/image-sort.lst Sun Jul 21 11:59:22 2019
@@ -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
Modified: openoffice/trunk/main/sw/source/ui/ribbar/workctrl.src
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/ribbar/workctrl.src?rev=1863520&r1=1863519&r2=1863520&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/ribbar/workctrl.src (original)
+++ openoffice/trunk/main/sw/source/ui/ribbar/workctrl.src Sun Jul 21 11:59:22 2019
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,16 +7,16 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -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,30 +91,30 @@ Menu RID_INSERT_FIELD_CTRL
};
};
};
-#define SCROLL_IMAGE_IDLIST \
- IdList = \
- { \
- NID_NEXT ; \
- NID_PREV ; \
- NID_TBL ; \
- NID_FRM ; \
- NID_PGE ; \
- NID_DRW ; \
- NID_CTRL ; \
- NID_REG ; \
- NID_BKM ; \
- NID_GRF ; \
- NID_OLE ; \
- NID_OUTL ; \
- NID_SEL ; \
- NID_FTN ; \
- NID_MARK ; \
- NID_POSTIT ; \
- NID_SRCH_REP ; \
- NID_INDEX_ENTRY; \
- NID_TABLE_FORMULA; \
- NID_TABLE_FORMULA_ERROR; \
- }; \
+#define SCROLL_IMAGE_IDLIST \
+ IdList = \
+ { \
+ NID_NEXT ; \
+ NID_PREV ; \
+ NID_TBL ; \
+ NID_FRM ; \
+ NID_PGE ; \
+ NID_DRW ; \
+ NID_CTRL ; \
+ NID_REG ; \
+ NID_BKM ; \
+ NID_GRF ; \
+ NID_OLE ; \
+ NID_OUTL ; \
+ NID_SEL ; \
+ NID_FTN ; \
+ NID_MARK ; \
+ NID_POSTIT ; \
+ NID_SRCH_REP ; \
+ NID_INDEX_ENTRY ; \
+ NID_TABLE_FORMULA ; \
+ NID_TABLE_FORMULA_ERROR ; \
+ }; \
IdCount = { 20 ; };
FloatingWindow RID_SCROLL_NAVIGATION_WIN
@@ -126,27 +126,27 @@ FloatingWindow RID_SCROLL_NAVIGATION_WIN
HelpID = HID_INSERT_CTRL ;
ImageList IL_VALUES
{
- Prefix = "sr";
- MaskColor = IMAGE_MASK_COLOR ;
- SCROLL_IMAGE_IDLIST
- };
- ImageList ILH_VALUES
- {
- Prefix = "srh";
- MaskColor = IMAGE_MASK_COLOR ;
- SCROLL_IMAGE_IDLIST
- };
- FixedLine FL_SEP
- {
- //no position, no text
- Size = MAP_APPFONT ( 20 , 4 ) ;
- };
- FixedText FI_INFO
- {
- //no position, no text
- Size = MAP_APPFONT ( 20 , 8 ) ;
- Center = TRUE;
- };
+ Prefix = "sr" ;
+ MaskColor = IMAGE_MASK_COLOR ;
+ SCROLL_IMAGE_IDLIST
+ };
+ ImageList ILH_VALUES
+ {
+ Prefix = "srh" ;
+ MaskColor = IMAGE_MASK_COLOR ;
+ SCROLL_IMAGE_IDLIST
+ };
+ FixedLine FL_SEP
+ {
+ //no position, no text
+ Size = MAP_APPFONT ( 20, 4 ) ;
+ };
+ FixedText FI_INFO
+ {
+ //no position, no text
+ Size = MAP_APPFONT ( 20, 8 ) ;
+ Center = TRUE ;
+ };
String ST_TBL
{
Text [ en-US ] = "Table" ;
@@ -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 : Funote */
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 Funote */
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 Funote */
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,26 +418,26 @@ ImageButton BTN_NAVI
SmallStyle = TRUE ;
Image IMG_BTN
{
- ImageBitmap = Bitmap { File = "punkt.bmp" ; };
- MaskColor = IMAGE_MASK_COLOR ;
- };
- Image IMG_BTN_H
- {
- ImageBitmap = Bitmap { File = "punkt_h.bmp" ; };
- MaskColor = IMAGE_MASK_COLOR ;
- };
- String ST_QUICK
+ ImageBitmap = Bitmap { File = "point.png" ; } ;
+ };
+ Image IMG_BTN_H
+ {
+ ImageBitmap = Bitmap { File = "point_h.png" ; } ;
+ };
+ String ST_QUICK
{
Text [ en-US ] = "Navigation" ;
};
};
ComboBox RID_PVIEW_ZOOM_LB
{
- HelpId = HID_PVIEW_ZOOM_LB;
- Size = MAP_APPFONT ( 30 , 86 ) ;
- DropDown = TRUE ;
- AutoHScroll = TRUE ;
- DDExtraWidth = TRUE ;
- Border = TRUE ;
- Hide = TRUE ;
+ HelpId = HID_PVIEW_ZOOM_LB ;
+ Size = MAP_APPFONT ( 30, 86 ) ;
+ DropDown = TRUE ;
+ AutoHScroll = TRUE ;
+ DDExtraWidth = TRUE ;
+ Border = TRUE ;
+ Hide = TRUE ;
};
+
+// ********************************************************************** EOF