-rw-r--r-- | noncore/apps/zsafe/zsafe.cpp | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/noncore/apps/zsafe/zsafe.cpp b/noncore/apps/zsafe/zsafe.cpp index ef16b46..e86b3d2 100644 --- a/noncore/apps/zsafe/zsafe.cpp +++ b/noncore/apps/zsafe/zsafe.cpp | |||
@@ -2599,2 +2599,3 @@ void ZSafe::addCategory() | |||
2599 | QString categ; | 2599 | QString categ; |
2600 | QString firstCategory; | ||
2600 | dialog->CategoryField->clear(); // remove all items | 2601 | dialog->CategoryField->clear(); // remove all items |
@@ -2620,2 +2621,4 @@ void ZSafe::addCategory() | |||
2620 | dialog->CategoryField->insertItem (categ, -1); | 2621 | dialog->CategoryField->insertItem (categ, -1); |
2622 | if (firstCategory.isEmpty()) | ||
2623 | firstCategory = categ; | ||
2621 | } | 2624 | } |
@@ -2626,3 +2629,6 @@ void ZSafe::addCategory() | |||
2626 | 2629 | ||
2630 | if (firstCategory.isEmpty()) | ||
2627 | setCategoryDialogFields(dialog); | 2631 | setCategoryDialogFields(dialog); |
2632 | else | ||
2633 | setCategoryDialogFields(dialog, firstCategory); | ||
2628 | 2634 | ||
@@ -2788,2 +2794,8 @@ void ZSafe::setCategoryDialogFields(CategoryDialog *dialog) | |||
2788 | { | 2794 | { |
2795 | if (!dialog) | ||
2796 | return; | ||
2797 | |||
2798 | QString icon; | ||
2799 | if (selectedItem) | ||
2800 | { | ||
2789 | dialog->Field1->setText(getFieldLabel (selectedItem, "1", tr("Name"))); | 2801 | dialog->Field1->setText(getFieldLabel (selectedItem, "1", tr("Name"))); |
@@ -2795,3 +2807,2 @@ void ZSafe::setCategoryDialogFields(CategoryDialog *dialog) | |||
2795 | 2807 | ||
2796 | QString icon; | ||
2797 | Category *cat= categories.find (selectedItem->text(0)); | 2808 | Category *cat= categories.find (selectedItem->text(0)); |
@@ -2801,2 +2812,12 @@ void ZSafe::setCategoryDialogFields(CategoryDialog *dialog) | |||
2801 | } | 2812 | } |
2813 | } | ||
2814 | else | ||
2815 | { | ||
2816 | dialog->Field1->setText(tr("Name")); | ||
2817 | dialog->Field2->setText(tr("Username")); | ||
2818 | dialog->Field3->setText(tr("Password")); | ||
2819 | dialog->Field4->setText(tr("Comment")); | ||
2820 | dialog->Field5->setText(tr("Field 4")); | ||
2821 | dialog->Field6->setText(tr("Field 5")); | ||
2822 | } | ||
2802 | 2823 | ||
@@ -2840,2 +2861,5 @@ void ZSafe::setCategoryDialogFields(CategoryDialog *dialog, QString category) | |||
2840 | { | 2861 | { |
2862 | if (!dialog) | ||
2863 | return; | ||
2864 | |||
2841 | dialog->Field1->setText(getFieldLabel (category, "1", tr("Name"))); | 2865 | dialog->Field1->setText(getFieldLabel (category, "1", tr("Name"))); |