# HG changeset patch
# User Santeri Piippo <crimsondusk64@gmail.com>
# Date 1372796997 -10800
# Node ID d0f41342ef5124525fe180a9e4c52111355ddc3b
# Parent  de051d2bd80b37072bde2a290e9a8c0a1c2112a2
Show values in file opening prompt

diff -r de051d2bd80b -r d0f41342ef51 src/bbox.cpp
--- a/src/bbox.cpp	Tue Jul 02 23:02:53 2013 +0300
+++ b/src/bbox.cpp	Tue Jul 02 23:29:57 2013 +0300
@@ -108,7 +108,7 @@
 	if (fXScale > fYScale) {
 		if (fXScale > fZScale)
 			fSize = fXScale;
-	} else if (fYScale > fZScale)
+	} elif (fYScale > fZScale)
 		fSize = fYScale;
 	
 	if (abs (fSize) >= 2.0f)
diff -r de051d2bd80b -r d0f41342ef51 src/config.cpp
--- a/src/config.cpp	Tue Jul 02 23:02:53 2013 +0300
+++ b/src/config.cpp	Tue Jul 02 23:29:57 2013 +0300
@@ -103,7 +103,7 @@
 			
 			if (valstring.toUpper () == "TRUE" || valstring == "1")
 				val = true;
-			else if (valstring.toUpper () == "FALSE" || valstring == "0")
+			elif (valstring.toUpper () == "FALSE" || valstring == "0")
 				val = false;
 			break;
 		}
diff -r de051d2bd80b -r d0f41342ef51 src/dialogs.cpp
--- a/src/dialogs.cpp	Tue Jul 02 23:02:53 2013 +0300
+++ b/src/dialogs.cpp	Tue Jul 02 23:29:57 2013 +0300
@@ -406,7 +406,7 @@
 // =============================================================================
 OpenProgressDialog::OpenProgressDialog (QWidget* parent, Qt::WindowFlags f) : QDialog (parent, f) {
 	progressBar = new QProgressBar;
-	progressText = new QLabel ("Parsing...");
+	progressText = new QLabel( "Parsing..." );
 	setNumLines (0);
 	m_progress = 0;
 	
@@ -431,7 +431,8 @@
 }
 
 void OpenProgressDialog::updateValues () {
-	progressBar->setValue (progress ());
+	progressText->setText( fmt( "Parsing... %1 / %2", progress(), numLines() ));
+	progressBar->setValue( progress() );
 }
 
 void OpenProgressDialog::updateProgress (int progress) {
diff -r de051d2bd80b -r d0f41342ef51 src/file.cpp
--- a/src/file.cpp	Tue Jul 02 23:02:53 2013 +0300
+++ b/src/file.cpp	Tue Jul 02 23:29:57 2013 +0300
@@ -351,7 +351,7 @@
 	
 	if( !ok )
 	{
-		load = oldLoad;
+		g_curfile = oldLoad;
 		return null;
 	}
 	
diff -r de051d2bd80b -r d0f41342ef51 src/gldraw.cpp
--- a/src/gldraw.cpp	Tue Jul 02 23:02:53 2013 +0300
+++ b/src/gldraw.cpp	Tue Jul 02 23:29:57 2013 +0300
@@ -958,7 +958,7 @@
 		m_panX += 0.03f * dx * (zoom () / 7.5f);
 		m_panY -= 0.03f * dy * (zoom () / 7.5f);
 		m_panning = true;
-	} else if (left && !m_rangepick && camera () == Free) {
+	} elif (left && !m_rangepick && camera () == Free) {
 		m_rotX = m_rotX + (dy);
 		m_rotY = m_rotY + (dx);
 		
@@ -1273,7 +1273,7 @@
 	if (obj->vertices () >= 2)
 		for (int i = 0; i < obj->vertices (); ++i)
 			verts << obj->getVertex (i);
-	else if( obj->getType() == LDObject::Subfile )
+	elif( obj->getType() == LDObject::Subfile )
 	{
 		vector<LDObject*> objs = static_cast<LDSubfile*>( obj )->inlineContents( true, true );
 		
@@ -1390,7 +1390,7 @@
 	
 	if( info.lw == 0 )
 		info.lw = ( info.lh * img->width() ) / img->height();
-	else if( info.lh == 0 )
+	elif( info.lh == 0 )
 		info.lh = ( info.lw * img->height() ) / img->width();
 	
 	const Axis x2d = cameraAxis( false ),
@@ -1643,7 +1643,7 @@
 			m_file->forgetObject( ovlobj );
 			delete ovlobj;
 		}
-		else if( meta.img && !ovlobj )
+		elif( meta.img && !ovlobj )
 		{
 			// Inverse case: image is there but the overlay object is
 			// not, thus create the object.
diff -r de051d2bd80b -r d0f41342ef51 src/gui.cpp
--- a/src/gui.cpp	Tue Jul 02 23:02:53 2013 +0300
+++ b/src/gui.cpp	Tue Jul 02 23:29:57 2013 +0300
@@ -686,7 +686,7 @@
 		if (obj->getType() == LDObject::Gibberish) {
 			item->setBackground (QColor ("#AA0000"));
 			item->setForeground (QColor ("#FFAA00"));
-		} else if (lv_colorize && obj->isColored () &&
+		} elif (lv_colorize && obj->isColored () &&
 			obj->color () != maincolor && obj->color () != edgecolor)
 		{
 			// If the object isn't in the main or edge color, draw this
diff -r de051d2bd80b -r d0f41342ef51 src/gui_editactions.cpp
--- a/src/gui_editactions.cpp	Tue Jul 02 23:02:53 2013 +0300
+++ b/src/gui_editactions.cpp	Tue Jul 02 23:29:57 2013 +0300
@@ -412,13 +412,13 @@
 				rotateVertex (v, rotpoint, transform);
 				obj->setVertex (i, v);
 			}
-		} else if (obj->hasMatrix ()) {
+		} elif (obj->hasMatrix ()) {
 			LDMatrixObject* mo = dynamic_cast<LDMatrixObject*> (obj);
 			vertex v = mo->position ();
 			rotateVertex (v, rotpoint, transform);
 			mo->setPosition (v);
 			mo->setTransform (mo->transform () * transform);
-		} else if (obj->getType () == LDObject::Vertex) {
+		} elif (obj->getType () == LDObject::Vertex) {
 			LDVertex* vert = static_cast<LDVertex*> (obj);
 			vertex v = vert->pos;
 			rotateVertex (v, rotpoint, transform);
diff -r de051d2bd80b -r d0f41342ef51 src/ldtypes.cpp
--- a/src/ldtypes.cpp	Tue Jul 02 23:02:53 2013 +0300
+++ b/src/ldtypes.cpp	Tue Jul 02 23:29:57 2013 +0300
@@ -205,7 +205,7 @@
 	for (LDObject*& obj : *g_curfile) {
 		if (obj == this)
 			obj = other;
-		else if (obj == other)
+		elif (obj == other)
 			obj = this;
 	}
 }
diff -r de051d2bd80b -r d0f41342ef51 src/main.cpp
--- a/src/main.cpp	Tue Jul 02 23:02:53 2013 +0300
+++ b/src/main.cpp	Tue Jul 02 23:29:57 2013 +0300
@@ -50,7 +50,7 @@
 void doPrint (FILE* fp, initlist<StringFormatArg> args) {
 	if (fp == stdout)
 		doPrint (g_file_stdout, args);
-	else if (fp == stderr)
+	elif (fp == stderr)
 		doPrint (g_file_stderr, args);
 	
 	fatal ("unknown FILE* argument");
diff -r de051d2bd80b -r d0f41342ef51 src/primitives.cpp
--- a/src/primitives.cpp	Tue Jul 02 23:02:53 2013 +0300
+++ b/src/primitives.cpp	Tue Jul 02 23:29:57 2013 +0300
@@ -251,7 +251,7 @@
 				PrimitiveCategory::Type type = PrimitiveCategory::Filename;
 				if (cmd == "f") {
 					type = PrimitiveCategory::Filename;
-				} else if (cmd == "t") {
+				} elif (cmd == "t") {
 					type = PrimitiveCategory::Title;
 				} else
 					continue;