2019-10-02 Fred Gleason <fredg@paravelsystems.com>

* Refactored rdcatch(1) to use the 'RDDialog' and 'RDWidget'
	base classes.

lib/Makefile.am

@@ -128,6 +128,7 @@ dist_librd_la_SOURCES = dbversion.h\
                         rdfontset.cpp rdfontset.h\
                         rdformpost.cpp rdformpost.h\
                         rdflacdecode.cpp rdflacdecode.h\
+                        rdframe.cpp rdframe.h\
                         rdgain_envelope.cpp rdgain_envelope.h\
                         rdget_ath.cpp rdget_ath.h\
                         rdgetpasswd.cpp rdgetpasswd.h\
@@ -282,6 +283,7 @@ nodist_librd_la_SOURCES = moc_rdadd_cart.cpp\
                           moc_rdexception_dialog.cpp\
                           moc_rdexport_settings_dialog.cpp\
                           moc_rdfeed.cpp\
+                          moc_rdframe.cpp\
                           moc_rdget_ath.cpp\
                           moc_rdgetpasswd.cpp\
                           moc_rdgpio.cpp\

lib/lib.pro

@@ -89,6 +89,7 @@ SOURCES += rdevent_line.cpp
 SOURCES += rdeventimportlist.cpp
 SOURCES += rdexception_dialog.cpp
 SOURCES += rdexport_settings_dialog.cpp
+SOURCES += rdframe.cpp
 SOURCES += rdfontset.cpp
 SOURCES += rdget_ath.cpp
 SOURCES += rdgetpasswd.cpp
@@ -223,6 +224,7 @@ HEADERS += rdevent_line.h
 HEADERS += rdeventimportlist.h
 HEADERS += rdexception_dialog.h
 HEADERS += rdexport_settings_dialog.h
+HEADERS += rdframe.h
 HEADERS += rdfontset.h
 HEADERS += rdget_ath.h
 HEADERS += rdgetpasswd.h

lib/rddialog.h

@@ -22,7 +22,6 @@
 #define RDDIALOG_H
 
 #include <qdialog.h>
-#include <qfont.h>
 
 #include <rdfontset.h>
 

lib/rdframe.cpp

@@ -0,0 +1,34 @@
+// rdframe.cpp
+//
+// Base class for Rivendell modal widgets.
+//
+//   (C) Copyright 2019 Fred Gleason <fredg@paravelsystems.com>
+//
+//   This program is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU General Public License version 2 as
+//   published by the Free Software Foundation.
+//
+//   This program is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU General Public License for more details.
+//
+//   You should have received a copy of the GNU General Public
+//   License along with this program; if not, write to the Free Software
+//   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//
+
+#include "rdframe.h"
+
+RDFrame::RDFrame(QWidget *parent,Qt::WindowFlags f)
+  : QFrame(parent,f), RDFontSet(font())
+{
+  setFont(defaultFont());
+}
+
+
+RDFrame::RDFrame(RDConfig *config,QWidget *parent,Qt::WindowFlags f)
+  : QFrame(parent,f), RDFontSet(font(),config)
+{
+  setFont(defaultFont());
+}

lib/rdframe.h

@@ -0,0 +1,37 @@
+// rdframe.h
+//
+// Base class for Rivendell QFrame-based widgets.
+//
+//   (C) Copyright 2019 Fred Gleason <fredg@paravelsystems.com>
+//
+//   This program is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU General Public License version 2 as
+//   published by the Free Software Foundation.
+//
+//   This program is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU General Public License for more details.
+//
+//   You should have received a copy of the GNU General Public
+//   License along with this program; if not, write to the Free Software
+//   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//
+
+#ifndef RDFRAME_H
+#define RDFRAME_H
+
+#include <qwidget.h>
+
+#include <rdfontset.h>
+
+class RDFrame : public QFrame, public RDFontSet
+{
+  Q_OBJECT;
+ public:
+  RDFrame(QWidget *parent=0,Qt::WindowFlags f=0);
+  RDFrame(RDConfig *config,QWidget *parent=0,Qt::WindowFlags f=0);
+};
+
+
+#endif  // RDFRAME_H

lib/rdwidget.h

@@ -22,7 +22,6 @@
 #define RDWIDGET_H
 
 #include <qwidget.h>
-#include <qfont.h>
 
 #include <rdfontset.h>