ooo-build r15304 - in trunk: . patches/dev300

[kyoshida svn gnome org]

Author: kyoshida
Date: Fri Feb  6 15:47:44 2009
New Revision: 15304
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15304&view=rev

Log:
2009-02-06  Daniel Watson  <daniel watsonbros gmail com>

	* patches/dev300/calc-sheet-tab-color-sc.diff: updated the tab color
	dialog, to remove the More button, and make the dialog stay even when a
	color is clicked on, so that the OK button is properly utilized.  
	Double-clicking on a color, OTOH, willl apply the color and dismiss the
	dialog.


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/calc-sheet-tab-color-sc.diff

Modified: trunk/patches/dev300/calc-sheet-tab-color-sc.diff
==============================================================================
--- trunk/patches/dev300/calc-sheet-tab-color-sc.diff	(original)
+++ trunk/patches/dev300/calc-sheet-tab-color-sc.diff	Fri Feb  6 15:47:44 2009
@@ -649,10 +649,10 @@
 +#define TAB_BG_COLOR_BTN_MORE 4
 diff --git sc/source/ui/inc/tabbgcolordlg.hxx sc/source/ui/inc/tabbgcolordlg.hxx
 new file mode 100644
-index 0000000..c302365
+index 0000000..523a210
 --- /dev/null
 +++ sc/source/ui/inc/tabbgcolordlg.hxx
-@@ -0,0 +1,76 @@
+@@ -0,0 +1,77 @@
 +/*************************************************************************
 + *
 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -713,7 +713,7 @@
 +        Control             aBorderWin;
 +        ValueSet            aTabBgColorSet;
 +        FixedLine           aTabBgColorBox;
-+        PushButton          aTabBgColorMore;
++        /*PushButton          aTabBgColorMore;*/
 +        OKButton            aBtnOk;
 +        CancelButton        aBtnCancel;
 +        HelpButton          aBtnHelp;
@@ -725,7 +725,8 @@
 +        void            FillColorValueSets_Impl();
 +
 +        DECL_LINK( TabBgColorSetHdl_Impl, ValueSet* );
-+        DECL_LINK( TabBgColorMoreHdl_Impl, PushButton* pBtn );
++        /*DECL_LINK( TabBgColorMoreHdl_Impl, PushButton* pBtn );*/
++        DECL_LINK( TabBgColorOKHdl_Impl, OKButton* pBtn );
 +};
 +
 +#endif // SC_TABBGCOLORDLG_HXX
@@ -817,10 +818,10 @@
  	$(SLO)$/filldlg.obj			\
 diff --git sc/source/ui/miscdlgs/tabbgcolordlg.cxx sc/source/ui/miscdlgs/tabbgcolordlg.cxx
 new file mode 100644
-index 0000000..cc3ea40
+index 0000000..5e2be9b
 --- /dev/null
 +++ sc/source/ui/miscdlgs/tabbgcolordlg.cxx
-@@ -0,0 +1,234 @@
+@@ -0,0 +1,254 @@
 +/*************************************************************************
 + *
 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -905,7 +906,7 @@
 +    aBorderWin              ( this, ScResId( TAB_BG_COLOR_CT_BORDER ) ),
 +    aTabBgColorSet          ( &aBorderWin, ScResId( TAB_BG_COLOR_SET_BGDCOLOR ) ),
 +    aTabBgColorBox          ( this, ScResId( TAB_BG_COLOR_GB_BGDCOLOR ) ),
-+    aTabBgColorMore         ( this, ScResId( TAB_BG_COLOR_BTN_MORE ) ),
++/*    aTabBgColorMore         ( this, ScResId( TAB_BG_COLOR_BTN_MORE ) ),*/
 +    aBtnOk                  ( this, ScResId( BTN_OK ) ),
 +    aBtnCancel              ( this, ScResId( BTN_CANCEL ) ),
 +    aBtnHelp                ( this, ScResId( BTN_HELP ) ),
@@ -919,13 +920,14 @@
 +    this->SetText( rTitle );
 +    this->SetStyle(GetStyle() | WB_BORDER | WB_STDFLOATWIN | WB_3DLOOK | WB_DIALOGCONTROL | WB_SYSTEMWINDOW | WB_STANDALONE | WB_HIDE);
 +    //TODO: Assign Help ID's to all controls...
-+    aTabBgColorBox.SetText(rTitle);
++    /*aTabBgColorBox.SetText(rTitle);
 +    WinBits nBits = ( aTabBgColorMore.GetStyle() | WB_3DLOOK | WB_CENTER | WB_VCENTER );
 +    aTabBgColorMore.SetText( aTabBgColorMoreText ); 
-+    aTabBgColorMore.SetStyle( nBits );
++    aTabBgColorMore.SetStyle( nBits );*/
 +    FillColorValueSets_Impl();
-+    aTabBgColorSet.SetSelectHdl( HDL(TabBgColorSetHdl_Impl) );
-+    aTabBgColorMore.SetClickHdl( HDL(TabBgColorMoreHdl_Impl) );
++    aTabBgColorSet.SetDoubleClickHdl( HDL(TabBgColorSetHdl_Impl) );
++    /*aTabBgColorMore.SetClickHdl( HDL(TabBgColorMoreHdl_Impl) );*/
++    aBtnOk.SetClickHdl( HDL(TabBgColorOKHdl_Impl) );
 +    FreeResource();
 +}
 +
@@ -946,6 +948,10 @@
 +    const SfxPoolItem* pItem = NULL;
 +    XColorTable* pColorTable = NULL;
 +    const Size aSize15x15 = Size( 15, 15 );
++    const Size aSize10x10 = Size( 10, 10 );
++    const Size aSize5x5 = Size( 5, 5 );
++    USHORT nSelectedItem = 0;
++
 +    FASTBOOL bOwn = FALSE;
 +
 +    DBG_ASSERT( pDocSh, "DocShell not found!" );
@@ -964,17 +970,15 @@
 +        XColorEntry* pEntry = NULL;
 +        Color aColWhite( COL_WHITE );
 +        String aStrWhite( ScResId( RID_SVXITEMS_COLOR_WHITE ) );
-+        WinBits nBits = ( aTabBgColorSet.GetStyle() | WB_NAMEFIELD | WB_ITEMBORDER | WB_NONEFIELD | WB_3DLOOK | WB_NO_DIRECTSELECT ); //removed WB_NAMEFIELD...
++        WinBits nBits = ( aTabBgColorSet.GetStyle() | WB_NAMEFIELD | WB_ITEMBORDER | WB_NONEFIELD | WB_3DLOOK | WB_NO_DIRECTSELECT ); //removed WB_NAMEFIELD, ...
 +        aTabBgColorSet.SetText( aTabBgColorNoColorText );
 +        aTabBgColorSet.SetStyle( nBits );
-+        aTabBgColorSet.SelectItem(0);
-+
 +        for ( i = 0; i < nCount; i++ )
 +        {
 +            pEntry = pColorTable->GetColor(i);
 +            aTabBgColorSet.InsertItem( i + 1, pEntry->GetColor(), pEntry->GetName() );
 +            if (pEntry->GetColor() == aTabBgColor)
-+                aTabBgColorSet.SelectItem(i + 1);
++                nSelectedItem = (i + 1);
 +        }
 +
 +        while ( i < 80 )
@@ -987,13 +991,17 @@
 +        {
 +            aTabBgColorSet.SetStyle( nBits | WB_VSCROLL );
 +        }
++
 +    }
-+    if ( bOwn )
-+        delete pColorTable;
 +    aTabBgColorSet.SetColCount( 10 );
 +    aTabBgColorSet.SetLineCount( 10 );
 +    aTabBgColorSet.CalcWindowSizePixel( aSize15x15 );
-+    aTabBgColorSet.StartSelection();
++    aTabBgColorSet.Format();
++    aTabBgColorSet.SelectItem(nSelectedItem);
++//    aTabBgColorSet.StartSelection();
++    aTabBgColorSet.Resize();
++    if ( bOwn )
++        delete pColorTable;
 +}
 +IMPL_LINK( ScTabBgColorDlg, TabBgColorSetHdl_Impl, ValueSet*, EMPTYARG )
 +/*
@@ -1006,12 +1014,23 @@
 +    EndDialog( TRUE );
 +    return 0;
 +}
++IMPL_LINK( ScTabBgColorDlg, TabBgColorOKHdl_Impl, OKButton*, EMPTYARG )
++{
++/*
++    Handler, called when the more button is pushed
++*/
++    USHORT nItemId = aTabBgColorSet.GetSelectItemId();
++    Color aColor = nItemId ? ( aTabBgColorSet.GetItemColor( nItemId ) ) : Color( COL_AUTO );
++    aTabBgColor = aColor;
++    EndDialog( TRUE );
++    return 0;
++}
 +
-+IMPL_LINK( ScTabBgColorDlg, TabBgColorMoreHdl_Impl, PushButton*, EMPTYARG )
++/*IMPL_LINK( ScTabBgColorDlg, TabBgColorMoreHdl_Impl, PushButton*, EMPTYARG )*/
 +/*
 +    Handler, called when the more button is pushed
 +*/
-+{
++/*{
 +    USHORT      nRet    = RET_OK;
 +    BOOL bOwn = FALSE;
 +    BOOL bInColorTable = FALSE;
@@ -1050,11 +1069,13 @@
 +        {
 +            XColorEntry* pNewEntry = new XColorEntry(aTabBgColor, String::CreateFromAscii(""));
 +            pColorTable->Insert( (pColorTable->Count()+1), pNewEntry );
++	    aTabBgColorSet.InsertItem( aTabBgColorSet.GetItemCount()+1, pNewEntry->GetColor(), pNewEntry->GetName() );
++	    aTabBgColorSet.SelectItem( aTabBgColorSet.GetItemCount() );
 +        }
-+        EndDialog( TRUE );
++        //EndDialog( TRUE );
 +    }
 +    return 0;
-+}
++}*/
 diff --git sc/source/ui/src/globstr.src sc/source/ui/src/globstr.src
 index 6912e7a..bf4a147 100644
 --- sc/source/ui/src/globstr.src
@@ -1071,7 +1092,7 @@
  	{
  		Text [ en-US ] = "Move Sheets" ;
 diff --git sc/source/ui/src/miscdlgs.src sc/source/ui/src/miscdlgs.src
-index fce9761..67ff9ec 100644
+index fce9761..0575a23 100644
 --- sc/source/ui/src/miscdlgs.src
 +++ sc/source/ui/src/miscdlgs.src
 @@ -546,6 +546,58 @@ ModalDialog RID_SCDLG_STRINPUT
@@ -1082,7 +1103,7 @@
 +{
 +    OutputSize = TRUE ;
 +    SVLook = TRUE ;
-+    Size = MAP_APPFONT ( 180 , 170 ) ;
++    Size = MAP_APPFONT ( 180 , 150 ) ;
 +    Moveable = TRUE ;
 +    Closeable = TRUE ;
 +    Control TAB_BG_COLOR_CT_BORDER
@@ -1100,14 +1121,14 @@
 +        Size = MAP_APPFONT ( 116 , 145 ) ;
 +        TabStop = TRUE ;
 +    };
-+    PushButton TAB_BG_COLOR_BTN_MORE
++    /*PushButton TAB_BG_COLOR_BTN_MORE
 +    {
 +        Pos = MAP_APPFONT ( 34, 152 ) ;
 +        Size = MAP_APPFONT ( 50 , 15 ) ;
 +        //Text =  SCSTR_TAB_BG_COLOR_MORE;
 +        TabStop = TRUE ;
 +        DefButton = FALSE ;
-+    };
++    };*/
 +    OKButton BTN_OK
 +    {
 +        Pos = MAP_APPFONT ( 125 , 50 ) ;