[Libreoffice-commits] .: Branch 'feature/pdf-signing' - filter/source

[Gökcen Eraslan]

 filter/source/pdf/impdialog.cxx |   13 ++++++++++++-
 filter/source/pdf/impdialog.hrc |    2 +-
 filter/source/pdf/impdialog.hxx |    2 ++
 filter/source/pdf/impdialog.src |   21 +++++++++++++++------
 4 files changed, 30 insertions(+), 8 deletions(-)

New commits:
commit a4ca3ebfabf09d82eabbe9c0ab46884d6d677db2
Author: Gökçen Eraslan <gokcen.eraslan at gmail.com>
Date:   Sun Jun 24 17:42:30 2012 +0300

    Add certificate selection button and its click handler.
    
    Change-Id: I3f2fff0a3c5cfb77de0ecd11832345b6e162816b

diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index 4e4b04a..259b958 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -1674,9 +1674,12 @@ ImpPDFTabSigningPage::ImpPDFTabSigningPage( Window* pParent,
     maFtSignContactInfo( this, PDFFilterResId( FT_SIGN_CONTACT ) ),
     maEdSignContactInfo( this, PDFFilterResId( ED_SIGN_CONTACT ) ),
     maFtSignReason( this, PDFFilterResId( FT_SIGN_REASON ) ),
-    maEdSignReason( this, PDFFilterResId( ED_SIGN_REASON ) )
+    maEdSignReason( this, PDFFilterResId( ED_SIGN_REASON ) ),
+    maPbSignSelectCert( this, PDFFilterResId( BTN_SIGN_SELECT_CERT ) )
 {
     FreeResource();
+
+    maPbSignSelectCert.SetClickHdl( LINK( this, ImpPDFTabSigningPage, ClickmaPbSignSelectCert ) );
 }
 
 // -----------------------------------------------------------------------------
@@ -1684,6 +1687,12 @@ ImpPDFTabSigningPage::~ImpPDFTabSigningPage()
 {
 }
 
+IMPL_LINK_NOARG( ImpPDFTabSigningPage, ClickmaPbSignSelectCert )
+{
+    // Certificate selection dialog will pop up
+    return 0;
+}
+
 // -----------------------------------------------------------------------------
 SfxTabPage*  ImpPDFTabSigningPage::Create( Window* pParent,
                                           const SfxItemSet& rAttrSet)
@@ -1709,6 +1718,7 @@ void ImpPDFTabSigningPage::SetFilterConfigItem( const  ImpPDFTabDialog* paParent
     maEdSignLocation.Enable( false );
     maEdSignContactInfo.Enable( false );
     maEdSignReason.Enable( false );
+    maPbSignSelectCert.Enable( false );
 
     if (paParent->mbSignPDF)
     {
@@ -1725,6 +1735,7 @@ IMPL_LINK_NOARG(ImpPDFTabSigningPage, ToggleSignPDFHdl)
     maEdSignLocation.Enable( maCbSignPDF.IsChecked() );
     maEdSignContactInfo.Enable( maCbSignPDF.IsChecked() );
     maEdSignReason.Enable( maCbSignPDF.IsChecked() );
+    maPbSignSelectCert.Enable( maCbSignPDF.IsChecked() );
 
     return 0;
 }
diff --git a/filter/source/pdf/impdialog.hrc b/filter/source/pdf/impdialog.hrc
index ea5cade..e446302 100644
--- a/filter/source/pdf/impdialog.hrc
+++ b/filter/source/pdf/impdialog.hrc
@@ -208,4 +208,4 @@
 #define ED_SIGN_CONTACT      174
 #define FT_SIGN_REASON       175
 #define ED_SIGN_REASON       176
-
+#define BTN_SIGN_SELECT_CERT 177
diff --git a/filter/source/pdf/impdialog.hxx b/filter/source/pdf/impdialog.hxx
index 87327a0..f227c14 100644
--- a/filter/source/pdf/impdialog.hxx
+++ b/filter/source/pdf/impdialog.hxx
@@ -447,8 +447,10 @@ class ImpPDFTabSigningPage : public SfxTabPage
     Edit                        maEdSignContactInfo;
     FixedText                   maFtSignReason;
     Edit                        maEdSignReason;
+    PushButton                  maPbSignSelectCert;
 
     DECL_LINK( ToggleSignPDFHdl, void* );
+    DECL_LINK( ClickmaPbSignSelectCert, void* );
 
 public:
     ImpPDFTabSigningPage( Window* pParent,
diff --git a/filter/source/pdf/impdialog.src b/filter/source/pdf/impdialog.src
index 92bf696..b099a53 100644
--- a/filter/source/pdf/impdialog.src
+++ b/filter/source/pdf/impdialog.src
@@ -834,9 +834,18 @@ TabPage  RID_PDF_TAB_SIGNING
         Text[ en-US ] = "Sign PDF file" ;
     };
 
+    PushButton BTN_SIGN_SELECT_CERT
+    {
+        TabStop = TRUE ;
+        Disable = TRUE ;
+        Pos = MAP_APPFONT ( 12, 17 ) ;
+        Size = MAP_APPFONT ( 120 , 13 ) ;
+        Text[ en-US ] = "Select c~ertificate...";
+    };
+
     FixedText FT_SIGN_LOCATION
     {
-        Pos = MAP_APPFONT( 12, 15 );
+        Pos = MAP_APPFONT( 12, 35 );
         Size = MAP_APPFONT( 109, 10 );
         Text[ en-US ] = "Location";
     };
@@ -844,13 +853,13 @@ TabPage  RID_PDF_TAB_SIGNING
     Edit ED_SIGN_LOCATION
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 122, 15 ) ;
+        Pos = MAP_APPFONT ( 122, 35 ) ;
         Size = MAP_APPFONT ( 48 , 12 ) ;
     };
 
     FixedText FT_SIGN_CONTACT
     {
-        Pos = MAP_APPFONT( 12, 28 );
+        Pos = MAP_APPFONT( 12, 48 );
         Size = MAP_APPFONT( 109, 10 );
         Text[ en-US ] = "Contact Information";
     };
@@ -858,13 +867,13 @@ TabPage  RID_PDF_TAB_SIGNING
     Edit ED_SIGN_CONTACT
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 122, 28 ) ;
+        Pos = MAP_APPFONT ( 122, 48 ) ;
         Size = MAP_APPFONT ( 48 , 12 ) ;
     };
 
     FixedText FT_SIGN_REASON
     {
-        Pos = MAP_APPFONT( 12, 41 );
+        Pos = MAP_APPFONT( 12, 61 );
         Size = MAP_APPFONT( 109, 10 );
         Text[ en-US ] = "Reason";
     };
@@ -872,7 +881,7 @@ TabPage  RID_PDF_TAB_SIGNING
     Edit ED_SIGN_REASON
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 122, 41 ) ;
+        Pos = MAP_APPFONT ( 122, 61 ) ;
         Size = MAP_APPFONT ( 48 , 12 ) ;
     };