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/04/21 10:22:26 UTC
svn commit: r1857902 - in /openoffice/branches/AOO42X: ./
main/avmedia/source/framework/ main/avmedia/source/viewer/
main/default_images/avmedia/res/
Author: mseidel
Date: Sun Apr 21 10:22:26 2019
New Revision: 1857902
URL: http://svn.apache.org/viewvc?rev=1857902&view=rev
Log:
Merged r1857877, r1857878 and r1857899 from trunk
- Converted remaining AV graphics from indexed color to RGB
- Cleaned up resource file for media controls, removed entries for maskcolor
- Cleaned up files for media controls, re-added entries for maskcolor
Modified:
openoffice/branches/AOO42X/ (props changed)
openoffice/branches/AOO42X/main/avmedia/source/framework/mediacontrol.hrc
openoffice/branches/AOO42X/main/avmedia/source/framework/mediacontrol.src
openoffice/branches/AOO42X/main/avmedia/source/viewer/mediawindow.src
openoffice/branches/AOO42X/main/default_images/avmedia/res/avlh02053.png
openoffice/branches/AOO42X/main/default_images/avmedia/res/avlh02054.png
Propchange: openoffice/branches/AOO42X/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 21 10:22:26 2019
@@ -9,4 +9,4 @@
/openoffice/branches/ia2:1417739-1541842
/openoffice/branches/ooxml-osba:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
/openoffice/branches/rejuvenate01:1480411,1534063,1534098,1536312,1549902,1560617
-/openoffice/trunk:1851110-1851111,1851115,1851118,1851121,1851206,1851214-1851215,1851443,1851449,1851464,1851575,1851634,1851637,1851639,1851715,1851753,1851813,1851987,1852008,1852010,1852029,1852046,1852174,1852187,1852190,1852197,1852430,1852438,1852623-1852624,1852841,1852965,1853175,1853245,1853252,1853285-1853286,1853299,1853319,1853327,1853443-1853444,1853456,1853466,1853504,1853558,1853643,1853668,1853670,1853726,1853742,1853972,1853976,1854051,1854065,1854176,1854196,1854324-1854325,1854473,1854519,1854740,1854788,1854852,1854933,1855053,1855140,1855181,1855246,1855509,1855523,1855617,1855647,1855649,1855778,1855813,1855926,1855947,1856034,1856079,1856113,1856224,1856555,1856677,1856833,1856899,1857186,1857302,1857311,1857450-1857451
+/openoffice/trunk:1851110-1851111,1851115,1851118,1851121,1851206,1851214-1851215,1851443,1851449,1851464,1851575,1851634,1851637,1851639,1851715,1851753,1851813,1851987,1852008,1852010,1852029,1852046,1852174,1852187,1852190,1852197,1852430,1852438,1852623-1852624,1852841,1852965,1853175,1853245,1853252,1853285-1853286,1853299,1853319,1853327,1853443-1853444,1853456,1853466,1853504,1853558,1853643,1853668,1853670,1853726,1853742,1853972,1853976,1854051,1854065,1854176,1854196,1854324-1854325,1854473,1854519,1854740,1854788,1854852,1854933,1855053,1855140,1855181,1855246,1855509,1855523,1855617,1855647,1855649,1855778,1855813,1855926,1855947,1856034,1856079,1856113,1856224,1856555,1856677,1856833,1856899,1857186,1857302,1857311,1857450-1857451,1857877-1857878,1857899
Modified: openoffice/branches/AOO42X/main/avmedia/source/framework/mediacontrol.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/avmedia/source/framework/mediacontrol.hrc?rev=1857902&r1=1857901&r2=1857902&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/avmedia/source/framework/mediacontrol.hrc (original)
+++ openoffice/branches/AOO42X/main/avmedia/source/framework/mediacontrol.hrc Sun Apr 21 10:22:26 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,43 +7,44 @@
* 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.
- *
+ *
*************************************************************/
-
-
-#define AVMEDIA_STR_PLAY 1024
-#define AVMEDIA_STR_PAUSE 1025
-#define AVMEDIA_STR_STOP 1026
-#define AVMEDIA_STR_ENDLESS 1027
-#define AVMEDIA_STR_ZOOM 1028
-#define AVMEDIA_STR_ZOOM_50 1029
-#define AVMEDIA_STR_ZOOM_100 1030
-#define AVMEDIA_STR_ZOOM_200 1031
-#define AVMEDIA_STR_ZOOM_FIT 1032
-#define AVMEDIA_STR_MUTE 1033
-#define AVMEDIA_STR_OPEN 1034
-#define AVMEDIA_STR_INSERT 1035
-#define AVMEDIA_STR_MEDIAPLAYER 1036
-
-#define AVMEDIA_IMG_OPEN 2048
-#define AVMEDIA_IMG_PLAY 2049
-#define AVMEDIA_IMG_PAUSE 2050
-#define AVMEDIA_IMG_STOP 2051
-#define AVMEDIA_IMG_ENDLESS 2052
-#define AVMEDIA_IMG_INSERT 2053
-#define AVMEDIA_IMG_MUTE 2054
+
+
+#define AVMEDIA_STR_PLAY 1024
+#define AVMEDIA_STR_PAUSE 1025
+#define AVMEDIA_STR_STOP 1026
+#define AVMEDIA_STR_ENDLESS 1027
+#define AVMEDIA_STR_ZOOM 1028
+#define AVMEDIA_STR_ZOOM_50 1029
+#define AVMEDIA_STR_ZOOM_100 1030
+#define AVMEDIA_STR_ZOOM_200 1031
+#define AVMEDIA_STR_ZOOM_FIT 1032
+#define AVMEDIA_STR_MUTE 1033
+#define AVMEDIA_STR_OPEN 1034
+#define AVMEDIA_STR_INSERT 1035
+#define AVMEDIA_STR_MEDIAPLAYER 1036
+
+#define AVMEDIA_IMG_OPEN 2048
+#define AVMEDIA_IMG_PLAY 2049
+#define AVMEDIA_IMG_PAUSE 2050
+#define AVMEDIA_IMG_STOP 2051
+#define AVMEDIA_IMG_ENDLESS 2052
+#define AVMEDIA_IMG_INSERT 2053
+#define AVMEDIA_IMG_MUTE 2054
#define AVMEDIA_IMGLST 3072
#define AVMEDIA_IMGLST_HC 3073
#define AVMEDIA_IMGLST_L 3074
#define AVMEDIA_IMGLST_L_HC 3075
+
Modified: openoffice/branches/AOO42X/main/avmedia/source/framework/mediacontrol.src
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/avmedia/source/framework/mediacontrol.src?rev=1857902&r1=1857901&r2=1857902&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/avmedia/source/framework/mediacontrol.src (original)
+++ openoffice/branches/AOO42X/main/avmedia/source/framework/mediacontrol.src Sun Apr 21 10:22:26 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,25 +7,25 @@
* 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.
- *
+ *
*************************************************************/
-
+
#include "mediacontrol.hrc"
String AVMEDIA_STR_OPEN
{
- Text[en-US] = "Open";
+ Text [ en-US ] = "Open" ;
};
// ------------------------------------------------------------------------------
@@ -39,151 +39,153 @@ String AVMEDIA_STR_INSERT
String AVMEDIA_STR_PLAY
{
- Text[en-US] = "Play";
+ Text [ en-US ] = "Play" ;
};
// ------------------------------------------------------------------------------
String AVMEDIA_STR_PAUSE
{
- Text[en-US] = "Pause";
+ Text [ en-US ] = "Pause" ;
};
// ------------------------------------------------------------------------------
-String AVMEDIA_STR_STOP
+String AVMEDIA_STR_STOP
{
- Text[en-US] = "Stop";
+ Text [ en-US ] = "Stop" ;
};
// ------------------------------------------------------------------------------
-String AVMEDIA_STR_ENDLESS
+String AVMEDIA_STR_ENDLESS
{
- Text[en-US] = "Repeat";
+ Text [ en-US ] = "Repeat" ;
};
// ------------------------------------------------------------------------------
String AVMEDIA_STR_MUTE
{
- Text[en-US] = "Mute";
+ Text [ en-US ] = "Mute" ;
};
// ------------------------------------------------------------------------------
-String AVMEDIA_STR_ZOOM
+String AVMEDIA_STR_ZOOM
{
- Text[en-US] = "View";
+ Text [ en-US ] = "View" ;
};
// ------------------------------------------------------------------------------
-String AVMEDIA_STR_ZOOM_50
+String AVMEDIA_STR_ZOOM_50
{
- Text[en-US] = "50 %";
+ Text [ en-US ] = "50 %" ;
};
// ------------------------------------------------------------------------------
-String AVMEDIA_STR_ZOOM_100
+String AVMEDIA_STR_ZOOM_100
{
- Text[en-US] = "100 %";
+ Text [ en-US ] = "100 %" ;
};
// ------------------------------------------------------------------------------
-String AVMEDIA_STR_ZOOM_200
+String AVMEDIA_STR_ZOOM_200
{
- Text[en-US] = "200 %";
+ Text [ en-US ] = "200 %" ;
};
// ------------------------------------------------------------------------------
-String AVMEDIA_STR_ZOOM_FIT
+String AVMEDIA_STR_ZOOM_FIT
{
- Text[en-US] = "Scaled";
+ Text [ en-US ] = "Scaled" ;
};
// ------------------------------------------------------------------------------
String AVMEDIA_STR_MEDIAPLAYER
{
- Text[en-US] = "Media Player";
+ Text [ en-US ] = "Media Player" ;
};
// ------------------------------------------------------------------------------
ImageList AVMEDIA_IMGLST
{
- Prefix = "av";
+ Prefix = "av" ;
MaskColor = Color{ Red = 0xff00; Green = 0x0000; Blue = 0xff00; };
IdList =
{
- AVMEDIA_IMG_OPEN;
- AVMEDIA_IMG_PLAY;
- AVMEDIA_IMG_PAUSE;
- AVMEDIA_IMG_STOP;
- AVMEDIA_IMG_ENDLESS;
- AVMEDIA_IMG_INSERT;
- AVMEDIA_IMG_MUTE;
+ AVMEDIA_IMG_OPEN ;
+ AVMEDIA_IMG_PLAY ;
+ AVMEDIA_IMG_PAUSE ;
+ AVMEDIA_IMG_STOP ;
+ AVMEDIA_IMG_ENDLESS ;
+ AVMEDIA_IMG_INSERT ;
+ AVMEDIA_IMG_MUTE ;
};
- IdCount = 7;
+ IdCount = 7 ;
};
// ------------------------------------------------------------------------------
ImageList AVMEDIA_IMGLST_L
{
- Prefix = "avl";
+ Prefix = "avl" ;
MaskColor = Color{ Red = 0xff00; Green = 0x0000; Blue = 0xff00; };
IdList =
{
- AVMEDIA_IMG_OPEN;
- AVMEDIA_IMG_PLAY;
- AVMEDIA_IMG_PAUSE;
- AVMEDIA_IMG_STOP;
- AVMEDIA_IMG_ENDLESS;
- AVMEDIA_IMG_INSERT;
- AVMEDIA_IMG_MUTE;
+ AVMEDIA_IMG_OPEN ;
+ AVMEDIA_IMG_PLAY ;
+ AVMEDIA_IMG_PAUSE ;
+ AVMEDIA_IMG_STOP ;
+ AVMEDIA_IMG_ENDLESS ;
+ AVMEDIA_IMG_INSERT ;
+ AVMEDIA_IMG_MUTE ;
};
- IdCount = 7;
+ IdCount = 7 ;
};
// ------------------------------------------------------------------------------
ImageList AVMEDIA_IMGLST_HC
{
- Prefix = "avh";
+ Prefix = "avh" ;
MaskColor = Color{ Red = 0xff00; Green = 0x0000; Blue = 0xff00; };
IdList =
{
- AVMEDIA_IMG_OPEN;
- AVMEDIA_IMG_PLAY;
- AVMEDIA_IMG_PAUSE;
- AVMEDIA_IMG_STOP;
- AVMEDIA_IMG_ENDLESS;
- AVMEDIA_IMG_INSERT;
- AVMEDIA_IMG_MUTE;
+ AVMEDIA_IMG_OPEN ;
+ AVMEDIA_IMG_PLAY ;
+ AVMEDIA_IMG_PAUSE ;
+ AVMEDIA_IMG_STOP ;
+ AVMEDIA_IMG_ENDLESS ;
+ AVMEDIA_IMG_INSERT ;
+ AVMEDIA_IMG_MUTE ;
};
- IdCount = 7;
+ IdCount = 7 ;
};
// ------------------------------------------------------------------------------
ImageList AVMEDIA_IMGLST_L_HC
{
- Prefix = "avlh";
+ Prefix = "avlh" ;
MaskColor = Color{ Red = 0xff00; Green = 0x0000; Blue = 0xff00; };
IdList =
{
- AVMEDIA_IMG_OPEN;
- AVMEDIA_IMG_PLAY;
- AVMEDIA_IMG_PAUSE;
- AVMEDIA_IMG_STOP;
- AVMEDIA_IMG_ENDLESS;
- AVMEDIA_IMG_INSERT;
- AVMEDIA_IMG_MUTE;
+ AVMEDIA_IMG_OPEN ;
+ AVMEDIA_IMG_PLAY ;
+ AVMEDIA_IMG_PAUSE ;
+ AVMEDIA_IMG_STOP ;
+ AVMEDIA_IMG_ENDLESS ;
+ AVMEDIA_IMG_INSERT ;
+ AVMEDIA_IMG_MUTE ;
};
- IdCount = 7;
+ IdCount = 7 ;
};
+
+// ********************************************************************** EOF
Modified: openoffice/branches/AOO42X/main/avmedia/source/viewer/mediawindow.src
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/avmedia/source/viewer/mediawindow.src?rev=1857902&r1=1857901&r2=1857902&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/avmedia/source/viewer/mediawindow.src (original)
+++ openoffice/branches/AOO42X/main/avmedia/source/viewer/mediawindow.src Sun Apr 21 10:22:26 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,60 +7,60 @@
* 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.
- *
+ *
*************************************************************/
-
+
#include "mediawindow.hrc"
String AVMEDIA_STR_INSERTMEDIA_DLG
{
- Text[en-US] = "Insert Movie and Sound";
+ Text [ en-US ] = "Insert Movie and Sound" ;
};
// ------------------------------------------------------------------------------
STRING AVMEDIA_STR_OPENMEDIA_DLG
{
- Text[en-US] = "Open Movie and Sound";
+ Text [ en-US ] = "Open Movie and Sound" ;
};
// ------------------------------------------------------------------------------
String AVMEDIA_STR_ALL_MEDIAFILES
{
- Text[en-US] = "All movie and sound files";
+ Text [ en-US ] = "All movie and sound files" ;
};
// ------------------------------------------------------------------------------
String AVMEDIA_STR_ALL_FILES
{
- Text[en-US] = "All files (*.*)";
+ Text [ en-US ] = "All files (*.*)" ;
};
// ------------------------------------------------------------------------------
Bitmap AVMEDIA_BMP_AUDIOLOGO
{
- file = "avaudiologo.png";
+ file = "avaudiologo.png" ;
};
// ------------------------------------------------------------------------------
Bitmap AVMEDIA_BMP_EMPTYLOGO
{
- file = "avemptylogo.png";
+ file = "avemptylogo.png" ;
};
// ------------------------------------------------------------------------------
@@ -69,5 +69,7 @@ ErrorBox AVMEDIA_ERR_URL
{
BUTTONS = WB_OK ;
DEFBUTTON = WB_DEF_OK ;
- Message[en-US] = "The format of the selected file is not supported.";
+ Message [ en-US ] = "The format of the selected file is not supported." ;
};
+
+// ********************************************************************** EOF
Modified: openoffice/branches/AOO42X/main/default_images/avmedia/res/avlh02053.png
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/default_images/avmedia/res/avlh02053.png?rev=1857902&r1=1857901&r2=1857902&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/AOO42X/main/default_images/avmedia/res/avlh02054.png
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/default_images/avmedia/res/avlh02054.png?rev=1857902&r1=1857901&r2=1857902&view=diff
==============================================================================
Binary files - no diff available.