summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2012-07-04 02:16:17 +0200
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2012-07-04 02:17:27 +0200
commitc675575ce507320b6f866d02fd7eee68462f7823 (patch)
treeb016004d74bc9acf612d21f8adc65042f9ac9695 /sc
parent9894c5a3cd545b112a226df88a790f56991af5ed (diff)
impreove the cond format dialog a little bit
Change-Id: I4c7fdb15440ef0fca5b262a37549e96c85d8ab1f
Diffstat (limited to 'sc')
-rw-r--r--sc/source/ui/condformat/condformatdlg.cxx9
-rw-r--r--sc/source/ui/src/condformatdlg.src12
2 files changed, 13 insertions, 8 deletions
diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx
index a6de790e69fe..e3036258e9f0 100644
--- a/sc/source/ui/condformat/condformatdlg.cxx
+++ b/sc/source/ui/condformat/condformatdlg.cxx
@@ -320,7 +320,7 @@ void ScCondFrmtEntry::Init()
Point aPointCol = maLbColMiddle.GetPosPixel();
Point aPointEdDataBar = maEdDataBarMin.GetPosPixel();
Point aPointLbDataBar = maLbDataBarMaxType.GetPosPixel();
- const long nMovePos = 150;
+ const long nMovePos = 250;
aPointLb.X() += nMovePos;
aPointEd.X() += nMovePos;
aPointCol.X() += nMovePos;
@@ -453,6 +453,7 @@ void ScCondFrmtEntry::SetCondType()
HideColorScaleElements();
HideDataBarElements();
SwitchToType(CONDITION);
+ ConditionTypeSelectHdl(NULL);
}
void ScCondFrmtEntry::HideColorScaleElements()
@@ -565,7 +566,11 @@ void ScCondFrmtEntry::SetFormulaType()
maEdVal2.Hide();
maLbCondType.Hide();
maLbStyle.Show();
+ maFtCondition.Show();
maWdPreview.Show();
+ maFtStyle.Show();
+ Size aSize(440, 30);
+ maEdVal1.SetSizePixel(aSize);
}
void ScCondFrmtEntry::Select()
@@ -895,7 +900,7 @@ IMPL_LINK_NOARG( ScCondFrmtEntry, ConditionTypeSelectHdl )
else
{
maEdVal2.Hide();
- Size aSize(193, 30);
+ Size aSize(440, 30);
maEdVal1.SetSizePixel(aSize);
}
return 0;
diff --git a/sc/source/ui/src/condformatdlg.src b/sc/source/ui/src/condformatdlg.src
index 68fd52a8bbc9..ebf84f397144 100644
--- a/sc/source/ui/src/condformatdlg.src
+++ b/sc/source/ui/src/condformatdlg.src
@@ -134,13 +134,13 @@ Control RID_COND_ENTRY
Edit ED_VAL1
{
Pos = MAP_APPFONT( 125, 15 );
- Size = MAP_APPFONT( 170, 12 );
+ Size = MAP_APPFONT( 160, 12 );
Border = TRUE;
};
Edit ED_VAL2
{
- Pos = MAP_APPFONT( 215, 15 );
- Size = MAP_APPFONT( 80, 12 );
+ Pos = MAP_APPFONT( 210, 15 );
+ Size = MAP_APPFONT( 75, 12 );
Border = TRUE;
};
ListBox LB_STYLE
@@ -156,7 +156,7 @@ Control RID_COND_ENTRY
};
ListBox LB_COLOR_FORMAT
{
- Pos = MAP_APPFONT( 50, 15 );
+ Pos = MAP_APPFONT( 70, 15 );
Size = MAP_APPFONT( 60, 60);
Border = TRUE;
DropDown = TRUE;
@@ -170,7 +170,7 @@ Control RID_COND_ENTRY
ListBox LB_TYPE_COL_SCALE
{
Pos = MAP_APPFONT( 5, 32 );
- Size = MAP_APPFONT( 50, 60 );
+ Size = MAP_APPFONT( 60, 60 );
Border = TRUE;
DropDown = TRUE;
StringList [ en-US ] =
@@ -186,7 +186,7 @@ Control RID_COND_ENTRY
Edit ED_COL_SCALE
{
Pos = MAP_APPFONT( 5, 48 );
- Size = MAP_APPFONT( 50, 12 );
+ Size = MAP_APPFONT( 60, 12 );
Border = TRUE;
};
Window WD_PREVIEW