impreove the cond format dialog a little bit

Change-Id: I4c7fdb15440ef0fca5b262a37549e96c85d8ab1f

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;

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