Skip to content

C
core
Kaydet (Commit) 88cf2853 authored tarafından Albert Thuswaldner's avatar Albert Thuswaldner Kaydeden (comit) Caolán McNamara
Dosyalara gözat
Seçenekler

Convert scalc delete contents dialog to .ui 

Change-Id: I1c84fe3c57fdd72880b16a2d69aa44cda0fc4f4f
üst 9b7a69d6
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 58 additions and 182 deletions
sc/UI_scalc.mk
Dosyayı görüntüle @ 88cf2853
......@@ -12,6 +12,7 @@ $(eval $(call gb_UI_UI,modules/scalc))
$(eval $(call gb_UI_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/cellprotectionpage \
sc/uiconfig/scalc/ui/definename \
sc/uiconfig/scalc/ui/deletecontents \
sc/uiconfig/scalc/ui/formatcellsdialog \
sc/uiconfig/scalc/ui/insertname \
sc/uiconfig/scalc/ui/insertsheet \
......
sc/source/ui/inc/delcodlg.hxx
Dosyayı görüntüle @ 88cf2853
......@@ -21,7 +21,6 @@
#define SC_DELCODLG_HXX
#include <vcl/dialog.hxx>
#include <vcl/fixed.hxx>
#include <vcl/button.hxx>
#include "global.hxx"
......@@ -30,18 +29,15 @@
class ScDeleteContentsDlg : public ModalDialog
{
private:
FixedLine aFlFrame;
CheckBox aBtnDelAll;
CheckBox aBtnDelStrings;
CheckBox aBtnDelNumbers;
CheckBox aBtnDelDateTime;
CheckBox aBtnDelFormulas;
CheckBox aBtnDelNotes;
CheckBox aBtnDelAttrs;
CheckBox aBtnDelObjects;
OKButton aBtnOk;
CancelButton aBtnCancel;
HelpButton aBtnHelp;
CheckBox* aBtnDelAll;
CheckBox* aBtnDelStrings;
CheckBox* aBtnDelNumbers;
CheckBox* aBtnDelDateTime;
CheckBox* aBtnDelFormulas;
CheckBox* aBtnDelNotes;
CheckBox* aBtnDelAttrs;
CheckBox* aBtnDelObjects;
OKButton* aBtnOk;
sal_Bool bObjectsDisabled;
......@@ -63,5 +59,4 @@ public:
#endif // SC_DELCODLG_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
sc/source/ui/inc/miscdlgs.hrc
Dosyayı görüntüle @ 88cf2853
......@@ -19,7 +19,6 @@
#include "sc.hrc" // -> RID_SCDLG_DELCELL
// -> RID_SCDLG_INSCELL
// -> RID_SCDLG_DELCONT
// -> RID_SCDLG_INSCONT
// -> RID_SCDLG_MOVETAB
// -> RID_SCDLG_STRINPUT
......@@ -49,15 +48,7 @@
#define BTN_INSROWS 16
#define BTN_INSCOLS 17
// Insert/Delete Contents Dialog
#define BTN_DELALL 10
#define BTN_DELSTRINGS 11
#define BTN_DELNUMBERS 12
#define BTN_DELDATETIME 13
#define BTN_DELFORMULAS 14
#define BTN_DELATTRS 15
#define BTN_DELNOTES 16
#define BTN_DELOBJECTS 17
// Insert Contents Dialog
#define BTN_INSALL 20
#define BTN_INSSTRINGS 21
#define BTN_INSNUMBERS 22
......
sc/source/ui/miscdlgs/delcodlg.cxx
Dosyayı görüntüle @ 88cf2853
......@@ -17,11 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#undef SC_DLLIMPLEMENTATION
//------------------------------------------------------------------
#include "delcodlg.hxx"
......@@ -40,50 +37,45 @@ sal_uInt16 ScDeleteContentsDlg::nPreviousChecks = (IDF_DATETIME | IDF_STRING
ScDeleteContentsDlg::ScDeleteContentsDlg( Window* pParent,
sal_uInt16 nCheckDefaults ) :
ModalDialog ( pParent, ScResId( RID_SCDLG_DELCONT ) ),
ModalDialog ( pParent, "DeleteContentsDialog", "modules/scalc/ui/deletecontents.ui" ),
//
aFlFrame ( this, ScResId( FL_FRAME ) ),
aBtnDelAll ( this, ScResId( BTN_DELALL ) ),
aBtnDelStrings ( this, ScResId( BTN_DELSTRINGS ) ),
aBtnDelNumbers ( this, ScResId( BTN_DELNUMBERS ) ),
aBtnDelDateTime ( this, ScResId( BTN_DELDATETIME ) ),
aBtnDelFormulas ( this, ScResId( BTN_DELFORMULAS ) ),
aBtnDelNotes ( this, ScResId( BTN_DELNOTES ) ),
aBtnDelAttrs ( this, ScResId( BTN_DELATTRS ) ),
aBtnDelObjects ( this, ScResId( BTN_DELOBJECTS ) ),
aBtnOk ( this, ScResId( BTN_OK ) ),
aBtnCancel ( this, ScResId( BTN_CANCEL ) ),
aBtnHelp ( this, ScResId( BTN_HELP ) ),
bObjectsDisabled( false )
{
get( aBtnDelAll, "deleteall" );
get( aBtnDelStrings, "text" );
get( aBtnDelNumbers, "numbers" );
get( aBtnDelDateTime, "datetime" );
get( aBtnDelFormulas, "formulas" );
get( aBtnDelNotes, "comments" );
get( aBtnDelAttrs, "formats" );
get( aBtnDelObjects, "objects" );
get( aBtnOk, "ok" );
if ( nCheckDefaults != 0 )
{
ScDeleteContentsDlg::nPreviousChecks = nCheckDefaults;
ScDeleteContentsDlg::bPreviousAllCheck = false;
}
aBtnDelAll.Check ( ScDeleteContentsDlg::bPreviousAllCheck );
aBtnDelStrings.Check ( IS_SET( IDF_STRING,
aBtnDelAll->Check ( ScDeleteContentsDlg::bPreviousAllCheck );
aBtnDelStrings->Check ( IS_SET( IDF_STRING,
ScDeleteContentsDlg::nPreviousChecks ) );
aBtnDelNumbers.Check ( IS_SET( IDF_VALUE,
aBtnDelNumbers->Check ( IS_SET( IDF_VALUE,
ScDeleteContentsDlg::nPreviousChecks ) );
aBtnDelDateTime.Check( IS_SET( IDF_DATETIME,
aBtnDelDateTime->Check( IS_SET( IDF_DATETIME,
ScDeleteContentsDlg::nPreviousChecks ) );
aBtnDelFormulas.Check( IS_SET( IDF_FORMULA,
aBtnDelFormulas->Check( IS_SET( IDF_FORMULA,
ScDeleteContentsDlg::nPreviousChecks ) );
aBtnDelNotes.Check ( IS_SET( IDF_NOTE,
aBtnDelNotes->Check ( IS_SET( IDF_NOTE,
ScDeleteContentsDlg::nPreviousChecks ) );
aBtnDelAttrs.Check ( IS_SET( IDF_ATTRIB,
aBtnDelAttrs->Check ( IS_SET( IDF_ATTRIB,
ScDeleteContentsDlg::nPreviousChecks ) );
aBtnDelObjects.Check ( IS_SET( IDF_OBJECTS,
aBtnDelObjects->Check ( IS_SET( IDF_OBJECTS,
ScDeleteContentsDlg::nPreviousChecks ) );
DisableChecks( aBtnDelAll.IsChecked() );
DisableChecks( aBtnDelAll->IsChecked() );
aBtnDelAll.SetClickHdl( LINK( this, ScDeleteContentsDlg, DelAllHdl ) );
//-------------
FreeResource();
aBtnDelAll->SetClickHdl( LINK( this, ScDeleteContentsDlg, DelAllHdl ) );
}
//------------------------------------------------------------------------
......@@ -92,22 +84,22 @@ sal_uInt16 ScDeleteContentsDlg::GetDelContentsCmdBits() const
{
ScDeleteContentsDlg::nPreviousChecks = 0;
if ( aBtnDelStrings.IsChecked() )
if ( aBtnDelStrings->IsChecked() )
ScDeleteContentsDlg::nPreviousChecks = IDF_STRING;
if ( aBtnDelNumbers.IsChecked() )
if ( aBtnDelNumbers->IsChecked() )
ScDeleteContentsDlg::nPreviousChecks |= IDF_VALUE;
if ( aBtnDelDateTime.IsChecked())
if ( aBtnDelDateTime->IsChecked())
ScDeleteContentsDlg::nPreviousChecks |= IDF_DATETIME;
if ( aBtnDelFormulas.IsChecked())
if ( aBtnDelFormulas->IsChecked())
ScDeleteContentsDlg::nPreviousChecks |= IDF_FORMULA;
if ( aBtnDelNotes.IsChecked() )
if ( aBtnDelNotes->IsChecked() )
ScDeleteContentsDlg::nPreviousChecks |= IDF_NOTE;
if ( aBtnDelAttrs.IsChecked() )
if ( aBtnDelAttrs->IsChecked() )
ScDeleteContentsDlg::nPreviousChecks |= IDF_ATTRIB;
if ( aBtnDelObjects.IsChecked() )
if ( aBtnDelObjects->IsChecked() )
ScDeleteContentsDlg::nPreviousChecks |= IDF_OBJECTS;
ScDeleteContentsDlg::bPreviousAllCheck = aBtnDelAll.IsChecked();
ScDeleteContentsDlg::bPreviousAllCheck = aBtnDelAll->IsChecked();
return ( (ScDeleteContentsDlg::bPreviousAllCheck)
? IDF_ALL
......@@ -120,26 +112,26 @@ void ScDeleteContentsDlg::DisableChecks( sal_Bool bDelAllChecked )
{
if ( bDelAllChecked )
{
aBtnDelStrings.Disable();
aBtnDelNumbers.Disable();
aBtnDelDateTime.Disable();
aBtnDelFormulas.Disable();
aBtnDelNotes.Disable();
aBtnDelAttrs.Disable();
aBtnDelObjects.Disable();
aBtnDelStrings->Disable();
aBtnDelNumbers->Disable();
aBtnDelDateTime->Disable();
aBtnDelFormulas->Disable();
aBtnDelNotes->Disable();
aBtnDelAttrs->Disable();
aBtnDelObjects->Disable();
}
else
{
aBtnDelStrings.Enable();
aBtnDelNumbers.Enable();
aBtnDelDateTime.Enable();
aBtnDelFormulas.Enable();
aBtnDelNotes.Enable();
aBtnDelAttrs.Enable();
aBtnDelStrings->Enable();
aBtnDelNumbers->Enable();
aBtnDelDateTime->Enable();
aBtnDelFormulas->Enable();
aBtnDelNotes->Enable();
aBtnDelAttrs->Enable();
if (bObjectsDisabled)
aBtnDelObjects.Disable();
aBtnDelObjects->Disable();
else
aBtnDelObjects.Enable();
aBtnDelObjects->Enable();
}
}
......@@ -148,15 +140,15 @@ void ScDeleteContentsDlg::DisableChecks( sal_Bool bDelAllChecked )
void ScDeleteContentsDlg::DisableObjects()
{
bObjectsDisabled = sal_True;
aBtnDelObjects.Check(false);
aBtnDelObjects.Disable();
aBtnDelObjects->Check(false);
aBtnDelObjects->Disable();
}
//------------------------------------------------------------------------
IMPL_LINK_NOARG_INLINE_START(ScDeleteContentsDlg, DelAllHdl)
{
DisableChecks( aBtnDelAll.IsChecked() );
DisableChecks( aBtnDelAll->IsChecked() );
return 0;
}
......@@ -166,6 +158,4 @@ ScDeleteContentsDlg::~ScDeleteContentsDlg()
{
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
sc/source/ui/src/miscdlgs.src
Dosyayı görüntüle @ 88cf2853
......@@ -155,107 +155,6 @@ ModalDialog RID_SCDLG_INSCELL
};
};
ModalDialog RID_SCDLG_DELCONT
{
OutputSize = TRUE ;
HelpId = CMD_SID_DELETE ;
SVLook = TRUE ;
Size = MAP_APPFONT ( 161 , 130 ) ;
Text [ en-US ] = "Delete Contents" ;
Moveable = TRUE ;
Closeable = FALSE ;
OKButton BTN_OK
{
Pos = MAP_APPFONT ( 105 , 6 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
DefButton = TRUE ;
};
CancelButton BTN_CANCEL
{
Pos = MAP_APPFONT ( 105 , 23 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
};
HelpButton BTN_HELP
{
Pos = MAP_APPFONT ( 105 , 43 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
};
CheckBox BTN_DELALL
{
HelpID = "sc:CheckBox:RID_SCDLG_DELCONT:BTN_DELALL";
Pos = MAP_APPFONT ( 12 , 14 ) ;
Size = MAP_APPFONT ( 83 , 10 ) ;
Text [ en-US ] = "Delete ~all" ;
TabStop = TRUE ;
};
CheckBox BTN_DELSTRINGS
{
HelpID = "sc:CheckBox:RID_SCDLG_DELCONT:BTN_DELSTRINGS";
Pos = MAP_APPFONT ( 12 , 30 ) ;
Size = MAP_APPFONT ( 83 , 10 ) ;
Text [ en-US ] = "~Text" ;
TabStop = TRUE ;
};
CheckBox BTN_DELNUMBERS
{
HelpID = "sc:CheckBox:RID_SCDLG_DELCONT:BTN_DELNUMBERS";
Pos = MAP_APPFONT ( 12 , 44 ) ;
Size = MAP_APPFONT ( 83 , 10 ) ;
Text [ en-US ] = "~Numbers" ;
TabStop = TRUE ;
};
CheckBox BTN_DELDATETIME
{
HelpID = "sc:CheckBox:RID_SCDLG_DELCONT:BTN_DELDATETIME";
Pos = MAP_APPFONT ( 12 , 58 ) ;
Size = MAP_APPFONT ( 83 , 10 ) ;
Text [ en-US ] = "~Date & time" ;
TabStop = TRUE ;
};
CheckBox BTN_DELFORMULAS
{
HelpID = "sc:CheckBox:RID_SCDLG_DELCONT:BTN_DELFORMULAS";
Pos = MAP_APPFONT ( 12 , 72 ) ;
Size = MAP_APPFONT ( 83 , 10 ) ;
Text [ en-US ] = "~Formulas" ;
TabStop = TRUE ;
};
CheckBox BTN_DELATTRS
{
HelpID = "sc:CheckBox:RID_SCDLG_DELCONT:BTN_DELATTRS";
Pos = MAP_APPFONT ( 12 , 100 ) ;
Size = MAP_APPFONT ( 83 , 10 ) ;
Text [ en-US ] = "For~mats" ;
TabStop = TRUE ;
};
CheckBox BTN_DELNOTES
{
HelpID = "sc:CheckBox:RID_SCDLG_DELCONT:BTN_DELNOTES";
Pos = MAP_APPFONT ( 12 , 86 ) ;
Size = MAP_APPFONT ( 83 , 10 ) ;
Text [ en-US ] = "~Comments" ;
TabStop = TRUE ;
};
CheckBox BTN_DELOBJECTS
{
HelpID = "sc:CheckBox:RID_SCDLG_DELCONT:BTN_DELOBJECTS";
Pos = MAP_APPFONT ( 12 , 114 ) ;
Size = MAP_APPFONT ( 83 , 10 ) ;
Text [ en-US ] = "~Objects" ;
TabStop = TRUE ;
};
FixedLine FL_FRAME
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
Size = MAP_APPFONT ( 93 , 8 ) ;
Text [ en-US ] = "Selection" ;
};
};
ModalDialog RID_SCDLG_INSCONT
{
OutputSize = TRUE ;
......
sc/uiconfig/scalc/ui/deletecontents.ui 0 → 100644
Dosyayı görüntüle @ 88cf2853
This diff is collapsed.
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