diff --git a/ChangeLog b/ChangeLog index 216aeca7..a0c6e433 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19701,3 +19701,5 @@ 2020-02-25 Fred Gleason * Removed the 'Q3ProgressDialog' dependency from the 'Select Cart' dialog. +2020-02-25 Fred Gleason + * Removed the 'Q3FileDialog' dependency from rdadmin(1). diff --git a/rdadmin/edit_dropbox.cpp b/rdadmin/edit_dropbox.cpp index e2918a6a..dee21f09 100644 --- a/rdadmin/edit_dropbox.cpp +++ b/rdadmin/edit_dropbox.cpp @@ -20,18 +20,19 @@ #include -#include -#include +#include #include #include -#include -#include -#include + #include -#include #include +#include +#include +#include +#include +#include +#include #include -#include #include #include @@ -44,8 +45,6 @@ EditDropbox::EditDropbox(int id,bool duplicate,QWidget *parent) : RDDialog(parent) { - setModal(true); - QString sql; RDSqlQuery *q; @@ -506,7 +505,9 @@ QSizePolicy EditDropbox::sizePolicy() const void EditDropbox::selectPathData() { QString path=box_path_edit->text(); - path=Q3FileDialog::getExistingDirectory(path,this); + path=QFileDialog::getExistingDirectory(this,"RDAdmin - "+ + tr("Select Directory"),path, + QFileDialog::ShowDirsOnly); if(!path.isEmpty()) { box_path_edit->setText(path); } @@ -538,7 +539,8 @@ void EditDropbox::selectCartData() void EditDropbox::selectLogPathData() { QString path=box_log_path_edit->text(); - path=Q3FileDialog::getSaveFileName(path,QString::null,this); + path=QFileDialog::getSaveFileName(this,"RDAdmin - "+tr("Select Log File"), + path,"Text files (*.txt);;All files (*)"); if(!path.isEmpty()) { box_log_path_edit->setText(path); } diff --git a/rdadmin/edit_rdairplay.cpp b/rdadmin/edit_rdairplay.cpp index 8c06770f..07193100 100644 --- a/rdadmin/edit_rdairplay.cpp +++ b/rdadmin/edit_rdairplay.cpp @@ -2,7 +2,7 @@ // // Edit an RDAirPlay Configuration // -// (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 @@ -18,19 +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 #include @@ -1188,8 +1188,9 @@ void EditRDAirPlay::editHotKeys() void EditRDAirPlay::selectSkinData() { QString filename=air_skin_edit->text(); - filename=Q3FileDialog::getOpenFileName(filename,RD_IMAGE_FILE_FILTER,this,"", - tr("Select Image File")); + filename=QFileDialog::getOpenFileName(this,"RDAdmin - "+ + tr("Select Image File"),filename, + RD_IMAGE_FILE_FILTER); if(!filename.isNull()) { air_skin_edit->setText(filename); } diff --git a/rdadmin/edit_rdpanel.cpp b/rdadmin/edit_rdpanel.cpp index 537f494c..ba202617 100644 --- a/rdadmin/edit_rdpanel.cpp +++ b/rdadmin/edit_rdpanel.cpp @@ -2,7 +2,7 @@ // // Edit an RDPanel Configuration // -// (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 @@ -18,7 +18,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#include +#include #include #include @@ -427,8 +427,9 @@ QSizePolicy EditRDPanel::sizePolicy() const void EditRDPanel::selectSkinData() { QString filename=air_skin_edit->text(); - filename=Q3FileDialog::getOpenFileName(filename,RD_IMAGE_FILE_FILTER,this,"", - tr("Select Image File")); + filename=QFileDialog::getOpenFileName(this,"RDAdmin - "+ + tr("Select Image File"),filename, + RD_IMAGE_FILE_FILTER); if(!filename.isNull()) { air_skin_edit->setText(filename); } diff --git a/rdadmin/edit_settings.cpp b/rdadmin/edit_settings.cpp index af8e2e95..f7b552d9 100644 --- a/rdadmin/edit_settings.cpp +++ b/rdadmin/edit_settings.cpp @@ -2,7 +2,7 @@ // // Edit Rivendell System-Wide Configuration // -// (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 @@ -18,10 +18,10 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#include #include #include +#include #include #include @@ -256,7 +256,9 @@ void EditSettings::duplicatesCheckedData(bool state) void EditSettings::saveData() { QString filename=RDGetHomeDir(); - filename=Q3FileDialog::getSaveFileName(filename,"Text Files *.txt",this); + filename=QFileDialog::getSaveFileName(this,"RDAdmin - "+tr("Save text file"), + filename, + "Text files (*.txt);;All files (*.*)"); if(filename.isNull()) { return; } diff --git a/rdadmin/rdadmin_cs.ts b/rdadmin/rdadmin_cs.ts index 06a89a01..cd86bbdc 100644 --- a/rdadmin/rdadmin_cs.ts +++ b/rdadmin/rdadmin_cs.ts @@ -1302,6 +1302,14 @@ files, causing any whose files remain to be imported again. Log events in Syslog + + Select Directory + + + + Select Log File + + EditEncoder @@ -3672,6 +3680,10 @@ Přepsat? Multicast Address for Notifications + + Save text file + + EditStation diff --git a/rdadmin/rdadmin_de.ts b/rdadmin/rdadmin_de.ts index 2397ae47..6a98b2e6 100644 --- a/rdadmin/rdadmin_de.ts +++ b/rdadmin/rdadmin_de.ts @@ -1222,6 +1222,14 @@ files, causing any whose files remain to be imported again. Log events in Syslog + + Select Directory + + + + Select Log File + + EditEncoder @@ -3548,6 +3556,10 @@ Overwrite? Multicast Address for Notifications + + Save text file + + EditStation diff --git a/rdadmin/rdadmin_es.ts b/rdadmin/rdadmin_es.ts index 6ed27449..71008bf8 100644 --- a/rdadmin/rdadmin_es.ts +++ b/rdadmin/rdadmin_es.ts @@ -1304,6 +1304,14 @@ files, causing any whose files remain to be imported again. Log events in Syslog + + Select Directory + + + + Select Log File + + EditEncoder @@ -3683,6 +3691,10 @@ Overwrite? Multicast Address for Notifications + + Save text file + + EditStation diff --git a/rdadmin/rdadmin_fr.ts b/rdadmin/rdadmin_fr.ts index edf0a6af..fa9ac38c 100644 --- a/rdadmin/rdadmin_fr.ts +++ b/rdadmin/rdadmin_fr.ts @@ -925,6 +925,14 @@ files, causing any whose files remain to be imported again. Log events in Syslog + + Select Directory + + + + Select Log File + + EditEndpoint @@ -2962,6 +2970,10 @@ Overwrite? Multicast Address for Notifications + + Save text file + + EditStation diff --git a/rdadmin/rdadmin_nb.ts b/rdadmin/rdadmin_nb.ts index 62ba272e..dc854129 100644 --- a/rdadmin/rdadmin_nb.ts +++ b/rdadmin/rdadmin_nb.ts @@ -1204,6 +1204,14 @@ files, causing any whose files remain to be imported again. Log events in Syslog + + Select Directory + + + + Select Log File + + EditEncoder @@ -3486,6 +3494,10 @@ Overwrite? Multicast Address for Notifications + + Save text file + + EditStation diff --git a/rdadmin/rdadmin_nn.ts b/rdadmin/rdadmin_nn.ts index 62ba272e..dc854129 100644 --- a/rdadmin/rdadmin_nn.ts +++ b/rdadmin/rdadmin_nn.ts @@ -1204,6 +1204,14 @@ files, causing any whose files remain to be imported again. Log events in Syslog + + Select Directory + + + + Select Log File + + EditEncoder @@ -3486,6 +3494,10 @@ Overwrite? Multicast Address for Notifications + + Save text file + + EditStation diff --git a/rdadmin/rdadmin_pt_BR.ts b/rdadmin/rdadmin_pt_BR.ts index 43ba2cc1..bd5b198d 100644 --- a/rdadmin/rdadmin_pt_BR.ts +++ b/rdadmin/rdadmin_pt_BR.ts @@ -1193,6 +1193,14 @@ files, causing any whose files remain to be imported again. Log events in Syslog + + Select Directory + + + + Select Log File + + EditEncoder @@ -3535,6 +3543,10 @@ Overwrite? Multicast Address for Notifications + + Save text file + + EditStation