Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-12-30 09:46:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Rename "EditGroupWidgetProperties" to "EditWidgetProperties".

Browse Source
This commit is contained in:
Florian Geyer 2012-10-29 19:26:24 +01:00
parent 9a7a88eea2
commit afe2c00841
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/CMakeLists.txt
View File

@ -169,6 +169,7 @@ set(keepassx_FORMS
gui/DatabaseSettingsWidget.ui gui/DatabaseSettingsWidget.ui
gui/EditWidget.ui gui/EditWidget.ui
gui/EditWidgetIcons.ui gui/EditWidgetIcons.ui
gui/EditWidgetProperties.ui
gui/MainWindow.ui gui/MainWindow.ui
gui/SearchWidget.ui gui/SearchWidget.ui
gui/SettingsWidgetGeneral.ui gui/SettingsWidgetGeneral.ui
@ -180,7 +181,6 @@ set(keepassx_FORMS
gui/entry/EditEntryWidgetMain.ui gui/entry/EditEntryWidgetMain.ui
gui/entry/EditEntryWidgetNotes.ui gui/entry/EditEntryWidgetNotes.ui
gui/group/EditGroupWidgetMain.ui gui/group/EditGroupWidgetMain.ui
gui/group/EditGroupWidgetProperties.ui
) )
if(MINGW) if(MINGW)

4
src/gui/group/EditGroupWidgetProperties.ui → src/gui/EditWidgetProperties.ui
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<class>EditGroupWidgetAdvanced</class> <class>EditWidgetProperties</class>
<widget class="QWidget" name="EditGroupWidgetAdvanced"> <widget class="QWidget" name="EditWidgetProperties">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>

10
src/gui/group/EditGroupWidget.cpp
View File

@ -17,7 +17,7 @@
#include "EditGroupWidget.h" #include "EditGroupWidget.h"
#include "ui_EditGroupWidgetMain.h" #include "ui_EditGroupWidgetMain.h"
#include "ui_EditGroupWidgetProperties.h" #include "ui_EditWidgetProperties.h"
#include "ui_EditWidget.h" #include "ui_EditWidget.h"
#include "core/Metadata.h" #include "core/Metadata.h"
@ -26,18 +26,18 @@
EditGroupWidget::EditGroupWidget(QWidget* parent) EditGroupWidget::EditGroupWidget(QWidget* parent)
: EditWidget(parent) : EditWidget(parent)
, m_mainUi(new Ui::EditGroupWidgetMain()) , m_mainUi(new Ui::EditGroupWidgetMain())
, m_propertiesUi(new Ui::EditGroupWidgetAdvanced()) , m_propertiesUi(new Ui::EditWidgetProperties())
, m_editGroupWidgetMain(new QWidget()) , m_editGroupWidgetMain(new QWidget())
, m_editGroupWidgetIcons(new EditWidgetIcons()) , m_editGroupWidgetIcons(new EditWidgetIcons())
, m_editGroupWidgetProperties(new QWidget()) , m_editWidgetProperties(new QWidget())
, m_group(Q_NULLPTR) , m_group(Q_NULLPTR)
{ {
m_mainUi->setupUi(m_editGroupWidgetMain); m_mainUi->setupUi(m_editGroupWidgetMain);
m_propertiesUi->setupUi(m_editGroupWidgetProperties); m_propertiesUi->setupUi(m_editWidgetProperties);
add(tr("Group"), m_editGroupWidgetMain); add(tr("Group"), m_editGroupWidgetMain);
add(tr("Icon"), m_editGroupWidgetIcons); add(tr("Icon"), m_editGroupWidgetIcons);
add(tr("Properties"), m_editGroupWidgetProperties); add(tr("Properties"), m_editWidgetProperties);
addTriStateItems(m_mainUi->searchComboBox); addTriStateItems(m_mainUi->searchComboBox);
addTriStateItems(m_mainUi->autotypeComboBox); addTriStateItems(m_mainUi->autotypeComboBox);

6
src/gui/group/EditGroupWidget.h
View File

@ -27,8 +27,8 @@
class EditWidgetIcons; class EditWidgetIcons;
namespace Ui { namespace Ui {
class EditGroupWidgetAdvanced;
class EditGroupWidgetMain; class EditGroupWidgetMain;
class EditWidgetProperties;
class EditWidget; class EditWidget;
} }
@ -55,10 +55,10 @@ private:
Group::TriState triStateFromIndex(int index); Group::TriState triStateFromIndex(int index);
const QScopedPointer<Ui::EditGroupWidgetMain> m_mainUi; const QScopedPointer<Ui::EditGroupWidgetMain> m_mainUi;
const QScopedPointer<Ui::EditGroupWidgetAdvanced> m_propertiesUi; const QScopedPointer<Ui::EditWidgetProperties> m_propertiesUi;
QWidget* const m_editGroupWidgetMain; QWidget* const m_editGroupWidgetMain;
EditWidgetIcons* const m_editGroupWidgetIcons; EditWidgetIcons* const m_editGroupWidgetIcons;
QWidget* const m_editGroupWidgetProperties; QWidget* const m_editWidgetProperties;
Group* m_group; Group* m_group;
Database* m_database; Database* m_database;