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

Some code corrections on fix of issue #235

Browse Source 
--HG--
branch : develop
This commit is contained in:
Felix Ulber 2015-02-26 22:34:33 +01:00
parent 1f0027fd22
commit 6ad6eda04a
4 changed files with 52 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/core/vsettings.cpp
View File

@ -40,7 +40,7 @@ const QString VSettings::SettingConfigurationSendReportState = QStringLiteral("
const QString VSettings::SettingConfigurationLocale = QStringLiteral("configuration/locale");
const QString VSettings::SettingConfigurationUnit = QStringLiteral("configuration/unit");
const QString VSettings::SettingConfigurationLabelLanguage = QStringLiteral("configuration/label_language");
const QString VSettings::SettingConfigurationConfirmItemDeletion= QStringLiteral("configuration/confirm_item_deletion");
const QString VSettings::SettingConfigurationConfirmItemDeletion = QStringLiteral("configuration/confirm_item_deletion");
const QString VSettings::SettingPathsIndividualMeasurements = QStringLiteral("paths/individual_measurements");
const QString VSettings::SettingPathsStandardMeasurements = QStringLiteral("paths/standard_measurements");

6
src/app/tools/vabstracttool.cpp
View File

@ -30,7 +30,7 @@
#include <QGraphicsView>
#include <QStyle>
#include <QtCore/qmath.h>
#include "checkablemessagebox.h"
#include "../../libs/vpropertyexplorer/checkablemessagebox.h"
#include "../undocommands/deltool.h"
#include "../core/vapplication.h"
#include "../geometry/vpointf.h"
@ -174,7 +174,9 @@ void VAbstractTool::DeleteTool(bool ask)
int VAbstractTool::ConfirmDeletion()
{
if (false == qApp->getSettings()->GetConfirmItemDelete())
{
return QMessageBox::Yes;
}
Utils::CheckableMessageBox msgBox(qApp->getMainWindow());
msgBox.setWindowTitle(tr("Confirm deletion"));
@ -186,7 +188,9 @@ int VAbstractTool::ConfirmDeletion()
int dialogResult = msgBox.exec();
if (dialogResult == QDialog::Accepted)
{
qApp->getSettings()->SetConfirmItemDelete(not msgBox.isChecked());
}
return dialogResult == QDialog::Accepted ? QMessageBox::Yes : QMessageBox::No;
}

31
src/libs/vpropertyexplorer/checkablemessagebox.cpp
View File

@ -2,30 +2,17 @@
**
** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
** Modified work Copyright 2015 Felix Ulber <felix.ulber(at)gmx.de>
** Modified work Copyright (C) 2015 Felix Ulber <felix.ulber(at)gmx.de>
**
** This file is part of Qt Creator.
** All rights reserved. This program and the accompanying materials are made
** available under the terms of the GNU Lesser General Public License (LGPL)
** version 2.1 which accompanies this distribution, and is available at
** http://www.gnu.org/licenses/lgpl-2.1.html
**
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and Digia. For licensing terms and
** conditions see http://www.qt.io/licensing. For further information
** use the contact form at http://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 or version 3 as published by the Free
** Software Foundation and appearing in the file LICENSE.LGPLv21 and
** LICENSE.LGPLv3 included in the packaging of this file. Please review the
** following information to ensure the GNU Lesser General Public License
** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Digia gives you certain additional
** rights. These rights are described in the Digia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
** This library is distributed in the hope that it will be useful, but WITHOUT
** ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
** FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
** for more details.
**
****************************************************************************/

31
src/libs/vpropertyexplorer/checkablemessagebox.h
View File

@ -2,30 +2,17 @@
**
** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
** Modified work Copyright 2015 Felix Ulber <felix.ulber(at)gmx.de>
** Modified work Copyright (C) 2015 Felix Ulber <felix.ulber(at)gmx.de>
**
** This file is part of Qt Creator.
** All rights reserved. This program and the accompanying materials are made
** available under the terms of the GNU Lesser General Public License (LGPL)
** version 2.1 which accompanies this distribution, and is available at
** http://www.gnu.org/licenses/lgpl-2.1.html
**
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and Digia. For licensing terms and
** conditions see http://www.qt.io/licensing. For further information
** use the contact form at http://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 or version 3 as published by the Free
** Software Foundation and appearing in the file LICENSE.LGPLv21 and
** LICENSE.LGPLv3 included in the packaging of this file. Please review the
** following information to ensure the GNU Lesser General Public License
** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Digia gives you certain additional
** rights. These rights are described in the Digia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
** This library is distributed in the hope that it will be useful, but WITHOUT
** ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
** FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
** for more details.
**
****************************************************************************/