mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'print' of https://github.com/neolit123/subsurface

Browse source
This commit is contained in:
Dirk Hohndel 2017-11-25 08:30:24 -08:00
commit 357dea0bcb
7 changed files with 280 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

20
desktop-widgets/mainwindow.cpp
View file

@ -256,8 +256,24 @@ MainWindow::MainWindow() : QMainWindow(),
connect(geoLookup, SIGNAL(started()),information(), SLOT(disableGeoLookupEdition()));
connect(geoLookup, SIGNAL(finished()), information(), SLOT(enableGeoLookupEdition()));
#ifndef NO_PRINTING
// copy the bundled print templates to the user path; no overwriting occurs!
copyPath(getPrintingTemplatePathBundle(), getPrintingTemplatePathUser());
// copy the bundled print templates to the user path
QStringList templateBackupList;
QString templatePathUser(getPrintingTemplatePathUser());
copy_bundled_templates(getPrintingTemplatePathBundle(), templatePathUser, &templateBackupList);
if (templateBackupList.length()) {
QMessageBox msgBox(this);
templatePathUser.replace("\\", "/");
templateBackupList.replaceInStrings(templatePathUser + "/", "");
msgBox.setWindowTitle(tr("Template backup created"));
msgBox.setText(tr("The following backup printing templates were created:\n\n%1\n\n"
"Location:\n%2\n\n"
"Please note that as of this version of Subsurface the default templates\n"
"are read-only and should not be edited directly, since the application\n"
"can overwrite them on startup.").arg(templateBackupList.join("\n")).arg(templatePathUser));
msgBox.setStandardButtons(QMessageBox::Ok);
msgBox.exec();
}
set_bundled_templates_as_read_only();
find_all_templates();
#endif

89
desktop-widgets/printoptions.cpp
View file

@ -60,11 +60,13 @@ void PrintOptions::setupTemplates()
int current_index = 0;
ui.printTemplate->clear();
Q_FOREACH(const QString& theme, currList) {
if (theme == storedTemplate) // find the stored template in the list
// find the stored template in the list
if (theme == storedTemplate || theme == lastImportExportTemplate)
current_index = currList.indexOf(theme);
ui.printTemplate->addItem(theme.split('.')[0], theme);
}
ui.printTemplate->setCurrentIndex(current_index);
lastImportExportTemplate = "";
}
// print type radio buttons
@ -121,6 +123,20 @@ void PrintOptions::on_printTemplate_currentIndexChanged(int index)
void PrintOptions::on_editButton_clicked()
{
QString templateName = getSelectedTemplate();
QString prefix = (printOptions->type == print_options::STATISTICS) ? "statistics/" : "";
QFile f(getPrintingTemplatePathUser() + QDir::separator() + prefix + templateName);
if (!f.open(QFile::ReadWrite | QFile::Text)) {
QMessageBox msgBox(this);
msgBox.setWindowTitle(tr("Read-only template!"));
msgBox.setText(tr("The template '%1' is read-only and connot be edited.\n"
"Please export this template to a different file.").arg(templateName));
msgBox.setStandardButtons(QMessageBox::Ok);
msgBox.exec();
return;
} else {
f.close();
}
TemplateEdit te(this, printOptions, templateOptions);
te.exec();
setup();
@ -128,36 +144,93 @@ void PrintOptions::on_editButton_clicked()
void PrintOptions::on_importButton_clicked()
{
QString filename = QFileDialog::getOpenFileName(this, tr("Import template file"), "",
QString pathUser = getPrintingTemplatePathUser();
QString filename = QFileDialog::getOpenFileName(this, tr("Import template file"), pathUser,
tr("HTML files") + " (*.html)");
if (filename.isEmpty())
return;
QFileInfo fileInfo(filename);
QFile::copy(filename, getPrintingTemplatePathUser() + QDir::separator() + fileInfo.fileName());
const QString dest = pathUser + QDir::separator() + fileInfo.fileName();
QFile f(dest);
if (!f.open(QFile::ReadWrite | QFile::Text)) {
QMessageBox msgBox(this);
msgBox.setWindowTitle(tr("Read-only template!"));
msgBox.setText(tr("The destination template '%1' is read-only and cannot be overwritten.").arg(fileInfo.fileName()));
msgBox.setStandardButtons(QMessageBox::Ok);
msgBox.exec();
return;
} else {
f.close();
if (filename != dest)
f.remove();
}
QFile::copy(filename, dest);
printOptions->p_template = fileInfo.fileName();
lastImportExportTemplate = fileInfo.fileName();
find_all_templates();
setup();
}
void PrintOptions::on_exportButton_clicked()
{
QString filename = QFileDialog::getSaveFileName(this, tr("Export template files as"), "",
QString pathUser = getPrintingTemplatePathUser();
QString filename = QFileDialog::getSaveFileName(this, tr("Export template files as"), pathUser,
tr("HTML files") + " (*.html)");
if (filename.isEmpty())
return;
QFile::copy(getPrintingTemplatePathUser() + QDir::separator() + getSelectedTemplate(), filename);
const QString ext(".html");
if (filename.endsWith(".htm", Qt::CaseInsensitive))
filename += "l";
else if (!filename.endsWith(ext, Qt::CaseInsensitive))
filename += ext;
QFileInfo fileInfo(filename);
const QString dest = pathUser + QDir::separator() + getSelectedTemplate();
QFile f(filename);
if (!f.open(QFile::ReadWrite | QFile::Text)) {
QMessageBox msgBox(this);
msgBox.setWindowTitle(tr("Read-only template!"));
msgBox.setText(tr("The destination template '%1' is read-only and cannot be overwritten.").arg(fileInfo.fileName()));
msgBox.setStandardButtons(QMessageBox::Ok);
msgBox.exec();
return;
} else {
f.close();
if (dest != filename)
f.remove();
}
QFile::copy(dest, filename);
if (!f.open(QFile::ReadWrite | QFile::Text))
f.setPermissions(QFileDevice::ReadUser | QFileDevice::ReadOwner | QFileDevice::WriteUser | QFileDevice::WriteOwner);
else
f.close();
lastImportExportTemplate = fileInfo.fileName();
find_all_templates();
setup();
}
void PrintOptions::on_deleteButton_clicked()
{
QString templateName = getSelectedTemplate();
QMessageBox msgBox;
msgBox.setText(tr("This action cannot be undone!"));
msgBox.setInformativeText(tr("Delete template: %1?").arg(templateName));
QMessageBox msgBox(this);
msgBox.setWindowTitle(tr("This action cannot be undone!"));
msgBox.setText(tr("Delete template '%1'?").arg(templateName));
msgBox.setStandardButtons(QMessageBox::Ok | QMessageBox::Cancel);
msgBox.setDefaultButton(QMessageBox::Cancel);
if (msgBox.exec() == QMessageBox::Ok) {
QFile f(getPrintingTemplatePathUser() + QDir::separator() + templateName);
if (!f.open(QFile::ReadWrite | QFile::Text)) {
msgBox.setWindowTitle(tr("Read-only template!"));
msgBox.setText(tr("The template '%1' is read-only and cannot be deleted.").arg(templateName));
msgBox.setStandardButtons(QMessageBox::Ok);
msgBox.exec();
return;
} else {
f.close();
}
f.remove();
find_all_templates();
setup();

1
desktop-widgets/printoptions.h
View file

@ -72,6 +72,7 @@ private:
struct print_options *printOptions;
struct template_options *templateOptions;
bool hasSetupSlots;
QString lastImportExportTemplate;
void setupTemplates();
private

58
desktop-widgets/templatelayout.cpp
View file

@ -1,4 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
#include <QFileDevice>
#include <string>
#include "templatelayout.h"
@ -19,23 +20,74 @@ int getTotalWork(print_options *printOptions)
void find_all_templates()
{
const QString ext(".html");
grantlee_templates.clear();
grantlee_statistics_templates.clear();
QDir dir(getPrintingTemplatePathUser());
QStringList list = dir.entryList(QDir::Files | QDir::NoDotAndDotDot);
foreach (const QString& filename, list) {
if (filename.at(filename.size() - 1) != '~') {
if (filename.at(filename.size() - 1) != '~' && filename.endsWith(ext))
grantlee_templates.append(filename);
}
}
// find statistics templates
dir.setPath(getPrintingTemplatePathUser() + QDir::separator() + "statistics");
list = dir.entryList(QDir::Files | QDir::NoDotAndDotDot);
foreach (const QString& filename, list) {
if (filename.at(filename.size() - 1) != '~') {
if (filename.at(filename.size() - 1) != '~' && filename.endsWith(ext))
grantlee_statistics_templates.append(filename);
}
}
/* find templates which are part of the bundle in the user path
* and set them as read only.
*/
void set_bundled_templates_as_read_only()
{
QDir dir;
const QString stats("statistics");
QStringList list, listStats;
QString pathBundle = getPrintingTemplatePathBundle();
QString pathUser = getPrintingTemplatePathUser();
dir.setPath(pathBundle);
list = dir.entryList(QDir::Files | QDir::NoDotAndDotDot);
dir.setPath(pathBundle + QDir::separator() + stats);
listStats = dir.entryList(QDir::Files | QDir::NoDotAndDotDot);
for (int i = 0; i < listStats.length(); i++)
listStats[i] = stats + QDir::separator() + listStats.at(i);
list += listStats;
foreach (const QString& f, list)
QFile::setPermissions(pathUser + QDir::separator() + f, QFileDevice::ReadOwner | QFileDevice::ReadUser);
}
void copy_bundled_templates(QString src, QString dst, QStringList *templateBackupList)
{
QDir dir(src);
if (!dir.exists())
return;
foreach (QString d, dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot)) {
QString dst_path = dst + QDir::separator() + d;
dir.mkpath(dst_path);
copy_bundled_templates(src + QDir::separator() + d, dst_path, templateBackupList);
}
foreach (QString f, dir.entryList(QDir::Files)) {
QFile fileSrc(src + QDir::separator() + f);
QFile fileDest(dst + QDir::separator() + f);
if (fileDest.exists()) {
// if open() fails the file is either locked or r/o. try to remove it and then overwrite
if (!fileDest.open(QFile::ReadWrite | QFile::Text)) {
fileDest.setPermissions(QFileDevice::WriteOwner | QFileDevice::WriteUser);
fileDest.remove();
} else { // if the file is not read-only create a backup
fileDest.close();
const QString targetFile = fileDest.fileName().replace(".html", "-User.html");
fileDest.copy(targetFile);
*templateBackupList << targetFile;
}
}
fileSrc.copy(fileDest.fileName()); // in all cases copy the file
}
}

3
desktop-widgets/templatelayout.h
View file

@ -2,6 +2,7 @@
#ifndef TEMPLATELAYOUT_H
#define TEMPLATELAYOUT_H
#include <QStringList>
#include <grantlee_templates.h>
#include "mainwindow.h"
#include "printoptions.h"
@ -12,6 +13,8 @@
int getTotalWork(print_options *printOptions);
void find_all_templates();
void set_bundled_templates_as_read_only();
void copy_bundled_templates(QString src, QString dst, QStringList *templateBackupList);
extern QList<QString> grantlee_templates, grantlee_statistics_templates;