UInfoEx: fix for swapped icon names/descriptions (thanks dracosha for pointing me)

1 files changed, 71 insertions, 71 deletions

diff --git a/plugins/UserInfoEx/src/mir_icolib.cpp b/plugins/UserInfoEx/src/mir_icolib.cpp
index 311c01bca1..1e649580b7 100644
--- a/plugins/UserInfoEx/src/mir_icolib.cpp
+++ b/plugins/UserInfoEx/src/mir_icolib.cpp
@@ -30,101 +30,101 @@ static IconItem common[] =
 static IconItem icons1[] =

 {

 	// common

-	{ "common_im",           LPGEN("IM naming"),             IDI_MIRANDA                },

-	{ "common_female",       LPGEN("Female"),                IDI_FEMALE                 },

-	{ "common_male",         LPGEN("Male"),                  IDI_MALE                   },

-	{ "common_birthday",     LPGEN("Birthday"),              IDI_BIRTHDAY               },

-	{ "common_clock",        LPGEN("Timezone"),              IDI_CLOCK,              32 },

-	{ "common_marital",      LPGEN("Marital status"),        IDI_MARITAL                },

-	{ "common_address",      LPGEN("Address"),               IDI_TREE_ADDRESS           },

-	{ "common_anniversary",  LPGEN("Anniversary"),           IDI_ANNIVERSARY            },

+	{ LPGEN("IM naming"),             "common_im",           IDI_MIRANDA                },

+	{ LPGEN("Female"),                "common_female",       IDI_FEMALE                 },

+	{ LPGEN("Male"),                  "common_male",         IDI_MALE                   },

+	{ LPGEN("Birthday"),              "common_birthday",     IDI_BIRTHDAY               },

+	{ LPGEN("Timezone"),              "common_clock",        IDI_CLOCK,              32 },

+	{ LPGEN("Marital status"),        "common_marital",      IDI_MARITAL                },

+	{ LPGEN("Address"),               "common_address",      IDI_TREE_ADDRESS           },

+	{ LPGEN("Anniversary"),           "common_anniversary",  IDI_ANNIVERSARY            },

 

 	// zodiac

-	{ "zod_aquarius",        LPGEN("Aquarius"),              IDI_ZOD_AQUARIUS,      128 },

-	{ "zod_aries",           LPGEN("Aries"),                 IDI_ZOD_ARIES,         128 },

-	{ "zod_cancer",          LPGEN("Cancer"),                IDI_ZOD_CANCER,        128 },

-	{ "zod_capricorn",       LPGEN("Capricorn"),             IDI_ZOD_CAPRICORN,     128 },

-	{ "zod_gemini",          LPGEN("Gemini"),                IDI_ZOD_GEMINI,        128 },

-	{ "zod_leo",             LPGEN("Leo"),                   IDI_ZOD_LEO,           128 },

-	{ "zod_libra",           LPGEN("Libra"),                 IDI_ZOD_LIBRA,         128 },

-	{ "zod_pisces",          LPGEN("Pisces"),                IDI_ZOD_PISCES,        128 },

-	{ "zod_sagittarius",     LPGEN("Sagittarius"),           IDI_ZOD_SAGITTARIUS,   128 },

-	{ "zod_scorpio",         LPGEN("Scorpio"),               IDI_ZOD_SCORPIO,       128 },

-	{ "zod_taurus",          LPGEN("Taurus"),                IDI_ZOD_TAURUS,        128 },

-	{ "zod_virgo",           LPGEN("Virgo"),                 IDI_ZOD_VIRGO,         128 },

+	{ LPGEN("Aquarius"),              "zod_aquarius",        IDI_ZOD_AQUARIUS,      128 },

+	{ LPGEN("Aries"),                 "zod_aries",           IDI_ZOD_ARIES,         128 },

+	{ LPGEN("Cancer"),                "zod_cancer",          IDI_ZOD_CANCER,        128 },

+	{ LPGEN("Capricorn"),             "zod_capricorn",       IDI_ZOD_CAPRICORN,     128 },

+	{ LPGEN("Gemini"),                "zod_gemini",          IDI_ZOD_GEMINI,        128 },

+	{ LPGEN("Leo"),                   "zod_leo",             IDI_ZOD_LEO,           128 },

+	{ LPGEN("Libra"),                 "zod_libra",           IDI_ZOD_LIBRA,         128 },

+	{ LPGEN("Pisces"),                "zod_pisces",          IDI_ZOD_PISCES,        128 },

+	{ LPGEN("Sagittarius"),           "zod_sagittarius",     IDI_ZOD_SAGITTARIUS,   128 },

+	{ LPGEN("Scorpio"),               "zod_scorpio",         IDI_ZOD_SCORPIO,       128 },

+	{ LPGEN("Taurus"),                "zod_taurus",          IDI_ZOD_TAURUS,        128 },

+	{ LPGEN("Virgo"),                 "zod_virgo",           IDI_ZOD_VIRGO,         128 },

 

 	// lists

-	{ "lst_modules",         LPGEN("Export: modules"),       IDI_LST_MODULES            },

-	{ "lst_folder",          LPGEN("Export: folder"),        IDI_LST_FOLDER             },

+	{ LPGEN("Export: modules"),       "lst_modules",         IDI_LST_MODULES            },

+	{ LPGEN("Export: folder"),        "lst_folder",          IDI_LST_FOLDER             },

 };

 

 static IconItem icons2[] =

 {

 	// tree

-	{ "tree_default",        LPGEN("Default"),               IDI_LST_FOLDER             },

+	{ LPGEN("Default"),               "tree_default",        IDI_LST_FOLDER             },

 };

 

 static IconItem icons3[] =

 {

 	// dialogs

-	{ "dlg_details",         LPGEN("Details info bar"),      IDI_DLG_DETAILS,        48 },

-	{ "dlg_phone",           LPGEN("Phone info bar"),        IDI_DLG_PHONE,          32 },

-	{ "dlg_email",           LPGEN("E-mail info bar"),       IDI_DLG_EMAIL,          32 },

-	{ "dlg_export",          LPGEN("Export VCard"),          IDI_EXPORT,             32 },

-	{ "dlg_import",          LPGEN("Import VCard"),          IDI_IMPORT,             32 },

-	{ "dlg_anniversary",     LPGEN("Anniversary info bar"),  IDI_ANNIVERSARY,        32 },

+	{ LPGEN("Details info bar"),      "dlg_details",         IDI_DLG_DETAILS,        48 },

+	{ LPGEN("Phone info bar"),        "dlg_phone",           IDI_DLG_PHONE,          32 },

+	{ LPGEN("E-mail info bar"),       "dlg_email",           IDI_DLG_EMAIL,          32 },

+	{ LPGEN("Export VCard"),          "dlg_export",          IDI_EXPORT,             32 },

+	{ LPGEN("Import VCard"),          "dlg_import",          IDI_IMPORT,             32 },

+	{ LPGEN("Anniversary info bar"),  "dlg_anniversary",     IDI_ANNIVERSARY,        32 },

 };

 

 static IconItem icons4[] =

 {

 	// button icons

-	{ "btn_update",          LPGEN("Update"),                IDI_BTN_UPDATE             },

-	{ "btn_import",          LPGEN("Import"),                IDI_IMPORT                 },

-	{ "btn_export",          LPGEN("Export"),                IDI_EXPORT                 },

-	{ "btn_ok",              LPGEN("OK"),                    IDI_BTN_OK                 },

-	{ "btn_cancel",          LPGEN("Cancel"),                IDI_BTN_CLOSE              },

-	{ "btn_apply",           LPGEN("Apply"),                 IDI_BTN_APPLY              },

-	{ "btn_goto",            LPGEN("Goto"),                  IDI_BTN_GOTO               },

-	{ "btn_phone",           LPGEN("Phone"),                 IDI_BTN_PHONE              },

-	{ "btn_fax",             LPGEN("Fax"),                   IDI_BTN_FAX                },

-	{ "btn_cellular",        LPGEN("Cellular"),              IDI_BTN_CELLULAR           },

-	{ "btn_customphone",     LPGEN("Custom phone"),          IDI_BTN_CUSTOMPHONE        },

-	{ "btn_email",           LPGEN("E-mail"),                IDI_BTN_EMAIL              },

-	{ "btn_downarrow",       LPGEN("Down arrow"),            IDI_BTN_DOWNARROW          },

-	{ "btn_add",             LPGEN("Add"),                   IDI_BTN_ADD                },

-	{ "btn_edit",            LPGEN("Edit"),                  IDI_BTN_EDIT               },

-	{ "btn_delete",          LPGEN("Delete"),                IDI_BTN_DELETE             },

-	{ "btn_search",          LPGEN("Search"),                IDI_SEARCH                 },

-	{ "btn_eximport",        LPGEN("Export/import"),         IDI_BTN_EXIMPORT           },

-	{ "btn_bdaybackup",      LPGEN("Backup birthday"),       IDI_BTN_BIRTHDAY_BACKUP    },

+	{ LPGEN("Update"),                "btn_update",          IDI_BTN_UPDATE             },

+	{ LPGEN("Import"),                "btn_import",          IDI_IMPORT                 },

+	{ LPGEN("Export"),                "btn_export",          IDI_EXPORT                 },

+	{ LPGEN("OK"),                    "btn_ok",              IDI_BTN_OK                 },

+	{ LPGEN("Cancel"),                "btn_cancel",          IDI_BTN_CLOSE              },

+	{ LPGEN("Apply"),                 "btn_apply",           IDI_BTN_APPLY              },

+	{ LPGEN("Goto"),                  "btn_goto",            IDI_BTN_GOTO               },

+	{ LPGEN("Phone"),                 "btn_phone",           IDI_BTN_PHONE              },

+	{ LPGEN("Fax"),                   "btn_fax",             IDI_BTN_FAX                },

+	{ LPGEN("Cellular"),              "btn_cellular",        IDI_BTN_CELLULAR           },

+	{ LPGEN("Custom phone"),          "btn_customphone",     IDI_BTN_CUSTOMPHONE        },

+	{ LPGEN("E-mail"),                "btn_email",           IDI_BTN_EMAIL              },

+	{ LPGEN("Down arrow"),            "btn_downarrow",       IDI_BTN_DOWNARROW          },

+	{ LPGEN("Add"),                   "btn_add",             IDI_BTN_ADD                },

+	{ LPGEN("Edit"),                  "btn_edit",            IDI_BTN_EDIT               },

+	{ LPGEN("Delete"),                "btn_delete",          IDI_BTN_DELETE             },

+	{ LPGEN("Search"),                "btn_search",          IDI_SEARCH                 },

+	{ LPGEN("Export/import"),         "btn_eximport",        IDI_BTN_EXIMPORT           },

+	{ LPGEN("Backup birthday"),       "btn_bdaybackup",      IDI_BTN_BIRTHDAY_BACKUP    },

 };

 

 static IconItem icons5[] =

 {

 	// birthday and anniversary

-	{ "rmd_dtb0",            LPGEN("Birthday today"),        IDI_RMD_DTB0 },

-	{ "rmd_dtb1",            LPGEN("Birthday tomorrow"),     IDI_RMD_DTB1 },

-	{ "rmd_dtb2",            LPGEN("Birthday in 2 days"),    IDI_RMD_DTB2 },

-	{ "rmd_dtb3",            LPGEN("Birthday in 3 days"),    IDI_RMD_DTB3 },

-	{ "rmd_dtb4",            LPGEN("Birthday in 4 days"),    IDI_RMD_DTB4 },

-	{ "rmd_dtb5",            LPGEN("Birthday in 5 days"),    IDI_RMD_DTB5 },

-	{ "rmd_dtb6",            LPGEN("Birthday in 6 days"),    IDI_RMD_DTB6 },

-	{ "rmd_dtb7",            LPGEN("Birthday in 7 days"),    IDI_RMD_DTB7 },

-	{ "rmd_dtb8",            LPGEN("Birthday in 8 days"),    IDI_RMD_DTB8 },

-	{ "rmd_dtb9",            LPGEN("Birthday in 9 days"),    IDI_RMD_DTB9 },

-	{ "rmd_dtbx",            LPGEN("Birthday later"),        IDI_RMD_DTBX },

-

-	{ "rmd_dta0",            LPGEN("Anniversary today"),     IDI_RMD_DTA0 },

-	{ "rmd_dta1",            LPGEN("Anniversary tomorrow"),  IDI_RMD_DTA1 },

-	{ "rmd_dta2",            LPGEN("Anniversary in 2 days"), IDI_RMD_DTA2 },

-	{ "rmd_dta3",            LPGEN("Anniversary in 3 days"), IDI_RMD_DTA3 },

-	{ "rmd_dta4",            LPGEN("Anniversary in 4 days"), IDI_RMD_DTA4 },

-	{ "rmd_dta5",            LPGEN("Anniversary in 5 days"), IDI_RMD_DTA5 },

-	{ "rmd_dta6",            LPGEN("Anniversary in 6 days"), IDI_RMD_DTA6 },

-	{ "rmd_dta7",            LPGEN("Anniversary in 7 days"), IDI_RMD_DTA7 },

-	{ "rmd_dta8",            LPGEN("Anniversary in 8 days"), IDI_RMD_DTA8 },

-	{ "rmd_dta9",            LPGEN("Anniversary in 9 days"), IDI_RMD_DTA9 },

-	{ "rmd_dtax",            LPGEN("Anniversary later"),     IDI_RMD_DTAX },

+	{ LPGEN("Birthday today"),        "rmd_dtb0",            IDI_RMD_DTB0 },

+	{ LPGEN("Birthday tomorrow"),     "rmd_dtb1",            IDI_RMD_DTB1 },

+	{ LPGEN("Birthday in 2 days"),    "rmd_dtb2",            IDI_RMD_DTB2 },

+	{ LPGEN("Birthday in 3 days"),    "rmd_dtb3",            IDI_RMD_DTB3 },

+	{ LPGEN("Birthday in 4 days"),    "rmd_dtb4",            IDI_RMD_DTB4 },

+	{ LPGEN("Birthday in 5 days"),    "rmd_dtb5",            IDI_RMD_DTB5 },

+	{ LPGEN("Birthday in 6 days"),    "rmd_dtb6",            IDI_RMD_DTB6 },

+	{ LPGEN("Birthday in 7 days"),    "rmd_dtb7",            IDI_RMD_DTB7 },

+	{ LPGEN("Birthday in 8 days"),    "rmd_dtb8",            IDI_RMD_DTB8 },

+	{ LPGEN("Birthday in 9 days"),    "rmd_dtb9",            IDI_RMD_DTB9 },

+	{ LPGEN("Birthday later"),        "rmd_dtbx",            IDI_RMD_DTBX },

+

+	{ LPGEN("Anniversary today"),     "rmd_dta0",            IDI_RMD_DTA0 },

+	{ LPGEN("Anniversary tomorrow"),  "rmd_dta1",            IDI_RMD_DTA1 },

+	{ LPGEN("Anniversary in 2 days"), "rmd_dta2",            IDI_RMD_DTA2 },

+	{ LPGEN("Anniversary in 3 days"), "rmd_dta3",            IDI_RMD_DTA3 },

+	{ LPGEN("Anniversary in 4 days"), "rmd_dta4",            IDI_RMD_DTA4 },

+	{ LPGEN("Anniversary in 5 days"), "rmd_dta5",            IDI_RMD_DTA5 },

+	{ LPGEN("Anniversary in 6 days"), "rmd_dta6",            IDI_RMD_DTA6 },

+	{ LPGEN("Anniversary in 7 days"), "rmd_dta7",            IDI_RMD_DTA7 },

+	{ LPGEN("Anniversary in 8 days"), "rmd_dta8",            IDI_RMD_DTA8 },

+	{ LPGEN("Anniversary in 9 days"), "rmd_dta9",            IDI_RMD_DTA9 },

+	{ LPGEN("Anniversary later"),     "rmd_dtax",            IDI_RMD_DTAX },

 };

 

 /////////////////////////////////////////////////////////////////////////////////////////