From afe2c00841ae58281408a6c254a4c0a90fc29ac9 Mon Sep 17 00:00:00 2001 From: Florian Geyer Date: Mon, 29 Oct 2012 19:26:24 +0100 Subject: [PATCH] Rename "EditGroupWidgetProperties" to "EditWidgetProperties". --- src/CMakeLists.txt | 2 +- ...roupWidgetProperties.ui => EditWidgetProperties.ui} | 4 ++-- src/gui/group/EditGroupWidget.cpp | 10 +++++----- src/gui/group/EditGroupWidget.h | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) rename src/gui/{group/EditGroupWidgetProperties.ui => EditWidgetProperties.ui} (96%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d8a73d58a..6c98904e6 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -169,6 +169,7 @@ set(keepassx_FORMS gui/DatabaseSettingsWidget.ui gui/EditWidget.ui gui/EditWidgetIcons.ui + gui/EditWidgetProperties.ui gui/MainWindow.ui gui/SearchWidget.ui gui/SettingsWidgetGeneral.ui @@ -180,7 +181,6 @@ set(keepassx_FORMS gui/entry/EditEntryWidgetMain.ui gui/entry/EditEntryWidgetNotes.ui gui/group/EditGroupWidgetMain.ui - gui/group/EditGroupWidgetProperties.ui ) if(MINGW) diff --git a/src/gui/group/EditGroupWidgetProperties.ui b/src/gui/EditWidgetProperties.ui similarity index 96% rename from src/gui/group/EditGroupWidgetProperties.ui rename to src/gui/EditWidgetProperties.ui index ed9039bb1..bcf71cccf 100644 --- a/src/gui/group/EditGroupWidgetProperties.ui +++ b/src/gui/EditWidgetProperties.ui @@ -1,7 +1,7 @@ - EditGroupWidgetAdvanced - + EditWidgetProperties + 0 diff --git a/src/gui/group/EditGroupWidget.cpp b/src/gui/group/EditGroupWidget.cpp index 6649b6a04..0b2dc5428 100644 --- a/src/gui/group/EditGroupWidget.cpp +++ b/src/gui/group/EditGroupWidget.cpp @@ -17,7 +17,7 @@ #include "EditGroupWidget.h" #include "ui_EditGroupWidgetMain.h" -#include "ui_EditGroupWidgetProperties.h" +#include "ui_EditWidgetProperties.h" #include "ui_EditWidget.h" #include "core/Metadata.h" @@ -26,18 +26,18 @@ EditGroupWidget::EditGroupWidget(QWidget* parent) : EditWidget(parent) , m_mainUi(new Ui::EditGroupWidgetMain()) - , m_propertiesUi(new Ui::EditGroupWidgetAdvanced()) + , m_propertiesUi(new Ui::EditWidgetProperties()) , m_editGroupWidgetMain(new QWidget()) , m_editGroupWidgetIcons(new EditWidgetIcons()) - , m_editGroupWidgetProperties(new QWidget()) + , m_editWidgetProperties(new QWidget()) , m_group(Q_NULLPTR) { m_mainUi->setupUi(m_editGroupWidgetMain); - m_propertiesUi->setupUi(m_editGroupWidgetProperties); + m_propertiesUi->setupUi(m_editWidgetProperties); add(tr("Group"), m_editGroupWidgetMain); add(tr("Icon"), m_editGroupWidgetIcons); - add(tr("Properties"), m_editGroupWidgetProperties); + add(tr("Properties"), m_editWidgetProperties); addTriStateItems(m_mainUi->searchComboBox); addTriStateItems(m_mainUi->autotypeComboBox); diff --git a/src/gui/group/EditGroupWidget.h b/src/gui/group/EditGroupWidget.h index b7879b606..eb92d733c 100644 --- a/src/gui/group/EditGroupWidget.h +++ b/src/gui/group/EditGroupWidget.h @@ -27,8 +27,8 @@ class EditWidgetIcons; namespace Ui { - class EditGroupWidgetAdvanced; class EditGroupWidgetMain; + class EditWidgetProperties; class EditWidget; } @@ -55,10 +55,10 @@ private: Group::TriState triStateFromIndex(int index); const QScopedPointer m_mainUi; - const QScopedPointer m_propertiesUi; + const QScopedPointer m_propertiesUi; QWidget* const m_editGroupWidgetMain; EditWidgetIcons* const m_editGroupWidgetIcons; - QWidget* const m_editGroupWidgetProperties; + QWidget* const m_editWidgetProperties; Group* m_group; Database* m_database;