diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-02-28 09:44:06 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-02-28 09:44:06 +0000 |
| commit | f837c1c6c3790e05dbeae7a1e805b618d534a51c (patch) | |
| tree | 4cf9b78506c0ad110bb763197d6e30ccaa747ec2 /svx | |
| parent | fb1f9e7c0399a65c76591a6cecdc9a90060c8988 (diff) | |
INTEGRATION: CWS cairocanvas (1.15.130); FILE MERGED
2006/01/27 12:27:34 thb 1.15.130.6: RESYNC: (1.16-1.17); FILE MERGED
2005/12/14 11:50:52 thb 1.15.130.5: #i59119# Removed unused controls (needs to be truly removed for next incompatible build); removed HW accel controls from control shift list
2005/12/13 17:25:50 thb 1.15.130.4: #i59119#, #i53104# Dialog reworked (unused stuff removed, hw accel checkbox moved to the right column)
2005/12/12 18:42:46 thb 1.15.130.3: RESYNC: (1.15-1.16); FILE MERGED
2005/11/22 13:25:13 radekdoulik 1.15.130.2: Issue number: #51657
Submitted by: radekdoulik
Reviewed by: radekdoulik
reverted UI changes, so that cairo canvas cws is accepted easier
2005/11/09 15:12:08 radekdoulik 1.15.130.1: Issue number: #51657
Submitted by: radekdoulik
Reviewed by: radekdoulik
accelerated checkbutton in options/view to enable cairo canvas on unix boxes
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/dialog/optgdlg.hrc | 30 |
1 files changed, 19 insertions, 11 deletions
diff --git a/svx/source/dialog/optgdlg.hrc b/svx/source/dialog/optgdlg.hrc index c9ab6a402518..87793a164a4a 100644 --- a/svx/source/dialog/optgdlg.hrc +++ b/svx/source/dialog/optgdlg.hrc @@ -4,9 +4,9 @@ * * $RCSfile: optgdlg.hrc,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: kz $ $Date: 2006-01-05 17:58:52 $ + * last change: $Author: kz $ $Date: 2006-02-28 10:44:06 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -73,17 +73,29 @@ #define ROW_FT_ICONSIZESTYLE (ROW_MF_SCALING+RSC_CD_DROPDOWN_HEIGHT+ROWSPACE) #define ROW_LB_ICONSIZESTYLE (ROW_FT_ICONSIZESTYLE+RSC_CD_FIXEDTEXT_HEIGHT+ROWSPACE) #define ROW_CB_SYSTEM_FONT (ROW_LB_ICONSIZESTYLE+RSC_CD_DROPDOWN_HEIGHT+ROWSPACE) -#define ROW_CB_FONTANTIALIASING (ROW_CB_SYSTEM_FONT+ (2 * RSC_CD_DROPDOWN_HEIGHT) +ROWSPACE) +#define ROW_CB_FONTANTIALIASING (ROW_CB_SYSTEM_FONT+ (2 * RSC_CD_FIXEDLINE_HEIGHT) +ROWSPACE) #define ROW_NF_AA_POINTLIMIT (ROW_CB_FONTANTIALIASING+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE) #define ROW_FL_MENU (ROW_NF_AA_POINTLIMIT+RSC_CD_DROPDOWN_HEIGHT+RSC_SP_FLGR_SPACE_X) #define ROW_CB_MENU_ICONS (ROW_FL_MENU +RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE) -#define ROW_CB_SHOW_INACTIVE (ROW_CB_MENU_ICONS+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE) -#define ROW_FL_FONTLISTS (ROW_CB_SHOW_INACTIVE + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_SPACE_X) +#define ROW_FL_FONTLISTS (ROW_CB_MENU_ICONS + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_SPACE_X) #define ROW_CB_FONT_SHOW (ROW_FL_FONTLISTS + RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE) #define ROW_CB_FONT_HISTORY (ROW_CB_FONT_SHOW + RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE) -#define ROW_FL_REDERING (ROW_CB_FONT_HISTORY + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_SPACE_X) -#define ROW_CB_USE_HARDACCELL (ROW_FL_REDERING + RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE) + +#define ROW_FL_3D (3) +#define ROW_CB_3D_OPENGL (ROW_FL_3D + RSC_CD_FIXEDLINE_HEIGHT + ROWSPACE) +#define ROW_CB_3D_OPENGL_FASTER (ROW_CB_3D_OPENGL + RSC_CD_FIXEDLINE_HEIGHT + ROWSPACE) +#define ROW_CB_3D_DITHERING (ROW_CB_3D_OPENGL_FASTER + RSC_CD_FIXEDLINE_HEIGHT + ROWSPACE) +#define ROW_CB_3D_SHOWFULL (ROW_CB_3D_DITHERING + RSC_CD_FIXEDLINE_HEIGHT + ROWSPACE) + +#define ROW_FL_RENDERING (ROW_CB_3D_SHOWFULL + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_SPACE_X) +#define ROW_CB_USE_HARDACCELL (ROW_FL_RENDERING + RSC_CD_FIXEDLINE_HEIGHT + ROWSPACE) + +#define ROW_FL_MOUSE (ROW_FL_MENU) // the same Y position as the menu - according to the spec. +#define ROW_FT_MOUSEPOS (ROW_FL_MOUSE + RSC_CD_FIXEDLINE_HEIGHT + ROWSPACE) +#define ROW_LB_MOUSEPOS (ROW_FT_MOUSEPOS + RSC_CD_FIXEDTEXT_HEIGHT + ROWSPACE) +#define ROW_FT_MOUSEMIDDLE (ROW_LB_MOUSEPOS + RSC_CD_DROPDOWN_HEIGHT + ROWSPACE) +#define ROW_LB_MOUSEMIDDLE (ROW_FT_MOUSEMIDDLE + RSC_CD_FIXEDTEXT_HEIGHT + ROWSPACE) // tabpage general ------------------------------------------------------- @@ -128,9 +140,6 @@ #define FL_MENU 41 #define FL_FONTLISTS 42 -#define FL_WORKINGSET 50 -#define BTN_DOCVIEW 51 -#define BTN_OPENWIN 52 #define LB_ICONSIZE 53 #define FT_ICONSIZESTYLE 54 #define LB_ICONSTYLE 55 @@ -138,7 +147,6 @@ #define STR_ICONSIZE 57 #define CB_FONT_SHOW 60 -#define CB_SHOW_INACTIVE 61 #define CB_FONT_HISTORY 62 #define CB_FONTANTIALIASING 63 |