Skip to content

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

convert export basic dialog to .ui (600th .ui conversion) 

Change-Id: I67511e69f763761cd1631263fccd0704daf1886b
üst 79c1b86e
Hide whitespace changes
Inline Side-by-side
Showing with 126 additions and 63 deletions
basctl/UIConfig_basicide.mk
Dosyayı görüntüle @ 8c5f5aab
...@@ -31,6 +31,7 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/BasicIDE,\ ...@@ -31,6 +31,7 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/BasicIDE,\
$(eval $(call gb_UIConfig_add_uifiles,modules/BasicIDE,\ $(eval $(call gb_UIConfig_add_uifiles,modules/BasicIDE,\
basctl/uiconfig/basicide/ui/basicmacrodialog \ basctl/uiconfig/basicide/ui/basicmacrodialog \
basctl/uiconfig/basicide/ui/gotolinedialog \ basctl/uiconfig/basicide/ui/gotolinedialog \
basctl/uiconfig/basicide/ui/exportdialog \
basctl/uiconfig/basicide/ui/newlibdialog \ basctl/uiconfig/basicide/ui/newlibdialog \
basctl/uiconfig/basicide/ui/organizedialog \ basctl/uiconfig/basicide/ui/organizedialog \
)) ))
......
basctl/inc/basidesh.hrc
Dosyayı görüntüle @ 8c5f5aab
...@@ -34,7 +34,6 @@ ...@@ -34,7 +34,6 @@
#define RID_TP_LIBS ( RID_BASICIDE_START + 38 ) #define RID_TP_LIBS ( RID_BASICIDE_START + 38 )
#define RID_TP_DLGS ( RID_BASICIDE_START + 39 ) #define RID_TP_DLGS ( RID_BASICIDE_START + 39 )
#define RID_DLG_LIBS ( RID_BASICIDE_START + 40 ) #define RID_DLG_LIBS ( RID_BASICIDE_START + 40 )
#define RID_DLG_EXPORT ( RID_BASICIDE_START + 43 )
#define RID_POPUP_DLGED ( RID_BASICIDE_START + 62 ) #define RID_POPUP_DLGED ( RID_BASICIDE_START + 62 )
#define RID_PRINTDLG_STRLIST ( RID_BASICIDE_START + 78 ) #define RID_PRINTDLG_STRLIST ( RID_BASICIDE_START + 78 )
......
basctl/source/basicide/moduldl2.cxx
Dosyayı görüntüle @ 8c5f5aab
...@@ -456,28 +456,20 @@ IMPL_LINK_NOARG(GotoLineDialog, OkButtonHandler) ...@@ -456,28 +456,20 @@ IMPL_LINK_NOARG(GotoLineDialog, OkButtonHandler)
IMPL_LINK_NOARG(ExportDialog, OkButtonHandler) IMPL_LINK_NOARG(ExportDialog, OkButtonHandler)
{ {
mbExportAsPackage = maExportAsPackageButton.IsChecked(); mbExportAsPackage = m_pExportAsPackageButton->IsChecked();
EndDialog(1); EndDialog(1);
return 0; return 0;
} }
ExportDialog::ExportDialog( Window * pParent ) ExportDialog::ExportDialog(Window * pParent)
: ModalDialog( pParent, IDEResId( RID_DLG_EXPORT ) ) : ModalDialog(pParent, "ExportDialog", "modules/BasicIDE/ui/exportdialog.ui")
, maExportAsPackageButton( this, IDEResId( RB_EXPORTASPACKAGE ) )
, maExportAsBasicButton( this, IDEResId( RB_EXPORTASBASIC ) )
, maOKButton( this, IDEResId( RID_PB_OK ) )
, maCancelButton( this, IDEResId( RID_PB_CANCEL ) )
, mbExportAsPackage(false) , mbExportAsPackage(false)
{ {
FreeResource(); get(m_pExportAsPackageButton, "extension");
maExportAsPackageButton.Check(); get(m_pOKButton, "ok");
maOKButton.SetClickHdl(LINK(this, ExportDialog, OkButtonHandler));
}
//----------------------------------------------------------------------------
ExportDialog::~ExportDialog() m_pExportAsPackageButton->Check();
{ m_pOKButton->SetClickHdl(LINK(this, ExportDialog, OkButtonHandler));
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
......
basctl/source/basicide/moduldlg.hxx
Dosyayı görüntüle @ 8c5f5aab
...@@ -81,10 +81,8 @@ public: ...@@ -81,10 +81,8 @@ public:
class ExportDialog : public ModalDialog class ExportDialog : public ModalDialog
{ {
private: private:
RadioButton maExportAsPackageButton; RadioButton* m_pExportAsPackageButton;
RadioButton maExportAsBasicButton; OKButton* m_pOKButton;
OKButton maOKButton;
CancelButton maCancelButton;
bool mbExportAsPackage; bool mbExportAsPackage;
...@@ -92,7 +90,6 @@ private: ...@@ -92,7 +90,6 @@ private:
public: public:
ExportDialog( Window * pParent ); ExportDialog( Window * pParent );
~ExportDialog();
bool isExportAsPackage () { return mbExportAsPackage; } bool isExportAsPackage () { return mbExportAsPackage; }
}; };
......
basctl/source/basicide/moduldlg.src
Dosyayı görüntüle @ 8c5f5aab
...@@ -272,48 +272,6 @@ ModalDialog RID_DLG_LIBS ...@@ -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 String RID_STR_EXPORTPACKAGE
{ {
Text [ en-US ] = "Export library as extension"; Text [ en-US ] = "Export library as extension";
......
basctl/uiconfig/basicide/ui/exportdialog.ui 0 → 100644
Dosyayı görüntüle @ 8c5f5aab
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.16.0 on Tue Dec 31 21:21:09 2013 -->
<interface>
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkDialog" id="ExportDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="title" translatable="yes">Export Basic library</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>
<object class="GtkGrid" id="grid3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
<property name="row_homogeneous">True</property>
<child>
<object class="GtkRadioButton" id="extension">
<property name="label" translatable="yes">Export as _extension</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="active">True</property>
<property name="draw_indicator">True</property>
<property name="group">basic</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="GtkRadioButton" id="basic">
<property name="label" translatable="yes">Export as BASIC library</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>
<property name="group">extension</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>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<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>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="pack_type">end</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-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