From b8e025e870d0c39f3d2bf8e91f2d1ba4bbeefd3a Mon Sep 17 00:00:00 2001
From: "t.youngs" <t.youngs@qub.ac.uk>
Date: Thu, 10 Nov 2011 09:57:21 +0000
Subject: [PATCH] Updated README. Fixed - Wrongful appearance of 'empty'
 dialogs. Minor tweak to dlpoly CONFIG import dialog title.

---
 README                 | 18 +++++++++++++++---
 data/filters/dlpoly    |  2 +-
 src/main/version.h     |  4 ++--
 src/parser/treegui.cpp | 11 ++++++++++-
 4 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/README b/README
index 910e64744..f687777f1 100644
--- a/README
+++ b/README
@@ -19,9 +19,11 @@ under the GPL, so you can take / change / redistribute at will, but it would be
 nice to be putting everything into the same pot.
 
 
-                                *** Installation ***
+                              *** Compilation ***
 
-Full instructions can be found in the manual. Briefly:
+Brief compilation instructions for Linux-based machines are given here. Full
+instructions, including guides for Windows and Mac compilation, can be found in the
+manual.
 
 1) Run './autogen.sh' (if you got Aten via svn)
 
@@ -31,6 +33,13 @@ Full instructions can be found in the manual. Briefly:
 	Use --with-qt=framework to use native Qt installation from TrollTech on Macs,
 		otherwise use --with-qt=fink to use the Fink-installed version. Leave
 		blank to take your chances!
+
+	Common errors from configure:
+	i) Cannot find headers for 'readline' (or similar) - you will need to install
+	   the development package for 'readline', not just the end-user package. On
+	   OpenSuSE systems, for instance, the relevant package is called 'readline-devel'.
+
+
   **or, if you use CMake**
   Run 'cmake .'
 
@@ -44,8 +53,11 @@ Full instructions can be found in the manual. Briefly:
 	For my default configuration (SuSE Linux 10.2) it's /usr/local/share/aten.
 	For example, using 'bash': export ATENDATA='/usr/local/share/aten'.
 	It's a good idea to put this in your .login, .bashrc, or whatever is relevant.
+	Alternatively, a temporary solution is to run Aten with the '--atendata' switch,
+	specifying the full path to the data files. For example:
+		aten --atendata /home/bob/src/aten/data
 
 
 Tris Youngs
 tris@projectaten.net
-March 2008
+November 2011
diff --git a/data/filters/dlpoly b/data/filters/dlpoly
index 134657386..1ab839c96 100644
--- a/data/filters/dlpoly
+++ b/data/filters/dlpoly
@@ -19,7 +19,7 @@ filter(type="importmodel", name="DL_POLY Configuration", extension="CONFIG,REVCO
 	dialog ui = defaultDialog();
 	if (!ui.created)
 	{
-		ui.title = "DL_POLY Export Options";
+		ui.title = "DL_POLY Import Options";
 		widget group, w, tabs, page;
 		ui.addLabel("","DL_POLY uses fractional cell coordinates ranging from -0.5 to +0.5", 1, 1);
 		ui.addLabel("","while Aten uses 0 to 1.0. The option below, if checked, will convert", 1, 2);
diff --git a/src/main/version.h b/src/main/version.h
index 6a074792e..b2854d4d3 100644
--- a/src/main/version.h
+++ b/src/main/version.h
@@ -23,8 +23,8 @@
 #define ATEN_VERSION_H
 
 #define ATENVERSION "1.8"
-#define ATENREVISION "1754"
-#define ATENDATE "Wed 02 Nov - 15:50"
+#define ATENREVISION "1755"
+#define ATENDATE "Thu 10 Nov - 09:57"
 #define ATENURL "http://aten.googlecode.com/svn/trunk"
 
 #endif
diff --git a/src/parser/treegui.cpp b/src/parser/treegui.cpp
index 33905538b..8154547f6 100644
--- a/src/parser/treegui.cpp
+++ b/src/parser/treegui.cpp
@@ -477,6 +477,7 @@ bool TreeGuiWidget::setProperty(TreeGuiWidgetEvent::EventProperty property, Retu
 	{
 		if (qtWidgetObject_ != NULL) qtWidgetObject_->updateQt();
 		checkWidgetEvents();
+		msg.exit("TreeGuiWidget::setProperty");
 		return TRUE;
 	}
 
@@ -486,6 +487,14 @@ bool TreeGuiWidget::setProperty(TreeGuiWidgetEvent::EventProperty property, Retu
 	{
 		// Widgets for which only 'text' value is valid
 		case (TreeGuiWidget::DialogWidget):
+			if (property == TreeGuiWidgetEvent::TextProperty)
+			{
+				text_ = rv.asString();
+				msg.exit("TreeGuiWidget::setProperty");
+				return TRUE;
+			}
+			else done = FALSE;
+			break;
 		case (TreeGuiWidget::LabelWidget):
 		case (TreeGuiWidget::GroupWidget):
 			if (property == TreeGuiWidgetEvent::TextProperty)
@@ -1154,7 +1163,7 @@ double TreeGuiWidget::asDouble()
 		case (TreeGuiWidget::RadioButtonWidget):
 		case (TreeGuiWidget::TabWidget):
 		case (TreeGuiWidget::StackWidget):
-			msg.print("Warning: Converting integer value to double when retrieving doublespin widget (%s).\n", name_.get());
+			msg.print("Warning: Converting integer value to double when retrieving widget value (%s).\n", name_.get());
 			result = double(valueI_);
 			break;
 		case (TreeGuiWidget::EditWidget):