diff options
-rw-r--r-- | extras/source/glade/libreoffice-catalog.xml.in | 3 | ||||
-rw-r--r-- | sc/AllLangResTarget_sc.mk | 1 | ||||
-rw-r--r-- | sc/UIConfig_scalc.mk | 1 | ||||
-rw-r--r-- | sc/inc/sc.hrc | 17 | ||||
-rw-r--r-- | sc/inc/scabstdlg.hxx | 9 | ||||
-rw-r--r-- | sc/source/ui/attrdlg/scdlgfact.cxx | 24 | ||||
-rw-r--r-- | sc/source/ui/attrdlg/scdlgfact.hxx | 9 | ||||
-rw-r--r-- | sc/source/ui/inc/autofmt.hxx | 11 | ||||
-rw-r--r-- | sc/source/ui/inc/miscdlgs.hrc | 27 | ||||
-rw-r--r-- | sc/source/ui/inc/scuiautofmt.hxx | 39 | ||||
-rw-r--r-- | sc/source/ui/miscdlgs/autofmt.cxx | 85 | ||||
-rw-r--r-- | sc/source/ui/miscdlgs/scuiautofmt.cxx | 211 | ||||
-rw-r--r-- | sc/source/ui/src/autofmt.src | 222 | ||||
-rw-r--r-- | sc/source/ui/src/scstring.src | 67 | ||||
-rw-r--r-- | sc/source/ui/view/cellsh3.cxx | 2 | ||||
-rw-r--r-- | sc/uiconfig/scalc/ui/autoformattable.ui | 360 | ||||
-rw-r--r-- | sw/uiconfig/swriter/ui/autoformattable.ui | 11 |
17 files changed, 622 insertions, 477 deletions
diff --git a/extras/source/glade/libreoffice-catalog.xml.in b/extras/source/glade/libreoffice-catalog.xml.in index 645ec551b734..7bbcdb9f7a08 100644 --- a/extras/source/glade/libreoffice-catalog.xml.in +++ b/extras/source/glade/libreoffice-catalog.xml.in @@ -365,6 +365,9 @@ <glade-widget-class title="Table Preview" name="swuilo-AutoFmtPreview" generic-name="Table Preview Window" parent="GtkDrawingArea" icon-name="widget-gtk-drawingarea"/> + <glade-widget-class title="Calc Table Preview" name="sclo-ScAutoFmtPreview" + generic-name="Calc Table Preview Window" parent="GtkDrawingArea" + icon-name="widget-gtk-drawingarea"/> <glade-widget-class title="Caption Preview" name="swuilo-SwCaptionPreview" generic-name="Caption Preview Window" parent="GtkDrawingArea" icon-name="widget-gtk-drawingarea"/> diff --git a/sc/AllLangResTarget_sc.mk b/sc/AllLangResTarget_sc.mk index 75ab3733ba63..92e425319d95 100644 --- a/sc/AllLangResTarget_sc.mk +++ b/sc/AllLangResTarget_sc.mk @@ -34,7 +34,6 @@ $(eval $(call gb_SrsTarget_set_include,sc/res,\ $(eval $(call gb_SrsTarget_add_files,sc/res,\ sc/source/ui/src/popup.src \ - sc/source/ui/src/autofmt.src \ sc/source/ui/src/globstr.src \ sc/source/ui/src/toolbox.src \ sc/source/ui/src/scfuncs.src \ diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk index bc6e875c698c..7d99aec42805 100644 --- a/sc/UIConfig_scalc.mk +++ b/sc/UIConfig_scalc.mk @@ -63,6 +63,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\ sc/uiconfig/scalc/ui/advancedfilterdialog \ sc/uiconfig/scalc/ui/allheaderfooterdialog \ sc/uiconfig/scalc/ui/analysisofvariancedialog \ + sc/uiconfig/scalc/ui/autoformattable \ sc/uiconfig/scalc/ui/cellprotectionpage \ sc/uiconfig/scalc/ui/changesourcedialog \ sc/uiconfig/scalc/ui/chardialog \ diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc index ae92cf8a0ce3..6f887b15f8ff 100644 --- a/sc/inc/sc.hrc +++ b/sc/inc/sc.hrc @@ -970,8 +970,20 @@ #define STR_WRONGROWCOL (STR_START + 418) #define STR_NOCOLFORMULA (STR_START + 419) #define STR_NOROWFORMULA (STR_START + 420) - -#define STR_END (STR_NOROWFORMULA) +#define STR_ADD_AUTOFORMAT_TITLE (STR_START + 421) +#define STR_RENAME_AUTOFORMAT_TITLE (STR_START + 422) +#define STR_ADD_AUTOFORMAT_LABEL (STR_START + 423) +#define STR_DEL_AUTOFORMAT_TITLE (STR_START + 424) +#define STR_DEL_AUTOFORMAT_MSG (STR_START + 425) +#define STR_BTN_AUTOFORMAT_CLOSE (STR_START + 426) +#define STR_JAN (STR_START + 427) +#define STR_FEB (STR_START + 428) +#define STR_MAR (STR_START + 429) +#define STR_NORTH (STR_START + 430) +#define STR_MID (STR_START + 431) +#define STR_SOUTH (STR_START + 432) +#define STR_SUM (STR_START + 433) +#define STR_END (STR_SUM) #define BMP_START (STR_END) @@ -1005,7 +1017,6 @@ #define RID_SCDLG_INSCELL (SC_DIALOGS_START + 12) #define RID_SCDLG_SELENTRY (SC_DIALOGS_START + 18) -#define RID_SCDLG_AUTOFORMAT (SC_DIALOGS_START + 20) #define RID_SCDLG_NAMES (SC_DIALOGS_START + 22) #define RID_SCDLG_DBNAMES (SC_DIALOGS_START + 23) #define RID_SCDLG_SOLVER (SC_DIALOGS_START + 26) diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx index 4fcff8771f12..0993fb54a1e1 100644 --- a/sc/inc/scabstdlg.hxx +++ b/sc/inc/scabstdlg.hxx @@ -332,11 +332,10 @@ public: virtual AbstractScTextImportOptionsDlg * CreateScTextImportOptionsDlg(Window* pParent) = 0; - virtual AbstractScAutoFormatDlg * CreateScAutoFormatDlg( Window* pParent, - ScAutoFormat* pAutoFormat, - const ScAutoFormatData* pSelFormatData, - ScDocument* pDoc, - int nId) = 0; + virtual AbstractScAutoFormatDlg * CreateScAutoFormatDlg(Window* pParent, + ScAutoFormat* pAutoFormat, + const ScAutoFormatData* pSelFormatData, + ScViewData *pViewData) = 0; virtual AbstractScColRowLabelDlg * CreateScColRowLabelDlg (Window* pParent, bool bCol = false, bool bRow = false) = 0; diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx index 75d198a5c645..7472494852a6 100644 --- a/sc/source/ui/attrdlg/scdlgfact.cxx +++ b/sc/source/ui/attrdlg/scdlgfact.cxx @@ -616,25 +616,13 @@ AbstractScTextImportOptionsDlg * ScAbstractDialogFactory_Impl::CreateScTextImpor return new AbstractScTextImportOptionsDlg_Impl(pDlg); } -AbstractScAutoFormatDlg * ScAbstractDialogFactory_Impl::CreateScAutoFormatDlg( Window* pParent, - ScAutoFormat* pAutoFormat, - const ScAutoFormatData* pSelFormatData, - ScDocument* pDoc, - int nId) +AbstractScAutoFormatDlg * ScAbstractDialogFactory_Impl::CreateScAutoFormatDlg(Window* pParent, + ScAutoFormat* pAutoFormat, + const ScAutoFormatData* pSelFormatData, + ScViewData *pViewData) { - ScAutoFormatDlg* pDlg=NULL; - switch ( nId ) - { - case RID_SCDLG_AUTOFORMAT : - pDlg = new ScAutoFormatDlg( pParent, pAutoFormat,pSelFormatData, pDoc ); - break; - default: - break; - } - - if ( pDlg ) - return new AbstractScAutoFormatDlg_Impl( pDlg ); - return 0; + ScAutoFormatDlg* pDlg = new ScAutoFormatDlg(pParent, pAutoFormat, pSelFormatData, pViewData); + return new AbstractScAutoFormatDlg_Impl(pDlg); } AbstractScColRowLabelDlg * ScAbstractDialogFactory_Impl::CreateScColRowLabelDlg(Window* pParent, diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx index a74674ca8962..9be2c1f5f6b4 100644 --- a/sc/source/ui/attrdlg/scdlgfact.hxx +++ b/sc/source/ui/attrdlg/scdlgfact.hxx @@ -401,11 +401,10 @@ public: virtual AbstractScTextImportOptionsDlg * CreateScTextImportOptionsDlg(Window* pParent); - virtual AbstractScAutoFormatDlg * CreateScAutoFormatDlg( Window* pParent, - ScAutoFormat* pAutoFormat, - const ScAutoFormatData* pSelFormatData, - ScDocument* pDoc, - int nId); + virtual AbstractScAutoFormatDlg * CreateScAutoFormatDlg(Window* pParent, + ScAutoFormat* pAutoFormat, + const ScAutoFormatData* pSelFormatData, + ScViewData *pViewData); virtual AbstractScColRowLabelDlg * CreateScColRowLabelDlg (Window* pParent, bool bCol = false, bool bRow = false); diff --git a/sc/source/ui/inc/autofmt.hxx b/sc/source/ui/inc/autofmt.hxx index f15e86cee9b8..fb4c3736cf77 100644 --- a/sc/source/ui/inc/autofmt.hxx +++ b/sc/source/ui/inc/autofmt.hxx @@ -29,8 +29,7 @@ #include <svtools/scriptedtext.hxx> #include <svx/framelinkarray.hxx> #include "scdllapi.h" - - +#include "viewdata.hxx" class ScAutoFormatData; class SvxBoxItem; @@ -48,13 +47,15 @@ enum AutoFmtLine { TOP_LINE, BOTTOM_LINE, LEFT_LINE, RIGHT_LINE }; class SC_DLLPUBLIC ScAutoFmtPreview : public Window { public: - ScAutoFmtPreview( Window* pParent, const ResId& rRes, ScDocument* pDoc ); - ~ScAutoFmtPreview(); + ScAutoFmtPreview(Window* pParent); + void DetectRTL(ScViewData *pViewData); + ~ScAutoFmtPreview(); void NotifyChange( ScAutoFormatData* pNewData ); protected: - virtual void Paint( const Rectangle& rRect ); + virtual void Paint(const Rectangle& rRect); + virtual void Resize(); private: ScAutoFormatData* pCurData; diff --git a/sc/source/ui/inc/miscdlgs.hrc b/sc/source/ui/inc/miscdlgs.hrc index c0f498204821..aeea75bd6e4a 100644 --- a/sc/source/ui/inc/miscdlgs.hrc +++ b/sc/source/ui/inc/miscdlgs.hrc @@ -21,7 +21,6 @@ // -> RID_SCDLG_MOVETAB // -> RID_SCDLG_SELENTRY // -> RID_SCDLG_FILLSERIES - // -> RID_SCDLG_AUTOFORMAT // General #define BTN_OK 100 @@ -42,32 +41,6 @@ #define FL_ENTRYLIST 10 #define LB_ENTRYLIST 11 -// Auto format -#define LB_FORMAT 1 -#define FL_FORMAT 9 -#define WND_PREVIEW 19 -#define BTN_NUMFORMAT 20 -#define BTN_BORDER 21 -#define BTN_FONT 23 -#define BTN_PATTERN 24 -#define BTN_ALIGNMENT 25 -#define BTN_ADJUST 26 -#define BTN_RENAME 27 -#define FL_FORMATTING 29 -#define STR_ADD_TITLE 100 -#define STR_ADD_LABEL 101 -#define STR_DEL_TITLE 102 -#define STR_DEL_MSG 103 -#define STR_RENAME_TITLE 104 - // Auto format Preview: -#define STR_JAN 121 -#define STR_FEB 122 -#define STR_MAR 123 -#define STR_NORTH 124 -#define STR_MID 125 -#define STR_SOUTH 126 -#define STR_SUM 127 - // Set/Reset Grouping: #define BTN_GROUP_COLS 1 #define BTN_GROUP_ROWS 3 diff --git a/sc/source/ui/inc/scuiautofmt.hxx b/sc/source/ui/inc/scuiautofmt.hxx index c3da04ee885e..f57f428485c1 100644 --- a/sc/source/ui/inc/scuiautofmt.hxx +++ b/sc/source/ui/inc/scuiautofmt.hxx @@ -23,33 +23,28 @@ class ScAutoFormatDlg : public ModalDialog { public: - ScAutoFormatDlg( Window* pParent, - ScAutoFormat* pAutoFormat, - const ScAutoFormatData* pSelFormatData, - ScDocument* pDoc ); - ~ScAutoFormatDlg(); + ScAutoFormatDlg(Window* pParent, + ScAutoFormat* pAutoFormat, + const ScAutoFormatData* pSelFormatData, + ScViewData *pViewData); sal_uInt16 GetIndex() const { return nIndex; } OUString GetCurrFormatName(); private: - FixedLine aFlFormat; - ListBox aLbFormat; - ScAutoFmtPreview* pWndPreview; - OKButton aBtnOk; - CancelButton aBtnCancel; - HelpButton aBtnHelp; - PushButton aBtnAdd; - PushButton aBtnRemove; - MoreButton aBtnMore; - FixedLine aFlFormatting; - CheckBox aBtnNumFormat; - CheckBox aBtnBorder; - CheckBox aBtnFont; - CheckBox aBtnPattern; - CheckBox aBtnAlignment; - CheckBox aBtnAdjust; - PushButton aBtnRename; + ListBox* m_pLbFormat; + ScAutoFmtPreview* m_pWndPreview; + OKButton* m_pBtnOk; + CancelButton* m_pBtnCancel; + PushButton* m_pBtnAdd; + PushButton* m_pBtnRemove; + PushButton* m_pBtnRename; + CheckBox* m_pBtnNumFormat; + CheckBox* m_pBtnBorder; + CheckBox* m_pBtnFont; + CheckBox* m_pBtnPattern; + CheckBox* m_pBtnAlignment; + CheckBox* m_pBtnAdjust; OUString aStrTitle; OUString aStrLabel; OUString aStrClose; diff --git a/sc/source/ui/miscdlgs/autofmt.cxx b/sc/source/ui/miscdlgs/autofmt.cxx index 6b80b79bd0f0..281acd237a58 100644 --- a/sc/source/ui/miscdlgs/autofmt.cxx +++ b/sc/source/ui/miscdlgs/autofmt.cxx @@ -56,40 +56,45 @@ // ScAutoFmtPreview -ScAutoFmtPreview::ScAutoFmtPreview( Window* pParent, const ResId& rRes, ScDocument* pDoc ) : - Window ( pParent, rRes ), - pCurData ( NULL ), - aVD ( *this ), - aScriptedText ( aVD ), - xBreakIter ( pDoc->GetBreakIterator() ), - bFitWidth ( false ), - mbRTL ( false ), - aPrvSize ( GetSizePixel().Width() - 6, GetSizePixel().Height() - 30 ), - mnLabelColWidth ( (aPrvSize.Width() - 4) / 4 - 12 ), - mnDataColWidth1 ( (aPrvSize.Width() - 4 - 2 * mnLabelColWidth) / 3 ), - mnDataColWidth2 ( (aPrvSize.Width() - 4 - 2 * mnLabelColWidth) / 4 ), - mnRowHeight ( (aPrvSize.Height() - 4) / 5 ), - aStrJan ( ScResId( STR_JAN ) ), - aStrFeb ( ScResId( STR_FEB ) ), - aStrMar ( ScResId( STR_MAR ) ), - aStrNorth ( ScResId( STR_NORTH ) ), - aStrMid ( ScResId( STR_MID ) ), - aStrSouth ( ScResId( STR_SOUTH ) ), - aStrSum ( ScResId( STR_SUM ) ), - pNumFmt ( new SvNumberFormatter( ::comphelper::getProcessComponentContext(), ScGlobal::eLnge ) ) +ScAutoFmtPreview::ScAutoFmtPreview(Window* pParent) + : Window(pParent) + , pCurData(NULL) + , aVD(*this) + , aScriptedText(aVD) + , bFitWidth(false) + , mbRTL(false) + , aStrJan(ScResId(STR_JAN)) + , aStrFeb(ScResId(STR_FEB)) + , aStrMar(ScResId(STR_MAR)) + , aStrNorth(ScResId(STR_NORTH)) + , aStrMid(ScResId(STR_MID)) + , aStrSouth(ScResId(STR_SOUTH)) + , aStrSum(ScResId(STR_SUM)) + , pNumFmt(new SvNumberFormatter(::comphelper::getProcessComponentContext(), ScGlobal::eLnge)) { Init(); } +extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeScAutoFmtPreview(Window *pParent, VclBuilder::stringmap &) +{ + return new ScAutoFmtPreview(pParent); +} +void ScAutoFmtPreview::Resize() +{ + aPrvSize = Size(GetSizePixel().Width() - 6, GetSizePixel().Height() - 30); + mnLabelColWidth = (aPrvSize.Width() - 4) / 4 - 12; + mnDataColWidth1 = (aPrvSize.Width() - 4 - 2 * mnLabelColWidth) / 3; + mnDataColWidth2 = (aPrvSize.Width() - 4 - 2 * mnLabelColWidth) / 4; + mnRowHeight = (aPrvSize.Height() - 4) / 5; + NotifyChange(pCurData); +} ScAutoFmtPreview::~ScAutoFmtPreview() { delete pNumFmt; } - - static void lcl_SetFontProperties( Font& rFont, const SvxFontItem& rFontItem, @@ -415,8 +420,6 @@ void ScAutoFmtPreview::PaintCells() } } - - void ScAutoFmtPreview::Init() { SetBorderStyle( WINDOW_BORDER_MONO ); @@ -424,20 +427,16 @@ void ScAutoFmtPreview::Init() maArray.SetUseDiagDoubleClipping( false ); CalcCellArray( false ); CalcLineMap(); +} - TypeId aType(TYPE(ScDocShell)); - ScDocShell* pDocShell = (ScDocShell*)SfxObjectShell::GetFirst(&aType); - SfxViewFrame* pFrame = SfxViewFrame::GetFirst( pDocShell ); - SfxViewShell* p = pFrame->GetViewShell(); - ScTabViewShell* pViewSh = dynamic_cast< ScTabViewShell* >( p ); - ScViewData* pViewData = pViewSh->GetViewData(); +void ScAutoFmtPreview::DetectRTL(ScViewData *pViewData) +{ SCTAB nCurrentTab = pViewData->GetTabNo(); ScDocument* pDoc = pViewData->GetDocument(); - mbRTL = pDoc->IsLayoutRTL( nCurrentTab ); + mbRTL = pDoc->IsLayoutRTL(nCurrentTab); + xBreakIter = pDoc->GetBreakIterator(); } - - void ScAutoFmtPreview::CalcCellArray( bool bFitWidthP ) { maArray.SetXOffset( 2 ); @@ -488,28 +487,20 @@ void ScAutoFmtPreview::CalcLineMap() } } - - void ScAutoFmtPreview::NotifyChange( ScAutoFormatData* pNewData ) { - if ( pNewData != pCurData ) + if (pNewData) { - pCurData = pNewData; + pCurData = pNewData; bFitWidth = pNewData->GetIncludeWidthHeight(); - CalcCellArray( bFitWidth ); - CalcLineMap(); - } - else if ( bFitWidth != pNewData->GetIncludeWidthHeight() ) - { - bFitWidth = !bFitWidth; - CalcCellArray( bFitWidth ); } + CalcCellArray( bFitWidth ); + CalcLineMap(); + DoPaint( Rectangle( Point(0,0), GetSizePixel() ) ); } - - void ScAutoFmtPreview::DoPaint( const Rectangle& /* rRect */ ) { sal_uInt32 nOldDrawMode = aVD.GetDrawMode(); diff --git a/sc/source/ui/miscdlgs/scuiautofmt.cxx b/sc/source/ui/miscdlgs/scuiautofmt.cxx index 7186c5e02a44..6a53ff903459 100644 --- a/sc/source/ui/miscdlgs/scuiautofmt.cxx +++ b/sc/source/ui/miscdlgs/scuiautofmt.cxx @@ -56,117 +56,92 @@ // AutoFormat-Dialog: -ScAutoFormatDlg::ScAutoFormatDlg( Window* pParent, - ScAutoFormat* pAutoFormat, - const ScAutoFormatData* pSelFormatData, - ScDocument* pDoc ) : - - ModalDialog ( pParent, ScResId( RID_SCDLG_AUTOFORMAT ) ), - - aFlFormat ( this, ScResId( FL_FORMAT ) ), - aLbFormat ( this, ScResId( LB_FORMAT ) ), - pWndPreview ( new ScAutoFmtPreview( this, ScResId( WND_PREVIEW ), pDoc ) ), - aBtnOk ( this, ScResId( BTN_OK ) ), - aBtnCancel ( this, ScResId( BTN_CANCEL ) ), - aBtnHelp ( this, ScResId( BTN_HELP ) ), - aBtnAdd ( this, ScResId( BTN_ADD ) ), - aBtnRemove ( this, ScResId( BTN_REMOVE ) ), - aBtnMore ( this, ScResId( BTN_MORE ) ), - aFlFormatting ( this, ScResId( FL_FORMATTING ) ), - aBtnNumFormat ( this, ScResId( BTN_NUMFORMAT ) ), - aBtnBorder ( this, ScResId( BTN_BORDER ) ), - aBtnFont ( this, ScResId( BTN_FONT ) ), - aBtnPattern ( this, ScResId( BTN_PATTERN ) ), - aBtnAlignment ( this, ScResId( BTN_ALIGNMENT ) ), - aBtnAdjust ( this, ScResId( BTN_ADJUST ) ), - aBtnRename ( this, ScResId( BTN_RENAME ) ), - aStrTitle ( ScResId( STR_ADD_TITLE ) ), - aStrLabel ( ScResId( STR_ADD_LABEL ) ), - aStrClose ( ScResId( STR_BTN_CLOSE ) ), - aStrDelTitle ( ScResId( STR_DEL_TITLE ) ), - aStrDelMsg ( ScResId( STR_DEL_MSG ) ) , - aStrRename ( ScResId( STR_RENAME_TITLE ) ), - - pFormat ( pAutoFormat ), - pSelFmtData ( pSelFormatData ), - nIndex ( 0 ), - bCoreDataChanged( false ), - bFmtInserted ( false ) +ScAutoFormatDlg::ScAutoFormatDlg(Window* pParent, + ScAutoFormat* pAutoFormat, + const ScAutoFormatData* pSelFormatData, + ScViewData *pViewData) + : ModalDialog(pParent, "AutoFormatTableDialog", + "modules/scalc/ui/autoformattable.ui") + , aStrTitle(ScResId(STR_ADD_AUTOFORMAT_TITLE)) + , aStrLabel(ScResId(STR_ADD_AUTOFORMAT_LABEL)) + , aStrClose(ScResId(STR_BTN_AUTOFORMAT_CLOSE)) + , aStrDelTitle(ScResId(STR_DEL_AUTOFORMAT_TITLE)) + , aStrDelMsg(ScResId(STR_DEL_AUTOFORMAT_MSG)) + , aStrRename(ScResId(STR_RENAME_AUTOFORMAT_TITLE)) + , pFormat(pAutoFormat) + , pSelFmtData(pSelFormatData) + , nIndex(0) + , bCoreDataChanged(false) + , bFmtInserted(false) { + get(m_pLbFormat, "formatlb"); + get(m_pWndPreview, "preview"); + m_pWndPreview->DetectRTL(pViewData); + get(m_pBtnOk, "ok"); + get(m_pBtnCancel, "cancel"); + get(m_pBtnAdd, "add"); + get(m_pBtnRemove, "remove"); + get(m_pBtnRename, "rename"); + get(m_pBtnNumFormat, "numformatcb"); + get(m_pBtnBorder, "bordercb"); + get(m_pBtnFont, "fontcb"); + get(m_pBtnPattern, "patterncb"); + get(m_pBtnAlignment, "alignmentcb"); + get(m_pBtnAdjust, "autofitcb"); + Init(); ScAutoFormat::iterator it = pFormat->begin(); - pWndPreview->NotifyChange(it->second); - FreeResource(); -} - - - -ScAutoFormatDlg::~ScAutoFormatDlg() -{ - delete pWndPreview; + m_pWndPreview->NotifyChange(it->second); } - - void ScAutoFormatDlg::Init() { - aLbFormat .SetSelectHdl( LINK( this, ScAutoFormatDlg, SelFmtHdl ) ); - aBtnNumFormat.SetClickHdl ( LINK( this, ScAutoFormatDlg, CheckHdl ) ); - aBtnBorder .SetClickHdl ( LINK( this, ScAutoFormatDlg, CheckHdl ) ); - aBtnFont .SetClickHdl ( LINK( this, ScAutoFormatDlg, CheckHdl ) ); - aBtnPattern .SetClickHdl ( LINK( this, ScAutoFormatDlg, CheckHdl ) ); - aBtnAlignment.SetClickHdl ( LINK( this, ScAutoFormatDlg, CheckHdl ) ); - aBtnAdjust .SetClickHdl ( LINK( this, ScAutoFormatDlg, CheckHdl ) ); - aBtnAdd .SetClickHdl ( LINK( this, ScAutoFormatDlg, AddHdl ) ); - aBtnRemove .SetClickHdl ( LINK( this, ScAutoFormatDlg, RemoveHdl ) ); - aBtnOk .SetClickHdl ( LINK( this, ScAutoFormatDlg, CloseHdl ) ); - aBtnCancel .SetClickHdl ( LINK( this, ScAutoFormatDlg, CloseHdl ) ); - aBtnRename .SetClickHdl ( LINK( this, ScAutoFormatDlg, RenameHdl ) ); - aLbFormat .SetDoubleClickHdl( LINK( this, ScAutoFormatDlg, DblClkHdl ) ); - - aBtnMore.AddWindow( &aBtnRename ); - aBtnMore.AddWindow( &aBtnNumFormat ); - aBtnMore.AddWindow( &aBtnBorder ); - aBtnMore.AddWindow( &aBtnFont ); - aBtnMore.AddWindow( &aBtnPattern ); - aBtnMore.AddWindow( &aBtnAlignment ); - aBtnMore.AddWindow( &aBtnAdjust ); - aBtnMore.AddWindow( &aFlFormatting ); + m_pLbFormat->SetSelectHdl( LINK( this, ScAutoFormatDlg, SelFmtHdl ) ); + m_pBtnNumFormat->SetClickHdl ( LINK( this, ScAutoFormatDlg, CheckHdl ) ); + m_pBtnBorder->SetClickHdl ( LINK( this, ScAutoFormatDlg, CheckHdl ) ); + m_pBtnFont->SetClickHdl ( LINK( this, ScAutoFormatDlg, CheckHdl ) ); + m_pBtnPattern->SetClickHdl ( LINK( this, ScAutoFormatDlg, CheckHdl ) ); + m_pBtnAlignment->SetClickHdl ( LINK( this, ScAutoFormatDlg, CheckHdl ) ); + m_pBtnAdjust->SetClickHdl ( LINK( this, ScAutoFormatDlg, CheckHdl ) ); + m_pBtnAdd->SetClickHdl ( LINK( this, ScAutoFormatDlg, AddHdl ) ); + m_pBtnRemove->SetClickHdl ( LINK( this, ScAutoFormatDlg, RemoveHdl ) ); + m_pBtnOk->SetClickHdl ( LINK( this, ScAutoFormatDlg, CloseHdl ) ); + m_pBtnCancel->SetClickHdl ( LINK( this, ScAutoFormatDlg, CloseHdl ) ); + m_pBtnRename->SetClickHdl ( LINK( this, ScAutoFormatDlg, RenameHdl ) ); + m_pLbFormat->SetDoubleClickHdl( LINK( this, ScAutoFormatDlg, DblClkHdl ) ); ScAutoFormat::const_iterator it = pFormat->begin(), itEnd = pFormat->end(); for (; it != itEnd; ++it) - aLbFormat.InsertEntry(it->second->GetName()); + m_pLbFormat->InsertEntry(it->second->GetName()); if (pFormat->size() == 1) - aBtnRemove.Disable(); + m_pBtnRemove->Disable(); - aLbFormat.SelectEntryPos( 0 ); - aBtnRename.Disable(); - aBtnRemove.Disable(); + m_pLbFormat->SelectEntryPos( 0 ); + m_pBtnRename->Disable(); + m_pBtnRemove->Disable(); nIndex = 0; UpdateChecks(); if ( !pSelFmtData ) { - aBtnAdd.Disable(); - aBtnRemove.Disable(); + m_pBtnAdd->Disable(); + m_pBtnRemove->Disable(); bFmtInserted = true; } } - - void ScAutoFormatDlg::UpdateChecks() { const ScAutoFormatData* pData = pFormat->findByIndex(nIndex); - aBtnNumFormat.Check( pData->GetIncludeValueFormat() ); - aBtnBorder .Check( pData->GetIncludeFrame() ); - aBtnFont .Check( pData->GetIncludeFont() ); - aBtnPattern .Check( pData->GetIncludeBackground() ); - aBtnAlignment.Check( pData->GetIncludeJustify() ); - aBtnAdjust .Check( pData->GetIncludeWidthHeight() ); + m_pBtnNumFormat->Check( pData->GetIncludeValueFormat() ); + m_pBtnBorder->Check( pData->GetIncludeFrame() ); + m_pBtnFont->Check( pData->GetIncludeFont() ); + m_pBtnPattern->Check( pData->GetIncludeBackground() ); + m_pBtnAlignment->Check( pData->GetIncludeJustify() ); + m_pBtnAdjust->Check( pData->GetIncludeWidthHeight() ); } @@ -175,12 +150,12 @@ void ScAutoFormatDlg::UpdateChecks() IMPL_LINK( ScAutoFormatDlg, CloseHdl, PushButton *, pBtn ) { - if ( pBtn == &aBtnOk || pBtn == &aBtnCancel ) + if (pBtn == m_pBtnOk || pBtn == m_pBtnCancel) { if ( bCoreDataChanged ) ScGlobal::GetOrCreateAutoFormat()->Save(); - EndDialog( (pBtn == &aBtnOk) ? RET_OK : RET_CANCEL ); + EndDialog( (pBtn == m_pBtnOk) ? RET_OK : RET_CANCEL ); } return 0; } @@ -204,26 +179,26 @@ IMPL_LINK( ScAutoFormatDlg, CheckHdl, Button *, pBtn ) ScAutoFormatData* pData = pFormat->findByIndex(nIndex); bool bCheck = ((CheckBox*)pBtn)->IsChecked(); - if ( pBtn == &aBtnNumFormat ) + if ( pBtn == m_pBtnNumFormat ) pData->SetIncludeValueFormat( bCheck ); - else if ( pBtn == &aBtnBorder ) + else if ( pBtn == m_pBtnBorder ) pData->SetIncludeFrame( bCheck ); - else if ( pBtn == &aBtnFont ) + else if ( pBtn == m_pBtnFont ) pData->SetIncludeFont( bCheck ); - else if ( pBtn == &aBtnPattern ) + else if ( pBtn == m_pBtnPattern ) pData->SetIncludeBackground( bCheck ); - else if ( pBtn == &aBtnAlignment ) + else if ( pBtn == m_pBtnAlignment ) pData->SetIncludeJustify( bCheck ); - else if ( pBtn == &aBtnAdjust ) + else if ( pBtn == m_pBtnAdjust ) pData->SetIncludeWidthHeight( bCheck ); if ( !bCoreDataChanged ) { - aBtnCancel.SetText( aStrClose ); + m_pBtnCancel->SetText( aStrClose ); bCoreDataChanged = true; } - pWndPreview->NotifyChange( pData ); + m_pWndPreview->NotifyChange( pData ); return 0; } @@ -264,13 +239,13 @@ IMPL_LINK_NOARG(ScAutoFormatDlg, AddHdl) ScAutoFormat::const_iterator it = pFormat->find(pNewData); ScAutoFormat::const_iterator itBeg = pFormat->begin(); size_t nPos = std::distance(itBeg, it); - aLbFormat.InsertEntry(aFormatName, nPos); - aLbFormat.SelectEntry( aFormatName ); - aBtnAdd.Disable(); + m_pLbFormat->InsertEntry(aFormatName, nPos); + m_pLbFormat->SelectEntry( aFormatName ); + m_pBtnAdd->Disable(); if ( !bCoreDataChanged ) { - aBtnCancel.SetText( aStrClose ); + m_pBtnCancel->SetText( aStrClose ); bCoreDataChanged = true; } @@ -306,25 +281,25 @@ IMPL_LINK_NOARG(ScAutoFormatDlg, AddHdl) IMPL_LINK_NOARG(ScAutoFormatDlg, RemoveHdl) { - if ( (nIndex > 0) && (aLbFormat.GetEntryCount() > 0) ) + if ( (nIndex > 0) && (m_pLbFormat->GetEntryCount() > 0) ) { OUString aMsg( aStrDelMsg.getToken( 0, '#' ) ); - aMsg += aLbFormat.GetSelectEntry(); + aMsg += m_pLbFormat->GetSelectEntry(); aMsg += aStrDelMsg.getToken( 1, '#' ); if ( RET_YES == QueryBox( this, WinBits( WB_YES_NO | WB_DEF_YES ), aMsg ).Execute() ) { - aLbFormat.RemoveEntry( nIndex ); - aLbFormat.SelectEntryPos( nIndex-1 ); + m_pLbFormat->RemoveEntry( nIndex ); + m_pLbFormat->SelectEntryPos( nIndex-1 ); if ( nIndex-1 == 0 ) - aBtnRemove.Disable(); + m_pBtnRemove->Disable(); if ( !bCoreDataChanged ) { - aBtnCancel.SetText( aStrClose ); + m_pBtnCancel->SetText( aStrClose ); bCoreDataChanged = true; } @@ -348,7 +323,7 @@ IMPL_LINK_NOARG(ScAutoFormatDlg, RenameHdl) while( !bOk ) { - OUString aFormatName = aLbFormat.GetSelectEntry(); + OUString aFormatName = m_pLbFormat->GetSelectEntry(); OUString aEntry; ScStringInputDlg* pDlg = new ScStringInputDlg( this, @@ -375,7 +350,7 @@ IMPL_LINK_NOARG(ScAutoFormatDlg, RenameHdl) // Format mit dem Namen noch nicht vorhanden, also // umbenennen - aLbFormat.RemoveEntry(nIndex ); + m_pLbFormat->RemoveEntry(nIndex ); const ScAutoFormatData* p = pFormat->findByIndex(nIndex); ScAutoFormatData* pNewData = new ScAutoFormatData(*p); @@ -388,20 +363,20 @@ IMPL_LINK_NOARG(ScAutoFormatDlg, RenameHdl) pFormat->insert(pNewData); - aLbFormat.SetUpdateMode(false); - aLbFormat.Clear(); + m_pLbFormat->SetUpdateMode(false); + m_pLbFormat->Clear(); for (it = pFormat->begin(); it != itEnd; ++it) { aEntry = it->second->GetName(); - aLbFormat.InsertEntry( aEntry ); + m_pLbFormat->InsertEntry( aEntry ); } - aLbFormat.SetUpdateMode(true); - aLbFormat.SelectEntry( aFormatName); + m_pLbFormat->SetUpdateMode(true); + m_pLbFormat->SelectEntry( aFormatName); if ( !bCoreDataChanged ) { - aBtnCancel.SetText( aStrClose ); + m_pBtnCancel->SetText( aStrClose ); bCoreDataChanged = true; } @@ -431,22 +406,22 @@ IMPL_LINK_NOARG(ScAutoFormatDlg, RenameHdl) IMPL_LINK_NOARG(ScAutoFormatDlg, SelFmtHdl) { - nIndex = aLbFormat.GetSelectEntryPos(); + nIndex = m_pLbFormat->GetSelectEntryPos(); UpdateChecks(); if ( nIndex == 0 ) { - aBtnRename.Disable(); - aBtnRemove.Disable(); + m_pBtnRename->Disable(); + m_pBtnRemove->Disable(); } else { - aBtnRename.Enable(); - aBtnRemove.Enable(); + m_pBtnRename->Enable(); + m_pBtnRemove->Enable(); } ScAutoFormatData* p = pFormat->findByIndex(nIndex); - pWndPreview->NotifyChange(p); + m_pWndPreview->NotifyChange(p); return 0; } diff --git a/sc/source/ui/src/autofmt.src b/sc/source/ui/src/autofmt.src deleted file mode 100644 index 02a9743792fc..000000000000 --- a/sc/source/ui/src/autofmt.src +++ /dev/null @@ -1,222 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "miscdlgs.hrc" - -ModalDialog RID_SCDLG_AUTOFORMAT -{ - OutputSize = TRUE ; - HelpId = CMD_SID_AUTOFORMAT ; - SVLook = TRUE ; - Size = MAP_APPFONT ( 312 , 121 ) ; - Text [ en-US ] = "AutoFormat" ; - Moveable = TRUE ; - Closeable = FALSE ; - ListBox LB_FORMAT - { - HelpID = "sc:ListBox:RID_SCDLG_AUTOFORMAT:LB_FORMAT"; - Border = TRUE ; - Pos = MAP_APPFONT ( 12 , 14 ) ; - Size = MAP_APPFONT ( 70 , 101 ) ; - TabStop = TRUE ; - }; - FixedLine FL_FORMAT - { - Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 244 , 8 ) ; - Text [ en-US ] = "F~ormat" ; - }; - Window WND_PREVIEW - { - Pos = MAP_APPFONT ( 88 , 14 ) ; - Size = MAP_APPFONT ( 159 , 101 ) ; - Border = TRUE ; - }; - CheckBox BTN_ADJUST - { - HelpID = "sc:CheckBox:RID_SCDLG_AUTOFORMAT:BTN_ADJUST"; - Hide = TRUE ; - Pos = MAP_APPFONT ( 172 , 146 ) ; - Size = MAP_APPFONT ( 75 , 10 ) ; - Text [ en-US ] = "A~utoFit width and height" ; - TabStop = TRUE ; - }; - CheckBox BTN_BORDER - { - HelpID = "sc:CheckBox:RID_SCDLG_AUTOFORMAT:BTN_BORDER"; - Hide = TRUE ; - Pos = MAP_APPFONT ( 12 , 146 ) ; - Size = MAP_APPFONT ( 75 , 10 ) ; - Text [ en-US ] = "~Borders" ; - TabStop = TRUE ; - }; - CheckBox BTN_FONT - { - HelpID = "sc:CheckBox:RID_SCDLG_AUTOFORMAT:BTN_FONT"; - Hide = TRUE ; - Pos = MAP_APPFONT ( 93 , 132 ) ; - Size = MAP_APPFONT ( 73 , 10 ) ; - Text [ en-US ] = "F~ont" ; - TabStop = TRUE ; - }; - CheckBox BTN_PATTERN - { - HelpID = "sc:CheckBox:RID_SCDLG_AUTOFORMAT:BTN_PATTERN"; - Hide = TRUE ; - Pos = MAP_APPFONT ( 93 , 146 ) ; - Size = MAP_APPFONT ( 73 , 10 ) ; - Text [ en-US ] = "~Pattern" ; - TabStop = TRUE ; - }; - CheckBox BTN_ALIGNMENT - { - HelpID = "sc:CheckBox:RID_SCDLG_AUTOFORMAT:BTN_ALIGNMENT"; - Hide = TRUE ; - Pos = MAP_APPFONT ( 172 , 132 ) ; - Size = MAP_APPFONT ( 75 , 10 ) ; - Text [ en-US ] = "Alignmen~t" ; - TabStop = TRUE ; - }; - CheckBox BTN_NUMFORMAT - { - HelpID = "sc:CheckBox:RID_SCDLG_AUTOFORMAT:BTN_NUMFORMAT"; - Hide = TRUE ; - Pos = MAP_APPFONT ( 12 , 132 ) ; - Size = MAP_APPFONT ( 75 , 10 ) ; - Text [ en-US ] = "~Number format" ; - TabStop = TRUE ; - }; - FixedLine FL_FORMATTING - { - Hide = TRUE ; - Pos = MAP_APPFONT ( 6 , 121 ) ; - Size = MAP_APPFONT ( 244 , 8 ) ; - Text [ en-US ] = "Formatting" ; - }; - OKButton BTN_OK - { - Pos = MAP_APPFONT ( 256 , 6 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - DefButton = TRUE ; - }; - CancelButton BTN_CANCEL - { - Pos = MAP_APPFONT ( 256 , 23 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - }; - MoreButton BTN_MORE - { - HelpID = "sc:MoreButton:RID_SCDLG_AUTOFORMAT:BTN_MORE"; - Pos = MAP_APPFONT ( 256 , 101 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - MapUnit = MAP_APPFONT ; - Delta = 48 ; - }; - PushButton BTN_ADD - { - HelpID = "sc:PushButton:RID_SCDLG_AUTOFORMAT:BTN_ADD"; - Pos = MAP_APPFONT ( 256 , 63 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - Text [ en-US ] = "~Add..." ; - TabStop = TRUE ; - }; - PushButton BTN_REMOVE - { - HelpID = "sc:PushButton:RID_SCDLG_AUTOFORMAT:BTN_REMOVE"; - Pos = MAP_APPFONT ( 256 , 81 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - Text [ en-US ] = "~Delete" ; - TabStop = TRUE ; - }; - - PushButton BTN_RENAME - { - Pos = MAP_APPFONT ( 256 , 123 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - HelpId=HID_SC_RENAME_AUTOFMT; - TabStop = TRUE ; - Text [ en-US ] = "~Rename" ; - }; - - HelpButton BTN_HELP - { - Pos = MAP_APPFONT ( 256 , 43 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - }; - String STR_ADD_TITLE - { - Text [ en-US ] = "Add AutoFormat" ; - }; - - String STR_RENAME_TITLE - { - Text [ en-US ] = "Rename AutoFormat" ; - }; - - String STR_ADD_LABEL - { - Text [ en-US ] = "Name" ; - }; - String STR_DEL_TITLE - { - Text [ en-US ] = "Delete AutoFormat" ; - }; - String STR_DEL_MSG - { - Text [ en-US ] = "Do you really want to delete the # AutoFomat?" ; - }; - String STR_BTN_CLOSE - { - Text [ en-US ] = "~Close" ; - }; - String STR_JAN - { - Text [ en-US ] = "Jan" ; - }; - String STR_FEB - { - Text [ en-US ] = "Feb" ; - }; - String STR_MAR - { - Text [ en-US ] = "Mar" ; - }; - String STR_NORTH - { - Text [ en-US ] = "North" ; - }; - String STR_MID - { - Text [ en-US ] = "Mid" ; - }; - String STR_SOUTH - { - Text [ en-US ] = "South" ; - }; - String STR_SUM - { - Text [ en-US ] = "Total" ; - }; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/src/scstring.src b/sc/source/ui/src/scstring.src index 42d650831c07..0268edbbec92 100644 --- a/sc/source/ui/src/scstring.src +++ b/sc/source/ui/src/scstring.src @@ -106,8 +106,6 @@ String SCSTR_AUDITSHELL Text [ en-US ] = "Detective Fill Mode" ; }; - - String STR_ROWHEIGHT { Text [ en-US ] = "Height" ; @@ -900,4 +898,69 @@ String STR_NOROWFORMULA Text [ en-US ] = "Formulas don't form a row." ; }; +String STR_ADD_AUTOFORMAT_TITLE +{ + Text [ en-US ] = "Add AutoFormat" ; +}; + +String STR_RENAME_AUTOFORMAT_TITLE +{ + Text [ en-US ] = "Rename AutoFormat" ; +}; + +String STR_ADD_AUTOFORMAT_LABEL +{ + Text [ en-US ] = "Name" ; +}; + +String STR_DEL_AUTOFORMAT_TITLE +{ + Text [ en-US ] = "Delete AutoFormat" ; +}; + +String STR_DEL_AUTOFORMAT_MSG +{ + Text [ en-US ] = "Do you really want to delete the # AutoFomat?" ; +}; + +String STR_BTN_AUTOFORMAT_CLOSE +{ + Text [ en-US ] = "~Close" ; +}; + +String STR_JAN +{ + Text [ en-US ] = "Jan" ; +}; + +String STR_FEB +{ + Text [ en-US ] = "Feb" ; +}; + +String STR_MAR +{ + Text [ en-US ] = "Mar" ; +}; + +String STR_NORTH +{ + Text [ en-US ] = "North" ; +}; + +String STR_MID +{ + Text [ en-US ] = "Mid" ; +}; + +String STR_SOUTH +{ + Text [ en-US ] = "South" ; +}; + +String STR_SUM +{ + Text [ en-US ] = "Total" ; +}; + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx index 1fddad09ab8c..25d2c1005674 100644 --- a/sc/source/ui/view/cellsh3.cxx +++ b/sc/source/ui/view/cellsh3.cxx @@ -828,7 +828,7 @@ void ScCellShell::Execute( SfxRequest& rReq ) ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "ScAbstractFactory create fail!"); - AbstractScAutoFormatDlg* pDlg = pFact->CreateScAutoFormatDlg( pDlgParent, ScGlobal::GetOrCreateAutoFormat(), pNewEntry,GetViewData()->GetDocument(), RID_SCDLG_AUTOFORMAT ); + AbstractScAutoFormatDlg* pDlg = pFact->CreateScAutoFormatDlg(pDlgParent, ScGlobal::GetOrCreateAutoFormat(), pNewEntry, GetViewData()); OSL_ENSURE(pDlg, "Dialog create fail!"); if ( pDlg->Execute() == RET_OK ) diff --git a/sc/uiconfig/scalc/ui/autoformattable.ui b/sc/uiconfig/scalc/ui/autoformattable.ui new file mode 100644 index 000000000000..eac431f8b94f --- /dev/null +++ b/sc/uiconfig/scalc/ui/autoformattable.ui @@ -0,0 +1,360 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.16.1 --> +<interface> + <requires lib="gtk+" version="3.0"/> + <!-- interface-requires LibreOffice 1.0 --> + <object class="GtkDialog" id="AutoFormatTableDialog"> + <property name="can_focus">False</property> + <property name="border_width">6</property> + <property name="title" translatable="yes">AutoFormat</property> + <property name="type_hint">normal</property> + <child internal-child="vbox"> + <object class="GtkBox" id="dialog-vbox1"> + <property name="can_focus">False</property> + <property name="spacing">12</property> + <child internal-child="action_area"> + <object class="GtkButtonBox" id="dialog-action_area1"> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <property name="homogeneous">True</property> + <property name="layout_style">start</property> + <child> + <object class="GtkButton" id="ok"> + <property name="label">gtk-ok</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="has_default">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="cancel"> + <property name="label">gtk-cancel</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="help"> + <property name="label">gtk-help</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkButton" id="add"> + <property name="label">gtk-add</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkButton" id="remove"> + <property name="label">gtk-delete</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> + </child> + <child> + <object class="GtkButton" id="rename"> + <property name="label" translatable="yes">Rename</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">5</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack_type">end</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <property name="spacing">12</property> + <child> + <object class="GtkFrame" id="format"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> + <child> + <object class="GtkAlignment" id="alignment1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="top_padding">6</property> + <property name="left_padding">12</property> + <child> + <object class="GtkGrid" id="grid2"> + <property name="width_request">400</property> + <property name="height_request">200</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="row_spacing">6</property> + <property name="column_spacing">6</property> + <child> + <object class="sclo-ScAutoFmtPreview" id="preview"> + <property name="width_request">200</property> + <property name="height_request">200</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow" id="scrolledwindow1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="vscrollbar_policy">always</property> + <property name="shadow_type">in</property> + <child> + <object class="GtkTreeView" id="formatlb"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="vexpand">True</property> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="treeview-selection1"/> + </child> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + </object> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="label1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Format</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkFrame" id="formatting"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> + <child> + <object class="GtkAlignment" id="alignment2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="top_padding">6</property> + <property name="left_padding">12</property> + <child> + <object class="GtkGrid" id="grid4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <child> + <object class="GtkCheckButton" id="numformatcb"> + <property name="label" translatable="yes">_Number format</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="bordercb"> + <property name="label" translatable="yes">_Borders</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="fontcb"> + <property name="label" translatable="yes">F_ont</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="patterncb"> + <property name="label" translatable="yes">_Pattern</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="alignmentcb"> + <property name="label" translatable="yes">Alignmen_t</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="autofitcb"> + <property name="label" translatable="yes">A_utoFit width and height</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">1</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + </object> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="label2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Formatting</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack_type">end</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + </child> + <action-widgets> + <action-widget response="0">ok</action-widget> + <action-widget response="0">cancel</action-widget> + <action-widget response="0">help</action-widget> + <action-widget response="0">add</action-widget> + <action-widget response="0">remove</action-widget> + <action-widget response="0">rename</action-widget> + </action-widgets> + </object> +</interface> diff --git a/sw/uiconfig/swriter/ui/autoformattable.ui b/sw/uiconfig/swriter/ui/autoformattable.ui index 202a3fb8b85a..fd3fb54f13b2 100644 --- a/sw/uiconfig/swriter/ui/autoformattable.ui +++ b/sw/uiconfig/swriter/ui/autoformattable.ui @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.16.1 --> <interface> - <!-- interface-requires gtk+ 3.0 --> + <requires lib="gtk+" version="3.0"/> <!-- interface-requires LibreOffice 1.0 --> <object class="GtkDialog" id="AutoFormatTableDialog"> <property name="can_focus">False</property> @@ -162,6 +163,9 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="vexpand">True</property> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="treeview-selection1"/> + </child> </object> </child> </object> @@ -217,6 +221,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="use_underline">True</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> @@ -233,6 +238,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="use_underline">True</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> @@ -249,6 +255,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="use_underline">True</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> @@ -265,6 +272,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="use_underline">True</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> @@ -281,6 +289,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="use_underline">True</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> |