SourceForge.net: Hugin: hugin-cvs

Home / Browse / Hugin / Mail / Archive

Email Archive: hugin-cvs (read-only)

2005:	_Jan (84)	_Feb (83)	_Mar (36)	_Apr (15)	_May (250)	_Jun (81)	_Jul (29)	_Aug (62)	_Sep (22)	_Oct (13)	_Nov (62)	_Dec (30)
2006:	_Jan (67)	_Feb (68)	_Mar (149)	_Apr (51)	_May (8)	_Jun (23)	_Jul (87)	_Aug (132)	_Sep (9)	_Oct (1)	_Nov (22)	_Dec (163)
2007:	_Jan (74)	_Feb (71)	_Mar (2)	_Apr (121)	_May (57)	_Jun (168)	_Jul (151)	_Aug (73)	_Sep (4)	_Oct (91)	_Nov (30)	_Dec (38)
2008:	_Jan (178)	_Feb (159)	_Mar (49)	_Apr (65)	_May (43)	_Jun (56)	_Jul (99)	_Aug (132)	_Sep (71)	_Oct (57)	_Nov (42)	_Dec (11)
2009:	_Jan (40)	_Feb (74)	_Mar (80)	_Apr (45)	_May (86)	_Jun (76)	_Jul (160)	_Aug (170)	_Sep (227)	_Oct (161)	_Nov (49)	_Dec (108)
2010:	_Jan (108)	_Feb (82)	_Mar (62)	_Apr (33)	_May (60)	_Jun (38)	_Jul (46)	_Aug (69)	_Sep (157)	_Oct (123)	_Nov (130)	_Dec (154)
2011:	_Jan (138)	_Feb (112)	_Mar (128)	_Apr (4)	_May (86)	_Jun (81)	_Jul (128)	_Aug (98)	_Sep (69)	_Oct (32)	_Nov (50)	_Dec (41)
2012:	_Jan (10)	_Feb (6)	_Mar (17)	_Apr (10)	_May (67)	_Jun (57)	_Jul (41)	_Aug (54)	_Sep (17)	_Oct (15)	_Nov (34)	_Dec (45)
2013:	_Jan (62)	_Feb (47)	_Mar (71)	_Apr (25)	_May (11)	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec


S	M	T	W	T	F	S
	1	2	3	4	5	6
					(11)	(2)
7	8	9	10	11	12	13
			(4)	(2)
14	15	16	17	18	19	20
	(18)	(6)			(1)
21	22	23	24	25	26	27

28	29	30	31
		(11)	(7)

[Hugin-cvs] hugin/src/hugin/xrc/data tips_fr.txt,1.4,NONE tips_fr-UTF8.txt,1.4,NONE tips_pl.txt,1.2,NONE tips_pl-UTF8.txt,1.3,NONE

From: Pablo d'Angelo <dangelo@us...> - 2005-08-31 06:13

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

Removed Files:
	tips_fr.txt tips_fr-UTF8.txt tips_pl.txt tips_pl-UTF8.txt 
Log Message:
removed old tip files


--- tips_pl-UTF8.txt DELETED ---

--- tips_pl.txt DELETED ---

--- tips_fr.txt DELETED ---

--- tips_fr-UTF8.txt DELETED ---

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

From: Pablo d'Angelo <dangelo@us...> - 2005-08-30 22:59

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

[Hugin-cvs] hugin/src/hugin/xrc/data about_fr.htm,1.12,1.13 about.htm,1.22,1.23 about_pl.htm,1.9,1.10

From: Pablo d'Angelo <dangelo@us...> - 2005-08-30 22:34

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

Modified Files:
	about_fr.htm about.htm about_pl.htm 
Log Message:
updated translation authors


Index: about_pl.htm
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/xrc/data/about_pl.htm,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- about_pl.htm	5 Aug 2005 19:58:24 -0000	1.9
+++ about_pl.htm	30 Aug 2005 22:34:24 -0000	1.10
@@ -19,7 +19,8 @@
       Marek&nbsp;Januszewski,
       Lorenz Trischberger,
       Luca&nbsp;Vascon,
-      Alexandre&nbsp;Proukoudine
+      Alexandre&nbsp;Proukoudine,
+      Ademar&nbsp;de&nbsp;Souza&nbsp;Reis
       <b>Podziêkowania dla:</b>
       Luca&nbsp;Vascon za logo,
       i wszystkich cz³onków grupy dyskusyjnej PTX.<p>

Index: about_fr.htm
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/xrc/data/about_fr.htm,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- about_fr.htm	5 Aug 2005 19:58:24 -0000	1.12
+++ about_fr.htm	30 Aug 2005 22:34:24 -0000	1.13
@@ -18,7 +18,8 @@
       Marek&nbsp;Januszewski,
       Lorenz Trischberger,
       Luca&nbsp;Vascon,
-      Alexandre&nbsp;Proukoudine
+      Alexandre&nbsp;Proukoudine,
+      Ademar&nbsp;de&nbsp;Souza&nbsp;Reis
       <b>Merci &agrave;&nbsp;:</b>
       Luca&nbsp;Vascon pour le logo,
       et tous les membres de la liste de diffusion PTX.<p>

Index: about.htm
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/xrc/data/about.htm,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- about.htm	5 Aug 2005 19:58:24 -0000	1.22
+++ about.htm	30 Aug 2005 22:34:24 -0000	1.23
@@ -18,7 +18,8 @@
       Marek&nbsp;Januszewski,
       Lorenz Trischberger,
       Luca&nbsp;Vascon,
-      Alexandre&nbsp;Proukoudine
+      Alexandre&nbsp;Proukoudine,
+      Ademar&nbsp;de&nbsp;Souza&nbsp;Reis
       <p>
       <b>Thanks to:</b>
       Luca&nbsp;Vascon for the logo,

[Hugin-cvs] hugin/src/hugin huginApp.cpp,1.87,1.88

From: Pablo d'Angelo <dangelo@us...> - 2005-08-30 22:33

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

Modified Files:
	huginApp.cpp 
Log Message:
restore splitter position on wxWidgets 2.6.1 and gtk doesnt work if the window is maximised.
wx2.6.1 & gtk workaround: Do dot maximise window on hugin start (if it was maximised when
hugin was closed last time)


Index: huginApp.cpp
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/huginApp.cpp,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -d -r1.87 -r1.88
--- huginApp.cpp	11 Aug 2005 17:42:15 -0000	1.87
+++ huginApp.cpp	30 Aug 2005 22:33:10 -0000	1.88
@@ -404,14 +404,35 @@
 
 void RestoreFramePosition(wxTopLevelWindow * frame, const wxString & basename)
 {
-    DEBUG_TRACE(basename);
+    DEBUG_TRACE(basename.mb_str());
 
     wxConfigBase * config = wxConfigBase::Get();
 
+#if ( __WXGTK__ ) &&  wxCHECK_VERSION(2,6,0)
+// restoring the splitter positions properly when maximising doesn't work.
+// Disabling maximise on wxWidgets >= 2.6.0 and gtk
+        //size
+        int w = config->Read(wxT("/") + basename + wxT("/width"),-1l);
+        int h = config->Read(wxT("/") + basename + wxT("/height"),-1l);
+        if (w >0) {
+            frame->SetClientSize(w,h);
+        } else {
+            frame->Fit();
+        }
+        //position
+        int x = config->Read(wxT("/") + basename + wxT("/positionX"),-1l);
+        int y = config->Read(wxT("/") + basename + wxT("/positionY"),-1l);
+        if ( y >= 0 && x >= 0 && x < 4000 && y < 4000) {
+            frame->Move(x, y);
+        } else {
+            frame->Move(0, 44);
+        }
+#else
     bool maximized = config->Read(wxT("/") + basename + wxT("/maximized"), 0l) != 0;
     if (maximized) {
         frame->Maximize();
         // explicitly layout after maximize
+        frame->Fit();
     } else {
         //size
         int w = config->Read(wxT("/") + basename + wxT("/width"),-1l);
@@ -428,8 +449,9 @@
             frame->Move(x, y);
         } else {
             frame->Move(0, 44);
-        }        
+        }
     }
+#endif
 }
 
 
@@ -439,6 +461,18 @@
 
     wxConfigBase * config = wxConfigBase::Get();
 
+#if ( __WXGTK__ ) &&  wxCHECK_VERSION(2,6,0)
+// restoring the splitter positions properly when maximising doesn't work.
+// Disabling maximise on wxWidgets >= 2.6.0 and gtk
+    
+        wxSize sz = frame->GetClientSize();
+        config->Write(wxT("/") + basename + wxT("/width"), sz.GetWidth());
+        config->Write(wxT("/") + basename + wxT("/height"), sz.GetHeight());
+        wxPoint ps = frame->GetPosition();
+        config->Write(wxT("/") + basename + wxT("/positionX"), ps.x);
+        config->Write(wxT("/") + basename + wxT("/positionY"), ps.y);
+        config->Write(wxT("/") + basename + wxT("/maximized"), 0);
+#else
     if (! frame->IsMaximized() ) {
         wxSize sz = frame->GetClientSize();
         config->Write(wxT("/") + basename + wxT("/width"), sz.GetWidth());
@@ -450,4 +484,5 @@
     } else {
         config->Write(wxT("/") + basename + wxT("/maximized"), 1l);
     }
+#endif
 }

[Hugin-cvs] hugin/src/hugin/po de.po,1.84,1.85 fr.po,1.51,1.52 hugin.pot,1.43,1.44 it.po,1.39,1.40 ja.po,1.4,1.5 pl.po,1.52,1.53 pt_BR.po,1.1,1.2 ru.po,1.4,1.5

From: Pablo d'Angelo <dangelo@us...> - 2005-08-30 22:29

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

Modified Files:
	de.po fr.po hugin.pot it.po ja.po pl.po pt_BR.po ru.po 
Log Message:
added tips of the day to .po files.


Index: it.po
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/po/it.po,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- it.po	10 Aug 2005 22:05:45 -0000	1.39
+++ it.po	30 Aug 2005 22:29:30 -0000	1.40
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: hugin 0.4\n"
 "Report-Msgid-Bugs-To: pablo.dangelo@..."
-"POT-Creation-Date: 2005-08-06 23:55+0200\n"
+"POT-Creation-Date: 2005-08-31 00:12+0200\n"
 "PO-Revision-Date: 2005-08-05 21:43+0100\n"
 "Last-Translator: Pablo d'Angelo <pablo.dangelo@..."
 "Language-Team: Italian <tp@..."
@@ -55,9 +55,9 @@
 msgid "Select autopano program / frontend script"
 msgstr "Scegliere il programma Autopano / script"
[...1179 lines suppressed...]
+"act on all selected images."
+msgstr ""
+
+#: src/hugin/xrc/data/tips.txt:28
+msgid ""
+"Lens parameters may vary with changing focus. For best results, calibrate "
+"the parameters using know settings and reuse them later."
+msgstr ""
+
+#: src/hugin/xrc/data/tips.txt:29
+msgid ""
+"Optimisation of all distortion parameters \"everything\" makes only sense "
+"with heavily overlapping images and many well distributed control points."
+msgstr ""
+
+#~ msgid "error during stitching:"
+#~ msgstr "errore durante lo Stitching:"
+
+#~ msgid "Select one"
+#~ msgstr "Seleziona uno"

Index: fr.po
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/po/fr.po,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- fr.po	15 Aug 2005 21:02:35 -0000	1.51
+++ fr.po	30 Aug 2005 22:29:30 -0000	1.52
@@ -8,9 +8,9 @@
 msgstr ""
 "Project-Id-Version: Hugin 0.5\n"
 "Report-Msgid-Bugs-To: pablo.dangelo@..."
-"POT-Creation-Date: 2005-08-05 21:39+0200\n"
-"PO-Revision-Date: 2005-08-12 08:57+0200\n"
-"Last-Translator: Jean-Luc Coulon (f5ibh) <jean-luc.coulon@..."
+"POT-Creation-Date: 2005-08-31 00:12+0200\n"
+"PO-Revision-Date: 2005-08-31 00:15+0100\n"
+"Last-Translator: Pablo d'Angelo <pablo.dangelo@..."
 "Language-Team: French <ll@..."
 "MIME-Version: 1.0\n"
[...2544 lines suppressed...]
+#: src/hugin/xrc/data/tips.txt:25
+msgid "The Panorama Tools, on which hugin is based were written by Helmut Dersch."
+msgstr "Les « Panorama Tools », sur lesquels repose Hugin ont été écrits par Helmut Dersch."
+
+#: src/hugin/xrc/data/tips.txt:26
+msgid "The precision of \"fine tuning\" control points can be improved by enabling rotation search. This is essential for fisheye and wide angle images."
+msgstr "La précision de « l'ajustement précis » des points de contrôle peut être améliorée en validant la recherche par rotation. C'est essentiel pour traiter des images provenant d'un fisheye ou d'un objectif grand angulaire."
+
+#: src/hugin/xrc/data/tips.txt:27
+msgid "Multiple images can be selected in the image and lens tabs. Commands will act on all selected images."
+msgstr "Plusieurs images peuvent être sélectionnées dans les onglets « Images » et « Appareil photo et objectif ». Les commandes s'appliqueront alors à toutes les images sélectionnées."
+
+#: src/hugin/xrc/data/tips.txt:28
+msgid "Lens parameters may vary with changing focus. For best results, calibrate the parameters using know settings and reuse them later."
+msgstr "Les paramètres de l'objectif peuvent varier en même temps que la mise au point. Pour obtenir de meilleurs résultats, calibrez les paramètres en utilisant des valeurs connues et réutilisez-les plus tard."
+
+#: src/hugin/xrc/data/tips.txt:29
+msgid "Optimisation of all distortion parameters \"everything\" makes only sense with heavily overlapping images and many well distributed control points."
+msgstr "L'optimisation de tous les paramètres de distorsion (« tout ») n'est utilisable que pour des images ayant un très large recouvrement et ayant des points de contrôle nombreux et bien distribués. "
+

Index: ru.po
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/po/ru.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ru.po	10 Aug 2005 22:05:45 -0000	1.4
+++ ru.po	30 Aug 2005 22:29:30 -0000	1.5
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: pablo.dangelo@..."
-"POT-Creation-Date: 2005-08-06 23:55+0200\n"
+"POT-Creation-Date: 2005-08-31 00:12+0200\n"
 "PO-Revision-Date: 2005-08-05 21:45+0100\n"
 "Last-Translator: Pablo d'Angelo <pablo.dangelo@..."
 "Language-Team: Russian <ru@..."
@@ -54,9 +54,9 @@
 msgid "Select autopano program / frontend script"
 msgstr "ÐÑÐ±ÐµÑÐ¸ÑÐµ ÑÑÐµÐ½Ð°ÑÐ¸Ð¹ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ Ð°Ð²ÑÐ¾Ð¿Ð°Ð½Ð¾ÑÐ°Ð¼Ð¸ÑÐ¾Ð²Ð°Ð½Ð¸Ñ"
[...1168 lines suppressed...]
+#: src/hugin/xrc/data/tips.txt:27
+msgid ""
+"Multiple images can be selected in the image and lens tabs. Commands will "
+"act on all selected images."
+msgstr ""
+
+#: src/hugin/xrc/data/tips.txt:28
+msgid ""
+"Lens parameters may vary with changing focus. For best results, calibrate "
+"the parameters using know settings and reuse them later."
+msgstr ""
+
+#: src/hugin/xrc/data/tips.txt:29
+msgid ""
+"Optimisation of all distortion parameters \"everything\" makes only sense "
+"with heavily overlapping images and many well distributed control points."
+msgstr ""
+
+#~ msgid "error during stitching:"
+#~ msgstr "ÐÑÐ¸Ð±ÐºÐ° Ð²Ð¾ Ð²ÑÐµÐ¼Ñ ÑÑÐ¸Ð²ÐºÐ¸:"

Index: de.po
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/po/de.po,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -d -r1.84 -r1.85
--- de.po	10 Aug 2005 22:05:45 -0000	1.84
+++ de.po	30 Aug 2005 22:29:30 -0000	1.85
@@ -10,8 +10,8 @@
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: pablo.dangelo@..."
-"POT-Creation-Date: 2005-08-06 23:55+0200\n"
-"PO-Revision-Date: 2005-08-06 22:39+0100\n"
+"POT-Creation-Date: 2005-08-31 00:12+0200\n"
+"PO-Revision-Date: 2005-08-30 23:40+0100\n"
 "Last-Translator: Pablo d'Angelo <pablo.dangelo@..."
 "Language-Team: deutsch <de@..."
 "MIME-Version: 1.0\n"
@@ -60,9 +60,9 @@
[...1179 lines suppressed...]
+"rotation search. This is essential for fisheye and wide angle images."
+msgstr ""
+
+#: src/hugin/xrc/data/tips.txt:27
+msgid ""
+"Multiple images can be selected in the image and lens tabs. Commands will "
+"act on all selected images."
+msgstr ""
+
+#: src/hugin/xrc/data/tips.txt:28
+msgid ""
+"Lens parameters may vary with changing focus. For best results, calibrate "
+"the parameters using know settings and reuse them later."
+msgstr ""
+
+#: src/hugin/xrc/data/tips.txt:29
+msgid ""
+"Optimisation of all distortion parameters \"everything\" makes only sense "
+"with heavily overlapping images and many well distributed control points."
+msgstr ""

Index: pt_BR.po
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/po/pt_BR.po,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- pt_BR.po	30 Aug 2005 21:24:28 -0000	1.1
+++ pt_BR.po	30 Aug 2005 22:29:30 -0000	1.2
@@ -1,2774 +1,3082 @@
-# translation of hugin.po to Brazilian Portuguese
-# translation of hugin.po to PortuguÃªs Brasileiro
-# Brazilian Portuguese translation for hugin package
-# Copyright (C) 2005 Ademar de Souza Reis Jr.
-# This file is distributed under the same license as the hugin package.
-# Ademar de Souza Reis Jr. <ademar@...>, 2005.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hugin-cvs2005-08-22\n"
-"Report-Msgid-Bugs-To: ademar@..."
[...5825 lines suppressed...]
+#: src/hugin/xrc/data/tips.txt:25
+msgid "The Panorama Tools, on which hugin is based were written by Helmut Dersch."
+msgstr "As \"Ferramentas Panorama\" (\"Panorama Tools\"), nas quais o hugin Ã© baseado, foram escritas por Helmut Dersch."
+
+#: src/hugin/xrc/data/tips.txt:26
+msgid "The precision of \"fine tuning\" control points can be improved by enabling rotation search. This is essential for fisheye and wide angle images."
+msgstr "A precisÃ£o do refinamento dos pontos de controle pode ser melhorada ligando-se a procura de rotaÃ§Ã£o (\"rotation search\"). Essa Ã© uma funcionalidade essencial para panoramas do tipo \"Olho de Peixe\" e grande angulares."
+
+#: src/hugin/xrc/data/tips.txt:27
+msgid "Multiple images can be selected in the image and lens tabs. Commands will act on all selected images."
+msgstr "MÃºltiplas imagens podem ser selecionadas na aba de imagens e lentes."
+
+#: src/hugin/xrc/data/tips.txt:28
+msgid "Lens parameters may vary with changing focus. For best results, calibrate the parameters using know settings and reuse them later."
+msgstr "Os parÃ¢metros de lente podem variar conforme o foco. Para melhores resultados, calibre os parÃ¢metros reutilizando valores conhecidos."
+
+#: src/hugin/xrc/data/tips.txt:29
+msgid "Optimisation of all distortion parameters \"everything\" makes only sense with heavily overlapping images and many well distributed control points."
+msgstr "A opÃ§Ã£o de otimizaÃ§Ã£o de todos os parÃ¢metros de distorÃ§Ã£o faz sentido apenas com imagens fortemente sobrepujadas ou com vÃ¡rios pontos de controle distribuÃdos."
+

Index: hugin.pot
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/po/hugin.pot,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- hugin.pot	10 Aug 2005 22:05:45 -0000	1.43
+++ hugin.pot	30 Aug 2005 22:29:30 -0000	1.44
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: pablo.dangelo@..."
-"POT-Creation-Date: 2005-08-06 23:55+0200\n"
+"POT-Creation-Date: 2005-08-31 00:12+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@..."
 "Language-Team: LANGUAGE <LL@..."
@@ -54,9 +54,9 @@
 msgid "Select autopano program / frontend script"
 msgstr ""
[...1153 lines suppressed...]
+"rotation search. This is essential for fisheye and wide angle images."
+msgstr ""
+
+#: src/hugin/xrc/data/tips.txt:27
+msgid ""
+"Multiple images can be selected in the image and lens tabs. Commands will "
+"act on all selected images."
+msgstr ""
+
+#: src/hugin/xrc/data/tips.txt:28
+msgid ""
+"Lens parameters may vary with changing focus. For best results, calibrate "
+"the parameters using know settings and reuse them later."
+msgstr ""
+
+#: src/hugin/xrc/data/tips.txt:29
+msgid ""
+"Optimisation of all distortion parameters \"everything\" makes only sense "
+"with heavily overlapping images and many well distributed control points."
+msgstr ""

Index: pl.po
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/po/pl.po,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- pl.po	10 Aug 2005 22:05:45 -0000	1.52
+++ pl.po	30 Aug 2005 22:29:30 -0000	1.53
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: hugin 0.5\n"
 "Report-Msgid-Bugs-To: pablo.dangelo@..."
-"POT-Creation-Date: 2005-08-06 23:55+0200\n"
-"PO-Revision-Date: 2005-08-05 21:41+0100\n"
+"POT-Creation-Date: 2005-08-31 00:12+0200\n"
+"PO-Revision-Date: 2005-08-30 23:49+0100\n"
 "Last-Translator: Pablo d'Angelo <pablo.dangelo@..."
 "Language-Team: Polish <pl@..."
 "MIME-Version: 1.0\n"
@@ -55,9 +55,9 @@
[...1179 lines suppressed...]
+"rotation search. This is essential for fisheye and wide angle images."
+msgstr ""
+
+#: src/hugin/xrc/data/tips.txt:27
+msgid ""
+"Multiple images can be selected in the image and lens tabs. Commands will "
+"act on all selected images."
+msgstr ""
+
+#: src/hugin/xrc/data/tips.txt:28
+msgid ""
+"Lens parameters may vary with changing focus. For best results, calibrate "
+"the parameters using know settings and reuse them later."
+msgstr ""
+
+#: src/hugin/xrc/data/tips.txt:29
+msgid ""
+"Optimisation of all distortion parameters \"everything\" makes only sense "
+"with heavily overlapping images and many well distributed control points."
+msgstr ""

Index: ja.po
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/po/ja.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ja.po	10 Aug 2005 22:05:45 -0000	1.4
+++ ja.po	30 Aug 2005 22:29:30 -0000	1.5
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: Hugin 0.5\n"
 "Report-Msgid-Bugs-To: pablo.dangelo@..."
-"POT-Creation-Date: 2005-08-06 23:55+0200\n"
+"POT-Creation-Date: 2005-08-31 00:12+0200\n"
 "PO-Revision-Date: 2005-08-05 21:44+0100\n"
 "Last-Translator: Pablo d'Angelo <pablo.dangelo@..."
 "Language-Team: N/A\n"
@@ -53,9 +53,9 @@
 msgid "Select autopano program / frontend script"
 msgstr "Autopanoããã°ã©ã ã¾ãã¯ã¹ã¯ãªãããé¸æãã¦ãã ãã"
[...1180 lines suppressed...]
+"act on all selected images."
+msgstr ""
+
+#: src/hugin/xrc/data/tips.txt:28
+msgid ""
+"Lens parameters may vary with changing focus. For best results, calibrate "
+"the parameters using know settings and reuse them later."
+msgstr ""
+
+#: src/hugin/xrc/data/tips.txt:29
+msgid ""
+"Optimisation of all distortion parameters \"everything\" makes only sense "
+"with heavily overlapping images and many well distributed control points."
+msgstr ""
+
+#~ msgid "error during stitching:"
+#~ msgstr "ã¹ãããã³ã°ä¸ã«ã¨ã©ã¼"
+
+#~ msgid "Select one"
+#~ msgstr "è¨èªã®é¸æ"

[Hugin-cvs] hugin/src/hugin/xrc/data tips.txt,1.6,1.7

From: Pablo d'Angelo <dangelo@us...> - 2005-08-30 22:14

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

Modified Files:
	tips.txt 
Log Message:


Index: tips.txt
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/xrc/data/tips.txt,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- tips.txt	30 Aug 2005 21:31:21 -0000	1.6
+++ tips.txt	30 Aug 2005 22:13:51 -0000	1.7
@@ -2,7 +2,7 @@
 # These tips are translated via gettext.
 _("To scroll both the images in the control points tab, hold the shift key while moving the mouse.")
 _("The control key or the middle mouse button can be used to pan one image in the control points tab.")
-_("Rotating the camera around the nodal point makes panorama creation a lot easier.")
+_("Rotating the camera around the entrance pupil (sometimes also called \"nodal point\") avoids parallax errors and makes panorama creation a lot easier.")
 _("Tutorials on hugin are available on http://hugin.sf.net/tutorials");
 _("If the panorama looks nice but the horizon is curved add vertical control points. See http://hugin.sf.net/tutorials for more information")
 _("Horizontal or vertical control point pairs can be set by selecting the same image on both sides of the control points tab.")

[Hugin-cvs] hugin/src/hugin/xrc/data tips.txt,1.5,1.6

From: Pablo d'Angelo <dangelo@us...> - 2005-08-30 21:31

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

Modified Files:
	tips.txt 
Log Message:
updated tips, prepared gettext translation


Index: tips.txt
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/xrc/data/tips.txt,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- tips.txt	15 Aug 2005 21:03:48 -0000	1.5
+++ tips.txt	30 Aug 2005 21:31:21 -0000	1.6
@@ -1,26 +1,29 @@
 # Tips for hugin
-To scroll both the images in the control points tab, hold the shift key while moving the mouse.
-The control key or the middle mouse button can be used to pan one image in the control points tab.
-Rotating the camera around the nodal point makes panorama creation a lot easier.
-If the panorama looks nice but the horizon is curved, select a new anchor position, or add vertical or horizontal control points.
-Horizontal or vertical control point pairs can be set by selecting the same image on both sides of the control points tab.
-Control points should be placed on static objects. Avoid placing them people, trees and other moving or deforming objects.
-Images can also be added to hugin via drag and drop.
-Spread control points as far as possible. Close control points do not define the relative orientation between images well.
-The Fine Tune button can be used to find a better position for the point in the right image for an already selected point.
-Editing the panorama in multiple layers with The Gimp or Photoshop offers many creative possibilities.
-The multilayer tiff file output can be read by The Gimp 2.0 or higher.
-You can press the middle mouse button to pan images in the control points tab.
-The "f" key is the shortcut for Fine Tune button.
-Pressing "Del" will remove the currently selected control point.
-Press "0" in the control points tab to zoom out to full view.
-Press "1" in the control points tab to zoom out to 100% view.
-The external tools autopano and autopano-sift can be used to create control points automatically.
-Enblend can be used to smoothly blend the panorama. Use it from within hugin by selecting "high quality tiff file" as output.
-After enblend has blended the panorama, the remapped output images (available in the same directory as the panorama image) can be used to retouch the panorama in The Gimp or Photoshop.
-hugin and other free panoramic software is discussed on the ptx email list. http://www.email-lists.org/mailman/listinfo/ptx
-The Panorama Tools, on which hugin is based were written by Helmut Dersch.
-The precision of "fine tuning" control points can be improved by enabling rotation search. This is essential for fisheye and wide angle images.
-Multiple images can be selected in the image and lens tabs. Command will act on all selected images.
-Lens parameters may vary with changing focus. For best results, calibrate the parameters using know settings and reuse them later.
-Optimisation of all distortion parameters "everything" makes only sense with heavily overlapping images and many well distributed control points.
+# These tips are translated via gettext.
+_("To scroll both the images in the control points tab, hold the shift key while moving the mouse.")
+_("The control key or the middle mouse button can be used to pan one image in the control points tab.")
+_("Rotating the camera around the nodal point makes panorama creation a lot easier.")
+_("Tutorials on hugin are available on http://hugin.sf.net/tutorials");
+_("If the panorama looks nice but the horizon is curved add vertical control points. See http://hugin.sf.net/tutorials for more information")
+_("Horizontal or vertical control point pairs can be set by selecting the same image on both sides of the control points tab.")
+_("Control points should be placed on static objects. Avoid placing them people, trees and other moving or deforming objects.")
+_("Images can also be added to hugin via drag and drop.")
+_("Spread control points as far as possible. Close control points do not define the relative orientation between images well.")
+_("The Fine Tune button can be used to find a better position for the point in the right image for an already selected point.")
+_("Editing the panorama in multiple layers with The Gimp or Photoshop offers many creative possibilities.")
+_("The PanoTools wiki at http://www.panotools.info/mediawiki offers comprehensive information about creating panoramas and other images with panotools.");
+_("The multilayer tiff file output can be read by The Gimp 2.0 or higher.")
+_("You can press the middle mouse button to pan images in the control points tab.")
+_("The "f" key is the shortcut for Fine Tune button.")
+_("Pressing "Del" will remove the currently selected control point.")
+_("Press "0" in the control points tab to zoom out to full view.")
+_("Press "1" in the control points tab to zoom out to 100% view.")
+_("The external tools autopano and autopano-sift can be used to create control points automatically.")
+_("Enblend can be used to smoothly blend the panorama. Use it from within hugin by selecting "high quality tiff file" as output.")
+_("After enblend has blended the panorama, the remapped output images (available in the same directory as the panorama image) can be used to retouch the panorama in The Gimp or Photoshop.")
+_("hugin and other free panoramic software is discussed on the ptx email list. http://www.email-lists.org/mailman/listinfo/ptx")
+_("The Panorama Tools, on which hugin is based were written by Helmut Dersch.")
+_("The precision of "fine tuning" control points can be improved by enabling rotation search. This is essential for fisheye and wide angle images.")
+_("Multiple images can be selected in the image and lens tabs. Commands will act on all selected images.")
+_("Lens parameters may vary with changing focus. For best results, calibrate the parameters using know settings and reuse them later.")
+_("Optimisation of all distortion parameters "everything" makes only sense with heavily overlapping images and many well distributed control points.")
\ No newline at end of file

[Hugin-cvs] hugin/src/hugin/po LINGUAS,1.6,1.7 POTFILES.in,1.9,1.10

From: Pablo d'Angelo <dangelo@us...> - 2005-08-30 21:25

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

Modified Files:
	LINGUAS POTFILES.in 
Log Message:
updated build files


Index: POTFILES.in
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/po/POTFILES.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- POTFILES.in	8 Jun 2005 21:27:39 -0000	1.9
+++ POTFILES.in	30 Aug 2005 21:25:40 -0000	1.10
@@ -23,6 +23,7 @@
 src/hugin/PTStitcherPanel.cpp
 src/hugin/RunOptimizerFrame.cpp
 src/hugin/RunStitcherFrame.cpp
+src/hugin/LocalizedFileTipProvider.cpp
 src/include/hugin/MyProgressDialog.h
 src/include/hugin/wxPanoCommand.h
 
@@ -54,3 +55,7 @@
 src/hugin/xrc/ptstitcher_panel.xrs
 src/hugin/xrc/run_optimizer_frame.xrs
 src/hugin/xrc/run_stitcher_frame.xrs
+
+# tip of the day
+src/hugin/xrc/data/tips.txt
+

Index: LINGUAS
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/po/LINGUAS,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- LINGUAS	22 Jun 2005 23:34:38 -0000	1.6
+++ LINGUAS	30 Aug 2005 21:25:40 -0000	1.7
@@ -1,3 +1,3 @@
 # Set of available languages.
-de pl fr it ja ru
+de pl fr it ja ru pt_BR

[Hugin-cvs] hugin/src/hugin PreferencesDialog.cpp,1.35,1.36

From: Pablo d'Angelo <dangelo@us...> - 2005-08-30 21:24

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

Modified Files:
	PreferencesDialog.cpp 
Log Message:
added Portuguese Brasilian translation


Index: PreferencesDialog.cpp
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/PreferencesDialog.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- PreferencesDialog.cpp	17 Aug 2005 20:48:25 -0000	1.35
+++ PreferencesDialog.cpp	30 Aug 2005 21:24:28 -0000	1.36
@@ -111,14 +111,11 @@
     *lp = wxLANGUAGE_ENGLISH;
     lang_choice->Append(_("English"), lp);
     lp = new long;
-    *lp = wxLANGUAGE_GERMAN;    
-    lang_choice->Append(_("German"), lp);
-    lp = new long;
     *lp = wxLANGUAGE_FRENCH;
     lang_choice->Append(_("French"), lp);
     lp = new long;
-    *lp = wxLANGUAGE_POLISH;
-    lang_choice->Append(_("Polish"), lp);
+    *lp = wxLANGUAGE_GERMAN;
+    lang_choice->Append(_("German"), lp);
     lp = new long;
     *lp = wxLANGUAGE_ITALIAN;
     lang_choice->Append(_("Italian"), lp);
@@ -126,6 +123,12 @@
     *lp = wxLANGUAGE_JAPANESE;
     lang_choice->Append(_("Japanese"), lp);
     lp = new long;
+    *lp = wxLANGUAGE_POLISH;
+    lang_choice->Append(_("Polish"), lp);
+    lp = new long;
+    *lp = wxLANGUAGE_PORTUGUESE_BRAZILIAN;
+    lang_choice->Append(_("Portuguese (Brazilian)"), lp);
+    lp = new long;
     *lp = wxLANGUAGE_RUSSIAN;
     lang_choice->Append(_("Russian"), lp);
     lang_choice->SetSelection(0);
@@ -153,7 +156,7 @@
     for (int i = 0; i < lang_choice->GetCount(); i++) {
         delete static_cast<long*>(lang_choice->GetClientData(i));
     }
-    
+
     DEBUG_TRACE("end dtor");
 }
 
@@ -567,7 +570,7 @@
         // unknown language selected..
         DEBUG_WARN("Unknown language configured");
     }
-    
+
 
     // cursor setting
 //    mem = cfg->Read(wxT("/CPImageCtrl/CursorType"), HUGIN_CP_CURSOR);

[Hugin-cvs] hugin/src/hugin/po pt_BR.po,NONE,1.1

From: Pablo d'Angelo <dangelo@us...> - 2005-08-30 21:24

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

Added Files:
	pt_BR.po 
Log Message:
added Portuguese Brasilian translation


--- NEW FILE: pt_BR.po ---
(This appears to be a binary file; contents omitted.)

[Hugin-cvs] hugin/src/include/hugin LocalizedFileTipProvider.h,NONE,1.1

From: Pablo d'Angelo <dangelo@us...> - 2005-08-30 21:23

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

Added Files:
	LocalizedFileTipProvider.h 
Log Message:
use gettext for translation of tips of the day



--- NEW FILE: LocalizedFileTipProvider.h ---
// -*- c-basic-offset: 4 -*-
/** @file LocalizedFileTipProvider.h
 *
 *  @author Pablo d'Angelo <pablo.dangelo@...>
 *
 *  $Id: LocalizedFileTipProvider.h,v 1.1 2005/08/30 21:22:58 dangelo Exp $
 *
 *  This is free software; you can redistribute it and/or
 *  modify it under the terms of the GNU General Public
 *  License as published by the Free Software Foundation; either
 *  version 2 of the License, or (at your option) any later version.
 *
 *  This software is distributed in the hope that it will be useful,
 *  but WITHOUT ANY WARRANTY; without even the implied warranty of
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 *  Lesser General Public License for more details.
 *
 *  You should have received a copy of the GNU General Public
 *  License along with this software; if not, write to the Free Software
 *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 */

#ifndef _LOCALIZED_FILE_TIP_PROVIDER_H
#define _LOCALIZED_FILE_TIP_PROVIDER_H

#include "panoinc_WX.h"

#include <wx/tipdlg.h>


/** A tip file provider that uses gettext to translate the tips.
 *  Based on the wxTipFileProvider class which just strips
 *  _(" "), but doesn't translate the entries.
 */

class LocalizedFileTipProvider : public wxTipProvider
{
public:
    LocalizedFileTipProvider(const wxString& filename, size_t currentTip);

    virtual wxString GetTip();

private:
    wxTextFile m_textfile;
};

#endif // _LOCALIZED_FILE_TIP_PROVIDER_H

[Hugin-cvs] hugin/src/hugin LocalizedFileTipProvider.cpp,NONE,1.1 Makefile.am,1.15,1.16 MainFrame.cpp,1.161,1.162

From: Pablo d'Angelo <dangelo@us...> - 2005-08-30 21:23

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

Modified Files:
	Makefile.am MainFrame.cpp 
Added Files:
	LocalizedFileTipProvider.cpp 
Log Message:
use gettext for translation of tips of the day



--- NEW FILE: LocalizedFileTipProvider.cpp ---
// -*- c-basic-offset: 4 -*-

/** @file LocalizedFileTipProvider.cpp
 *
 *  @brief FileTipProvider that uses gettext to translate the tips
 *
 *  Based on wxFileTipProvider shipped with wxWidgets.
 *
 *  @author Pablo d'Angelo <pablo.dangelo@...>
 *
 *  $Id: LocalizedFileTipProvider.cpp,v 1.1 2005/08/30 21:22:57 dangelo Exp $
 *
 *  This program is free software; you can redistribute it and/or
 *  modify it under the terms of the GNU General Public
 *  License as published by the Free Software Foundation; either
 *  version 2 of the License, or (at your option) any later version.
 *
 *  This software is distributed in the hope that it will be useful,
 *  but WITHOUT ANY WARRANTY; without even the implied warranty of
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 *  General Public License for more details.
 *
 *  You should have received a copy of the GNU General Public
 *  License along with this software; if not, write to the Free Software
 *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 */

#include <config.h>
#include "panoinc_WX.h"

#include "hugin/LocalizedFileTipProvider.h"


LocalizedFileTipProvider::LocalizedFileTipProvider(const wxString& filename,
                                                   size_t currentTip)
                 : wxTipProvider(currentTip), m_textfile(filename)
{
    m_textfile.Open();
}

wxString LocalizedFileTipProvider::GetTip()
{
    size_t count = m_textfile.GetLineCount();
    if ( !count )
    {
        return _("Tips not available, sorry!");
    }

    wxString tip;

    // Comments start with a # symbol.
    // Loop reading lines until get the first one that isn't a comment.
    // The max number of loop executions is the number of lines in the
    // textfile so that can't go into an eternal loop in the [oddball]
    // case of a comment-only tips file, or the developer has vetoed
    // them all via PreprecessTip().
    for ( size_t i=0; i < count; i++ )
    {
        // The current tip may be at the last line of the textfile, (or
        // past it, if the number of lines in the textfile changed, such
        // as changing to a different textfile, with less tips). So check
        // to see at last line of text file, (or past it)...
        if ( m_currentTip >= count )
        {
            // .. and if so, wrap back to line 0.
            m_currentTip = 0;
        }

        // Read the tip, and increment the current tip counter.
        tip = m_textfile.GetLine(m_currentTip++);

        // Allow a derived class's overrided virtual to modify the tip
        // now if so desired.
        tip = PreprocessTip(tip);

        // Break if tip isn't a comment, and isn't an empty string
        // (or only stray space characters).
        if ( !tip.StartsWith(wxT("#")) && (tip.Trim() != wxEmptyString) )
        {
            break;
        }
    }

    // If tip starts with '_(', then it is a gettext string of format
    // _("My \"global\" tip text") so first strip off the leading '_("'...
    if ( tip.StartsWith(wxT("_(\"" ), &tip))
    {
        //...and strip off the trailing '")'...
        tip = tip.BeforeLast(wxT('\"'));
        // ...and replace escaped quotes
        tip.Replace(wxT("\\\""), wxT("\""));

        // translate tip
        tip = wxGetTranslation(tip);
    }

    return tip;
}


Index: Makefile.am
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/Makefile.am,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- Makefile.am	18 Jul 2005 12:05:57 -0000	1.15
+++ Makefile.am	30 Aug 2005 21:22:57 -0000	1.16
@@ -17,7 +17,7 @@
 	      PreviewPanel.cpp ImageCenter.cpp OptimizePanel.cpp RunOptimizerFrame.cpp RunStitcherFrame.cpp CPListFrame.cpp \
 	      TextKillFocusHandler.cpp ImageOrientationPanel.cpp ImageOrientationFrame.cpp PanoDruid.cpp \
 	      CPZoomDisplayPanel.cpp CPFineTuneFrame.cpp \
-	      PreferencesDialog.cpp
+	      PreferencesDialog.cpp LocalizedFileTipProvider.cpp
 
 if HAVE_MINGW
 WIN_SRC    = hugin_rc.rc

Index: MainFrame.cpp
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/MainFrame.cpp,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -d -r1.161 -r1.162
--- MainFrame.cpp	16 Aug 2005 20:43:33 -0000	1.161
+++ MainFrame.cpp	30 Aug 2005 21:22:58 -0000	1.162
@@ -933,46 +933,27 @@
 
 void MainFrame::OnTipOfDay(wxCommandEvent& WXUNUSED(e))
 {
-	wxString strFile;
-	wxString langCode;
-	bool bShowAtStartup;
-	bool bTipsExist = false;
-	int nValue;
+    wxString strFile;
+    bool bShowAtStartup;
+    bool bTipsExist = false;
+    int nValue;
 
     wxConfigBase * config = wxConfigBase::Get();
-	nValue = config->Read(wxT("/MainFrame/ShowStartTip"),1l);
+    nValue = config->Read(wxT("/MainFrame/ShowStartTip"),1l);
 
-#ifndef __WXMAC__
-    //if the language is not default, load custom tip file (if exists)
-	langCode = huginApp::Get()->GetLocale().GetName().Left(2).Lower();
-	DEBUG_INFO("Lang Code: " << langCode.mb_str());
-	DEBUG_INFO("Tip index: " << nValue);
-	if(langCode != wxString(wxT("en")))
-	{
-#ifdef UNICODE
-		strFile = m_xrcPrefix + wxT("data/tips_") + langCode + wxT("-UTF8.txt");
-#else
-		strFile = m_xrcPrefix + wxT("data/tips_") + langCode + wxT(".txt");
-#endif
-		if(wxFile::Exists(strFile))
-			bTipsExist = true;
-	}
-#elif (defined UNICODE)
-    strFile = MacGetPathTOBundledResourceFile(CFSTR("tips-UTF8.txt"));
-    if(strFile!=wxT("")) bTipsExist = true;
-#endif
-	if(!bTipsExist)
-		strFile = m_xrcPrefix + wxT("data/tips.txt");  //load default file
+        
+    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);
-	bShowAtStartup = wxShowTip(this, tipProvider);
+    DEBUG_INFO("Reading tips from " << strFile.mb_str());
+    wxTipProvider *tipProvider = wxCreateFileTipProvider(strFile, nValue);
+    bShowAtStartup = wxShowTip(this, tipProvider);
 
-	//store startup preferences
-	nValue = (bShowAtStartup ? tipProvider->GetCurrentTip() : 0);
-	DEBUG_INFO("Writing tip index: " << nValue);
+    //store startup preferences
+    nValue = (bShowAtStartup ? tipProvider->GetCurrentTip() : 0);
+    DEBUG_INFO("Writing tip index: " << nValue);
     config->Write(wxT("/MainFrame/ShowStartTip"), nValue);
-	delete tipProvider;
+    delete tipProvider;
 }
 
 void MainFrame::OnKeyboardHelp(wxCommandEvent & e)

[Hugin-cvs] hugin/src/hugin PreferencesDialog.cpp,1.34,1.35

From: Pablo d'Angelo <dangelo@us...> - 2005-08-19 00:13

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

Modified Files:
	PreferencesDialog.cpp 
Log Message:
removed "select one" from language chooser, gcc 4.0 compile fix


Index: PreferencesDialog.cpp
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/PreferencesDialog.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- PreferencesDialog.cpp	16 Aug 2005 20:43:33 -0000	1.34
+++ PreferencesDialog.cpp	17 Aug 2005 20:48:25 -0000	1.35
@@ -104,15 +104,30 @@
     wxChoice *lang_choice = XRCCTRL(*this, "prefs_gui_language", wxChoice);
 
     // add languages to choice
-    lang_choice->Append(_("Select one"), (void *) huginApp::Get()->GetLocale().GetLanguage());
-    lang_choice->Append(_("System default"), (void *) wxLANGUAGE_DEFAULT);
-    lang_choice->Append(_("English"), (void *) wxLANGUAGE_ENGLISH);
-    lang_choice->Append(_("German"), (void *) wxLANGUAGE_GERMAN);
-    lang_choice->Append(_("French"), (void *) wxLANGUAGE_FRENCH);
-    lang_choice->Append(_("Polish"), (void *) wxLANGUAGE_POLISH);
-    lang_choice->Append(_("Italian"), (void *) wxLANGUAGE_ITALIAN);
-    lang_choice->Append(_("Japanese"), (void *) wxLANGUAGE_JAPANESE);
-    lang_choice->Append(_("Russian"), (void *) wxLANGUAGE_RUSSIAN);
+    long * lp = new long;
+    *lp = wxLANGUAGE_DEFAULT;
+    lang_choice->Append(_("System default"), lp);
+    lp = new long;
+    *lp = wxLANGUAGE_ENGLISH;
+    lang_choice->Append(_("English"), lp);
+    lp = new long;
+    *lp = wxLANGUAGE_GERMAN;    
+    lang_choice->Append(_("German"), lp);
+    lp = new long;
+    *lp = wxLANGUAGE_FRENCH;
+    lang_choice->Append(_("French"), lp);
+    lp = new long;
+    *lp = wxLANGUAGE_POLISH;
+    lang_choice->Append(_("Polish"), lp);
+    lp = new long;
+    *lp = wxLANGUAGE_ITALIAN;
+    lang_choice->Append(_("Italian"), lp);
+    lp = new long;
+    *lp = wxLANGUAGE_JAPANESE;
+    lang_choice->Append(_("Japanese"), lp);
+    lp = new long;
+    *lp = wxLANGUAGE_RUSSIAN;
+    lang_choice->Append(_("Russian"), lp);
     lang_choice->SetSelection(0);
 
     // Load configuration values from wxConfig
@@ -133,6 +148,12 @@
 
     StoreFramePosition(this, wxT("PreferencesDialog"));
 
+    // delete custom list data
+    wxChoice *lang_choice = XRCCTRL(*this, "prefs_gui_language", wxChoice);
+    for (int i = 0; i < lang_choice->GetCount(); i++) {
+        delete static_cast<long*>(lang_choice->GetClientData(i));
+    }
+    
     DEBUG_TRACE("end dtor");
 }
 
@@ -525,6 +546,29 @@
     long mem = cfg->Read(wxT("/ImageCache/UpperBound"), HUGIN_IMGCACHE_UPPERBOUND);
     MY_SPIN_VAL("prefs_cache_UpperBound", mem >> 20);
 
+    // language
+    // check if current language is in list and activate it then.
+    wxChoice *lang_choice = XRCCTRL(*this, "prefs_gui_language", wxChoice);
+    int curlang = cfg->Read(wxT("language"), HUGIN_LANGUAGE);
+    bool found = false;
+    int idx = 0;
+    for (int i = 0; i < lang_choice->GetCount(); i++) {
+        long lang = * static_cast<long *>(lang_choice->GetClientData(i));
+        if (curlang == lang) {
+            found = true;
+            idx = i;
+        }
+    }
+    if (found) {
+        DEBUG_DEBUG("wxChoice language updated:" << curlang);
+        // update language
+        lang_choice->SetSelection(idx);
+    } else {
+        // unknown language selected..
+        DEBUG_WARN("Unknown language configured");
+    }
+    
+
     // cursor setting
 //    mem = cfg->Read(wxT("/CPImageCtrl/CursorType"), HUGIN_CP_CURSOR);
 //    MY_SPIN_VAL("prefs_cp_CursorType", mem);
@@ -677,12 +721,15 @@
     // locale
     // language
     wxChoice *lang = XRCCTRL(*this, "prefs_gui_language", wxChoice);
-    DEBUG_INFO("Language Selection ID: " << (long)((int) lang->GetClientData(lang->GetSelection())));
     // DEBUG_TRACE("Language Selection Name: " << huginApp::Get()->GetLocale().GetLanguageName((int) lang->GetClientData(lang->GetSelection())).mb_str());
     //DEBUG_INFO("Language Selection locale: " << ((huginApp::Get()->GetLocale().GetLanguageInfo((int) lang->GetClientData(lang->GetSelection())))->CanonicalName).mb_str());
     //DEBUG_INFO("Current System Language ID: " << huginApp::Get()->GetLocale().GetSystemLanguage());
 
-    cfg->Write(wxT("language"), (long)((int) lang->GetClientData(lang->GetSelection())));
+    void * tmplp = lang->GetClientData(lang->GetSelection());
+    long templ =  * static_cast<long *>(tmplp);
+    cfg->Write(wxT("language"), templ);
+    DEBUG_INFO("Language Selection ID: " << templ);
+
     // cursor
 //    cfg->Write(wxT("/CPImageCtrl/CursorType"), MY_G_SPIN_VAL("prefs_cp_CursorType"));
     // tempdir

[Hugin-cvs] hugin ChangeLog,1.49,1.50

From: Pablo d'Angelo <dangelo@us...> - 2005-08-16 21:11

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

Modified Files:
	ChangeLog 
Log Message:
updated changelog


Index: ChangeLog
===================================================================
RCS file: /cvsroot/hugin/hugin/ChangeLog,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- ChangeLog	16 Aug 2005 20:55:29 -0000	1.49
+++ ChangeLog	16 Aug 2005 21:10:48 -0000	1.50
@@ -1,3 +1,16 @@
+2005-08-16 23:06  dangelo
+
+	* src/hugin/hugin.desktop: added russian description
+
+2005-08-16 22:59  dangelo
+
+	* src/include/PT/Stitcher.h: fixed compile error on some newer
+	  versions of gcc 3.4 and higher
+
+2005-08-16 22:55  dangelo
+
+	* ChangeLog: updated changelog
+
 2005-08-16 22:43  dangelo
 
 	* src/hugin/: CPListFrame.cpp, MainFrame.cpp,

[Hugin-cvs] hugin/src/hugin hugin.desktop,1.1,1.2

From: Pablo d'Angelo <dangelo@us...> - 2005-08-16 21:06

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

Modified Files:
	hugin.desktop 
Log Message:
added russian description


Index: hugin.desktop
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/hugin.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- hugin.desktop	20 May 2005 15:07:11 -0000	1.1
+++ hugin.desktop	16 Aug 2005 21:06:11 -0000	1.2
@@ -2,12 +2,15 @@
 Name=Hugin panorama creator
 Name[cs]=Hugin pro sklÃ¡dÃ¡nÃ panoramat
 Name[de]=Hugin panorama creator
+Name[ru]=Ð¡ÑÐ¸Ð²Ð°ÑÐµÐ»Ñ Ð¿Ð°Ð½Ð¾ÑÐ°Ð¼ Hugin
 Comment=Stitch photographs together
 Comment[cs]=SklÃ¡dÃ¡nÃ panoramatickÃ½ch snÃmkÅ¯
 Comment[de]=Erzeugt Panoramabildern aus mehreren Einzelbildern.
+Comment[ru]=Ð¡ÑÐ¸Ð²ÐºÐ° Ð¿Ð°Ð½Ð¾ÑÐ°Ð¼ Ð¸Ð· Ð¾ÑÐ´ÐµÐ»ÑÐ½ÑÑ ÑÐ¾ÑÐ¾Ð³ÑÐ°ÑÐ¸Ð¹
 GenericName=Panorama stitcher
 GenericName[de]=Panorama Stitcher
 GenericName[cs]=NÃ¡stroj pro sklÃ¡dÃ¡nÃ panoramat
+GenericName[ru]=Ð¡ÑÐ¸Ð²Ð°ÑÐµÐ»Ñ Ð¿Ð°Ð½Ð¾ÑÐ°Ð¼
 Categories=Application;Graphics;
 Encoding=UTF-8
 Exec=hugin

[Hugin-cvs] hugin/src/include/PT Stitcher.h,1.27,1.28

From: Pablo d'Angelo <dangelo@us...> - 2005-08-16 20:59

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

Modified Files:
	Stitcher.h 
Log Message:
fixed compile error on some newer versions of gcc 3.4 and higher


Index: Stitcher.h
===================================================================
RCS file: /cvsroot/hugin/hugin/src/include/PT/Stitcher.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- Stitcher.h	15 Aug 2005 16:03:26 -0000	1.27
+++ Stitcher.h	16 Aug 2005 20:59:48 -0000	1.28
@@ -313,7 +313,7 @@
             vigra::TiffImage * tiff = TIFFOpen(filename.str().c_str(), "w");
 
             vigra_ext::createTiffDirectory(tiff,
-                                           m_pano.getImage(imgNr).getFilename(),
+                                           Base::m_pano.getImage(imgNr).getFilename(),
                                            m_basename,
                                            opts.tiffCompression,
                                            1, 1, remapped.boundingBox().upperLeft());

[Hugin-cvs] hugin ChangeLog,1.48,1.49

From: Pablo d'Angelo <dangelo@us...> - 2005-08-16 20:55

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

Modified Files:
	ChangeLog 
Log Message:
updated changelog


Index: ChangeLog
===================================================================
RCS file: /cvsroot/hugin/hugin/ChangeLog,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- ChangeLog	6 Aug 2005 21:39:12 -0000	1.48
+++ ChangeLog	16 Aug 2005 20:55:29 -0000	1.49
@@ -1,3 +1,94 @@
+2005-08-16 22:43  dangelo
+
+	* src/hugin/: CPListFrame.cpp, MainFrame.cpp,
+	  NonaStitcherPanel.cpp, PreferencesDialog.cpp, PreviewFrame.cpp,
+	  xrc/pref_dialog.xrc: Display meaningful message when nona is out
+	  of memory.  Fixed wxFrame background color on wxMSW.
+
+2005-08-15 23:38  dangelo
+
+	* src/: hugin/PreferencesDialog.cpp,
+	  include/hugin/config_defaults.h: use wxNotebook::GetSelection(),
+	  its compatible with wx 2.4.  disabled deleting of tiff input by
+	  default.
+
+2005-08-15 23:06  dangelo
+
+	* src/: foreign/vigra_impex/tiff.cxx,
+	  include/vigra_ext/tiffUtils.h: fixed bugs in tiff importer and
+	  exporters
+
+2005-08-15 23:05  dangelo
+
+	* src/: common/common.vcproj, include/config_msvc.h: updated
+	  windows build system
+
+2005-08-15 23:03  dangelo
+
+	* src/: hugin/PreferencesDialog.cpp, hugin/xrc/pref_dialog.xrc,
+	  hugin/xrc/data/tips.txt, hugin/xrc/data/tips_fr-UTF8.txt,
+	  hugin/xrc/data/tips_fr.txt, hugin/xrc/data/tips_pl-UTF8.txt,
+	  hugin/xrc/data/tips_pl.txt, include/hugin/PreferencesDialog.h,
+	  include/hugin/StitcherPanel.h, include/hugin/config_defaults.h:
+	  implemented "load defaults" button in preferences dialog
+
+2005-08-15 23:02  dangelo
+
+	* src/hugin/po/fr.po: updated french translation
+
+2005-08-15 19:07  dangelo
+
+	* src/: hugin/NonaStitcherPanel.cpp, hugin/PTStitcherPanel.cpp,
+	  include/hugin/NonaStitcherPanel.h,
+	  include/hugin/PTStitcherPanel.h: bugfix: do not change project
+	  when cropped TIFF_m output it temporarily enabled during
+	  remapping for enblend
+
+2005-08-15 18:22  dangelo
+
+	* src/hugin/CPEditorPanel.cpp: Workaround a bug in wxWSW 2.6.1.
+	  Setting the horizontal splitter position doesn't work properly.
+
+2005-08-15 18:03  dangelo
+
+	* src/: Panorama/PanoramaMemento.cpp, hugin/NonaStitcherPanel.cpp,
+	  include/PT/Stitcher.h, include/hugin/config_defaults.h: Added
+	  functionality to create cropped TIFF_m output. Not enabled in the
+	  GUI yet, enblend needs to be patched first.
+
+2005-08-11 19:42  dangelo
+
+	* src/: hugin/CPListFrame.cpp, hugin/ImageCenter.cpp,
+	  hugin/MainFrame.cpp, hugin/PreferencesDialog.cpp,
+	  hugin/PreviewFrame.cpp, hugin/huginApp.cpp,
+	  include/hugin/huginApp.h: resize main window before showing it.
+	  Tested code on linux with wxWidgets 2.4, 2.5.3 and 2.6.1 Use
+	  common function to restore window size and position
+
+2005-08-11 00:05  dangelo
+
+	* src/: hugin/CPEditorPanel.cpp, hugin/CPImageCtrl.cpp,
+	  hugin/ImagesPanel.cpp, hugin/LensPanel.cpp, hugin/MainFrame.cpp,
+	  hugin/OptimizePanel.cpp, hugin/huginApp.cpp, hugin/po/de.po,
+	  hugin/po/fr.po, hugin/po/hugin.pot, hugin/po/it.po,
+	  hugin/po/ja.po, hugin/po/pl.po, hugin/po/ru.po,
+	  include/hugin/CPEditorPanel.h, include/hugin/ImagesPanel.h,
+	  include/hugin/LensPanel.h, include/hugin/MainFrame.h: work around
+	  some changed behaviour and bugs in wxWidgets 2.6.1 on unix
+	  (wxgtk).  Splitters are restored to their original size and 'f'
+	  key finetunes on the image with the mouse cursor over it.
+
+	  also updated translations.
+
+2005-08-09 07:27  dangelo
+
+	* src/hugin/MainFrame.cpp: removed project filename from titlebar
+	  when starting a new project
+
+2005-08-06 23:39  dangelo
+
+	* ChangeLog, NEWS, src/hugin/po/de.po: Updated NEWS file
+
 2005-08-06 00:43  dangelo
 
 	* AUTHORS, README, README_WINDOWS, src/build_msvc/Hugin.sln,

[Hugin-cvs] hugin/src/hugin/xrc pref_dialog.xrc,1.13,1.14

From: Pablo d'Angelo <dangelo@us...> - 2005-08-16 20:43

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

Modified Files:
	pref_dialog.xrc 
Log Message:
Display meaningful message when nona is out of memory.
Fixed wxFrame background color on wxMSW. 


Index: pref_dialog.xrc
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/xrc/pref_dialog.xrc,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- pref_dialog.xrc	15 Aug 2005 21:03:48 -0000	1.13
+++ pref_dialog.xrc	16 Aug 2005 20:43:33 -0000	1.14
@@ -21,84 +21,117 @@
                         <cols>3</cols>
                         <object class="sizeritem">
                           <object class="wxStaticText" name="">
+                            
                             <label>PTStitcher:</label>
                           </object>
+                          
                           <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+                          
                           <border>5</border>
                         </object>
                         <object class="sizeritem">
                           <object class="wxTextCtrl" name="prefs_pt_PTStitcherEXE"/>
+                          
                           <flag>wxALL|wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag>
+                          
                           <border>5</border>
                         </object>
                         <object class="sizeritem">
                           <object class="wxButton" name="prefs_ptstitcher_select">
+                            
                             <label>...</label>
                           </object>
+                          
                           <flag>wxALIGN_CENTRE_VERTICAL</flag>
                         </object>
                         <growablecols>1</growablecols>
                         <object class="sizeritem">
                           <object class="wxStaticText">
+                            
                             <label>PTOptimizer</label>
                           </object>
+                          
                           <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+                          
                           <border>5</border>
                         </object>
                         <object class="sizeritem">
                           <object class="wxTextCtrl" name="prefs_pt_PTOptimizerEXE"/>
+                          
                           <flag>wxALL|wxEXPAND|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+                          
                           <border>5</border>
                         </object>
                         <object class="sizeritem">
                           <object class="wxButton" name="prefs_ptoptimizer_select">
+                            
                             <label>...</label>
                           </object>
+                          
                           <flag>wxALIGN_CENTRE_VERTICAL</flag>
                         </object>
                         <object class="sizeritem">
                           <object class="wxStaticText">
+                            
                             <label>Scriptfile</label>
                           </object>
+                          
                           <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+                          
                           <border>5</border>
                         </object>
                         <object class="sizeritem">
                           <object class="wxTextCtrl" name="prefs_pt_ScriptFile">
+                            
                             <tooltip>Name of the temporary script file used by Panotools</tooltip>
                           </object>
+                          
                           <flag>wxALL|wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag>
+                          
                           <border>5</border>
                         </object>
                         <object class="spacer">
+                          
                           <size>0,0</size>
                         </object>
                         <object class="sizeritem">
                           <object class="wxStaticText">
+                            
                             <label>Panotools:</label>
                           </object>
+                          
                           <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+                          
                           <border>5</border>
                         </object>
                         <object class="sizeritem">
                           <object class="wxStaticText" name="prefs_panotools_version">
+                            
                             <label>Panotools</label>
                           </object>
+                          
                           <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
+                          
                           <border>5</border>
                         </object>
                         <object class="sizeritem">
                           <object class="wxButton" name="prefs_panotools_details">
+                            
                             <label>Details</label>
+                            
                             <enabled>0</enabled>
                           </object>
+                          
                           <flag>wxALIGN_CENTRE_VERTICAL</flag>
                         </object>
                       </object>
+                      
                       <flag>wxEXPAND</flag>
                     </object>
                   </object>
+                  
                   <flag>wxALL|wxEXPAND</flag>
+                  
                   <border>5</border>
                 </object>
               </object>
@@ -119,115 +152,165 @@
                         <cols>3</cols>
                         <object class="sizeritem">
                           <object class="wxStaticText" name="">
+                            
                             <label>Patch width:</label>
                           </object>
+                          
                           <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+                          
                           <border>5</border>
                         </object>
                         <object class="sizeritem">
                           <object class="wxSpinCtrl" name="prefs_ft_TemplateSize">
+                            
                             <min>3</min>
                           </object>
+                          
                           <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
+                          
                           <border>5</border>
                         </object>
                         <object class="sizeritem">
                           <object class="wxStaticText">
+                            
                             <label>pixels</label>
                           </object>
+                          
                           <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
+                          
                           <border>5</border>
                         </object>
                         <object class="sizeritem">
                           <object class="wxStaticText">
+                            
                             <label>Search area width:</label>
                           </object>
+                          
                           <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+                          
                           <border>5</border>
                         </object>
                         <object class="sizeritem">
                           <object class="wxSpinCtrl" name="prefs_ft_SearchAreaPercent">
+                            
                             <min>1</min>
                           </object>
+                          
                           <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
+                          
                           <border>5</border>
                         </object>
                         <object class="sizeritem">
                           <object class="wxStaticText">
+                            
                             <label>percent of image width</label>
                           </object>
+                          
                           <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
+                          
                           <border>5</border>
                         </object>
                         <object class="sizeritem">
                           <object class="wxStaticText" name="">
+                            
                             <label>Local search area width:</label>
                           </object>
+                          
                           <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+                          
                           <border>5</border>
                         </object>
                         <object class="sizeritem">
                           <object class="wxSpinCtrl" name="prefs_ft_LocalSearchWidth">
+                            
                             <min>1</min>
                           </object>
+                          
                           <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
+                          
                           <border>5</border>
                         </object>
                         <object class="sizeritem">
                           <object class="wxStaticText">
+                            
                             <label>pixels</label>
+                            
                             <tooltip></tooltip>
                           </object>
+                          
                           <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
+                          
                           <border>5</border>
                         </object>
                         <object class="sizeritem">
                           <object class="wxStaticText">
+                            
                             <label>Correlation Threshold:</label>
                           </object>
+                          
                           <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+                          
                           <border>5</border>
                         </object>
                         <object class="sizeritem">
                           <object class="wxTextCtrl" name="prefs_ft_CorrThreshold"/>
+                          
                           <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
+                          
                           <border>5</border>
                         </object>
                         <object class="sizeritem">
                           <object class="wxStaticText">
+                            
                             <label>0: no similarity\n1: maximum similarity</label>
+                            
                             <tooltip></tooltip>
                           </object>
+                          
                           <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
+                          
                           <border>5</border>
                         </object>
                         <object class="sizeritem">
                           <object class="wxStaticText">
+                            
                             <label>Peak Curvature Threshold:</label>
                           </object>
+                          
                           <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+                          
                           <border>5</border>
                         </object>
                         <object class="sizeritem">
                           <object class="wxTextCtrl" name="prefs_ft_CurvThreshold"/>
+                          
                           <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
+                          
                           <border>5</border>
                         </object>
                         <object class="sizeritem">
                           <object class="wxStaticText">
+                            
                             <label>0: no peak\n 0.2: distinctive peak</label>
+                            
                             <tooltip></tooltip>
                           </object>
+                          
                           <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
+                          
                           <border>5</border>
                         </object>
                         <growablecols>2</growablecols>
                       </object>
+                      
                       <option>1</option>
+                      
                       <flag>wxEXPAND</flag>
                     </object>
                   </object>
+                  
                   <flag>wxALL|wxEXPAND</flag>
+                  
                   <border>5</border>
                 </object>
                 <object class="sizeritem">
@@ -236,6 +319,7 @@
                     <orient>wxVERTICAL</orient>
                     <object class="sizeritem">
                       <object class="wxCheckBox" name="prefs_ft_RotationSearch">
+                        
                         <label>Enable rotation search (slower, but more accurate)</label>
                       </object>
                     </object>
@@ -245,67 +329,93 @@
                           <cols>3</cols>
                           <object class="sizeritem">
                             <object class="wxStaticText" name="">
+                              
                               <label>Start angle:</label>
                             </object>
+                            
                             <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+                            
                             <border>5</border>
                           </object>
                           <object class="sizeritem">
                             <object class="wxSpinCtrl" name="prefs_ft_RotationStartAngle">
+                              
                               <style></style>
                             </object>
+                            
                             <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
+                            
                             <border>5</border>
                           </object>
                           <object class="sizeritem">
                             <object class="wxStaticText">
+                              
                               <label>degrees</label>
                             </object>
+                            
                             <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
+                            
                             <border>5</border>
                           </object>
                           <object class="sizeritem">
                             <object class="wxStaticText">
+                              
                               <label>Stop angle:</label>
                             </object>
+                            
                             <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+                            
                             <border>5</border>
                           </object>
                           <object class="sizeritem">
                             <object class="wxSpinCtrl" name="prefs_ft_RotationStopAngle"/>
+                            
                             <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
+                            
                             <border>5</border>
                           </object>
                           <object class="sizeritem">
                             <object class="wxStaticText">
+                              
                               <label>degrees</label>
                             </object>
+                            
                             <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
+                            
                             <border>5</border>
                           </object>
                           <object class="sizeritem">
                             <object class="wxStaticText">
+                              
                               <label>Steps:</label>
                             </object>
+                            
                             <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+                            
                             <border>5</border>
                           </object>
                           <object class="sizeritem">
                             <object class="wxSpinCtrl" name="prefs_ft_RotationSteps">
+                              
                               <min>0</min>
                             </object>
+                            
                             <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
+                            
                             <border>5</border>
                           </object>
                           <growablecols>2</growablecols>
                           <object class="spacer">
+                            
                             <size>0,0</size>
                           </object>
                         </object>
                       </object>
                     </object>
                   </object>
+                  
                   <flag>wxALL|wxEXPAND</flag>
+                  
                   <border>5</border>
                 </object>
               </object>
@@ -326,31 +436,44 @@
                         <cols>3</cols>
                         <object class="sizeritem">
                           <object class="wxStaticText">
+                            
                             <label>Image cache memory:</label>
                           </object>
+                          
                           <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+                          
                           <border>5</border>
                         </object>
                         <object class="sizeritem">
                           <object class="wxSpinCtrl" name="prefs_cache_UpperBound">
+                            
                             <min>1</min>
+                            
                             <tooltip>Keep fullsize images in memory, until this limit is exceeded</tooltip>
                           </object>
+                          
                           <flag>wxALL|wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag>
+                          
                           <border>5</border>
                         </object>
                         <object class="sizeritem">
                           <object class="wxStaticText">
+                            
                             <label>MB</label>
                           </object>
+                          
                           <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
+                          
                           <border>5</border>
                         </object>
                       </object>
+                      
                       <flag>wxEXPAND</flag>
                     </object>
                   </object>
+                  
                   <flag>wxALL|wxEXPAND</flag>
+                  
                   <border>5</border>
                 </object>
                 <object class="sizeritem">
@@ -362,40 +485,56 @@
                         <cols>3</cols>
                         <object class="sizeritem">
                           <object class="wxStaticText">
+                            
                             <label>Language</label>
                           </object>
+                          
                           <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+                          
                           <border>5</border>
                         </object>
                         <object class="sizeritem">
                           <object class="wxChoice" name="prefs_gui_language">
+                            
                             <content/>
                           </object>
+                          
                           <flag>wxALL|wxEXPAND</flag>
+                          
                           <border>5</border>
                         </object>
                         <object class="sizeritem">
                           <object class="wxStaticText">
+                            
                             <label>requires restarting hugin</label>
+                            
                             <style></style>
                           </object>
+                          
                           <flag>wxALL|wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag>
+                          
                           <border>5</border>
                         </object>
                         <rows>2</rows>
                         <growablecols>1</growablecols>
                       </object>
+                      
                       <flag>wxEXPAND</flag>
                     </object>
                     <object class="sizeritem">
                       <object class="wxCheckBox" name="prefs_misc_UseSelectedImages">
+                        
                         <label>Optimize and stitch only images selected in preview window</label>
                       </object>
+                      
                       <flag>wxALL</flag>
+                      
                       <border>5</border>
                     </object>
                   </object>
+                  
                   <flag>wxALL|wxEXPAND</flag>
+                  
                   <border>5</border>
                 </object>
                 <object class="sizeritem">
@@ -407,29 +546,41 @@
                         <orient>wxHORIZONTAL</orient>
                         <object class="sizeritem">
                           <object class="wxStaticText">
+                            
                             <label>Tempdir:</label>
                           </object>
+                          
                           <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+                          
                           <border>5</border>
                         </object>
                         <object class="sizeritem">
                           <object class="wxTextCtrl" name="prefs_misc_tempdir"/>
+                          
                           <option>1</option>
+                          
                           <flag>wxALL|wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag>
+                          
                           <border>5</border>
                         </object>
                         <object class="sizeritem">
                           <object class="wxStaticText">
+                            
                             <label>leave empty for OS default</label>
                           </object>
+                          
                           <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
+                          
                           <border>5</border>
                         </object>
                       </object>
+                      
                       <flag>wxEXPAND</flag>
                     </object>
                   </object>
+                  
                   <flag>wxALL|wxEXPAND</flag>
+                  
                   <border>5</border>
                 </object>
                 <object class="sizeritem">
@@ -441,15 +592,20 @@
                         <orient>wxHORIZONTAL</orient>
                         <object class="sizeritem">
                           <object class="wxCheckBox" name="prefs_misc_showDruid">
+                            
                             <label>Show Druid (requires restarting hugin)</label>
                           </object>
                         </object>
                       </object>
+                      
                       <option>1</option>
+                      
                       <flag>wxEXPAND</flag>
                     </object>
                   </object>
+                  
                   <flag>wxALL|wxEXPAND</flag>
+                  
                   <border>5</border>
                 </object>
               </object>
@@ -464,13 +620,17 @@
                   <object class="wxBoxSizer">
                     <object class="sizeritem">
                       <object class="wxStaticText">
+                        
                         <label>Select Autopano</label>
                       </object>
+                      
                       <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+                      
                       <border>5</border>
                     </object>
                     <object class="sizeritem">
                       <object class="wxChoice" name="prefs_AutoPanoType">
+                        
                         <content>
                           <item>Autopano (by A. Jenny)</item>
                           <item>Autopano-SIFT (by S. Nowozin)</item>
@@ -479,7 +639,9 @@
                     </object>
                     <orient>wxHORIZONTAL</orient>
                   </object>
+                  
                   <flag>wxALL|wxEXPAND</flag>
+                  
                   <border>5</border>
                 </object>
                 <object class="sizeritem">
@@ -492,42 +654,58 @@
                           <cols>3</cols>
                           <object class="sizeritem">
                             <object class="wxStaticText">
+                              
                               <label>Autopano-SIFT:</label>
                             </object>
+                            
                             <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+                            
                             <border>5</border>
                           </object>
                           <object class="sizeritem">
                             <object class="wxTextCtrl" name="prefs_AutoPanoSIFTExe"/>
+                            
                             <flag>wxALL|wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag>
+                            
                             <border>5</border>
                           </object>
                           <object class="sizeritem">
                             <object class="wxButton" name="prefs_AutoPanoSIFTExe_select">
+                              
                               <label>...</label>
                             </object>
+                            
                             <flag>wxALIGN_CENTRE_VERTICAL</flag>
                           </object>
                           <object class="sizeritem">
                             <object class="wxStaticText">
+                              
                               <label>Arguments:</label>
                             </object>
+                            
                             <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+                            
                             <border>5</border>
                           </object>
                           <object class="sizeritem">
                             <object class="wxTextCtrl" name="prefs_AutoPanoSIFTArgs"/>
+                            
                             <option>2</option>
+                            
                             <flag>wxALL|wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag>
+                            
                             <border>5</border>
                           </object>
                           <growablecols>1</growablecols>
                         </object>
                       </object>
+                      
                       <flag>wxEXPAND</flag>
                     </object>
                   </object>
+                  
                   <flag>wxALL|wxEXPAND</flag>
+                  
                   <border>5</border>
                 </object>
                 <object class="sizeritem">
@@ -540,53 +718,72 @@
                           <cols>3</cols>
                           <object class="sizeritem">
                             <object class="wxStaticText">
+                              
                               <label>Autopano:</label>
                             </object>
+                            
                             <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+                            
                             <border>5</border>
                           </object>
                           <object class="sizeritem">
                             <object class="wxTextCtrl" name="prefs_AutoPanoKolorExe"/>
+                            
                             <flag>wxALL|wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag>
+                            
                             <border>5</border>
                           </object>
                           <object class="sizeritem">
                             <object class="wxButton" name="prefs_AutoPanoKolorExe_select">
+                              
                               <label>...</label>
                             </object>
+                            
                             <flag>wxALIGN_CENTRE_VERTICAL</flag>
                           </object>
                           <object class="sizeritem">
                             <object class="wxStaticText">
+                              
                               <label>Arguments:</label>
                             </object>
+                            
                             <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+                            
                             <border>5</border>
                           </object>
                           <object class="sizeritem">
                             <object class="wxTextCtrl" name="prefs_AutoPanoKolorArgs"/>
+                            
                             <option>2</option>
+                            
                             <flag>wxALL|wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag>
+                            
                             <border>5</border>
                           </object>
                           <growablecols>1</growablecols>
                         </object>
                       </object>
+                      
                       <flag>wxEXPAND</flag>
                     </object>
                   </object>
+                  
                   <flag>wxALL|wxEXPAND</flag>
+                  
                   <border>5</border>
                 </object>
                 <object class="sizeritem">
                   <object class="wxStaticText">
+                    
                     <label>following patterns will be subsituted before running:
 %o  -- output project (0.oto will be appended when using Autopano)
 %p  -- number of control points between each pair
 %i  -- image files
 %namefile -- file that contains image filenames</label>
                   </object>
+                  
                   <flag>wxALL|wxEXPAND</flag>
+                  
                   <border>5</border>
                 </object>
               </object>
@@ -606,117 +803,166 @@
                         <cols>3</cols>
                         <object class="sizeritem">
                           <object class="wxStaticText">
+                            
                             <label>Enblend:</label>
                           </object>
+                          
                           <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+                          
                           <border>5</border>
                         </object>
                         <object class="sizeritem">
                           <object class="wxTextCtrl" name="prefs_enblend_EnblendExe"/>
+                          
                           <flag>wxALL|wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag>
+                          
                           <border>5</border>
                         </object>
                         <object class="sizeritem">
                           <object class="wxButton" name="prefs_enblend_select">
+                            
                             <label>...</label>
                           </object>
+                          
                           <flag>wxALIGN_CENTRE_VERTICAL</flag>
                         </object>
                         <object class="sizeritem">
                           <object class="wxStaticText">
+                            
                             <label>Additional Arguments:</label>
                           </object>
+                          
                           <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+                          
                           <border>5</border>
                         </object>
                         <object class="sizeritem">
                           <object class="wxTextCtrl" name="prefs_enblend_EnblendArgs"/>
+                          
                           <option>2</option>
+                          
                           <flag>wxALL|wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag>
+                          
                           <border>5</border>
                         </object>
                         <growablecols>1</growablecols>
                         <object class="spacer">
+                          
                           <size>0,0</size>
                         </object>
                       </object>
+                      
                       <flag>wxALL|wxEXPAND</flag>
                     </object>
                     <object class="sizeritem">
                       <object class="wxStaticText">
+                        
                         <label>Do not set -w and -o arguments, they are set by hugin</label>
                       </object>
+                      
                       <flag>wxALIGN_CENTRE_HORIZONTAL</flag>
+                      
                       <border>10</border>
                     </object>
                     <object class="sizeritem">
                       <object class="wxCheckBox" name="prefs_enblend_DeleteRemapped">
+                        
                         <label>Delete remapped tiff files</label>
                       </object>
+                    
+                      <flag>wxTOP|wxLEFT</flag>
+                      <border>5</border>
                     </object>
                   </object>
+                  
                   <flag>wxALL|wxEXPAND</flag>
+                  
                   <border>5</border>
                 </object>
               </object>
             </object>
           </object>
         </object>
+        
         <option>1</option>
+        
         <flag>wxALL|wxEXPAND</flag>
+        
         <border>5</border>
+        
         <minsize>450,400</minsize>
       </object>
       <object class="sizeritem">
         <object class="wxBoxSizer">
           <orient>wxHORIZONTAL</orient>
           <object class="spacer">
+            
             <option>4</option>
+            
             <flag>wxEXPAND</flag>
           </object>
           <object class="sizeritem">
             <object class="wxButton" name="wxID_OK">
+              
               <label>Ok</label>
             </object>
+            
             <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
+            
             <border>5</border>
           </object>
           <object class="spacer">
+            
             <option>1</option>
+            
             <flag>wxEXPAND</flag>
           </object>
           <object class="sizeritem">
             <object class="wxButton" name="wxID_APPLY">
+              
               <label>Apply</label>
             </object>
+            
             <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
+            
             <border>5</border>
           </object>
           <object class="spacer">
+            
             <option>1</option>
+            
             <flag>wxEXPAND</flag>
           </object>
           <object class="sizeritem">
             <object class="wxButton" name="wxID_CANCEL">
+              
               <label>Cancel</label>
             </object>
+            
             <flag>wxALL|wxEXPAND</flag>
+            
             <border>5</border>
           </object>
           <object class="spacer">
+            
             <option>4</option>
+            
             <flag>wxEXPAND</flag>
           </object>
           <object class="sizeritem">
             <object class="wxButton" name="prefs_defaults">
+              
               <label>Load Defaults</label>
             </object>
+            
             <flag>wxALL|wxEXPAND</flag>
+            
             <border>5</border>
           </object>
         </object>
+        
         <flag>wxEXPAND</flag>
       </object>
     </object>
   </object>
-</resource>
+</resource>
\ No newline at end of file

[Hugin-cvs] hugin/src/hugin CPListFrame.cpp,1.22,1.23 MainFrame.cpp,1.160,1.161 NonaStitcherPanel.cpp,1.52,1.53 PreferencesDialog.cpp,1.33,1.34 PreviewFrame.cpp,1.53,1.54

From: Pablo d'Angelo <dangelo@us...> - 2005-08-16 20:43

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

Modified Files:
	CPListFrame.cpp MainFrame.cpp NonaStitcherPanel.cpp 
	PreferencesDialog.cpp PreviewFrame.cpp 
Log Message:
Display meaningful message when nona is out of memory.
Fixed wxFrame background color on wxMSW. 


Index: MainFrame.cpp
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/MainFrame.cpp,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -d -r1.160 -r1.161
--- MainFrame.cpp	11 Aug 2005 17:42:15 -0000	1.160
+++ MainFrame.cpp	16 Aug 2005 20:43:33 -0000	1.161
@@ -365,11 +365,15 @@
     }
     wxYield();
 	
-
     // disable automatic Layout() calls, to it by hand
     SetAutoLayout(false);
 
 
+#if __WXMSW__
+    // wxFrame does have a strange background color on Windows, copy color from a child widget
+    this->SetBackgroundColour(images_panel->GetBackgroundColour());
+#endif
+
 // By using /SUBSYSTEM:CONSOLE /ENTRY:"WinMainCRTStartup" in the linker
 // options for the debug build, a console window will be used for stdout
 // and stderr. No need to redirect to a file. Better security since we can't

Index: PreferencesDialog.cpp
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/PreferencesDialog.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- PreferencesDialog.cpp	15 Aug 2005 21:38:57 -0000	1.33
+++ PreferencesDialog.cpp	16 Aug 2005 20:43:33 -0000	1.34
@@ -118,6 +118,11 @@
     // Load configuration values from wxConfig
     UpdateDisplayData();
 
+#if __WXMSW__
+    // wxFrame does have a strange background color on Windows, copy color from a child widget
+    this->SetBackgroundColour(XRCCTRL(*this, "prefs_ft_RotationStartAngle", wxSpinCtrl)->GetBackgroundColour());
+#endif
+
     RestoreFramePosition(this, wxT("PreferencesDialog"));
 }
 

Index: NonaStitcherPanel.cpp
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/NonaStitcherPanel.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- NonaStitcherPanel.cpp	15 Aug 2005 17:07:28 -0000	1.52
+++ NonaStitcherPanel.cpp	16 Aug 2005 20:43:33 -0000	1.53
@@ -291,8 +291,15 @@
         // stitch panorama
         PT::stitchPanorama(pano, opts,
                            pdisp, opts.outfile, imgs);
+    } catch (std::bad_alloc & e) {
+        wxMessageBox(_("Out of memory.\nTry again with a smaller panorama image size\n"),
+                     _("Error during stitching"),
+                     wxICON_ERROR | wxOK);
+        return;
     } catch (std::exception & e) {
-        DEBUG_FATAL(_("error during stitching:") << e.what());
+        wxMessageBox(wxString(e.what(), *wxConvCurrent),
+                     _("Error during stitching"),
+                     wxICON_ERROR | wxOK);
         return;
     }
 

Index: PreviewFrame.cpp
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/PreviewFrame.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- PreviewFrame.cpp	11 Aug 2005 17:42:15 -0000	1.53
+++ PreviewFrame.cpp	16 Aug 2005 20:43:33 -0000	1.54
@@ -200,7 +200,7 @@
     SetStatusText(wxT(""),1);
 
     // the initial size as calculated by the sizers
-    SetSizer( topsizer );
+    this->SetSizer( topsizer );
     topsizer->SetSizeHints( this );
 
     // set the minimize icon
@@ -222,6 +222,11 @@
 
     m_ToolBar->ToggleTool(XRCID("preview_auto_update_tool"), aup !=0);
 
+#if __WXMSW_
+    // wxFrame does have a strange background color on Windows..
+    this->SetBackgroundColour(m_PreviewPanel->GetBackgroundColour());
+#endif
+
     if (config->Read(wxT("/PreviewFrame/isShown"), 0l) != 0) {
         Show();
     }

Index: CPListFrame.cpp
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/CPListFrame.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- CPListFrame.cpp	11 Aug 2005 17:42:15 -0000	1.22
+++ CPListFrame.cpp	16 Aug 2005 20:43:33 -0000	1.23
@@ -267,6 +267,10 @@
     m_verbose = (config->Read(wxT("/CPListFrame/verbose"),0l) != 0);
 
 #if __WXMSW__
+    // wxFrame does have a strange background color on Windows, copy color from a child widget
+    this->SetBackgroundColour(XRCCTRL(*this, "cp_list_select", wxButton)->GetBackgroundColour());
+#endif
+#if __WXMSW__
     wxIcon myIcon(MainFrame::Get()->GetXRCPath() + wxT("data/icon.ico"),wxBITMAP_TYPE_ICO);
 #else
     wxIcon myIcon(MainFrame::Get()->GetXRCPath() + wxT("data/icon.png"),wxBITMAP_TYPE_PNG);

[Hugin-cvs] hugin/src/include/hugin config_defaults.h,1.19,1.20

From: Pablo d'Angelo <dangelo@us...> - 2005-08-15 21:39

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

Modified Files:
	config_defaults.h 
Log Message:
use wxNotebook::GetSelection(), its compatible with wx 2.4.
disabled deleting of tiff input by default.


Index: config_defaults.h
===================================================================
RCS file: /cvsroot/hugin/hugin/src/include/hugin/config_defaults.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- config_defaults.h	15 Aug 2005 21:03:49 -0000	1.19
+++ config_defaults.h	15 Aug 2005 21:38:57 -0000	1.20
@@ -48,7 +48,7 @@
 
 #define HUGIN_PREVIEW_SHOW_DRUID              1l
 #define HUGIN_USE_SELECTED_IMAGES             0l
-#define HUGIN_ENBLEND_DELETE_REMAPPED_FILES   1l
+#define HUGIN_ENBLEND_DELETE_REMAPPED_FILES   0l
 #define HUGIN_CROP_SETS_CENTER                1l
 
 // GUI defaults

[Hugin-cvs] hugin/src/hugin PreferencesDialog.cpp,1.32,1.33

From: Pablo d'Angelo <dangelo@us...> - 2005-08-15 21:39

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

Modified Files:
	PreferencesDialog.cpp 
Log Message:
use wxNotebook::GetSelection(), its compatible with wx 2.4.
disabled deleting of tiff input by default.


Index: PreferencesDialog.cpp
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/PreferencesDialog.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- PreferencesDialog.cpp	15 Aug 2005 21:03:48 -0000	1.32
+++ PreferencesDialog.cpp	15 Aug 2005 21:38:57 -0000	1.33
@@ -125,7 +125,7 @@
 PreferencesDialog::~PreferencesDialog()
 {
     DEBUG_TRACE("begin dtor");
-    
+
     StoreFramePosition(this, wxT("PreferencesDialog"));
 
     DEBUG_TRACE("end dtor");
@@ -583,13 +583,13 @@
                                 wxYES_NO, this);
     if ( really == wxYES)
     {
-        if (noteb->GetCurrentPage() == noteb->GetPage(0)) {
+        if (noteb->GetSelection() == 0) {
             cfg->Write(wxT("/Panotools/PTStitcherExe"), wxT(HUGIN_PT_STITCHER_EXE) );
             cfg->Write(wxT("/Panotools/PTOptimizerExe"), wxT(HUGIN_PT_OPTIMIZER_EXE) );
             cfg->Write(wxT("/PanoTools/ScriptFile"), wxT("PT_script.txt"));
         }
 
-        if (noteb->GetCurrentPage() == noteb->GetPage(1)) {
+        if (noteb->GetSelection() == 1) {
             // Fine tune settings
             cfg->Write(wxT("/Finetune/SearchAreaPercent"), HUGIN_FT_SEARCH_AREA_PERCENT);
             cfg->Write(wxT("/Finetune/TemplateSize"), HUGIN_FT_TEMPLATE_SIZE);
@@ -603,7 +603,7 @@
             cfg->Write(wxT("/Finetune/RotationStopAngle"), HUGIN_FT_ROTATION_STOP_ANGLE);
             cfg->Write(wxT("/Finetune/RotationSteps"), HUGIN_FT_ROTATION_STEPS);
         }
-        if (noteb->GetCurrentPage() == noteb->GetPage(2)) {
+        if (noteb->GetSelection() == 2) {
             // MISC
             // cache
             cfg->Write(wxT("/ImageCache/UpperBound"), HUGIN_IMGCACHE_UPPERBOUND);
@@ -614,7 +614,7 @@
             // use preview images as active images
             cfg->Write(wxT("/General/UseOnlySelectedImages"), HUGIN_USE_SELECTED_IMAGES);
         }
-        if (noteb->GetCurrentPage() == noteb->GetPage(3)) {
+        if (noteb->GetSelection() == 3) {
             /////
             /// AUTOPANO
             cfg->Write(wxT("/AutoPano/Type"), HUGIN_AP_TYPE);
@@ -625,13 +625,13 @@
             cfg->Write(wxT("/AutoPanoKolor/AutopanoExe"), wxT(HUGIN_APKOLOR_EXE));
             cfg->Write(wxT("/AutoPanoKolor/Args"), wxT(HUGIN_APKOLOR_ARGS));
         }
-        if (noteb->GetCurrentPage() == noteb->GetPage(3)) {
+        if (noteb->GetSelection() == 4) {
             /// ENBLEND
             cfg->Write(wxT("/Enblend/EnblendExe"), wxT(HUGIN_ENBLEND_EXE));
             cfg->Write(wxT("/Enblend/EnblendArgs"), wxT(HUGIN_ENBLEND_ARGS));
             cfg->Write(wxT("/Enblend/DeleteRemappedFiles"), HUGIN_ENBLEND_DELETE_REMAPPED_FILES);
         }
-        
+
         UpdateDisplayData();
     }
 }

[Hugin-cvs] hugin/src/include/vigra_ext tiffUtils.h,1.10,1.11

From: Pablo d'Angelo <dangelo@us...> - 2005-08-15 21:06

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

Modified Files:
	tiffUtils.h 
Log Message:
fixed bugs in tiff importer and exporters


Index: tiffUtils.h
===================================================================
RCS file: /cvsroot/hugin/hugin/src/include/vigra_ext/tiffUtils.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- tiffUtils.h	26 Jul 2005 06:05:16 -0000	1.10
+++ tiffUtils.h	15 Aug 2005 21:06:09 -0000	1.11
@@ -55,7 +55,7 @@
  */
 inline void createTiffDirectory(vigra::TiffImage * tiff, const std::string & pagename,
 				const std::string & documentname,
-                                const std::string comp,
+                const std::string comp,
 				uint16 page, uint16 nImg,
 				vigra::Diff2D offset)
 {
@@ -64,17 +64,17 @@
     // hopefully I didn't forget too much stuff..
     // TIFF tag reference at http://www.awaresystems.be/imaging/tiff/tifftags.html
 
-    // FIXME: Should not create a new directory unless this is a new layer since TIFFOpen
-    //        already creates a new directory and this breaks some windows builds.
-    //        Maybe move the create into the multilayer stuff
-    //        or write a createMultiTiffDirectory?
-    //TIFFCreateDirectory (tiff);
-
     // set page
     // FIXME: Also only needed for multilayer images
-    TIFFSetField (tiff, TIFFTAG_SUBFILETYPE, FILETYPE_PAGE);
-    TIFFSetField (tiff, TIFFTAG_PAGENUMBER, (unsigned short)page, (unsigned short)nImg);
-
+    if (nImg > 1) {
+        // create tiff directory for the new layers
+        // TIFFOpen already created the first one.
+        if (page > 1) {
+            TIFFCreateDirectory (tiff);
+        }
+        TIFFSetField (tiff, TIFFTAG_SUBFILETYPE, FILETYPE_PAGE);
+        TIFFSetField (tiff, TIFFTAG_PAGENUMBER, (unsigned short)page, (unsigned short)nImg);
+    }
     TIFFSetField (tiff, TIFFTAG_XRESOLUTION, (float) dpi);
     TIFFSetField (tiff, TIFFTAG_YRESOLUTION, (float) dpi);
     // offsets must allways be positive so correct them

[Hugin-cvs] hugin/src/foreign/vigra_impex tiff.cxx,1.3,1.4

From: Pablo d'Angelo <dangelo@us...> - 2005-08-15 21:06

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

Modified Files:
	tiff.cxx 
Log Message:
fixed bugs in tiff importer and exporters


Index: tiff.cxx
===================================================================
RCS file: /cvsroot/hugin/hugin/src/foreign/vigra_impex/tiff.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- tiff.cxx	27 Oct 2004 18:12:51 -0000	1.3
+++ tiff.cxx	15 Aug 2005 21:06:09 -0000	1.4
@@ -127,8 +127,8 @@
         stripbuffer = 0;
         strip = 0;
         stripindex = 0;
-        x_resolution = 0;
-        y_resolution = 0;
+        x_resolution = 150;
+        y_resolution = 150;
         extra_samples_per_pixel = 0;
     }
 
@@ -439,12 +439,12 @@
 
         // XPosition
         if (TIFFGetField( tiff, TIFFTAG_XPOSITION, &fvalue )) {
-            fvalue = fvalue / unitLength;
+            fvalue = fvalue * x_resolution;
             position.x = (int)floor(fvalue + 0.5);
         }
         // YPosition
         if (TIFFGetField( tiff, TIFFTAG_YPOSITION, &fvalue )) {
-            fvalue = fvalue / unitLength;
+            fvalue = fvalue * y_resolution;
             position.y = (int)floor(fvalue + 0.5);
         }

[Hugin-cvs] hugin/src/include config_msvc.h,1.2,1.3

From: Pablo d'Angelo <dangelo@us...> - 2005-08-15 21:05

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

Modified Files:
	config_msvc.h 
Log Message:
updated windows build system


Index: config_msvc.h
===================================================================
RCS file: /cvsroot/hugin/hugin/src/include/config_msvc.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- config_msvc.h	2 Jun 2005 07:55:44 -0000	1.2
+++ config_msvc.h	15 Aug 2005 21:05:33 -0000	1.3
@@ -37,7 +37,7 @@
 #define HAVE_MEMORY_H 1
 
 /* Define to 1 if you have the <pano12/queryfeature.h> header file. */
-#define HAVE_PANO12_QUERYFEATURE_H 1
+#define HAVE_PANO12_QUERYFEATURE_H 1
 
 /* Define to 1 if you have the <stdint.h> header file. */
 //#define HAVE_STDINT_H 1
@@ -88,7 +88,7 @@
 #define PACKAGE_NAME "hugin"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "hugin 0.5 beta3"
+#define PACKAGE_STRING "hugin 0.5 rc2"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "hugin"

[Hugin-cvs] hugin/src/common common.vcproj,1.5,1.6

From: Pablo d'Angelo <dangelo@us...> - 2005-08-15 21:05

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

Modified Files:
	common.vcproj 
Log Message:
updated windows build system


Index: common.vcproj
===================================================================
RCS file: /cvsroot/hugin/hugin/src/common/common.vcproj,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- common.vcproj	4 Feb 2005 00:37:40 -0000	1.5
+++ common.vcproj	15 Aug 2005 21:05:33 -0000	1.6
@@ -4,6 +4,7 @@
 	Version="7.10"
 	Name="common"
 	ProjectGUID="{609891D5-B1A9-43E3-9B61-AD53D6008158}"
+	RootNamespace="common"
 	Keyword="Win32Proj">
 	<Platforms>
 		<Platform
@@ -39,7 +40,8 @@
 			<Tool
 				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCPreBuildEventTool"
+				CommandLine="copy $(SolutionDir)\..\include\config_msvc.h $(SolutionDir)\..\include\config.h"/>
 			<Tool
 				Name="VCPreLinkEventTool"/>
 			<Tool
@@ -78,7 +80,8 @@
 			<Tool
 				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCPreBuildEventTool"
+				CommandLine="copy $(SolutionDir)\..\include\config_msvc.h $(SolutionDir)\..\include\config.h"/>
 			<Tool
 				Name="VCPreLinkEventTool"/>
 			<Tool
@@ -117,7 +120,8 @@
 			<Tool
 				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCPreBuildEventTool"
+				CommandLine="copy $(SolutionDir)\..\include\config_msvc.h $(SolutionDir)\..\include\config.h"/>
 			<Tool
 				Name="VCPreLinkEventTool"/>
 			<Tool

Next Messages