avmedia/source/framework/mediacontrol.hrc | 1
avmedia/source/framework/mediacontrol.src | 92 +++++++++++++++---------------
avmedia/source/viewer/mediawindow.src | 16 ++---
default_images/sfx2/res/closedoc.png |binary
4 files changed, 58 insertions(+), 51 deletions(-)
New commits:
commit af6fe636711841e1ebe22d7aa0c5a3712e5dcb09
Author: Matthias Seidel <msei...@apache.org>
AuthorDate: Sun Apr 21 10:16:51 2019 +0000
Commit: Matthias Seidel <msei...@apache.org>
CommitDate: Sun Apr 21 10:16:51 2019 +0000
Updated graphic
diff --git a/default_images/sfx2/res/closedoc.png
b/default_images/sfx2/res/closedoc.png
index 410982a21b05..875b59190e6b 100644
Binary files a/default_images/sfx2/res/closedoc.png and
b/default_images/sfx2/res/closedoc.png differ
commit 4820583166d892919fad9efea65288915fac1526
Author: Matthias Seidel <msei...@apache.org>
AuthorDate: Sun Apr 21 10:16:02 2019 +0000
Commit: Matthias Seidel <msei...@apache.org>
CommitDate: Sun Apr 21 10:16:02 2019 +0000
Cleaned up files for media controls, re-added entries for maskcolor
diff --git a/avmedia/source/framework/mediacontrol.hrc
b/avmedia/source/framework/mediacontrol.hrc
index 6cd2a18d04cc..efbe71bf1891 100644
--- a/avmedia/source/framework/mediacontrol.hrc
+++ b/avmedia/source/framework/mediacontrol.hrc
@@ -47,3 +47,4 @@
#define AVMEDIA_IMGLST_HC 3073
#define AVMEDIA_IMGLST_L 3074
#define AVMEDIA_IMGLST_L_HC 3075
+
diff --git a/avmedia/source/framework/mediacontrol.src
b/avmedia/source/framework/mediacontrol.src
index 4074be8d2a3b..43c8b72c2368 100644
--- a/avmedia/source/framework/mediacontrol.src
+++ b/avmedia/source/framework/mediacontrol.src
@@ -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
diff --git a/avmedia/source/viewer/mediawindow.src
b/avmedia/source/viewer/mediawindow.src
index 479d2780eecd..2564161a2459 100644
--- a/avmedia/source/viewer/mediawindow.src
+++ b/avmedia/source/viewer/mediawindow.src
@@ -25,42 +25,42 @@
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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
