[Libreoffice-commits] core.git: Branch 'feature/gsoc14-libcmis' - uui/source uui/uiconfig uui/UIConfig_uui.mk

[Mihai Varga]

 uui/UIConfig_uui.mk             |    1 +
 uui/source/authfallbackdlg.cxx  |   17 +++++++++++------
 uui/source/authfallbackdlg.hxx  |    5 +++--
 uui/uiconfig/ui/authfallback.ui |    4 +++-
 4 files changed, 18 insertions(+), 9 deletions(-)

New commits:
commit a90e68effaf636405f0f8918c172565b3d96bf4a
Author: Mihai Varga <mihai.mv13 at gmail.com>
Date:   Thu Jun 26 20:06:53 2014 +0300

    Auth dialog update
    
    Change-Id: I0564215566504793546543d0777e6a7c7ca90290

diff --git a/uui/UIConfig_uui.mk b/uui/UIConfig_uui.mk
index 076969b..cf81eac 100644
--- a/uui/UIConfig_uui.mk
+++ b/uui/UIConfig_uui.mk
@@ -10,6 +10,7 @@
 $(eval $(call gb_UIConfig_UIConfig,uui))
 
 $(eval $(call gb_UIConfig_add_uifiles,uui,\
+	uui/uiconfig/ui/authfallback \
 	uui/uiconfig/ui/logindialog \
 	uui/uiconfig/ui/macrowarnmedium \
 	uui/uiconfig/ui/masterpassworddlg \
diff --git a/uui/source/authfallbackdlg.cxx b/uui/source/authfallbackdlg.cxx
index cae7deb..5f1548d 100644
--- a/uui/source/authfallbackdlg.cxx
+++ b/uui/source/authfallbackdlg.cxx
@@ -10,11 +10,12 @@
 #include "authfallbackdlg.hxx"
 
 #include <vcl/msgbox.hxx>
+#include <iostream>
 
 using namespace boost;
 
 AuthFallbackDlg::AuthFallbackDlg( Window* pParent ) :
-    ModalDialog( pParent, "AuthFallbackDlg", "svt/ui/authfallback.ui" )
+    ModalDialog( pParent, "AuthFallbackDlg", "uui/ui/authfallback.ui" )
 {
     get( m_pTVInstructions, "instructions" );
     get( m_pEDUrl, "url" );
@@ -29,7 +30,7 @@ AuthFallbackDlg::AuthFallbackDlg( Window* pParent ) :
 AuthFallbackDlg::AuthFallbackDlg( Window* pParent, 
         const OUString& instructions,
         const OUString& url ) :
-    ModalDialog( pParent, "AuthFallbackDlg", "svt/ui/authfallback.ui" )
+    ModalDialog( pParent, "AuthFallbackDlg", "uui/ui/authfallback.ui" )
 {
     get( m_pTVInstructions, "instructions" );
     get( m_pEDUrl, "url" );
@@ -38,13 +39,14 @@ AuthFallbackDlg::AuthFallbackDlg( Window* pParent,
     get( m_pBTCancel, "cancel" );
 
     m_pBTOk->SetClickHdl( LINK( this, AuthFallbackDlg, OKHdl) );
-    m_pBTOk->Enable( false );
+    m_pBTCancel->SetClickHdl( LINK( this, AuthFallbackDlg, CancelHdl) );
+    m_pBTOk->Enable( true );
 
     m_pTVInstructions->SetText( instructions );
     m_pEDUrl->SetText( url );
 }
 
-AuthFallbackDlg::~AuthFallbackDlg()
+AuthFallbackDlg::~AuthFallbackDlg( )
 {
 }
 
@@ -54,5 +56,8 @@ IMPL_LINK ( AuthFallbackDlg,  OKHdl, Button *, EMPTYARG )
     return 1;
 }
 
-
-
+IMPL_LINK ( AuthFallbackDlg,  CancelHdl, Button *, EMPTYARG )
+{
+    EndDialog( RET_CANCEL );
+    return 0;
+}
diff --git a/uui/source/authfallbackdlg.hxx b/uui/source/authfallbackdlg.hxx
index 818aa84..d068f48 100644
--- a/uui/source/authfallbackdlg.hxx
+++ b/uui/source/authfallbackdlg.hxx
@@ -23,8 +23,8 @@ private :
     VclMultiLineEdit* m_pTVInstructions;
     Edit* m_pEDUrl;
     Edit* m_pEDCode;
-    OKButton* m_pBTOk;
-    CancelButton* m_pBTCancel;
+    PushButton* m_pBTOk;
+    PushButton* m_pBTCancel;
 
 public :
 
@@ -38,6 +38,7 @@ public :
 private:
 
     DECL_LINK ( OKHdl, Button * );
+    DECL_LINK ( CancelHdl, Button * );
 };
 
 #endif // INCLUDED_SVTOOLS_AUTHFALLBACKDLG_HXX
diff --git a/uui/uiconfig/ui/authfallback.ui b/uui/uiconfig/ui/authfallback.ui
index 86a0a81..506197b 100644
--- a/uui/uiconfig/ui/authfallback.ui
+++ b/uui/uiconfig/ui/authfallback.ui
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
-  <object class="GtkDialog" id="AuthenticationDialog">
+  <object class="GtkDialog" id="AuthFallbackDlg">
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">OneDrive authentication code</property>
+    <property name="default_width">400</property>
+    <property name="default_height">270</property>
     <child>
       <object class="GtkBox" id="box">
         <property name="visible">True</property>