[Libreoffice-commits] .: 2 commits - chart2/source
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Mon Jun 27 14:45:32 PDT 2011
chart2/source/controller/dialogs/CommonResources.hrc | 25 -------------------
chart2/source/controller/dialogs/tp_ChartType.src | 2 -
2 files changed, 1 insertion(+), 26 deletions(-)
New commits:
commit 7d003d531e26d7e921854e837b16037a516aa1cc
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Jun 27 23:40:56 2011 +0200
fdo#38725: Reorder buttons to Ok, Cancel, Help
Remove BUTTONS_HELP_OK_CANCEL definition and use more
intuitive usable BUTTONS_OK_CANCEL_HELP.
diff --git a/chart2/source/controller/dialogs/CommonResources.hrc b/chart2/source/controller/dialogs/CommonResources.hrc
index d13a1cc..17614bf 100644
--- a/chart2/source/controller/dialogs/CommonResources.hrc
+++ b/chart2/source/controller/dialogs/CommonResources.hrc
@@ -51,25 +51,4 @@ HelpButton BTN_HELP \
#define BUTTONS_OK_CANCEL_HELP_STACKED( xPos ) \
BUTTONS_OK_CANCEL_HELP( xPos, 6, 0, 17 )
-#define BUTTONS_HELP_OK_CANCEL( xPos, yPos, xOffset, yOffset ) \
-HelpButton BTN_HELP \
-{ \
- Pos = MAP_APPFONT ( xPos , yPos ) ; \
- Size = MAP_APPFONT ( 50 , 14 ) ; \
- TabStop = TRUE ; \
-}; \
-OKButton BTN_OK \
-{ \
- Pos = MAP_APPFONT ( xPos+xOffset , yPos+yOffset ) ; \
- Size = MAP_APPFONT ( 50 , 14 ) ; \
- TabStop = TRUE ; \
- DefButton = TRUE ; \
-}; \
-CancelButton BTN_CANCEL \
-{ \
- Pos = MAP_APPFONT ( xPos+xOffset+xOffset , yPos+yOffset+yOffset ) ; \
- Size = MAP_APPFONT ( 50 , 14 ) ; \
- TabStop = TRUE ; \
-};
-
#endif
diff --git a/chart2/source/controller/dialogs/tp_ChartType.src b/chart2/source/controller/dialogs/tp_ChartType.src
index 3736190..049ef89 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.src
+++ b/chart2/source/controller/dialogs/tp_ChartType.src
@@ -269,5 +269,5 @@ ModalDialog DLG_SPLINE_PROPERTIES
Pos = MAP_APPFONT ( 0 , POS_Y_SPLINES_4 ) ;
Size = MAP_APPFONT ( SPLINE_DIALOG_WIDTH , RSC_CD_FIXEDTEXT_HEIGHT ) ;
};
- BUTTONS_HELP_OK_CANCEL( POS_X_SPLINES_1, POS_Y_SPLINES_5, 53, 0 )
+ BUTTONS_OK_CANCEL_HELP( POS_X_SPLINES_1, POS_Y_SPLINES_5, 53, 0 )
};
commit 08a82d5ba872100037b47dfc988bc283fe4ee850
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Jun 27 23:25:46 2011 +0200
Use definition of BUTTONS_HELP_OK_CANCEL directly.
diff --git a/chart2/source/controller/dialogs/CommonResources.hrc b/chart2/source/controller/dialogs/CommonResources.hrc
index d594420..d13a1cc 100644
--- a/chart2/source/controller/dialogs/CommonResources.hrc
+++ b/chart2/source/controller/dialogs/CommonResources.hrc
@@ -72,8 +72,4 @@ CancelButton BTN_CANCEL \
TabStop = TRUE ; \
};
-#define BUTTONS_HELP_OK_CANCEL_NEXT( xPos, yPos ) \
-BUTTONS_HELP_OK_CANCEL( xPos, yPos, 53, 0 )
-
-
#endif
diff --git a/chart2/source/controller/dialogs/tp_ChartType.src b/chart2/source/controller/dialogs/tp_ChartType.src
index 334c8d5..3736190 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.src
+++ b/chart2/source/controller/dialogs/tp_ChartType.src
@@ -269,5 +269,5 @@ ModalDialog DLG_SPLINE_PROPERTIES
Pos = MAP_APPFONT ( 0 , POS_Y_SPLINES_4 ) ;
Size = MAP_APPFONT ( SPLINE_DIALOG_WIDTH , RSC_CD_FIXEDTEXT_HEIGHT ) ;
};
- BUTTONS_HELP_OK_CANCEL_NEXT(POS_X_SPLINES_1,POS_Y_SPLINES_5)
+ BUTTONS_HELP_OK_CANCEL( POS_X_SPLINES_1, POS_Y_SPLINES_5, 53, 0 )
};
More information about the Libreoffice-commits
mailing list