convert pdf warn dialog to .ui

Change-Id: I379c7f06ae87bee5571c1f2ef5053b3b863d6e61

6 files changed, 184 insertions, 140 deletions

diff --git a/filter/UIConfig_xsltdlg.mk b/filter/UIConfig_xsltdlg.mk
index abef4d3db278..34421120a05a 100644
--- a/filter/UIConfig_xsltdlg.mk
+++ b/filter/UIConfig_xsltdlg.mk
@@ -19,6 +19,7 @@ $(eval $(call gb_UIConfig_add_uifiles,filter,\
     filter/uiconfig/ui/pdfuserinterfacepage \
     filter/uiconfig/ui/pdfviewpage \
 	filter/uiconfig/ui/testxmlfilter \
+	filter/uiconfig/ui/warnpdfdialog \
 	filter/uiconfig/ui/xmlfiltersettings \
 	filter/uiconfig/ui/xmlfiltertabpagegeneral \
 	filter/uiconfig/ui/xmlfiltertabpagetransformation \
diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index 9062ba57d818..1c18bce3602b 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -1450,15 +1450,18 @@ IMPL_LINK_NOARG(ImpPDFTabLinksPage, ClickRbOpnLnksBrowserHdl)
     return 0;
 }
 
-ImplErrorDialog::ImplErrorDialog( const std::set< vcl::PDFWriter::ErrorCode >& rErrors ) :
-    ModalDialog( NULL, PDFFilterResId( RID_PDF_ERROR_DLG ) ),
-    maFI( this, 0 ),
-    maProcessText( this, PDFFilterResId( FT_PROCESS ) ),
-    maErrors( this, WB_BORDER | WB_AUTOVSCROLL ),
-    maExplanation( this, WB_WORDBREAK ),
-    maButton( this, WB_DEFBUTTON )
-
+ImplErrorDialog::ImplErrorDialog(const std::set< vcl::PDFWriter::ErrorCode >& rErrors)
+    : MessageDialog(NULL, "WarnPDFDialog", "filter/ui/warnpdfdialog.ui")
 {
+    get(m_pErrors, "errors");
+    get(m_pExplanation, "message");
+
+    Size aSize(LogicToPixel(Size(100, 75), MapMode(MAP_APPFONT)));
+    m_pErrors->set_width_request(aSize.Width());
+    m_pErrors->set_height_request(aSize.Height());
+    m_pExplanation->set_width_request(aSize.Width());
+    m_pExplanation->set_height_request(aSize.Height());
+
     // load images
     Image aWarnImg( BitmapEx( PDFFilterResId( IMG_WARN ) ) );
     Image aErrImg( BitmapEx( PDFFilterResId( IMG_ERR ) ) );
@@ -1470,30 +1473,30 @@ ImplErrorDialog::ImplErrorDialog( const std::set< vcl::PDFWriter::ErrorCode >& r
         {
         case vcl::PDFWriter::Warning_Transparency_Omitted_PDFA:
         {
-            sal_uInt16 nPos = maErrors.InsertEntry( OUString( PDFFilterResId( STR_WARN_TRANSP_PDFA_SHORT ) ),
+            sal_uInt16 nPos = m_pErrors->InsertEntry( OUString( PDFFilterResId( STR_WARN_TRANSP_PDFA_SHORT ) ),
                                                 aWarnImg );
-            maErrors.SetEntryData( nPos, new OUString( PDFFilterResId( STR_WARN_TRANSP_PDFA ) ) );
+            m_pErrors->SetEntryData( nPos, new OUString( PDFFilterResId( STR_WARN_TRANSP_PDFA ) ) );
         }
         break;
         case vcl::PDFWriter::Warning_Transparency_Omitted_PDF13:
         {
-            sal_uInt16 nPos = maErrors.InsertEntry( OUString( PDFFilterResId( STR_WARN_TRANSP_VERSION_SHORT ) ),
+            sal_uInt16 nPos = m_pErrors->InsertEntry( OUString( PDFFilterResId( STR_WARN_TRANSP_VERSION_SHORT ) ),
                                                 aWarnImg );
-            maErrors.SetEntryData( nPos, new OUString( PDFFilterResId( STR_WARN_TRANSP_VERSION ) ) );
+            m_pErrors->SetEntryData( nPos, new OUString( PDFFilterResId( STR_WARN_TRANSP_VERSION ) ) );
         }
         break;
         case vcl::PDFWriter::Warning_FormAction_Omitted_PDFA:
         {
-            sal_uInt16 nPos = maErrors.InsertEntry( OUString( PDFFilterResId( STR_WARN_FORMACTION_PDFA_SHORT ) ),
+            sal_uInt16 nPos = m_pErrors->InsertEntry( OUString( PDFFilterResId( STR_WARN_FORMACTION_PDFA_SHORT ) ),
                                                 aWarnImg );
-            maErrors.SetEntryData( nPos, new OUString( PDFFilterResId( STR_WARN_FORMACTION_PDFA ) ) );
+            m_pErrors->SetEntryData( nPos, new OUString( PDFFilterResId( STR_WARN_FORMACTION_PDFA ) ) );
         }
         break;
         case vcl::PDFWriter::Warning_Transparency_Converted:
         {
-            sal_uInt16 nPos = maErrors.InsertEntry( OUString( PDFFilterResId( STR_WARN_TRANSP_CONVERTED_SHORT ) ),
+            sal_uInt16 nPos = m_pErrors->InsertEntry( OUString( PDFFilterResId( STR_WARN_TRANSP_CONVERTED_SHORT ) ),
                                                 aWarnImg );
-            maErrors.SetEntryData( nPos, new OUString( PDFFilterResId( STR_WARN_TRANSP_CONVERTED ) ) );
+            m_pErrors->SetEntryData( nPos, new OUString( PDFFilterResId( STR_WARN_TRANSP_CONVERTED ) ) );
         }
         break;
         default:
@@ -1501,55 +1504,27 @@ ImplErrorDialog::ImplErrorDialog( const std::set< vcl::PDFWriter::ErrorCode >& r
         }
     }
 
-    FreeResource();
-
-    if( maErrors.GetEntryCount() > 0 )
+    if( m_pErrors->GetEntryCount() > 0 )
     {
-        maErrors.SelectEntryPos( 0 );
-        OUString* pStr = reinterpret_cast<OUString*>(maErrors.GetEntryData( 0 ));
-        maExplanation.SetText( pStr ? *pStr : OUString() );
+        m_pErrors->SelectEntryPos( 0 );
+        OUString* pStr = reinterpret_cast<OUString*>(m_pErrors->GetEntryData( 0 ));
+        m_pExplanation->SetText( pStr ? *pStr : OUString() );
     }
 
-    // adjust layout
-    Image aWarnImage( WarningBox::GetStandardImage() );
-    Size aImageSize( aWarnImage.GetSizePixel() );
-    Size aDlgSize( GetSizePixel() );
-    aImageSize.Width() += 6;
-    aImageSize.Height() += 6;
-    maFI.SetImage( aWarnImage );
-    maFI.SetPosSizePixel( Point( 5, 5 ), aImageSize );
-    maFI.Show();
-
-    maProcessText.SetStyle( maProcessText.GetStyle() | WB_VCENTER );
-    maProcessText.SetPosSizePixel( Point( aImageSize.Width() + 10, 5 ),
-                                   Size(  aDlgSize.Width() - aImageSize.Width() - 15, aImageSize.Height() ) );
-
-    Point aErrorLBPos( 5, aImageSize.Height() + 10 );
-    Size aErrorLBSize( aDlgSize.Width()/2 - 10, aDlgSize.Height() - aErrorLBPos.Y() - 35 );
-    maErrors.SetPosSizePixel( aErrorLBPos, aErrorLBSize );
-    maErrors.SetSelectHdl( LINK( this, ImplErrorDialog, SelectHdl ) );
-    maErrors.Show();
-
-    maExplanation.SetPosSizePixel( Point( aErrorLBPos.X() + aErrorLBSize.Width() + 5, aErrorLBPos.Y() ),
-                                   Size( aDlgSize.Width() - aErrorLBPos.X() - aErrorLBSize.Width() - 10, aErrorLBSize.Height() ) );
-    maExplanation.Show();
-
-    maButton.SetPosSizePixel( Point( (aDlgSize.Width() - 50)/2, aDlgSize.Height() - 30 ),
-                              Size( 50, 25 ) );
-    maButton.Show();
+    m_pErrors->SetSelectHdl( LINK( this, ImplErrorDialog, SelectHdl ) );
 }
 
 ImplErrorDialog::~ImplErrorDialog()
 {
     // free strings again
-    for( sal_uInt16 n = 0; n < maErrors.GetEntryCount(); n++ )
-        delete (OUString*)maErrors.GetEntryData( n );
+    for( sal_uInt16 n = 0; n < m_pErrors->GetEntryCount(); n++ )
+        delete (OUString*)m_pErrors->GetEntryData( n );
 }
 
 IMPL_LINK_NOARG(ImplErrorDialog, SelectHdl)
 {
-    OUString* pStr = reinterpret_cast<OUString*>(maErrors.GetEntryData( maErrors.GetSelectEntryPos() ));
-    maExplanation.SetText( pStr ? *pStr : OUString() );
+    OUString* pStr = reinterpret_cast<OUString*>(m_pErrors->GetEntryData( m_pErrors->GetSelectEntryPos() ));
+    m_pExplanation->SetText( pStr ? *pStr : OUString() );
     return 0;
 }
 
diff --git a/filter/source/pdf/impdialog.hrc b/filter/source/pdf/impdialog.hrc
index 0351742f668e..0927cb00d654 100644
--- a/filter/source/pdf/impdialog.hrc
+++ b/filter/source/pdf/impdialog.hrc
@@ -19,32 +19,25 @@
 
 #include <filter.hrc>
 
-#define RID_PDF_WARNPDFAPASSWORD    (RID_PDF_DIALOG_START +   6)
+#define RID_PDF_WARNPDFAPASSWORD        (RID_PDF_DIALOG_START + 6)
 
 //strings for PDF security, user password management
-#define STR_PDF_EXPORT_UDPWD         (RID_PDF_DIALOG_START +  7)
+#define STR_PDF_EXPORT_UDPWD            (RID_PDF_DIALOG_START + 7)
 
 //strings for PDF security, owner password management
-#define STR_PDF_EXPORT_ODPWD         (RID_PDF_DIALOG_START + 10)
-
-#define RID_PDF_ERROR_DLG            (RID_PDF_DIALOG_START + 11)
-#define FT_PROCESS                        1
-#define IMG_WARN                          2
-#define IMG_ERR                           3
-#define STR_WARN_TRANSP_PDFA              4
-#define STR_WARN_TRANSP_PDFA_SHORT        5
-#define STR_WARN_TRANSP_VERSION           6
-#define STR_WARN_TRANSP_VERSION_SHORT     7
-#define STR_WARN_FORMACTION_PDFA          8
-#define STR_WARN_FORMACTION_PDFA_SHORT    9
-#define STR_WARN_TRANSP_CONVERTED        10
-#define STR_WARN_TRANSP_CONVERTED_SHORT  11
-
-//ATTENTION: maximum allowed value is( RID_PDF_DIALOG_START +   19)
-
-#define FL_GENERAL_VERTICAL  157
-#define FL_INITVIEW_VERTICAL 158
-#define FL_VPREFER_VERTICAL  158
-#define FL_SECURITY_VERTICAL 160
+#define STR_PDF_EXPORT_ODPWD            (RID_PDF_DIALOG_START + 8)
+
+#define STR_WARN_TRANSP_PDFA            (RID_PDF_DIALOG_START + 9)
+#define STR_WARN_TRANSP_PDFA_SHORT      (RID_PDF_DIALOG_START + 10)
+#define STR_WARN_TRANSP_VERSION         (RID_PDF_DIALOG_START + 11)
+#define STR_WARN_TRANSP_VERSION_SHORT   (RID_PDF_DIALOG_START + 12)
+#define STR_WARN_FORMACTION_PDFA        (RID_PDF_DIALOG_START + 13)
+#define STR_WARN_FORMACTION_PDFA_SHORT  (RID_PDF_DIALOG_START + 14)
+#define STR_WARN_TRANSP_CONVERTED       (RID_PDF_DIALOG_START + 15)
+#define STR_WARN_TRANSP_CONVERTED_SHORT (RID_PDF_DIALOG_START + 16)
+#define IMG_WARN                        (RID_PDF_DIALOG_START + 17)
+#define IMG_ERR                         (RID_PDF_DIALOG_START + 18)
+
+//ATTENTION: maximum allowed value is   (RID_PDF_DIALOG_START + 19)
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/pdf/impdialog.hxx b/filter/source/pdf/impdialog.hxx
index 89a7648a9d2d..be76a67c3756 100644
--- a/filter/source/pdf/impdialog.hxx
+++ b/filter/source/pdf/impdialog.hxx
@@ -54,14 +54,10 @@ public:
     PDFFilterResId( sal_uInt32 nId );
 };
 
-class ImplErrorDialog : public ModalDialog
+class ImplErrorDialog : public MessageDialog
 {
-    FixedImage      maFI;
-    FixedText       maProcessText;
-    ListBox         maErrors;
-    FixedText       maExplanation;
-
-    OKButton        maButton;
+    ListBox*        m_pErrors;
+    FixedText*      m_pExplanation;
 
     DECL_LINK(SelectHdl, void *);
     public:
diff --git a/filter/source/pdf/impdialog.src b/filter/source/pdf/impdialog.src
index ca9c21b2b9e2..32d81a490486 100644
--- a/filter/source/pdf/impdialog.src
+++ b/filter/source/pdf/impdialog.src
@@ -39,64 +39,54 @@ WarningBox RID_PDF_WARNPDFAPASSWORD
     Message[ en-US ] = "PDF/A does not allow encryption. The exported PDF file will not be password protected.";
 };
 
-ModalDialog RID_PDF_ERROR_DLG
+String STR_WARN_TRANSP_PDFA_SHORT
 {
-    HelpID = "filter:ModalDialog:RID_PDF_ERROR_DLG";
-    OutputSize = TRUE;
-    SVLook = TRUE;
-    Moveable = TRUE;
-    Text [en-US] = "Problems during PDF export";
-    Size = MAP_APPFONT( 200, 150 );
-
-    FixedText FT_PROCESS
-    {
-        WordBreak = TRUE;
-        Pos = MAP_APPFONT( 5, 5 );
-        Size = MAP_APPFONT( 210, 24 );
-        Text [en-US] = "During PDF export the following problems occurred:";
-    };
-
-    Bitmap IMG_WARN
-    {
-        File = "ballgreen_7.png";
-    };
-    Bitmap IMG_ERR
-    {
-        File = "ballred_7.png";
-    };
-
-    String STR_WARN_TRANSP_PDFA_SHORT
-    {
-        Text [en-US] = "PDF/A transparency";
-    };
-    String STR_WARN_TRANSP_PDFA
-    {
-        Text [en-US] = "PDF/A forbids transparency. A transparent object was painted opaque instead.";
-    };
-    String STR_WARN_TRANSP_VERSION_SHORT
-    {
-        Text [en-US] = "PDF version conflict";
-    };
-    String STR_WARN_TRANSP_VERSION
-    {
-        Text [en-US] = "Transparency is not supported in PDF versions earlier than PDF 1.4. A transparent object was painted opaque instead";
-    };
-    String STR_WARN_FORMACTION_PDFA_SHORT
-    {
-        Text [en-US] = "PDF/A form action";
-    };
-    String STR_WARN_FORMACTION_PDFA
-    {
-        Text [en-US] = "A form control contained an action not supported by the PDF/A standard. The action was skipped";
-    };
-    String STR_WARN_TRANSP_CONVERTED
-    {
-        Text [en-US] = "Some objects were converted to an image in order to remove transparencies, because the target PDF format does not support transparencies. Possibly better results can be achieved if you remove the transparent objects before exporting.";
-    };
-    String STR_WARN_TRANSP_CONVERTED_SHORT
-    {
-        Text [en-US] = "Transparencies removed";
-    };
+    Text [en-US] = "PDF/A transparency";
+};
+
+String STR_WARN_TRANSP_PDFA
+{
+    Text [en-US] = "PDF/A forbids transparency. A transparent object was painted opaque instead.";
+};
+
+String STR_WARN_TRANSP_VERSION_SHORT
+{
+    Text [en-US] = "PDF version conflict";
+};
+
+String STR_WARN_TRANSP_VERSION
+{
+    Text [en-US] = "Transparency is not supported in PDF versions earlier than PDF 1.4. A transparent object was painted opaque instead";
+};
+
+String STR_WARN_FORMACTION_PDFA_SHORT
+{
+    Text [en-US] = "PDF/A form action";
+};
+
+String STR_WARN_FORMACTION_PDFA
+{
+    Text [en-US] = "A form control contained an action not supported by the PDF/A standard. The action was skipped";
+};
+
+String STR_WARN_TRANSP_CONVERTED
+{
+    Text [en-US] = "Some objects were converted to an image in order to remove transparencies, because the target PDF format does not support transparencies. Possibly better results can be achieved if you remove the transparent objects before exporting.";
+};
+
+String STR_WARN_TRANSP_CONVERTED_SHORT
+{
+    Text [en-US] = "Transparencies removed";
+};
+
+Bitmap IMG_WARN
+{
+    File = "ballgreen_7.png";
+};
+
+Bitmap IMG_ERR
+{
+    File = "ballred_7.png";
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/uiconfig/ui/warnpdfdialog.ui b/filter/uiconfig/ui/warnpdfdialog.ui
new file mode 100644
index 000000000000..1192d5ea31fb
--- /dev/null
+++ b/filter/uiconfig/ui/warnpdfdialog.ui
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.1 -->
+<interface>
+  <requires lib="gtk+" version="3.6"/>
+  <object class="GtkMessageDialog" id="WarnPDFDialog">
+    <property name="can_focus">False</property>
+    <property name="border_width">12</property>
+    <property name="type">popup</property>
+    <property name="title" translatable="yes">Problems during PDF export</property>
+    <property name="resizable">False</property>
+    <property name="type_hint">dialog</property>
+    <property name="skip_taskbar_hint">True</property>
+    <property name="message_type">warning</property>
+    <property name="buttons">ok</property>
+    <property name="text" translatable="yes">During PDF export the following problems occurred:</property>
+    <child internal-child="vbox">
+      <object class="GtkBox" id="messagedialog-vbox">
+        <property name="can_focus">False</property>
+        <property name="hexpand">True</property>
+        <property name="vexpand">True</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">24</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox" id="messagedialog-action_area">
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+          </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="grid1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="hexpand">True</property>
+            <property name="vexpand">True</property>
+            <property name="column_spacing">12</property>
+            <property name="column_homogeneous">True</property>
+            <child>
+              <object class="GtkLabel" id="message">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="hexpand">True</property>
+                <property name="vexpand">True</property>
+                <property name="xalign">0</property>
+                <property name="yalign">0</property>
+                <property name="wrap">True</property>
+                <property name="width_chars">30</property>
+                <property name="max_width_chars">30</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">0</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkTreeView" id="errors:border">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="hexpand">True</property>
+                <property name="vexpand">True</property>
+                <child internal-child="selection">
+                  <object class="GtkTreeSelection" id="treeview-selection1"/>
+                </child>
+              </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>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>