diff --git a/ChangeLog b/ChangeLog index 71dcc774..b13a3d5f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21032,3 +21032,6 @@ * Removed 'Q3SocketDevice' dependencies from rdsoftkeys(1). 2021-02-06 Fred Gleason * Removed 'Q3TextStream' dependencies from 'RDProfile'. +2021-02-06 Fred Gleason + * Removed 'Q3DateEdit' dependencies from rddgimport(1). + * Removed 'Q3TextEdit' dependencies from rddgimport(1). diff --git a/utils/rddgimport/rddgimport.cpp b/utils/rddgimport/rddgimport.cpp index 342d7fa7..a8cf8c4c 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-2019 Fred Gleason +// (C) Copyright 2012-2021 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,11 +20,10 @@ #include -#include - -#include -#include -#include +#include +#include +#include +#include #include #include @@ -115,7 +114,8 @@ MainWidget::MainWidget(RDConfig *c,QWidget *parent) // // Date Selector // - dg_date_edit=new Q3DateEdit(this); + dg_date_edit=new QDateEdit(this); + dg_date_edit->setDisplayFormat("MM/dd/yyyy"); dg_date_edit->setDate(QDate::currentDate()); dg_date_label=new QLabel(dg_date_edit,tr("Date:"),this); dg_date_label->setFont(labelFont()); @@ -134,7 +134,7 @@ MainWidget::MainWidget(RDConfig *c,QWidget *parent) // // Messages Area // - dg_messages_text=new Q3TextEdit(this); + dg_messages_text=new QTextEdit(this); dg_messages_text->setReadOnly(true); dg_messages_label=new QLabel(dg_service_box,tr("Messages"),this); dg_messages_label->setFont(labelFont()); @@ -611,7 +611,8 @@ QString MainWidget::GetIsci(const QString &str) const void MainWidget::LogMessage(const QString &str) { dg_messages_text->append(str+"\n"); - dg_messages_text->scrollToBottom(); + dg_messages_text->verticalScrollBar()-> + setValue(dg_messages_text->verticalScrollBar()->maximum()); } diff --git a/utils/rddgimport/rddgimport.h b/utils/rddgimport/rddgimport.h index b811d9ea..8e6290ec 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-2019 Fred Gleason +// (C) Copyright 2012-2021 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,12 +21,13 @@ #ifndef RDDGIMPORT_H #define RDDGIMPORT_H -#include -#include +//#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include @@ -77,10 +78,10 @@ class MainWidget : public RDWidget QLineEdit *dg_filename_edit; QPushButton *dg_filename_button; QLabel *dg_date_label; - Q3DateEdit *dg_date_edit; + QDateEdit *dg_date_edit; QPushButton *dg_date_button; QLabel *dg_messages_label; - Q3TextEdit *dg_messages_text; + QTextEdit *dg_messages_text; RDBusyBar *dg_bar; QPushButton *dg_process_button; QPushButton *dg_close_button;