2020-02-25 Fred Gleason <fredg@paravelsystems.com>

* Removed the 'Q3FileDialog' dependency from rdadmin(1).
2025-04-07 01:13:50 +02:00 · 2020-02-25 16:51:06 -05:00 · 2020-02-25 16:51:06 -05:00 · ad7aafbe63
commit ad7aafbe63
parent 080a89d139
12 changed files with 122 additions and 30 deletions
--- a/2
+++ b/2
@ -19701,3 +19701,5 @@
 2020-02-25 Fred Gleason <fredg@paravelsystems.com>
 	* Removed the 'Q3ProgressDialog' dependency from the 'Select Cart'
 	dialog.
+2020-02-25 Fred Gleason <fredg@paravelsystems.com>
+	* Removed the 'Q3FileDialog' dependency from rdadmin(1).
--- a/rdadmin/edit_dropbox.cpp
+++ b/rdadmin/edit_dropbox.cpp
@ -20,18 +20,19 @@

 #include <math.h>

-#include <qstring.h>
-#include <qpushbutton.h>
+#include <q3buttongroup.h>
 #include <q3listbox.h>
 #include <q3textedit.h>
-#include <qpainter.h>
-#include <qevent.h>
-#include <qmessagebox.h>
+
 #include <qcheckbox.h>
-#include <q3buttongroup.h>
 #include <qcolordialog.h>
+#include <qevent.h>
+#include <qfiledialog.h>
+#include <qmessagebox.h>
+#include <qpainter.h>
+#include <qpushbutton.h>
+#include <qstring.h>
 #include <qvalidator.h>
-#include <q3filedialog.h>

 #include <rdapplication.h>
 #include <rdcart_dialog.h>
@ -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);
  }
--- a/rdadmin/edit_rdairplay.cpp
+++ b/rdadmin/edit_rdairplay.cpp
@ -2,7 +2,7 @@
 //
 // Edit an RDAirPlay Configuration
 //
-//   (C) Copyright 2002-2019 Fred Gleason <fredg@paravelsystems.com>
+//   (C) Copyright 2002-2020 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,19 +18,19 @@
 //   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //

-#include <qdialog.h>
-#include <qstring.h>
-#include <qpushbutton.h>
-#include <qradiobutton.h>
+#include <q3buttongroup.h>
 #include <q3listbox.h>
 #include <q3textedit.h>
-#include <qpainter.h>
-#include <qevent.h>
-#include <qmessagebox.h>
+
 #include <qcheckbox.h>
-#include <q3buttongroup.h>
+#include <qdialog.h>
+#include <qevent.h>
+#include <qfiledialog.h>
+#include <qmessagebox.h>
 #include <qpainter.h>
-#include <q3filedialog.h>
+#include <qpushbutton.h>
+#include <qradiobutton.h>
+#include <qstring.h>

 #include <rd.h>
 #include <rddb.h>
@ -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);
  }
--- a/rdadmin/edit_rdpanel.cpp
+++ b/rdadmin/edit_rdpanel.cpp
@ -2,7 +2,7 @@
 //
 // Edit an RDPanel Configuration
 //
-//   (C) Copyright 2002-2019 Fred Gleason <fredg@paravelsystems.com>
+//   (C) Copyright 2002-2020 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,7 +18,7 @@
 //   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //

-#include <q3filedialog.h>
+#include <qfiledialog.h>
 #include <qmessagebox.h>
 #include <qpushbutton.h>

@ -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);
  }
--- 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 <fredg@paravelsystems.com>
+//   (C) Copyright 2002-2020 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,10 +18,10 @@
 //   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //

-#include <q3filedialog.h>
 #include <q3progressdialog.h>

 #include <qapplication.h>
+#include <qfiledialog.h>
 #include <qmessagebox.h>

 #include <rdconf.h>
@ -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;
  }
--- a/rdadmin/rdadmin_cs.ts
+++ b/rdadmin/rdadmin_cs.ts
@ -1302,6 +1302,14 @@ files, causing any whose files remain to be imported again.</source>
        <source>Log events in Syslog</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Select Directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select Log File</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>EditEncoder</name>
@ -3672,6 +3680,10 @@ Přepsat?</translation>
        <source>Multicast Address for Notifications</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Save text file</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>EditStation</name>
--- a/rdadmin/rdadmin_de.ts
+++ b/rdadmin/rdadmin_de.ts
@ -1222,6 +1222,14 @@ files, causing any whose files remain to be imported again.</source>
        <source>Log events in Syslog</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Select Directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select Log File</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>EditEncoder</name>
@ -3548,6 +3556,10 @@ Overwrite?</source>
        <source>Multicast Address for Notifications</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Save text file</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>EditStation</name>
--- a/rdadmin/rdadmin_es.ts
+++ b/rdadmin/rdadmin_es.ts
@ -1304,6 +1304,14 @@ files, causing any whose files remain to be imported again.</source>
        <source>Log events in Syslog</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Select Directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select Log File</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>EditEncoder</name>
@ -3683,6 +3691,10 @@ Overwrite?</source>
        <source>Multicast Address for Notifications</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Save text file</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>EditStation</name>
--- a/rdadmin/rdadmin_fr.ts
+++ b/rdadmin/rdadmin_fr.ts
@ -925,6 +925,14 @@ files, causing any whose files remain to be imported again.</source>
        <source>Log events in Syslog</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Select Directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select Log File</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>EditEndpoint</name>
@ -2962,6 +2970,10 @@ Overwrite?</source>
        <source>Multicast Address for Notifications</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Save text file</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>EditStation</name>
--- a/rdadmin/rdadmin_nb.ts
+++ b/rdadmin/rdadmin_nb.ts
@ -1204,6 +1204,14 @@ files, causing any whose files remain to be imported again.</source>
        <source>Log events in Syslog</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Select Directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select Log File</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>EditEncoder</name>
@ -3486,6 +3494,10 @@ Overwrite?</source>
        <source>Multicast Address for Notifications</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Save text file</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>EditStation</name>
--- a/rdadmin/rdadmin_nn.ts
+++ b/rdadmin/rdadmin_nn.ts
@ -1204,6 +1204,14 @@ files, causing any whose files remain to be imported again.</source>
        <source>Log events in Syslog</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Select Directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select Log File</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>EditEncoder</name>
@ -3486,6 +3494,10 @@ Overwrite?</source>
        <source>Multicast Address for Notifications</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Save text file</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>EditStation</name>
--- 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.</source>
        <source>Log events in Syslog</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Select Directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select Log File</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>EditEncoder</name>
@ -3535,6 +3543,10 @@ Overwrite?</source>
        <source>Multicast Address for Notifications</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Save text file</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>EditStation</name>