diff options
author | Caolán McNamara <caolanm@redhat.com> | 2013-12-31 21:27:16 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-12-31 21:34:07 +0000 |
commit | 8c5f5aab2e3f1c600ff362632fb4db8d8c065d46 (patch) | |
tree | 6742961701ac0c12bb2bc3658e65de7d98bfc67f /basctl/source | |
parent | 79c1b86e20bbb2bb826493b07cfc000cb3a5d52d (diff) |
convert export basic dialog to .ui (600th .ui conversion)
Change-Id: I67511e69f763761cd1631263fccd0704daf1886b
Diffstat (limited to 'basctl/source')
-rw-r--r-- | basctl/source/basicide/moduldl2.cxx | 22 | ||||
-rw-r--r-- | basctl/source/basicide/moduldlg.hxx | 7 | ||||
-rw-r--r-- | basctl/source/basicide/moduldlg.src | 42 |
3 files changed, 9 insertions, 62 deletions
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx index ba23c2f2c004..1f8fc704d005 100644 --- a/basctl/source/basicide/moduldl2.cxx +++ b/basctl/source/basicide/moduldl2.cxx @@ -456,28 +456,20 @@ IMPL_LINK_NOARG(GotoLineDialog, OkButtonHandler) IMPL_LINK_NOARG(ExportDialog, OkButtonHandler) { - mbExportAsPackage = maExportAsPackageButton.IsChecked(); + mbExportAsPackage = m_pExportAsPackageButton->IsChecked(); EndDialog(1); return 0; } -ExportDialog::ExportDialog( Window * pParent ) - : ModalDialog( pParent, IDEResId( RID_DLG_EXPORT ) ) - , maExportAsPackageButton( this, IDEResId( RB_EXPORTASPACKAGE ) ) - , maExportAsBasicButton( this, IDEResId( RB_EXPORTASBASIC ) ) - , maOKButton( this, IDEResId( RID_PB_OK ) ) - , maCancelButton( this, IDEResId( RID_PB_CANCEL ) ) +ExportDialog::ExportDialog(Window * pParent) + : ModalDialog(pParent, "ExportDialog", "modules/BasicIDE/ui/exportdialog.ui") , mbExportAsPackage(false) { - FreeResource(); - maExportAsPackageButton.Check(); - maOKButton.SetClickHdl(LINK(this, ExportDialog, OkButtonHandler)); -} - -//---------------------------------------------------------------------------- + get(m_pExportAsPackageButton, "extension"); + get(m_pOKButton, "ok"); -ExportDialog::~ExportDialog() -{ + m_pExportAsPackageButton->Check(); + m_pOKButton->SetClickHdl(LINK(this, ExportDialog, OkButtonHandler)); } //---------------------------------------------------------------------------- diff --git a/basctl/source/basicide/moduldlg.hxx b/basctl/source/basicide/moduldlg.hxx index a341a96a0901..1bac3009cb9a 100644 --- a/basctl/source/basicide/moduldlg.hxx +++ b/basctl/source/basicide/moduldlg.hxx @@ -81,10 +81,8 @@ public: class ExportDialog : public ModalDialog { private: - RadioButton maExportAsPackageButton; - RadioButton maExportAsBasicButton; - OKButton maOKButton; - CancelButton maCancelButton; + RadioButton* m_pExportAsPackageButton; + OKButton* m_pOKButton; bool mbExportAsPackage; @@ -92,7 +90,6 @@ private: public: ExportDialog( Window * pParent ); - ~ExportDialog(); bool isExportAsPackage () { return mbExportAsPackage; } }; diff --git a/basctl/source/basicide/moduldlg.src b/basctl/source/basicide/moduldlg.src index 7f5a8025d5a6..885ee0699121 100644 --- a/basctl/source/basicide/moduldlg.src +++ b/basctl/source/basicide/moduldlg.src @@ -272,48 +272,6 @@ ModalDialog RID_DLG_LIBS }; }; -ModalDialog RID_DLG_EXPORT -{ - HelpID = "basctl:ModalDialog:RID_DLG_EXPORT"; - OutputSize = TRUE ; - SVLook = TRUE ; - Size = MAP_APPFONT ( 115 , 55 ) ; - Moveable = TRUE ; - Closeable = TRUE ; - Text [ en-US ] = "Export Basic library"; - OKButton RID_PB_OK - { - Pos = MAP_APPFONT ( 6 , 35 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - DefButton = TRUE ; - }; - CancelButton RID_PB_CANCEL - { - Pos = MAP_APPFONT ( 59 , 35 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - }; - - RadioButton RB_EXPORTASPACKAGE - { - HelpID = "basctl:RadioButton:RID_DLG_EXPORT:RB_EXPORTASPACKAGE"; - Pos = MAP_APPFONT( 6, 6 ); - Size = MAP_APPFONT( 103, 10 ); - Group = TRUE; - Text [ en-US ] = "Export as ~extension"; - TabStop = TRUE ; - }; - RadioButton RB_EXPORTASBASIC - { - HelpID = "basctl:RadioButton:RID_DLG_EXPORT:RB_EXPORTASBASIC"; - Pos = MAP_APPFONT( 6, 19 ); - Size = MAP_APPFONT( 103, 10 ); - //Group = TRUE; - Text [ en-US ] = "Export as BASIC library"; - }; -}; - String RID_STR_EXPORTPACKAGE { Text [ en-US ] = "Export library as extension"; |