Added some extra keys to aid in dismissal of About dialog.

diff --git a/src/about.cpp b/src/about.cpp
index a09924f8b68657b20bd19aeb858fee32eaeede6a..95e52758d757a7f16a7bdb128e0237e6acc511da 100644 (file)
--- a/src/about.cpp
+++ b/src/about.cpp
@@ -23,49 +23,18 @@ AboutWindow::AboutWindow(QWidget * parent/*= 0*/): QWidget(parent, Qt::Dialog)
        setWindowTitle(tr("About Architektonas..."));
 
        layout = new QVBoxLayout();
-       layout->setSizeConstraint(QLayout::SetFixedSize);
+//     layout->setSizeConstraint(QLayout::SetFixedSize);
        setLayout(layout);
 
-//     image = new QLabel();
-//     image->setAlignment(Qt::AlignRight);
-//     image->setPixmap(QPixmap(":/res/atns-icon.png"));
-//     layout->addWidget(image);
-
-#if 0
-//     QString s = QString(tr("(Last full build was on %1 %2)<br>")).arg(__DATE__).arg(__TIME__);
-       QString s = QString(tr(""//<img src=':/res/atns-icon.png'>"//));
-//     s.append(tr(
-//"This is some random text. I wonder if it will be rendered correctly or not???</p>"
-               "<table><tr><td valign='middle'>"
-               "<table>"
-               "<tr><td align='right'><b>Architektonas: </b></td><td>Free, <i>Industrial Strength</i> 2D Computer Aided Design</td></tr>"
-               "<tr><td align='right'><b>Version: </b></td><td>1.0.0</td></tr>"
-               "<tr><td align='right'><b>License: </b></td><td>GPL v3 or later</td></tr>"
-               "<tr><td align='right'><b>Chief Architect: </b></td><td>James L. Hammons (shamus)</td></tr>"
-               "<tr><td align='right'><b>Coders: </b></td><td>James L. Hammons (shamus)</td></tr>"
-//             "<tr><td align='right'><b>Testers: </b></td><td>shamus</td></tr>"
-               "<tr><td align='right'><b>Homepage: </b></td><td>http://shamusworld.gotdns.org/architektonas/</td></tr>"
-               "</table>"
-               "</td>"
-               "<td><img src=':/res/atns-icon.png'></td></tr></table>"
-               "<br><br>"
-               "<i>The authors of Architektonas would like to express their heartfelt gratitude to:</i>"
-//             "<br>"
-               "<ul>"
-               "<li>The authors of <b>Inkscape</b>, whose incredible GUI was a huge inspiration for us</li>"
-               "<li><b>QCad</b> for sucking so bad that we just <i>had</i> to write something better</li>"
-               "<li>Every other 2D CAD package out there that's mired in a legacy of the bad old days of pencil and paper, and all the attendant horrors that came along with that. We couldn't have done it without you!</li>"
-               "</ul>"
-       ));
-#else
        QString s = QString(tr(
                "<table>"
                "<tr>"
-               "<td  style='padding-right:15px'><img src=':/res/about-logo.png'></td>"
+               "<td style='padding-right:15px; float:left'><img src=':/res/about-logo.png'></td>"
                "<td>"
+//             "<img src=':/res/about-logo.png' style='padding-right:15px; float:left'>"
+
                "<table>"
-//             "<tr><td align='right'><b>Architektonas: </b></td><td width='100'>Free, <i>Industrial Strength</i> 2D Computer Aided Design</td></tr>"
-               "<tr><td align='right' width='110'><b>Architektonas: </b></td><td>Free, <i>Industrial Strength</i> 2D Computer Aided Design</td></tr>"
+               "<tr><td align='right' width='120'><b>Architektonas: </b></td><td>Free, <i>Industrial Strength</i> 2D Computer Aided Design</td></tr>"
                "<tr><td align='right'><b>Version: </b></td><td>1.0.0</td></tr>"
                "<tr><td align='right'><b>License: </b></td><td>GPL v3 or later</td></tr>"
                "<tr><td align='right'><b>Chief Architect: </b></td><td>James Hammons (shamus)</td></tr>"
@@ -73,6 +42,7 @@ AboutWindow::AboutWindow(QWidget * parent/*= 0*/): QWidget(parent, Qt::Dialog)
 //             "<tr><td align='right'><b>Testers: </b></td><td>shamus</td></tr>"
                "<tr><td align='right'><b>Homepage: </b></td><td>http://shamusworld.gotdns.org/architektonas/</td></tr>"
                "</table>"
+
                "<br><br>"
                "<i>The authors of Architektonas would like to express their heartfelt gratitude to:</i>"
                "<ul>"
@@ -84,7 +54,6 @@ AboutWindow::AboutWindow(QWidget * parent/*= 0*/): QWidget(parent, Qt::Dialog)
                "</tr>"
                "</table>"
        ));
-#endif
 
        text = new QLabel(s);
        text->setWordWrap(true);
@@ -92,3 +61,11 @@ AboutWindow::AboutWindow(QWidget * parent/*= 0*/): QWidget(parent, Qt::Dialog)
 //     text->setMaximumWidth(800);
        layout->addWidget(text);
 }
+
+
+void AboutWindow::keyPressEvent(QKeyEvent * e)
+{
+       if (e->key() == Qt::Key_Escape || e->key() == Qt::Key_Return)
+               hide();
+}
+

diff --git a/src/about.h b/src/about.h
index 7397e3b8a9679f185eac1b6ad909d248627f0dac..1eceedb72a578c711a50bb43063d9f5ce55d6862 100644 (file)
--- a/src/about.h
+++ b/src/about.h
@@ -2,7 +2,7 @@
 // about.h: Credits where credits are due ;-)
 //
 // by James L. Hammons
-// (C) 2010 Underground Software
+// (C) 2012 Underground Software
 //
 
 #ifndef __ABOUT_H__
@@ -15,6 +15,9 @@ class AboutWindow: public QWidget
        public:
                AboutWindow(QWidget * parent = 0);
 
+       protected:
+               void keyPressEvent(QKeyEvent *);
+
        private:
                QVBoxLayout * layout;
                QLabel * text;
@@ -22,21 +25,3 @@ class AboutWindow: public QWidget
 };
 
 #endif // __ABOUT_H__
-
-
-#if 0
-class AboutWindow : public QbWindow {
-  Q_OBJECT
-
-public:
-  QVBoxLayout *layout;
-  struct Logo : public QWidget {
-    void paintEvent(QPaintEvent*);
-  } *logo;
-  QLabel *info;
-
-  AboutWindow();
-};
-
-extern AboutWindow *aboutWindow;
-#endif