[Hugin-cvs] SF.net SVN: hugin:[3710] hugin/trunk/src/PTBatcherGUI

[<bru...@us...>]

Revision: 3710
          http://hugin.svn.sourceforge.net/hugin/?rev=3710&view=rev
Author:   brunopostle
Date:     2009-03-08 21:32:20 +0000 (Sun, 08 Mar 2009)

Log Message:
-----------
More fixes for PTBatcherGUI i18n (Thomas Modes)

Modified Paths:
--------------
    hugin/trunk/src/PTBatcherGUI/ProjectListBox.cpp
    hugin/trunk/src/PTBatcherGUI/ProjectListBox.h

Modified: hugin/trunk/src/PTBatcherGUI/ProjectListBox.cpp
===================================================================
--- hugin/trunk/src/PTBatcherGUI/ProjectListBox.cpp	2009-03-06 17:57:22 UTC (rev 3709)
+++ hugin/trunk/src/PTBatcherGUI/ProjectListBox.cpp	2009-03-08 21:32:20 UTC (rev 3710)
@@ -44,15 +44,14 @@
 	columns.Add(SIZE);
 
 	m_selected = -1;
-	for(unsigned int i=0; i<columns.GetCount(); i++)
-		this->InsertColumn(i,columnTitle[columns.Item(i)]);
-	/*this->InsertColumn(0,_("ID"));
+	this->InsertColumn(0,_("ID"));
 	this->InsertColumn(1,_("Project"));
 	this->InsertColumn(2,_("Output prefix"));
-	this->InsertColumn(3,_("Last modified"));
-	this->InsertColumn(4,_("Output format"));
-	this->InsertColumn(5,_("Projection"));
-	this->InsertColumn(6,_("Size"));*/
+	this->InsertColumn(3,_("Status"));
+	this->InsertColumn(4,_("Last modified"));
+	this->InsertColumn(5,_("Output format"));
+	this->InsertColumn(6,_("Projection"));
+	this->InsertColumn(7,_("Size"));
 
 	//get saved width
     for( int i=0; i < GetColumnCount() ; i++ )
@@ -269,7 +268,18 @@
 			}
 		case 5:
 			if(project->status!=Project::MISSING)
-				return this->projectionFormat[project->options.getProjection()];
+			{
+#ifdef HasPANO13
+				pano_projection_features proj;
+				if (panoProjectionFeaturesQuery(project->options.getProjection(), &proj)) 
+				{
+					wxString str2(proj.name, wxConvLocal);
+					return wxGetTranslation(str2);
+				}
+				else
+#endif
+					return _T("");
+			};
 		case 6:
 			if(project->status!=Project::MISSING)
 			{
@@ -313,37 +323,6 @@
 	m_selected = ((wxListEvent)event).GetIndex();
 }
 
-const wxString ProjectListBox::columnTitle[] = {
-			_("ID"),
-			_("Project"),
-			_("Output prefix"),
-			_("Last modified"),
-			_("Output format"),
-			_("Projection"),
-			_("Size"),
-			_("Status")};
-
-const wxString ProjectListBox::projectionFormat[] = {
-			_T("RECTILINEAR"),
-			_T("CYLINDRICAL"),
-			_T("EQUIRECTANGULAR"),
-			_T("FULL_FRAME_FISHEYE"),
-			_T("STEREOGRAPHIC"),
-			_T("MERCATOR"),
-			_T("TRANSVERSE_MERCATOR"),
-			_T("SINUSOIDAL"),
-			_T("LAMBERT"),
-			_T("LAMBERT_AZIMUTHAL"),
-			_T("ALBERS_EQUAL_AREA_CONIC"),
-			_T("MILLER_CYLINDRICAL"),
-			_T("PANINI"),
-			_T("ARCHITECTURAL"),
-			_T("ORTOGRAPHIC"),
-			_T("EQUISOLID"),
-			_T("EQUI_PANINI"),
-                        _T("BIPLANE"),
-                        _T("TRIPLANE")};
-
 const wxString ProjectListBox::fileFormat[] = {_T("JPEG"),
 			_T("PNG"),
             _T("TIFF"),

Modified: hugin/trunk/src/PTBatcherGUI/ProjectListBox.h
===================================================================
--- hugin/trunk/src/PTBatcherGUI/ProjectListBox.h	2009-03-06 17:57:22 UTC (rev 3709)
+++ hugin/trunk/src/PTBatcherGUI/ProjectListBox.h	2009-03-08 21:32:20 UTC (rev 3710)
@@ -72,10 +72,8 @@
 			SIZE,
 			STATUS
         };
-	static const wxString columnTitle[];
 	//options taken from enum in PanoramaOptions.h. Should it change 
 	//in the future, these arrays should be corrected also
-	static const wxString projectionFormat[];
 	static const wxString fileFormat[];
 	static const wxString outputMode[];
 	static const wxString HDRMergeType[];


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.