diff options
author | Joseph Powers <jpowers27@cox.net> | 2010-11-23 21:07:47 -0800 |
---|---|---|
committer | Joseph Powers <jpowers27@cox.net> | 2010-11-23 21:44:31 -0800 |
commit | 0b176013df99ee6b10305306b9a9dd07ad51a8a5 (patch) | |
tree | cf6f32239289d171591c1933abc686f03d8b3404 /reportdesign | |
parent | Spelling mistakes and dead code (diff) | |
download | core-0b176013df99ee6b10305306b9a9dd07ad51a8a5.tar.gz core-0b176013df99ee6b10305306b9a9dd07ad51a8a5.zip |
.bmp to .png, plus formatting issues.
Diffstat (limited to 'reportdesign')
-rw-r--r-- | reportdesign/source/core/resource/strings.src | 13 | ||||
-rw-r--r-- | reportdesign/source/ui/dlg/CondFormat.src | 36 | ||||
-rw-r--r-- | reportdesign/source/ui/dlg/DateTime.src | 6 | ||||
-rw-r--r-- | reportdesign/source/ui/dlg/GroupsSorting.cxx | 9 | ||||
-rw-r--r-- | reportdesign/source/ui/dlg/GroupsSorting.src | 95 | ||||
-rw-r--r-- | reportdesign/source/ui/inc/GroupsSorting.hxx | 12 | ||||
-rw-r--r-- | reportdesign/source/ui/report/report.src | 4 |
7 files changed, 70 insertions, 105 deletions
diff --git a/reportdesign/source/core/resource/strings.src b/reportdesign/source/core/resource/strings.src index d6191e2f381e..bdc63648633a 100644 --- a/reportdesign/source/core/resource/strings.src +++ b/reportdesign/source/core/resource/strings.src @@ -31,26 +31,32 @@ String RID_STR_DETAIL { Text [ en-US ] = "Detail"; }; + String RID_STR_PAGE_HEADER { Text [ en-US ] = "Page Header"; }; + String RID_STR_PAGE_FOOTER { Text [ en-US ] = "Page Footer"; }; + String RID_STR_GROUP_HEADER { Text [ en-US ] = "Group Header"; }; + String RID_STR_GROUP_FOOTER { Text [ en-US ] = "Group Footer"; }; + String RID_STR_REPORT_HEADER { Text [ en-US ] = "Report Header"; }; + String RID_STR_REPORT_FOOTER { Text [ en-US ] = "Report Footer"; @@ -65,30 +71,37 @@ String RID_STR_ERROR_WRONG_ARGUMENT { Text [ en-US ] = "You tried to set an illegal argument. Please have a look at '#1' for valid arguments."; }; + String RID_STR_ARGUMENT_IS_NULL { Text [ en-US ] = "The element is invalid."; }; + String RID_STR_FIXEDTEXT { Text [ en-US ] = "Label field" ; }; + String RID_STR_FORMATTEDFIELD { Text [ en-US ] = "Formatted field"; }; + String RID_STR_IMAGECONTROL { Text [ en-US ] = "Image control" ; }; + String RID_STR_REPORT { Text [ en-US ] = "Report"; }; + String RID_STR_SHAPE { Text [ en-US ] = "Shape"; }; + String RID_STR_FIXEDLINE { Text [ en-US ] = "Fixed line"; diff --git a/reportdesign/source/ui/dlg/CondFormat.src b/reportdesign/source/ui/dlg/CondFormat.src index f688d243cafe..2e5e352bcbde 100644 --- a/reportdesign/source/ui/dlg/CondFormat.src +++ b/reportdesign/source/ui/dlg/CondFormat.src @@ -276,12 +276,12 @@ ImageList IMG_CONDFORMAT_DLG_SC MASKCOLOR; FileList = { - < "res/commandimagelist/sc_bold.png" ; SID_ATTR_CHAR_WEIGHT ; > ; - < "res/commandimagelist/sc_italic.png" ; SID_ATTR_CHAR_POSTURE ; > ; - < "res/commandimagelist/sc_underline.png" ; SID_ATTR_CHAR_UNDERLINE ; > ; - < "res/commandimagelist/sc_backgroundcolor.png" ; SID_BACKGROUND_COLOR ; > ; - < "res/commandimagelist/sc_fontcolor.png" ; SID_ATTR_CHAR_COLOR2 ; > ; - < "res/commandimagelist/sc_fontdialog.png" ; SID_CHAR_DLG ; > ; + < "res/commandimagelist/sc_bold.png" ; SID_ATTR_CHAR_WEIGHT ; > ; + < "res/commandimagelist/sc_italic.png" ; SID_ATTR_CHAR_POSTURE ; > ; + < "res/commandimagelist/sc_underline.png" ; SID_ATTR_CHAR_UNDERLINE ; > ; + < "res/commandimagelist/sc_backgroundcolor.png" ; SID_BACKGROUND_COLOR ; > ; + < "res/commandimagelist/sc_fontcolor.png" ; SID_ATTR_CHAR_COLOR2 ; > ; + < "res/commandimagelist/sc_fontdialog.png" ; SID_CHAR_DLG ; > ; }; }; @@ -290,12 +290,12 @@ ImageList IMG_CONDFORMAT_DLG_LC MASKCOLOR; FileList = { - < "res/commandimagelist/lc_bold.png" ; SID_ATTR_CHAR_WEIGHT ; > ; - < "res/commandimagelist/lc_italic.png" ; SID_ATTR_CHAR_POSTURE ; > ; - < "res/commandimagelist/lc_underline.png" ; SID_ATTR_CHAR_UNDERLINE ; > ; - < "res/commandimagelist/lc_backgroundcolor.png" ; SID_BACKGROUND_COLOR ; > ; - < "res/commandimagelist/lc_fontcolor.png" ; SID_ATTR_CHAR_COLOR2 ; > ; - < "res/commandimagelist/lc_fontdialog.png" ; SID_CHAR_DLG ; > ; + < "res/commandimagelist/lc_bold.png" ; SID_ATTR_CHAR_WEIGHT ; > ; + < "res/commandimagelist/lc_italic.png" ; SID_ATTR_CHAR_POSTURE ; > ; + < "res/commandimagelist/lc_underline.png" ; SID_ATTR_CHAR_UNDERLINE ; > ; + < "res/commandimagelist/lc_backgroundcolor.png" ; SID_BACKGROUND_COLOR ; > ; + < "res/commandimagelist/lc_fontcolor.png" ; SID_ATTR_CHAR_COLOR2 ; > ; + < "res/commandimagelist/lc_fontdialog.png" ; SID_CHAR_DLG ; > ; }; }; @@ -350,9 +350,9 @@ ImageList IMG_ADDFIELD_DLG_SC MASKCOLOR; FileList = { - < "res/commandimagelist/sc_sortup.png" ; SID_FM_SORTUP ; > ; - < "res/commandimagelist/sc_sortdown.png" ; SID_FM_SORTDOWN ; > ; - < "res/commandimagelist/sc_removefiltersort.png" ; SID_FM_REMOVE_FILTER_SORT ; > ; + < "res/commandimagelist/sc_sortup.png" ; SID_FM_SORTUP ; > ; + < "res/commandimagelist/sc_sortdown.png" ; SID_FM_SORTDOWN ; > ; + < "res/commandimagelist/sc_removefiltersort.png" ; SID_FM_REMOVE_FILTER_SORT ; > ; }; }; @@ -361,9 +361,9 @@ ImageList IMG_ADDFIELD_DLG_LC MASKCOLOR; FileList = { - < "res/commandimagelist/lc_sortup.png" ; SID_FM_SORTUP ; > ; - < "res/commandimagelist/lc_sortdown.png" ; SID_FM_SORTDOWN ; > ; - < "res/commandimagelist/lc_removefiltersort.png" ; SID_FM_REMOVE_FILTER_SORT ; > ; + < "res/commandimagelist/lc_sortup.png" ; SID_FM_SORTUP ; > ; + < "res/commandimagelist/lc_sortdown.png" ; SID_FM_SORTDOWN ; > ; + < "res/commandimagelist/lc_removefiltersort.png" ; SID_FM_REMOVE_FILTER_SORT ; > ; }; }; diff --git a/reportdesign/source/ui/dlg/DateTime.src b/reportdesign/source/ui/dlg/DateTime.src index 0e30747fb78c..4324db909568 100644 --- a/reportdesign/source/ui/dlg/DateTime.src +++ b/reportdesign/source/ui/dlg/DateTime.src @@ -74,8 +74,8 @@ ModalDialog RID_DATETIME_DLG { Pos = MAP_APPFONT ( RELATED_CONTROLS , RELATED_CONTROLS + 2*UNRELATED_CONTROLS + CHECKBOX_HEIGHT + LISTBOX_HEIGHT) ; Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS , 1 ) ; - // Text [ en-US ] = "Time"; }; + CheckBox CB_TIME { Pos = MAP_APPFONT ( UNRELATED_CONTROLS, RELATED_CONTROLS + 3*UNRELATED_CONTROLS + CHECKBOX_HEIGHT + LISTBOX_HEIGHT) ; @@ -100,11 +100,13 @@ ModalDialog RID_DATETIME_DLG TabStop = TRUE; Sort = FALSE; }; + FixedLine FL_SEPARATOR1 { Pos = MAP_APPFONT ( RELATED_CONTROLS , RELATED_CONTROLS + 5*UNRELATED_CONTROLS + 2*CHECKBOX_HEIGHT + 2*LISTBOX_HEIGHT) ; Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS , 1 ) ; }; + OKButton PB_OK { Pos = MAP_APPFONT ( UNRELATED_CONTROLS, RELATED_CONTROLS + 6*UNRELATED_CONTROLS + 2*CHECKBOX_HEIGHT + 2*LISTBOX_HEIGHT +1) ; @@ -112,12 +114,14 @@ ModalDialog RID_DATETIME_DLG TabStop = TRUE ; DefButton = TRUE ; }; + CancelButton PB_CANCEL { Pos = MAP_APPFONT ( RELATED_CONTROLS + UNRELATED_CONTROLS + BUTTON_WIDTH , RELATED_CONTROLS + 6*UNRELATED_CONTROLS + 2*CHECKBOX_HEIGHT + 2*LISTBOX_HEIGHT +1) ; Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ; TabStop = TRUE ; }; + HelpButton PB_HELP { TabStop = TRUE ; diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx index b08d8da392c1..5c6c23935548 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.cxx +++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx @@ -1000,7 +1000,7 @@ OGroupsSortingDialog::OGroupsSortingDialog( Window* _pParent pControlsLst[i]->SetGetFocusHdl(LINK(this, OGroupsSortingDialog, OnControlFocusGot)); pControlsLst[i]->SetLoseFocusHdl(LINK(this, OGroupsSortingDialog, OnControlFocusLost)); pControlsLst[i]->Show(TRUE); - } // for (int i = 0; i < SAL_N_ELEMENTS(pControls); ++i) + } for (size_t i = 0; i < (SAL_N_ELEMENTS(pControlsLst))-1; ++i) static_cast<ListBox*>(pControlsLst[i])->SetSelectHdl(LINK(this,OGroupsSortingDialog,LBChangeHdl)); @@ -1341,7 +1341,8 @@ void OGroupsSortingDialog::displayGroup(const uno::Reference<report::XGroup>& _x m_aGroupOnLst.InsertEntry(String(ModuleRes(STR_RPT_INTERVAL))); m_aGroupOnLst.SetEntryData(1,reinterpret_cast<void*>(report::GroupOn::INTERVAL)); break; - } // switch(nDataType) + } + USHORT nPos = 0; switch(_xGroup->getGroupOn()) { @@ -1409,7 +1410,7 @@ void OGroupsSortingDialog::Resize() for (size_t i = 0; i < SAL_N_ELEMENTS(pControls); ++i) { nMaxTextWidth = ::std::max<sal_Int32>(static_cast<sal_Int32>(GetTextWidth(pControls[i]->GetText())),nMaxTextWidth); - } // for (int i = 0; i < SAL_N_ELEMENTS(pControls); ++i) + } // aTotalOutputSize.Width() - m_aHeaderLst.GetSizePixel().Width() - 3*aSpace.Width() for (size_t i = 0; i < SAL_N_ELEMENTS(pControls); ++i) @@ -1420,7 +1421,7 @@ void OGroupsSortingDialog::Resize() aPos.Y() = pControlsLst[i]->GetPosPixel().Y(); pControlsLst[i]->SetPosSizePixel(aPos,Size(aTotalOutputSize.Width() - aPos.X() - aSpace.Width(),pControlsLst[i]->GetSizePixel().Height())); - } // for (int i = 0; i < SAL_N_ELEMENTS(pControls); ++i) + } m_aFL.SetSizePixel(Size(aTotalOutputSize.Width() - aSpace.Width(),m_aFL.GetSizePixel().Height())); m_aFL2.SetSizePixel(Size(aTotalOutputSize.Width() - aSpace.Width(),m_aFL2.GetSizePixel().Height())); diff --git a/reportdesign/source/ui/dlg/GroupsSorting.src b/reportdesign/source/ui/dlg/GroupsSorting.src index b9163bc6ce34..159a457011ce 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.src +++ b/reportdesign/source/ui/dlg/GroupsSorting.src @@ -66,57 +66,13 @@ FloatingWindow RID_GROUPS_SORTING { Pos = MAP_APPFONT ( UNRELATED_CONTROLS , 3*UNRELATED_CONTROLS + BROWSER_HEIGHT ) ; Size = MAP_APPFONT ( FIXEDTEXT_WIDTH , FIXEDTEXT_HEIGHT ) ; -// Text [ en-US ] = "Move group" ; Text [ en-US ] = "Group actions" ; }; -// /* -// | PAGE_WIDTH | -// | /-----\ {-------\ /---------\ | -// | unreleated FT_MOVELABEL |PB_UP| unreleated |PB_DOWN| unreleated |PD_DELETE| unreleated | -// | \_____/ \_______/ \_________/ | -// -// Don't set any position here, it will be done in OGroupsSortingDialog::Resize() -// -// Find possible IMAGEBUTTON_* in rscicpx.cxx -// Symbol is vclrsc.hxx -// */ -// ImageButton PB_UP -// { -// Pos = MAP_APPFONT ( PAGE_WIDTH - 3*UNRELATED_CONTROLS - 3*14 - 2*RELATED_CONTROLS, 3*UNRELATED_CONTROLS + BROWSER_HEIGHT -1 ) ; -// Size = MAP_APPFONT ( 14 , 14 ) ; -// TabStop = TRUE; -// // Symbol = IMAGEBUTTON_ARROW_UP ; // arrow up -// Symbol = IMAGEBUTTON_SPIN_UP ; // triangle up -// // Symbol = IMAGEBUTTON_FLOAT; -// }; -// -// ImageButton PB_DOWN -// { -// Pos = MAP_APPFONT ( PAGE_WIDTH - 2*UNRELATED_CONTROLS - 2*14 - 2*RELATED_CONTROLS, 3*UNRELATED_CONTROLS + BROWSER_HEIGHT - 1 ) ; -// Size = MAP_APPFONT ( 14 , 14 ) ; -// TabStop = TRUE; -// // Symbol = IMAGEBUTTON_ARROW_DOWN ; // arrow down -// // Symbol = IMAGEBUTTON_FIRST ; -// Symbol = IMAGEBUTTON_SPIN_DOWN; -// -// }; -// -// ImageButton PB_DELETE -// { -// Pos = MAP_APPFONT ( PAGE_WIDTH - UNRELATED_CONTROLS - 14, 3*UNRELATED_CONTROLS + BROWSER_HEIGHT - 1 ) ; -// Size = MAP_APPFONT ( 14 , 14 ) ; -// TabStop = TRUE; -// Symbol = IMAGEBUTTON_CLOSE ; -// }; - - ToolBox TB_TOOLBOX { Pos = MAP_APPFONT ( PAGE_WIDTH - 4*14 - UNRELATED_CONTROLS, 3*UNRELATED_CONTROLS + BROWSER_HEIGHT - 1 ) ; ButtonType = BUTTON_SYMBOL; -// Align = BOXALIGN_TOP; -// HelpId = HID_RPT_CONDFORMAT_TB; Customize = FALSE; ItemList = { @@ -127,7 +83,6 @@ FloatingWindow RID_GROUPS_SORTING HelpID = HID_RPT_GROUPSORT_MOVE_UP ; Text [ en-US ] = "Move up" ; Checkable = TRUE; -// Disable = TRUE; }; ToolBoxItem { @@ -136,7 +91,6 @@ FloatingWindow RID_GROUPS_SORTING HelpID = HID_RPT_GROUPSORT_MOVE_DOWN ; Text [ en-US ] = "Move down" ; Checkable = TRUE; -// Disable = TRUE; }; ToolBoxItem { @@ -145,7 +99,6 @@ FloatingWindow RID_GROUPS_SORTING HelpID = HID_RPT_GROUPSORT_DELETE ; Text [ en-US ] = "~Delete" ; Checkable = TRUE; -// Disable = TRUE; }; }; }; @@ -164,6 +117,7 @@ FloatingWindow RID_GROUPS_SORTING Hide = TRUE; Text [ en-US ] = "Sorting" ; }; + ListBox LST_ORDER { Border = TRUE; @@ -180,6 +134,7 @@ FloatingWindow RID_GROUPS_SORTING }; }; + FixedText FT_HEADER { Pos = MAP_APPFONT ( UNRELATED_CONTROLS , 5*UNRELATED_CONTROLS + BROWSER_HEIGHT + BUTTON_HEIGHT + 2*FIXEDTEXT_HEIGHT) ; @@ -188,6 +143,7 @@ FloatingWindow RID_GROUPS_SORTING Text [ en-US ] = "Group Header" ; }; + ListBox LST_HEADERLST { Border = TRUE; @@ -203,6 +159,7 @@ FloatingWindow RID_GROUPS_SORTING < "Not present" ; Default ; > ; }; }; + FixedText FT_FOOTER { Pos = MAP_APPFONT ( UNRELATED_CONTROLS, 6*UNRELATED_CONTROLS + BROWSER_HEIGHT + BUTTON_HEIGHT + 3*FIXEDTEXT_HEIGHT) ; @@ -211,6 +168,7 @@ FloatingWindow RID_GROUPS_SORTING Text [ en-US ] = "Group Footer" ; }; + ListBox LST_FOOTERLST { Border = TRUE; @@ -226,6 +184,7 @@ FloatingWindow RID_GROUPS_SORTING < "Not present" ; Default ; > ; }; }; + FixedText FT_GROUPON { Pos = MAP_APPFONT ( UNRELATED_CONTROLS, 7*UNRELATED_CONTROLS + BROWSER_HEIGHT + BUTTON_HEIGHT + 4*FIXEDTEXT_HEIGHT) ; @@ -234,6 +193,7 @@ FloatingWindow RID_GROUPS_SORTING Text [ en-US ] = "Group On" ; }; + ListBox LST_GROUPONLST { Border = TRUE; @@ -248,6 +208,7 @@ FloatingWindow RID_GROUPS_SORTING < "Each Value" ; Default ; > ; }; }; + FixedText FT_GROUPINTERVAL { Pos = MAP_APPFONT ( UNRELATED_CONTROLS , 8*UNRELATED_CONTROLS + BROWSER_HEIGHT + BUTTON_HEIGHT + 5*FIXEDTEXT_HEIGHT) ; @@ -255,6 +216,7 @@ FloatingWindow RID_GROUPS_SORTING Hide = TRUE; Text [ en-US ] = "Group Interval" ; }; + NumericField ED_GROUPINTERVALLST { Border = TRUE; @@ -302,58 +264,58 @@ FloatingWindow RID_GROUPS_SORTING WordBreak = TRUE; }; -//BTN Image IMG_UP_H -//BTN { -//BTN ImageBitmap = Bitmap { File = "arrow_move_up_hc" ; }; -//BTN }; -//BTN Image IMG_DOWN_H -//BTN { -//BTN ImageBitmap = Bitmap { File = "arrow_move_down_hc" ; }; -//BTN }; - - }; String STR_RPT_EXPRESSION { Text [ en-US ] = "Field/Expression" ; }; + String STR_RPT_SORTING { Text [ en-US ] = "Sort Order" ; }; + String STR_RPT_PREFIXCHARS { Text [ en-US ] = "Prefix Characters" ; }; + String STR_RPT_YEAR { Text [ en-US ] = "Year" ; }; + String STR_RPT_QUARTER { Text [ en-US ] = "Quarter" ; }; + String STR_RPT_MONTH { Text [ en-US ] = "Month" ; }; + String STR_RPT_WEEK { Text [ en-US ] = "Week" ; }; + String STR_RPT_DAY { Text [ en-US ] = "Day" ; }; + String STR_RPT_HOUR { Text [ en-US ] = "Hour" ; }; + String STR_RPT_MINUTE { Text [ en-US ] = "Minute" ; }; + String STR_RPT_INTERVAL { Text [ en-US ] = "Interval" ; @@ -373,42 +335,31 @@ String STR_RPT_HELP_FOOTER { Text [ en-US ] = "Display a footer for this group?" ; }; + String STR_RPT_HELP_GROUPON { Text [ en-US ] = "Select the value or range of values that starts a new group." ; }; + String STR_RPT_HELP_INTERVAL { Text [ en-US ] = "Interval or number of characters to group on." ; }; + String STR_RPT_HELP_KEEP { Text [ en-US ] = "Keep group together on one page?" ; }; + String STR_RPT_HELP_SORT { Text [ en-US ] = "Select ascending or descending sort order. Ascending means from A to Z or 0 to 9" ; }; - Menu RID_GROUPSROWPOPUPMENU { ItemList = { -/* - MenuItem - { - ITEM_EDIT_CUT - }; - MenuItem - { - ITEM_EDIT_COPY - }; - MenuItem - { - ITEM_EDIT_PASTE - }; -*/ MenuItem { ITEM_EDIT_DELETE diff --git a/reportdesign/source/ui/inc/GroupsSorting.hxx b/reportdesign/source/ui/inc/GroupsSorting.hxx index 5a05e2593b39..5bd349b1d52d 100644 --- a/reportdesign/source/ui/inc/GroupsSorting.hxx +++ b/reportdesign/source/ui/inc/GroupsSorting.hxx @@ -65,18 +65,15 @@ class OReportController; \************************************************************************/ class OGroupsSortingDialog : public FloatingWindow - , public ::cppu::BaseMutex - , public ::comphelper::OPropertyChangeListener - ,public dbaui::OToolBoxHelper - ,public vcl::IImageListProvider + , public ::cppu::BaseMutex + , public ::comphelper::OPropertyChangeListener + , public dbaui::OToolBoxHelper + , public vcl::IImageListProvider { friend class OFieldExpressionControl; FixedLine m_aFL2; FixedText m_aMove; -//BTN ImageButton m_aPB_Up; -//BTN ImageButton m_aPB_Down; -//BTN ImageButton m_aPB_Delete; ToolBox m_aToolBox; FixedLine m_aFL3; @@ -106,7 +103,6 @@ private: DECL_LINK( OnControlFocusLost, Control* ); DECL_LINK( OnControlFocusGot, Control* ); DECL_LINK( LBChangeHdl, ListBox* ); -//BTN DECL_LINK( ClickHdl, ImageButton* ); DECL_LINK( OnFormatAction, ToolBox* ); /** returns the groups diff --git a/reportdesign/source/ui/report/report.src b/reportdesign/source/ui/report/report.src index 50f8138c861c..52f5fe402c79 100644 --- a/reportdesign/source/ui/report/report.src +++ b/reportdesign/source/ui/report/report.src @@ -112,13 +112,13 @@ String RID_STR_PROPTITLE_GROUP Image RID_IMG_TREENODE_COLLAPSED { - ImageBitmap = Bitmap { File = "plus.bmp"; } ; + ImageBitmap = Bitmap { File = "plus.png"; } ; MaskColor = Color { Red = 0xFF00; Green = 0x0000; Blue = 0xFF00; }; }; Image RID_IMG_TREENODE_EXPANDED { - ImageBitmap = Bitmap { File = "minus.bmp"; } ; + ImageBitmap = Bitmap { File = "minus.png"; } ; MaskColor = Color { Red = 0xFF00; Green = 0x0000; Blue = 0xFF00; }; }; |