aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactoring.

Browse Source
This commit is contained in:
Roman Telezhynskyi 2023-05-09 19:28:11 +03:00
parent fbbcf5320f
commit 4a7ce91f65
2 changed files with 73 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/libs/vlayout/dialogs/watermarkwindow.cpp
View File

@ -50,11 +50,10 @@
#include "../vformat/vwatermark.h"
//---------------------------------------------------------------------------------------------------------------------
WatermarkWindow::WatermarkWindow(const QString &patternPath, QWidget *parent) :
QMainWindow(parent),
WatermarkWindow::WatermarkWindow(const QString &patternPath, QWidget *parent)
: QMainWindow(parent),
ui(new Ui::WatermarkWindow),
m_patternPath(patternPath),
m_okPathColor()
m_patternPath(patternPath)
{
ui->setupUi(this);
m_okPathColor = ui->lineEditPath->palette().color(ui->lineEditPath->foregroundRole());
@ -274,7 +273,7 @@ void WatermarkWindow::showEvent(QShowEvent *event)
// do your init stuff here
QSize sz = VAbstractApplication::VApp()->Settings()->GetWatermarkEditorSize();
if (sz.isEmpty() == false)
if (not sz.isEmpty())
{
resize(sz);
}
@ -384,21 +383,20 @@ auto WatermarkWindow::on_actionSave_triggered() -> bool
{
return on_actionSaveAs_triggered();
}
else
{
if (m_curFileFormatVersion < VWatermarkConverter::WatermarkMaxVer
&& not ContinueFormatRewrite(m_curFileFormatVersionStr, VWatermarkConverter::WatermarkMaxVerStr))
if (m_curFileFormatVersion < VWatermarkConverter::WatermarkMaxVer &&
not ContinueFormatRewrite(m_curFileFormatVersionStr, VWatermarkConverter::WatermarkMaxVerStr))
{
return false;
}
//#ifdef Q_OS_WIN32
// qt_ntfs_permission_lookup++; // turn checking on
//#endif /*Q_OS_WIN32*/
// #ifdef Q_OS_WIN32
// qt_ntfs_permission_lookup++; // turn checking on
// #endif /*Q_OS_WIN32*/
const bool isFileWritable = QFileInfo(m_curFile).isWritable();
//#ifdef Q_OS_WIN32
// qt_ntfs_permission_lookup--; // turn it off again
//#endif /*Q_OS_WIN32*/
// #ifdef Q_OS_WIN32
// qt_ntfs_permission_lookup--; // turn it off again
// #endif /*Q_OS_WIN32*/
if (not isFileWritable)
{
QMessageBox messageBox(this);
@ -410,14 +408,14 @@ auto WatermarkWindow::on_actionSave_triggered() -> bool
if (messageBox.exec() == QMessageBox::Yes)
{
//#ifdef Q_OS_WIN32
// qt_ntfs_permission_lookup++; // turn checking on
//#endif /*Q_OS_WIN32*/
bool changed = QFile::setPermissions(m_curFile,
QFileInfo(m_curFile).permissions() | QFileDevice::WriteUser);
//#ifdef Q_OS_WIN32
// qt_ntfs_permission_lookup--; // turn it off again
//#endif /*Q_OS_WIN32*/
// #ifdef Q_OS_WIN32
// qt_ntfs_permission_lookup++; // turn checking on
// #endif /*Q_OS_WIN32*/
bool changed =
QFile::setPermissions(m_curFile, QFileInfo(m_curFile).permissions() | QFileDevice::WriteUser);
// #ifdef Q_OS_WIN32
// qt_ntfs_permission_lookup--; // turn it off again
// #endif /*Q_OS_WIN32*/
if (not changed)
{
@ -455,7 +453,6 @@ auto WatermarkWindow::on_actionSave_triggered() -> bool
messageBox.exec();
}
return result;
}
}
//---------------------------------------------------------------------------------------------------------------------
@ -607,11 +604,8 @@ auto WatermarkWindow::ContinueFormatRewrite(const QString &currentFormatVersion,
VAbstractApplication::VApp()->Settings()->SetConfirmFormatRewriting(not msgBox.isChecked());
return true;
}
else
{
return false;
}
}
return true;
}
@ -652,7 +646,7 @@ void WatermarkWindow::SetCurrentFile(const QString &fileName)
}
//---------------------------------------------------------------------------------------------------------------------
auto WatermarkWindow::OpenNewEditor(const QString &fileName) const -> bool
auto WatermarkWindow::OpenNewEditor(const QString &fileName) -> bool
{
if (this->isWindowModified() || not m_curFile.isEmpty())
{

16
src/libs/vlayout/dialogs/watermarkwindow.h
View File

@ -44,7 +44,7 @@ class WatermarkWindow : public QMainWindow
public:
explicit WatermarkWindow(const QString &patternPath, QWidget *parent = nullptr);
~WatermarkWindow();
~WatermarkWindow() override;
auto CurrentFile() const -> QString;
@ -52,13 +52,13 @@ public:
signals:
void New();
void OpenAnother(const QString &fileName) const;
void OpenAnother(const QString &fileName);
protected:
virtual void closeEvent(QCloseEvent *event) override;
virtual void changeEvent(QEvent* event) override;
virtual void showEvent(QShowEvent *event) override;
virtual void resizeEvent(QResizeEvent *event) override;
void closeEvent(QCloseEvent *event) override;
void changeEvent(QEvent *event) override;
void showEvent(QShowEvent *event) override;
void resizeEvent(QResizeEvent *event) override;
private slots:
void on_actionNew_triggered();
@ -76,7 +76,7 @@ private:
QString m_patternPath;
QString m_curFile{};
VWatermarkData m_data{};
QColor m_okPathColor;
QColor m_okPathColor{};
bool m_isInitialized{false};
unsigned m_curFileFormatVersion{0x0};
@ -92,7 +92,7 @@ private:
auto ContinueFormatRewrite(const QString &currentFormatVersion, const QString &maxFormatVersion) -> bool;
auto SaveWatermark(const QString &fileName, QString &error) -> bool;
void SetCurrentFile(const QString &fileName);
auto OpenNewEditor(const QString &fileName = QString()) const -> bool;
auto OpenNewEditor(const QString &fileName = QString()) -> bool;
void Clear();
auto IgnoreLocking(int error, const QString &path) -> bool;
void ShowWatermark();