Skip to content

C
core
Kaydet (Commit) 1c8ea218 authored tarafından Robert Dargaud's avatar Robert Dargaud Kaydeden (comit) Katarina Machalkova
Dosyalara gözat
Seçenekler

Unlimited number of conditions for conditional formatting 

(Calc part)
üst f7d31f5b
Expand all Show whitespace changes
Inline Side-by-side
Showing with 80 additions and 9 deletions
sc/source/ui/inc/condfrmt.hrc
Dosyayı görüntüle @ 1c8ea218
...@@ -63,6 +63,13 @@ ...@@ -63,6 +63,13 @@
#define FL_SEP1 41 #define FL_SEP1 41
#define FL_SEP2 42 #define FL_SEP2 42
#define LB_SCROLL 43
#define WIN_CHAR_PREVIEW_COND1 44
#define WIN_CHAR_PREVIEW_COND2 45
#define WIN_CHAR_PREVIEW_COND3 46
#define BTN_INSERT 47
//IAccessibility2 Implementation 2009----- //IAccessibility2 Implementation 2009-----
#define LABEL_FORMARTTING_CONDITIONS 5043 #define LABEL_FORMARTTING_CONDITIONS 5043
#define LABEL_CONDITIONS 5044 #define LABEL_CONDITIONS 5044
......
sc/source/ui/inc/condfrmt.hxx
Dosyayı görüntüle @ 1c8ea218
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
#include "anyrefdg.hxx" #include "anyrefdg.hxx"
#include <vcl/fixed.hxx> #include <vcl/fixed.hxx>
#include <vcl/lstbox.hxx> #include <vcl/lstbox.hxx>
#include <svx/fntctrl.hxx>
class ScDocument; class ScDocument;
...@@ -56,6 +57,8 @@ public: ...@@ -56,6 +57,8 @@ public:
virtual void AddRefEntry(); virtual void AddRefEntry();
virtual sal_Bool IsRefInputMode() const; virtual sal_Bool IsRefInputMode() const;
virtual void SetActive(); virtual void SetActive();
void SliderMoved();
sal_uInt16 GetSliderPos();
virtual sal_Bool Close(); virtual sal_Bool Close();
private: private:
...@@ -70,6 +73,9 @@ private: ...@@ -70,6 +73,9 @@ private:
FixedText aFtCond1Template; FixedText aFtCond1Template;
ListBox aLbCond1Template; ListBox aLbCond1Template;
PushButton aBtnNew1; PushButton aBtnNew1;
SvxFontPrevWindow aPreviewWin1;
FixedLine aFlSep1;
CheckBox aCbxCond2; CheckBox aCbxCond2;
ListBox aLbCond21; ListBox aLbCond21;
ListBox aLbCond22; ListBox aLbCond22;
...@@ -81,6 +87,9 @@ private: ...@@ -81,6 +87,9 @@ private:
FixedText aFtCond2Template; FixedText aFtCond2Template;
ListBox aLbCond2Template; ListBox aLbCond2Template;
PushButton aBtnNew2; PushButton aBtnNew2;
SvxFontPrevWindow aPreviewWin2;
FixedLine aFlSep2;
CheckBox aCbxCond3; CheckBox aCbxCond3;
ListBox aLbCond31; ListBox aLbCond31;
ListBox aLbCond32; ListBox aLbCond32;
...@@ -92,9 +101,12 @@ private: ...@@ -92,9 +101,12 @@ private:
FixedText aFtCond3Template; FixedText aFtCond3Template;
ListBox aLbCond3Template; ListBox aLbCond3Template;
PushButton aBtnNew3; PushButton aBtnNew3;
SvxFontPrevWindow aPreviewWin3;
ScrollBar aScrollBar;
OKButton aBtnOk; OKButton aBtnOk;
CancelButton aBtnCancel; CancelButton aBtnCancel;
PushButton aBtnInsert;
HelpButton aBtnHelp; HelpButton aBtnHelp;
Point aCond1Pos1; Point aCond1Pos1;
...@@ -120,31 +132,48 @@ private: ...@@ -120,31 +132,48 @@ private:
Size aCond3Size1; Size aCond3Size1;
Size aCond3Size2; Size aCond3Size2;
Size aCond3Size3; Size aCond3Size3;
FixedLine aFlSep2;
FixedLine aFlSep1;
formula::RefEdit* pEdActive; formula::RefEdit* pEdActive;
sal_Bool bDlgLostFocus; sal_Bool bDlgLostFocus;
ScDocument* pDoc; ScDocument* pDoc;
ScCondFormatEntry** ppEntries;
sal_uInt16 nEntryCount;
sal_uInt16 nCurrentOffset;
String aCbxCond1InitialText;
String aCbxCond2InitialText;
String aCbxCond3InitialText;
#ifdef _CONDFRMT_CXX #ifdef _CONDFRMT_CXX
void InsertEntry();
void AddEntry();
void GetConditionalFormat( ScConditionalFormat& rCndFmt ); void GetConditionalFormat( ScConditionalFormat& rCndFmt );
void Refresh( sal_uInt16 nOffset );
void UpdateValueList ( sal_uInt16 nOffset );
void Cond1Cheked( sal_Bool bChecked );
void Cond2Cheked( sal_Bool bChecked );
void Cond3Cheked( sal_Bool bChecked );
DECL_LINK( ClickCond1Hdl, void * ); DECL_LINK( ClickCond1Hdl, void * );
DECL_LINK( ChangeCond11Hdl, void * ); DECL_LINK( ChangeCond11Hdl, void * );
DECL_LINK( ChangeCond12Hdl, void * ); DECL_LINK( ChangeCond12Hdl, void * );
DECL_LINK( ChangeCond1TemplateHdl, void * );
DECL_LINK( ClickCond2Hdl, void * ); DECL_LINK( ClickCond2Hdl, void * );
DECL_LINK( ChangeCond21Hdl, void * ); DECL_LINK( ChangeCond21Hdl, void * );
DECL_LINK( ChangeCond22Hdl, void * ); DECL_LINK( ChangeCond22Hdl, void * );
DECL_LINK( ChangeCond2TemplateHdl, void * );
DECL_LINK( ClickCond3Hdl, void * ); DECL_LINK( ClickCond3Hdl, void * );
DECL_LINK( ChangeCond31Hdl, void * ); DECL_LINK( ChangeCond31Hdl, void * );
DECL_LINK( ChangeCond32Hdl, void * ); DECL_LINK( ChangeCond32Hdl, void * );
DECL_LINK( ChangeCond3TemplateHdl, void * );
DECL_LINK( GetFocusHdl, Control* ); DECL_LINK( GetFocusHdl, Control* );
DECL_LINK( LoseFocusHdl, Control* ); DECL_LINK( LoseFocusHdl, Control* );
DECL_LINK( BtnHdl, PushButton* ); DECL_LINK( BtnHdl, PushButton* );
DECL_LINK( NewBtnHdl, PushButton* ); DECL_LINK( NewBtnHdl, PushButton* );
DECL_LINK( ScrollHdl, ScrollBar* );
#endif // _CONDFRMT_CXX #endif // _CONDFRMT_CXX
}; };
......
sc/source/ui/src/condfrmt.src
Dosyayı görüntüle @ 1c8ea218
...@@ -31,7 +31,7 @@ ModelessDialog RID_SCDLG_CONDFORMAT ...@@ -31,7 +31,7 @@ ModelessDialog RID_SCDLG_CONDFORMAT
{ {
OutputSize = TRUE ; OutputSize = TRUE ;
SVLook = TRUE ; SVLook = TRUE ;
Size = MAP_APPFONT ( 316 , 161 ) ; Size = MAP_APPFONT ( 326 , 161 ) ;
Moveable = TRUE ; Moveable = TRUE ;
Closeable = TRUE ; Closeable = TRUE ;
HelpId = HID_SCDLG_CONDFORMAT ; HelpId = HID_SCDLG_CONDFORMAT ;
...@@ -136,10 +136,17 @@ ModelessDialog RID_SCDLG_CONDFORMAT ...@@ -136,10 +136,17 @@ ModelessDialog RID_SCDLG_CONDFORMAT
DropDown = TRUE ; DropDown = TRUE ;
Sort = TRUE ; Sort = TRUE ;
}; };
Window WIN_CHAR_PREVIEW_COND1
{
Border = FALSE ;
Pos = MAP_APPFONT ( 124 , 34 ) ;
Size = MAP_APPFONT ( 41 , 14 ) ;
Text [ en-US ] = "Example";
};
PushButton BTN_COND1_NEW PushButton BTN_COND1_NEW
{ {
HelpID = "sc:PushButton:RID_SCDLG_CONDFORMAT:BTN_COND1_NEW"; HelpID = "sc:PushButton:RID_SCDLG_CONDFORMAT:BTN_COND1_NEW";
Pos = MAP_APPFONT ( 124 , 34 ) ; Pos = MAP_APPFONT ( 169 , 34 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ; Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ; TabStop = TRUE ;
Text [ en-US ] = "~New Style..." ; Text [ en-US ] = "~New Style..." ;
...@@ -249,10 +256,17 @@ ModelessDialog RID_SCDLG_CONDFORMAT ...@@ -249,10 +256,17 @@ ModelessDialog RID_SCDLG_CONDFORMAT
DropDown = TRUE ; DropDown = TRUE ;
Sort = TRUE ; Sort = TRUE ;
}; };
Window WIN_CHAR_PREVIEW_COND2
{
Border = FALSE ;
Pos = MAP_APPFONT ( 124 , 88 ) ;
Size = MAP_APPFONT ( 41 , 14 ) ;
Text [ en-US ] = "Example";
};
PushButton BTN_COND2_NEW PushButton BTN_COND2_NEW
{ {
HelpID = "sc:PushButton:RID_SCDLG_CONDFORMAT:BTN_COND2_NEW"; HelpID = "sc:PushButton:RID_SCDLG_CONDFORMAT:BTN_COND2_NEW";
Pos = MAP_APPFONT ( 124 , 88 ) ; Pos = MAP_APPFONT ( 169 , 88 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ; Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ; TabStop = TRUE ;
Text [ en-US ] = "Ne~w Style..." ; Text [ en-US ] = "Ne~w Style..." ;
...@@ -362,30 +376,51 @@ ModelessDialog RID_SCDLG_CONDFORMAT ...@@ -362,30 +376,51 @@ ModelessDialog RID_SCDLG_CONDFORMAT
DropDown = TRUE ; DropDown = TRUE ;
Sort = TRUE ; Sort = TRUE ;
}; };
Window WIN_CHAR_PREVIEW_COND3
{
Border = FALSE ;
Pos = MAP_APPFONT ( 124 , 142 ) ;
Size = MAP_APPFONT ( 41 , 14 ) ;
Text [ en-US ] = "Example";
};
PushButton BTN_COND3_NEW PushButton BTN_COND3_NEW
{ {
HelpID = "sc:PushButton:RID_SCDLG_CONDFORMAT:BTN_COND3_NEW"; HelpID = "sc:PushButton:RID_SCDLG_CONDFORMAT:BTN_COND3_NEW";
Pos = MAP_APPFONT ( 124 , 142 ) ; Pos = MAP_APPFONT ( 169 , 142 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ; Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ; TabStop = TRUE ;
Text [ en-US ] = "New ~Style..." ; Text [ en-US ] = "New ~Style..." ;
}; };
ScrollBar LB_SCROLL
{
Pos = MAP_APPFONT ( 260, 6 ) ;
Size = MAP_APPFONT ( 8 , 150 ) ;
TabStop = TRUE ;
VScroll = TRUE ;
};
OKButton BTN_OK OKButton BTN_OK
{ {
Pos = MAP_APPFONT ( 260 , 6 ) ; Pos = MAP_APPFONT ( 270 , 6 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ; Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ; TabStop = TRUE ;
DefButton = TRUE ; DefButton = TRUE ;
}; };
CancelButton BTN_CANCEL CancelButton BTN_CANCEL
{ {
Pos = MAP_APPFONT ( 260 , 23 ) ; Pos = MAP_APPFONT ( 270 , 23 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
};
PushButton BTN_INSERT
{
Pos = MAP_APPFONT ( 270 , 57 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ; Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ; TabStop = TRUE ;
Text [ en-US ] = "~Insert" ;
}; };
HelpButton BTN_HELP HelpButton BTN_HELP
{ {
Pos = MAP_APPFONT ( 260 , 43 ) ; Pos = MAP_APPFONT ( 270 , 74 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ; Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ; TabStop = TRUE ;
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment