diff --git a/ChangeLog b/ChangeLog index 88e68bb6..3da23364 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19190,3 +19190,5 @@ 2019-10-07 Fred Gleason * Refactored rdlogin(1) to use the 'RDDialog' and 'RDWidget' base classes. +2019-10-07 Fred Gleason + * Removed remaining references to 'helvetica' fonts. diff --git a/rdhpi/Makefile.am b/rdhpi/Makefile.am index 8bb0f24f..cf7f74ab 100644 --- a/rdhpi/Makefile.am +++ b/rdhpi/Makefile.am @@ -50,15 +50,13 @@ all: lrelease-qt4 rdhpi.pro lib_LTLIBRARIES = librdhpi.la -dist_librdhpi_la_SOURCES = rdhpicardselector.cpp rdhpicardselector.h\ - rdhpiinformation.cpp rdhpiinformation.h\ +dist_librdhpi_la_SOURCES = rdhpiinformation.cpp rdhpiinformation.h\ rdhpiplaystream.cpp rdhpiplaystream.h\ rdhpirecordstream.cpp rdhpirecordstream.h\ rdhpisoundcard.cpp rdhpisoundcard.h\ rdhpisoundselector.cpp rdhpisoundselector.h -nodist_librdhpi_la_SOURCES = moc_rdhpicardselector.cpp\ - moc_rdhpiplaystream.cpp\ +nodist_librdhpi_la_SOURCES = moc_rdhpiplaystream.cpp\ moc_rdhpirecordstream.cpp\ moc_rdhpisoundcard.cpp\ moc_rdhpisoundselector.cpp diff --git a/rdhpi/rdhpi.pro b/rdhpi/rdhpi.pro index afa84115..9724e50e 100644 --- a/rdhpi/rdhpi.pro +++ b/rdhpi/rdhpi.pro @@ -24,14 +24,12 @@ # purely for the sake of i18n support. # -SOURCES += rdhpicardselector.cpp SOURCES += rdhpiinformation.cpp SOURCES += rdhpiplaystream.cpp SOURCES += rdhpirecordstream.cpp SOURCES += rdhpisoundcard.cpp SOURCES += rdhpisoundselector.cpp -HEADERS += rdhpicardselector.h HEADERS += rdhpiinformation.h HEADERS += rdhpiplaystream.h HEADERS += rdhpirecordstream.h diff --git a/rdhpi/rdhpicardselector.cpp b/rdhpi/rdhpicardselector.cpp deleted file mode 100644 index 4ccca604..00000000 --- a/rdhpi/rdhpicardselector.cpp +++ /dev/null @@ -1,172 +0,0 @@ -// rdhpicardselector.cpp -// -// Audio card selector widget for Rivendell -// -// (C) Copyright 2002-2016 Fred Gleason -// -// 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 -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include - - -RDHPICardSelector::RDHPICardSelector(QWidget *parent) - : QWidget(parent) -{ - QFont font; - - yoffset=0; - - // - // Generate Font - // - font=QFont("Helvetica",12,QFont::Bold); - font.setPixelSize(12); - - // - // Title - // - card_title=new QLabel(this); - card_title->setGeometry(0,0,geometry().width(),19); - card_title->setFont(font); - card_title->setAlignment(Qt::AlignHCenter); - card_title->hide(); - - // - // Card - // - card_card_box=new QSpinBox(this); - card_card_box->setGeometry(60,yoffset,50,19); - card_card_box->setSpecialValueText("None"); - card_card_box->setMinValue(-1); - card_card_box->setMaxValue(HPI_MAX_ADAPTERS-1); - card_card_box->setValue(-1); - connect(card_card_box,SIGNAL(valueChanged(int)),this,SLOT(cardData(int))); - card_card_label=new QLabel(card_card_box,"Card:",this); - card_card_label->setGeometry(0,yoffset+2,55,19); - card_card_label->setAlignment(Qt::AlignRight|Qt::TextShowMnemonic); - - // - // Port - // - card_port_box=new QSpinBox(this); - card_port_box->setGeometry(60,yoffset+22,50,19); - card_port_box->setMinValue(0); - card_port_box->setMaxValue(HPI_MAX_NODES-1); - card_port_box->setDisabled(true); - connect(card_port_box,SIGNAL(valueChanged(int)),this,SLOT(portData(int))); - card_port_label=new QLabel(card_port_box,"Port:",this); - card_port_label->setGeometry(0,yoffset+24,55,19); - card_port_label->setAlignment(Qt::AlignRight|Qt::TextShowMnemonic); -} - - -RDHPICardSelector::~RDHPICardSelector() -{ - delete card_title; - delete card_card_box; - delete card_port_box; -} - - -QSize RDHPICardSelector::sizeHint() const -{ - return QSize(110,43+yoffset); -} - - -QSizePolicy RDHPICardSelector::sizePolicy() const -{ - return QSizePolicy(QSizePolicy::Fixed,QSizePolicy::Fixed); -} - - -QString RDHPICardSelector::title() const -{ - return card_title->text(); -} - - -void RDHPICardSelector::setTitle(QString title) -{ - card_title->setText(title); - if(title.isEmpty()) { - yoffset=0; - card_title->hide(); - } - else { - yoffset=22; - card_title->show(); - } - card_card_box->setGeometry(60,yoffset,50,19); - card_card_label->setGeometry(0,yoffset+2,55,19); - card_port_box->setGeometry(60,yoffset+22,50,19); - card_port_label->setGeometry(0,yoffset+24,55,19); -} - - -int RDHPICardSelector::card() const -{ - return card_card_box->value(); -} - - -void RDHPICardSelector::setCard(int card) -{ - card_card_box->setValue(card); -} - - -int RDHPICardSelector::port() const -{ - return card_port_box->value(); -} - - -void RDHPICardSelector::setPort(int port) -{ - card_port_box->setValue(port); -} - - -void RDHPICardSelector::cardData(int card) -{ - if(card>=0) { - card_port_box->setEnabled(true); - } - else { - card_port_box->setDisabled(true); - } - emit cardChanged(card); -} - - -void RDHPICardSelector::portData(int port) -{ - emit portChanged(port); -} - diff --git a/rdhpi/rdhpicardselector.h b/rdhpi/rdhpicardselector.h deleted file mode 100644 index 50d2bb94..00000000 --- a/rdhpi/rdhpicardselector.h +++ /dev/null @@ -1,62 +0,0 @@ -// rdhpicardselector.h -// -// Audio Card Selector Widget -// -// (C) Copyright 2002-2007,2016 Fred Gleason -// -// 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 RDHPICARDSELECTOR_H -#define RDHPICARDSELECTOR_H - -#include -#include -#include - - -class RDHPICardSelector : public QWidget -{ - Q_OBJECT - public: - RDHPICardSelector(QWidget *parent=0); - ~RDHPICardSelector(); - QSize sizeHint() const; - QSizePolicy sizePolicy() const; - QString title() const; - void setTitle(QString title); - int card() const; - void setCard(int card); - int port() const; - void setPort(int port); - - signals: - void cardChanged(int card); - void portChanged(int port); - - private slots: - void cardData(int); - void portData(int); - - private: - QLabel *card_card_label; - QSpinBox *card_card_box; - QLabel *card_port_label; - QSpinBox *card_port_box; - QLabel *card_title; - int yoffset; -}; - - -#endif // RDHPICARDSELECTOR_H diff --git a/rdlibrary/edit_notes.cpp b/rdlibrary/edit_notes.cpp index cdcb03bd..73c567f8 100644 --- a/rdlibrary/edit_notes.cpp +++ b/rdlibrary/edit_notes.cpp @@ -2,7 +2,7 @@ // // Edit Cart Notes. // -// (C) Copyright 2009-2018 Fred Gleason +// (C) Copyright 2009-2019 Fred Gleason // // 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,36 +18,24 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#include -#include - #include "edit_notes.h" EditNotes::EditNotes(RDCart *cart,QWidget *parent) - : QDialog(parent) + : RDDialog(parent) { - setModal(true); - notes_cart=cart; setWindowTitle("RDLibrary - "+tr("Notes for cart")+ QString().sprintf(" %06u [",cart->number())+cart->title()+"]"); - // - // Create Fonts - // - QFont button_font=QFont("helvetica",12,QFont::Bold); - button_font.setPixelSize(12); - // // Fix the Window Size // - setMinimumWidth(sizeHint().width()); - setMinimumHeight(sizeHint().height()); + setMinimumSize(sizeHint()); // // Variable Name // - notes_view=new Q3TextView(this); + notes_view=new QTextEdit(this); notes_view->setTextFormat(Qt::PlainText); notes_view->setReadOnly(false); @@ -56,7 +44,7 @@ EditNotes::EditNotes(RDCart *cart,QWidget *parent) // notes_ok_button=new QPushButton(this); notes_ok_button->setDefault(true); - notes_ok_button->setFont(button_font); + notes_ok_button->setFont(buttonFont()); notes_ok_button->setText(tr("&OK")); notes_ok_button->setDefault(true); connect(notes_ok_button,SIGNAL(clicked()),this,SLOT(okData())); @@ -65,7 +53,7 @@ EditNotes::EditNotes(RDCart *cart,QWidget *parent) // Cancel Button // notes_cancel_button=new QPushButton(this); - notes_cancel_button->setFont(button_font); + notes_cancel_button->setFont(buttonFont()); notes_cancel_button->setText(tr("&Cancel")); connect(notes_cancel_button,SIGNAL(clicked()),this,SLOT(cancelData())); diff --git a/rdlibrary/edit_notes.h b/rdlibrary/edit_notes.h index 87e6fbdb..e785e00f 100644 --- a/rdlibrary/edit_notes.h +++ b/rdlibrary/edit_notes.h @@ -2,7 +2,7 @@ // // Edit Cart Notes. // -// (C) Copyright 2009-2018 Fred Gleason +// (C) Copyright 2009-2019 Fred Gleason // // 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 @@ -21,14 +21,13 @@ #ifndef EDIT_NOTES_H #define EDIT_NOTES_H -#include -#include #include -#include +#include #include +#include -class EditNotes : public QDialog +class EditNotes : public RDDialog { Q_OBJECT public: @@ -44,7 +43,7 @@ class EditNotes : public QDialog void cancelData(); private: - Q3TextView *notes_view; + QTextEdit *notes_view; QPushButton *notes_ok_button; QPushButton *notes_cancel_button; RDCart *notes_cart; diff --git a/rdlogedit/render_dialog.cpp b/rdlogedit/render_dialog.cpp index 1a95ab20..93d83cfa 100644 --- a/rdlogedit/render_dialog.cpp +++ b/rdlogedit/render_dialog.cpp @@ -2,7 +2,7 @@ // // Render Log Dialog for Rivendell. // -// (C) Copyright 2017-2018 Fred Gleason +// (C) Copyright 2017-2019 Fred Gleason // // 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,18 +18,12 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#include -#include -#include -#include -#include -#include -#include +#include + #include #include #include -#include #include #include #include @@ -38,11 +32,8 @@ RenderDialog::RenderDialog(RDStation *station,RDSystem *system,RDConfig *config, QWidget *parent) - - : QDialog(parent) + : RDDialog(parent) { - setModal(true); - render_station=station; render_system=system; render_config=config; @@ -52,23 +43,18 @@ RenderDialog::RenderDialog(RDStation *station,RDSystem *system,RDConfig *config, setWindowTitle("RDLogEdit - "+tr("Render Log")); - QFont button_font("helvetica",12,QFont::Bold); - button_font.setPixelSize(12); - // // Fix the Window Size // - setMinimumWidth(sizeHint().width()); - setMaximumWidth(sizeHint().width()); - setMinimumHeight(sizeHint().height()); - setMaximumHeight(sizeHint().height()); + setMinimumSize(sizeHint()); + setMaximumSize(sizeHint()); // // Dialogs // render_progress_dialog= new Q3ProgressDialog(tr("Rendering Log..."),tr("Cancel"),0,this,"",true); - render_progress_dialog->setCaption("RDLogEdit - "+tr("Render Progress")); + render_progress_dialog->setWindowTitle("RDLogEdit - "+tr("Render Progress")); // // Settings @@ -90,7 +76,7 @@ RenderDialog::RenderDialog(RDStation *station,RDSystem *system,RDConfig *config, render_to_box->insertItem(tr("File")); connect(render_to_box,SIGNAL(activated(int)),this,SLOT(toChangedData(int))); render_to_label=new QLabel(tr("Render To")+":",this); - render_to_label->setFont(button_font); + render_to_label->setFont(labelFont()); render_to_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // @@ -101,7 +87,7 @@ RenderDialog::RenderDialog(RDStation *station,RDSystem *system,RDConfig *config, connect(render_filename_edit,SIGNAL(textChanged(const QString &)), this,SLOT(filenameChangedData(const QString &))); render_filename_label=new QLabel(tr("Cart/Cut")+":",this); - render_filename_label->setFont(button_font); + render_filename_label->setFont(labelFont()); render_filename_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); render_filename_button=new QPushButton(tr("Select"),this); connect(render_filename_button,SIGNAL(clicked()),this,SLOT(selectData())); @@ -113,7 +99,7 @@ RenderDialog::RenderDialog(RDStation *station,RDSystem *system,RDConfig *config, render_audiosettings_edit->setReadOnly(true); render_audiosettings_edit->setText(render_settings->description()); render_audiosettings_label=new QLabel(tr("Audio Parameters")+":",this); - render_audiosettings_label->setFont(button_font); + render_audiosettings_label->setFont(labelFont()); render_audiosettings_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); render_audiosettings_button=new QPushButton(tr("Set"),this); connect(render_audiosettings_button,SIGNAL(clicked()), @@ -128,9 +114,10 @@ RenderDialog::RenderDialog(RDStation *station,RDSystem *system,RDConfig *config, connect(render_starttime_box,SIGNAL(activated(int)), this,SLOT(starttimeSourceData(int))); render_starttime_label=new QLabel(tr("Virtual Start Time")+":",this); - render_starttime_label->setFont(button_font); + render_starttime_label->setFont(labelFont()); render_starttime_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); - render_starttime_edit=new Q3TimeEdit(this); + render_starttime_edit=new QTimeEdit(this); + render_starttime_edit->setDisplayFormat("hh:mm:ss"); render_starttime_edit->setDisabled(true); // @@ -140,7 +127,7 @@ RenderDialog::RenderDialog(RDStation *station,RDSystem *system,RDConfig *config, render_events_box->insertItem(tr("All Events")); render_events_box->insertItem(tr("Only Selected Events")); render_events_label=new QLabel(tr("Include")+":",this); - render_events_label->setFont(button_font); + render_events_label->setFont(labelFont()); render_events_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // @@ -150,7 +137,7 @@ RenderDialog::RenderDialog(RDStation *station,RDSystem *system,RDConfig *config, render_ignorestop_box->insertItem(tr("Stop Rendering")); render_ignorestop_box->insertItem(tr("Treat as PLAY")); render_ignorestop_label=new QLabel(tr("At STOP transition")+":",this); - render_ignorestop_label->setFont(button_font); + render_ignorestop_label->setFont(labelFont()); render_ignorestop_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // @@ -159,7 +146,7 @@ RenderDialog::RenderDialog(RDStation *station,RDSystem *system,RDConfig *config, render_render_button=new QPushButton(tr("&Render"),this); render_render_button-> setGeometry(sizeHint().width()-90,sizeHint().height()-60,80,50); - render_render_button->setFont(button_font); + render_render_button->setFont(buttonFont()); render_render_button->setDefault(true); connect(render_render_button,SIGNAL(clicked()),this,SLOT(renderData())); @@ -169,7 +156,7 @@ RenderDialog::RenderDialog(RDStation *station,RDSystem *system,RDConfig *config, render_cancel_button=new QPushButton(tr("&Cancel"),this); render_cancel_button-> setGeometry(sizeHint().width()-90,sizeHint().height()-60,80,50); - render_cancel_button->setFont(button_font); + render_cancel_button->setFont(buttonFont()); render_cancel_button->setDefault(true); connect(render_cancel_button,SIGNAL(clicked()),this,SLOT(cancelData())); } @@ -227,8 +214,8 @@ void RenderDialog::selectData() { if(render_to_box->currentItem()) { QString filename= - Q3FileDialog::getSaveFileName(render_save_path,RD_AUDIO_FILE_FILTER, - this,"","RDLogEdit - "+tr("Render Log")); + QFileDialog::getSaveFileName(this,"RDLogEdit - "+tr("Render Log"), + render_save_path,RD_AUDIO_FILE_FILTER); if(!filename.isEmpty()) { render_filename_edit->setText(filename); filenameChangedData(filename); @@ -258,7 +245,7 @@ void RenderDialog::starttimeSourceData(int item) void RenderDialog::audiosettingsData() { - RDExportSettingsDialog *d=new RDExportSettingsDialog(render_settings); + RDExportSettingsDialog *d=new RDExportSettingsDialog(render_settings,this); if(d->exec()==0) { render_audiosettings_edit->setText(render_settings->description()); } diff --git a/rdlogedit/render_dialog.h b/rdlogedit/render_dialog.h index 6edcd114..8366f44f 100644 --- a/rdlogedit/render_dialog.h +++ b/rdlogedit/render_dialog.h @@ -2,7 +2,7 @@ // // Log Rendering Dialog for Rivendell. // -// (C) Copyright 2017-2018 Fred Gleason +// (C) Copyright 2017-2019 Fred Gleason // // 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 @@ -21,21 +21,11 @@ #ifndef RENDER_DIALOG_H #define RENDER_DIALOG_H -#include -#include -#include -#include -#include -#include -#include +#include -#include -#include #include -#include +#include #include -#include -#include // // Widget Settings @@ -43,7 +33,7 @@ #define IMPORT_BAR_INTERVAL 500 #define IMPORT_TEMP_BASENAME "rdlib" -class RenderDialog : public QDialog +class RenderDialog : public RDDialog { Q_OBJECT public: @@ -84,7 +74,7 @@ class RenderDialog : public QDialog QLineEdit *render_filename_edit; QLabel *render_starttime_label; QComboBox *render_starttime_box; - Q3TimeEdit *render_starttime_edit; + QTimeEdit *render_starttime_edit; QLabel *render_audiosettings_label; QLineEdit *render_audiosettings_edit; QPushButton *render_audiosettings_button; diff --git a/rdmonitor/positiondialog.cpp b/rdmonitor/positiondialog.cpp index 1d59a72a..dd152f5d 100644 --- a/rdmonitor/positiondialog.cpp +++ b/rdmonitor/positiondialog.cpp @@ -2,7 +2,7 @@ // // Dialog to set RDMonitor screen position. // -// (C) Copyright 2013-2018 Fred Gleason +// (C) Copyright 2013-2019 Fred Gleason // // 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 @@ -20,44 +20,31 @@ #include "positiondialog.h" -PositionDialog::PositionDialog(QDesktopWidget *dw,RDMonitorConfig *config, - QWidget *parent) - : QDialog(parent) +PositionDialog::PositionDialog(QDesktopWidget *dw,RDMonitorConfig *mconfig, + RDConfig *config,QWidget *parent) + : RDDialog(config,parent) { - setModal(true); pos_desktop_widget=dw; - pos_config=config; + pos_config=mconfig; setWindowTitle("RDMonitor"); - // - // Fonts - // - QFont button_font("helvetica",12,QFont::Bold); - button_font.setPixelSize(12); - - QFont list_font("helvetica",12,QFont::Normal); - list_font.setPixelSize(12); - // // Screen Number // pos_screen_number_box=new QComboBox(this); - pos_screen_number_box->setFont(list_font); pos_screen_number_label= new QLabel(pos_screen_number_box,tr("Screen")+":",this); - pos_screen_number_label->setFont(button_font); + pos_screen_number_label->setFont(labelFont()); pos_screen_number_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Position // pos_position_box=new QComboBox(this); - pos_position_box->setFont(list_font); - pos_position_box->setFont(list_font); pos_position_label= new QLabel(pos_position_box,tr("Position")+":",this); - pos_position_label->setFont(button_font); + pos_position_label->setFont(labelFont()); pos_position_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); for(int i=0;i @@ -68,34 +55,32 @@ PositionDialog::PositionDialog(QDesktopWidget *dw,RDMonitorConfig *config, // X Offset // pos_x_offset_spin=new QSpinBox(this); - pos_x_offset_spin->setFont(list_font); pos_x_offset_spin->setRange(0,99); pos_x_offset_label=new QLabel(pos_x_offset_spin,tr("X Offset")+":",this); - pos_x_offset_label->setFont(button_font); + pos_x_offset_label->setFont(labelFont()); pos_x_offset_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Y Offset // pos_y_offset_spin=new QSpinBox(this); - pos_y_offset_spin->setFont(list_font); pos_y_offset_spin->setRange(0,99); pos_y_offset_label=new QLabel(pos_y_offset_spin,tr("Y Offset")+":",this); - pos_y_offset_label->setFont(button_font); + pos_y_offset_label->setFont(labelFont()); pos_y_offset_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // OK Button // pos_ok_button=new QPushButton(tr("OK"),this); - pos_ok_button->setFont(button_font); + pos_ok_button->setFont(buttonFont()); connect(pos_ok_button,SIGNAL(clicked()),this,SLOT(okData())); // // Cancel Button // pos_cancel_button=new QPushButton(tr("Cancel"),this); - pos_cancel_button->setFont(button_font); + pos_cancel_button->setFont(buttonFont()); connect(pos_cancel_button,SIGNAL(clicked()),this,SLOT(cancelData())); setMaximumSize(sizeHint()); diff --git a/rdmonitor/positiondialog.h b/rdmonitor/positiondialog.h index 33e352ad..49b7212d 100644 --- a/rdmonitor/positiondialog.h +++ b/rdmonitor/positiondialog.h @@ -2,7 +2,7 @@ // // Dialog to set RDMonitor screen position. // -// (C) Copyright 2013-2018 Fred Gleason +// (C) Copyright 2013-2019 Fred Gleason // // 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 @@ -23,18 +23,19 @@ #include #include -#include #include #include #include +#include #include -class PositionDialog : public QDialog +class PositionDialog : public RDDialog { Q_OBJECT public: - PositionDialog(QDesktopWidget *dw,RDMonitorConfig *config,QWidget *parent=0); + PositionDialog(QDesktopWidget *dw,RDMonitorConfig *mconfig,RDConfig *config, + QWidget *parent=0); QSize sizeHint() const; QSizePolicy sizePolicy() const; diff --git a/rdmonitor/rdmonitor.cpp b/rdmonitor/rdmonitor.cpp index 86c1f796..c62051c1 100644 --- a/rdmonitor/rdmonitor.cpp +++ b/rdmonitor/rdmonitor.cpp @@ -89,7 +89,8 @@ MainWidget::MainWidget(RDConfig *c,QWidget *parent) mon_desktop_widget=new QDesktopWidget(); mon_config=new RDMonitorConfig(); mon_config->load(); - mon_position_dialog=new PositionDialog(mon_desktop_widget,mon_config,this); + mon_position_dialog=new PositionDialog(mon_desktop_widget,mon_config, + mon_rdconfig,this); mon_position_dialog->setGeometry(0,0,mon_position_dialog->sizeHint().width(), mon_position_dialog->sizeHint().height()); diff --git a/utils/rddgimport/rddgimport.cpp b/utils/rddgimport/rddgimport.cpp index 5f7ef649..342d7fa7 100644 --- a/utils/rddgimport/rddgimport.cpp +++ b/utils/rddgimport/rddgimport.cpp @@ -2,7 +2,7 @@ // // A Qt-based application for importing Dial Global CDN downloads // -// (C) Copyright 2012-2018 Fred Gleason +// (C) Copyright 2012-2019 Fred Gleason // // 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,28 +18,19 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#include -#include #include +#include + #include -#include -#include -#include #include #include -#include -#include -#include #include -#include #include -#include #include #include #include -#include #include "rddgimport.h" @@ -48,8 +39,8 @@ // #include "../../icons/rivendell-22x22.xpm" -MainWidget::MainWidget(QWidget *parent) - : QWidget(parent) +MainWidget::MainWidget(RDConfig *c,QWidget *parent) + : RDWidget(c,parent) { QString sql; RDSqlQuery *q; @@ -87,20 +78,10 @@ MainWidget::MainWidget(QWidget *parent) // // Set Window Size // - setMinimumWidth(sizeHint().width()); - setMinimumHeight(sizeHint().height()); + setMinimumSize(sizeHint()); SetCaption(); - // - // Fonts - // - QFont main_font("helvetica",12,QFont::Normal); - main_font.setPixelSize(12); - setFont(main_font); - QFont label_font("helvetica",12,QFont::Bold); - label_font.setPixelSize(12); - // // Configuration Elements // @@ -114,7 +95,7 @@ MainWidget::MainWidget(QWidget *parent) connect(dg_service_box,SIGNAL(activated(int)), this,SLOT(serviceActivatedData(int))); dg_service_label=new QLabel(dg_service_box,tr("Service:"),this); - dg_service_label->setFont(label_font); + dg_service_label->setFont(labelFont()); dg_service_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // @@ -124,10 +105,10 @@ MainWidget::MainWidget(QWidget *parent) connect(dg_filename_edit,SIGNAL(textChanged(const QString &)), this,SLOT(filenameChangedData(const QString &))); dg_filename_label=new QLabel(dg_filename_edit,tr("Filename:"),this); - dg_filename_label->setFont(label_font); + dg_filename_label->setFont(labelFont()); dg_filename_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); dg_filename_button=new QPushButton(tr("Select"),this); - dg_filename_button->setFont(main_font); + dg_filename_button->setFont(subButtonFont()); connect(dg_filename_button,SIGNAL(clicked()), this,SLOT(filenameSelectedData())); @@ -137,10 +118,10 @@ MainWidget::MainWidget(QWidget *parent) dg_date_edit=new Q3DateEdit(this); dg_date_edit->setDate(QDate::currentDate()); dg_date_label=new QLabel(dg_date_edit,tr("Date:"),this); - dg_date_label->setFont(label_font); + dg_date_label->setFont(labelFont()); dg_date_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); dg_date_button=new QPushButton(tr("Select"),this); - dg_date_button->setFont(main_font); + dg_date_button->setFont(subButtonFont()); connect(dg_date_button,SIGNAL(clicked()), this,SLOT(dateSelectedData())); @@ -156,14 +137,14 @@ MainWidget::MainWidget(QWidget *parent) dg_messages_text=new Q3TextEdit(this); dg_messages_text->setReadOnly(true); dg_messages_label=new QLabel(dg_service_box,tr("Messages"),this); - dg_messages_label->setFont(label_font); + dg_messages_label->setFont(labelFont()); dg_messages_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Process Button // dg_process_button=new QPushButton(tr("Process"),this); - dg_process_button->setFont(label_font); + dg_process_button->setFont(buttonFont()); dg_process_button->setDisabled(true); connect(dg_process_button,SIGNAL(clicked()),this,SLOT(processData())); @@ -171,7 +152,7 @@ MainWidget::MainWidget(QWidget *parent) // Close Button // dg_close_button=new QPushButton(tr("Close"),this); - dg_close_button->setFont(label_font); + dg_close_button->setFont(buttonFont()); connect(dg_close_button,SIGNAL(clicked()),this,SLOT(quitMainWidget())); // @@ -226,8 +207,9 @@ void MainWidget::filenameSelectedData() filename=RDGetHomeDir(); } filename= - Q3FileDialog::getOpenFileName(filename,tr("Text Files")+" (*.txt *.TXT);;"+ - tr("All Files")+" (*.*)",this); + QFileDialog::getOpenFileName(this,"RDDgImport - "+tr("Open File"),filename, + tr("Text Files")+" (*.txt *.TXT);;"+ + tr("All Files")+" (*.*)"); if(!filename.isEmpty()) { dg_filename_edit->setText(filename); filenameChangedData(filename); @@ -664,7 +646,9 @@ int main(int argc,char *argv[]) // // Start Event Loop // - MainWidget *w=new MainWidget(); + RDConfig *config=new RDConfig(); + config->load(); + MainWidget *w=new MainWidget(config); a.setMainWidget(w); w->setGeometry(QRect(QPoint(0,0),w->sizeHint())); w->show(); diff --git a/utils/rddgimport/rddgimport.h b/utils/rddgimport/rddgimport.h index 8309e30c..b811d9ea 100644 --- a/utils/rddgimport/rddgimport.h +++ b/utils/rddgimport/rddgimport.h @@ -2,7 +2,7 @@ // // A Qt-based application for importing Dial Global CDN downloads // -// (C) Copyright 2012-2018 Fred Gleason +// (C) Copyright 2012-2019 Fred Gleason // // 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 @@ -21,24 +21,17 @@ #ifndef RDDGIMPORT_H #define RDDGIMPORT_H -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include #include #include +#include +#include +#include + #include -#include #include #include +#include #include "event.h" @@ -46,11 +39,11 @@ #define RDDGIMPORT_KILLDATE_OFFSET 7 #define RDDGIMPORT_FILE_EXTENSION "mp3" -class MainWidget : public QWidget +class MainWidget : public RDWidget { Q_OBJECT public: - MainWidget(QWidget *parent=0); + MainWidget(RDConfig *c,QWidget *parent=0); QSize sizeHint() const; private slots: diff --git a/utils/rddgimport/rddgimport_de.ts b/utils/rddgimport/rddgimport_de.ts index dae7d8a8..9803838f 100644 --- a/utils/rddgimport/rddgimport_de.ts +++ b/utils/rddgimport/rddgimport_de.ts @@ -99,5 +99,9 @@ Unknown command option + + Open File + + diff --git a/utils/rddgimport/rddgimport_es.ts b/utils/rddgimport/rddgimport_es.ts index dae7d8a8..9803838f 100644 --- a/utils/rddgimport/rddgimport_es.ts +++ b/utils/rddgimport/rddgimport_es.ts @@ -99,5 +99,9 @@ Unknown command option + + Open File + + diff --git a/utils/rddgimport/rddgimport_fr.ts b/utils/rddgimport/rddgimport_fr.ts index dae7d8a8..9803838f 100644 --- a/utils/rddgimport/rddgimport_fr.ts +++ b/utils/rddgimport/rddgimport_fr.ts @@ -99,5 +99,9 @@ Unknown command option + + Open File + + diff --git a/utils/rddgimport/rddgimport_nb.ts b/utils/rddgimport/rddgimport_nb.ts index dae7d8a8..9803838f 100644 --- a/utils/rddgimport/rddgimport_nb.ts +++ b/utils/rddgimport/rddgimport_nb.ts @@ -99,5 +99,9 @@ Unknown command option + + Open File + + diff --git a/utils/rddgimport/rddgimport_nn.ts b/utils/rddgimport/rddgimport_nn.ts index dae7d8a8..9803838f 100644 --- a/utils/rddgimport/rddgimport_nn.ts +++ b/utils/rddgimport/rddgimport_nn.ts @@ -99,5 +99,9 @@ Unknown command option + + Open File + + diff --git a/utils/rddgimport/rddgimport_pt_BR.ts b/utils/rddgimport/rddgimport_pt_BR.ts index dae7d8a8..9803838f 100644 --- a/utils/rddgimport/rddgimport_pt_BR.ts +++ b/utils/rddgimport/rddgimport_pt_BR.ts @@ -99,5 +99,9 @@ Unknown command option + + Open File + + diff --git a/utils/rddiscimport/rddiscimport.cpp b/utils/rddiscimport/rddiscimport.cpp index df4191d3..65fd6da4 100644 --- a/utils/rddiscimport/rddiscimport.cpp +++ b/utils/rddiscimport/rddiscimport.cpp @@ -2,7 +2,7 @@ // // A Qt-based application for importing TM Century GoldDisc CDs // -// (C) Copyright 2013,2016-2018 Fred Gleason +// (C) Copyright 2013-2019 Fred Gleason // // 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,39 +18,21 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#include -#include -#include +#include #include -#include -#include -#include #include -#include -#include -//Added by qt3to4: -#include -#include -#include +#include -#include -#include -#include #include -#include -#include -#include -#include -#include #include #include #include #include "rddiscimport.h" -MainWidget::MainWidget(QWidget *parent) - : QWidget(parent) +MainWidget::MainWidget(RDConfig *c,QWidget *parent) + : RDWidget(c,parent) { QString err_msg; @@ -81,8 +63,7 @@ MainWidget::MainWidget(QWidget *parent) // // Set Window Size // - setMinimumWidth(sizeHint().width()); - setMinimumHeight(sizeHint().height()); + setMinimumSize(sizeHint()); SetCaption(); @@ -91,16 +72,6 @@ MainWidget::MainWidget(QWidget *parent) // dg_tempfile=RDTempFile(); - // - // Fonts - // - QFont main_font("helvetica",12,QFont::Normal); - main_font.setPixelSize(12); - setFont(main_font); - QFont label_font("helvetica",12,QFont::Bold); - label_font.setPixelSize(12); - setFont(main_font); - // // Configuration Elements // @@ -131,10 +102,10 @@ MainWidget::MainWidget(QWidget *parent) // dg_indexfile_edit=new QLineEdit(this); dg_indexfile_label=new QLabel(dg_indexfile_edit,tr("Index File")+":",this); - dg_indexfile_label->setFont(label_font); + dg_indexfile_label->setFont(labelFont()); dg_indexfile_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); dg_indexfile_button=new QPushButton(tr("Select"),this); - dg_indexfile_button->setFont(main_font); + dg_indexfile_button->setFont(buttonFont()); connect(dg_indexfile_button,SIGNAL(clicked()), this,SLOT(indexFileSelectedData())); @@ -143,7 +114,7 @@ MainWidget::MainWidget(QWidget *parent) // dg_group_box=new QComboBox(this); dg_group_label=new QLabel(dg_group_box,tr("Destination Group")+":",this); - dg_group_label->setFont(label_font); + dg_group_label->setFont(labelFont()); dg_group_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); connect(dg_group_box,SIGNAL(activated(int)), this,SLOT(groupActivatedData(int))); @@ -153,7 +124,7 @@ MainWidget::MainWidget(QWidget *parent) // dg_userdef_edit=new QLineEdit(this); dg_userdef_label=new QLabel(dg_userdef_edit,tr("User Defined")+":",this); - dg_userdef_label->setFont(label_font); + dg_userdef_label->setFont(labelFont()); dg_userdef_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // @@ -185,13 +156,13 @@ MainWidget::MainWidget(QWidget *parent) // Progress Bars // dg_disc_label=new QLabel(tr("Disk Progress"),this); - dg_disc_label->setFont(label_font); + dg_disc_label->setFont(labelFont()); dg_disc_label->setDisabled(true); dg_disc_bar=new Q3ProgressBar(this); dg_disc_bar->setDisabled(true); dg_track_label=new QLabel(tr("Track Progress"),this); - dg_track_label->setFont(label_font); + dg_track_label->setFont(labelFont()); dg_track_label->setDisabled(true); dg_track_bar=new Q3ProgressBar(this); dg_track_bar->setTotalSteps(dg_ripper->totalSteps()+1); @@ -204,7 +175,7 @@ MainWidget::MainWidget(QWidget *parent) // dg_discid_edit=new QLineEdit(this); dg_discid_label=new QLabel(dg_discid_edit,tr("Disc ID")+":",this); - dg_discid_label->setFont(label_font); + dg_discid_label->setFont(labelFont()); dg_discid_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); connect(dg_discid_edit,SIGNAL(textChanged(const QString &)), this,SLOT(discIdChangedData(const QString &))); @@ -213,7 +184,7 @@ MainWidget::MainWidget(QWidget *parent) // Rip Button // dg_rip_button=new QPushButton(tr("Rip Disc"),this); - dg_rip_button->setFont(label_font); + dg_rip_button->setFont(buttonFont()); connect(dg_rip_button,SIGNAL(clicked()),this,SLOT(ripData())); // @@ -224,15 +195,15 @@ MainWidget::MainWidget(QWidget *parent) dg_channels_box->insertItem("2"); dg_channels_box->setCurrentItem(rda->libraryConf()->defaultChannels()-1); dg_channels_label=new QLabel(dg_channels_box,tr("Channels")+":",this); - dg_channels_label->setFont(label_font); + dg_channels_label->setFont(labelFont()); dg_channels_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Autotrim Check Box // dg_autotrim_box=new QCheckBox(tr("Autotrim"),this); + dg_autotrim_box->setFont(labelFont()); dg_autotrim_box->setChecked(true); - dg_autotrim_box->setFont(label_font); dg_autotrim_box->setChecked(rda->libraryConf()->trimThreshold()!=0); connect(dg_autotrim_box,SIGNAL(toggled(bool)), this,SLOT(autotrimCheckData(bool))); @@ -244,18 +215,18 @@ MainWidget::MainWidget(QWidget *parent) dg_autotrim_spin->setRange(-99,0); dg_autotrim_spin->setValue(rda->libraryConf()->trimThreshold()/100); dg_autotrim_label=new QLabel(dg_autotrim_spin,tr("Level")+":",this); - dg_autotrim_label->setFont(label_font); + dg_autotrim_label->setFont(labelFont()); dg_autotrim_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); dg_autotrim_unit=new QLabel(tr("dBFS"),this); - dg_autotrim_unit->setFont(label_font); + dg_autotrim_unit->setFont(labelFont()); dg_autotrim_unit->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Normalize Check Box // dg_normalize_box=new QCheckBox(tr("Normalize"),this); + dg_normalize_box->setFont(labelFont()); dg_normalize_box->setChecked(true); - dg_normalize_box->setFont(label_font); dg_normalize_box->setChecked(rda->libraryConf()->ripperLevel()!=0); connect(dg_normalize_box,SIGNAL(toggled(bool)), this,SLOT(normalizeCheckData(bool))); @@ -267,10 +238,10 @@ MainWidget::MainWidget(QWidget *parent) dg_normalize_spin->setRange(-30,0); dg_normalize_spin->setValue(rda->libraryConf()->ripperLevel()/100); dg_normalize_label=new QLabel(dg_normalize_spin,tr("Level:"),this); - dg_normalize_label->setFont(label_font); + dg_normalize_label->setFont(labelFont()); dg_normalize_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); dg_normalize_unit=new QLabel(tr("dBFS"),this); - dg_normalize_unit->setFont(label_font); + dg_normalize_unit->setFont(labelFont()); dg_normalize_unit->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // @@ -283,7 +254,7 @@ MainWidget::MainWidget(QWidget *parent) // Close Button // dg_close_button=new QPushButton(tr("Close"),this); - dg_close_button->setFont(label_font); + dg_close_button->setFont(buttonFont()); connect(dg_close_button,SIGNAL(clicked()),this,SLOT(quitMainWidget())); LoadConfig(); @@ -738,7 +709,9 @@ int main(int argc,char *argv[]) // // Start Event Loop // - MainWidget *w=new MainWidget(); + RDConfig *config=new RDConfig(); + config->load(); + MainWidget *w=new MainWidget(config); a.setMainWidget(w); w->setGeometry(QRect(QPoint(0,0),w->sizeHint())); w->show(); diff --git a/utils/rddiscimport/rddiscimport.h b/utils/rddiscimport/rddiscimport.h index d454e53e..8401c477 100644 --- a/utils/rddiscimport/rddiscimport.h +++ b/utils/rddiscimport/rddiscimport.h @@ -2,7 +2,7 @@ // // A Qt-based application for importing TM Century GoldDisc CDs // -// (C) Copyright 2013,2016-2018 Fred Gleason +// (C) Copyright 2013-2019 Fred Gleason // // 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 @@ -21,40 +21,31 @@ #ifndef RDDISCIMPORT_H #define RDDISCIMPORT_H -#include -#include +#include #include -#include -#include -#include #include #include #include -#include #include -#include -//Added by qt3to4: -#include #include #include #include -#include -#include #include #include #include +#include -#include +#include "metalibrary.h" #define RDDISCIMPORT_USAGE "\n" -class MainWidget : public QWidget +class MainWidget : public RDWidget { Q_OBJECT public: - MainWidget(QWidget *parent=0); + MainWidget(RDConfig *c,QWidget *parent=0); QSize sizeHint() const; private slots: