Skip to content

C
core
Kaydet (Commit) fbb1f977 authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

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
üst 13821254
Expand all Show whitespace changes
Inline Side-by-side
Showing with 142 additions and 322 deletions
svtools/UI_svt.mk
Dosyayı görüntüle @ fbb1f977
......@@ -10,6 +10,7 @@
$(eval $(call gb_UI_UI,svt))
$(eval $(call gb_UI_add_uifiles,svt,\
svtools/uiconfig/ui/addresstemplatedialog \
svtools/uiconfig/ui/graphicexport \
svtools/uiconfig/ui/placeedit \
svtools/uiconfig/ui/printersetupdialog \
......
svtools/inc/svtools/addresstemplate.hxx
Dosyayı görüntüle @ fbb1f977
......@@ -22,10 +22,10 @@
#include "svtools/svtdllapi.h"
#include <vcl/dialog.hxx>
#include <vcl/group.hxx>
#include <vcl/fixed.hxx>
#include <vcl/combobox.hxx>
#include <vcl/button.hxx>
#include <vcl/layout.hxx>
#include <vcl/lstbox.hxx>
#include <vcl/scrbar.hxx>
#include <com/sun/star/container/XNameAccess.hpp>
......@@ -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;
......
svtools/inc/svtools/helpid.hrc
Dosyayı görüntüle @ fbb1f977
......@@ -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"
......
svtools/inc/svtools/svtools.hrc
Dosyayı görüntüle @ fbb1f977
......@@ -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
......
svtools/source/dialogs/addresstemplate.hrc
Dosyayı görüntüle @ fbb1f977
......@@ -24,58 +24,6 @@
#define FIELD_PAIRS_VISIBLE 5
#define FIELD_CONTROLS_VISIBLE 2 * FIELD_PAIRS_VISIBLE
#define FL_DATASOURCEFRAME 1
#define FT_DATASOURCE 2
#define CB_DATASOURCE 3
#define CT_BORDER 1
#define PB_ADMINISTATE_DATASOURCES 4
#define FT_TABLE 5
#define CB_TABLE 6
#define FT_FIELDS 7
#define SB_FIELDSCROLLER 8
#define PB_OK 9
#define PB_CANCEL 10
#define PB_HELP 11
#define FT_FIELD_BASE 50
#define LB_FIELD_BASE 50
#define STR_NO_FIELD_SELECTION 1
#define STR_FIELD_COMPANY 2
#define STR_FIELD_DEPARTMENT 3
#define STR_FIELD_FIRSTNAME 4
#define STR_FIELD_LASTNAME 5
#define STR_FIELD_STREET 6
#define STR_FIELD_COUNTRY 7
#define STR_FIELD_ZIPCODE 8
#define STR_FIELD_CITY 9
#define STR_FIELD_TITLE 10
#define STR_FIELD_POSITION 11
#define STR_FIELD_ADDRFORM 12
#define STR_FIELD_INITIALS 13
#define STR_FIELD_SALUTATION 14
#define STR_FIELD_HOMETEL 15
#define STR_FIELD_WORKTEL 16
#define STR_FIELD_FAX 17
#define STR_FIELD_EMAIL 18
#define STR_FIELD_URL 19
#define STR_FIELD_NOTE 20
#define STR_FIELD_USER1 21
#define STR_FIELD_USER2 22
#define STR_FIELD_USER3 23
#define STR_FIELD_USER4 24
#define STR_FIELD_ID 25
#define STR_FIELD_STATE 26
#define STR_FIELD_OFFICETEL 27
#define STR_FIELD_PAGER 28
#define STR_FIELD_MOBILE 29
#define STR_FIELD_TELOTHER 30
#define STR_FIELD_CALENDAR 31
#define STR_FIELD_INVITE 32
#define STR_LOGICAL_FIELD_NAMES 33
#endif // _SVT_ADDRESSTEMPLATE_HRC_
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
svtools/source/dialogs/addresstemplate.src
Dosyayı görüntüle @ fbb1f977
......@@ -19,298 +19,143 @@
#include <svtools/svtools.hrc>
#include "addresstemplate.hrc"
#include <svtools/controldims.hrc>
#define FIELD_ROW_HEIGHT 17
ModalDialog DLG_ADDRESSBOOKSOURCE
{
HelpID = "svtools:ModalDialog:DLG_ADDRESSBOOKSOURCE";
SVLook = TRUE ;
OutputSize = TRUE ;
Size = MAP_APPFONT ( 300 , 88 + FIELD_ROW_HEIGHT * FIELD_PAIRS_VISIBLE ) ;
Hide = TRUE ;
Moveable = TRUE ;
Text [ en-US ] = "Templates: Address Book Assignment";
FixedLine FL_DATASOURCEFRAME
{
Text [ en-US ] = "Address Book Source";
SVLook = TRUE ;
Pos = MAP_APPFONT ( 6 , 2 ) ;
Size = MAP_APPFONT ( 288 , RSC_CD_FIXEDLINE_HEIGHT ) ;
};
FixedText FT_DATASOURCE
{
Text [ en-US ] = "Data source";
SVLook = TRUE ;
Pos = MAP_APPFONT ( 12 , 15 ) ;
Size = MAP_APPFONT ( 90 , 10 ) ;
Group = TRUE;
};
ComboBox CB_DATASOURCE
{
HelpID = "svtools:ComboBox:DLG_ADDRESSBOOKSOURCE:CB_DATASOURCE";
SVLook = TRUE ;
Pos = MAP_APPFONT ( 105, 13 ) ;
Size = MAP_APPFONT ( 96, 55 ) ;
DropDown = TRUE;
TabStop = TRUE;
};
PushButton PB_ADMINISTATE_DATASOURCES
{
HelpID = "svtools:PushButton:DLG_ADDRESSBOOKSOURCE:PB_ADMINISTATE_DATASOURCES";
Text [ en-US ] = "~Address Data Source...";
SVLook = TRUE ;
Pos = MAP_APPFONT ( 204, 13 ) ;
Size = MAP_APPFONT ( 90, 14 ) ;
TabStop = TRUE;
};
FixedText FT_TABLE
{
Text [ en-US ] = "Table";
SVLook = TRUE ;
Pos = MAP_APPFONT ( 12 , 32 ) ;
Size = MAP_APPFONT ( 90 , 10 ) ;
Group = TRUE;
};
ComboBox CB_TABLE
{
HelpID = "svtools:ComboBox:DLG_ADDRESSBOOKSOURCE:CB_TABLE";
SVLook = TRUE ;
Pos = MAP_APPFONT ( 105, 30 ) ;
Size = MAP_APPFONT ( 96, 55 ) ;
DropDown = TRUE;
TabStop = TRUE;
};
FixedText FT_FIELDS
{
Text [ en-US ] = "Field assignment";
SVLook = TRUE ;
Pos = MAP_APPFONT ( 6, 30 + RSC_CD_DROPDOWN_HEIGHT + RSC_SP_CTRL_Y ) ;
Size = MAP_APPFONT ( 248 , RSC_CD_FIXEDTEXT_HEIGHT ) ;
};
Window CT_BORDER
{
Border = TRUE ;
Pos = MAP_APPFONT ( 6, 30 + RSC_CD_DROPDOWN_HEIGHT + RSC_SP_CTRL_Y + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y ) ;
Size = MAP_APPFONT ( 288 , 5 + FIELD_ROW_HEIGHT * FIELD_PAIRS_VISIBLE ) ;
};
#define DECLARE_FIELD( row, column ) \
FixedText FT_FIELD_BASE + row * 2 + column \
{ \
SVLook = TRUE ; \
Pos = MAP_APPFONT ( 3 + column * 134, RSC_SP_CTRL_GROUP_Y + 2 + row * FIELD_ROW_HEIGHT ) ; \
Size = MAP_APPFONT ( 79 , 10 ) ; \
Group = TRUE; \
}; \
ListBox LB_FIELD_BASE + row * 2 + column \
{ \
SVLook = TRUE; \
Pos = MAP_APPFONT ( 89 + column * 134, RSC_SP_CTRL_GROUP_Y + row * FIELD_ROW_HEIGHT ) ; \
Size = MAP_APPFONT ( 42 , 14 ) ; \
Border = TRUE; \
DropDown = TRUE; \
TabStop = TRUE; \
}
#if FIELD_PAIRS_VISIBLE > 0
DECLARE_FIELD( 0, 0 );
DECLARE_FIELD( 0, 1 );
#endif
#if FIELD_PAIRS_VISIBLE > 1
DECLARE_FIELD( 1, 0 );
DECLARE_FIELD( 1, 1 );
#endif
#if FIELD_PAIRS_VISIBLE > 2
DECLARE_FIELD( 3, 0 );
DECLARE_FIELD( 3, 1 );
#endif
#if FIELD_PAIRS_VISIBLE > 3
DECLARE_FIELD( 2, 0 );
DECLARE_FIELD( 2, 1 );
#endif
#if FIELD_PAIRS_VISIBLE > 4
DECLARE_FIELD( 4, 0 );
DECLARE_FIELD( 4, 1 );
#endif
#if FIELD_PAIRS_VISIBLE > 5
DECLARE_FIELD( 5, 0 );
DECLARE_FIELD( 5, 1 );
#endif
ScrollBar SB_FIELDSCROLLER
{
SVLook = TRUE;
Pos = MAP_APPFONT ( 275, RSC_SP_CTRL_GROUP_Y ) ;
Size = MAP_APPFONT ( 8 , 16 - RSC_SP_CTRL_GROUP_Y + FIELD_ROW_HEIGHT * (FIELD_PAIRS_VISIBLE - 1) ) ;
};
OKButton PB_OK
{
SVLook = TRUE;
DefButton = TRUE;
Pos = MAP_APPFONT ( 137, 70 + FIELD_ROW_HEIGHT * FIELD_PAIRS_VISIBLE ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
};
CancelButton PB_CANCEL
{
SVLook = TRUE;
Pos = MAP_APPFONT ( 190, 70 + FIELD_ROW_HEIGHT * FIELD_PAIRS_VISIBLE ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
};
HelpButton PB_HELP
{
SVLook = TRUE;
Pos = MAP_APPFONT ( 244, 70 + FIELD_ROW_HEIGHT * FIELD_PAIRS_VISIBLE ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
};
String STR_LOGICAL_FIELD_NAMES
{
String STR_LOGICAL_FIELD_NAMES
{
Text = "FirstName;LastName;Company;Department;Street;Zip;City;State;Country;PhonePriv;PhoneComp;PhoneOffice;PhoneCell;PhoneOther;Pager;Fax;EMail;URL;Title;Position;Code;AddrForm;AddrFormMail;Id;CalendarURL;InviteParticipant;Note;Altfield1;Altfield2;Altfield3;Altfield4";
// no need to translate this
// the items in this string have to be in the same order as the STR_FIELD_* strings are added to the
// field label list of the dialog
};
};
String STR_NO_FIELD_SELECTION
{
String STR_NO_FIELD_SELECTION
{
Text [ en-US ] = "<none>";
};
};
String STR_FIELD_COMPANY
{
String STR_FIELD_COMPANY
{
Text [ en-US ] = "Company";
};
String STR_FIELD_DEPARTMENT
{
};
String STR_FIELD_DEPARTMENT
{
Text [ en-US ] = "Department";
};
String STR_FIELD_FIRSTNAME
{
};
String STR_FIELD_FIRSTNAME
{
Text [ en-US ] = "First name";
};
String STR_FIELD_LASTNAME
{
};
String STR_FIELD_LASTNAME
{
Text [ en-US ] = "Last name";
};
String STR_FIELD_STREET
{
};
String STR_FIELD_STREET
{
Text [ en-US ] = "Street";
};
String STR_FIELD_COUNTRY
{
};
String STR_FIELD_COUNTRY
{
Text [ en-US ] = "Country";
};
String STR_FIELD_ZIPCODE
{
};
String STR_FIELD_ZIPCODE
{
Text [ en-US ] = "ZIP Code";
};
String STR_FIELD_CITY
{
};
String STR_FIELD_CITY
{
Text [ en-US ] = "City";
};
String STR_FIELD_TITLE
{
};
String STR_FIELD_TITLE
{
Text [ en-US ] = "Title";
};
String STR_FIELD_POSITION
{
};
String STR_FIELD_POSITION
{
Text [ en-US ] = "Position";
};
String STR_FIELD_ADDRFORM
{
};
String STR_FIELD_ADDRFORM
{
Text [ en-US ] = "Addr. Form";
};
String STR_FIELD_INITIALS
{
};
String STR_FIELD_INITIALS
{
Text [ en-US ] = "Initials";
};
String STR_FIELD_SALUTATION
{
};
String STR_FIELD_SALUTATION
{
Text [ en-US ] = "Complimentary close";
};
String STR_FIELD_HOMETEL
{
};
String STR_FIELD_HOMETEL
{
Text [ en-US ] = "Tel: Home";
};
String STR_FIELD_WORKTEL
{
};
String STR_FIELD_WORKTEL
{
Text [ en-US ] = "Tel: Work";
};
String STR_FIELD_FAX
{
};
String STR_FIELD_FAX
{
Text [ en-US ] = "FAX";
};
String STR_FIELD_EMAIL
{
};
String STR_FIELD_EMAIL
{
Text [ en-US ] = "E-mail";
};
String STR_FIELD_URL
{
};
String STR_FIELD_URL
{
Text [ en-US ] = "URL";
};
String STR_FIELD_NOTE
{
};
String STR_FIELD_NOTE
{
Text [ en-US ] = "Note";
};
String STR_FIELD_USER1
{
};
String STR_FIELD_USER1
{
Text [ en-US ] = "User 1";
};
String STR_FIELD_USER2
{
};
String STR_FIELD_USER2
{
Text [ en-US ] = "User 2";
};
String STR_FIELD_USER3
{
};
String STR_FIELD_USER3
{
Text [ en-US ] = "User 3";
};
String STR_FIELD_USER4
{
};
String STR_FIELD_USER4
{
Text [ en-US ] = "User 4";
};
String STR_FIELD_ID
{
};
String STR_FIELD_ID
{
Text [ en-US ] = "ID";
};
String STR_FIELD_STATE
{
};
String STR_FIELD_STATE
{
Text [ en-US ] = "State";
};
String STR_FIELD_OFFICETEL
{
};
String STR_FIELD_OFFICETEL
{
Text [ en-US ] = "Tel: Office";
};
String STR_FIELD_PAGER
{
};
String STR_FIELD_PAGER
{
Text [ en-US ] = "Pager";
};
String STR_FIELD_MOBILE
{
};
String STR_FIELD_MOBILE
{
Text [ en-US ] = "Mobile";
};
String STR_FIELD_TELOTHER
{
};
String STR_FIELD_TELOTHER
{
Text [ en-US ] = "Tel: Other";
};
String STR_FIELD_CALENDAR
{
};
String STR_FIELD_CALENDAR
{
Text [ en-US ] = "Calendar";
};
String STR_FIELD_INVITE
{
};
String STR_FIELD_INVITE
{
Text [ en-US ] = "Invite";
};
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
svtools/uiconfig/ui/addresstemplatedialog.ui 0 → 100644
Dosyayı görüntüle @ fbb1f977
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment