From 34554c0d154809e172b9a2de44f226fe44b16978 Mon Sep 17 00:00:00 2001 From: "Philipp Lohmann [pl]" Date: Wed, 23 Jun 2010 15:19:12 +0200 Subject: vcl113: #i3909# issue a warning if no printer config is writable --- padmin/source/padialog.cxx | 14 ++++++++++++++ padmin/source/padialog.src | 5 +++++ 2 files changed, 19 insertions(+) (limited to 'padmin/source') diff --git a/padmin/source/padialog.cxx b/padmin/source/padialog.cxx index 583e14c06caa..d91ebea0c73d 100644 --- a/padmin/source/padialog.cxx +++ b/padmin/source/padialog.cxx @@ -152,6 +152,20 @@ void PADialog::Init() m_aFontsPB.Enable( FALSE ); m_aFontsPB.Show( FALSE ); } + + // at this point no actual changes will be written + // but the write will have checked whether any writeable config exists + if( ! m_rPIManager.writePrinterConfig() ) + { + m_aAddPB.Enable( FALSE ); + m_aRemPB.Enable( FALSE ); + m_aConfPB.Enable( FALSE ); + m_aRenamePB.Enable( FALSE ); + m_aStdPB.Enable( FALSE ); + m_aCUPSCB.Enable( FALSE ); + ErrorBox aBox( GetParent(), WB_OK | WB_DEF_OK, String( PaResId( RID_ERR_NOWRITE ) ) ); + aBox.Execute(); + } } PADialog::~PADialog() diff --git a/padmin/source/padialog.src b/padmin/source/padialog.src index 8834bba3226c..ab09d9155d1b 100644 --- a/padmin/source/padialog.src +++ b/padmin/source/padialog.src @@ -340,6 +340,11 @@ String RID_PA_TXT_TESTPAGE_PRINTED Text [ en-US ] = "The test page was printed succesfully. Please check the result."; }; +String RID_ERR_NOWRITE +{ + Text [en-US] = "No printers can be installed, because the file system is read-only.\nPlease contact your system administrator."; +}; + String RID_QRY_PRTNAME { Text [ en-US ] = "~New printer name"; -- cgit From 1bee6c0e9121cf1d3d246a7e49f5e0d89aad6682 Mon Sep 17 00:00:00 2001 From: "Philipp Lohmann [pl]" Date: Mon, 16 Aug 2010 20:31:58 +0200 Subject: pdfprint: #i94173# #i113802# send print jobs in PDF instead of PostScript --- padmin/source/prtsetup.cxx | 39 +++++++++++++++++++++++++++++++-------- padmin/source/prtsetup.hxx | 3 ++- padmin/source/rtsetup.hrc | 10 +++++----- padmin/source/rtsetup.src | 14 +++++++++++--- 4 files changed, 49 insertions(+), 17 deletions(-) (limited to 'padmin/source') diff --git a/padmin/source/prtsetup.cxx b/padmin/source/prtsetup.cxx index 17d28515e540..8165b8015403 100644 --- a/padmin/source/prtsetup.cxx +++ b/padmin/source/prtsetup.cxx @@ -198,6 +198,7 @@ IMPL_LINK( RTSDialog, ClickButton, Button*, pButton ) m_aJobData.m_nColorDepth = m_pDevicePage->getDepth(); m_aJobData.m_nColorDevice = m_pDevicePage->getColorDevice(); m_aJobData.m_nPSLevel = m_pDevicePage->getLevel(); + m_aJobData.m_nPDFDevice = m_pDevicePage->getPDFDevice(); } if( m_pOtherPage ) // write other settings @@ -363,8 +364,8 @@ RTSDevicePage::RTSDevicePage( RTSDialog* pParent ) : m_aPPDKeyBox( this, PaResId( RID_RTS_DEVICE_PPDKEY_BOX ) ), m_aPPDValueText( this, PaResId( RID_RTS_DEVICE_PPDVALUE_TXT ) ), m_aPPDValueBox( this, PaResId( RID_RTS_DEVICE_PPDVALUE_BOX ) ), - m_aLevelText( this, PaResId( RID_RTS_DEVICE_LEVEL_TXT ) ), - m_aLevelBox( this, PaResId( RID_RTS_DEVICE_LEVEL_BOX ) ), + m_aLevelText( this, PaResId( RID_RTS_DEVICE_PRINTLANG_TXT ) ), + m_aLevelBox( this, PaResId( RID_RTS_DEVICE_PRINTLANG_BOX ) ), m_aSpaceText( this, PaResId( RID_RTS_DEVICE_SPACE_TXT ) ), m_aSpaceBox( this, PaResId( RID_RTS_DEVICE_SPACE_BOX ) ), m_aDepthText( this, PaResId( RID_RTS_DEVICE_DEPTH_TXT ) ), @@ -385,13 +386,19 @@ RTSDevicePage::RTSDevicePage( RTSDialog* pParent ) : case 1: m_aSpaceBox.SelectEntry( m_aSpaceColor );break; } - m_aLevelBox.InsertEntry( m_pParent->m_aFromDriverString ); - m_aLevelBox.InsertEntry( String( RTL_CONSTASCII_USTRINGPARAM( "1" ) ) ); - m_aLevelBox.InsertEntry( String( RTL_CONSTASCII_USTRINGPARAM( "2" ) ) ); - if( m_pParent->m_aJobData.m_nPSLevel == 0 ) - m_aLevelBox.SelectEntry( m_pParent->m_aFromDriverString ); + ULONG nLevelEntryData = 0; + if( m_pParent->m_aJobData.m_nPDFDevice > 0 ) + nLevelEntryData = 10; else - m_aLevelBox.SelectEntry( String::CreateFromInt32( m_pParent->m_aJobData.m_nPSLevel ) ); + nLevelEntryData = m_pParent->m_aJobData.m_nPSLevel+1; + for( USHORT i = 0; i < m_aLevelBox.GetEntryCount(); i++ ) + { + if( (ULONG)m_aLevelBox.GetEntryData( i ) == nLevelEntryData ) + { + m_aLevelBox.SelectEntryPos( i ); + break; + } + } m_aDepthBox.SelectEntry( String::CreateFromInt32( m_pParent->m_aJobData.m_nColorDepth ).AppendAscii( " Bit" ) ); @@ -430,6 +437,22 @@ void RTSDevicePage::update() // ------------------------------------------------------------------ +ULONG RTSDevicePage::getLevel() +{ + ULONG nLevel = (ULONG)m_aLevelBox.GetEntryData( m_aLevelBox.GetSelectEntryPos() ); + return nLevel < 10 ? nLevel-1 : 0; +} + +// ------------------------------------------------------------------ + +ULONG RTSDevicePage::getPDFDevice() +{ + ULONG nLevel = (ULONG)m_aLevelBox.GetEntryData( m_aLevelBox.GetSelectEntryPos() ); + return nLevel > 9 ? 1 : 0; +} + +// ------------------------------------------------------------------ + IMPL_LINK( RTSDevicePage, SelectHdl, ListBox*, pBox ) { if( pBox == &m_aPPDKeyBox ) diff --git a/padmin/source/prtsetup.hxx b/padmin/source/prtsetup.hxx index 65288f738482..72e3d81ee8d7 100644 --- a/padmin/source/prtsetup.hxx +++ b/padmin/source/prtsetup.hxx @@ -147,7 +147,8 @@ public: void update(); - ULONG getLevel() { return m_aLevelBox.GetSelectEntry().ToInt32(); } + ULONG getLevel(); + ULONG getPDFDevice(); ULONG getDepth() { return m_aDepthBox.GetSelectEntry().ToInt32(); } ULONG getColorDevice() { diff --git a/padmin/source/rtsetup.hrc b/padmin/source/rtsetup.hrc index 30439088de8e..7b6677de7ec4 100644 --- a/padmin/source/rtsetup.hrc +++ b/padmin/source/rtsetup.hrc @@ -48,13 +48,13 @@ #define RID_RTS_DEVICEPAGE 4003 #define RID_RTS_DEVICE_COLOR_TXT 1 -#define RID_RTS_DEVICE_GRAY_TXT 2 +#define RID_RTS_DEVICE_GRAY_TXT 2 #define RID_RTS_DEVICE_PPDKEY_TXT 3 #define RID_RTS_DEVICE_PPDKEY_BOX 4 -#define RID_RTS_DEVICE_PPDVALUE_TXT 5 -#define RID_RTS_DEVICE_PPDVALUE_BOX 6 -#define RID_RTS_DEVICE_LEVEL_TXT 7 -#define RID_RTS_DEVICE_LEVEL_BOX 8 +#define RID_RTS_DEVICE_PPDVALUE_TXT 5 +#define RID_RTS_DEVICE_PPDVALUE_BOX 6 +#define RID_RTS_DEVICE_PRINTLANG_TXT 7 +#define RID_RTS_DEVICE_PRINTLANG_BOX 8 #define RID_RTS_DEVICE_SPACE_TXT 9 #define RID_RTS_DEVICE_SPACE_BOX 10 #define RID_RTS_DEVICE_DEPTH_TXT 11 diff --git a/padmin/source/rtsetup.src b/padmin/source/rtsetup.src index e04374a72245..e2e9a4c8aea3 100644 --- a/padmin/source/rtsetup.src +++ b/padmin/source/rtsetup.src @@ -173,17 +173,25 @@ TabPage RID_RTS_DEVICEPAGE Size = MAP_APPFONT( 105, 111 ); }; - FixedText RID_RTS_DEVICE_LEVEL_TXT + FixedText RID_RTS_DEVICE_PRINTLANG_TXT { Pos = MAP_APPFONT( 5, 130 ); Size = MAP_APPFONT( 80, 8 ); - Text [ en-US ] = "PostScript ~Level"; + Text [ en-US ] = "Printer ~Language type"; }; - ListBox RID_RTS_DEVICE_LEVEL_BOX + ListBox RID_RTS_DEVICE_PRINTLANG_BOX { DropDown = TRUE; Pos = MAP_APPFONT( 120, 130 ); Size = MAP_APPFONT( 105, 200 ); + StringList [en-US] = + { + < "PostScript (Level from driver)" ; 1; > ; + < "PostScript Level 1" ; 2; > ; + < "PostScript Level 2"; 3; > ; + < "PostScript Level 3"; 3; > ; + < "PDF"; 10; > ; + }; }; FixedText RID_RTS_DEVICE_SPACE_TXT { -- cgit From e1b5342bdc0b933e334a24e91ad370b04f9f2f79 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Mon, 11 Oct 2010 17:56:12 +0200 Subject: CWS changehid: generate former auto hids into src files --- padmin/source/padialog.src | 64 ++++++++++++++++++++++++++++++++++++++++++++++ padmin/source/rtsetup.src | 38 +++++++++++++++++++++++++++ 2 files changed, 102 insertions(+) (limited to 'padmin/source') diff --git a/padmin/source/padialog.src b/padmin/source/padialog.src index ab09d9155d1b..09ce29a2c682 100644 --- a/padmin/source/padialog.src +++ b/padmin/source/padialog.src @@ -29,6 +29,7 @@ ModalDialog RID_FONTIMPORT_DIALOG { + HelpID = "padmin:ModalDialog:RID_FONTIMPORT_DIALOG"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 230 , 185 ); @@ -37,6 +38,7 @@ ModalDialog RID_FONTIMPORT_DIALOG ListBox RID_FIMP_BOX_NEWFONTS { + HelpID = "padmin:ListBox:RID_FONTIMPORT_DIALOG:RID_FIMP_BOX_NEWFONTS"; Border = TRUE; Sort=TRUE; AutoHScroll = TRUE; @@ -58,18 +60,21 @@ ModalDialog RID_FONTIMPORT_DIALOG }; Edit RID_FIMP_EDT_FROM { + HelpID = "padmin:Edit:RID_FONTIMPORT_DIALOG:RID_FIMP_EDT_FROM"; Border = TRUE; Pos = MAP_APPFONT( 10, 97 ); Size = MAP_APPFONT( 130, 12 ); }; PushButton RID_FIMP_BTN_FROM { + HelpID = "padmin:PushButton:RID_FONTIMPORT_DIALOG:RID_FIMP_BTN_FROM"; Pos = MAP_APPFONT( 145, 97 ); Size = MAP_APPFONT( 15, 12 ); Text = "..."; }; CheckBox RID_FIMP_BOX_SUBDIRS { + HelpID = "padmin:CheckBox:RID_FONTIMPORT_DIALOG:RID_FIMP_BOX_SUBDIRS"; Pos = MAP_APPFONT( 10, 115 ); Size = MAP_APPFONT( 145, 10 ); Text [ en-US ] = "Sea~rch Subdirectories"; @@ -83,6 +88,7 @@ ModalDialog RID_FONTIMPORT_DIALOG CheckBox RID_FIMP_BOX_LINKONLY { + HelpID = "padmin:CheckBox:RID_FONTIMPORT_DIALOG:RID_FIMP_BOX_LINKONLY"; Pos = MAP_APPFONT( 10, 140 ); Size = MAP_APPFONT( 145, 10 ); Text [ en-US ] = "Create ~soft links only"; @@ -100,6 +106,7 @@ ModalDialog RID_FONTIMPORT_DIALOG }; PushButton RID_FIMP_BTN_SELECTALL { + HelpID = "padmin:PushButton:RID_FONTIMPORT_DIALOG:RID_FIMP_BTN_SELECTALL"; Pos = MAP_APPFONT( 175, 44 ); Size = MAP_APPFONT( 50, 12 ); Text [ en-US ] = "~Select All"; @@ -146,6 +153,7 @@ ModalDialog RID_FONTIMPORT_DIALOG ModalDialog RID_PADIALOG { + HelpID = "padmin:ModalDialog:RID_PADIALOG"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 260 , 198 ) ; @@ -160,6 +168,7 @@ ModalDialog RID_PADIALOG }; CheckBox RID_PA_CB_CUPSUSAGE { + HelpID = "padmin:CheckBox:RID_PADIALOG:RID_PA_CB_CUPSUSAGE"; Pos = MAP_APPFONT( 12, 158 ); Size = MAP_APPFONT( 168, 8 ); Text [ en-US ] = "Disable CUPS Support"; @@ -186,6 +195,7 @@ ModalDialog RID_PADIALOG }; ListBox RID_PA_LB_DEV { + HelpID = "padmin:ListBox:RID_PADIALOG:RID_PA_LB_DEV"; Pos = MAP_APPFONT( 12, 15 ); Size = MAP_APPFONT( 168, 80 ); Border = TRUE; @@ -237,30 +247,35 @@ ModalDialog RID_PADIALOG }; PushButton RID_PA_BTN_CONF { + HelpID = "padmin:PushButton:RID_PADIALOG:RID_PA_BTN_CONF"; Pos = MAP_APPFONT( 190, 15 ); Size = MAP_APPFONT( 60, 12 ); Text [ en-US ] = "Properties..."; }; PushButton RID_PA_BTN_RENAME { + HelpID = "padmin:PushButton:RID_PADIALOG:RID_PA_BTN_RENAME"; Pos = MAP_APPFONT( 190, 32 ); Size = MAP_APPFONT( 60, 12 ); Text [ en-US ] = "R~ename..."; }; PushButton RID_PA_BTN_STD { + HelpID = "padmin:PushButton:RID_PADIALOG:RID_PA_BTN_STD"; Pos = MAP_APPFONT( 190, 49 ); Size = MAP_APPFONT( 60, 12 ); Text [ en-US ] = "~Default"; }; PushButton RID_PA_BTN_DEL { + HelpID = "padmin:PushButton:RID_PADIALOG:RID_PA_BTN_DEL"; Pos = MAP_APPFONT( 190, 66 ); Size = MAP_APPFONT( 60, 12 ); Text [ en-US ] = "Remo~ve..."; }; PushButton RID_PA_TESTPAGE { + HelpID = "padmin:PushButton:RID_PADIALOG:RID_PA_TESTPAGE"; Pos = MAP_APPFONT( 190, 83 ); Size = MAP_APPFONT( 60, 12 ); Text [ en-US ] = "Test ~Page"; @@ -268,12 +283,14 @@ ModalDialog RID_PADIALOG PushButton RID_PA_BTN_FONTS { + HelpID = "padmin:PushButton:RID_PADIALOG:RID_PA_BTN_FONTS"; Pos = MAP_APPFONT( 80, 181 ); Size = MAP_APPFONT( 70, 12 ); Text [ en-US ] = "Fon~ts..."; }; PushButton RID_PA_BTN_ADD { + HelpID = "padmin:PushButton:RID_PADIALOG:RID_PA_BTN_ADD"; Pos = MAP_APPFONT( 5, 181 ); Size = MAP_APPFONT( 70, 12 ); Text [ en-US ] = "New Printer..."; @@ -292,6 +309,7 @@ ModalDialog RID_PADIALOG ModalDialog RID_STRINGQUERYDLG { + HelpID = "padmin:ModalDialog:RID_STRINGQUERYDLG"; OutputSize = TRUE ; SVLook = TRUE ; Pos = MAP_APPFONT ( 10 , 10 ) ; @@ -306,12 +324,14 @@ ModalDialog RID_STRINGQUERYDLG }; Edit RID_STRQRY_EDT_NEWNAME { + HelpID = "padmin:Edit:RID_STRINGQUERYDLG:RID_STRQRY_EDT_NEWNAME"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 23 ) ; Size = MAP_APPFONT ( 130 , 12 ) ; }; ComboBox RID_STRQRY_BOX_NEWNAME { + HelpID = "padmin:ComboBox:RID_STRINGQUERYDLG:RID_STRQRY_BOX_NEWNAME"; Border = TRUE ; DropDown = TRUE; Pos = MAP_APPFONT ( 6 , 23 ) ; @@ -383,6 +403,7 @@ String RID_TXT_TESTPAGE_TIME ModalDialog RID_FONTNAMEDIALOG { + HelpID = "padmin:ModalDialog:RID_FONTNAMEDIALOG"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 255 , 110 ) ; @@ -397,24 +418,28 @@ ModalDialog RID_FONTNAMEDIALOG }; PushButton RID_FNTNM_BTN_RENAME { + HelpID = "padmin:PushButton:RID_FONTNAMEDIALOG:RID_FNTNM_BTN_RENAME"; Pos = MAP_APPFONT( 196, 31 ); Size = MAP_APPFONT( 50, 12 ); Text [ en-US ] = "Re~name..."; }; PushButton RID_FNTNM_BTN_REMOVE { + HelpID = "padmin:PushButton:RID_FONTNAMEDIALOG:RID_FNTNM_BTN_REMOVE"; Pos = MAP_APPFONT ( 196 , 48 ) ; Size = MAP_APPFONT ( 50 , 12 ) ; Text [ en-US ] = "~Remove..."; }; PushButton RID_FNTNM_BTN_IMPORT { + HelpID = "padmin:PushButton:RID_FONTNAMEDIALOG:RID_FNTNM_BTN_IMPORT"; Pos = MAP_APPFONT ( 196 , 65 ) ; Size = MAP_APPFONT ( 50 , 12 ) ; Text [ en-US ] = "~Add..."; }; ListBox RID_FNTNM_LB_FONTS { + HelpID = "padmin:ListBox:RID_FONTNAMEDIALOG:RID_FNTNM_LB_FONTS"; Border = TRUE ; Sort = TRUE ; AutoHScroll = TRUE; @@ -541,6 +566,7 @@ String RID_AFMERROR_BOX_TXT ModelessDialog RID_PROGRESS_DLG { + HelpID = "padmin:ModelessDialog:RID_PROGRESS_DLG"; OutputSize = TRUE ; SVLook = TRUE ; Pos = MAP_APPFONT ( 10 , 10 ) ; @@ -586,6 +612,7 @@ String RID_OPERATION_CONVERTMETRIC ModalDialog RID_PPDIMPORT_DLG { + HelpID = "padmin:ModalDialog:RID_PPDIMPORT_DLG"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 265 , 225 ) ; @@ -606,6 +633,7 @@ ModalDialog RID_PPDIMPORT_DLG }; ComboBox RID_PPDIMP_LB_PATH { + HelpID = "padmin:ComboBox:RID_PPDIMPORT_DLG:RID_PPDIMP_LB_PATH"; Dropdown = TRUE; Border = TRUE; Sort = TRUE; @@ -615,6 +643,7 @@ ModalDialog RID_PPDIMPORT_DLG }; PushButton RID_PPDIMP_BTN_SEARCH { + HelpID = "padmin:PushButton:RID_PPDIMPORT_DLG:RID_PPDIMP_BTN_SEARCH"; Pos = MAP_APPFONT( 145, 15 ); Size = MAP_APPFONT( 50, 14 ); Text [ en-US ] = "Browse..."; @@ -628,6 +657,7 @@ ModalDialog RID_PPDIMPORT_DLG }; MultiListBox RID_PPDIMP_LB_DRIVER { + HelpID = "padmin:MultiListBox:RID_PPDIMPORT_DLG:RID_PPDIMP_LB_DRIVER"; Border = TRUE; Sort = TRUE; SimpleMode = TRUE; @@ -723,6 +753,7 @@ String RID_TXT_PRINTERADDFAILED ModalDialog RID_ADD_PRINTER_DIALOG { + HelpID = "padmin:ModalDialog:RID_ADD_PRINTER_DIALOG"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 240 , 172 ) ; @@ -752,12 +783,14 @@ ModalDialog RID_ADD_PRINTER_DIALOG }; PushButton RID_ADDP_BTN_NEXT { + HelpID = "padmin:PushButton:RID_ADD_PRINTER_DIALOG:RID_ADDP_BTN_NEXT"; Pos = MAP_APPFONT( 130, 155 ); Size = MAP_APPFONT( 50, 12 ); Text [ en-US ] = "~Next >>"; }; PushButton RID_ADDP_BTN_PREV { + HelpID = "padmin:PushButton:RID_ADD_PRINTER_DIALOG:RID_ADDP_BTN_PREV"; Pos = MAP_APPFONT( 75, 155 ); Size = MAP_APPFONT( 50, 12 ); Text [ en-US ] = "<< ~Back"; @@ -767,6 +800,7 @@ ModalDialog RID_ADD_PRINTER_DIALOG TabPage RID_ADDP_PAGE_CHOOSEDRIVER { + HelpID = "padmin:TabPage:RID_ADDP_PAGE_CHOOSEDRIVER"; Hide = TRUE; Pos = MAP_APPFONT( 0, 30 ); Size = MAP_APPFONT( 240, 120 ); @@ -782,6 +816,7 @@ TabPage RID_ADDP_PAGE_CHOOSEDRIVER }; ListBox RID_ADDP_CHDRV_BOX_DRIVER { + HelpID = "padmin:ListBox:RID_ADDP_PAGE_CHOOSEDRIVER:RID_ADDP_CHDRV_BOX_DRIVER"; Pos = MAP_APPFONT( 5, 15 ); Size = MAP_APPFONT( 175, 100 ); Border = TRUE; @@ -789,12 +824,14 @@ TabPage RID_ADDP_PAGE_CHOOSEDRIVER }; PushButton RID_ADDP_CHDRV_BTN_ADD { + HelpID = "padmin:PushButton:RID_ADDP_PAGE_CHOOSEDRIVER:RID_ADDP_CHDRV_BTN_ADD"; Pos = MAP_APPFONT( 185, 15 ); Size = MAP_APPFONT( 50, 12 ); Text [ en-US ] = "~Import..."; }; PushButton RID_ADDP_CHDRV_BTN_REMOVE { + HelpID = "padmin:PushButton:RID_ADDP_PAGE_CHOOSEDRIVER:RID_ADDP_CHDRV_BTN_REMOVE"; Pos = MAP_APPFONT( 185, 32 ); Size = MAP_APPFONT( 50, 12 ); Text [ en-US ] = "~Delete"; @@ -807,6 +844,7 @@ TabPage RID_ADDP_PAGE_CHOOSEDRIVER TabPage RID_ADDP_PAGE_CHOOSEDEV { + HelpID = "padmin:TabPage:RID_ADDP_PAGE_CHOOSEDEV"; Hide = TRUE; Pos = MAP_APPFONT( 0, 30 ); Size = MAP_APPFONT( 240, 120 ); @@ -822,24 +860,28 @@ TabPage RID_ADDP_PAGE_CHOOSEDEV }; RadioButton RID_ADDP_CHDEV_BTN_PRINTER { + HelpID = "padmin:RadioButton:RID_ADDP_PAGE_CHOOSEDEV:RID_ADDP_CHDEV_BTN_PRINTER"; Pos = MAP_APPFONT ( 40, 40 ); Size = MAP_APPFONT( 180, 10 ); Text [ en-US ] = "Add a ~printer"; }; RadioButton RID_ADDP_CHDEV_BTN_FAX { + HelpID = "padmin:RadioButton:RID_ADDP_PAGE_CHOOSEDEV:RID_ADDP_CHDEV_BTN_FAX"; Pos = MAP_APPFONT ( 40, 50 ); Size = MAP_APPFONT( 180, 10 ); Text [ en-US ] = "Connect a fa~x device"; }; RadioButton RID_ADDP_CHDEV_BTN_PDF { + HelpID = "padmin:RadioButton:RID_ADDP_PAGE_CHOOSEDEV:RID_ADDP_CHDEV_BTN_PDF"; Pos = MAP_APPFONT ( 40, 60 ); Size = MAP_APPFONT( 180, 10 ); Text [ en-US ] = "Connect a P~DF converter"; }; RadioButton RID_ADDP_CHDEV_BTN_OLD { + HelpID = "padmin:RadioButton:RID_ADDP_PAGE_CHOOSEDEV:RID_ADDP_CHDEV_BTN_OLD"; Pos = MAP_APPFONT ( 40, 70 ); Size = MAP_APPFONT( 180, 10 ); Text [ en-US ] = "~Import printers from a StarOffice installation"; @@ -848,6 +890,7 @@ TabPage RID_ADDP_PAGE_CHOOSEDEV TabPage RID_ADDP_PAGE_NAME { + HelpID = "padmin:TabPage:RID_ADDP_PAGE_NAME"; Hide = TRUE; Pos = MAP_APPFONT( 0, 30 ); Size = MAP_APPFONT( 240, 120 ); @@ -875,12 +918,14 @@ TabPage RID_ADDP_PAGE_NAME }; Edit RID_ADDP_NAME_EDT_NAME { + HelpID = "padmin:Edit:RID_ADDP_PAGE_NAME:RID_ADDP_NAME_EDT_NAME"; Pos = MAP_APPFONT( 40, 35 ); Size = MAP_APPFONT( 160, 12 ); Border = TRUE; }; Edit RID_ADDP_NAME_EDT_FAXNAME { + HelpID = "padmin:Edit:RID_ADDP_PAGE_NAME:RID_ADDP_NAME_EDT_FAXNAME"; Pos = MAP_APPFONT( 40, 35 ); Size = MAP_APPFONT( 160, 12 ); Border = TRUE; @@ -888,6 +933,7 @@ TabPage RID_ADDP_PAGE_NAME }; Edit RID_ADDP_NAME_EDT_PDFNAME { + HelpID = "padmin:Edit:RID_ADDP_PAGE_NAME:RID_ADDP_NAME_EDT_PDFNAME"; Pos = MAP_APPFONT( 40, 35 ); Size = MAP_APPFONT( 160, 12 ); Border = TRUE; @@ -895,12 +941,14 @@ TabPage RID_ADDP_PAGE_NAME }; CheckBox RID_ADDP_NAME_BOX_DEFAULT { + HelpID = "padmin:CheckBox:RID_ADDP_PAGE_NAME:RID_ADDP_NAME_BOX_DEFAULT"; Pos = MAP_APPFONT( 40, 50 ); Size = MAP_APPFONT( 160, 12 ); Text [ en-US ] = "~Use as default printer"; }; CheckBox RID_ADDP_NAME_BOX_FAXSWALLOW { + HelpID = "padmin:CheckBox:RID_ADDP_PAGE_NAME:RID_ADDP_NAME_BOX_FAXSWALLOW"; Pos = MAP_APPFONT( 40, 50 ); Size = MAP_APPFONT( 160, 12 ); Text [ en-US ] = "Remo~ve fax number from output"; @@ -909,6 +957,7 @@ TabPage RID_ADDP_PAGE_NAME TabPage RID_ADDP_PAGE_COMMAND { + HelpID = "padmin:TabPage:RID_ADDP_PAGE_COMMAND"; Hide = TRUE; Pos = MAP_APPFONT( 0, 30 ); Size = MAP_APPFONT( 240, 120 ); @@ -925,12 +974,14 @@ TabPage RID_ADDP_PAGE_COMMAND }; ComboBox RID_ADDP_CMD_BOX_COMMAND { + HelpID = "padmin:ComboBox:RID_ADDP_PAGE_COMMAND:RID_ADDP_CMD_BOX_COMMAND"; Pos = MAP_APPFONT( 10, 30); Size = MAP_APPFONT( 220, 85 ); Border = TRUE; }; ComboBox RID_ADDP_CMD_BOX_PDFCOMMAND { + HelpID = "padmin:ComboBox:RID_ADDP_PAGE_COMMAND:RID_ADDP_CMD_BOX_PDFCOMMAND"; Pos = MAP_APPFONT( 10, 30); Size = MAP_APPFONT( 220, 60 ); Border = TRUE; @@ -943,18 +994,21 @@ TabPage RID_ADDP_PAGE_COMMAND }; Edit RID_ADDP_CMD_EDT_PDFDIR { + HelpID = "padmin:Edit:RID_ADDP_PAGE_COMMAND:RID_ADDP_CMD_EDT_PDFDIR"; Border = TRUE; Pos = MAP_APPFONT( 10, 104 ); Size = MAP_APPFONT( 190, 12 ); }; PushButton RID_ADDP_CMD_BTN_PDFDIR { + HelpID = "padmin:PushButton:RID_ADDP_PAGE_COMMAND:RID_ADDP_CMD_BTN_PDFDIR"; Pos = MAP_APPFONT( 205, 104 ); Size = MAP_APPFONT( 25, 12 ); Text = "~..."; }; PushButton RID_ADDP_CMD_BTN_HELP { + HelpID = "padmin:PushButton:RID_ADDP_PAGE_COMMAND:RID_ADDP_CMD_BTN_HELP"; Pos = MAP_APPFONT( 180, 2 ); Size = MAP_APPFONT( 50, 12 ); Text [ en-US ] = "~Help"; @@ -971,6 +1025,7 @@ TabPage RID_ADDP_PAGE_COMMAND TabPage RID_ADDP_PAGE_OLDPRINTERS { + HelpID = "padmin:TabPage:RID_ADDP_PAGE_OLDPRINTERS"; Hide = TRUE; Pos = MAP_APPFONT( 0, 30 ); Size = MAP_APPFONT( 240, 120 ); @@ -987,12 +1042,14 @@ TabPage RID_ADDP_PAGE_OLDPRINTERS }; MultiListBox RID_ADDP_OLD_BOX_PRINTERS { + HelpID = "padmin:MultiListBox:RID_ADDP_PAGE_OLDPRINTERS:RID_ADDP_OLD_BOX_PRINTERS"; Pos = MAP_APPFONT( 10, 35 ); Size = MAP_APPFONT( 165, 80 ); Border = TRUE; }; PushButton RID_ADDP_OLD_BTN_SELECTALL { + HelpID = "padmin:PushButton:RID_ADDP_PAGE_OLDPRINTERS:RID_ADDP_OLD_BTN_SELECTALL"; Pos = MAP_APPFONT( 180, 35 ); Size = MAP_APPFONT( 50, 12 ); Text [ en-US ] = "~Select All"; @@ -1001,6 +1058,7 @@ TabPage RID_ADDP_PAGE_OLDPRINTERS TabPage RID_ADDP_PAGE_FAXDRIVER { + HelpID = "padmin:TabPage:RID_ADDP_PAGE_FAXDRIVER"; Hide = TRUE; Pos = MAP_APPFONT( 0, 30 ); Size = MAP_APPFONT( 240, 120 ); @@ -1017,12 +1075,14 @@ TabPage RID_ADDP_PAGE_FAXDRIVER }; RadioButton RID_ADDP_FAXDRV_BTN_DEFAULT { + HelpID = "padmin:RadioButton:RID_ADDP_PAGE_FAXDRIVER:RID_ADDP_FAXDRV_BTN_DEFAULT"; Pos = MAP_APPFONT( 40,40 ); Size = MAP_APPFONT( 160, 10 ); Text [ en-US ] = "T~he default driver"; }; RadioButton RID_ADDP_FAXDRV_BTN_SELECT { + HelpID = "padmin:RadioButton:RID_ADDP_PAGE_FAXDRIVER:RID_ADDP_FAXDRV_BTN_SELECT"; Pos = MAP_APPFONT( 40, 50 ); Size = MAP_APPFONT( 160,24 ); Text [ en-US ] = "A speci~fic driver, to adapt the format to another printer"; @@ -1031,6 +1091,7 @@ TabPage RID_ADDP_PAGE_FAXDRIVER TabPage RID_ADDP_PAGE_PDFDRIVER { + HelpID = "padmin:TabPage:RID_ADDP_PAGE_PDFDRIVER"; Hide = TRUE; Pos = MAP_APPFONT( 0, 30 ); Size = MAP_APPFONT( 240, 120 ); @@ -1047,18 +1108,21 @@ TabPage RID_ADDP_PAGE_PDFDRIVER }; RadioButton RID_ADDP_PDFDRV_BTN_DEFAULT { + HelpID = "padmin:RadioButton:RID_ADDP_PAGE_PDFDRIVER:RID_ADDP_PDFDRV_BTN_DEFAULT"; Pos = MAP_APPFONT( 40, 40 ); Size = MAP_APPFONT( 160, 10 ); Text [ en-US ] = "T~he default driver"; }; RadioButton RID_ADDP_PDFDRV_BTN_DIST { + HelpID = "padmin:RadioButton:RID_ADDP_PAGE_PDFDRIVER:RID_ADDP_PDFDRV_BTN_DIST"; Pos = MAP_APPFONT( 40,50 ); Size = MAP_APPFONT( 160, 10 ); Text [ en-US ] = "The Adobe D~istiller(tm) driver"; }; RadioButton RID_ADDP_PDFDRV_BTN_SELECT { + HelpID = "padmin:RadioButton:RID_ADDP_PAGE_PDFDRIVER:RID_ADDP_PDFDRV_BTN_SELECT"; Pos = MAP_APPFONT( 40, 60 ); Size = MAP_APPFONT( 160, 24 ); Text [ en-US ] = "A spec~ific driver, to adapt the format to another printer"; diff --git a/padmin/source/rtsetup.src b/padmin/source/rtsetup.src index e04374a72245..dbb4566a3a27 100644 --- a/padmin/source/rtsetup.src +++ b/padmin/source/rtsetup.src @@ -78,6 +78,7 @@ TabDialog RID_RTS_RTSDIALOG TabPage RID_RTS_PAPERPAGE { + HelpID = "padmin:TabPage:RID_RTS_PAPERPAGE"; Hide = TRUE; Size = MAP_APPFONT( 230, 175 ); FixedText RID_RTS_PAPER_PAPER_TXT @@ -88,6 +89,7 @@ TabPage RID_RTS_PAPERPAGE }; ListBox RID_RTS_PAPER_PAPER_BOX { + HelpID = "padmin:ListBox:RID_RTS_PAPERPAGE:RID_RTS_PAPER_PAPER_BOX"; Border = TRUE; DropDown = TRUE; Pos = MAP_APPFONT( 115, 5 ); @@ -101,6 +103,7 @@ TabPage RID_RTS_PAPERPAGE }; ListBox RID_RTS_PAPER_ORIENTATION_BOX { + HelpID = "padmin:ListBox:RID_RTS_PAPERPAGE:RID_RTS_PAPER_ORIENTATION_BOX"; Border = TRUE; DropDown = TRUE; Pos = MAP_APPFONT( 115, 20 ); @@ -114,6 +117,7 @@ TabPage RID_RTS_PAPERPAGE }; ListBox RID_RTS_PAPER_DUPLEX_BOX { + HelpID = "padmin:ListBox:RID_RTS_PAPERPAGE:RID_RTS_PAPER_DUPLEX_BOX"; Border = TRUE; DropDown = TRUE; Pos = MAP_APPFONT( 115, 35 ); @@ -127,6 +131,7 @@ TabPage RID_RTS_PAPERPAGE }; ListBox RID_RTS_PAPER_SLOT_BOX { + HelpID = "padmin:ListBox:RID_RTS_PAPERPAGE:RID_RTS_PAPER_SLOT_BOX"; Border = TRUE; DropDown = TRUE; Pos = MAP_APPFONT( 115, 50 ); @@ -136,6 +141,7 @@ TabPage RID_RTS_PAPERPAGE TabPage RID_RTS_DEVICEPAGE { + HelpID = "padmin:TabPage:RID_RTS_DEVICEPAGE"; Hide = TRUE; Size = MAP_APPFONT( 230, 175 ); @@ -156,6 +162,7 @@ TabPage RID_RTS_DEVICEPAGE }; ListBox RID_RTS_DEVICE_PPDKEY_BOX { + HelpID = "padmin:ListBox:RID_RTS_DEVICEPAGE:RID_RTS_DEVICE_PPDKEY_BOX"; Border = TRUE; Pos = MAP_APPFONT( 5, 14 ); Size = MAP_APPFONT( 105, 111 ); @@ -168,6 +175,7 @@ TabPage RID_RTS_DEVICEPAGE }; ListBox RID_RTS_DEVICE_PPDVALUE_BOX { + HelpID = "padmin:ListBox:RID_RTS_DEVICEPAGE:RID_RTS_DEVICE_PPDVALUE_BOX"; Border = TRUE; Pos = MAP_APPFONT( 120, 14 ); Size = MAP_APPFONT( 105, 111 ); @@ -181,6 +189,7 @@ TabPage RID_RTS_DEVICEPAGE }; ListBox RID_RTS_DEVICE_LEVEL_BOX { + HelpID = "padmin:ListBox:RID_RTS_DEVICEPAGE:RID_RTS_DEVICE_LEVEL_BOX"; DropDown = TRUE; Pos = MAP_APPFONT( 120, 130 ); Size = MAP_APPFONT( 105, 200 ); @@ -193,6 +202,7 @@ TabPage RID_RTS_DEVICEPAGE }; ListBox RID_RTS_DEVICE_SPACE_BOX { + HelpID = "padmin:ListBox:RID_RTS_DEVICEPAGE:RID_RTS_DEVICE_SPACE_BOX"; DropDown = TRUE; Pos = MAP_APPFONT( 120, 145 ); Size = MAP_APPFONT( 105, 200 ); @@ -205,6 +215,7 @@ TabPage RID_RTS_DEVICEPAGE }; ListBox RID_RTS_DEVICE_DEPTH_BOX { + HelpID = "padmin:ListBox:RID_RTS_DEVICEPAGE:RID_RTS_DEVICE_DEPTH_BOX"; DropDown = TRUE; Pos = MAP_APPFONT( 120, 160 ); Size = MAP_APPFONT( 105, 200 ); @@ -218,11 +229,13 @@ TabPage RID_RTS_DEVICEPAGE TabPage RID_RTS_FONTSUBSTPAGE { + HelpID = "padmin:TabPage:RID_RTS_FONTSUBSTPAGE"; Hide = TRUE; Size = MAP_APPFONT( 230, 175 ); CheckBox RID_RTS_FS_ENABLE_BTN { + HelpID = "padmin:CheckBox:RID_RTS_FONTSUBSTPAGE:RID_RTS_FS_ENABLE_BTN"; Pos = MAP_APPFONT( 5, 5 ); Size = MAP_APPFONT( 180, 10 ); Text [ en-US ] = "~Enable font replacement"; @@ -236,6 +249,7 @@ TabPage RID_RTS_FONTSUBSTPAGE }; MultiListBox RID_RTS_FS_SUBST_BOX { + HelpID = "padmin:MultiListBox:RID_RTS_FONTSUBSTPAGE:RID_RTS_FS_SUBST_BOX"; AutoHScroll = TRUE; Border = TRUE; Sort = TRUE; @@ -245,12 +259,14 @@ TabPage RID_RTS_FONTSUBSTPAGE }; PushButton RID_RTS_FS_ADD_BTN { + HelpID = "padmin:PushButton:RID_RTS_FONTSUBSTPAGE:RID_RTS_FS_ADD_BTN"; Pos = MAP_APPFONT( 5, 125 ); Size = MAP_APPFONT( 107, 12 ); Text [ en-US ] = "~Add"; }; PushButton RID_RTS_FS_REMOVE_BTN { + HelpID = "padmin:PushButton:RID_RTS_FONTSUBSTPAGE:RID_RTS_FS_REMOVE_BTN"; Pos = MAP_APPFONT( 117, 125 ); Size = MAP_APPFONT( 107, 12 ); Text [ en-US ] = "~Remove"; @@ -263,6 +279,7 @@ TabPage RID_RTS_FONTSUBSTPAGE }; ComboBox RID_RTS_FS_FROM_BOX { + HelpID = "padmin:ComboBox:RID_RTS_FONTSUBSTPAGE:RID_RTS_FS_FROM_BOX"; Border = TRUE; DropDown = TRUE; Sort = TRUE; @@ -277,6 +294,7 @@ TabPage RID_RTS_FONTSUBSTPAGE }; ListBox RID_RTS_FS_TO_BOX { + HelpID = "padmin:ListBox:RID_RTS_FONTSUBSTPAGE:RID_RTS_FS_TO_BOX"; Border = TRUE; DropDown = TRUE; Sort = TRUE; @@ -287,11 +305,13 @@ TabPage RID_RTS_FONTSUBSTPAGE TabPage RID_RTS_COMMANDPAGE { + HelpID = "padmin:TabPage:RID_RTS_COMMANDPAGE"; Hide = TRUE; Size = MAP_APPFONT( 230, 175 ); ComboBox RID_RTS_CMD_CB_COMMANDS { + HelpID = "padmin:ComboBox:RID_RTS_COMMANDPAGE:RID_RTS_CMD_CB_COMMANDS"; Border = TRUE ; Sort = TRUE ; Dropdown = TRUE; @@ -300,6 +320,7 @@ TabPage RID_RTS_COMMANDPAGE }; CheckBox RID_RTS_CMD_CB_EXTERNAL { + HelpID = "padmin:CheckBox:RID_RTS_COMMANDPAGE:RID_RTS_CMD_CB_EXTERNAL"; Pos = MAP_APPFONT( 11, 95 ); Size = MAP_APPFONT( 220, 10 ); Text [ en-US ] = "~Use system print dialog, disable %PRODUCTNAME's print dialog"; @@ -313,6 +334,7 @@ TabPage RID_RTS_COMMANDPAGE }; ComboBox RIT_RTS_CMD_CB_QUICKCMD { + HelpID = "padmin:ComboBox:RID_RTS_COMMANDPAGE:RIT_RTS_CMD_CB_QUICKCMD"; Border = TRUE; Sort = TRUE; Dropdown = TRUE; @@ -340,6 +362,7 @@ TabPage RID_RTS_COMMANDPAGE ListBox RID_RTS_CMD_LB_CONFIGURE { + HelpID = "padmin:ListBox:RID_RTS_COMMANDPAGE:RID_RTS_CMD_LB_CONFIGURE"; DropDown = true; Border = true; Pos = MAP_APPFONT( 101, 56 ); @@ -354,6 +377,7 @@ TabPage RID_RTS_COMMANDPAGE CheckBox RID_RTS_CMD_BOX_SWALLOWFAXNO { + HelpID = "padmin:CheckBox:RID_RTS_COMMANDPAGE:RID_RTS_CMD_BOX_SWALLOWFAXNO"; Pos = MAP_APPFONT( 11, 146 ); Size = MAP_APPFONT( 130, 8 ); Text [ en-US ] = "~Fax number will be removed from output"; @@ -366,12 +390,14 @@ TabPage RID_RTS_COMMANDPAGE }; Edit RID_RTS_CMD_EDT_PDFDIR { + HelpID = "padmin:Edit:RID_RTS_COMMANDPAGE:RID_RTS_CMD_EDT_PDFDIR"; Border = TRUE; Pos = MAP_APPFONT( 11, 155 ); Size = MAP_APPFONT( 130, 12 ); }; PushButton RID_RTS_CMD_BTN_PDFDIR { + HelpID = "padmin:PushButton:RID_RTS_COMMANDPAGE:RID_RTS_CMD_BTN_PDFDIR"; Pos = MAP_APPFONT( 146, 155 ); Size = MAP_APPFONT( 15, 12 ); Text = "..."; @@ -395,12 +421,14 @@ TabPage RID_RTS_COMMANDPAGE }; PushButton RID_RTS_CMD_BTN_HELP { + HelpID = "padmin:PushButton:RID_RTS_COMMANDPAGE:RID_RTS_CMD_BTN_HELP"; Pos = MAP_APPFONT( 170, 55 ); Size = MAP_APPFONT( 50, 12 ); Text [ en-US ] = "~Help"; }; PushButton RID_RTS_CMD_BTN_REMOVE { + HelpID = "padmin:PushButton:RID_RTS_COMMANDPAGE:RID_RTS_CMD_BTN_REMOVE"; Pos = MAP_APPFONT( 170, 72 ); Size = MAP_APPFONT( 50, 12 ); Text [ en-US ] = "~Remove"; @@ -421,6 +449,7 @@ TabPage RID_RTS_COMMANDPAGE TabPage RID_RTS_OTHERPAGE { + HelpID = "padmin:TabPage:RID_RTS_OTHERPAGE"; Hide = TRUE; Size = MAP_APPFONT( 230, 175 ); @@ -432,6 +461,7 @@ TabPage RID_RTS_OTHERPAGE }; MetricField RID_RTS_OTHER_LEFTMARGIN_BOX { + HelpID = "padmin:MetricField:RID_RTS_OTHERPAGE:RID_RTS_OTHER_LEFTMARGIN_BOX"; Border = TRUE ; Pos = MAP_APPFONT ( 100 , 5 ) ; Size = MAP_APPFONT ( 50 , 12 ) ; @@ -448,6 +478,7 @@ TabPage RID_RTS_OTHERPAGE }; MetricField RID_RTS_OTHER_TOPMARGIN_BOX { + HelpID = "padmin:MetricField:RID_RTS_OTHERPAGE:RID_RTS_OTHER_TOPMARGIN_BOX"; Border = TRUE ; Pos = MAP_APPFONT ( 100 , 20 ) ; Size = MAP_APPFONT ( 50 , 12 ) ; @@ -464,6 +495,7 @@ TabPage RID_RTS_OTHERPAGE }; MetricField RID_RTS_OTHER_RIGHTMARGIN_BOX { + HelpID = "padmin:MetricField:RID_RTS_OTHERPAGE:RID_RTS_OTHER_RIGHTMARGIN_BOX"; Border = TRUE ; Pos = MAP_APPFONT ( 100 , 35 ) ; Size = MAP_APPFONT ( 50 , 12 ) ; @@ -480,6 +512,7 @@ TabPage RID_RTS_OTHERPAGE }; MetricField RID_RTS_OTHER_BOTTOMMARGIN_BOX { + HelpID = "padmin:MetricField:RID_RTS_OTHERPAGE:RID_RTS_OTHER_BOTTOMMARGIN_BOX"; Border = TRUE ; Pos = MAP_APPFONT ( 100 , 50 ) ; Size = MAP_APPFONT ( 50 , 12 ) ; @@ -496,12 +529,14 @@ TabPage RID_RTS_OTHERPAGE }; Edit RID_RTS_OTHER_COMMENT_EDT { + HelpID = "padmin:Edit:RID_RTS_OTHERPAGE:RID_RTS_OTHER_COMMENT_EDT"; Border = TRUE ; Pos = MAP_APPFONT ( 5 , 75 ) ; Size = MAP_APPFONT ( 220 , 12 ) ; }; PushButton RID_RTS_OTHER_DEFAULT_BTN { + HelpID = "padmin:PushButton:RID_RTS_OTHERPAGE:RID_RTS_OTHER_DEFAULT_BTN"; Pos = MAP_APPFONT( 175, 5 ); Size = MAP_APPFONT( 50, 12 ); Text [ en-US ] = "~Default"; @@ -515,6 +550,7 @@ String RID_TXT_QUERYFAXNUMBER ModalDialog RID_RTS_PWDIALOG { + HelpID = "padmin:ModalDialog:RID_RTS_PWDIALOG"; Text [ en-US ] = "Authentication request"; OutputSize = TRUE ; SVLook = TRUE ; @@ -537,6 +573,7 @@ ModalDialog RID_RTS_PWDIALOG }; Edit RID_RTS_PWDIALOG_USER_EDT { + HelpID = "padmin:Edit:RID_RTS_PWDIALOG:RID_RTS_PWDIALOG_USER_EDT"; Pos = MAP_APPFONT( 70, 29 ); Size = MAP_APPFONT( 75, 12 ); Border = TRUE; @@ -549,6 +586,7 @@ ModalDialog RID_RTS_PWDIALOG }; Edit RID_RTS_PWDIALOG_PASS_EDT { + HelpID = "padmin:Edit:RID_RTS_PWDIALOG:RID_RTS_PWDIALOG_PASS_EDT"; Pos = MAP_APPFONT( 70, 44 ); Size = MAP_APPFONT( 75, 12 ); Border = TRUE; -- cgit From 2cce17c5b5637744b1086f14dfcd2d9cbbfa5710 Mon Sep 17 00:00:00 2001 From: Carsten Driesner Date: Fri, 14 Jan 2011 15:09:57 +0100 Subject: removetooltypes01: #i112600# Remove tools types from padmin --- padmin/source/adddlg.cxx | 104 ++++++++++++++++++++++---------------------- padmin/source/cmddlg.cxx | 24 +++++----- padmin/source/cmddlg.hxx | 6 +-- padmin/source/fontentry.cxx | 28 ++++++------ padmin/source/helper.cxx | 8 ++-- padmin/source/helper.hxx | 2 +- padmin/source/newppdlg.cxx | 2 +- padmin/source/padialog.cxx | 38 ++++++++-------- padmin/source/padialog.hxx | 4 +- padmin/source/pamain.cxx | 8 ++-- padmin/source/progress.cxx | 10 ++--- padmin/source/progress.hxx | 6 +-- padmin/source/prtsetup.cxx | 64 +++++++++++++-------------- padmin/source/prtsetup.hxx | 8 ++-- 14 files changed, 156 insertions(+), 156 deletions(-) (limited to 'padmin/source') diff --git a/padmin/source/adddlg.cxx b/padmin/source/adddlg.cxx index 0f398c7e480a..e3d94a05d0ef 100644 --- a/padmin/source/adddlg.cxx +++ b/padmin/source/adddlg.cxx @@ -61,18 +61,18 @@ APChooseDevicePage::APChooseDevicePage( AddPrinterDialog* pParent ) : m_aOverTxt( this, PaResId( RID_ADDP_CHDEV_TXT_OVER ) ) { FreeResource(); - m_aPrinterBtn.Check( TRUE ); - m_aFaxBtn.Check( FALSE ); - m_aPDFBtn.Check( FALSE ); - m_aOldBtn.Check( FALSE ); + m_aPrinterBtn.Check( sal_True ); + m_aFaxBtn.Check( sal_False ); + m_aPDFBtn.Check( sal_False ); + m_aOldBtn.Check( sal_False ); if( ! AddPrinterDialog::getOldPrinterLocation().Len() ) - m_aOldBtn.Enable( FALSE ); + m_aOldBtn.Enable( sal_False ); if( ! PrinterInfoManager::get().addOrRemovePossible() ) { - m_aPrinterBtn.Check( FALSE ); - m_aFaxBtn.Check( TRUE ); - m_aPrinterBtn.Enable( FALSE ); - m_aOldBtn.Enable( FALSE ); + m_aPrinterBtn.Check( sal_False ); + m_aFaxBtn.Check( sal_True ); + m_aPrinterBtn.Enable( sal_False ); + m_aOldBtn.Enable( sal_False ); } } @@ -129,7 +129,7 @@ bool APChooseDriverPage::check() void APChooseDriverPage::fill( PrinterInfo& rInfo ) { - USHORT nPos = m_aDriverBox.GetSelectEntryPos(); + sal_uInt16 nPos = m_aDriverBox.GetSelectEntryPos(); String* pDriver = (String*)m_aDriverBox.GetEntryData( nPos ); rInfo.m_aDriverName = *pDriver; #if OSL_DEBUG_LEVEL > 1 @@ -332,15 +332,15 @@ APNamePage::APNamePage( AddPrinterDialog* pParent, const String& rInitName, Devi { FreeResource(); if( eKind != DeviceKind::Printer ) - m_aDefaultBox.Show( FALSE ); + m_aDefaultBox.Show( sal_False ); else m_aNameEdt.SetText( rInitName ); if( eKind != DeviceKind::Fax ) - m_aFaxSwallowBox.Show( FALSE ); + m_aFaxSwallowBox.Show( sal_False ); m_aNameEdt.SetText( AddPrinterDialog::uniquePrinterName( m_aNameEdt.GetText() ) ); - m_aDefaultBox.Check( FALSE ); - m_aFaxSwallowBox.Check( FALSE ); + m_aDefaultBox.Check( sal_False ); + m_aFaxSwallowBox.Check( sal_False ); } APNamePage::~APNamePage() @@ -374,16 +374,16 @@ APCommandPage::APCommandPage( AddPrinterDialog* pParent, DeviceKind::type eKind ::std::list< String > aCommands; if( m_eKind == DeviceKind::Printer ) { - m_aHelpBtn.Show( FALSE ); + m_aHelpBtn.Show( sal_False ); Size aSize = m_aCommandTxt.GetSizePixel(); aSize.Width() = m_aCommandBox.GetSizePixel().Width(); m_aCommandTxt.SetSizePixel( aSize ); } if( m_eKind != DeviceKind::Pdf ) { - m_aPdfDirBtn.Show( FALSE ); - m_aPdfDirEdt.Show( FALSE ); - m_aPdfDirTxt.Show( FALSE ); + m_aPdfDirBtn.Show( sal_False ); + m_aPdfDirEdt.Show( sal_False ); + m_aPdfDirTxt.Show( sal_False ); } switch( m_eKind ) { @@ -675,8 +675,8 @@ APFaxDriverPage::APFaxDriverPage( AddPrinterDialog* pParent ) { FreeResource(); - m_aDefBtn.Check( TRUE ); - m_aSelectBtn.Check( FALSE ); + m_aDefBtn.Check( sal_True ); + m_aSelectBtn.Check( sal_False ); m_aSelectBtn.SetStyle( m_aSelectBtn.GetStyle() | WB_WORDBREAK ); } @@ -708,9 +708,9 @@ APPdfDriverPage::APPdfDriverPage( AddPrinterDialog* pParent ) { FreeResource(); - m_aDefBtn.Check( TRUE ); - m_aDistBtn.Check( FALSE ); - m_aSelectBtn.Check( FALSE ); + m_aDefBtn.Check( sal_True ); + m_aDistBtn.Check( sal_False ); + m_aSelectBtn.Check( sal_False ); m_aSelectBtn.SetStyle( m_aSelectBtn.GetStyle() | WB_WORDBREAK ); } @@ -758,9 +758,9 @@ AddPrinterDialog::AddPrinterDialog( Window* pParent ) { FreeResource(); m_pCurrentPage = m_pChooseDevicePage = new APChooseDevicePage( this ); - m_pCurrentPage->Show( TRUE ); - m_aFinishPB.Enable( FALSE ); - m_aPrevPB.Enable( FALSE ); + m_pCurrentPage->Show( sal_True ); + m_aFinishPB.Enable( sal_False ); + m_aPrevPB.Enable( sal_False ); m_aNextPB.SetClickHdl( LINK( this, AddPrinterDialog, ClickBtnHdl ) ); m_aPrevPB.SetClickHdl( LINK( this, AddPrinterDialog, ClickBtnHdl ) ); @@ -822,7 +822,7 @@ void AddPrinterDialog::DataChanged( const DataChangedEvent& rEv ) void AddPrinterDialog::advance() { - m_pCurrentPage->Show( FALSE ); + m_pCurrentPage->Show( sal_False ); if( m_pCurrentPage == m_pChooseDevicePage ) { if( m_pChooseDevicePage->isPrinter() ) @@ -830,30 +830,30 @@ void AddPrinterDialog::advance() if( ! m_pChooseDriverPage ) m_pChooseDriverPage = new APChooseDriverPage( this ); m_pCurrentPage = m_pChooseDriverPage; - m_aPrevPB.Enable( TRUE ); + m_aPrevPB.Enable( sal_True ); } else if( m_pChooseDevicePage->isOld() ) { if( ! m_pOldPrinterPage ) m_pOldPrinterPage = new APOldPrinterPage( this ); m_pCurrentPage = m_pOldPrinterPage; - m_aPrevPB.Enable( TRUE ); - m_aFinishPB.Enable( TRUE ); - m_aNextPB.Enable( FALSE ); + m_aPrevPB.Enable( sal_True ); + m_aFinishPB.Enable( sal_True ); + m_aNextPB.Enable( sal_False ); } else if( m_pChooseDevicePage->isFax() ) { if( ! m_pFaxDriverPage ) m_pFaxDriverPage = new APFaxDriverPage( this ); m_pCurrentPage = m_pFaxDriverPage; - m_aPrevPB.Enable( TRUE ); + m_aPrevPB.Enable( sal_True ); } else if( m_pChooseDevicePage->isPDF() ) { if( ! m_pPdfDriverPage ) m_pPdfDriverPage = new APPdfDriverPage( this ); m_pCurrentPage = m_pPdfDriverPage; - m_aPrevPB.Enable( TRUE ); + m_aPrevPB.Enable( sal_True ); } } else if( m_pCurrentPage == m_pChooseDriverPage ) @@ -869,8 +869,8 @@ void AddPrinterDialog::advance() else m_pNamePage->setText( m_aPrinter.m_aPrinterName ); m_pCurrentPage = m_pNamePage; - m_aFinishPB.Enable( TRUE ); - m_aNextPB.Enable( FALSE ); + m_aFinishPB.Enable( sal_True ); + m_aNextPB.Enable( sal_False ); } else if( m_pCurrentPage == m_pFaxDriverPage ) { @@ -898,8 +898,8 @@ void AddPrinterDialog::advance() if( ! m_pFaxNamePage ) m_pFaxNamePage = new APNamePage( this, String(), DeviceKind::Fax ); m_pCurrentPage = m_pFaxNamePage; - m_aNextPB.Enable( FALSE ); - m_aFinishPB.Enable( TRUE ); + m_aNextPB.Enable( sal_False ); + m_aFinishPB.Enable( sal_True ); } else if( m_pCurrentPage == m_pPdfDriverPage ) { @@ -927,26 +927,26 @@ void AddPrinterDialog::advance() if( ! m_pPdfNamePage ) m_pPdfNamePage = new APNamePage( this, String(), DeviceKind::Pdf ); m_pCurrentPage = m_pPdfNamePage; - m_aNextPB.Enable( FALSE ); - m_aFinishPB.Enable( TRUE ); + m_aNextPB.Enable( sal_False ); + m_aFinishPB.Enable( sal_True ); } - m_pCurrentPage->Show( TRUE ); + m_pCurrentPage->Show( sal_True ); m_aTitleImage.SetText( m_pCurrentPage->getTitle() ); } void AddPrinterDialog::back() { - m_pCurrentPage->Show( FALSE ); + m_pCurrentPage->Show( sal_False ); if( m_pCurrentPage == m_pChooseDriverPage ) { m_pCurrentPage = m_pChooseDevicePage; - m_aPrevPB.Enable( FALSE ); + m_aPrevPB.Enable( sal_False ); } else if( m_pCurrentPage == m_pNamePage ) { m_pCurrentPage = m_pCommandPage; - m_aNextPB.Enable( TRUE ); + m_aNextPB.Enable( sal_True ); } else if( m_pCurrentPage == m_pCommandPage ) { @@ -955,13 +955,13 @@ void AddPrinterDialog::back() else if( m_pCurrentPage == m_pOldPrinterPage ) { m_pCurrentPage = m_pChooseDevicePage; - m_aPrevPB.Enable( FALSE ); - m_aNextPB.Enable( TRUE ); + m_aPrevPB.Enable( sal_False ); + m_aNextPB.Enable( sal_True ); } else if( m_pCurrentPage == m_pFaxDriverPage ) { m_pCurrentPage = m_pChooseDevicePage; - m_aPrevPB.Enable( FALSE ); + m_aPrevPB.Enable( sal_False ); } else if( m_pCurrentPage == m_pFaxSelectDriverPage ) { @@ -970,17 +970,17 @@ void AddPrinterDialog::back() else if( m_pCurrentPage == m_pFaxNamePage ) { m_pCurrentPage = m_pFaxCommandPage; - m_aNextPB.Enable( TRUE ); + m_aNextPB.Enable( sal_True ); } else if( m_pCurrentPage == m_pFaxCommandPage ) { m_pCurrentPage = m_pFaxDriverPage->isDefault() ? (APTabPage*)m_pFaxDriverPage : (APTabPage*)m_pFaxSelectDriverPage; - m_aNextPB.Enable( TRUE ); + m_aNextPB.Enable( sal_True ); } else if( m_pCurrentPage == m_pPdfDriverPage ) { m_pCurrentPage = m_pChooseDevicePage; - m_aPrevPB.Enable( FALSE ); + m_aPrevPB.Enable( sal_False ); } else if( m_pCurrentPage == m_pPdfSelectDriverPage ) { @@ -989,14 +989,14 @@ void AddPrinterDialog::back() else if( m_pCurrentPage == m_pPdfNamePage ) { m_pCurrentPage = m_pPdfCommandPage; - m_aNextPB.Enable( TRUE ); + m_aNextPB.Enable( sal_True ); } else if( m_pCurrentPage == m_pPdfCommandPage ) { m_pCurrentPage = m_pPdfDriverPage->isDefault() || m_pPdfDriverPage->isDist() ? (APTabPage*)m_pPdfDriverPage : (APTabPage*)m_pPdfSelectDriverPage; - m_aNextPB.Enable( TRUE ); + m_aNextPB.Enable( sal_True ); } - m_pCurrentPage->Show( TRUE ); + m_pCurrentPage->Show( sal_True ); m_aTitleImage.SetText( m_pCurrentPage->getTitle() ); } diff --git a/padmin/source/cmddlg.cxx b/padmin/source/cmddlg.cxx index 76d181fb8e5e..d1fad0189b45 100644 --- a/padmin/source/cmddlg.cxx +++ b/padmin/source/cmddlg.cxx @@ -270,10 +270,10 @@ RTSCommandPage::RTSCommandPage( RTSDialog* pParent ) : m_aPdfDirectoryButton.SetClickHdl( LINK( this, RTSCommandPage, ClickBtnHdl ) ); m_aExternalCB.SetToggleHdl( LINK( this, RTSCommandPage, ClickBtnHdl ) ); - m_aPdfDirectoryButton.Show( FALSE ); - m_aPdfDirectoryEdit.Show( FALSE ); - m_aPdfDirectoryText.Show( FALSE ); - m_aFaxSwallowBox.Show( FALSE ); + m_aPdfDirectoryButton.Show( sal_False ); + m_aPdfDirectoryEdit.Show( sal_False ); + m_aPdfDirectoryText.Show( sal_False ); + m_aFaxSwallowBox.Show( sal_False ); m_aCommandsCB.SetText( m_pParent->m_aJobData.m_aCommand ); m_aQuickCB.SetText( m_pParent->m_aJobData.m_aQuickCommand ); @@ -287,9 +287,9 @@ RTSCommandPage::RTSCommandPage( RTSDialog* pParent ) : if( ! aToken.compareToAscii( "fax", 3 ) ) { m_bWasFax = true; - m_aFaxSwallowBox.Show( TRUE ); + m_aFaxSwallowBox.Show( sal_True ); sal_Int32 nPos = 0; - m_aFaxSwallowBox.Check( ! aToken.getToken( 1, '=', nPos ).compareToAscii( "swallow", 7 ) ? TRUE : FALSE ); + m_aFaxSwallowBox.Check( ! aToken.getToken( 1, '=', nPos ).compareToAscii( "swallow", 7 ) ? sal_True : sal_False ); m_aConfigureBox.SelectEntryPos( m_nFaxEntry ); } else if( ! aToken.compareToAscii( "pdf=", 4 ) ) @@ -297,9 +297,9 @@ RTSCommandPage::RTSCommandPage( RTSDialog* pParent ) : m_bWasPdf = true; sal_Int32 nPos = 0; m_aPdfDirectoryEdit.SetText( aToken.getToken( 1, '=', nPos ) ); - m_aPdfDirectoryEdit.Show( TRUE ); - m_aPdfDirectoryButton.Show( TRUE ); - m_aPdfDirectoryText.Show( TRUE ); + m_aPdfDirectoryEdit.Show( sal_True ); + m_aPdfDirectoryButton.Show( sal_True ); + m_aPdfDirectoryText.Show( sal_True ); m_aConfigureBox.SelectEntryPos( m_nPdfEntry ); } else if( ! aToken.compareToAscii( "external_dialog" ) ) @@ -425,17 +425,17 @@ IMPL_LINK( RTSCommandPage, SelectHdl, Control*, pBox ) { if( pBox == &m_aConfigureBox ) { - BOOL bEnable = m_aConfigureBox.GetSelectEntryPos() == m_nPdfEntry ? TRUE : FALSE; + sal_Bool bEnable = m_aConfigureBox.GetSelectEntryPos() == m_nPdfEntry ? sal_True : sal_False; m_aPdfDirectoryButton.Show( bEnable ); m_aPdfDirectoryEdit.Show( bEnable ); m_aPdfDirectoryText.Show( bEnable ); - bEnable = m_aConfigureBox.GetSelectEntryPos() == m_nFaxEntry ? TRUE : FALSE; + bEnable = m_aConfigureBox.GetSelectEntryPos() == m_nFaxEntry ? sal_True : sal_False; m_aFaxSwallowBox.Show( bEnable ); UpdateCommands(); } else if( pBox == &m_aCommandsCB ) { - m_aRemovePB.Enable( TRUE ); + m_aRemovePB.Enable( sal_True ); } return 0; diff --git a/padmin/source/cmddlg.hxx b/padmin/source/cmddlg.hxx index 9e6d12cf4277..0b1e07dd1db7 100644 --- a/padmin/source/cmddlg.hxx +++ b/padmin/source/cmddlg.hxx @@ -79,9 +79,9 @@ private: FixedText m_aConfigureText; ListBox m_aConfigureBox; - USHORT m_nPrinterEntry; - USHORT m_nFaxEntry; - USHORT m_nPdfEntry; + sal_uInt16 m_nPrinterEntry; + sal_uInt16 m_nFaxEntry; + sal_uInt16 m_nPdfEntry; FixedText m_aPdfDirectoryText; PushButton m_aPdfDirectoryButton; Edit m_aPdfDirectoryEdit; diff --git a/padmin/source/fontentry.cxx b/padmin/source/fontentry.cxx index f67d2c0d18d6..93ed87e221a9 100644 --- a/padmin/source/fontentry.cxx +++ b/padmin/source/fontentry.cxx @@ -143,7 +143,7 @@ FontNameDlg::FontNameDlg( Window *pParent ) : { FreeResource(); - m_aFontBox.EnableMultiSelection( TRUE ); + m_aFontBox.EnableMultiSelection( sal_True ); m_aOKButton.SetClickHdl( LINK( this, FontNameDlg, ClickBtnHdl ) ); m_aRenameButton.SetClickHdl( LINK( this, FontNameDlg, ClickBtnHdl ) ); @@ -256,8 +256,8 @@ void FontNameDlg::init() ::std::list< fontID > aFonts; m_rFontManager.getFontList( aFonts ); m_aFontBox.Clear(); - m_aRemoveButton.Enable( FALSE ); - m_aRenameButton.Enable( FALSE ); + m_aRemoveButton.Enable( sal_False ); + m_aRenameButton.Enable( sal_False ); ::std::hash_map< OUString, int, OUStringHash > aFamilies; ::std::list< fontID >::iterator font_it; @@ -300,7 +300,7 @@ void FontNameDlg::init() } else aEntry = fillFontEntry( aInfo, String( ByteString( aFile ), osl_getThreadTextEncoding() ), aFamilies[ aInfo.m_aFamilyName ] > 1 ); - USHORT nEntry = m_aFontBox.InsertEntry( aEntry ); + sal_uInt16 nEntry = m_aFontBox.InsertEntry( aEntry ); m_aFontBox.SetEntryData( nEntry, (void*)(*font_it) ); } } @@ -310,7 +310,7 @@ IMPL_LINK( FontNameDlg, SelectHdl, ListBox*, pBox ) { if( pBox == &m_aFontBox ) { - BOOL bEnable = m_aFontBox.GetSelectEntryCount() ? TRUE : FALSE; + sal_Bool bEnable = m_aFontBox.GetSelectEntryCount() ? sal_True : sal_False; m_aRemoveButton.Enable( bEnable ); m_aRenameButton.Enable( bEnable ); } @@ -442,7 +442,7 @@ FontImportDialog::FontImportDialog( Window* pParent ) : { FreeResource(); - m_aNewFontsBox.EnableMultiSelection( TRUE ); + m_aNewFontsBox.EnableMultiSelection( sal_True ); m_aOKBtn.SetClickHdl( LINK( this, FontImportDialog, ClickBtnHdl ) ); m_aSelectAllBtn.SetClickHdl( LINK( this, FontImportDialog, ClickBtnHdl ) ); @@ -450,8 +450,8 @@ FontImportDialog::FontImportDialog( Window* pParent ) : m_aFromDirEdt.SetModifyHdl( LINK( this, FontImportDialog, ModifyHdl ) ); m_aRefreshTimer.SetTimeoutHdl( LINK( this, FontImportDialog, RefreshTimeoutHdl ) ); m_aRefreshTimer.SetTimeout( 2000 ); - m_aLinkOnlyBox.Check( FALSE ); - m_aSubDirsBox.Check( TRUE ); + m_aLinkOnlyBox.Check( sal_False ); + m_aSubDirsBox.Check( sal_True ); m_aSubDirsBox.SetToggleHdl( LINK( this, FontImportDialog, ToggleHdl ) ); Config& rPadminRC( getPadminRC() ); @@ -595,7 +595,7 @@ void FontImportDialog::fillFontBox() aEntry = FontNameDlg::fillFontEntry( it->second.front(), aFile, aFamilies[ it->second.front().m_aFamilyName ] > 1 ); else aEntry = FontNameDlg::fillFontEntry( it->second, aFile ); - USHORT nPos = m_aNewFontsBox.InsertEntry( aEntry ); + sal_uInt16 nPos = m_aNewFontsBox.InsertEntry( aEntry ); m_aNewFontsBox.SetEntryData( nPos, (void*)&(it->first) ); } } @@ -616,12 +616,12 @@ void FontImportDialog::copyFonts() m_pProgress = new ProgressDialog( this ); m_pProgress->setRange( 0, aFiles.size() ); m_pProgress->startOperation( m_aImportOperation ); - m_pProgress->Show( TRUE ); + m_pProgress->Show( sal_True ); m_pProgress->setValue( 0 ); m_pProgress->Invalidate(); m_pProgress->Sync(); nSuccess = m_rFontManager.importFonts( aFiles, m_aLinkOnlyBox.IsChecked() ? true : false, this ); - m_pProgress->Show( FALSE ); + m_pProgress->Show( sal_False ); delete m_pProgress; m_pProgress = NULL; } @@ -649,10 +649,10 @@ IMPL_LINK( FontImportDialog, ClickBtnHdl, Button*, pButton ) } else if( pButton == &m_aSelectAllBtn ) { - m_aNewFontsBox.SetUpdateMode( FALSE ); + m_aNewFontsBox.SetUpdateMode( sal_False ); for( int i = 0; i < m_aNewFontsBox.GetEntryCount(); i++ ) - m_aNewFontsBox.SelectEntryPos( i, TRUE ); - m_aNewFontsBox.SetUpdateMode( TRUE ); + m_aNewFontsBox.SelectEntryPos( i, sal_True ); + m_aNewFontsBox.SetUpdateMode( sal_True ); } return 0; } diff --git a/padmin/source/helper.cxx b/padmin/source/helper.cxx index b81d37df5cb1..cab3bc9bde71 100644 --- a/padmin/source/helper.cxx +++ b/padmin/source/helper.cxx @@ -219,13 +219,13 @@ QueryString::QueryString( Window* pParent, String& rQuery, String& rRet, const : m_aComboBox.InsertEntry( m_rReturnValue ); for( ::std::list::const_iterator it = rChoices.begin(); it != rChoices.end(); ++it ) m_aComboBox.InsertEntry( *it ); - m_aEdit.Show( FALSE ); + m_aEdit.Show( sal_False ); m_bUseEdit = false; } else { m_aEdit.SetText( m_rReturnValue ); - m_aComboBox.Show( FALSE ); + m_aComboBox.Show( sal_False ); m_bUseEdit = true; } SetText( Application::GetDisplayName() ); @@ -251,13 +251,13 @@ IMPL_LINK( QueryString, ClickBtnHdl, Button*, pButton ) * AreYouSure */ -BOOL padmin::AreYouSure( Window* pParent, int nRid ) +sal_Bool padmin::AreYouSure( Window* pParent, int nRid ) { if( nRid == -1 ) nRid = RID_YOU_SURE; QueryBox aQueryBox( pParent, WB_YES_NO | WB_DEF_NO, String( PaResId( nRid ) ) ); - return aQueryBox.Execute() == RET_NO ? FALSE : TRUE; + return aQueryBox.Execute() == RET_NO ? sal_False : sal_True; } /* diff --git a/padmin/source/helper.hxx b/padmin/source/helper.hxx index 636241b826a6..b78bee96672d 100644 --- a/padmin/source/helper.hxx +++ b/padmin/source/helper.hxx @@ -110,7 +110,7 @@ public: ~QueryString(); }; -BOOL AreYouSure( Window*, int nRid = -1 ); +sal_Bool AreYouSure( Window*, int nRid = -1 ); ResId PaResId( sal_uInt32 nId ); diff --git a/padmin/source/newppdlg.cxx b/padmin/source/newppdlg.cxx index e1760c28db30..636e2d7435ea 100644 --- a/padmin/source/newppdlg.cxx +++ b/padmin/source/newppdlg.cxx @@ -152,7 +152,7 @@ void PPDImportDialog::Import() continue; } - USHORT nPos = m_aDriverLB.InsertEntry( aPrinterName ); + sal_uInt16 nPos = m_aDriverLB.InsertEntry( aPrinterName ); m_aDriverLB.SetEntryData( nPos, new String( aPath.PathToFileName() ) ); } } diff --git a/padmin/source/padialog.cxx b/padmin/source/padialog.cxx index d91ebea0c73d..bd81fe5d002b 100644 --- a/padmin/source/padialog.cxx +++ b/padmin/source/padialog.cxx @@ -68,12 +68,12 @@ using namespace com::sun::star; using namespace com::sun::star::uno; using namespace com::sun::star::beans; -PADialog* PADialog::Create( Window* pParent, BOOL bAdmin ) +PADialog* PADialog::Create( Window* pParent, sal_Bool bAdmin ) { return new PADialog( pParent, bAdmin ); } -PADialog::PADialog( Window* pParent, BOOL /*bAdmin*/ ) : +PADialog::PADialog( Window* pParent, sal_Bool /*bAdmin*/ ) : ModalDialog( pParent, PaResId( RID_PADIALOG ) ), m_aDevicesLB( this, PaResId( RID_PA_LB_DEV ) ), m_aConfPB( this, PaResId( RID_PA_BTN_CONF ) ), @@ -130,7 +130,7 @@ void PADialog::Init() UpdateDevice(); UpdateText(); - m_aRemPB.Enable( FALSE ); + m_aRemPB.Enable( sal_False ); m_aDevicesLB.SetDoubleClickHdl( LINK( this, PADialog, DoubleClickHdl ) ); m_aDevicesLB.SetSelectHdl( LINK( this, PADialog, SelectHdl ) ); @@ -146,23 +146,23 @@ void PADialog::Init() ::psp::PrintFontManager& rFontManager( ::psp::PrintFontManager::get() ); if( ! rFontManager.checkImportPossible() ) - m_aFontsPB.Enable( FALSE ); + m_aFontsPB.Enable( sal_False ); if( rFontManager.hasFontconfig() ) { - m_aFontsPB.Enable( FALSE ); - m_aFontsPB.Show( FALSE ); + m_aFontsPB.Enable( sal_False ); + m_aFontsPB.Show( sal_False ); } // at this point no actual changes will be written // but the write will have checked whether any writeable config exists if( ! m_rPIManager.writePrinterConfig() ) { - m_aAddPB.Enable( FALSE ); - m_aRemPB.Enable( FALSE ); - m_aConfPB.Enable( FALSE ); - m_aRenamePB.Enable( FALSE ); - m_aStdPB.Enable( FALSE ); - m_aCUPSCB.Enable( FALSE ); + m_aAddPB.Enable( sal_False ); + m_aRemPB.Enable( sal_False ); + m_aConfPB.Enable( sal_False ); + m_aRenamePB.Enable( sal_False ); + m_aStdPB.Enable( sal_False ); + m_aCUPSCB.Enable( sal_False ); ErrorBox aBox( GetParent(), WB_OK | WB_DEF_OK, String( PaResId( RID_ERR_NOWRITE ) ) ); aBox.Execute(); } @@ -260,9 +260,9 @@ IMPL_LINK( PADialog, SelectHdl, ListBox*, pListBox ) String sSelect = getSelectedDevice(); String sDefPrt = m_rPIManager.getDefaultPrinter(); if( sDefPrt == sSelect || ! m_rPIManager.removePrinter( sSelect, true ) ) - m_aRemPB.Enable( FALSE ); + m_aRemPB.Enable( sal_False ); else - m_aRemPB.Enable( TRUE ); + m_aRemPB.Enable( sal_True ); UpdateText(); } return 0; @@ -277,7 +277,7 @@ void PADialog::UpdateDefPrt() if( m_aRemPB.HasFocus() ) m_aDevicesLB.GetFocus(); - m_aRemPB.Enable( FALSE ); + m_aRemPB.Enable( sal_False ); } void PADialog::UpdateText() @@ -331,7 +331,7 @@ static Point project( const Point& rPoint ) static Color approachColor( const Color& rFrom, const Color& rTo ) { Color aColor; - UINT8 nDiff; + sal_uInt8 nDiff; // approach red if( rFrom.GetRed() < rTo.GetRed() ) { @@ -456,7 +456,7 @@ void SpaPrinterController::printPage( int ) const static const struct { const char* const pDirect; - USHORT nResId; + sal_uInt16 nResId; } aResIds[] = { { NULL, RID_TXT_TESTPAGE_NAME }, @@ -653,7 +653,7 @@ void PADialog::RemDevice() { if( m_aDevicesLB.GetEntry( i ).CompareTo( aDefPrinter, aDefPrinter.Len() ) == COMPARE_EQUAL ) { - m_aDevicesLB.SelectEntryPos( i, TRUE ); + m_aDevicesLB.SelectEntryPos( i, sal_True ); UpdateText(); break; } @@ -662,7 +662,7 @@ void PADialog::RemDevice() m_aDevicesLB.GetFocus(); if( m_aDevicesLB.GetEntryCount() < 2 ) - m_aRemPB.Enable( FALSE ); + m_aRemPB.Enable( sal_False ); } void PADialog::ConfigureDevice() diff --git a/padmin/source/padialog.hxx b/padmin/source/padialog.hxx index 2a8285f8af88..88086e9497de 100644 --- a/padmin/source/padialog.hxx +++ b/padmin/source/padialog.hxx @@ -92,7 +92,7 @@ namespace padmin { DECL_LINK( SelectHdl, ListBox* ); DECL_LINK( DelPressedHdl, ListBox* ); - PADialog( Window*, BOOL ); + PADialog( Window*, sal_Bool ); void Init(); void UpdateDefPrt(); @@ -112,7 +112,7 @@ namespace padmin { public: ~PADialog(); - static PADialog* Create( Window*, BOOL ); + static PADialog* Create( Window*, sal_Bool ); }; } // namespace diff --git a/padmin/source/pamain.cxx b/padmin/source/pamain.cxx index f46a2c8a3149..a780dddd915f 100644 --- a/padmin/source/pamain.cxx +++ b/padmin/source/pamain.cxx @@ -59,7 +59,7 @@ class MyApp : public Application { public: void Main(); - virtual USHORT Exception( USHORT nError ); + virtual sal_uInt16 Exception( sal_uInt16 nError ); static void ReadStringHook( String& ); }; @@ -82,7 +82,7 @@ void MyApp::ReadStringHook( String& rStr ) // ----------------------------------------------------------------------- -USHORT MyApp::Exception( USHORT nError ) +sal_uInt16 MyApp::Exception( sal_uInt16 nError ) { switch( nError & EXC_MAJORTYPE ) { @@ -149,7 +149,7 @@ void MyApp::Main() if( Application::GetSettings().GetMiscSettings().GetEnableATToolSupport() ) { - BOOL bQuitApp; + sal_Bool bQuitApp; if( !InitAccessBridge( true, bQuitApp ) ) if( bQuitApp ) return; @@ -160,7 +160,7 @@ void MyApp::Main() ResMgr::SetReadStringHook( MyApp::ReadStringHook ); - pPADialog = PADialog::Create( NULL , FALSE ); + pPADialog = PADialog::Create( NULL , sal_False ); Application::SetDisplayName( pPADialog->GetText() ); pPADialog->SetIcon(501); pPADialog->Execute(); diff --git a/padmin/source/progress.cxx b/padmin/source/progress.cxx index 03ef67db8da9..9a7cf537a842 100644 --- a/padmin/source/progress.cxx +++ b/padmin/source/progress.cxx @@ -41,7 +41,7 @@ using namespace padmin; ProgressDialog::ProgressDialog( Window* pParent, - BOOL bCancelable, + sal_Bool bCancelable, int nMin, int nMax ) : ModelessDialog( pParent, PaResId( RID_PROGRESS_DLG ) ), maOperation( this, PaResId( RID_PROGRESS_OPERATION_TXT ) ), @@ -51,7 +51,7 @@ ProgressDialog::ProgressDialog( Window* pParent, maProgressBar( this, PaResId( RID_PROGRESS_STATUSBAR ) ), mnMax( nMax ), mnMin( nMin ), - mbCanceled( FALSE ) + mbCanceled( sal_False ) { maFilename.SetStyle( maFilename.GetStyle() | WB_PATHELLIPSIS ); if( ! bCancelable ) @@ -75,9 +75,9 @@ void ProgressDialog::startOperation( const String& rOperation ) { maOperation.SetText( rOperation ); maProgressBar.SetValue( 0 ); - mbCanceled = FALSE; + mbCanceled = sal_False; if( ! IsVisible() ) - Show( TRUE ); + Show( sal_True ); } void ProgressDialog::setValue( int nValue ) @@ -97,7 +97,7 @@ IMPL_LINK( ProgressDialog, ClickBtnHdl, Button*, pButton ) { if( pButton == &maCancelButton ) { - mbCanceled = TRUE; + mbCanceled = sal_True; } return 0; } diff --git a/padmin/source/progress.hxx b/padmin/source/progress.hxx index 552a049c3572..f249732549c6 100644 --- a/padmin/source/progress.hxx +++ b/padmin/source/progress.hxx @@ -45,10 +45,10 @@ namespace padmin { ProgressBar maProgressBar; int mnMax, mnMin; - BOOL mbCanceled; + sal_Bool mbCanceled; public: - ProgressDialog( Window*, BOOL bCancelable = TRUE, int nMin = 0, int nMax = 100 ); + ProgressDialog( Window*, sal_Bool bCancelable = sal_True, int nMin = 0, int nMax = 100 ); ~ProgressDialog(); DECL_LINK( ClickBtnHdl, Button* ); @@ -58,7 +58,7 @@ namespace padmin { void startOperation( const String& ); void setFilename( const String& ); - BOOL isCanceled() { return mbCanceled; } + sal_Bool isCanceled() { return mbCanceled; } }; } // namespace diff --git a/padmin/source/prtsetup.cxx b/padmin/source/prtsetup.cxx index 8165b8015403..2ec2707a2bcc 100644 --- a/padmin/source/prtsetup.cxx +++ b/padmin/source/prtsetup.cxx @@ -47,7 +47,7 @@ void RTSDialog::insertAllPPDValues( ListBox& rBox, const PPDParser* pParser, con return; const PPDValue* pValue = NULL; - USHORT nPos = 0; + sal_uInt16 nPos = 0; String aOptionText; for( int i = 0; i < pKey->countValues(); i++ ) @@ -150,7 +150,7 @@ IMPL_LINK( RTSDialog, ActivatePage, TabControl*, pTabCtrl ) if( pTabCtrl != &m_aTabControl ) return 0; - USHORT nId = m_aTabControl.GetCurPageId(); + sal_uInt16 nId = m_aTabControl.GetCurPageId(); if ( ! m_aTabControl.GetTabPage( nId ) ) { @@ -242,7 +242,7 @@ RTSPaperPage::RTSPaperPage( RTSDialog* pParent ) : FreeResource(); - USHORT nPos = 0; + sal_uInt16 nPos = 0; m_aOrientBox.InsertEntry( PORTRAIT_STRING ); m_aOrientBox.InsertEntry( LSCAPE_STRING ); @@ -284,8 +284,8 @@ void RTSPaperPage::update() } else { - m_aDuplexText.Enable( FALSE ); - m_aDuplexBox.Enable( FALSE ); + m_aDuplexText.Enable( sal_False ); + m_aDuplexBox.Enable( sal_False ); } // paper @@ -296,8 +296,8 @@ void RTSPaperPage::update() } else { - m_aPaperText.Enable( FALSE ); - m_aPaperBox.Enable( FALSE ); + m_aPaperText.Enable( sal_False ); + m_aPaperBox.Enable( sal_False ); } // input slots @@ -308,8 +308,8 @@ void RTSPaperPage::update() } else { - m_aSlotText.Enable( FALSE ); - m_aSlotBox.Enable( FALSE ); + m_aSlotText.Enable( sal_False ); + m_aSlotBox.Enable( sal_False ); } } @@ -386,14 +386,14 @@ RTSDevicePage::RTSDevicePage( RTSDialog* pParent ) : case 1: m_aSpaceBox.SelectEntry( m_aSpaceColor );break; } - ULONG nLevelEntryData = 0; + sal_uLong nLevelEntryData = 0; if( m_pParent->m_aJobData.m_nPDFDevice > 0 ) nLevelEntryData = 10; else nLevelEntryData = m_pParent->m_aJobData.m_nPSLevel+1; - for( USHORT i = 0; i < m_aLevelBox.GetEntryCount(); i++ ) + for( sal_uInt16 i = 0; i < m_aLevelBox.GetEntryCount(); i++ ) { - if( (ULONG)m_aLevelBox.GetEntryData( i ) == nLevelEntryData ) + if( (sal_uLong)m_aLevelBox.GetEntryData( i ) == nLevelEntryData ) { m_aLevelBox.SelectEntryPos( i ); break; @@ -416,7 +416,7 @@ RTSDevicePage::RTSDevicePage( RTSDialog* pParent ) : ) { String aEntry( m_pParent->m_aJobData.m_pParser->translateKey( pKey->getKey() ) ); - USHORT nPos = m_aPPDKeyBox.InsertEntry( aEntry ); + sal_uInt16 nPos = m_aPPDKeyBox.InsertEntry( aEntry ); m_aPPDKeyBox.SetEntryData( nPos, (void*)pKey ); } } @@ -437,17 +437,17 @@ void RTSDevicePage::update() // ------------------------------------------------------------------ -ULONG RTSDevicePage::getLevel() +sal_uLong RTSDevicePage::getLevel() { - ULONG nLevel = (ULONG)m_aLevelBox.GetEntryData( m_aLevelBox.GetSelectEntryPos() ); + sal_uLong nLevel = (sal_uLong)m_aLevelBox.GetEntryData( m_aLevelBox.GetSelectEntryPos() ); return nLevel < 10 ? nLevel-1 : 0; } // ------------------------------------------------------------------ -ULONG RTSDevicePage::getPDFDevice() +sal_uLong RTSDevicePage::getPDFDevice() { - ULONG nLevel = (ULONG)m_aLevelBox.GetEntryData( m_aLevelBox.GetSelectEntryPos() ); + sal_uLong nLevel = (sal_uLong)m_aLevelBox.GetEntryData( m_aLevelBox.GetSelectEntryPos() ); return nLevel > 9 ? 1 : 0; } @@ -490,7 +490,7 @@ void RTSDevicePage::FillValueBox( const PPDKey* pKey ) m_pParent->m_aJobData.m_pParser ) { String aEntry( m_pParent->m_aJobData.m_pParser->translateOption( pKey->getKey(), pValue->m_aOption ) ); - USHORT nPos = m_aPPDValueBox.InsertEntry( aEntry ); + sal_uInt16 nPos = m_aPPDValueBox.InsertEntry( aEntry ); m_aPPDValueBox.SetEntryData( nPos, (void*)pValue ); } } @@ -521,10 +521,10 @@ RTSOtherPage::RTSOtherPage( RTSDialog* pParent ) : { FreeResource(); - m_aTopLB.EnableEmptyFieldValue( TRUE ); - m_aBottomLB.EnableEmptyFieldValue( TRUE ); - m_aLeftLB.EnableEmptyFieldValue( TRUE ); - m_aRightLB.EnableEmptyFieldValue( TRUE ); + m_aTopLB.EnableEmptyFieldValue( sal_True ); + m_aBottomLB.EnableEmptyFieldValue( sal_True ); + m_aLeftLB.EnableEmptyFieldValue( sal_True ); + m_aRightLB.EnableEmptyFieldValue( sal_True ); m_aDefaultBtn.SetClickHdl( LINK( this, RTSOtherPage, ClickBtnHdl ) ); @@ -658,16 +658,16 @@ RTSFontSubstPage::RTSFontSubstPage( RTSDialog* pParent ) : } m_aEnableBox.Check( m_pParent->m_aJobData.m_bPerformFontSubstitution ); - m_aRemoveButton.Enable( FALSE ); + m_aRemoveButton.Enable( sal_False ); if( ! m_pParent->m_aJobData.m_bPerformFontSubstitution ) { - m_aSubstitutionsBox.Enable( FALSE ); - m_aSubstitutionsText.Enable( FALSE ); - m_aAddButton.Enable( FALSE ); - m_aToFontBox.Enable( FALSE ); - m_aToFontText.Enable( FALSE ); - m_aFromFontBox.Enable( FALSE ); - m_aFromFontText.Enable( FALSE ); + m_aSubstitutionsBox.Enable( sal_False ); + m_aSubstitutionsText.Enable( sal_False ); + m_aAddButton.Enable( sal_False ); + m_aToFontBox.Enable( sal_False ); + m_aToFontText.Enable( sal_False ); + m_aFromFontBox.Enable( sal_False ); + m_aFromFontText.Enable( sal_False ); } update(); @@ -686,7 +686,7 @@ RTSFontSubstPage::~RTSFontSubstPage() void RTSFontSubstPage::update() { m_aSubstitutionsBox.Clear(); - m_aRemoveButton.Enable( FALSE ); + m_aRemoveButton.Enable( sal_False ); // fill substitutions box ::std::hash_map< OUString, OUString, OUStringHash >::const_iterator it; for( it = m_pParent->m_aJobData.m_aFontSubstitutes.begin(); @@ -728,7 +728,7 @@ IMPL_LINK( RTSFontSubstPage, ClickBtnHdl, Button*, pButton ) for( int i = 0; i < m_aSubstitutionsBox.GetSelectEntryCount(); i++ ) { String aEntry( m_aSubstitutionsBox.GetSelectEntry( i ) ); - USHORT nPos = aEntry.SearchAscii( " -> " ); + sal_uInt16 nPos = aEntry.SearchAscii( " -> " ); aEntry.Erase( nPos ); m_pParent->m_aJobData.m_aFontSubstitutes.erase( aEntry ); } diff --git a/padmin/source/prtsetup.hxx b/padmin/source/prtsetup.hxx index 72e3d81ee8d7..02a9325726fc 100644 --- a/padmin/source/prtsetup.hxx +++ b/padmin/source/prtsetup.hxx @@ -147,10 +147,10 @@ public: void update(); - ULONG getLevel(); - ULONG getPDFDevice(); - ULONG getDepth() { return m_aDepthBox.GetSelectEntry().ToInt32(); } - ULONG getColorDevice() + sal_uLong getLevel(); + sal_uLong getPDFDevice(); + sal_uLong getDepth() { return m_aDepthBox.GetSelectEntry().ToInt32(); } + sal_uLong getColorDevice() { String aSpace( m_aSpaceBox.GetSelectEntry() ); return aSpace == m_aSpaceColor ? 1 : ( aSpace == m_aSpaceGray ? -1 : 0 ); -- cgit From 9381025d4abb0a10fb458117542c2a063c7b1cfd Mon Sep 17 00:00:00 2001 From: "Philipp Lohmann [pl]" Date: Tue, 18 Jan 2011 18:44:14 +0100 Subject: vcl118: #i116501# migrated padmin module to gbuild system --- padmin/source/helper.hxx | 7 +++++++ padmin/source/padialog.hxx | 2 +- padmin/source/prtsetup.cxx | 6 +++--- 3 files changed, 11 insertions(+), 4 deletions(-) (limited to 'padmin/source') diff --git a/padmin/source/helper.hxx b/padmin/source/helper.hxx index 636241b826a6..4a9468c50725 100644 --- a/padmin/source/helper.hxx +++ b/padmin/source/helper.hxx @@ -46,6 +46,13 @@ #endif #include +#if defined SPA_DLLIMPLEMENTATION +#define SPA_DLLPUBLIC SAL_DLLPUBLIC_EXPORT +#else +#define SPA_DLLPUBLIC SAL_DLLPUBLIC_IMPORT +#endif + + class Config; #define PSPRINT_PPDDIR "driver" diff --git a/padmin/source/padialog.hxx b/padmin/source/padialog.hxx index 2a8285f8af88..053d9501ee7e 100644 --- a/padmin/source/padialog.hxx +++ b/padmin/source/padialog.hxx @@ -50,7 +50,7 @@ class Printer; namespace padmin { - class PADialog : public ModalDialog + class SPA_DLLPUBLIC PADialog : public ModalDialog { private: DelListBox m_aDevicesLB; diff --git a/padmin/source/prtsetup.cxx b/padmin/source/prtsetup.cxx index 8165b8015403..1d105618b648 100644 --- a/padmin/source/prtsetup.cxx +++ b/padmin/source/prtsetup.cxx @@ -802,7 +802,7 @@ OString RTSPWDialog::getPassword() const extern "C" { - int Sal_SetupPrinterDriver( ::psp::PrinterInfo& rJobData ) + int SPA_DLLPUBLIC Sal_SetupPrinterDriver( ::psp::PrinterInfo& rJobData ) { int nRet = 0; RTSDialog aDialog( rJobData, rJobData.m_aPrinterName, false ); @@ -816,14 +816,14 @@ extern "C" { return nRet; } - int Sal_queryFaxNumber( String& rNumber ) + int SPA_DLLPUBLIC Sal_queryFaxNumber( String& rNumber ) { String aTmpString( PaResId( RID_TXT_QUERYFAXNUMBER ) ); QueryString aQuery( NULL, aTmpString, rNumber ); return aQuery.Execute(); } - bool Sal_authenticateQuery( const OString& rServer, OString& rUserName, OString& rPassword ) + bool SPA_DLLPUBLIC Sal_authenticateQuery( const OString& rServer, OString& rUserName, OString& rPassword ) { bool bRet = false; -- cgit From f25576b919fff510e057608a25b7194509480dd9 Mon Sep 17 00:00:00 2001 From: "Philipp Lohmann [pl]" Date: Tue, 18 Jan 2011 18:48:23 +0100 Subject: vcl118: #i116501# migrated padmin module to gbuild system --- padmin/source/makefile.mk | 115 ---------------------------------------------- 1 file changed, 115 deletions(-) delete mode 100644 padmin/source/makefile.mk (limited to 'padmin/source') diff --git a/padmin/source/makefile.mk b/padmin/source/makefile.mk deleted file mode 100644 index 8bcbd51ef832..000000000000 --- a/padmin/source/makefile.mk +++ /dev/null @@ -1,115 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -.IF "$(GUIBASE)"=="aqua" - -dummy: - @echo "Nothing to build for GUIBASE aqua." - -.ELSE - -PRJ=.. -PRJNAME=padmin -TARGET=padmin -TARGETTYPE=GUI -ENABLE_EXCEPTIONS=TRUE -LIBTARGET=NO - -# --- Settings ----------------------------------------------------- - -.INCLUDE: settings.mk - -# --- Files -------------------------------------------------------- - -SRS1NAME=$(TARGET) -SRC1FILES=padialog.src rtsetup.src - -RESLIB1NAME=spa -RESLIB1IMAGES=$(PRJ)$/source -RESLIB1SRSFILES= $(SRS)$/padmin.srs -RESLIB1DEPN=\ - padialog.src \ - padialog.hrc \ - rtsetup.src \ - rtsetup.hrc - -.IF "$(GUI)" == "UNX" - -SLOFILES=\ - $(SLO)$/padialog.obj \ - $(SLO)$/cmddlg.obj \ - $(SLO)$/progress.obj \ - $(SLO)$/newppdlg.obj \ - $(SLO)$/prtsetup.obj \ - $(SLO)$/fontentry.obj \ - $(SLO)$/helper.obj \ - $(SLO)$/adddlg.obj \ - $(SLO)$/titlectrl.obj - - -OBJFILES=\ - $(OBJ)/pamain.obj - -SHL1TARGET= spa$(DLLPOSTFIX) -SHL1OBJS=$(SLOFILES) -SHL1STDLIBS=\ - $(SVTOOLLIB) \ - $(VCLLIB) \ - $(UNOTOOLSLIB) \ - $(TOOLSLIB) \ - $(COMPHELPERLIB) \ - $(CPPULIB) \ - $(SALLIB) - -APP1TARGET=spadmin.bin -APP1DEPN+=$(SHL1TARGETN) - -APP1OBJS=\ - $(OBJ)$/desktopcontext.obj \ - $(OBJ)/pamain.obj - -APP1STDLIBS= \ - -l$(SHL1TARGET) \ - $(VCLLIB) \ - $(UNOTOOLSLIB) \ - $(TOOLSLIB) \ - $(UCBHELPERLIB) \ - $(COMPHELPERLIB) \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(SALLIB) - -UNIXTEXT = $(MISC)$/spadmin.sh - -.ENDIF - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -.ENDIF # GUIBASE==aqua - -- cgit From 1f197059a0856e76c7e6fdb0cb5584c767734ed9 Mon Sep 17 00:00:00 2001 From: "Philipp Lohmann [pl]" Date: Thu, 20 Jan 2011 13:38:53 +0100 Subject: vcl118: #i116501# additional needed fixes for gbuild migration --- padmin/source/padialog.src | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'padmin/source') diff --git a/padmin/source/padialog.src b/padmin/source/padialog.src index 09ce29a2c682..85191f3dddf9 100644 --- a/padmin/source/padialog.src +++ b/padmin/source/padialog.src @@ -483,47 +483,47 @@ String RID_YOU_SURE Bitmap RID_BUTTERFLY { - File = "butter.png" ; + File = "source/butter.png" ; }; Bitmap RID_BMP_SMALL_PRINTER { - File = "print.png"; + File = "source/print.png"; }; Bitmap RID_BMP_SMALL_FAX { - File = "fax.png"; + File = "source/fax.png"; }; Bitmap RID_BMP_SMALL_PDF { - File = "pdf.png"; + File = "source/pdf.png"; }; Bitmap RID_BMP_PRINTER { - File = "printer_large.png"; + File = "source/printer_large.png"; }; Bitmap RID_BMP_SMALL_PRINTER_HC { - File = "printer_16_h.png"; + File = "source/printer_16_h.png"; }; Bitmap RID_BMP_SMALL_FAX_HC { - File = "fax_16_h.png"; + File = "source/fax_16_h.png"; }; Bitmap RID_BMP_SMALL_PDF_HC { - File = "printpdf_16_h.png"; + File = "source/printpdf_16_h.png"; }; Bitmap RID_BMP_PRINTER_HC { - File = "printer_40x48_h.png"; + File = "source/printer_40x48_h.png"; }; -- cgit