author | zecke <zecke> | 2004-10-16 00:01:01 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-10-16 00:01:01 (UTC) |
commit | df14f647ff1a60ca82e0fa9bd91458be146153b8 (patch) (unidiff) | |
tree | 4859961352851a4392e1442f2080c15bff8ad7bc /noncore/apps/zsafe | |
parent | 419f9710c488f56a7a117eb1529970d3371e0094 (diff) | |
download | opie-df14f647ff1a60ca82e0fa9bd91458be146153b8.zip opie-df14f647ff1a60ca82e0fa9bd91458be146153b8.tar.gz opie-df14f647ff1a60ca82e0fa9bd91458be146153b8.tar.bz2 |
Replace QPEApplication::qpeDir() + "/ with
QPEApplication::qpeDir() + "
as it is guranteed that qpeDir() will have '/' as the last
charachter
-rw-r--r-- | noncore/apps/zsafe/zsafe.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/noncore/apps/zsafe/zsafe.cpp b/noncore/apps/zsafe/zsafe.cpp index 6aa6392..1ae3b15 100644 --- a/noncore/apps/zsafe/zsafe.cpp +++ b/noncore/apps/zsafe/zsafe.cpp | |||
@@ -2755,49 +2755,49 @@ void ZSafe::addCategory() | |||
2755 | firstCategory = categ; | 2755 | firstCategory = categ; |
2756 | } | 2756 | } |
2757 | } | 2757 | } |
2758 | ++it; | 2758 | ++it; |
2759 | } | 2759 | } |
2760 | 2760 | ||
2761 | 2761 | ||
2762 | if (firstCategory.isEmpty()) | 2762 | if (firstCategory.isEmpty()) |
2763 | setCategoryDialogFields(dialog); | 2763 | setCategoryDialogFields(dialog); |
2764 | else | 2764 | else |
2765 | setCategoryDialogFields(dialog, firstCategory); | 2765 | setCategoryDialogFields(dialog, firstCategory); |
2766 | 2766 | ||
2767 | // CategoryDialog *dialog = new CategoryDialog(this, "Category", TRUE); | 2767 | // CategoryDialog *dialog = new CategoryDialog(this, "Category", TRUE); |
2768 | 2768 | ||
2769 | if (initIcons) | 2769 | if (initIcons) |
2770 | { | 2770 | { |
2771 | Wait waitDialog(this, tr("Wait dialog")); | 2771 | Wait waitDialog(this, tr("Wait dialog")); |
2772 | waitDialog.waitLabel->setText(tr("Gathering icons...")); | 2772 | waitDialog.waitLabel->setText(tr("Gathering icons...")); |
2773 | waitDialog.show(); | 2773 | waitDialog.show(); |
2774 | qApp->processEvents(); | 2774 | qApp->processEvents(); |
2775 | 2775 | ||
2776 | #ifdef DESKTOP | 2776 | #ifdef DESKTOP |
2777 | QDir d(iconPath); | 2777 | QDir d(iconPath); |
2778 | #else | 2778 | #else |
2779 | QDir d(QPEApplication::qpeDir() + "/pics/"); | 2779 | QDir d(QPEApplication::qpeDir() + "pics/"); |
2780 | #endif | 2780 | #endif |
2781 | d.setFilter( QDir::Files); | 2781 | d.setFilter( QDir::Files); |
2782 | 2782 | ||
2783 | const QFileInfoList *list = d.entryInfoList(); | 2783 | const QFileInfoList *list = d.entryInfoList(); |
2784 | QFileInfoListIterator it( *list ); // create list iterator | 2784 | QFileInfoListIterator it( *list ); // create list iterator |
2785 | QFileInfo *fi; // pointer for traversing | 2785 | QFileInfo *fi; // pointer for traversing |
2786 | 2786 | ||
2787 | dialog->IconField->insertItem("predefined"); | 2787 | dialog->IconField->insertItem("predefined"); |
2788 | while ( (fi=it.current()) ) { // for each file... | 2788 | while ( (fi=it.current()) ) { // for each file... |
2789 | QString fileName = fi->fileName(); | 2789 | QString fileName = fi->fileName(); |
2790 | if(fileName.right(4) == ".png"){ | 2790 | if(fileName.right(4) == ".png"){ |
2791 | fileName = fileName.mid(0,fileName.length()-4); | 2791 | fileName = fileName.mid(0,fileName.length()-4); |
2792 | #ifdef DESKTOP | 2792 | #ifdef DESKTOP |
2793 | QPixmap imageOfFile; | 2793 | QPixmap imageOfFile; |
2794 | imageOfFile.load(iconPath + fi->fileName()); | 2794 | imageOfFile.load(iconPath + fi->fileName()); |
2795 | #else | 2795 | #else |
2796 | QPixmap imageOfFile(Resource::loadPixmap(fileName)); | 2796 | QPixmap imageOfFile(Resource::loadPixmap(fileName)); |
2797 | #endif | 2797 | #endif |
2798 | QImage foo = imageOfFile.convertToImage(); | 2798 | QImage foo = imageOfFile.convertToImage(); |
2799 | foo = foo.smoothScale(16,16); | 2799 | foo = foo.smoothScale(16,16); |
2800 | imageOfFile.convertFromImage(foo); | 2800 | imageOfFile.convertFromImage(foo); |
2801 | dialog->IconField->insertItem(imageOfFile,fileName); | 2801 | dialog->IconField->insertItem(imageOfFile,fileName); |
2802 | } | 2802 | } |
2803 | ++it; | 2803 | ++it; |
@@ -2939,49 +2939,49 @@ void ZSafe::setCategoryDialogFields(CategoryDialog *dialog) | |||
2939 | dialog->Field5->setText(getFieldLabel (selectedItem, "5", tr("Field 4"))); | 2939 | dialog->Field5->setText(getFieldLabel (selectedItem, "5", tr("Field 4"))); |
2940 | dialog->Field6->setText(getFieldLabel (selectedItem, "6", tr("Field 5"))); | 2940 | dialog->Field6->setText(getFieldLabel (selectedItem, "6", tr("Field 5"))); |
2941 | 2941 | ||
2942 | Category *cat= categories.find (selectedItem->text(0)); | 2942 | Category *cat= categories.find (selectedItem->text(0)); |
2943 | if (cat) | 2943 | if (cat) |
2944 | { | 2944 | { |
2945 | icon = cat->getIconName(); | 2945 | icon = cat->getIconName(); |
2946 | } | 2946 | } |
2947 | else | 2947 | else |
2948 | icon = conf->readEntry(APP_KEY+selectedItem->text(0)); | 2948 | icon = conf->readEntry(APP_KEY+selectedItem->text(0)); |
2949 | } | 2949 | } |
2950 | else | 2950 | else |
2951 | { | 2951 | { |
2952 | dialog->Field1->setText(tr("Name")); | 2952 | dialog->Field1->setText(tr("Name")); |
2953 | dialog->Field2->setText(tr("Username")); | 2953 | dialog->Field2->setText(tr("Username")); |
2954 | dialog->Field3->setText(tr("Password")); | 2954 | dialog->Field3->setText(tr("Password")); |
2955 | dialog->Field4->setText(tr("Comment")); | 2955 | dialog->Field4->setText(tr("Comment")); |
2956 | dialog->Field5->setText(tr("Field 4")); | 2956 | dialog->Field5->setText(tr("Field 4")); |
2957 | dialog->Field6->setText(tr("Field 5")); | 2957 | dialog->Field6->setText(tr("Field 5")); |
2958 | } | 2958 | } |
2959 | 2959 | ||
2960 | #ifdef DESKTOP | 2960 | #ifdef DESKTOP |
2961 | QDir d(iconPath); | 2961 | QDir d(iconPath); |
2962 | #else | 2962 | #else |
2963 | QDir d(QPEApplication::qpeDir() + "/pics/"); | 2963 | QDir d(QPEApplication::qpeDir() + "pics/"); |
2964 | #endif | 2964 | #endif |
2965 | d.setFilter( QDir::Files); | 2965 | d.setFilter( QDir::Files); |
2966 | 2966 | ||
2967 | const QFileInfoList *list = d.entryInfoList(); | 2967 | const QFileInfoList *list = d.entryInfoList(); |
2968 | int i=0; | 2968 | int i=0; |
2969 | QFileInfoListIterator it( *list ); // create list iterator | 2969 | QFileInfoListIterator it( *list ); // create list iterator |
2970 | QFileInfo *fi; // pointer for traversing | 2970 | QFileInfo *fi; // pointer for traversing |
2971 | if (icon.isEmpty() || icon.isNull()) | 2971 | if (icon.isEmpty() || icon.isNull()) |
2972 | { | 2972 | { |
2973 | dialog->IconField->setCurrentItem(0); | 2973 | dialog->IconField->setCurrentItem(0); |
2974 | } | 2974 | } |
2975 | else | 2975 | else |
2976 | { | 2976 | { |
2977 | while ( (fi=it.current()) ) | 2977 | while ( (fi=it.current()) ) |
2978 | { // for each file... | 2978 | { // for each file... |
2979 | QString fileName = fi->fileName(); | 2979 | QString fileName = fi->fileName(); |
2980 | if(fileName.right(4) == ".png") | 2980 | if(fileName.right(4) == ".png") |
2981 | { | 2981 | { |
2982 | fileName = fileName.mid(0,fileName.length()-4); | 2982 | fileName = fileName.mid(0,fileName.length()-4); |
2983 | 2983 | ||
2984 | if(fileName+".png"==icon) | 2984 | if(fileName+".png"==icon) |
2985 | { | 2985 | { |
2986 | dialog->IconField->setCurrentItem(i+1); | 2986 | dialog->IconField->setCurrentItem(i+1); |
2987 | break; | 2987 | break; |
@@ -2996,49 +2996,49 @@ void ZSafe::setCategoryDialogFields(CategoryDialog *dialog) | |||
2996 | void ZSafe::setCategoryDialogFields(CategoryDialog *dialog, QString category) | 2996 | void ZSafe::setCategoryDialogFields(CategoryDialog *dialog, QString category) |
2997 | { | 2997 | { |
2998 | if (!dialog) | 2998 | if (!dialog) |
2999 | return; | 2999 | return; |
3000 | 3000 | ||
3001 | dialog->Field1->setText(getFieldLabel (category, "1", tr("Name"))); | 3001 | dialog->Field1->setText(getFieldLabel (category, "1", tr("Name"))); |
3002 | dialog->Field2->setText(getFieldLabel (category, "2", tr("Username"))); | 3002 | dialog->Field2->setText(getFieldLabel (category, "2", tr("Username"))); |
3003 | dialog->Field3->setText(getFieldLabel (category, "3", tr("Password"))); | 3003 | dialog->Field3->setText(getFieldLabel (category, "3", tr("Password"))); |
3004 | dialog->Field4->setText(getFieldLabel (category, "4", tr("Comment"))); | 3004 | dialog->Field4->setText(getFieldLabel (category, "4", tr("Comment"))); |
3005 | dialog->Field5->setText(getFieldLabel (category, "5", tr("Field 4"))); | 3005 | dialog->Field5->setText(getFieldLabel (category, "5", tr("Field 4"))); |
3006 | dialog->Field6->setText(getFieldLabel (category, "6", tr("Field 5"))); | 3006 | dialog->Field6->setText(getFieldLabel (category, "6", tr("Field 5"))); |
3007 | 3007 | ||
3008 | QString icon; | 3008 | QString icon; |
3009 | Category *cat= categories.find (category); | 3009 | Category *cat= categories.find (category); |
3010 | if (cat) | 3010 | if (cat) |
3011 | { | 3011 | { |
3012 | icon = cat->getIconName(); | 3012 | icon = cat->getIconName(); |
3013 | } | 3013 | } |
3014 | else | 3014 | else |
3015 | icon = conf->readEntry(APP_KEY+category); | 3015 | icon = conf->readEntry(APP_KEY+category); |
3016 | 3016 | ||
3017 | #ifdef DESKTOP | 3017 | #ifdef DESKTOP |
3018 | QDir d(iconPath); | 3018 | QDir d(iconPath); |
3019 | #else | 3019 | #else |
3020 | QDir d(QPEApplication::qpeDir() + "/pics/"); | 3020 | QDir d(QPEApplication::qpeDir() + "pics/"); |
3021 | #endif | 3021 | #endif |
3022 | d.setFilter( QDir::Files); | 3022 | d.setFilter( QDir::Files); |
3023 | 3023 | ||
3024 | const QFileInfoList *list = d.entryInfoList(); | 3024 | const QFileInfoList *list = d.entryInfoList(); |
3025 | int i=0; | 3025 | int i=0; |
3026 | QFileInfoListIterator it( *list ); // create list iterator | 3026 | QFileInfoListIterator it( *list ); // create list iterator |
3027 | QFileInfo *fi; // pointer for traversing | 3027 | QFileInfo *fi; // pointer for traversing |
3028 | if (icon.isEmpty() || icon.isNull()) | 3028 | if (icon.isEmpty() || icon.isNull()) |
3029 | { | 3029 | { |
3030 | dialog->IconField->setCurrentItem(0); | 3030 | dialog->IconField->setCurrentItem(0); |
3031 | } | 3031 | } |
3032 | else | 3032 | else |
3033 | { | 3033 | { |
3034 | while ( (fi=it.current()) ) | 3034 | while ( (fi=it.current()) ) |
3035 | { // for each file... | 3035 | { // for each file... |
3036 | QString fileName = fi->fileName(); | 3036 | QString fileName = fi->fileName(); |
3037 | if(fileName.right(4) == ".png") | 3037 | if(fileName.right(4) == ".png") |
3038 | { | 3038 | { |
3039 | fileName = fileName.mid(0,fileName.length()-4); | 3039 | fileName = fileName.mid(0,fileName.length()-4); |
3040 | 3040 | ||
3041 | if(fileName+".png"==icon) | 3041 | if(fileName+".png"==icon) |
3042 | { | 3042 | { |
3043 | dialog->IconField->setCurrentItem(i+1); | 3043 | dialog->IconField->setCurrentItem(i+1); |
3044 | break; | 3044 | break; |
@@ -3175,92 +3175,92 @@ void ZSafe::editCategory() | |||
3175 | if (!foundCategory) | 3175 | if (!foundCategory) |
3176 | { | 3176 | { |
3177 | dialog->CategoryField->insertItem (category, i); | 3177 | dialog->CategoryField->insertItem (category, i); |
3178 | dialog->CategoryField->setCurrentItem(i); | 3178 | dialog->CategoryField->setCurrentItem(i); |
3179 | } | 3179 | } |
3180 | 3180 | ||
3181 | QString icon; | 3181 | QString icon; |
3182 | Category *cat= categories.find (selectedItem->text(0)); | 3182 | Category *cat= categories.find (selectedItem->text(0)); |
3183 | if (cat) | 3183 | if (cat) |
3184 | { | 3184 | { |
3185 | icon = cat->getIconName(); | 3185 | icon = cat->getIconName(); |
3186 | } | 3186 | } |
3187 | 3187 | ||
3188 | if (initIcons) | 3188 | if (initIcons) |
3189 | { | 3189 | { |
3190 | 3190 | ||
3191 | Wait waitDialog(this, tr("Wait dialog")); | 3191 | Wait waitDialog(this, tr("Wait dialog")); |
3192 | waitDialog.waitLabel->setText(tr("Gathering icons...")); | 3192 | waitDialog.waitLabel->setText(tr("Gathering icons...")); |
3193 | waitDialog.show(); | 3193 | waitDialog.show(); |
3194 | qApp->processEvents(); | 3194 | qApp->processEvents(); |
3195 | 3195 | ||
3196 | #ifdef DESKTOP | 3196 | #ifdef DESKTOP |
3197 | QDir d(iconPath); | 3197 | QDir d(iconPath); |
3198 | #else | 3198 | #else |
3199 | QDir d(QPEApplication::qpeDir() + "/pics/"); | 3199 | QDir d(QPEApplication::qpeDir() + "pics/"); |
3200 | #endif | 3200 | #endif |
3201 | d.setFilter( QDir::Files); | 3201 | d.setFilter( QDir::Files); |
3202 | 3202 | ||
3203 | const QFileInfoList *list = d.entryInfoList(); | 3203 | const QFileInfoList *list = d.entryInfoList(); |
3204 | int i=0; | 3204 | int i=0; |
3205 | QFileInfoListIterator it( *list ); // create list iterator | 3205 | QFileInfoListIterator it( *list ); // create list iterator |
3206 | QFileInfo *fi; // pointer for traversing | 3206 | QFileInfo *fi; // pointer for traversing |
3207 | if (icon.isEmpty() || icon.isNull()) | 3207 | if (icon.isEmpty() || icon.isNull()) |
3208 | { | 3208 | { |
3209 | dialog->IconField->setCurrentItem(0); | 3209 | dialog->IconField->setCurrentItem(0); |
3210 | } | 3210 | } |
3211 | 3211 | ||
3212 | dialog->IconField->insertItem("predefined"); | 3212 | dialog->IconField->insertItem("predefined"); |
3213 | while ( (fi=it.current()) ) { // for each file... | 3213 | while ( (fi=it.current()) ) { // for each file... |
3214 | QString fileName = fi->fileName(); | 3214 | QString fileName = fi->fileName(); |
3215 | if(fileName.right(4) == ".png") | 3215 | if(fileName.right(4) == ".png") |
3216 | { | 3216 | { |
3217 | fileName = fileName.mid(0,fileName.length()-4); | 3217 | fileName = fileName.mid(0,fileName.length()-4); |
3218 | #ifdef DESKTOP | 3218 | #ifdef DESKTOP |
3219 | QPixmap imageOfFile; | 3219 | QPixmap imageOfFile; |
3220 | imageOfFile.load(iconPath + fi->fileName()); | 3220 | imageOfFile.load(iconPath + fi->fileName()); |
3221 | #else | 3221 | #else |
3222 | QPixmap imageOfFile(Resource::loadPixmap(fileName)); | 3222 | QPixmap imageOfFile(Resource::loadPixmap(fileName)); |
3223 | #endif | 3223 | #endif |
3224 | QImage foo = imageOfFile.convertToImage(); | 3224 | QImage foo = imageOfFile.convertToImage(); |
3225 | foo = foo.smoothScale(16,16); | 3225 | foo = foo.smoothScale(16,16); |
3226 | imageOfFile.convertFromImage(foo); | 3226 | imageOfFile.convertFromImage(foo); |
3227 | dialog->IconField->insertItem(imageOfFile,fileName); | 3227 | dialog->IconField->insertItem(imageOfFile,fileName); |
3228 | if(fileName+".png"==icon) | 3228 | if(fileName+".png"==icon) |
3229 | dialog->IconField->setCurrentItem(i+1); | 3229 | dialog->IconField->setCurrentItem(i+1); |
3230 | ++i; | 3230 | ++i; |
3231 | } | 3231 | } |
3232 | ++it; | 3232 | ++it; |
3233 | } | 3233 | } |
3234 | waitDialog.hide(); | 3234 | waitDialog.hide(); |
3235 | } | 3235 | } |
3236 | else | 3236 | else |
3237 | { | 3237 | { |
3238 | #ifdef DESKTOP | 3238 | #ifdef DESKTOP |
3239 | // QDir d(QDir::homeDirPath() + "/pics/"); | 3239 | // QDir d(QDir::homeDirPath() + "/pics/"); |
3240 | QDir d(iconPath); | 3240 | QDir d(iconPath); |
3241 | #else | 3241 | #else |
3242 | QDir d(QPEApplication::qpeDir() + "/pics/"); | 3242 | QDir d(QPEApplication::qpeDir() + "pics/"); |
3243 | #endif | 3243 | #endif |
3244 | d.setFilter( QDir::Files); | 3244 | d.setFilter( QDir::Files); |
3245 | 3245 | ||
3246 | const QFileInfoList *list = d.entryInfoList(); | 3246 | const QFileInfoList *list = d.entryInfoList(); |
3247 | int i=0; | 3247 | int i=0; |
3248 | QFileInfoListIterator it( *list ); // create list iterator | 3248 | QFileInfoListIterator it( *list ); // create list iterator |
3249 | QFileInfo *fi; // pointer for traversing | 3249 | QFileInfo *fi; // pointer for traversing |
3250 | if (icon.isEmpty() || icon.isNull()) | 3250 | if (icon.isEmpty() || icon.isNull()) |
3251 | { | 3251 | { |
3252 | dialog->IconField->setCurrentItem(0); | 3252 | dialog->IconField->setCurrentItem(0); |
3253 | } | 3253 | } |
3254 | else | 3254 | else |
3255 | { | 3255 | { |
3256 | 3256 | ||
3257 | while ( (fi=it.current()) ) | 3257 | while ( (fi=it.current()) ) |
3258 | { // for each file... | 3258 | { // for each file... |
3259 | QString fileName = fi->fileName(); | 3259 | QString fileName = fi->fileName(); |
3260 | if(fileName.right(4) == ".png") | 3260 | if(fileName.right(4) == ".png") |
3261 | { | 3261 | { |
3262 | fileName = fileName.mid(0,fileName.length()-4); | 3262 | fileName = fileName.mid(0,fileName.length()-4); |
3263 | 3263 | ||
3264 | 3264 | ||
3265 | if(fileName+".png"==icon) | 3265 | if(fileName+".png"==icon) |
3266 | { | 3266 | { |