From fbb1f9776b18104886c18d01b85331742a5e9764 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 5 Apr 2013 15:25:10 +0100 Subject: convert address template dialog to .ui seeing as it's an obscure dialog I didn't invest time in moving all the entries into the .ui and rework the scrolling logic Change-Id: If1dccbf01901bf4f754e49d5b38baf2033316410 --- svtools/inc/svtools/addresstemplate.hxx | 20 +++++------------ svtools/inc/svtools/helpid.hrc | 2 -- svtools/inc/svtools/svtools.hrc | 38 +++++++++++++++++++++++++++++++++ 3 files changed, 43 insertions(+), 17 deletions(-) (limited to 'svtools/inc') diff --git a/svtools/inc/svtools/addresstemplate.hxx b/svtools/inc/svtools/addresstemplate.hxx index d9b5148ae0ff..d7406235b9a6 100644 --- a/svtools/inc/svtools/addresstemplate.hxx +++ b/svtools/inc/svtools/addresstemplate.hxx @@ -22,10 +22,10 @@ #include "svtools/svtdllapi.h" #include -#include #include #include #include +#include #include #include #include @@ -47,20 +47,10 @@ namespace svt { protected: // Controls - FixedLine m_aDatasourceFrame; - FixedText m_aDatasourceLabel; - ComboBox m_aDatasource; - PushButton m_aAdministrateDatasources; - FixedText m_aTableLabel; - ComboBox m_aTable; - - FixedText m_aFieldsTitle; - Window m_aFieldsFrame; - - ScrollBar m_aFieldScroller; - OKButton m_aOK; - CancelButton m_aCancel; - HelpButton m_aHelp; + ComboBox* m_pDatasource; + PushButton* m_pAdministrateDatasources; + ComboBox* m_pTable; + ScrollBar* m_pFieldScroller; // string to display for "no selection" const String m_sNoFieldSelection; diff --git a/svtools/inc/svtools/helpid.hrc b/svtools/inc/svtools/helpid.hrc index 990a9237fa68..0751c5b70cd7 100644 --- a/svtools/inc/svtools/helpid.hrc +++ b/svtools/inc/svtools/helpid.hrc @@ -59,8 +59,6 @@ #define HID_TEMPLATEDLG_TB_DOCINFO "SVT_HID_TEMPLATEDLG_TB_DOCINFO" #define HID_TEMPLATEDLG_TB_PREVIEW "SVT_HID_TEMPLATEDLG_TB_PREVIEW" -#define HID_ADDRTEMPL_FIELD_ASSIGNMENT "SVT_HID_ADDRTEMPL_FIELD_ASSIGNMENT" - // Help ids for the filepicker dialogs #define HID_EXPLORERDLG_FILE "SVT_HID_EXPLORERDLG_FILE" diff --git a/svtools/inc/svtools/svtools.hrc b/svtools/inc/svtools/svtools.hrc index 4afca7358f2e..ea04f469df35 100644 --- a/svtools/inc/svtools/svtools.hrc +++ b/svtools/inc/svtools/svtools.hrc @@ -216,6 +216,44 @@ //manually in sync with STR_ARR_SVT_LANGUAGE_TABLE #define STR_ARR_SVT_LANGUAGE_TABLE_END (STR_ARR_SVT_LANGUAGE_TABLE) +#define STR_SVT_ADDRESSTEMPLATE_START (STR_ARR_SVT_LANGUAGE_TABLE_END+1) +#define STR_NO_FIELD_SELECTION (STR_SVT_ADDRESSTEMPLATE_START+0) +#define STR_FIELD_COMPANY (STR_SVT_ADDRESSTEMPLATE_START+1) +#define STR_FIELD_DEPARTMENT (STR_SVT_ADDRESSTEMPLATE_START+2) +#define STR_FIELD_FIRSTNAME (STR_SVT_ADDRESSTEMPLATE_START+3) +#define STR_FIELD_LASTNAME (STR_SVT_ADDRESSTEMPLATE_START+4) +#define STR_FIELD_STREET (STR_SVT_ADDRESSTEMPLATE_START+5) +#define STR_FIELD_COUNTRY (STR_SVT_ADDRESSTEMPLATE_START+6) +#define STR_FIELD_ZIPCODE (STR_SVT_ADDRESSTEMPLATE_START+7) +#define STR_FIELD_CITY (STR_SVT_ADDRESSTEMPLATE_START+8) +#define STR_FIELD_TITLE (STR_SVT_ADDRESSTEMPLATE_START+9) +#define STR_FIELD_POSITION (STR_SVT_ADDRESSTEMPLATE_START+10) +#define STR_FIELD_ADDRFORM (STR_SVT_ADDRESSTEMPLATE_START+11) +#define STR_FIELD_INITIALS (STR_SVT_ADDRESSTEMPLATE_START+12) +#define STR_FIELD_SALUTATION (STR_SVT_ADDRESSTEMPLATE_START+13) +#define STR_FIELD_HOMETEL (STR_SVT_ADDRESSTEMPLATE_START+14) +#define STR_FIELD_WORKTEL (STR_SVT_ADDRESSTEMPLATE_START+15) +#define STR_FIELD_FAX (STR_SVT_ADDRESSTEMPLATE_START+16) +#define STR_FIELD_EMAIL (STR_SVT_ADDRESSTEMPLATE_START+17) +#define STR_FIELD_URL (STR_SVT_ADDRESSTEMPLATE_START+18) +#define STR_FIELD_NOTE (STR_SVT_ADDRESSTEMPLATE_START+19) +#define STR_FIELD_USER1 (STR_SVT_ADDRESSTEMPLATE_START+20) +#define STR_FIELD_USER2 (STR_SVT_ADDRESSTEMPLATE_START+21) +#define STR_FIELD_USER3 (STR_SVT_ADDRESSTEMPLATE_START+22) +#define STR_FIELD_USER4 (STR_SVT_ADDRESSTEMPLATE_START+23) +#define STR_FIELD_ID (STR_SVT_ADDRESSTEMPLATE_START+24) +#define STR_FIELD_STATE (STR_SVT_ADDRESSTEMPLATE_START+25) +#define STR_FIELD_OFFICETEL (STR_SVT_ADDRESSTEMPLATE_START+26) +#define STR_FIELD_PAGER (STR_SVT_ADDRESSTEMPLATE_START+27) +#define STR_FIELD_MOBILE (STR_SVT_ADDRESSTEMPLATE_START+28) +#define STR_FIELD_TELOTHER (STR_SVT_ADDRESSTEMPLATE_START+29) +#define STR_FIELD_CALENDAR (STR_SVT_ADDRESSTEMPLATE_START+30) +#define STR_FIELD_INVITE (STR_SVT_ADDRESSTEMPLATE_START+31) +#define STR_LOGICAL_FIELD_NAMES (STR_SVT_ADDRESSTEMPLATE_START+32) +#define STR_SVT_ADDRESSTEMPLATE_END (STR_LOGICAL_FIELD_NAMES) + + + //............................................................................. // dialogs -- cgit