From 1047bd0700842ac2f5f747fe7e5417a0336244a7 Mon Sep 17 00:00:00 2001
From: clifford <clifford@b57f626f-c46c-0410-a088-ec61d464b74c>
Date: Mon, 26 Oct 2009 12:16:41 +0000
Subject: Clifford Wolf: 	Typo fix s/axis/axes/g

git-svn-id: http://svn.clifford.at/openscad/trunk@121 b57f626f-c46c-0410-a088-ec61d464b74c

diff --git a/glview.cc b/glview.cc
index 7128064..882daf8 100644
--- a/glview.cc
+++ b/glview.cc
@@ -42,7 +42,7 @@ GLView::GLView(QWidget *parent) : QGLWidget(parent)
 	last_mouse_y = 0;
 
 	orthomode = false;
-	showaxis = false;
+	showaxes = false;
 	showcrosshairs = false;
 
 	renderfunc = NULL;
@@ -242,7 +242,7 @@ void GLView::paintGL()
 
 	glTranslated(object_trans_x, object_trans_y, object_trans_z);
 
-	if (showaxis)
+	if (showaxes)
 	{
 		glLineWidth(1);
 		glColor3d(0.5, 0.5, 0.5);
@@ -266,7 +266,7 @@ void GLView::paintGL()
 	if (renderfunc)
 		renderfunc(renderfunc_vp);
 
-	if (showaxis)
+	if (showaxes)
 	{
 		glDepthFunc(GL_ALWAYS);
 
diff --git a/mainwin.cc b/mainwin.cc
index 1e4876a..f28e679 100644
--- a/mainwin.cc
+++ b/mainwin.cc
@@ -184,8 +184,8 @@ MainWindow::MainWindow(const char *filename)
 		menu->addSeparator();
 		actViewModeShowEdges = menu->addAction("Show Edges", this, SLOT(viewModeShowEdges()), QKeySequence(Qt::CTRL + Qt::Key_1));
 		actViewModeShowEdges->setCheckable(true);
-		actViewModeShowAxis = menu->addAction("Show Axis", this, SLOT(viewModeShowAxis()), QKeySequence(Qt::CTRL + Qt::Key_2));
-		actViewModeShowAxis->setCheckable(true);
+		actViewModeShowAxes = menu->addAction("Show Axes", this, SLOT(viewModeShowAxes()), QKeySequence(Qt::CTRL + Qt::Key_2));
+		actViewModeShowAxes->setCheckable(true);
 		actViewModeShowCrosshairs = menu->addAction("Show Crosshairs", this, SLOT(viewModeShowCrosshairs()), QKeySequence(Qt::CTRL + Qt::Key_3));
 		actViewModeShowCrosshairs->setCheckable(true);
 		actViewModeAnimate = menu->addAction("Animate", this, SLOT(viewModeAnimate()));
@@ -1166,9 +1166,9 @@ void MainWindow::viewModeShowEdges()
 	screen->updateGL();
 }
 
-void MainWindow::viewModeShowAxis()
+void MainWindow::viewModeShowAxes()
 {
-	screen->showaxis = actViewModeShowAxis->isChecked();
+	screen->showaxes = actViewModeShowAxes->isChecked();
 	screen->updateGL();
 }
 
diff --git a/openscad.h b/openscad.h
index 5f724e4..6682db8 100644
--- a/openscad.h
+++ b/openscad.h
@@ -648,7 +648,7 @@ public:
 	void *renderfunc_vp;
 
 	bool orthomode;
-	bool showaxis;
+	bool showaxes;
 	bool showcrosshairs;
 
 	double viewer_distance;
@@ -777,7 +777,7 @@ public:
 #endif
 	QAction *actViewModeThrownTogether;
 	QAction *actViewModeShowEdges;
-	QAction *actViewModeShowAxis;
+	QAction *actViewModeShowAxes;
 	QAction *actViewModeShowCrosshairs;
 	QAction *actViewModeAnimate;
 	QAction *actViewPerspective;
@@ -794,7 +794,7 @@ public slots:
 #endif
 	void viewModeThrownTogether();
 	void viewModeShowEdges();
-	void viewModeShowAxis();
+	void viewModeShowAxes();
 	void viewModeShowCrosshairs();
 	void viewModeAnimate();
 	void viewAngleTop();
-- 
cgit v0.10.1