realAscot/qelectrotech-source-mirror
realAscot/qelectrotech-source-mirror
1
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-09-13 20:23:04 +02:00
Code Packages Releases 1 Activity

Merge pull request #333 from plc-user/master

Browse Source 
corrected a few places where QETApp::documentDir() should also be used
This commit is contained in:
Laurent Trinques 2025-01-29 14:38:25 +01:00 committed by GitHub
commit 22e6188bb6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sources/editor/ui/qetelementeditor.cpp
View File

@ -1282,24 +1282,6 @@ void QETElementEditor::on_m_open_from_file_action_triggered()
openElement(user_filename); openElement(user_filename);
} }
void QETElementEditor::on_m_open_scaled_element_action_triggered()
{
#ifdef TODO_LIST
# pragma message("@TODO Merge 'Element-Scaling' code into QET")
# pragma message("https://github.com/plc-user/QET_ElementScaler")
#endif
#if defined(Q_OS_WIN32) || defined(Q_OS_WIN64)
QString program = (QDir::homePath() + "/Application Data/qet/QET_ElementScaler.exe");
#elif defined(Q_OS_MAC)
QString program = (QDir::homePath() + "/.qet/QET_ElementScaler.app");
#else
QString program = (QDir::homePath() + "/.qet/QET_ElementScaler");
#endif
QStringList arguments;
QProcess *ES = new QProcess(qApp);
ES -> start(program,arguments);
}
bool QETElementEditor::on_m_save_as_file_action_triggered() bool QETElementEditor::on_m_save_as_file_action_triggered()
{ {
// Check element before writing // Check element before writing
@ -1472,7 +1454,7 @@ void QETElementEditor::on_m_import_dxf_triggered()
{ {
QString file_path{QFileDialog::getOpenFileName(this, QString file_path{QFileDialog::getOpenFileName(this,
QObject::tr("Importer un fichier dxf"), QObject::tr("Importer un fichier dxf"),
QDir::homePath(), QETApp::documentDir(),
"DXF (*.dxf)")}; "DXF (*.dxf)")};
if (file_path.isEmpty()) { if (file_path.isEmpty()) {
return; return;
@ -1498,7 +1480,7 @@ void QETElementEditor::on_m_import_scaled_element_triggered()
{ {
QString file_path{QFileDialog::getOpenFileName(this, QString file_path{QFileDialog::getOpenFileName(this,
tr("Importer un élément à redimensionner"), tr("Importer un élément à redimensionner"),
QDir::homePath(), QETApp::documentDir(),
tr("Éléments QElectroTech (*.elmt)"))}; tr("Éléments QElectroTech (*.elmt)"))};
if (file_path.isEmpty()) { if (file_path.isEmpty()) {
return; return;

1
sources/editor/ui/qetelementeditor.h
View File

@ -86,7 +86,6 @@ class QETElementEditor : public QMainWindow
void on_m_new_action_triggered(); void on_m_new_action_triggered();
void on_m_open_action_triggered(); void on_m_open_action_triggered();
void on_m_open_from_file_action_triggered(); void on_m_open_from_file_action_triggered();
void on_m_open_scaled_element_action_triggered();
bool on_m_save_as_file_action_triggered(); bool on_m_save_as_file_action_triggered();
void on_m_reload_action_triggered(); void on_m_reload_action_triggered();
void on_m_quit_action_triggered(); void on_m_quit_action_triggered();

10
sources/ui/configpage/generalconfigurationpage.cpp
View File

@ -436,7 +436,7 @@ void GeneralConfigurationPage::on_m_common_elmt_path_cb_currentIndexChanged(int
{ {
if (index == 1) if (index == 1)
{ {
QString path = QFileDialog::getExistingDirectory(this, tr("Chemin de la collection commune"), QDir::homePath()); QString path = QFileDialog::getExistingDirectory(this, tr("Chemin de la collection commune"), QETApp::documentDir());
if (!path.isEmpty()) { if (!path.isEmpty()) {
ui->m_common_elmt_path_cb->setItemData(1, path, Qt::DisplayRole); ui->m_common_elmt_path_cb->setItemData(1, path, Qt::DisplayRole);
} }
@ -450,7 +450,7 @@ void GeneralConfigurationPage::on_m_company_elmt_path_cb_currentIndexChanged(int
{ {
if (index == 1) if (index == 1)
{ {
QString path = QFileDialog::getExistingDirectory(this, tr("Chemin de la collection company"), QDir::homePath()); QString path = QFileDialog::getExistingDirectory(this, tr("Chemin de la collection company"), QETApp::documentDir());
if (!path.isEmpty()) { if (!path.isEmpty()) {
ui->m_company_elmt_path_cb->setItemData(1, path, Qt::DisplayRole); ui->m_company_elmt_path_cb->setItemData(1, path, Qt::DisplayRole);
} }
@ -464,7 +464,7 @@ void GeneralConfigurationPage::on_m_custom_elmt_path_cb_currentIndexChanged(int
{ {
if (index == 1) if (index == 1)
{ {
QString path = QFileDialog::getExistingDirectory(this, tr("Chemin de la collection utilisateur"), QDir::homePath()); QString path = QFileDialog::getExistingDirectory(this, tr("Chemin de la collection utilisateur"), QETApp::documentDir());
if (!path.isEmpty()) { if (!path.isEmpty()) {
ui->m_custom_elmt_path_cb->setItemData(1, path, Qt::DisplayRole); ui->m_custom_elmt_path_cb->setItemData(1, path, Qt::DisplayRole);
} }
@ -478,7 +478,7 @@ void GeneralConfigurationPage::on_m_company_tbt_path_cb_currentIndexChanged(int
{ {
if (index == 1) if (index == 1)
{ {
QString path = QFileDialog::getExistingDirectory(this, tr("Chemin des cartouches company"), QDir::homePath()); QString path = QFileDialog::getExistingDirectory(this, tr("Chemin des cartouches company"), QETApp::documentDir());
if (!path.isEmpty()) { if (!path.isEmpty()) {
ui->m_company_tbt_path_cb->setItemData(1, path, Qt::DisplayRole); ui->m_company_tbt_path_cb->setItemData(1, path, Qt::DisplayRole);
} }
@ -492,7 +492,7 @@ void GeneralConfigurationPage::on_m_custom_tbt_path_cb_currentIndexChanged(int i
{ {
if (index == 1) if (index == 1)
{ {
QString path = QFileDialog::getExistingDirectory(this, tr("Chemin des cartouches utilisateur"), QDir::homePath()); QString path = QFileDialog::getExistingDirectory(this, tr("Chemin des cartouches utilisateur"), QETApp::documentDir());
if (!path.isEmpty()) { if (!path.isEmpty()) {
ui->m_custom_tbt_path_cb->setItemData(1, path, Qt::DisplayRole); ui->m_custom_tbt_path_cb->setItemData(1, path, Qt::DisplayRole);
} }