Author: mseidel
Date: Sun Apr 21 10:16:02 2019
New Revision: 1857899
URL: http://svn.apache.org/viewvc?rev=1857899&view=rev
Log:
Cleaned up files for media controls, re-added entries for maskcolor
Modified:
openoffice/trunk/main/avmedia/source/framework/mediacontrol.hrc
openoffice/trunk/main/avmedia/source/framework/mediacontrol.src
openoffice/trunk/main/avmedia/source/viewer/mediawindow.src
Modified: openoffice/trunk/main/avmedia/source/framework/mediacontrol.hrc
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/avmedia/source/framework/mediacontrol.hrc?rev=1857899&r1=1857898&r2=1857899&view=diff
==============================================================================
--- openoffice/trunk/main/avmedia/source/framework/mediacontrol.hrc (original)
+++ openoffice/trunk/main/avmedia/source/framework/mediacontrol.hrc Sun Apr 21
10:16:02 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/trunk/main/avmedia/source/framework/mediacontrol.src
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/avmedia/source/framework/mediacontrol.src?rev=1857899&r1=1857898&r2=1857899&view=diff
==============================================================================
--- openoffice/trunk/main/avmedia/source/framework/mediacontrol.src (original)
+++ openoffice/trunk/main/avmedia/source/framework/mediacontrol.src Sun Apr 21
10:16:02 2019
@@ -25,7 +25,7 @@
String AVMEDIA_STR_OPEN
{
- Text [en-US] = "Open" ;
+ Text [ en-US ] = "Open" ;
};
//
------------------------------------------------------------------------------
@@ -39,77 +39,77 @@ 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
{
- Text [en-US] = "Stop" ;
+ Text [ en-US ] = "Stop" ;
};
//
------------------------------------------------------------------------------
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
{
- Text [en-US] = "View" ;
+ Text [ en-US ] = "View" ;
};
//
------------------------------------------------------------------------------
String AVMEDIA_STR_ZOOM_50
{
- Text [en-US] = "50 %" ;
+ Text [ en-US ] = "50 %" ;
};
//
------------------------------------------------------------------------------
String AVMEDIA_STR_ZOOM_100
{
- Text [en-US] = "100 %" ;
+ Text [ en-US ] = "100 %" ;
};
//
------------------------------------------------------------------------------
String AVMEDIA_STR_ZOOM_200
{
- Text [en-US] = "200 %" ;
+ Text [ en-US ] = "200 %" ;
};
//
------------------------------------------------------------------------------
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" ;
};
//
------------------------------------------------------------------------------
@@ -117,17 +117,18 @@ String AVMEDIA_STR_MEDIAPLAYER
ImageList AVMEDIA_IMGLST
{
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 ;
};
//
------------------------------------------------------------------------------
@@ -135,17 +136,18 @@ ImageList AVMEDIA_IMGLST
ImageList AVMEDIA_IMGLST_L
{
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 ;
};
//
------------------------------------------------------------------------------
@@ -153,17 +155,18 @@ ImageList AVMEDIA_IMGLST_L
ImageList AVMEDIA_IMGLST_HC
{
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 ;
};
//
------------------------------------------------------------------------------
@@ -171,17 +174,18 @@ ImageList AVMEDIA_IMGLST_HC
ImageList AVMEDIA_IMGLST_L_HC
{
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/trunk/main/avmedia/source/viewer/mediawindow.src
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/avmedia/source/viewer/mediawindow.src?rev=1857899&r1=1857898&r2=1857899&view=diff
==============================================================================
--- openoffice/trunk/main/avmedia/source/viewer/mediawindow.src (original)
+++ openoffice/trunk/main/avmedia/source/viewer/mediawindow.src Sun Apr 21
10:16:02 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
