summaryrefslogtreecommitdiff
path: root/padmin
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-03-21 09:07:42 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-03-21 11:23:01 +0000
commitb3a162ccecd24c61d4d6daeb7ac9bcd1a75db7be (patch)
tree6df9399cf8f69721f390e77467ab056dda7a7d54 /padmin
parent5c291a0287af46558d3ef96d18b114c371ddd31b (diff)
move the fax dialog from padmin to vcl
now we don't have to dlopen padmin to get it so we can drop that complicated stuff and don't need to be unx only Change-Id: I0e585b05a4ecf2a1c8a3ac5275185d81ada518e5
Diffstat (limited to 'padmin')
-rw-r--r--padmin/UIConfig_spa.mk1
-rw-r--r--padmin/source/helper.cxx34
-rw-r--r--padmin/source/helper.hxx17
-rw-r--r--padmin/source/prtsetup.cxx7
-rw-r--r--padmin/source/rtsetup.hrc2
-rw-r--r--padmin/source/rtsetup.src5
-rw-r--r--padmin/uiconfig/ui/querydialog.ui109
7 files changed, 0 insertions, 175 deletions
diff --git a/padmin/UIConfig_spa.mk b/padmin/UIConfig_spa.mk
index 6ac5ba26e87b..565f0cc57536 100644
--- a/padmin/UIConfig_spa.mk
+++ b/padmin/UIConfig_spa.mk
@@ -13,7 +13,6 @@ $(eval $(call gb_UIConfig_add_uifiles,spa,\
padmin/uiconfig/ui/printerdevicepage \
padmin/uiconfig/ui/printerpaperpage \
padmin/uiconfig/ui/printerpropertiesdialog \
- padmin/uiconfig/ui/querydialog \
))
# vim: set noet sw=4 ts=4:
diff --git a/padmin/source/helper.cxx b/padmin/source/helper.cxx
index d0e2a51f83bb..da9fcabcd3ba 100644
--- a/padmin/source/helper.cxx
+++ b/padmin/source/helper.cxx
@@ -75,38 +75,4 @@ ResId padmin::PaResId( sal_uInt32 nId )
return ResId( nId, *pPaResMgr );
}
-/*
- * QueryString
- */
-QueryString::QueryString(Window* pParent, OUString& rQuery, OUString& rRet)
- : ModalDialog(pParent, "QueryDialog",
- "spa/ui/querydialog.ui" )
- , m_rReturnValue( rRet )
-{
- get(m_pOKButton, "ok");
- get(m_pFixedText, "label");
- get(m_pEdit, "entry");
-
- m_pOKButton->SetClickHdl( LINK( this, QueryString, ClickBtnHdl ) );
- m_pFixedText->SetText( rQuery );
- m_pEdit->SetText( m_rReturnValue );
- SetText( Application::GetDisplayName() );
-}
-
-QueryString::~QueryString()
-{
-}
-
-IMPL_LINK( QueryString, ClickBtnHdl, Button*, pButton )
-{
- if (pButton == m_pOKButton)
- {
- m_rReturnValue = m_pEdit->GetText();
- EndDialog( 1 );
- }
- else
- EndDialog(0);
- return 0;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/padmin/source/helper.hxx b/padmin/source/helper.hxx
index 1e491d2d0293..b7b8fb86b1d1 100644
--- a/padmin/source/helper.hxx
+++ b/padmin/source/helper.hxx
@@ -38,24 +38,7 @@
namespace padmin
{
-class QueryString : public ModalDialog
-{
-private:
- OKButton* m_pOKButton;
- FixedText* m_pFixedText;
- Edit* m_pEdit;
- OUString& m_rReturnValue;
-
- DECL_LINK( ClickBtnHdl, Button* );
-
-public:
- QueryString(Window*, OUString &, OUString &);
- // parent window, Query text, initial value
- ~QueryString();
-};
-
ResId PaResId( sal_uInt32 nId );
-
} // namespace padmin
#endif
diff --git a/padmin/source/prtsetup.cxx b/padmin/source/prtsetup.cxx
index bda0d0126495..b526ec78aa23 100644
--- a/padmin/source/prtsetup.cxx
+++ b/padmin/source/prtsetup.cxx
@@ -538,13 +538,6 @@ extern "C" {
return nRet;
}
- int SPA_DLLPUBLIC Sal_queryFaxNumber( OUString& rNumber )
- {
- OUString aTmpString( PaResId( RID_TXT_QUERYFAXNUMBER ) );
- QueryString aQuery( NULL, aTmpString, rNumber );
- return aQuery.Execute();
- }
-
bool SPA_DLLPUBLIC Sal_authenticateQuery( const OString& rServer, OString& rUserName, OString& rPassword )
{
bool bRet = false;
diff --git a/padmin/source/rtsetup.hrc b/padmin/source/rtsetup.hrc
index aab206a92dfa..5a58ea69a385 100644
--- a/padmin/source/rtsetup.hrc
+++ b/padmin/source/rtsetup.hrc
@@ -22,8 +22,6 @@
#define RID_RTS_RTSDIALOG_INVALID_TXT 4001
-#define RID_TXT_QUERYFAXNUMBER 4007
-
#define RID_RTS_PWDIALOG 4008
#define RID_RTS_PWDIALOG_TXT 1
#define RID_RTS_PWDIALOG_USER_TXT 2
diff --git a/padmin/source/rtsetup.src b/padmin/source/rtsetup.src
index 74953c9ce279..89d332dbf53f 100644
--- a/padmin/source/rtsetup.src
+++ b/padmin/source/rtsetup.src
@@ -24,11 +24,6 @@ String RID_RTS_RTSDIALOG_INVALID_TXT
Text [ en-US ] = "<ignore>";
};
-String RID_TXT_QUERYFAXNUMBER
-{
- Text [ en-US ] = "Please enter the fax number.";
-};
-
ModalDialog RID_RTS_PWDIALOG
{
HelpID = "padmin:ModalDialog:RID_RTS_PWDIALOG";
diff --git a/padmin/uiconfig/ui/querydialog.ui b/padmin/uiconfig/ui/querydialog.ui
deleted file mode 100644
index e51e76ccab6e..000000000000
--- a/padmin/uiconfig/ui/querydialog.ui
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.1 -->
-<interface>
- <requires lib="gtk+" version="3.0"/>
- <object class="GtkDialog" id="QueryDialog">
- <property name="can_focus">False</property>
- <property name="border_width">6</property>
- <property name="title" translatable="yes">New Data Type</property>
- <property name="type_hint">normal</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>
- </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="GtkGrid" id="grid2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="valign">start</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">12</property>
- <child>
- <object class="GtkLabel" id="label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">entry</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="GtkEntry" id="entry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <property name="invisible_char">•</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">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>