From 6ad6eda04a3b95a5b094c119a34351f88c5cd23a Mon Sep 17 00:00:00 2001 From: Felix Ulber Date: Thu, 26 Feb 2015 22:34:33 +0100 Subject: [PATCH] Some code corrections on fix of issue #235 --HG-- branch : develop --- src/app/core/vsettings.cpp | 58 +++++++++---------- src/app/tools/vabstracttool.cpp | 6 +- .../vpropertyexplorer/checkablemessagebox.cpp | 31 +++------- .../vpropertyexplorer/checkablemessagebox.h | 31 +++------- 4 files changed, 52 insertions(+), 74 deletions(-) diff --git a/src/app/core/vsettings.cpp b/src/app/core/vsettings.cpp index 456fffd5b..199f1ce36 100644 --- a/src/app/core/vsettings.cpp +++ b/src/app/core/vsettings.cpp @@ -33,39 +33,39 @@ #include #include -const QString VSettings::SettingConfigurationOsSeparator = QStringLiteral("configuration/osSeparator"); -const QString VSettings::SettingConfigurationAutosaveState = QStringLiteral("configuration/autosave/state"); -const QString VSettings::SettingConfigurationAutosaveTime = QStringLiteral("configuration/autosave/time"); -const QString VSettings::SettingConfigurationSendReportState = QStringLiteral("configuration/send_report/state"); -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::SettingConfigurationOsSeparator = QStringLiteral("configuration/osSeparator"); +const QString VSettings::SettingConfigurationAutosaveState = QStringLiteral("configuration/autosave/state"); +const QString VSettings::SettingConfigurationAutosaveTime = QStringLiteral("configuration/autosave/time"); +const QString VSettings::SettingConfigurationSendReportState = QStringLiteral("configuration/send_report/state"); +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::SettingPathsIndividualMeasurements = QStringLiteral("paths/individual_measurements"); -const QString VSettings::SettingPathsStandardMeasurements = QStringLiteral("paths/standard_measurements"); -const QString VSettings::SettingPathsPattern = QStringLiteral("paths/pattern"); -const QString VSettings::SettingPathsLayout = QStringLiteral("paths/layout"); +const QString VSettings::SettingPathsIndividualMeasurements = QStringLiteral("paths/individual_measurements"); +const QString VSettings::SettingPathsStandardMeasurements = QStringLiteral("paths/standard_measurements"); +const QString VSettings::SettingPathsPattern = QStringLiteral("paths/pattern"); +const QString VSettings::SettingPathsLayout = QStringLiteral("paths/layout"); -const QString VSettings::SettingPatternUser = QStringLiteral("pattern/user"); -const QString VSettings::SettingPatternGraphicalOutput = QStringLiteral("pattern/graphicalOutput"); -const QString VSettings::SettingPatternUndo = QStringLiteral("pattern/undo"); +const QString VSettings::SettingPatternUser = QStringLiteral("pattern/user"); +const QString VSettings::SettingPatternGraphicalOutput = QStringLiteral("pattern/graphicalOutput"); +const QString VSettings::SettingPatternUndo = QStringLiteral("pattern/undo"); -const QString VSettings::SettingGeneralRecentFileList = QStringLiteral("recentFileList"); -const QString VSettings::SettingGeneralRestoreFileList = QStringLiteral("restoreFileList"); -const QString VSettings::SettingGeneralGeometry = QStringLiteral("geometry"); -const QString VSettings::SettingGeneralWindowState = QStringLiteral("windowState"); +const QString VSettings::SettingGeneralRecentFileList = QStringLiteral("recentFileList"); +const QString VSettings::SettingGeneralRestoreFileList = QStringLiteral("restoreFileList"); +const QString VSettings::SettingGeneralGeometry = QStringLiteral("geometry"); +const QString VSettings::SettingGeneralWindowState = QStringLiteral("windowState"); -const QString VSettings::SettingCommunityServer = QStringLiteral("community/server"); -const QString VSettings::SettingCommunityServerSecure = QStringLiteral("community/serverSecure"); -const QString VSettings::SettingCommunityUseProxy = QStringLiteral("community/useProxy"); -const QString VSettings::SettingCommunityProxyAddress = QStringLiteral("community/proxyAddress"); -const QString VSettings::SettingCommunityProxyPort = QStringLiteral("community/proxyPort"); -const QString VSettings::SettingCommunityProxyUser = QStringLiteral("community/proxyUser"); -const QString VSettings::SettingCommunityProxyPass = QStringLiteral("community/proxyPass"); -const QString VSettings::SettingCommunityUsername = QStringLiteral("community/username"); -const QString VSettings::SettingCommunitySavePassword = QStringLiteral("community/savePassword"); -const QString VSettings::SettingCommunityUserPassword = QStringLiteral("community/userpassword"); +const QString VSettings::SettingCommunityServer = QStringLiteral("community/server"); +const QString VSettings::SettingCommunityServerSecure = QStringLiteral("community/serverSecure"); +const QString VSettings::SettingCommunityUseProxy = QStringLiteral("community/useProxy"); +const QString VSettings::SettingCommunityProxyAddress = QStringLiteral("community/proxyAddress"); +const QString VSettings::SettingCommunityProxyPort = QStringLiteral("community/proxyPort"); +const QString VSettings::SettingCommunityProxyUser = QStringLiteral("community/proxyUser"); +const QString VSettings::SettingCommunityProxyPass = QStringLiteral("community/proxyPass"); +const QString VSettings::SettingCommunityUsername = QStringLiteral("community/username"); +const QString VSettings::SettingCommunitySavePassword = QStringLiteral("community/savePassword"); +const QString VSettings::SettingCommunityUserPassword = QStringLiteral("community/userpassword"); //--------------------------------------------------------------------------------------------------------------------- VSettings::VSettings(Format format, Scope scope, const QString &organization, const QString &application, diff --git a/src/app/tools/vabstracttool.cpp b/src/app/tools/vabstracttool.cpp index 38f2b3630..e79fb59e2 100644 --- a/src/app/tools/vabstracttool.cpp +++ b/src/app/tools/vabstracttool.cpp @@ -30,7 +30,7 @@ #include #include #include -#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; } diff --git a/src/libs/vpropertyexplorer/checkablemessagebox.cpp b/src/libs/vpropertyexplorer/checkablemessagebox.cpp index 205d07b67..9454417df 100644 --- a/src/libs/vpropertyexplorer/checkablemessagebox.cpp +++ b/src/libs/vpropertyexplorer/checkablemessagebox.cpp @@ -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 +** Modified work Copyright (C) 2015 Felix Ulber ** -** 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. ** ****************************************************************************/ diff --git a/src/libs/vpropertyexplorer/checkablemessagebox.h b/src/libs/vpropertyexplorer/checkablemessagebox.h index 233b505d6..3e209a987 100644 --- a/src/libs/vpropertyexplorer/checkablemessagebox.h +++ b/src/libs/vpropertyexplorer/checkablemessagebox.h @@ -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 +** Modified work Copyright (C) 2015 Felix Ulber ** -** 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. ** ****************************************************************************/