[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sfx2/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Sat Jul 28 14:09:25 UTC 2018
sfx2/source/appl/newhelp.src | 212 ++++++++++++++++---------------------------
1 file changed, 83 insertions(+), 129 deletions(-)
New commits:
commit a3c6f1476a3d434bd4a209d80c748d5aeb281e5c
Author: Matthias Seidel <mseidel at apache.org>
AuthorDate: Sat Jul 28 12:54:44 2018 +0000
Commit: Matthias Seidel <mseidel at apache.org>
CommitDate: Sat Jul 28 12:54:44 2018 +0000
Cleaned up resource file for Help.
Removed entries for MASKCOLOR_MAGENTA.
The graphics were changed from BMP to PNG with transparency layer long ago. No need for masking a special color as transparent anymore.
diff --git a/sfx2/source/appl/newhelp.src b/sfx2/source/appl/newhelp.src
index 2adf3e2ec306..ec3ce3316c31 100644
--- a/sfx2/source/appl/newhelp.src
+++ b/sfx2/source/appl/newhelp.src
@@ -28,21 +28,21 @@
Window WIN_HELPINDEX
{
Hide = TRUE ;
- Size = MAP_APPFONT ( 120 , 200 ) ;
+ Size = MAP_APPFONT ( 120, 200 ) ;
DialogControl = TRUE;
ListBox LB_ACTIVE
{
HelpId = HID_HELP_LISTBOX;
Border = TRUE ;
DropDown = TRUE;
- Pos = MAP_APPFONT ( 3 , 3 ) ;
- Size = MAP_APPFONT ( 114 , 40 ) ;
+ Pos = MAP_APPFONT ( 3, 3 ) ;
+ Size = MAP_APPFONT ( 114, 40 ) ;
};
FixedLine FL_ACTIVE
{
Hide = True;
Pos = MAP_APPFONT ( 2, 19 ) ;
- Size = MAP_APPFONT ( 118 , 1 ) ;
+ Size = MAP_APPFONT ( 118, 1 ) ;
};
TabControl TC_INDEX
{
@@ -80,25 +80,25 @@ TabPage TP_HELP_INDEX
HelpId = HID_HELP_TABPAGE_INDEX;
Hide = TRUE ;
DialogControl = TRUE;
- Size = MAP_APPFONT ( 120 , 200 ) ;
+ Size = MAP_APPFONT ( 120, 200 ) ;
FixedText FT_EXPRESSION
{
- Pos = MAP_APPFONT ( 6 , 6 ) ;
- Size = MAP_APPFONT ( 108 , 10 ) ;
+ Pos = MAP_APPFONT ( 6, 6 ) ;
+ Size = MAP_APPFONT ( 108, 10 ) ;
Text [ en-US ] = "~Search term" ;
};
ComboBox CB_INDEX
{
HelpID = "sfx2:ComboBox:TP_HELP_INDEX:CB_INDEX";
Border = TRUE ;
- Pos = MAP_APPFONT ( 6 , 17 ) ;
- Size = MAP_APPFONT ( 108 , 97 ) ;
+ Pos = MAP_APPFONT ( 6, 17 ) ;
+ Size = MAP_APPFONT ( 108, 97 ) ;
};
PushButton PB_OPEN_INDEX
{
HelpID = "sfx2:PushButton:TP_HELP_INDEX:PB_OPEN_INDEX";
- Pos = MAP_APPFONT ( 64 , 115 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
+ Pos = MAP_APPFONT ( 64, 115 ) ;
+ Size = MAP_APPFONT ( 50, 14 ) ;
Text [ en-US ] = "~Display" ;
};
};
@@ -108,11 +108,11 @@ TabPage TP_HELP_SEARCH
HelpId = HID_HELP_TABPAGE_SEARCH;
Hide = TRUE ;
DialogControl = TRUE;
- Size = MAP_APPFONT ( 140 , 122 ) ;
+ Size = MAP_APPFONT ( 140, 122 ) ;
FixedText FT_SEARCH
{
- Pos = MAP_APPFONT ( 6 , 6 ) ;
- Size = MAP_APPFONT ( 128 , 10 ) ;
+ Pos = MAP_APPFONT ( 6, 6 ) ;
+ Size = MAP_APPFONT ( 128, 10 ) ;
Text [ en-US ] = "S~earch term" ;
};
ComboBox ED_SEARCH
@@ -120,42 +120,42 @@ TabPage TP_HELP_SEARCH
HelpID = "sfx2:ComboBox:TP_HELP_SEARCH:ED_SEARCH";
Border = TRUE ;
DropDown = TRUE;
- Pos = MAP_APPFONT ( 6 , 17 ) ;
- Size = MAP_APPFONT ( 92 , 40 ) ;
+ Pos = MAP_APPFONT ( 6, 17 ) ;
+ Size = MAP_APPFONT ( 92, 40 ) ;
};
PushButton PB_SEARCH
{
HelpID = "sfx2:PushButton:TP_HELP_SEARCH:PB_SEARCH";
- Pos = MAP_APPFONT ( 101 , 17 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
+ Pos = MAP_APPFONT ( 101, 17 ) ;
+ Size = MAP_APPFONT ( 50, 14 ) ;
Text [ en-US ] = "~Find";
};
CheckBox CB_FULLWORDS
{
HelpID = "sfx2:CheckBox:TP_HELP_SEARCH:CB_FULLWORDS";
Pos = MAP_APPFONT ( 6, 34 ) ;
- Size = MAP_APPFONT ( 128 , 10 ) ;
+ Size = MAP_APPFONT ( 128, 10 ) ;
Text [ en-US ] = "~Complete words only";
};
CheckBox CB_SCOPE
{
HelpID = "sfx2:CheckBox:TP_HELP_SEARCH:CB_SCOPE";
Pos = MAP_APPFONT ( 6, 47 ) ;
- Size = MAP_APPFONT ( 128 , 10 ) ;
+ Size = MAP_APPFONT ( 128, 10 ) ;
Text [ en-US ] = "Find in ~headings only";
};
ListBox LB_RESULT
{
HelpID = "sfx2:ListBox:TP_HELP_SEARCH:LB_RESULT";
Border = TRUE ;
- Pos = MAP_APPFONT ( 6 , 60 ) ;
- Size = MAP_APPFONT ( 128 , 30 ) ;
+ Pos = MAP_APPFONT ( 6, 60 ) ;
+ Size = MAP_APPFONT ( 128, 30 ) ;
};
PushButton PB_OPEN_SEARCH
{
HelpID = "sfx2:PushButton:TP_HELP_SEARCH:PB_OPEN_SEARCH";
- Pos = MAP_APPFONT ( 84 , 182 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
+ Pos = MAP_APPFONT ( 84, 182 ) ;
+ Size = MAP_APPFONT ( 50, 14 ) ;
Text [ en-US ] = "~Display" ;
};
};
@@ -165,11 +165,11 @@ TabPage TP_HELP_BOOKMARKS
HelpId = HID_HELP_TABPAGE_BOOKMARKS;
Hide = TRUE ;
DialogControl = TRUE;
- Size = MAP_APPFONT ( 120 , 200 ) ;
+ Size = MAP_APPFONT ( 120, 200 ) ;
FixedText FT_BOOKMARKS
{
- Pos = MAP_APPFONT ( 6 , 6 ) ;
- Size = MAP_APPFONT ( 108 , 10 ) ;
+ Pos = MAP_APPFONT ( 6, 6 ) ;
+ Size = MAP_APPFONT ( 108, 10 ) ;
Text [ en-US ] = "~Bookmarks" ;
};
ListBox LB_BOOKMARKS
@@ -177,14 +177,14 @@ TabPage TP_HELP_BOOKMARKS
HelpID = "sfx2:ListBox:TP_HELP_BOOKMARKS:LB_BOOKMARKS";
Border = TRUE ;
Sort = TRUE;
- Pos = MAP_APPFONT ( 6 , 19 ) ;
- Size = MAP_APPFONT ( 108 , 97 ) ;
+ Pos = MAP_APPFONT ( 6, 19 ) ;
+ Size = MAP_APPFONT ( 108, 97 ) ;
};
PushButton PB_BOOKMARKS
{
HelpID = "sfx2:PushButton:TP_HELP_BOOKMARKS:PB_BOOKMARKS";
- Pos = MAP_APPFONT ( 64 , 119 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
+ Pos = MAP_APPFONT ( 64, 119 ) ;
+ Size = MAP_APPFONT ( 50, 14 ) ;
Text [ en-US ] = "~Display" ;
};
};
@@ -194,94 +194,76 @@ TabPage TP_HELP_CONTENT
HelpId = HID_HELP_TABPAGE_CONTENTS;
Hide = TRUE ;
DialogControl = TRUE;
- Size = MAP_APPFONT ( 120 , 200 ) ;
+ Size = MAP_APPFONT ( 120, 200 ) ;
Control LB_CONTENTS
{
HelpId = HID_HELP_TREELISTBOX_CONTENTS ;
Border = TRUE ;
TabStop = TRUE;
- Pos = MAP_APPFONT ( 6 , 6 ) ;
- Size = MAP_APPFONT ( 108 , 188 ) ;
+ Pos = MAP_APPFONT ( 6, 6 ) ;
+ Size = MAP_APPFONT ( 108, 188 ) ;
};
};
-#define MASKCOLOR_MAGENTA \
- MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
-
Image IMG_HELP_TOOLBOX_INDEX_ON
{
- ImageBitmap = Bitmap { File = "indexon_small.bmp" ; };
- MASKCOLOR_MAGENTA
+ ImageBitmap = Bitmap { File = "indexon_small.png" ; };
};
Image IMG_HELP_TOOLBOX_INDEX_OFF
{
- ImageBitmap = Bitmap { File = "indexoff_small.bmp" ; };
- MASKCOLOR_MAGENTA
+ ImageBitmap = Bitmap { File = "indexoff_small.png" ; };
};
Image IMG_HELP_TOOLBOX_START
{
- ImageBitmap = Bitmap { File = "sc06303.bmp" ; };
- MASKCOLOR_MAGENTA
+ ImageBitmap = Bitmap { File = "sc06303.png" ; };
};
Image IMG_HELP_TOOLBOX_PREV
{
- ImageBitmap = Bitmap { File = "sc06301.bmp" ; };
- MASKCOLOR_MAGENTA
+ ImageBitmap = Bitmap { File = "sc06301.png" ; };
};
Image IMG_HELP_TOOLBOX_NEXT
{
- ImageBitmap = Bitmap { File = "sc06300.bmp" ; };
- MASKCOLOR_MAGENTA
+ ImageBitmap = Bitmap { File = "sc06300.png" ; };
};
Image IMG_HELP_TOOLBOX_PRINT
{
- ImageBitmap = Bitmap { File = "sc05504.bmp" ; };
- MASKCOLOR_MAGENTA
+ ImageBitmap = Bitmap { File = "sc05504.png" ; };
};
Image IMG_HELP_TOOLBOX_BOOKMARKS
{
- ImageBitmap = Bitmap { File = "favourite.bmp" ; };
- MASKCOLOR_MAGENTA
+ ImageBitmap = Bitmap { File = "favourite.png" ; };
};
Image IMG_HELP_TOOLBOX_SEARCHDIALOG
{
- ImageBitmap = Bitmap { File = "sc05961.bmp" ; };
- MASKCOLOR_MAGENTA
+ ImageBitmap = Bitmap { File = "sc05961.png" ; };
};
Image IMG_HELP_TOOLBOX_COPY
{
- ImageBitmap = Bitmap { File = "sc05711.bmp" ; };
- MASKCOLOR_MAGENTA
+ ImageBitmap = Bitmap { File = "sc05711.png" ; };
};
Image IMG_HELP_CONTENT_BOOK_OPEN
{
- ImageBitmap = Bitmap { File = "hlpbookopen.bmp" ; };
- MASKCOLOR_MAGENTA
+ ImageBitmap = Bitmap { File = "hlpbookopen.png" ; };
};
Image IMG_HELP_CONTENT_BOOK_OPEN_HC
{
- ImageBitmap = Bitmap { File = "hlpbookopen_h.bmp" ; };
- MASKCOLOR_MAGENTA
+ ImageBitmap = Bitmap { File = "hlpbookopen_h.png" ; };
};
Image IMG_HELP_CONTENT_BOOK_CLOSED
{
- ImageBitmap = Bitmap { File = "hlpbookclosed.bmp" ; };
- MASKCOLOR_MAGENTA
+ ImageBitmap = Bitmap { File = "hlpbookclosed.png" ; };
};
Image IMG_HELP_CONTENT_BOOK_CLOSED_HC
{
- ImageBitmap = Bitmap { File = "hlpbookclosed_h.bmp" ; };
- MASKCOLOR_MAGENTA
+ ImageBitmap = Bitmap { File = "hlpbookclosed_h.png" ; };
};
Image IMG_HELP_CONTENT_DOC
{
- ImageBitmap = Bitmap { File = "hlpdoc.bmp" ; };
- MASKCOLOR_MAGENTA
+ ImageBitmap = Bitmap { File = "hlpdoc.png" ; };
};
Image IMG_HELP_CONTENT_DOC_HC
{
- ImageBitmap = Bitmap { File = "hlpdoc_h.bmp" ; };
- MASKCOLOR_MAGENTA
+ ImageBitmap = Bitmap { File = "hlpdoc_h.png" ; };
};
String STR_HELP_WINDOW_TITLE
@@ -344,7 +326,7 @@ String STR_HELP_MENU_TEXT_COPY
ModalDialog DLG_HELP_ADDBOOKMARK
{
HelpID = "sfx2:ModalDialog:DLG_HELP_ADDBOOKMARK";
- Size = MAP_APPFONT ( 208 , 43 ) ;
+ Size = MAP_APPFONT ( 208, 43 ) ;
Text [ en-US ] = "Add to Bookmarks";
MOVEABLE = TRUE ;
CLOSEABLE = TRUE ;
@@ -352,7 +334,7 @@ ModalDialog DLG_HELP_ADDBOOKMARK
SVLOOK = TRUE ;
FixedText FT_BOOKMARK_TITLE
{
- PosSize = MAP_APPFONT ( 6 , 6 , 140 , 10 ) ;
+ PosSize = MAP_APPFONT ( 6, 6, 140, 10 ) ;
Text [ en-US ] = "Bookmark:" ;
TABSTOP = FALSE ;
GROUP = TRUE ;
@@ -361,13 +343,13 @@ ModalDialog DLG_HELP_ADDBOOKMARK
Edit ED_BOOKMARK_TITLE
{
HelpID = "sfx2:Edit:DLG_HELP_ADDBOOKMARK:ED_BOOKMARK_TITLE";
- PosSize = MAP_APPFONT ( 6 , 19 , 140 , 12 ) ;
+ PosSize = MAP_APPFONT ( 6, 19, 140, 12 ) ;
TABSTOP = TRUE ;
BORDER = TRUE ;
};
OKButton PB_BOOKMARK_OK
{
- PosSize = MAP_APPFONT ( 152 , 6 , 50 , 14 ) ;
+ PosSize = MAP_APPFONT ( 152, 6, 50, 14 ) ;
HIDE = FALSE ;
TABSTOP = TRUE ;
GROUP = TRUE ;
@@ -376,13 +358,13 @@ ModalDialog DLG_HELP_ADDBOOKMARK
};
CancelButton PB_BOOKMARK_CANCEL
{
- PosSize = MAP_APPFONT ( 152 , 23 , 50 , 14 ) ;
+ PosSize = MAP_APPFONT ( 152, 23, 50, 14 ) ;
TABSTOP = TRUE ;
GROUP = TRUE ;
};
HelpButton PB_BOOKMARK_HELP
{
- PosSize = MAP_APPFONT ( 152 , 43 , 50 , 14 ) ;
+ PosSize = MAP_APPFONT ( 152, 43, 50, 14 ) ;
TABSTOP = TRUE ;
GROUP = TRUE ;
Hide = TRUE;
@@ -438,140 +420,113 @@ InfoBox RID_INFO_NOSEARCHTEXTFOUND
Image IMG_HELP_TOOLBOX_HC_INDEX_ON
{
- ImageBitmap = Bitmap { File = "indexon_small_h.bmp" ; };
- MASKCOLOR_MAGENTA
+ ImageBitmap = Bitmap { File = "indexon_small_h.png" ; };
};
Image IMG_HELP_TOOLBOX_HC_INDEX_OFF
{
- ImageBitmap = Bitmap { File = "indexoff_small_h.bmp" ; };
- MASKCOLOR_MAGENTA
+ ImageBitmap = Bitmap { File = "indexoff_small_h.png" ; };
};
Image IMG_HELP_TOOLBOX_HC_START
{
- ImageBitmap = Bitmap { File = "sch06303.bmp" ; };
- MASKCOLOR_MAGENTA
+ ImageBitmap = Bitmap { File = "sch06303.png" ; };
};
Image IMG_HELP_TOOLBOX_HC_PREV
{
- ImageBitmap = Bitmap { File = "sch06301.bmp" ; };
- MASKCOLOR_MAGENTA
+ ImageBitmap = Bitmap { File = "sch06301.png" ; };
};
Image IMG_HELP_TOOLBOX_HC_NEXT
{
- ImageBitmap = Bitmap { File = "sch06300.bmp" ; };
- MASKCOLOR_MAGENTA
+ ImageBitmap = Bitmap { File = "sch06300.png" ; };
};
Image IMG_HELP_TOOLBOX_HC_PRINT
{
- ImageBitmap = Bitmap { File = "sch05504.bmp" ; };
- MASKCOLOR_MAGENTA
+ ImageBitmap = Bitmap { File = "sch05504.png" ; };
};
Image IMG_HELP_TOOLBOX_HC_BOOKMARKS
{
- ImageBitmap = Bitmap { File = "favourite_h.bmp" ; };
- MASKCOLOR_MAGENTA
+ ImageBitmap = Bitmap { File = "favourite_h.png" ; };
};
Image IMG_HELP_TOOLBOX_HC_SEARCHDIALOG
{
- ImageBitmap = Bitmap { File = "sch05961.bmp" ; };
- MASKCOLOR_MAGENTA
+ ImageBitmap = Bitmap { File = "sch05961.png" ; };
};
Image IMG_HELP_TOOLBOX_HC_COPY
{
- ImageBitmap = Bitmap { File = "sch05711.bmp" ; };
- MASKCOLOR_MAGENTA
+ ImageBitmap = Bitmap { File = "sch05711.png" ; };
};
Image IMG_HELP_TOOLBOX_L_INDEX_ON
{
- ImageBitmap = Bitmap { File = "indexon_big.bmp" ; };
- MASKCOLOR_MAGENTA
+ ImageBitmap = Bitmap { File = "indexon_big.png" ; };
};
Image IMG_HELP_TOOLBOX_L_INDEX_OFF
{
- ImageBitmap = Bitmap { File = "indexoff_big.bmp" ; };
- MASKCOLOR_MAGENTA
+ ImageBitmap = Bitmap { File = "indexoff_big.png" ; };
};
Image IMG_HELP_TOOLBOX_L_START
{
- ImageBitmap = Bitmap { File = "lc06303.bmp" ; };
- MASKCOLOR_MAGENTA
+ ImageBitmap = Bitmap { File = "lc06303.png" ; };
};
Image IMG_HELP_TOOLBOX_L_PREV
{
- ImageBitmap = Bitmap { File = "lc06301.bmp" ; };
- MASKCOLOR_MAGENTA
+ ImageBitmap = Bitmap { File = "lc06301.png" ; };
};
Image IMG_HELP_TOOLBOX_L_NEXT
{
- ImageBitmap = Bitmap { File = "lc06300.bmp" ; };
- MASKCOLOR_MAGENTA
+ ImageBitmap = Bitmap { File = "lc06300.png" ; };
};
Image IMG_HELP_TOOLBOX_L_PRINT
{
- ImageBitmap = Bitmap { File = "lc05504.bmp" ; };
- MASKCOLOR_MAGENTA
+ ImageBitmap = Bitmap { File = "lc05504.png" ; };
};
Image IMG_HELP_TOOLBOX_L_BOOKMARKS
{
- ImageBitmap = Bitmap { File = "favourite_big.bmp" ; };
- MASKCOLOR_MAGENTA
+ ImageBitmap = Bitmap { File = "favourite_big.png" ; };
};
Image IMG_HELP_TOOLBOX_L_SEARCHDIALOG
{
- ImageBitmap = Bitmap { File = "lc05961.bmp" ; };
- MASKCOLOR_MAGENTA
+ ImageBitmap = Bitmap { File = "lc05961.png" ; };
};
Image IMG_HELP_TOOLBOX_L_COPY
{
- ImageBitmap = Bitmap { File = "lc05711.bmp" ; };
- MASKCOLOR_MAGENTA
+ ImageBitmap = Bitmap { File = "lc05711.png" ; };
};
Image IMG_HELP_TOOLBOX_HCL_INDEX_ON
{
- ImageBitmap = Bitmap { File = "indexon_big_h.bmp" ; };
- MASKCOLOR_MAGENTA
+ ImageBitmap = Bitmap { File = "indexon_big_h.png" ; };
};
Image IMG_HELP_TOOLBOX_HCL_INDEX_OFF
{
- ImageBitmap = Bitmap { File = "indexoff_big_h.bmp" ; };
- MASKCOLOR_MAGENTA
+ ImageBitmap = Bitmap { File = "indexoff_big_h.png" ; };
};
Image IMG_HELP_TOOLBOX_HCL_START
{
- ImageBitmap = Bitmap { File = "lch06303.bmp" ; };
- MASKCOLOR_MAGENTA
+ ImageBitmap = Bitmap { File = "lch06303.png" ; };
};
Image IMG_HELP_TOOLBOX_HCL_PREV
{
- ImageBitmap = Bitmap { File = "lch06301.bmp" ; };
- MASKCOLOR_MAGENTA
+ ImageBitmap = Bitmap { File = "lch06301.png" ; };
};
Image IMG_HELP_TOOLBOX_HCL_NEXT
{
- ImageBitmap = Bitmap { File = "lch06300.bmp" ; };
- MASKCOLOR_MAGENTA
+ ImageBitmap = Bitmap { File = "lch06300.png" ; };
};
Image IMG_HELP_TOOLBOX_HCL_PRINT
{
- ImageBitmap = Bitmap { File = "lch05504.bmp" ; };
- MASKCOLOR_MAGENTA
+ ImageBitmap = Bitmap { File = "lch05504.png" ; };
};
Image IMG_HELP_TOOLBOX_HCL_BOOKMARKS
{
- ImageBitmap = Bitmap { File = "favourite_big_h.bmp" ; };
- MASKCOLOR_MAGENTA
+ ImageBitmap = Bitmap { File = "favourite_big_h.png" ; };
};
Image IMG_HELP_TOOLBOX_HCL_SEARCHDIALOG
{
- ImageBitmap = Bitmap { File = "lch05961.bmp" ; };
- MASKCOLOR_MAGENTA
+ ImageBitmap = Bitmap { File = "lch05961.png" ; };
};
Image IMG_HELP_TOOLBOX_HCL_COPY
{
- ImageBitmap = Bitmap { File = "lch05711.bmp" ; };
- MASKCOLOR_MAGENTA
+ ImageBitmap = Bitmap { File = "lch05711.png" ; };
};
CheckBox RID_HELP_ONSTARTUP_BOX
@@ -579,10 +534,9 @@ CheckBox RID_HELP_ONSTARTUP_BOX
HelpId = HID_HELP_ONSTARTUP_BOX;
Hide = TRUE;
TabStop = TRUE;
- Size = MAP_APPFONT ( 200 , 10 ) ;
+ Size = MAP_APPFONT ( 200, 10 ) ;
};
String RID_HELP_ONSTARTUP_TEXT
{
Text [ en-US ] = "~Display %PRODUCTNAME %MODULENAME Help at Startup";
};
-
More information about the Libreoffice-commits
mailing list