From 253783569bef2320d04fe1d310709c64c64fd3a1 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 16 Feb 2014 18:08:37 +0000 Subject: - custom list of time zones removed; - adaptation of ICQ for new Time API; - code cleaning git-svn-id: http://svn.miranda-ng.org/main/trunk@8140 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/IcqOscarJ/src/changeinfo/constants.cpp | 233 +++++++++-------------- 1 file changed, 92 insertions(+), 141 deletions(-) (limited to 'protocols/IcqOscarJ/src/changeinfo/constants.cpp') diff --git a/protocols/IcqOscarJ/src/changeinfo/constants.cpp b/protocols/IcqOscarJ/src/changeinfo/constants.cpp index 394505a519..0148fba616 100644 --- a/protocols/IcqOscarJ/src/changeinfo/constants.cpp +++ b/protocols/IcqOscarJ/src/changeinfo/constants.cpp @@ -25,157 +25,108 @@ // ChangeInfo Plugin stuff // // ----------------------------------------------------------------------------- -#include "icqoscar.h" +#include "icqoscar.h" -static FieldNamesItem timezones[]={ - {24 ,LPGEN("GMT-12:00 Eniwetok; Kwajalein")}, - {23 ,LPGEN("GMT-11:30")}, - {22 ,LPGEN("GMT-11:00 Midway Island; Samoa")}, - {21 ,LPGEN("GMT-10:30")}, - {20 ,LPGEN("GMT-10:00 Hawaii")}, - {19 ,LPGEN("GMT-9:30")}, - {18 ,LPGEN("GMT-9:00 Alaska")}, - {17 ,LPGEN("GMT-8:30")}, - {16 ,LPGEN("GMT-8:00 Pacific Time; Tijuana")}, - {15 ,LPGEN("GMT-7:30")}, - {14 ,LPGEN("GMT-7:00 Arizona; Mountain Time")}, - {13 ,LPGEN("GMT-6:30")}, - {12 ,LPGEN("GMT-6:00 Central Time; Central America; Saskatchewan")}, - {11 ,LPGEN("GMT-5:30")}, - {10 ,LPGEN("GMT-5:00 Eastern Time; Bogota; Lima; Quito")}, - {9 ,LPGEN("GMT-4:30")}, - {8 ,LPGEN("GMT-4:00 Atlantic Time; Santiago; Caracas; La Paz")}, - {7 ,LPGEN("GMT-3:30 Newfoundland")}, - {6 ,LPGEN("GMT-3:00 Greenland; Buenos Aires; Georgetown")}, - {5 ,LPGEN("GMT-2:30")}, - {4 ,LPGEN("GMT-2:00 Mid-Atlantic")}, - {3 ,LPGEN("GMT-1:30")}, - {2 ,LPGEN("GMT-1:00 Cape Verde Islands; Azores")}, - {1 ,LPGEN("GMT-0:30")}, - {0 ,LPGEN("GMT+0:00 London; Dublin; Edinburgh; Lisbon; Casablanca")}, - {-1 ,LPGEN("GMT+0:30")}, - {-2 ,LPGEN("GMT+1:00 Central European Time; West Central Africa; Warsaw")}, - {-3 ,LPGEN("GMT+1:30")}, - {-4 ,LPGEN("GMT+2:00 Jerusalem; Helsinki; Harare; Cairo; Bucharest; Athens")}, - {-5 ,LPGEN("GMT+2:30")}, - {-6 ,LPGEN("GMT+3:00 Moscow; St. Petersburg; Nairobi; Kuwait; Baghdad")}, - {-7 ,LPGEN("GMT+3:30 Tehran")}, - {-8 ,LPGEN("GMT+4:00 Baku; Tbilisi; Yerevan; Abu Dhabi; Muscat")}, - {-9 ,LPGEN("GMT+4:30 Kabul")}, - {-10 ,LPGEN("GMT+5:00 Calcutta; Chennai; Mumbai; New Delhi; Ekaterinburg")}, - {-11 ,LPGEN("GMT+5:30")}, - {-12 ,LPGEN("GMT+6:00 Astana; Dhaka; Almaty; Novosibirsk; Sri Jayawardenepura")}, - {-13 ,LPGEN("GMT+6:30 Rangoon")}, - {-14 ,LPGEN("GMT+7:00 Bankok; Hanoi; Jakarta; Krasnoyarsk")}, - {-15 ,LPGEN("GMT+7:30")}, - {-16 ,LPGEN("GMT+8:00 Perth; Taipei; Singapore; Hong Kong; Beijing")}, - {-17 ,LPGEN("GMT+8:30")}, - {-18 ,LPGEN("GMT+9:00 Tokyo; Osaka; Seoul; Sapporo; Yakutsk")}, - {-19 ,LPGEN("GMT+9:30 Darwin; Adelaide")}, - {-20 ,LPGEN("GMT+10:00 East Australia; Guam; Vladivostok")}, - {-21 ,LPGEN("GMT+10:30")}, - {-22 ,LPGEN("GMT+11:00 Magadan; Solomon Is.; New Caledonia")}, - {-23 ,LPGEN("GMT+11:30")}, - {-24 ,LPGEN("GMT+12:00 Auckland; Wellington; Fiji; Kamchatka; Marshall Is.")}, - {-100,NULL} +static FieldNamesItem months[] = { + { 1, LPGEN("January") }, + { 2, LPGEN("February") }, + { 3, LPGEN("March") }, + { 4, LPGEN("April") }, + { 5, LPGEN("May") }, + { 6, LPGEN("June") }, + { 7, LPGEN("July") }, + { 8, LPGEN("August") }, + { 9, LPGEN("September") }, + { 10, LPGEN("October") }, + { 11, LPGEN("November") }, + { 12, LPGEN("December") }, + { 0, NULL } }; +const int ageRange[] = { 13, 0x7FFF }; // 14, 130 +const int yearRange[] = { 1753, 0x7FFF }; // 1880, 2000 +const int dayRange[] = { 1, 31 }; -static FieldNamesItem months[]={ - {1, LPGEN("January")}, - {2, LPGEN("February")}, - {3, LPGEN("March")}, - {4, LPGEN("April")}, - {5, LPGEN("May")}, - {6, LPGEN("June")}, - {7, LPGEN("July")}, - {8, LPGEN("August")}, - {9, LPGEN("September")}, - {10,LPGEN("October")}, - {11,LPGEN("November")}, - {12,LPGEN("December")}, - {0, NULL} -}; +const SettingItem setting[] = +{ + // personal + { LPGEN("Personal"), LI_DIVIDER }, + { LPGEN("Nickname"), LI_STRING, DBVT_UTF8, "Nick" }, + { LPGEN("First name"), LI_STRING, DBVT_UTF8, "FirstName" }, + { LPGEN("Last name"), LI_STRING, DBVT_UTF8, "LastName" }, + { LPGEN("Gender"), LI_LIST, DBVT_BYTE, "Gender", genderField }, + { LPGEN("About"), LI_LONGSTRING, DBVT_UTF8, "About" }, + + // password + { LPGEN("Password"), LI_DIVIDER }, + { LPGEN("Password"), LI_STRING | LIF_PASSWORD, DBVT_UTF8, "Password" }, + // contact + { LPGEN("Contact"), LI_DIVIDER }, + { LPGEN("Primary e-mail"), LI_STRING, DBVT_UTF8, "e-mail0" }, + { LPGEN("Secondary e-mail"), LI_STRING, DBVT_UTF8, "e-mail1" }, + { LPGEN("Tertiary e-mail"), LI_STRING, DBVT_UTF8, "e-mail2" }, + { LPGEN("Homepage"), LI_STRING, DBVT_UTF8, "Homepage" }, + { LPGEN("Street"), LI_STRING, DBVT_UTF8, "Street" }, + { LPGEN("City"), LI_STRING, DBVT_UTF8, "City" }, + { LPGEN("State"), LI_STRING, DBVT_UTF8, "State" }, + { LPGEN("ZIP/postcode"), LI_STRING, DBVT_UTF8, "ZIP" }, + { LPGEN("Country"), LI_LIST, DBVT_WORD, "Country", countryField }, + { LPGEN("Phone number"), LI_STRING, DBVT_UTF8, "Phone" }, + { LPGEN("Fax number"), LI_STRING, DBVT_UTF8, "Fax" }, + { LPGEN("Cellular number"), LI_STRING, DBVT_UTF8, "Cellular" }, + + // more + { LPGEN("Personal Detail"), LI_DIVIDER }, + { LPGEN("Timezone"), LI_LIST | LIF_ZEROISVALID | LIF_SIGNED, DBVT_BYTE, "Timezone", timezonesField }, + { LPGEN("Year of birth"), LI_NUMBER, DBVT_WORD, "BirthYear", yearRange }, + { LPGEN("Month of birth"), LI_LIST, DBVT_BYTE, "BirthMonth", months }, + { LPGEN("Day of birth"), LI_NUMBER, DBVT_BYTE, "BirthDay", dayRange }, + { LPGEN("Marital Status"), LI_LIST, DBVT_BYTE, "MaritalStatus", maritalField }, + { LPGEN("Spoken language 1"), LI_LIST, DBVT_BYTE, "Language1", languageField }, + { LPGEN("Spoken language 2"), LI_LIST, DBVT_BYTE, "Language2", languageField }, + { LPGEN("Spoken language 3"), LI_LIST, DBVT_BYTE, "Language3", languageField }, -const int ageRange[]={13,0x7FFF}; // 14, 130 -const int yearRange[]={1753,0x7FFF}; // 1880, 2000 -const int dayRange[]={1,31}; + // more + { LPGEN("Originally from"), LI_DIVIDER }, + { LPGEN("Street"), LI_STRING, DBVT_UTF8, "OriginStreet" }, + { LPGEN("City"), LI_STRING, DBVT_UTF8, "OriginCity" }, + { LPGEN("State"), LI_STRING, DBVT_UTF8, "OriginState" }, + { LPGEN("Country"), LI_LIST, DBVT_WORD, "OriginCountry", countryField }, + // study + { LPGEN("Education"), LI_DIVIDER }, + { LPGEN("Level"), LI_LIST, DBVT_WORD, "StudyLevel", studyLevelField }, + { LPGEN("Institute"), LI_STRING, DBVT_UTF8, "StudyInstitute" }, + { LPGEN("Degree"), LI_STRING, DBVT_UTF8, "StudyDegree" }, + { LPGEN("Graduation Year"), LI_NUMBER, DBVT_WORD, "StudyYear", yearRange }, -const SettingItem setting[]={ - //personal - {LPGEN("Personal"), LI_DIVIDER}, - {LPGEN("Nickname"), LI_STRING, DBVT_UTF8, "Nick"}, - {LPGEN("First name"), LI_STRING, DBVT_UTF8, "FirstName"}, - {LPGEN("Last name"), LI_STRING, DBVT_UTF8, "LastName"}, - {LPGEN("Gender"), LI_LIST, DBVT_BYTE, "Gender", genderField}, - {LPGEN("About"), LI_LONGSTRING, DBVT_UTF8, "About"}, - //password - {LPGEN("Password"), LI_DIVIDER}, - {LPGEN("Password"), LI_STRING|LIF_PASSWORD,DBVT_UTF8, "Password"}, - //contact - {LPGEN("Contact"), LI_DIVIDER}, - {LPGEN("Primary e-mail"), LI_STRING, DBVT_UTF8, "e-mail0"}, - {LPGEN("Secondary e-mail"), LI_STRING, DBVT_UTF8, "e-mail1"}, - {LPGEN("Tertiary e-mail"), LI_STRING, DBVT_UTF8, "e-mail2"}, - {LPGEN("Homepage"), LI_STRING, DBVT_UTF8, "Homepage"}, - {LPGEN("Street"), LI_STRING, DBVT_UTF8, "Street"}, - {LPGEN("City"), LI_STRING, DBVT_UTF8, "City"}, - {LPGEN("State"), LI_STRING, DBVT_UTF8, "State"}, - {LPGEN("ZIP/postcode"), LI_STRING, DBVT_UTF8, "ZIP"}, - {LPGEN("Country"), LI_LIST, DBVT_WORD, "Country", countryField}, - {LPGEN("Phone number"), LI_STRING, DBVT_UTF8, "Phone"}, - {LPGEN("Fax number"), LI_STRING, DBVT_UTF8, "Fax"}, - {LPGEN("Cellular number"),LI_STRING, DBVT_UTF8, "Cellular"}, - //more - {LPGEN("Personal Detail"),LI_DIVIDER}, - {LPGEN("Timezone"), LI_LIST|LIF_ZEROISVALID|LIF_SIGNED,DBVT_BYTE, "Timezone", timezones}, - {LPGEN("Year of birth"), LI_NUMBER, DBVT_WORD, "BirthYear", yearRange}, - {LPGEN("Month of birth"), LI_LIST, DBVT_BYTE, "BirthMonth", months}, - {LPGEN("Day of birth"), LI_NUMBER, DBVT_BYTE, "BirthDay", dayRange}, - {LPGEN("Marital Status"), LI_LIST, DBVT_BYTE, "MaritalStatus", maritalField}, - {LPGEN("Spoken language 1"), LI_LIST, DBVT_BYTE, "Language1", languageField}, - {LPGEN("Spoken language 2"), LI_LIST, DBVT_BYTE, "Language2", languageField}, - {LPGEN("Spoken language 3"), LI_LIST, DBVT_BYTE, "Language3", languageField}, - //more - {LPGEN("Originally from"),LI_DIVIDER}, - {LPGEN("Street"), LI_STRING, DBVT_UTF8, "OriginStreet"}, - {LPGEN("City"), LI_STRING, DBVT_UTF8, "OriginCity"}, - {LPGEN("State"), LI_STRING, DBVT_UTF8, "OriginState"}, - {LPGEN("Country"), LI_LIST, DBVT_WORD, "OriginCountry", countryField}, - //study - {LPGEN("Education"), LI_DIVIDER}, - {LPGEN("Level"), LI_LIST, DBVT_WORD, "StudyLevel", studyLevelField}, - {LPGEN("Institute"), LI_STRING, DBVT_UTF8, "StudyInstitute"}, - {LPGEN("Degree"), LI_STRING, DBVT_UTF8, "StudyDegree"}, - {LPGEN("Graduation Year"),LI_NUMBER, DBVT_WORD, "StudyYear", yearRange}, - //work - {LPGEN("Work"), LI_DIVIDER}, - {LPGEN("Company name"), LI_STRING, DBVT_UTF8, "Company"}, - {LPGEN("Company homepage"),LI_STRING, DBVT_UTF8, "CompanyHomepage"}, - {LPGEN("Company street"), LI_STRING, DBVT_UTF8, "CompanyStreet"}, - {LPGEN("Company city"), LI_STRING, DBVT_UTF8, "CompanyCity"}, - {LPGEN("Company state"), LI_STRING, DBVT_UTF8, "CompanyState"}, - {LPGEN("Company phone"), LI_STRING, DBVT_UTF8, "CompanyPhone"}, - {LPGEN("Company fax"), LI_STRING, DBVT_UTF8, "CompanyFax"}, - {LPGEN("Company ZIP/postcode"),LI_STRING,DBVT_UTF8, "CompanyZIP"}, - {LPGEN("Company country"),LI_LIST, DBVT_WORD, "CompanyCountry", countryField}, - {LPGEN("Company department"),LI_STRING, DBVT_UTF8, "CompanyDepartment"}, - {LPGEN("Company position"),LI_STRING, DBVT_UTF8, "CompanyPosition"}, - {LPGEN("Company industry"),LI_LIST, DBVT_WORD, "CompanyIndustry", industryField}, + // work + { LPGEN("Work"), LI_DIVIDER }, + { LPGEN("Company name"), LI_STRING, DBVT_UTF8, "Company" }, + { LPGEN("Company homepage"), LI_STRING, DBVT_UTF8, "CompanyHomepage" }, + { LPGEN("Company street"), LI_STRING, DBVT_UTF8, "CompanyStreet" }, + { LPGEN("Company city"), LI_STRING, DBVT_UTF8, "CompanyCity" }, + { LPGEN("Company state"), LI_STRING, DBVT_UTF8, "CompanyState" }, + { LPGEN("Company phone"), LI_STRING, DBVT_UTF8, "CompanyPhone" }, + { LPGEN("Company fax"), LI_STRING, DBVT_UTF8, "CompanyFax" }, + { LPGEN("Company ZIP/postcode"), LI_STRING, DBVT_UTF8, "CompanyZIP" }, + { LPGEN("Company country"), LI_LIST, DBVT_WORD, "CompanyCountry", countryField }, + { LPGEN("Company department"), LI_STRING, DBVT_UTF8, "CompanyDepartment" }, + { LPGEN("Company position"), LI_STRING, DBVT_UTF8, "CompanyPosition" }, + { LPGEN("Company industry"), LI_LIST, DBVT_WORD, "CompanyIndustry", industryField }, - //interests - {LPGEN("Personal Interests"), LI_DIVIDER}, - {LPGEN("Interest category 1"),LI_LIST, DBVT_WORD, "Interest0Cat", interestsField}, - {LPGEN("Interest areas 1"),LI_STRING, DBVT_UTF8, "Interest0Text"}, - {LPGEN("Interest category 2"),LI_LIST, DBVT_WORD, "Interest1Cat", interestsField}, - {LPGEN("Interest areas 2"),LI_STRING, DBVT_UTF8, "Interest1Text"}, - {LPGEN("Interest category 3"),LI_LIST, DBVT_WORD, "Interest2Cat", interestsField}, - {LPGEN("Interest areas 3"),LI_STRING, DBVT_UTF8, "Interest2Text"}, - {LPGEN("Interest category 4"),LI_LIST, DBVT_WORD, "Interest3Cat", interestsField}, - {LPGEN("Interest areas 4"),LI_STRING, DBVT_UTF8, "Interest3Text"}, + //interests + { LPGEN("Personal Interests"), LI_DIVIDER }, + { LPGEN("Interest category 1"), LI_LIST, DBVT_WORD, "Interest0Cat", interestsField }, + { LPGEN("Interest areas 1"), LI_STRING, DBVT_UTF8, "Interest0Text" }, + { LPGEN("Interest category 2"), LI_LIST, DBVT_WORD, "Interest1Cat", interestsField }, + { LPGEN("Interest areas 2"), LI_STRING, DBVT_UTF8, "Interest1Text" }, + { LPGEN("Interest category 3"), LI_LIST, DBVT_WORD, "Interest2Cat", interestsField }, + { LPGEN("Interest areas 3"), LI_STRING, DBVT_UTF8, "Interest2Text" }, + { LPGEN("Interest category 4"), LI_LIST, DBVT_WORD, "Interest3Cat", interestsField }, + { LPGEN("Interest areas 4"), LI_STRING, DBVT_UTF8, "Interest3Text" }, }; const int settingCount = SIZEOF(setting); -- cgit v1.2.3