Create Help menu and stub for about box.

src/Typica.pro

@@ -1,26 +1,30 @@
-######################################################################
-# Automatically generated by qmake (2.01a) Sat May 23 23:41:13 2009
-######################################################################
-
-QT += script
-QT += xml
-QT += sql
-QT += xmlpatterns
-QT += scripttools
-QT += webkit
-
-include(3rdparty/qextserialport/src/qextserialport.pri)
-
-TEMPLATE = app
-TARGET = 
-DEPENDPATH += .
-
-# Input
-HEADERS += moc_typica.cpp
-SOURCES += typica.cpp
-
-RESOURCES += \
-    resources.qrc
-
-RC_FILE = typica.rc
-ICON = resources/icons/appicons/logo.icns
+######################################################################
+# Automatically generated by qmake (2.01a) Sat May 23 23:41:13 2009
+######################################################################
+
+QT += script
+QT += xml
+QT += sql
+QT += xmlpatterns
+QT += scripttools
+QT += webkit
+
+include(3rdparty/qextserialport/src/qextserialport.pri)
+
+TEMPLATE = app
+TARGET = 
+DEPENDPATH += .
+
+# Input
+HEADERS += moc_typica.cpp \
+    helpmenu.h \
+    abouttypica.h
+SOURCES += typica.cpp \
+    helpmenu.cpp \
+    abouttypica.cpp
+
+RESOURCES += \
+    resources.qrc
+
+RC_FILE = typica.rc
+ICON = resources/icons/appicons/logo.icns

src/abouttypica.cpp

@@ -0,0 +1,20 @@
+/*223:*/
+#line 29 "./abouttypica.w"
+
+#include "abouttypica.h"
+
+/*224:*/
+#line 38 "./abouttypica.w"
+
+AboutTypica::AboutTypica():QMainWindow(NULL)
+{
+
+}
+
+#line 5650 "./typica.w"
+
+/*:224*/
+#line 32 "./abouttypica.w"
+
+
+/*:223*/

src/abouttypica.h

@@ -0,0 +1,18 @@
+/*222:*/
+#line 12 "./abouttypica.w"
+
+#include <QMainWindow> 
+
+#ifndef AboutTypicaHeader
+#define AboutTypicaHeader
+
+class AboutTypica:public QMainWindow
+{
+Q_OBJECT
+public:
+AboutTypica();
+};
+
+#endif
+
+/*:222*/

src/abouttypica.w

@@ -0,0 +1,43 @@
+@** A Window for Displaying Information About Typica.
+
+\noindent The About window for an application typically displays a few pieces
+of information: The application logo, name, and version number, copyright and
+license information, and other assorted information. In Typica this also
+includes a list of the people and companies that have provided financial
+assistance toward the ongoing development of the software and information that
+others can use to help in this way. Some of this information would benefit
+from existing as a link which can open an external application such as a web
+browser or email client.
+
+@(abouttypica.h@>=
+#include <QMainWindow>
+
+#ifndef AboutTypicaHeader
+#define AboutTypicaHeader
+
+class AboutTypica : public QMainWindow
+{
+	Q_OBJECT
+	public:
+		AboutTypica();
+};
+
+#endif
+
+@ The implementation is in a separate file.
+
+@(abouttypica.cpp@>=
+#include "abouttypica.h"
+
+@<AboutTypica implementation@>@;
+
+@ The information provided here comes from a set of HTML documents stored as
+compiled resources and presented in a set of |QWebView| instances accessible
+through a set of tabs.
+
+@<AboutTypica implementation@>=
+AboutTypica::AboutTypica() : QMainWindow(NULL)
+{
+
+}
+

src/helpmenu.cpp

@@ -0,0 +1,35 @@
+/*167:*/
+#line 35 "./helpmenu.w"
+
+#include "helpmenu.h"
+#include "abouttypica.h"
+
+/*168:*/
+#line 47 "./helpmenu.w"
+
+HelpMenu::HelpMenu():QMenu()
+{
+setObjectName("helpMenu");
+setTitle(tr("Help"));
+QAction*aboutTypicaAction= new QAction(tr("About Typica"),this);
+aboutTypicaAction->setObjectName("aboutTypicaAction");
+addAction(aboutTypicaAction);
+connect(aboutTypicaAction,SIGNAL(triggered()),this,SLOT(displayAboutTypica()));
+}
+
+/*:168*//*169:*/
+#line 61 "./helpmenu.w"
+
+void HelpMenu::displayAboutTypica()
+{
+AboutTypica*aboutBox= new AboutTypica;
+aboutBox->show();
+}
+
+#line 4031 "./typica.w"
+
+/*:169*/
+#line 39 "./helpmenu.w"
+
+
+/*:167*/

src/helpmenu.h

@@ -0,0 +1,20 @@
+/*166:*/
+#line 16 "./helpmenu.w"
+
+#include <QMenu> 
+
+#ifndef HelpMenuHeader
+#define HelpMenuHeader
+
+class HelpMenu:public QMenu
+{
+Q_OBJECT
+public:
+HelpMenu();
+public slots:
+void displayAboutTypica();
+};
+
+#endif
+
+/*:166*/

src/helpmenu.w

@@ -0,0 +1,67 @@
+@* The Help Menu.
+
+\noindent Every window has a help menu that is inserted at the end of any
+configuration defined menus. At present this only serves to have a place to
+hold the "About Typica" menu item which brings up an appropriate about box, but
+there is the possibility that future developments will introduce other items
+that should be included in this menu.
+
+@<Insert help menu@>=
+HelpMenu *helpMenu = new HelpMenu();
+window->menuBar()->addMenu(helpMenu);
+
+@ Since the help menu is represented by its own class, we must have a
+declaration for that class. This is a trivial case.
+
+@(helpmenu.h@>=
+#include <QMenu>
+
+#ifndef HelpMenuHeader
+#define HelpMenuHeader
+
+class HelpMenu : public QMenu
+{
+	Q_OBJECT
+	public:
+		HelpMenu();
+	public slots:
+		void displayAboutTypica();
+};
+
+#endif
+
+@ Implementation is in a separate file.
+
+@(helpmenu.cpp@>=
+#include "helpmenu.h"
+#include "abouttypica.h"
+
+@<Help menu implementation@>@;
+
+@ The constructor sets an object name for the menu so scripts are able to look
+up the menu and add additional items. The "About Typica" menu item also has an
+object name which can be used to provide custom handling if this is desired.
+The |triggered()| signal from that item is immediately connected to a handler
+for displaying an about box.
+
+@<Help menu implementation@>=
+HelpMenu::HelpMenu() : QMenu()
+{
+	setObjectName("helpMenu");
+	setTitle(tr("Help"));
+	QAction *aboutTypicaAction = new QAction(tr("About Typica"), this);
+	aboutTypicaAction->setObjectName("aboutTypicaAction");
+	addAction(aboutTypicaAction);
+	connect(aboutTypicaAction, SIGNAL(triggered()), this, SLOT(displayAboutTypica()));
+}
+
+@ When "About Typica" is selected from the menu, we display an about box. This
+is also handled by a separate class.
+
+@<Help menu implementation@>=
+void HelpMenu::displayAboutTypica()
+{
+	AboutTypica *aboutBox = new AboutTypica;
+	aboutBox->show();
+}
+

src/typica.w

@@ -842,6 +842,13 @@ various Qt modules.
 #include <QtXmlPatterns>
 #include <QtWebKit>
 
+@ New code is being written in separate files in a long term effort to improve
+organization of the code. The result of this is that some additional headers
+are required here.
+
+@<Header files to include@>=
+#include "helpmenu.h"
+
 @** The Scripting Engine.
 
 \noindent The main enhancement of \pn{} version 1.1 is the introduction of a
@@ -3894,14 +3901,8 @@ if(element.hasChildNodes())
 {
 	@<Process window children@>@;
 }
-if(window)
-{
-	window->show();
-}
-else
-{
-	qDebug() << "Error! Window invalidated";
-}
+@<Insert help menu@>@;
+window->show();
 
 @ Three element types make sense as top level children of a {\tt <window>}
 element. An element representing a layout element can be used to apply that
@@ -4026,6 +4027,8 @@ while(j < menuItems.count())
 	j++;
 }
 
+@i helpmenu.w
+
 @ A layout can contain a number of different elements including a variety of
 widget types and other layouts. This function is responsible for applying any
 layout class to the widget currently being populated and processing children of
@@ -5643,6 +5646,8 @@ QScriptValue QComboBox_findText(QScriptContext *context, QScriptEngine *engine)
 	return QScriptValue(engine, self->findText(argument<QString>(0, context)));
 }
 
+@i abouttypica.w
+
 @** A representation of temperature measurements.
 
 \noindent Most of the information in a roast log will be temperature