[Hugin-cvs] hugin/src/hugin LocalizedFileTipProvider.cpp,1.1,1.2 MainFrame.cpp,1.162,1.163

[Pablo d'A. <da...@us...>]

Update of /cvsroot/hugin/hugin/src/hugin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15516/src/hugin

Modified Files:
	LocalizedFileTipProvider.cpp MainFrame.cpp 
Log Message:
acutally use gettext localized tips. tested with wx 2.4, wx 2.5.3 and wx 2.6.1


Index: LocalizedFileTipProvider.cpp
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/LocalizedFileTipProvider.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- LocalizedFileTipProvider.cpp	30 Aug 2005 21:22:57 -0000	1.1
+++ LocalizedFileTipProvider.cpp	30 Aug 2005 22:59:26 -0000	1.2
@@ -27,6 +27,7 @@
  */
 
 #include <config.h>
+#include "common/utils.h"
 #include "panoinc_WX.h"
 
 #include "hugin/LocalizedFileTipProvider.h"
@@ -91,8 +92,10 @@
         // ...and replace escaped quotes
         tip.Replace(wxT("\\\""), wxT("\""));
 
+        DEBUG_DEBUG("Tip before translation " << tip);
         // translate tip
         tip = wxGetTranslation(tip);
+        DEBUG_DEBUG("Tip after translation " << tip);
     }
 
     return tip;

Index: MainFrame.cpp
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/MainFrame.cpp,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -d -r1.162 -r1.163
--- MainFrame.cpp	30 Aug 2005 21:22:58 -0000	1.162
+++ MainFrame.cpp	30 Aug 2005 22:59:26 -0000	1.163
@@ -48,6 +48,7 @@
 #include "hugin/CPListFrame.h"
 #include "hugin/MyProgressDialog.h"
 #include "hugin/ImageCache.h"
+#include "hugin/LocalizedFileTipProvider.h"
 
 
 
@@ -941,12 +942,12 @@
     wxConfigBase * config = wxConfigBase::Get();
     nValue = config->Read(wxT("/MainFrame/ShowStartTip"),1l);
 
-        
+
     DEBUG_INFO("Tip index: " << nValue);
     strFile = m_xrcPrefix + wxT("data/tips.txt");  //load default file
 	
     DEBUG_INFO("Reading tips from " << strFile.mb_str());
-    wxTipProvider *tipProvider = wxCreateFileTipProvider(strFile, nValue);
+    wxTipProvider *tipProvider = new LocalizedFileTipProvider(strFile, nValue);
     bShowAtStartup = wxShowTip(this, tipProvider);
 
     //store startup preferences