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

* Refactored rdcatch(1) to use the 'RDDialog' and 'RDWidget'
	base classes.
This commit is contained in:
Fred Gleason
2019-10-03 16:20:35 -04:00
parent e63c1a64a9
commit 247a3cd857
27 changed files with 473 additions and 709 deletions

View File

@@ -2,7 +2,7 @@
//
// Edit a Rivendell Macro Cart Event
//
// (C) Copyright 2002-2018 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-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
@@ -18,22 +18,9 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#include <qdialog.h>
#include <qgroupbox.h>
#include <qstring.h>
#include <qpushbutton.h>
#include <q3listbox.h>
#include <q3textedit.h>
#include <qpainter.h>
#include <qevent.h>
#include <qmessagebox.h>
#include <qcheckbox.h>
#include <rdapplication.h>
#include <rd.h>
#include <rdcart_dialog.h>
#include <rdcut_path.h>
#include <rddb.h>
#include <rdescape_string.h>
#include <rdtextvalidator.h>
@@ -41,38 +28,24 @@
#include "globals.h"
EditCartEvent::EditCartEvent(int id,std::vector<int> *adds,QWidget *parent)
: QDialog(parent)
: RDDialog(parent)
{
setModal(true);
QString sql;
RDSqlQuery *q;
QString temp;
int cartnum;
//
// Fix the Window Size
//
setMinimumWidth(sizeHint().width());
setMaximumWidth(sizeHint().width());
setMinimumHeight(sizeHint().height());
setMaximumHeight(sizeHint().height());
//
// Generate Fonts
//
QFont button_font=QFont("Helvetica",12,QFont::Bold);
button_font.setPixelSize(12);
QFont label_font=QFont("Helvetica",12,QFont::Bold);
label_font.setPixelSize(12);
QFont day_font=QFont("Helvetica",10,QFont::Normal);
day_font.setPixelSize(10);
edit_deck=NULL;
edit_added_events=adds;
setWindowTitle("RDCatch - "+tr("Edit Cart Event"));
//
// Fix the Window Size
//
setMinimumSize(sizeHint());
setMaximumSize(sizeHint());
//
// Text Validator
//
@@ -96,7 +69,7 @@ EditCartEvent::EditCartEvent(int id,std::vector<int> *adds,QWidget *parent)
edit_active_button->setGeometry(10,11,20,20);
QLabel *label=new QLabel(edit_active_button,tr("Event Active"),this);
label->setGeometry(30,11,125,20);
label->setFont(label_font);
label->setFont(labelFont());
label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
//
@@ -106,17 +79,18 @@ EditCartEvent::EditCartEvent(int id,std::vector<int> *adds,QWidget *parent)
edit_station_box->setGeometry(200,10,140,23);
label=new QLabel(edit_station_box,tr("Location:"),this);
label->setGeometry(125,10,70,23);
label->setFont(label_font);
label->setFont(labelFont());
label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
//
// Start Time
//
edit_starttime_edit=new Q3TimeEdit(this);
edit_starttime_edit=new QTimeEdit(this);
edit_starttime_edit->setGeometry(sizeHint().width()-90,12,80,20);
edit_starttime_edit->setDisplayFormat("hh:mm:ss");
label=new QLabel(edit_starttime_edit,tr("Start Time:"),this);
label->setGeometry(sizeHint().width()-175,12,80,20);
label->setFont(label_font);
label->setFont(labelFont());
label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
//
@@ -127,7 +101,7 @@ EditCartEvent::EditCartEvent(int id,std::vector<int> *adds,QWidget *parent)
edit_description_edit->setValidator(validator);
label=new QLabel(edit_description_edit,tr("Description:"),this);
label->setGeometry(10,43,100,20);
label->setFont(label_font);
label->setFont(labelFont());
label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
//
@@ -138,11 +112,11 @@ EditCartEvent::EditCartEvent(int id,std::vector<int> *adds,QWidget *parent)
edit_destination_edit->setReadOnly(false);
label=new QLabel(edit_destination_edit,tr("Cart Number:"),this);
label->setGeometry(10,73,100,19);
label->setFont(label_font);
label->setFont(labelFont());
label->setAlignment(Qt::AlignRight);
QPushButton *button=new QPushButton(this);
button->setGeometry(185,68,60,24);
button->setFont(day_font);
button->setFont(subLabelFont());
button->setText(tr("&Select"));
connect(button,SIGNAL(clicked()),this,SLOT(selectCartData()));
@@ -150,7 +124,7 @@ EditCartEvent::EditCartEvent(int id,std::vector<int> *adds,QWidget *parent)
// Button Label
//
QGroupBox *groupbox=new QGroupBox(tr("Active Days"),this);
groupbox->setFont(label_font);
groupbox->setFont(labelFont());
groupbox->setGeometry(10,104,sizeHint().width()-20,62);
//
@@ -160,7 +134,7 @@ EditCartEvent::EditCartEvent(int id,std::vector<int> *adds,QWidget *parent)
edit_mon_button->setGeometry(20,120,20,20);
label=new QLabel(edit_mon_button,tr("Monday"),this);
label->setGeometry(40,120,115,20);
label->setFont(day_font);
label->setFont(subLabelFont());
label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
//
@@ -170,7 +144,7 @@ EditCartEvent::EditCartEvent(int id,std::vector<int> *adds,QWidget *parent)
edit_tue_button->setGeometry(115,120,20,20);
label=new QLabel(edit_tue_button,tr("Tuesday"),this);
label->setGeometry(135,120,115,20);
label->setFont(day_font);
label->setFont(subLabelFont());
label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
//
@@ -180,7 +154,7 @@ EditCartEvent::EditCartEvent(int id,std::vector<int> *adds,QWidget *parent)
edit_wed_button->setGeometry(215,120,20,20);
label=new QLabel(edit_wed_button,tr("Wednesday"),this);
label->setGeometry(235,120,115,20);
label->setFont(day_font);
label->setFont(subLabelFont());
label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
//
@@ -190,7 +164,7 @@ EditCartEvent::EditCartEvent(int id,std::vector<int> *adds,QWidget *parent)
edit_thu_button->setGeometry(335,120,20,20);
label=new QLabel(edit_thu_button,tr("Thursday"),this);
label->setGeometry(355,120,115,20);
label->setFont(day_font);
label->setFont(subLabelFont());
label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
//
@@ -200,7 +174,7 @@ EditCartEvent::EditCartEvent(int id,std::vector<int> *adds,QWidget *parent)
edit_fri_button->setGeometry(440,120,20,20);
label=new QLabel(edit_fri_button,tr("Friday"),this);
label->setGeometry(460,120,40,20);
label->setFont(day_font);
label->setFont(subLabelFont());
label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
//
@@ -210,7 +184,7 @@ EditCartEvent::EditCartEvent(int id,std::vector<int> *adds,QWidget *parent)
edit_sat_button->setGeometry(130,145,20,20);
label=new QLabel(edit_sat_button,tr("Saturday"),this);
label->setGeometry(150,145,60,20);
label->setFont(day_font);
label->setFont(subLabelFont());
label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
//
@@ -220,7 +194,7 @@ EditCartEvent::EditCartEvent(int id,std::vector<int> *adds,QWidget *parent)
edit_sun_button->setGeometry(300,145,20,20);
label=new QLabel(edit_sun_button,tr("Sunday"),this);
label->setGeometry(320,145,60,20);
label->setFont(day_font);
label->setFont(subLabelFont());
label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
//
@@ -230,7 +204,7 @@ EditCartEvent::EditCartEvent(int id,std::vector<int> *adds,QWidget *parent)
edit_oneshot_box->setGeometry(20,180,15,15);
label=new QLabel(edit_oneshot_box,tr("Make OneShot"),this);
label->setGeometry(40,178,115,20);
label->setFont(label_font);
label->setFont(labelFont());
label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
//
@@ -238,7 +212,7 @@ EditCartEvent::EditCartEvent(int id,std::vector<int> *adds,QWidget *parent)
//
button=new QPushButton(this);
button->setGeometry(sizeHint().width()-300,sizeHint().height()-60,80,50);
button->setFont(button_font);
button->setFont(buttonFont());
button->setText(tr("&Save As\nNew"));
connect(button,SIGNAL(clicked()),this,SLOT(saveasData()));
if(adds==NULL) {
@@ -251,7 +225,7 @@ EditCartEvent::EditCartEvent(int id,std::vector<int> *adds,QWidget *parent)
button=new QPushButton(this);
button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50);
button->setDefault(true);
button->setFont(button_font);
button->setFont(buttonFont());
button->setText(tr("&OK"));
connect(button,SIGNAL(clicked()),this,SLOT(okData()));
@@ -260,7 +234,7 @@ EditCartEvent::EditCartEvent(int id,std::vector<int> *adds,QWidget *parent)
//
button=new QPushButton(this);
button->setGeometry(sizeHint().width()-90,sizeHint().height()-60,80,50);
button->setFont(button_font);
button->setFont(buttonFont());
button->setText(tr("&Cancel"));
connect(button,SIGNAL(clicked()),this,SLOT(cancelData()));