Menu
▾
▴
[Seq-cvs-commit] SF.net SVN: seq:[1056] showeq/branches/pre_6_0_beta/src
|
From: <cn...@us...> - 2020-10-24 21:10:26
|
Revision: 1056
http://sourceforge.net/p/seq/svn/1056
Author: cn187
Date: 2020-10-24 21:10:18 +0000 (Sat, 24 Oct 2020)
Log Message:
-----------
Replace Q3FileDialog with QFileDialog
Modified Paths:
--------------
showeq/branches/pre_6_0_beta/src/editor.cpp
showeq/branches/pre_6_0_beta/src/interface.cpp
showeq/branches/pre_6_0_beta/src/map.cpp
showeq/branches/pre_6_0_beta/src/messagewindow.cpp
Modified: showeq/branches/pre_6_0_beta/src/editor.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/editor.cpp 2020-10-24 16:16:35 UTC (rev 1055)
+++ showeq/branches/pre_6_0_beta/src/editor.cpp 2020-10-24 21:10:18 UTC (rev 1056)
@@ -33,7 +33,7 @@
#include <Q3PopupMenu>
#include <QMenuBar>
#include <Q3MainWindow>
-#include <Q3FileDialog>
+#include <QFileDialog>
#include <QToolButton>
#include <Q3TextStream>
#include <QPaintDevice>
@@ -141,8 +141,7 @@
void EditorWindow::load()
{
- QString fn = Q3FileDialog::getOpenFileName( QString::null, QString::null,
- this);
+ QString fn = QFileDialog::getOpenFileName(this);
if ( !fn.isEmpty() )
load( fn );
else
@@ -202,8 +201,7 @@
void EditorWindow::saveAs()
{
- QString fn = Q3FileDialog::getSaveFileName( QString::null, QString::null,
- this );
+ QString fn = QFileDialog::getSaveFileName(this);
if ( !fn.isEmpty() ) {
filename = fn;
save();
Modified: showeq/branches/pre_6_0_beta/src/interface.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/interface.cpp 2020-10-24 16:16:35 UTC (rev 1055)
+++ showeq/branches/pre_6_0_beta/src/interface.cpp 2020-10-24 21:10:18 UTC (rev 1056)
@@ -81,7 +81,7 @@
#include <QStatusBar>
#include <QLineEdit>
#include <QMessageBox>
-#include <Q3FileDialog>
+#include <QFileDialog>
#include <Q3Accel>
#include <QFileInfo>
#include <QFile>
@@ -3107,9 +3107,9 @@
QFileInfo fileInfo = m_dataLocationMgr->findExistingFile(".", formatFile);
- QString newFormatFile =
- Q3FileDialog::getOpenFileName(fileInfo.absFilePath(), "*.txt",
- this, "FormatFile", "Select Format File");
+ QString newFormatFile =
+ QFileDialog::getOpenFileName(this, "Select Format File",
+ fileInfo.absFilePath(), "*.txt");
// if the newFormatFile name is not empty, then the user selected a file
if (!newFormatFile.isEmpty())
@@ -3129,9 +3129,9 @@
QFileInfo fileInfo = m_dataLocationMgr->findExistingFile(".", spellsFile);
- QString newSpellsFile =
- Q3FileDialog::getOpenFileName(fileInfo.absFilePath(), "*.txt",
- this, "FormatFile", "Select Format File");
+ QString newSpellsFile =
+ QFileDialog::getOpenFileName(this, "Select Spells File",
+ fileInfo.absFilePath(), "*.txt");
// if the newFormatFile name is not empty, then the user selected a file
if (!newSpellsFile.isEmpty())
@@ -3336,11 +3336,9 @@
void
EQInterface::select_filter_file(void)
{
- QString filterFile = Q3FileDialog::getOpenFileName(m_filterMgr->filterFile(),
- QString("ShowEQ Filter Files (*.xml)"),
- 0,
- "Select Filter Config..."
- );
+ QString filterFile = QFileDialog::getOpenFileName(this, "Select Filter Config",
+ m_filterMgr->filterFile(), QString("ShowEQ Filter Files (*.xml)"));
+
if (!filterFile.isEmpty())
m_filterMgr->loadFilters(filterFile);
}
@@ -4418,13 +4416,11 @@
"opcodemonitor.log");
QFileInfo logFileInfo = m_dataLocationMgr->findWriteFile("logs", logFile);
-
- logFile =
- Q3FileDialog::getSaveFileName(logFileInfo.absFilePath(),
- "*.log",
- this,
- "ShowEQ - OpCode Log File");
+ logFile =
+ QFileDialog::getSaveFileName(this, "ShowEQ - OpCode Log File",
+ logFileInfo.absFilePath(), "*.log");
+
// set log filename
if (!logFile.isEmpty())
pSEQPrefs->setPrefString("LogFilename", section, logFile);
@@ -5319,10 +5315,10 @@
void EQInterface::set_opt_save_BaseFilename()
{
- QString fileName =
- Q3FileDialog::getSaveFileName(showeq_params->saveRestoreBaseFilename,
- QString::null, this, "SaveBaseFilename",
- "Save State Base Filename");
+ QString fileName =
+ QFileDialog::getSaveFileName(this, "Save State Base Filename",
+ showeq_params->saveRestoreBaseFilename);
+
if (!fileName.isEmpty())
{
// set it to be the new base filename
Modified: showeq/branches/pre_6_0_beta/src/map.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/map.cpp 2020-10-24 16:16:35 UTC (rev 1055)
+++ showeq/branches/pre_6_0_beta/src/map.cpp 2020-10-24 21:10:18 UTC (rev 1056)
@@ -53,7 +53,7 @@
#include <QPainter>
#include <QPixmap>
#include <QFont>
-#include <Q3FileDialog>
+#include <QFileDialog>
#include <QEvent>
#include <QPushButton>
#include <QLayout>
@@ -397,7 +397,7 @@
fileName = m_dataLocMgr->findExistingFile("maps", fileName).absFilePath();
// create a file dialog the defaults to the currently open map
- fileName = Q3FileDialog::getOpenFileName(fileName,
+ fileName = QFileDialog::getOpenFileName(m_dialogParent, "Load Map", fileName,
"All maps (*.map *.txt);;SEQ maps (*.map);;EQ maps (*.txt)");
if (fileName.isEmpty ())
@@ -421,7 +421,7 @@
fileName = m_dataLocMgr->findExistingFile("maps", fileName).absFilePath();
// create a file dialog the defaults to the currently open map
- fileName = Q3FileDialog::getOpenFileName(fileName,
+ fileName = QFileDialog::getOpenFileName(m_dialogParent, "Import Map", fileName,
"All maps (*.map *.txt);;SEQ maps (*.map);;EQ maps (*.txt)");
if (fileName.isEmpty ())
@@ -4526,11 +4526,9 @@
QString filters;
for (char* tmp =formats.first(); tmp != 0; tmp = formats.next())
filters += QString(tmp) + QString(" (*.") + QString(tmp) + ")\n";
-
- Q3FileDialog fileDlg(QString::null, filters, this, "saveMapImage", true);
- fileDlg.setCaption("Save Map Image Filename");
- fileDlg.setMode(Q3FileDialog::AnyFile);
+ QFileDialog fileDlg(this, "Save Map Image Filename", QString(), filters);
+
if (fileDlg.exec() != QDialog::Accepted)
return;
Modified: showeq/branches/pre_6_0_beta/src/messagewindow.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/messagewindow.cpp 2020-10-24 16:16:35 UTC (rev 1055)
+++ showeq/branches/pre_6_0_beta/src/messagewindow.cpp 2020-10-24 21:10:18 UTC (rev 1056)
@@ -37,7 +37,7 @@
#include <QLabel>
#include <QLineEdit>
#include <Q3GroupBox>
-#include <Q3FileDialog>
+#include <QFileDialog>
#include <QFile>
#include <Q3TextStream>
#include <Q3HBoxLayout>
@@ -817,9 +817,8 @@
void MessageWindow::saveText(void)
{
- QString fileName =
- Q3FileDialog::getSaveFileName("", "*.txt", this,
- "ShowEQ - Message Text File");
+ QString fileName =
+ QFileDialog::getSaveFileName(this, "ShowEQ - Message Text File", QString(), "*.txt");
if (fileName.isEmpty())
return;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
