summaryrefslogtreecommitdiff
path: root/extensions/source/preload
diff options
context:
space:
mode:
authorOliver Specht <os@openoffice.org>2001-12-17 07:33:04 +0000
committerOliver Specht <os@openoffice.org>2001-12-17 07:33:04 +0000
commit9e4f8d0c473ac0b4dcacbf584c3f75c240031639 (patch)
tree5e28e9585d6d7d30dad881f9f30dbd2532401ecf /extensions/source/preload
parentf02cb1eb12b9c66c06fa30009983ff821ecc76ab (diff)
#95959##95957##95956##95954# preload wizard changed
Diffstat (limited to 'extensions/source/preload')
-rw-r--r--extensions/source/preload/oemwiz.cxx54
-rw-r--r--extensions/source/preload/oemwiz.hxx19
-rw-r--r--extensions/source/preload/preload.hrc8
-rw-r--r--extensions/source/preload/preload.src101
4 files changed, 42 insertions, 140 deletions
diff --git a/extensions/source/preload/oemwiz.cxx b/extensions/source/preload/oemwiz.cxx
index 28b7ca573433..54a0bc598552 100644
--- a/extensions/source/preload/oemwiz.cxx
+++ b/extensions/source/preload/oemwiz.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: oemwiz.cxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: os $ $Date: 2001-11-14 16:05:22 $
+ * last change: $Author: os $ $Date: 2001-12-17 08:33:04 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -121,7 +121,6 @@ namespace preload
TabPage* pWelcomePage;
TabPage* pLicensePage;
TabPage* pUserDataPage;
- TabPage* pReadMePage;
OEMPreloadDialog_Impl(Window* pDialog);
~OEMPreloadDialog_Impl()
@@ -129,7 +128,6 @@ namespace preload
delete pWelcomePage;
delete pLicensePage;
delete pUserDataPage;
- delete pReadMePage;
delete pSet;
}
void WriteUserData();
@@ -162,7 +160,6 @@ namespace preload
pLicensePage = new OEMLicenseTabPage(pDialog);
pUserDataPage = new SvxGeneralTabPage(pDialog, *pSet);
((SvxGeneralTabPage*)pUserDataPage)->Reset(*pSet);
- pReadMePage = new OEMReadMeTabPage(pDialog);
}
/* -----------------------------14.11.2001 11:33------------------------------
@@ -204,9 +201,13 @@ namespace preload
,aCancelPB(this, ResId(PB_CANCEL ))
,aAcceptST(ResId(ST_ACCEPT))
,aFinishST(ResId(ST_FINISH))
+ ,aLicense(ResId(ST_LICENSE_AGREEMENT))
+ ,aUserData(ResId(ST_INSERT_USER_DATA))
,pImpl(new OEMPreloadDialog_Impl(this))
{
FreeResource();
+ aDlgTitle = GetText();
+ aPrevPB.Enable(FALSE);
aNextST = aNextPB.GetText();
aPrevPB.SetClickHdl(LINK(this, OEMPreloadDialog, NextPrevPageHdl));
aNextPB.SetClickHdl(LINK(this, OEMPreloadDialog, NextPrevPageHdl));
@@ -220,11 +221,9 @@ namespace preload
AddPage( pImpl->pWelcomePage );
AddPage( pImpl->pLicensePage );
AddPage( pImpl->pUserDataPage );
- AddPage( pImpl->pReadMePage );
SetPage( OEM_WELCOME, pImpl->pWelcomePage );
SetPage( OEM_LICENSE, pImpl->pLicensePage );
SetPage( OEM_USERDATA, pImpl->pUserDataPage );
- SetPage( OEM_README, pImpl->pReadMePage );
ShowPage( OEM_WELCOME );
}
/* -----------------------------14.11.2001 11:33------------------------------
@@ -244,7 +243,7 @@ namespace preload
if(GetCurLevel())
ShowPage(GetCurLevel() - 1);
}
- else if(OEM_README > GetCurLevel())
+ else if(OEM_USERDATA > GetCurLevel())
ShowPage(GetCurLevel() + 1);
else
{
@@ -252,19 +251,25 @@ namespace preload
Finnish(RET_OK);
}
+ String sTitle(aDlgTitle);
+
switch(GetCurLevel())
{
case OEM_WELCOME:
- case OEM_USERDATA:
aNextPB.SetText(aNextST);
break;
case OEM_LICENSE:
+ sTitle += aLicense;
aNextPB.SetText(aAcceptST);
+ aCancelPB.GrabFocus();
break;
- case OEM_README:
+ case OEM_USERDATA:
+ sTitle += aUserData;
aNextPB.SetText(aFinishST);
break;
}
+ SetText(sTitle);
+ aPrevPB.Enable(GetCurLevel() != OEM_WELCOME);
return 0;
}
/* -----------------------------14.11.2001 11:33------------------------------
@@ -343,35 +348,6 @@ namespace preload
aLicenseML.SetText( sLicense );
}
-/* -----------------------------13.11.2001 12:29------------------------------
-
- ---------------------------------------------------------------------------*/
- OEMReadMeTabPage::OEMReadMeTabPage(Window* pParent) :
- TabPage(pParent, ModuleRes(RID_TP_README)),
- aInfoFT(this, ResId(FT_INFO)),
- aReadmeML(this, ResId(ML_README))
- {
- FreeResource();
- }
-/* -----------------------------13.11.2001 12:30------------------------------
-
- ---------------------------------------------------------------------------*/
- OEMReadMeTabPage::~OEMReadMeTabPage()
- {
- }
-
-/* -----------------------------14.11.2001 09:18------------------------------
-
- ---------------------------------------------------------------------------*/
-void OEMReadMeTabPage::ActivatePage()
-{
- if(aReadmeML.GetText().Len())
- return;
- aReadmeML.SetLeftMargin( 5 );
- String sReadme;
- OEMPreloadDialog::LoadFromLocalFile(String::CreateFromAscii("readme.txt"), sReadme);
- aReadmeML.SetText( sReadme );
-}
//.........................................................................
} // namespace preload
//.........................................................................
diff --git a/extensions/source/preload/oemwiz.hxx b/extensions/source/preload/oemwiz.hxx
index 392139e7605c..a3b10efc264a 100644
--- a/extensions/source/preload/oemwiz.hxx
+++ b/extensions/source/preload/oemwiz.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: oemwiz.hxx,v $
*
- * $Revision: 1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: os $ $Date: 2001-11-14 13:18:01 $
+ * last change: $Author: os $ $Date: 2001-12-17 08:33:04 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -91,7 +91,6 @@ namespace preload
#define OEM_WELCOME 0
#define OEM_LICENSE 1
#define OEM_USERDATA 2
- #define OEM_README 3
//.........................................................................
//=====================================================================
@@ -107,6 +106,9 @@ namespace preload
String aNextST;
String aAcceptST;
String aFinishST;
+ String aDlgTitle;
+ String aLicense;
+ String aUserData;
OEMPreloadDialog_Impl* pImpl;
DECL_LINK(NextPrevPageHdl, PushButton*);
@@ -143,17 +145,6 @@ namespace preload
virtual void ActivatePage();
};
- class OEMReadMeTabPage : public TabPage
- {
- FixedText aInfoFT;
- MultiLineEdit aReadmeML;
-
- public:
- OEMReadMeTabPage(Window* pParent);
- ~OEMReadMeTabPage();
-
- virtual void ActivatePage();
- };
//.........................................................................
} // namespace preload
diff --git a/extensions/source/preload/preload.hrc b/extensions/source/preload/preload.hrc
index 9f654db5f79d..f3662ce81180 100644
--- a/extensions/source/preload/preload.hrc
+++ b/extensions/source/preload/preload.hrc
@@ -2,9 +2,9 @@
*
* $RCSfile: preload.hrc,v $
*
- * $Revision: 1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: os $ $Date: 2001-11-14 13:18:06 $
+ * last change: $Author: os $ $Date: 2001-12-17 08:33:04 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -64,7 +64,6 @@
#define RID_DLG_OEMWIZARD 1024
#define RID_TP_LICENSE 1025
-#define RID_TP_README 1026
#define RID_TP_WELCOME 1027
@@ -79,4 +78,7 @@
#define FT_INFO1 9
#define FT_INFO2 10
#define ML_LICENSE 11
+#define ST_LICENSE_AGREEMENT 12
+#define ST_INSERT_USER_DATA 13
+
#endif
diff --git a/extensions/source/preload/preload.src b/extensions/source/preload/preload.src
index 0ecd378d6abe..412556685f53 100644
--- a/extensions/source/preload/preload.src
+++ b/extensions/source/preload/preload.src
@@ -2,9 +2,9 @@
*
* $RCSfile: preload.src,v $
*
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
- * last change: $Author: kz $ $Date: 2001-12-14 16:47:02 $
+ * last change: $Author: os $ $Date: 2001-12-17 08:33:04 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -176,6 +176,17 @@ ModalDialog RID_DLG_OEMWIZARD
Text[ arabic ] = "Finish";
Text[ catalan ] = "Finish";
};
+ String ST_LICENSE_AGREEMENT
+ {
+ Text = " - Software-Lizenzvereinbarung";
+ Text[english_us] = " - Software License Agreement";
+ };
+
+ String ST_INSERT_USER_DATA
+ {
+ Text = " - Benutzerdaten";
+ Text[english_us] = "- User Data";
+ };
};
TabPage RID_TP_WELCOME
{
@@ -188,7 +199,7 @@ TabPage RID_TP_WELCOME
Text [ ENGLISH ] = "Welcome" ;
FixedText FT_INFO
{
- Pos = MAP_APPFONT ( 12 , 14 ) ;
+ Pos = MAP_APPFONT ( 6 , 14 ) ;
Size = MAP_APPFONT ( 248 , 160 ) ;
WordBreak = TRUE ;
Text = "Herzlich willkommen zu %PRODUCTNAME %PRODUCTVERSION OEM\n\nUm %PRODUCTNAME %PRODUCTVERSION OEM starten zu knnen, geben Sie bitte auf der dem Lizenztext folgenden Dialogseite Ihre Benutzerdaten ein.\n\nIn der Readme-Datei im %PRODUCTNAME-Produktverzeichnis finden Sie wichtige Hinweise zum Programm. Bitte lesen Sie diese Hinweise aufmerksam durch.\n\nDes weiteren finden Sie ausfhrliche Informationen auf der Internetseite von Sun unter\n\nhttp://www.sun.com/staroffice.\n\nWir wnschen Ihnen viel Spa und Erfolg mit Ihrem neuen %PRODUCTNAME.\n\nIhr %PRODUCTNAME Team.";
@@ -273,16 +284,17 @@ TabPage RID_TP_LICENSE
};
MultiLineEdit ML_LICENSE
{
- PosSize = MAP_APPFONT ( 6 , 23 , 248, 123 ) ;
+ PosSize = MAP_APPFONT ( 6 , 25 , 248, 123 ) ;
Border = TRUE ;
VScroll = TRUE ;
ReadOnly = TRUE ;
+ IgnoreTab = TRUE;
};
FixedText FT_INFO2
{
WordBreak = TRUE ;
Pos = MAP_APPFONT ( 6 , 152 ) ;
- Size = MAP_APPFONT ( 148 , 27 ) ;
+ Size = MAP_APPFONT ( 248 , 27 ) ;
Text = "Akzeptieren Sie smtliche Bedingungen im vorliegenden Lizenzabkommen, klicken Sie auf die Schaltflche '%1'. Stimmen Sie den Bedingungen nicht zu klicken Sie auf '%2', die Installation wird dann abgebrochen." ;
Text [ english_us ] = "If you accept all terms of the license agreement, click '%1'. Otherwise, click '%2' to cancel the installation." ;
Text [ portuguese ] = "Clique no boto '%1' se concordar com os termos do contrato de licena. Se no os aceitar clique no boto '%2' e a instalao ser cancelada." ;
@@ -327,85 +339,6 @@ TabPage RID_TP_LICENSE
Text[ arabic ] = "License Agreement";
Text[ catalan ] = "License Agreement";
};
-TabPage RID_TP_README
-{
-// HelpId = ;
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Hide = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
- Text = "ReadMe" ;
- Text [ ENGLISH ] = "ReadMe" ;
- FixedText FT_INFO
- {
- WordBreak = TRUE ;
- Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 248 , 20 ) ;
- Text = "Dieser Text enthlt zustzliche und wichtige Informationen zu %1. Mit der Bildlaufleiste knnen Sie den Rest des Text sichtbar machen." ;
- Text [ english_us ] = "This text contains additional information for %1. Use the scroll bar to display the entire text." ;
- Text [ portuguese_brazilian ] = "Dieser Text enth?lt zus?tzliche und wichtige Informationen zu %1. Mit der Bildlaufleiste k?nen Sie den Rest des Text sichtbar machen." ;
- Text [ swedish ] = "Den hr texten innehller mer information om %1. Med hjlp av rullningslisten kan du se resten av texten." ;
- Text [ danish ] = "Denne tekst indeholder yderligere, vigtige informationer om %1. Ved hjlp af rullepanelet kan du se resten af teksten." ;
- Text [ italian ] = "Questo testo contiene importanti informazioni su %1. Con la barra di scorrimento possibile visualizzare l'intero testo." ;
- Text [ spanish ] = "Este texto contiene informacin adicional e importante sobre %1. Con la barra de desplazamiento podr visualizar el resto del texto." ;
- Text [ french ] = "Ce texte contient des informations importantes sur %1. Pour vous dplacer dans le texte, utilisez la barre de dfilement." ;
- Text [ dutch ] = "Deze tekst bevat nog verdere belangrijke informatie over %1. Met de beeldschuifbalk kunt u de rest van de tekst zichtbaar maken." ;
- Text [ portuguese ] = "Este texto contm informaes adicionais sobre o %1. Use a barra de deslocamento para visualizar o texto completo." ;
- Text[ chinese_simplified ] = "以下这段文字中含有附加的有关 %1 的重要信息。您可以通过移动滚动条来阅读其下半部分。";
- Text[ russian ] = " %1. , .";
- Text[ polish ] = "Tutaj znajduj si dodatkowe informacje o programie %1. Po przesuniciu paska przewijania obrazu odkryta zostanie pozostaa cz tekstu.";
- Text[ japanese ] = "この文章には %1 についてさらに重要な情報が含まれています。スクロールバーを動かすと、残りの文章が表示されます。";
- Text[ chinese_traditional ] = "這段文字含有附加的關於 %1 的重要資訊。您可以按一下捲軸﹐閱讀其下半部份。";
- Text[ arabic ] = " %1. .";
- Text[ greek ] = " %1. .";
- Text[ korean ] = "이 텍스트는 %1에 대한 중요한 추가 정보입니다. 스크롤 바를 사용하여 나머지 텍스트를 볼 수 있습니다.";
- Text[ turkish ] = "Bu metin %1 ile ilgili nemli ek bilgiler ieriyor. Sayfa kaydrma ubuunu kullanarak, metnin devamn grntleyebilirsiniz.";
- Text[ language_user1 ] = " ";
- Text[ catalan ] = "Este texto contiene informacin adicional e importante sobre %1. Con la barra de desplazamiento puede hacer visible el resto del texto.";
- Text[ finnish ] = "Tss tekstiss on listietoja kohteesta %1. Voit vieritt teksti vierityspalkin avulla.";
- };
- MultiLineEdit ML_README
- {
- PosSize = MAP_APPFONT ( 6 , 23 , 248, 156 ) ;
- Border = TRUE ;
- VScroll = TRUE ;
- ReadOnly = TRUE ;
- };
- Text[ english_us ] = "ReadMe";
- Text[ portuguese ] = "ReadMe";
- Text[ russian ] = "ReadMe";
- Text[ greek ] = "ReadMe";
- Text[ dutch ] = "ReadMe";
- Text[ french ] = "ReadMe";
- Text[ spanish ] = "ReadMe";
- Text[ finnish ] = "ReadMe";
- Text[ italian ] = "Readme";
- Text[ danish ] = "ReadMe";
- Text[ swedish ] = "ReadMe";
- Text[ polish ] = "ReadMe";
- Text[ portuguese_brazilian ] = "ReadMe";
- Text[ japanese ] = "ReadMe";
- Text[ korean ] = "ReadMe";
- Text[ chinese_simplified ] = "ReadMe";
- Text[ chinese_traditional ] = "ReadMe";
- Text[ turkish ] = "ReadMe";
- Text[ arabic ] = "ReadMe";
- Text[ catalan ] = "ReadMe";
-};
-
-
-
-
-
-
-
-
-
-
-
-
-
-