Skip to content

C
core
Kaydet (Commit) 51640a1b authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

convert calc character dialog to .ui 

Change-Id: I305b18bea24377dcd98b3e06c4cf75bdbdd4d717
üst 44029ade
Hide whitespace changes
Inline Side-by-side
Showing with 189 additions and 116 deletions
sc/UIConfig_scalc.mk
Dosyayı görüntüle @ 51640a1b
...@@ -64,6 +64,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\ ...@@ -64,6 +64,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/allheaderfooterdialog \ sc/uiconfig/scalc/ui/allheaderfooterdialog \
sc/uiconfig/scalc/ui/analysisofvariancedialog \ sc/uiconfig/scalc/ui/analysisofvariancedialog \
sc/uiconfig/scalc/ui/cellprotectionpage \ sc/uiconfig/scalc/ui/cellprotectionpage \
sc/uiconfig/scalc/ui/chardialog \
sc/uiconfig/scalc/ui/colwidthdialog \ sc/uiconfig/scalc/ui/colwidthdialog \
sc/uiconfig/scalc/ui/consolidatedialog \ sc/uiconfig/scalc/ui/consolidatedialog \
sc/uiconfig/scalc/ui/correlationdialog \ sc/uiconfig/scalc/ui/correlationdialog \
......
sc/inc/sc.hrc
Dosyayı görüntüle @ 51640a1b
...@@ -1049,7 +1049,6 @@ ...@@ -1049,7 +1049,6 @@
#define RID_SCDLG_CHAR (SC_DIALOGS_START + 76)
#define RID_SCDLG_PARAGRAPH (SC_DIALOGS_START + 77) #define RID_SCDLG_PARAGRAPH (SC_DIALOGS_START + 77)
#define RID_SCDLG_CONTACTS (SC_DIALOGS_START + 78) #define RID_SCDLG_CONTACTS (SC_DIALOGS_START + 78)
......
sc/inc/scabstdlg.hxx
Dosyayı görüntüle @ 51640a1b
...@@ -492,8 +492,8 @@ public: ...@@ -492,8 +492,8 @@ public:
virtual SfxAbstractTabDialog * CreateScSubTotalDlg( Window* pParent, virtual SfxAbstractTabDialog * CreateScSubTotalDlg( Window* pParent,
const SfxItemSet* pArgSet ) = 0; const SfxItemSet* pArgSet ) = 0;
virtual SfxAbstractTabDialog * CreateScCharDlg( Window* pParent, const SfxItemSet* pAttr, virtual SfxAbstractTabDialog * CreateScCharDlg(Window* pParent,
const SfxObjectShell* pDocShell, int nId ) = 0; const SfxItemSet* pAttr, const SfxObjectShell* pDocShell) = 0;
virtual SfxAbstractTabDialog * CreateScParagraphDlg( Window* pParent, const SfxItemSet* pAttr , virtual SfxAbstractTabDialog * CreateScParagraphDlg( Window* pParent, const SfxItemSet* pAttr ,
int nId ) = 0; int nId ) = 0;
......
sc/source/ui/attrdlg/scdlgfact.cxx
Dosyayı görüntüle @ 51640a1b
...@@ -1125,22 +1125,11 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScSubTotalDlg(Window* ...@@ -1125,22 +1125,11 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScSubTotalDlg(Window*
return new ScAbstractTabDialog_Impl( pDlg ); return new ScAbstractTabDialog_Impl( pDlg );
} }
SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScCharDlg( Window* pParent, const SfxItemSet* pAttr, SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScCharDlg(
const SfxObjectShell* pDocShell, int nId ) Window* pParent, const SfxItemSet* pAttr, const SfxObjectShell* pDocShell)
{ {
SfxTabDialog* pDlg=NULL; SfxTabDialog* pDlg = new ScCharDlg(pParent, pAttr, pDocShell);
switch ( nId ) return new ScAbstractTabDialog_Impl(pDlg);
{
case RID_SCDLG_CHAR :
pDlg = new ScCharDlg( pParent, pAttr, pDocShell );
break;
default:
break;
}
if ( pDlg )
return new ScAbstractTabDialog_Impl( pDlg );
return 0;
} }
SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScParagraphDlg( Window* pParent, const SfxItemSet* pAttr , SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScParagraphDlg( Window* pParent, const SfxItemSet* pAttr ,
......
sc/source/ui/attrdlg/scdlgfact.hxx
Dosyayı görüntüle @ 51640a1b
...@@ -559,8 +559,8 @@ public: ...@@ -559,8 +559,8 @@ public:
virtual SfxAbstractTabDialog * CreateScSubTotalDlg( Window* pParent, virtual SfxAbstractTabDialog * CreateScSubTotalDlg( Window* pParent,
const SfxItemSet* pArgSet ); const SfxItemSet* pArgSet );
virtual SfxAbstractTabDialog * CreateScCharDlg( Window* pParent, const SfxItemSet* pAttr, virtual SfxAbstractTabDialog * CreateScCharDlg(Window* pParent,
const SfxObjectShell* pDocShell, int nId ); const SfxItemSet* pAttr, const SfxObjectShell* pDocShell);
virtual SfxAbstractTabDialog * CreateScParagraphDlg( Window* pParent, const SfxItemSet* pAttr , virtual SfxAbstractTabDialog * CreateScParagraphDlg( Window* pParent, const SfxItemSet* pAttr ,
int nId ); int nId );
......
sc/source/ui/drawfunc/drtxtob1.cxx
Dosyayı görüntüle @ 51640a1b
...@@ -46,8 +46,9 @@ sal_Bool ScDrawTextObjectBar::ExecuteCharDlg( const SfxItemSet& rArgs, ...@@ -46,8 +46,9 @@ sal_Bool ScDrawTextObjectBar::ExecuteCharDlg( const SfxItemSet& rArgs,
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "ScAbstractFactory create fail!"); OSL_ENSURE(pFact, "ScAbstractFactory create fail!");
SfxAbstractTabDialog* pDlg = pFact->CreateScCharDlg( pViewData->GetDialogParent(), &rArgs, SfxAbstractTabDialog* pDlg = pFact->CreateScCharDlg(
pViewData->GetSfxDocShell(),RID_SCDLG_CHAR ); pViewData->GetDialogParent(), &rArgs,
pViewData->GetSfxDocShell());
OSL_ENSURE(pDlg, "Dialog create fail!"); OSL_ENSURE(pDlg, "Dialog create fail!");
if (nSlot == SID_CHAR_DLG_EFFECT) if (nSlot == SID_CHAR_DLG_EFFECT)
{ {
......
sc/source/ui/inc/textdlgs.hxx
Dosyayı görüntüle @ 51640a1b
...@@ -27,14 +27,14 @@ class SfxObjectShell; ...@@ -27,14 +27,14 @@ class SfxObjectShell;
class ScCharDlg : public SfxTabDialog class ScCharDlg : public SfxTabDialog
{ {
private: private:
const SfxObjectShell& rDocShell; const SfxObjectShell& rDocShell;
sal_uInt16 m_nNamePageId;
virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ); sal_uInt16 m_nEffectsPageId;
virtual void PageCreated(sal_uInt16 nId, SfxTabPage &rPage);
public: public:
ScCharDlg( Window* pParent, const SfxItemSet* pAttr, ScCharDlg(Window* pParent, const SfxItemSet* pAttr,
const SfxObjectShell* pDocShell ); const SfxObjectShell* pDocShell);
~ScCharDlg() {}
}; };
class ScParagraphDlg : public SfxTabDialog class ScParagraphDlg : public SfxTabDialog
......
sc/source/ui/miscdlgs/textdlgs.cxx
Dosyayı görüntüle @ 51640a1b
...@@ -33,15 +33,16 @@ ...@@ -33,15 +33,16 @@
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
ScCharDlg::ScCharDlg( Window* pParent, const SfxItemSet* pAttr, ScCharDlg::ScCharDlg( Window* pParent, const SfxItemSet* pAttr,
const SfxObjectShell* pDocShell ) : const SfxObjectShell* pDocShell )
SfxTabDialog ( pParent, ScResId( RID_SCDLG_CHAR ), pAttr ), : SfxTabDialog(pParent, "CharDialog",
rDocShell ( *pDocShell ) "modules/scalc/ui/chardialog.ui", pAttr)
, rDocShell(*pDocShell)
, m_nNamePageId(0)
, m_nEffectsPageId(0)
{ {
FreeResource(); m_nNamePageId = AddTabPage("font", RID_SVXPAGE_CHAR_NAME);
m_nEffectsPageId = AddTabPage("fonteffects", RID_SVXPAGE_CHAR_EFFECTS);
AddTabPage( RID_SVXPAGE_CHAR_NAME ); AddTabPage("position", RID_SVXPAGE_CHAR_POSITION);
AddTabPage( RID_SVXPAGE_CHAR_EFFECTS );
AddTabPage( RID_SVXPAGE_CHAR_POSITION );
} }
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
...@@ -49,25 +50,18 @@ ScCharDlg::ScCharDlg( Window* pParent, const SfxItemSet* pAttr, ...@@ -49,25 +50,18 @@ ScCharDlg::ScCharDlg( Window* pParent, const SfxItemSet* pAttr,
void ScCharDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) void ScCharDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
{ {
SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
switch( nId ) if (nId == m_nNamePageId)
{ {
case RID_SVXPAGE_CHAR_NAME: SvxFontListItem aItem(*( (const SvxFontListItem*)
{ ( rDocShell.GetItem( SID_ATTR_CHAR_FONTLIST) ) ) );
SvxFontListItem aItem(*( (const SvxFontListItem*)
( rDocShell.GetItem( SID_ATTR_CHAR_FONTLIST) ) ) );
aSet.Put (SvxFontListItem( aItem.GetFontList(), SID_ATTR_CHAR_FONTLIST));
rPage.PageCreated(aSet);
}
break;
case RID_SVXPAGE_CHAR_EFFECTS: aSet.Put (SvxFontListItem( aItem.GetFontList(), SID_ATTR_CHAR_FONTLIST));
aSet.Put (SfxUInt16Item(SID_DISABLE_CTL,DISABLE_CASEMAP)); rPage.PageCreated(aSet);
rPage.PageCreated(aSet); }
break; else if (nId == m_nEffectsPageId)
{
default: aSet.Put (SfxUInt16Item(SID_DISABLE_CTL,DISABLE_CASEMAP));
break; rPage.PageCreated(aSet);
} }
} }
......
sc/source/ui/pagedlg/tphfedit.cxx
Dosyayı görüntüle @ 51640a1b
...@@ -216,8 +216,8 @@ void ScEditWindow::SetCharAttriutes() ...@@ -216,8 +216,8 @@ void ScEditWindow::SetCharAttriutes()
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "ScAbstractFactory create fail!"); OSL_ENSURE(pFact, "ScAbstractFactory create fail!");
SfxAbstractTabDialog* pDlg = pFact->CreateScCharDlg( GetParent(), &aSet, SfxAbstractTabDialog* pDlg = pFact->CreateScCharDlg(
pDocSh,RID_SCDLG_CHAR ); GetParent(), &aSet, pDocSh);
OSL_ENSURE(pDlg, "Dialog create fail!"); OSL_ENSURE(pDlg, "Dialog create fail!");
pDlg->SetText( ScGlobal::GetRscString( STR_TEXTATTRS ) ); pDlg->SetText( ScGlobal::GetRscString( STR_TEXTATTRS ) );
if ( pDlg->Execute() == RET_OK ) if ( pDlg->Execute() == RET_OK )
......
sc/source/ui/src/textdlgs.src
Dosyayı görüntüle @ 51640a1b
...@@ -20,65 +20,6 @@ ...@@ -20,65 +20,6 @@
#include <svx/dialogs.hrc> #include <svx/dialogs.hrc>
#include "sc.hrc" #include "sc.hrc"
TabDialog RID_SCDLG_CHAR
{
OutputSize = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT ( 289 , 176 ) ;
Text [ en-US ] = "Character" ;
Moveable = TRUE ;
Closeable = TRUE ;
TabControl 1
{
OutputSize = TRUE ;
Pos = MAP_APPFONT ( 3 , 3 ) ;
Size = MAP_APPFONT ( 260 , 135 ) ;
PageList =
{
PageItem
{
Identifier = RID_SVXPAGE_CHAR_NAME ;
Text [ en-US ] = "Font";
};
PageItem
{
Identifier = RID_SVXPAGE_CHAR_EFFECTS ;
Text [ en-US ] = "Font Effects";
};
PageItem
{
Identifier = RID_SVXPAGE_CHAR_POSITION ;
Text [ en-US ] = "Font Position";
};
};
};
OKButton 1
{
Pos = MAP_APPFONT ( 6 , 151 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
};
CancelButton 1
{
Pos = MAP_APPFONT ( 60 , 151 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
};
HelpButton 1
{
Pos = MAP_APPFONT ( 114 , 151 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
};
PushButton 1
{
Pos = MAP_APPFONT ( 169 , 151 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = "Back" ;
TabStop = TRUE ;
};
};
TabDialog RID_SCDLG_PARAGRAPH TabDialog RID_SCDLG_PARAGRAPH
{ {
OutputSize = TRUE ; OutputSize = TRUE ;
......
sc/source/ui/view/editsh.cxx
Dosyayı görüntüle @ 51640a1b
...@@ -457,8 +457,8 @@ void ScEditShell::Execute( SfxRequest& rReq ) ...@@ -457,8 +457,8 @@ void ScEditShell::Execute( SfxRequest& rReq )
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "ScAbstractFactory create fail!"); OSL_ENSURE(pFact, "ScAbstractFactory create fail!");
SfxAbstractTabDialog* pDlg = pFact->CreateScCharDlg( pViewData->GetDialogParent(), &aAttrs, SfxAbstractTabDialog* pDlg = pFact->CreateScCharDlg(
pObjSh, RID_SCDLG_CHAR ); pViewData->GetDialogParent(), &aAttrs, pObjSh);
OSL_ENSURE(pDlg, "Dialog create fail!"); OSL_ENSURE(pDlg, "Dialog create fail!");
if (nSlot == SID_CHAR_DLG_EFFECT) if (nSlot == SID_CHAR_DLG_EFFECT)
{ {
......
sc/uiconfig/scalc/ui/chardialog.ui 0 → 100644
Dosyayı görüntüle @ 51640a1b
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.16.0 on Sat Jan 4 17:30:31 2014 -->
<interface>
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkDialog" id="CharDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="title" translatable="yes">Character</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
<property name="can_focus">False</property>
<property name="orientation">vertical</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="layout_style">end</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="can_default">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="reset">
<property name="label">gtk-revert-to-saved</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>
</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="GtkNotebook" id="tabcontrol">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<child>
<placeholder/>
</child>
<child type="tab">
<object class="GtkLabel" id="font">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Font</property>
</object>
<packing>
<property name="tab_fill">False</property>
</packing>
</child>
<child>
<placeholder/>
</child>
<child type="tab">
<object class="GtkLabel" id="fonteffects">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Font Effects</property>
</object>
<packing>
<property name="position">1</property>
<property name="tab_fill">False</property>
</packing>
</child>
<child>
<placeholder/>
</child>
<child type="tab">
<object class="GtkLabel" id="position">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Position</property>
</object>
<packing>
<property name="position">2</property>
<property name="tab_fill">False</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</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">reset</action-widget>
</action-widgets>
</object>
</interface>
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