3rd try is a charm? Thanks for that fix regarding the size of the space
between the options - that was creating a snag for me and I couldn't
figure it out. Again, feel free to comment.
Joel
On 08/06/2012 11:28 AM, Ivan Timofeev wrote:
Hi Joel,
On 02.08.2012 21:57, Joel Madero wrote:
Here is an updated patch.
not that it is essential, but it is good if the commit message is
wrapped so that it does not exceed a reasonable width (say 70-80
characters). (Yes, my e-mail client seems unable to do that, ugh.)
Please enter the commit message for your changes. Lines starting
with '#' will be ignored, and an empty message aborts the commit.
Something wrong with your editor? These lines should start with '#'
and be ignored, why they are in the commit message again?
Text [ en-US ] = "Optional features" ;
uhm, IMHO "optional" means "not necessary in most cases, but sometimes
might be helpful". So a user would think "Ok, let's enable all these,
won't hurt anyway." But this features aren't stable and somewhat
dangerous to enable, and
- Text [ en-US ] = "Enable experimental (unstable) features";
+ Text [ en-US ] = "Enable experimental features";
makes it sound even more safe. Maybe "Unstable features" as a header
then?
Another nit-picking:
you placed two labels in one row, not good IMHO: consider long
translations. But then the last row could go out of the visible area,
it would be great to check that - play with "#define ROW.." constants in
optgdlg.hrc, remove my ugly +6 in ROW14 etc... :)
Thanks!
Ivan
>From fea8e91665e2b9e52f004514a796f01c13bf81d0 Mon Sep 17 00:00:00 2001
From: Joel Madero <jmadero....@gmail.com>
Date: Wed, 8 Aug 2012 17:04:09 -0700
Subject: [PATCH] Addition of linear divider and header "Optional (unstable)
Features"
Put two experimental options (Experimental & Macro Recording) below
a linear divider with the header of "Optional (Unstable) Features"
Had to adjust distance between two options in order for them to fit
properly in the dialog.
Change-Id: I784f99c282d5b70e7e025b1ca05a7c8d73869cef
---
cui/source/options/optgdlg.cxx | 7 ++++---
cui/source/options/optgdlg.hrc | 6 ++++--
cui/source/options/optgdlg.hxx | 1 +
cui/source/options/optgdlg.src | 14 ++++++++++----
4 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 8800e11..4f83368 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -213,6 +213,7 @@ OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet& rSet ) :
aInterpretFT ( this, CUI_RES( FT_INTERPRET ) ),
aYearValueField ( this, CUI_RES( NF_YEARVALUE ) ),
aToYearFT ( this, CUI_RES( FT_TOYEAR ) ),
+ aExperimentalFL ( this, CUI_RES( FL_EXPERIMENTAL ) ),
aExperimentalCB ( this, CUI_RES( CB_EXPERIMENTAL ) ),
aMacroRecorderCB ( this, CUI_RES( CB_MACRORECORDER ) )
{
@@ -244,7 +245,7 @@ OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet& rSet ) :
Window* pWins[] =
{
&aPrintDlgFL, &aPrintDlgCB, &aDocStatusFL, &aDocStatusCB, &aSaveAlwaysCB,
- &aTwoFigureFL, &aInterpretFT, &aYearValueField, &aToYearFT, &aExperimentalCB, &aMacroRecorderCB
+ &aTwoFigureFL, &aInterpretFT, &aYearValueField, &aToYearFT, &aExperimentalFL, &aExperimentalCB, &aMacroRecorderCB
};
Window** pCurrent = pWins;
const sal_Int32 nCount = SAL_N_ELEMENTS( pWins );
@@ -265,7 +266,7 @@ OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet& rSet ) :
Window* pWins[] =
{
&aPrintDlgFL, &aPrintDlgCB, &aDocStatusFL, &aDocStatusCB, &aSaveAlwaysCB,
- &aTwoFigureFL, &aInterpretFT, &aYearValueField, &aToYearFT, &aExperimentalCB, &aMacroRecorderCB
+ &aTwoFigureFL, &aInterpretFT, &aYearValueField, &aToYearFT, &aExperimentalFL, &aExperimentalCB, &aMacroRecorderCB
};
Window** pCurrent = pWins;
const sal_Int32 nCount = SAL_N_ELEMENTS( pWins );
@@ -291,7 +292,7 @@ OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet& rSet ) :
Window* pWins[] =
{
&aDocStatusFL, &aDocStatusCB, &aSaveAlwaysCB, &aTwoFigureFL,
- &aInterpretFT, &aYearValueField, &aToYearFT, &aExperimentalCB, &aMacroRecorderCB
+ &aInterpretFT, &aYearValueField, &aToYearFT, &aExperimentalFL, &aExperimentalCB, &aMacroRecorderCB
};
Window** pCurrent = pWins;
const sal_Int32 nCount = SAL_N_ELEMENTS( pWins );
diff --git a/cui/source/options/optgdlg.hrc b/cui/source/options/optgdlg.hrc
index 9be9051..2bf4343 100644
--- a/cui/source/options/optgdlg.hrc
+++ b/cui/source/options/optgdlg.hrc
@@ -51,6 +51,7 @@
#define ROW13 (ROW12+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE)
#define ROW14 (ROW13+RSC_CD_CHECKBOX_HEIGHT+ROWSPACE+6)
#define ROW15 (ROW14+RSC_CD_CHECKBOX_HEIGHT+ROWSPACE)
+#define ROW16 (ROW15+RSC_CD_CHECKBOX_HEIGHT)
#define DIFF(v1,v2) (v2-v1)
#define OFFS_TEXTBOX_FIXEDTEXT(base) (base+(RSC_CD_TEXTBOX_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2)
@@ -93,8 +94,9 @@
#define CB_EXTHELP 12
#define CB_HELPAGENT 13
#define PB_HELPAGENT_RESET 14
-#define CB_EXPERIMENTAL 15
-#define CB_MACRORECORDER 16
+#define FL_EXPERIMENTAL 15
+#define CB_EXPERIMENTAL 16
+#define CB_MACRORECORDER 17
#define FL_TWOFIGURE 40
#define FT_INTERPRET 41
diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx
index 3ae53fd..e38c48c 100644
--- a/cui/source/options/optgdlg.hxx
+++ b/cui/source/options/optgdlg.hxx
@@ -70,6 +70,7 @@ private:
String aStrDateInfo;
+ FixedLine aExperimentalFL;
CheckBox aExperimentalCB;
CheckBox aMacroRecorderCB;
diff --git a/cui/source/options/optgdlg.src b/cui/source/options/optgdlg.src
index 6f1ab4e..794ab18 100644
--- a/cui/source/options/optgdlg.src
+++ b/cui/source/options/optgdlg.src
@@ -161,17 +161,23 @@ TabPage OFA_TP_MISC
Size = MAP_APPFONT( WHOLE_WIDTH - COL6, RSC_CD_FIXEDTEXT_HEIGHT );
Text [ en-US ] = "and " ;
};
+ FixedLine FL_EXPERIMENTAL
+ {
+ Pos = MAP_APPFONT( COL0, ROW14 );
+ Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT );
+ Text [ en-US ] = "Optional (unstable) features" ;
+ };
CheckBox CB_EXPERIMENTAL
{
- Pos = MAP_APPFONT( COL1, ROW14 );
+ Pos = MAP_APPFONT( COL1, ROW15 );
Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT );
- Text [ en-US ] = "Enable experimental (unstable) features";
+ Text [ en-US ] = "Enable experimental features";
};
CheckBox CB_MACRORECORDER
{
- Pos = MAP_APPFONT( COL1, ROW15 );
+ Pos = MAP_APPFONT( COL1, ROW16 );
Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT );
- Text [ en-US ] = "Enable macro recording (limited)";
+ Text [ en-US ] = "Enable macro recording";
};
};
--
1.7.9.5
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
