From 9a7a88eea249f8f87153c81eaba1245cda87982e Mon Sep 17 00:00:00 2001 From: Florian Geyer Date: Mon, 29 Oct 2012 19:05:51 +0100 Subject: [PATCH] Rename "Advanced" to "Properties" in EditGroupWidget. --- src/CMakeLists.txt | 2 +- src/gui/group/EditGroupWidget.cpp | 18 +++++++++--------- src/gui/group/EditGroupWidget.h | 4 ++-- ...dvanced.ui => EditGroupWidgetProperties.ui} | 0 4 files changed, 12 insertions(+), 12 deletions(-) rename src/gui/group/{EditGroupWidgetAdvanced.ui => EditGroupWidgetProperties.ui} (100%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e3b01714..d8a73d58 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -179,8 +179,8 @@ set(keepassx_FORMS gui/entry/EditEntryWidgetHistory.ui gui/entry/EditEntryWidgetMain.ui gui/entry/EditEntryWidgetNotes.ui - gui/group/EditGroupWidgetAdvanced.ui gui/group/EditGroupWidgetMain.ui + gui/group/EditGroupWidgetProperties.ui ) if(MINGW) diff --git a/src/gui/group/EditGroupWidget.cpp b/src/gui/group/EditGroupWidget.cpp index 83d82d1a..6649b6a0 100644 --- a/src/gui/group/EditGroupWidget.cpp +++ b/src/gui/group/EditGroupWidget.cpp @@ -16,8 +16,8 @@ */ #include "EditGroupWidget.h" -#include "ui_EditGroupWidgetAdvanced.h" #include "ui_EditGroupWidgetMain.h" +#include "ui_EditGroupWidgetProperties.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_advancedUi(new Ui::EditGroupWidgetAdvanced()) + , m_propertiesUi(new Ui::EditGroupWidgetAdvanced()) , m_editGroupWidgetMain(new QWidget()) , m_editGroupWidgetIcons(new EditWidgetIcons()) - , m_editGroupWidgetAdvanced(new QWidget()) + , m_editGroupWidgetProperties(new QWidget()) , m_group(Q_NULLPTR) { m_mainUi->setupUi(m_editGroupWidgetMain); - m_advancedUi->setupUi(m_editGroupWidgetAdvanced); + m_propertiesUi->setupUi(m_editGroupWidgetProperties); add(tr("Group"), m_editGroupWidgetMain); add(tr("Icon"), m_editGroupWidgetIcons); - add(tr("Advanced"), m_editGroupWidgetAdvanced); + add(tr("Properties"), m_editGroupWidgetProperties); addTriStateItems(m_mainUi->searchComboBox); addTriStateItems(m_mainUi->autotypeComboBox); @@ -69,13 +69,13 @@ void EditGroupWidget::loadGroup(Group* group, bool create, Database* database) m_mainUi->expireCheck->setChecked(group->timeInfo().expires()); m_mainUi->expireDatePicker->setDateTime(group->timeInfo().expiryTime().toLocalTime()); QString timeFormat("d MMM yyyy HH:mm:ss"); - m_advancedUi->modifiedEdit->setText( + m_propertiesUi->modifiedEdit->setText( group->timeInfo().lastModificationTime().toLocalTime().toString(timeFormat)); - m_advancedUi->createdEdit->setText( + m_propertiesUi->createdEdit->setText( group->timeInfo().creationTime().toLocalTime().toString(timeFormat)); - m_advancedUi->accessedEdit->setText( + m_propertiesUi->accessedEdit->setText( group->timeInfo().lastAccessTime().toLocalTime().toString(timeFormat)); - m_advancedUi->uuidEdit->setText(group->uuid().toHex()); + m_propertiesUi->uuidEdit->setText(group->uuid().toHex()); m_mainUi->searchComboBox->setCurrentIndex(indexFromTriState(group->searchingEnabled())); m_mainUi->autotypeComboBox->setCurrentIndex(indexFromTriState(group->autoTypeEnabled())); diff --git a/src/gui/group/EditGroupWidget.h b/src/gui/group/EditGroupWidget.h index 9f8da2c2..b7879b60 100644 --- a/src/gui/group/EditGroupWidget.h +++ b/src/gui/group/EditGroupWidget.h @@ -55,10 +55,10 @@ private: Group::TriState triStateFromIndex(int index); const QScopedPointer m_mainUi; - const QScopedPointer m_advancedUi; + const QScopedPointer m_propertiesUi; QWidget* const m_editGroupWidgetMain; EditWidgetIcons* const m_editGroupWidgetIcons; - QWidget* const m_editGroupWidgetAdvanced; + QWidget* const m_editGroupWidgetProperties; Group* m_group; Database* m_database; diff --git a/src/gui/group/EditGroupWidgetAdvanced.ui b/src/gui/group/EditGroupWidgetProperties.ui similarity index 100% rename from src/gui/group/EditGroupWidgetAdvanced.ui rename to src/gui/group/EditGroupWidgetProperties.ui