Kaydet (Commit) aaa808d6 authored tarafından Caolán McNamara's avatar Caolán McNamara

convert gallery theme id dialog to .ui

Change-Id: Iad468b19a24efc4044a46301f6421648aac7cd6a
üst f2111a7e
......@@ -42,6 +42,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/dbregisterpage \
cui/uiconfig/ui/effectspage \
cui/uiconfig/ui/formatcellsdialog \
cui/uiconfig/ui/gallerythemeiddialog \
cui/uiconfig/ui/gallerytitledialog \
cui/uiconfig/ui/hangulhanjaadddialog \
cui/uiconfig/ui/hatchpage \
......
......@@ -521,7 +521,7 @@ IMPL_LINK( ActualizeProgress, ActualizeHdl, INetURLObject*, pURL )
}
TitleDialog::TitleDialog(Window* pParent, const OUString& rOldTitle)
: ModalDialog (pParent, "GalleryTitleDialog", "cui/ui/gallerytitledialog.ui")
: ModalDialog(pParent, "GalleryTitleDialog", "cui/ui/gallerytitledialog.ui")
{
get(m_pEdit, "entry");
m_pEdit->SetText( rOldTitle );
......@@ -532,24 +532,21 @@ TitleDialog::TitleDialog(Window* pParent, const OUString& rOldTitle)
// - GalleryIdDialog -
// -------------------
GalleryIdDialog::GalleryIdDialog( Window* pParent, GalleryTheme* _pThm ) :
ModalDialog ( pParent, CUI_RES( RID_SVXDLG_GALLERY_THEMEID ) ),
aBtnOk ( this, CUI_RES( BTN_OK ) ),
aBtnCancel ( this, CUI_RES( BTN_CANCEL ) ),
aFLId ( this, CUI_RES( FL_ID ) ),
aLbResName ( this, CUI_RES( LB_RESNAME ) ),
pThm ( _pThm )
GalleryIdDialog::GalleryIdDialog( Window* pParent, GalleryTheme* _pThm )
: ModalDialog(pParent, "GalleryThemeIDDialog", "cui/ui/gallerythemeiddialog.ui")
, pThm(_pThm )
{
FreeResource();
get(m_pBtnOk, "ok");
get(m_pLbResName, "entry");
aLbResName.InsertEntry( OUString( "!!! No Id !!!" ) );
m_pLbResName->InsertEntry( OUString( "!!! No Id !!!" ) );
GalleryTheme::InsertAllThemes( aLbResName );
GalleryTheme::InsertAllThemes(*m_pLbResName);
aLbResName.SelectEntryPos( (sal_uInt16) pThm->GetId() );
aLbResName.GrabFocus();
m_pLbResName->SelectEntryPos( (sal_uInt16) pThm->GetId() );
m_pLbResName->GrabFocus();
aBtnOk.SetClickHdl( LINK( this, GalleryIdDialog, ClickOkHdl ) );
m_pBtnOk->SetClickHdl( LINK( this, GalleryIdDialog, ClickOkHdl ) );
}
// -----------------------------------------------------------------------------
......@@ -574,7 +571,7 @@ IMPL_LINK_NOARG(GalleryIdDialog, ClickOkHdl)
InfoBox aBox( this, aStr );
aBox.Execute();
aLbResName.GrabFocus();
m_pLbResName->GrabFocus();
bDifferentThemeExists = sal_True;
}
}
......
......@@ -318,47 +318,6 @@ ModalDialog RID_SVXDLG_GALLERY_ACTUALIZE_PROGRESS
};
};
ModalDialog RID_SVXDLG_GALLERY_THEMEID
{
HelpID = "cui:ModalDialog:RID_SVXDLG_GALLERY_THEMEID";
OutputSize = TRUE ;
Border = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT ( 180 , 63 ) ;
Text [ en-US ] = "Theme ID" ;
Moveable = TRUE ;
OkButton BTN_OK
{
Pos = MAP_APPFONT ( 124 , 6 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
DefButton = TRUE ;
};
CancelButton BTN_CANCEL
{
Pos = MAP_APPFONT ( 124 , 23 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
};
FixedLine FL_ID
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
Size = MAP_APPFONT ( 112 , 8 ) ;
Text [ en-US ] = "ID";
};
ListBox LB_RESNAME
{
HelpID = "cui:ListBox:RID_SVXDLG_GALLERY_THEMEID:LB_RESNAME";
Border = TRUE ;
Pos = MAP_APPFONT ( 12 , 14 ) ;
Size = MAP_APPFONT ( 100 , 60 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
HScroll = TRUE ;
VScroll = TRUE ;
};
};
String RID_SVXSTR_GALLERY_NOFILES
{
Text [ en-US ] = "<No Files>" ;
......
......@@ -185,22 +185,15 @@ public:
class GalleryIdDialog : public ModalDialog
{
private:
OKButton aBtnOk;
CancelButton aBtnCancel;
FixedLine aFLId;
ListBox aLbResName;
OKButton* m_pBtnOk;
ListBox* m_pLbResName;
GalleryTheme* pThm;
DECL_LINK( ClickOkHdl, void* );
DECL_LINK( ClickResNameHdl, void* );
DECL_LINK( ClickOkHdl, void* );
DECL_LINK( ClickResNameHdl, void* );
public:
GalleryIdDialog( Window* pParent, GalleryTheme* pThm );
~GalleryIdDialog() {}
sal_uLong GetId() const { return aLbResName.GetSelectEntryPos(); }
GalleryIdDialog( Window* pParent, GalleryTheme* pThm );
sal_uLong GetId() const { return m_pLbResName->GetSelectEntryPos(); }
};
class GalleryThemeProperties : public SfxTabDialog
......
......@@ -28,7 +28,6 @@
#define RID_SVXDLG_GALLERY_SEARCH_PROGRESS (RID_CUI_GALLERY_START + 6)
#define RID_SVXDLG_GALLERY_TAKE_PROGRESS (RID_CUI_GALLERY_START + 7)
#define RID_SVXDLG_GALLERY_ACTUALIZE_PROGRESS (RID_CUI_GALLERY_START + 8)
#define RID_SVXDLG_GALLERY_THEMEID (RID_CUI_GALLERY_START + 9)
// Gallery-Strings
#define RID_SVXSTR_GALLERY_NOFILES (RID_CUI_GALLERY_START + 12)
......@@ -67,8 +66,6 @@
#define FL_ACTUALIZE_PROGRESS 1
#define FT_ACTUALIZE_FILE 1
#define FL_ID 1
#define LB_RESNAME 1
// Gallery-TabDialog
#define FI_MS_IMAGE 1
......
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkDialog" id="GalleryThemeIDDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="title" translatable="yes">Theme ID</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="GtkBox" id="box1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">start</property>
<property name="hexpand">True</property>
<property name="spacing">12</property>
<child>
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">ID</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">entry</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkComboBox" id="entry">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">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="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">1</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