Skip to content

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

convert validity tabdialog to .ui 

Change-Id: Ib7be4172e2d9b80869dbfa47674b13f1e03877d3
üst 4e49887b
Hide whitespace changes
Inline Side-by-side
Showing with 218 additions and 97 deletions
sc/UIConfig_scalc.mk
Dosyayı görüntüle @ 03552256
...@@ -99,6 +99,8 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\ ...@@ -99,6 +99,8 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/leftheaderdialog \ sc/uiconfig/scalc/ui/leftheaderdialog \
sc/uiconfig/scalc/ui/namerangesdialog \ sc/uiconfig/scalc/ui/namerangesdialog \
sc/uiconfig/scalc/ui/managenamesdialog \ sc/uiconfig/scalc/ui/managenamesdialog \
sc/uiconfig/scalc/ui/movecopysheet \
sc/uiconfig/scalc/ui/movingaveragedialog \
sc/uiconfig/scalc/ui/nosolutiondialog \ sc/uiconfig/scalc/ui/nosolutiondialog \
sc/uiconfig/scalc/ui/optcalculatepage \ sc/uiconfig/scalc/ui/optcalculatepage \
sc/uiconfig/scalc/ui/optchangespage \ sc/uiconfig/scalc/ui/optchangespage \
...@@ -148,9 +150,8 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\ ...@@ -148,9 +150,8 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/tpviewpage \ sc/uiconfig/scalc/ui/tpviewpage \
sc/uiconfig/scalc/ui/ttestdialog \ sc/uiconfig/scalc/ui/ttestdialog \
sc/uiconfig/scalc/ui/ungroupdialog \ sc/uiconfig/scalc/ui/ungroupdialog \
sc/uiconfig/scalc/ui/validationdialog \
sc/uiconfig/scalc/ui/validationhelptabpage \ sc/uiconfig/scalc/ui/validationhelptabpage \
sc/uiconfig/scalc/ui/movecopysheet \
sc/uiconfig/scalc/ui/movingaveragedialog \
)) ))
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
sc/inc/scabstdlg.hxx
Dosyayı görüntüle @ 03552256
...@@ -499,8 +499,8 @@ public: ...@@ -499,8 +499,8 @@ public:
virtual SfxAbstractTabDialog * CreateScParagraphDlg( Window* pParent, const SfxItemSet* pAttr , virtual SfxAbstractTabDialog * CreateScParagraphDlg( Window* pParent, const SfxItemSet* pAttr ,
int nId ) = 0; int nId ) = 0;
virtual SfxAbstractTabDialog * CreateScValidationDlg( Window* pParent, virtual SfxAbstractTabDialog * CreateScValidationDlg(Window* pParent,
const SfxItemSet* pArgSet,int nId, ScTabViewShell *pTabVwSh ) = 0; const SfxItemSet* pArgSet, ScTabViewShell *pTabVwSh) = 0;
virtual SfxAbstractTabDialog * CreateScSortDlg(Window* pParent, const SfxItemSet* pArgSet) = 0; virtual SfxAbstractTabDialog * CreateScSortDlg(Window* pParent, const SfxItemSet* pArgSet) = 0;
// for tabpage // for tabpage
......
sc/source/ui/attrdlg/scdlgfact.cxx
Dosyayı görüntüle @ 03552256
...@@ -1173,22 +1173,11 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScParagraphDlg( Windo ...@@ -1173,22 +1173,11 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScParagraphDlg( Windo
return 0; return 0;
} }
SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScValidationDlg( Window* pParent, SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScValidationDlg(Window* pParent,
const SfxItemSet* pArgSet,int nId, ScTabViewShell *pTabVwSh ) const SfxItemSet* pArgSet, ScTabViewShell *pTabVwSh)
{ {
SfxTabDialog* pDlg=NULL; SfxTabDialog* pDlg = new ScValidationDlg(pParent, pArgSet, pTabVwSh);
switch ( nId ) return new ScAbstractTabDialog_Impl(pDlg);
{
case TAB_DLG_VALIDATION :
pDlg = new ScValidationDlg( pParent, pArgSet, pTabVwSh );
break;
default:
break;
}
if ( pDlg )
return new ScAbstractTabDialog_Impl( pDlg );
return 0;
} }
SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScSortDlg(Window* pParent, const SfxItemSet* pArgSet) SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScSortDlg(Window* pParent, const SfxItemSet* pArgSet)
......
sc/source/ui/attrdlg/scdlgfact.hxx
Dosyayı görüntüle @ 03552256
...@@ -566,8 +566,8 @@ public: ...@@ -566,8 +566,8 @@ public:
virtual SfxAbstractTabDialog * CreateScParagraphDlg( Window* pParent, const SfxItemSet* pAttr , virtual SfxAbstractTabDialog * CreateScParagraphDlg( Window* pParent, const SfxItemSet* pAttr ,
int nId ); int nId );
virtual SfxAbstractTabDialog * CreateScValidationDlg( Window* pParent, virtual SfxAbstractTabDialog * CreateScValidationDlg(Window* pParent,
const SfxItemSet* pArgSet,int nId, ScTabViewShell *pTabVwSh ); const SfxItemSet* pArgSet, ScTabViewShell *pTabVwSh);
virtual SfxAbstractTabDialog * CreateScSortDlg(Window* pParent, const SfxItemSet* pArgSet); virtual SfxAbstractTabDialog * CreateScSortDlg(Window* pParent, const SfxItemSet* pArgSet);
......
sc/source/ui/dbgui/validate.cxx
Dosyayı görüntüle @ 03552256
...@@ -61,22 +61,19 @@ static sal_uInt16 pValueRanges[] = ...@@ -61,22 +61,19 @@ static sal_uInt16 pValueRanges[] =
// ============================================================================ // ============================================================================
ScValidationDlg::ScValidationDlg( Window* pParent, ScValidationDlg::ScValidationDlg(Window* pParent, const SfxItemSet* pArgSet,
const SfxItemSet* pArgSet, ScTabViewShell *pTabViewSh, SfxBindings *pB /*= NULL*/)
ScTabViewShell *pTabViewSh, : ScValidationDlgBase(pParent ? pParent : SFX_APP()->GetTopWindow(),
SfxBindings *pB /*= NULL*/ "ValidationDialog", "modules/scalc/ui/validationdialog.ui", pArgSet, pB)
) : , m_pTabVwSh(pTabViewSh)
ScValidationDlgBase( pParent ? pParent : SFX_APP()->GetTopWindow(), TAB_DLG_VALIDATION, pArgSet, pB ), , m_nValuePageId(0)
m_bOwnRefHdlr( false ), , m_bOwnRefHdlr(false)
m_pTabVwSh( pTabViewSh ), , m_bRefInputting(false)
m_bRefInputting( false ) {
{ m_nValuePageId = AddTabPage("criteria", ScTPValidationValue::Create, 0);
AddTabPage( TP_VALIDATION_VALUES, ScTPValidationValue::Create, 0 ); AddTabPage("inputhelp", ScTPValidationHelp::Create, 0);
AddTabPage( TP_VALIDATION_INPUTHELP, ScTPValidationHelp::Create, 0 ); AddTabPage("erroralert", ScTPValidationError::Create, 0);
AddTabPage( TP_VALIDATION_ERROR, ScTPValidationError::Create, 0 ); get(m_pHBox, "refinputbox");
FreeResource();
//temp hack until converted to .ui
mpHBox = new VclHBox(get_content_area());
} }
void ScTPValidationValue::SetReferenceHdl( const ScRange&rRange , ScDocument* pDoc ) void ScTPValidationValue::SetReferenceHdl( const ScRange&rRange , ScDocument* pDoc )
...@@ -155,8 +152,10 @@ void ScTPValidationValue::RefInputDonePostHdl() ...@@ -155,8 +152,10 @@ void ScTPValidationValue::RefInputDonePostHdl()
sal_Bool ScValidationDlg::Close() sal_Bool ScValidationDlg::Close()
{ {
if( m_bOwnRefHdlr ) if( m_bOwnRefHdlr )
if( SfxTabPage* pPage = GetTabPage( TP_VALIDATION_VALUES ) ) {
if (SfxTabPage* pPage = GetTabPage(m_nValuePageId))
static_cast<ScTPValidationValue*>(pPage)->RemoveRefDlg(); static_cast<ScTPValidationValue*>(pPage)->RemoveRefDlg();
}
return ScValidationDlgBase::Close(); return ScValidationDlgBase::Close();
} }
...@@ -165,10 +164,8 @@ ScValidationDlg::~ScValidationDlg() ...@@ -165,10 +164,8 @@ ScValidationDlg::~ScValidationDlg()
{ {
if( m_bOwnRefHdlr ) if( m_bOwnRefHdlr )
RemoveRefDlg( false ); RemoveRefDlg( false );
delete mpHBox;
} }
// ============================================================================ // ============================================================================
namespace { namespace {
......
sc/source/ui/dbgui/validate.src
Dosyayı görüntüle @ 03552256
...@@ -21,41 +21,6 @@ ...@@ -21,41 +21,6 @@
#include "validate.hrc" #include "validate.hrc"
TabDialog TAB_DLG_VALIDATION
{
OutputSize = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT ( 289 , 176 ) ;
Moveable = TRUE ;
TabControl 1
{
OutputSize = TRUE ;
Size = MAP_APPFONT ( 260 , 135 ) ;
PageList =
{
PageItem
{
Identifier = TP_VALIDATION_VALUES ;
PageResID = TP_VALIDATION_VALUES ;
Text [ en-US ] = "Criteria";
};
PageItem
{
Identifier = TP_VALIDATION_INPUTHELP ;
PageResID = TP_VALIDATION_INPUTHELP ;
Text [ en-US ] = "Input Help" ;
};
PageItem
{
Identifier = TP_VALIDATION_ERROR ;
PageResID = TP_VALIDATION_ERROR ;
Text [ en-US ] = "Error Alert" ;
};
};
};
Text [ en-US ] = "Validity" ;
};
#define OFFSET_X 30 #define OFFSET_X 30
TabPage TP_VALIDATION_VALUES TabPage TP_VALIDATION_VALUES
......
sc/source/ui/inc/anyrefdg.hxx
Dosyayı görüntüle @ 03552256
...@@ -207,6 +207,9 @@ private: ...@@ -207,6 +207,9 @@ private:
template<class TParentWindow, class TResId, class TArg> template<class TParentWindow, class TResId, class TArg>
ScRefHdlrImplBase( TParentWindow* pParent, TResId nResId, const TArg &rArg, SfxBindings *pB = NULL ); ScRefHdlrImplBase( TParentWindow* pParent, TResId nResId, const TArg &rArg, SfxBindings *pB = NULL );
template<class TParentWindow, class TArg>
ScRefHdlrImplBase( TParentWindow* pParent, const OString& rID, const OUString& rUIXMLDescription, const TArg &rArg, SfxBindings *pB = NULL );
~ScRefHdlrImplBase(); ~ScRefHdlrImplBase();
template<class, class, bool> friend struct ScRefHdlrImpl; template<class, class, bool> friend struct ScRefHdlrImpl;
...@@ -238,6 +241,15 @@ ScRefHdlrImplBase<TWindow,bBindRef>::ScRefHdlrImplBase( TParentWindow* pParent, ...@@ -238,6 +241,15 @@ ScRefHdlrImplBase<TWindow,bBindRef>::ScRefHdlrImplBase( TParentWindow* pParent,
{ {
} }
template<class TWindow, bool bBindRef >
template<class TParentWindow, class TArg>
ScRefHdlrImplBase<TWindow,bBindRef>::ScRefHdlrImplBase( TParentWindow* pParent, const OString& rID, const OUString& rUIXMLDescription, const TArg &rArg, SfxBindings *pB )
: TWindow( pParent, rID, rUIXMLDescription, rArg ),
ScRefHandler( *static_cast<TWindow*>(this), pB, bBindRef )
{
}
template<class TWindow, bool bBindRef > template<class TWindow, bool bBindRef >
ScRefHdlrImplBase<TWindow,bBindRef>::~ScRefHdlrImplBase(){} ScRefHdlrImplBase<TWindow,bBindRef>::~ScRefHdlrImplBase(){}
......
sc/source/ui/inc/validate.hrc
Dosyayı görüntüle @ 03552256
...@@ -17,9 +17,6 @@ ...@@ -17,9 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#define TP_VALIDATION_VALUES 696 #define TP_VALIDATION_VALUES 696
#define TP_VALIDATION_INPUTHELP 697
#define TP_VALIDATION_ERROR 698
#define TAB_DLG_VALIDATION 699
#define FT_ALLOW 1 #define FT_ALLOW 1
#define LB_ALLOW 2 #define LB_ALLOW 2
......
sc/source/ui/inc/validate.hxx
Dosyayı görüntüle @ 03552256
...@@ -80,26 +80,35 @@ public: ...@@ -80,26 +80,35 @@ public:
}; };
/** The "Validity" tab dialog. */ /** The "Validity" tab dialog. */
class ScValidationDlg :public ScRefHdlrImpl<ScValidationDlg, SfxTabDialog, false>, public ScRefHandlerHelper class ScValidationDlg
: public ScRefHdlrImpl<ScValidationDlg, SfxTabDialog, false>
, public ScRefHandlerHelper
{ {
typedef ScRefHdlrImpl<ScValidationDlg, SfxTabDialog, false> ScValidationDlgBase; typedef ScRefHdlrImpl<ScValidationDlg, SfxTabDialog, false> ScValidationDlgBase;
DECL_LINK( OkHdl, Button * ); DECL_LINK( OkHdl, Button * );
bool m_bOwnRefHdlr:1;
ScTabViewShell *m_pTabVwSh; ScTabViewShell *m_pTabVwSh;
VclHBox* mpHBox; VclHBox* m_pHBox;
sal_uInt16 m_nValuePageId;
bool m_bOwnRefHdlr:1;
bool m_bRefInputting:1; bool m_bRefInputting:1;
bool EnterRefStatus(); bool EnterRefStatus();
bool LeaveRefStatus(); bool LeaveRefStatus();
public: public:
explicit ScValidationDlg( Window* pParent, const SfxItemSet* pArgSet, ScTabViewShell * pTabViewSh, SfxBindings *pB = NULL ); explicit ScValidationDlg( Window* pParent, const SfxItemSet* pArgSet, ScTabViewShell * pTabViewSh, SfxBindings *pB = NULL );
virtual ~ScValidationDlg(); virtual ~ScValidationDlg();
inline static ScValidationDlg * Find1AliveObject( Window *pAncestor ); static ScValidationDlg * Find1AliveObject( Window *pAncestor )
{
return static_cast<ScValidationDlg *>( SC_MOD()->Find1RefWindow( SLOTID, pAncestor ) );
}
bool IsAlive(); bool IsAlive();
inline ScTabViewShell * GetTabViewShell(); ScTabViewShell *GetTabViewShell()
{
return m_pTabVwSh;
}
bool SetupRefDlg(); bool SetupRefDlg();
bool RemoveRefDlg( sal_Bool bRestoreModal = sal_True ); bool RemoveRefDlg( sal_Bool bRestoreModal = sal_True );
...@@ -129,7 +138,7 @@ public: ...@@ -129,7 +138,7 @@ public:
} }
bool IsRefInputting(){ return m_bRefInputting; } bool IsRefInputting(){ return m_bRefInputting; }
Window* get_refinput_shrink_parent() { return mpHBox; } Window* get_refinput_shrink_parent() { return m_pHBox; }
virtual void RefInputStart( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL ) virtual void RefInputStart( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL )
{ {
...@@ -302,16 +311,6 @@ public: ...@@ -302,16 +311,6 @@ public:
virtual void Reset ( const SfxItemSet& rArgSet ); virtual void Reset ( const SfxItemSet& rArgSet );
}; };
inline ScTabViewShell *ScValidationDlg::GetTabViewShell()
{
return m_pTabVwSh;
}
inline ScValidationDlg * ScValidationDlg::Find1AliveObject( Window *pAncestor )
{
return static_cast<ScValidationDlg *>( SC_MOD()->Find1RefWindow( SLOTID, pAncestor ) );
}
#endif // SC_VALIDATE_HXX #endif // SC_VALIDATE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
sc/source/ui/view/cellsh2.cxx
Dosyayı görüntüle @ 03552256
...@@ -848,8 +848,8 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) ...@@ -848,8 +848,8 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
} }
// cell range picker // cell range picker
SfxAbstractTabDialog* pDlg = pFact->CreateScValidationDlg( NULL, &aArgSet, TAB_DLG_VALIDATION, pTabViewShell ); SfxAbstractTabDialog* pDlg = pFact->CreateScValidationDlg(NULL, &aArgSet, pTabViewShell);
OSL_ENSURE(pDlg, "Dialog create fail!"); assert(pDlg); //Dialog create fail!
short nResult = pDlg->Execute(); short nResult = pDlg->Execute();
//When picking Cell Range, other Tab may be switched. Need restore the correct tab //When picking Cell Range, other Tab may be switched. Need restore the correct tab
......
sc/uiconfig/scalc/ui/validationdialog.ui 0 → 100644
Dosyayı görüntüle @ 03552256
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkDialog" id="ValidationDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="title" translatable="yes">Validity</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="criteria">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Criteria</property>
</object>
<packing>
<property name="tab_fill">False</property>
</packing>
</child>
<child>
<placeholder/>
</child>
<child type="tab">
<object class="GtkLabel" id="inputhelp">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Input Help</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="erroralert">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Error Alert</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>
<child>
<object class="GtkBox" id="refinputbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</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