From a8497097c0177e2fea296c179d98b31bafe7291a Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Tue, 25 Feb 2020 17:52:57 -0500 Subject: [PATCH] 2020-02-25 Fred Gleason * Removed the 'Q3ProgressDialog' dependency from rdadmin(1). --- ChangeLog | 2 ++ rdadmin/edit_settings.cpp | 14 ++++++++------ rdadmin/list_feeds.cpp | 18 ++++++++---------- rdadmin/rdadmin_cs.ts | 4 ++++ rdadmin/rdadmin_de.ts | 4 ++++ rdadmin/rdadmin_es.ts | 4 ++++ rdadmin/rdadmin_fr.ts | 4 ++++ rdadmin/rdadmin_nb.ts | 4 ++++ rdadmin/rdadmin_nn.ts | 4 ++++ rdadmin/rdadmin_pt_BR.ts | 4 ++++ 10 files changed, 46 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index fa5eae34..e21f8fd4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19710,3 +19710,5 @@ 2020-02-25 Fred Gleason * Removed the 'Q3ProgressDialog' dependency from the 'Select Cut' dialog. +2020-02-25 Fred Gleason + * Removed the 'Q3ProgressDialog' dependency from rdadmin(1). diff --git a/rdadmin/edit_settings.cpp b/rdadmin/edit_settings.cpp index f7b552d9..6c0c9ef4 100644 --- a/rdadmin/edit_settings.cpp +++ b/rdadmin/edit_settings.cpp @@ -18,11 +18,11 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#include #include #include #include +#include #include #include @@ -307,7 +307,8 @@ void EditSettings::okData() if(edit_duplicate_carts_box->isChecked()!= edit_system->allowDuplicateCartTitles()) { QLabel *msg=new QLabel(this); - Q3ProgressDialog *pd=new Q3ProgressDialog(this); + QProgressDialog *pd=new QProgressDialog(this); + pd->setWindowTitle("RDAdmin - "+tr("Progress")); pd->setLabel(msg); pd->setCancelButton(NULL); pd->setMinimumDuration(2); @@ -321,7 +322,8 @@ void EditSettings::okData() int count=0; int step=0; int step_size=q->size()/10; - pd->setProgress(0,10); + pd->setMaximum(10); + pd->setValue(0); while(q->next()) { sql=QString("select NUMBER from CART where ")+ "(TITLE=\""+RDEscapeString(q->value(1).toString())+"\")&&"+ @@ -333,7 +335,7 @@ void EditSettings::okData() delete q1; count++; if(count>=step_size) { - pd->setProgress(++step); + pd->setValue(++step); count=0; qApp->processEvents(); } @@ -372,7 +374,7 @@ void EditSettings::okData() sql="alter table CART drop index TITLE_IDX"; q=new RDSqlQuery(sql); delete q; - sql="alter table CART modify column TITLE char(255) unique"; + sql="alter table CART modify column TITLE varchar(191) unique"; q=new RDSqlQuery(sql); delete q; edit_system->setAllowDuplicateCartTitles(false); @@ -381,7 +383,7 @@ void EditSettings::okData() sql="alter table CART drop index TITLE"; q=new RDSqlQuery(sql); delete q; - sql="alter table CART modify column TITLE char(255)"; + sql="alter table CART modify column TITLE varchar(191)"; q=new RDSqlQuery(sql); delete q; sql="alter table CART add index TITLE_IDX(TITLE)"; diff --git a/rdadmin/list_feeds.cpp b/rdadmin/list_feeds.cpp index f41a799d..3fb98685 100644 --- a/rdadmin/list_feeds.cpp +++ b/rdadmin/list_feeds.cpp @@ -2,7 +2,7 @@ // // List Rivendell Feeds // -// (C) Copyright 2002-2019 Fred Gleason +// (C) Copyright 2002-2020 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 @@ -22,11 +22,10 @@ #include #include -#include - +#include #include #include -#include +#include #include #include @@ -221,15 +220,14 @@ void ListFeeds::deleteData() RDPodcast *cast; sql=QString().sprintf("select ID from PODCASTS where FEED_ID=%d",item->id()); q=new RDSqlQuery(sql); - Q3ProgressDialog *pd= - new Q3ProgressDialog(tr("Deleting Audio..."),tr("Cancel"),q->size()+1,this, - NULL); - pd->setCaption(tr("Deleting")); - pd->setProgress(0); + QProgressDialog *pd=new QProgressDialog(tr("Deleting Audio..."),tr("Cancel"), + 0,q->size()+1,this); + pd->setWindowTitle("RDAdmin - "+tr("Deleting")); + pd->setValue(0); qApp->processEvents(); sleep(1); while(q->next()) { - pd->setProgress(pd->progress()+1); + pd->setValue(pd->value()+1); qApp->processEvents(); cast=new RDPodcast(rda->config(),q->value(0).toUInt()); cast->removeAudio(feed,&errs,rda->config()->logXloadDebugData()); diff --git a/rdadmin/rdadmin_cs.ts b/rdadmin/rdadmin_cs.ts index cd86bbdc..a710e5b9 100644 --- a/rdadmin/rdadmin_cs.ts +++ b/rdadmin/rdadmin_cs.ts @@ -3684,6 +3684,10 @@ Přepsat? Save text file + + Progress + + EditStation diff --git a/rdadmin/rdadmin_de.ts b/rdadmin/rdadmin_de.ts index 6a98b2e6..c4306f3b 100644 --- a/rdadmin/rdadmin_de.ts +++ b/rdadmin/rdadmin_de.ts @@ -3560,6 +3560,10 @@ Overwrite? Save text file + + Progress + + EditStation diff --git a/rdadmin/rdadmin_es.ts b/rdadmin/rdadmin_es.ts index 71008bf8..6873d2a9 100644 --- a/rdadmin/rdadmin_es.ts +++ b/rdadmin/rdadmin_es.ts @@ -3695,6 +3695,10 @@ Overwrite? Save text file + + Progress + + EditStation diff --git a/rdadmin/rdadmin_fr.ts b/rdadmin/rdadmin_fr.ts index fa9ac38c..1b0ec9fa 100644 --- a/rdadmin/rdadmin_fr.ts +++ b/rdadmin/rdadmin_fr.ts @@ -2974,6 +2974,10 @@ Overwrite? Save text file + + Progress + + EditStation diff --git a/rdadmin/rdadmin_nb.ts b/rdadmin/rdadmin_nb.ts index dc854129..ac135509 100644 --- a/rdadmin/rdadmin_nb.ts +++ b/rdadmin/rdadmin_nb.ts @@ -3498,6 +3498,10 @@ Overwrite? Save text file + + Progress + + EditStation diff --git a/rdadmin/rdadmin_nn.ts b/rdadmin/rdadmin_nn.ts index dc854129..ac135509 100644 --- a/rdadmin/rdadmin_nn.ts +++ b/rdadmin/rdadmin_nn.ts @@ -3498,6 +3498,10 @@ Overwrite? Save text file + + Progress + + EditStation diff --git a/rdadmin/rdadmin_pt_BR.ts b/rdadmin/rdadmin_pt_BR.ts index bd5b198d..6ec2d51f 100644 --- a/rdadmin/rdadmin_pt_BR.ts +++ b/rdadmin/rdadmin_pt_BR.ts @@ -3547,6 +3547,10 @@ Overwrite? Save text file + + Progress + + EditStation