summaryrefslogtreecommitdiff
path: root/wizards
diff options
context:
space:
mode:
authorBehrend Cornelius <bc@openoffice.org>2001-07-12 11:28:36 +0000
committerBehrend Cornelius <bc@openoffice.org>2001-07-12 11:28:36 +0000
commit118c679c2514c90f265fb50c94d2f282d8d4073d (patch)
tree012c0d24dc986c29f853c1e01834d9db9346b071 /wizards
parent7a23964399e620e7837c35634fa657cd3384344a (diff)
#84145# label of cancel and GoOn button swapped, Dialog Controls made Invisible (on Step 3)
Diffstat (limited to 'wizards')
-rw-r--r--wizards/source/euro/AutoPilotRun.xba19
-rw-r--r--wizards/source/euro/Common.xba3
-rw-r--r--wizards/source/euro/Init.xba6
-rw-r--r--wizards/source/euro/euro.src19
4 files changed, 30 insertions, 17 deletions
diff --git a/wizards/source/euro/AutoPilotRun.xba b/wizards/source/euro/AutoPilotRun.xba
index f82d4a2aff5f..4c9298f0d755 100644
--- a/wizards/source/euro/AutoPilotRun.xba
+++ b/wizards/source/euro/AutoPilotRun.xba
@@ -72,9 +72,11 @@ Dim FilesList()
End If
Next DocIndex
DialogModel.cmdGoOn.Enabled = True
- If GoOn Then
- Msgbox (sMsgREADY,64, sMsgDLGTITLE)
- End If
+ DialogModel.cmdGoOn.Label = sReady
+ DialogModel.cmdCancel.Label = sClose
+&apos; If GoOn Then
+&apos; Msgbox (sMsgREADY,64, sMsgDLGTITLE)
+&apos; End If
End If
End Sub
@@ -117,7 +119,7 @@ End Function
Sub ChangeToNextProgressStep()
DialogModel.lblCurProgress.FontWeight = com.sun.star.awt.FontWeight.NORMAL
- DialogConvert.GetControl(&quot;lblCurProgress&quot;).Visible = False
+&apos; DialogConvert.GetControl(&quot;lblCurProgress&quot;).Visible = False
DialogConvert.GetControl(&quot;lblCurProgress&quot;).Visible = True
End Sub
@@ -204,16 +206,15 @@ Dim bMakeVisible as Boolean
Dim LocStep as Integer
&apos; If the Sub is call by the &apos;cmdBack&apos; Button then set the &apos;bMakeVisible&apos; variable accordingly
bMakeVisible = IsMissing(aEvent)
- &apos; Todo: Wieso können die nicht unsichtbar gemacht werden?
- DialogConvert.GetControl(&quot;lblCurrencies&quot;).Visible = Not bMakeVisible
- DialogConvert.GetControl(&quot;lstCurrencies&quot;).Visible = Not bMakeVisible
- DialogConvert.GetControl(&quot;cmdBack&quot;).Visible = bMakeVisible
- DialogConvert.GetControl(&quot;cmdGoOn&quot;).Visible = bMakeVisible
If bMakeVisible Then
DialogModel.Step = 3
Else
DialogModel.Step = 2
End If
+ DialogConvert.GetControl(&quot;lblCurrencies&quot;).Visible = Not bMakeVisible
+ DialogConvert.GetControl(&quot;lstCurrencies&quot;).Visible = Not bMakeVisible
+ DialogConvert.GetControl(&quot;cmdBack&quot;).Visible = bMakeVisible
+ DialogConvert.GetControl(&quot;cmdGoOn&quot;).Visible = bMakeVisible
DialogModel.imgPreview.ImageUrl = BitmapDir &amp; &quot;euro_&quot; &amp; DialogModel.Step &amp; &quot;.bmp&quot;
End Sub
diff --git a/wizards/source/euro/Common.xba b/wizards/source/euro/Common.xba
index 8ac0d1496ad1..16443d3690f5 100644
--- a/wizards/source/euro/Common.xba
+++ b/wizards/source/euro/Common.xba
@@ -188,6 +188,9 @@ Sub StartConversion()
Case 2
InitializeThirdStep()
ConvertDocuments()
+ Case 3
+ CloseDialog()
+
End Select
End Sub
diff --git a/wizards/source/euro/Init.xba b/wizards/source/euro/Init.xba
index 4f7dcf541f3b..4d9329b83bd8 100644
--- a/wizards/source/euro/Init.xba
+++ b/wizards/source/euro/Init.xba
@@ -39,7 +39,6 @@ Public sStsRELRANGES as String
Public sStsRELSHEETRANGES as String
Public sStsREPROTECT as String
-Public sMsgREADY as String
Public sMsgSELDIR as String
Public sMsgSELFILE as String
Public sMsgTARGETDIR as String
@@ -139,7 +138,7 @@ Public bDocHasProtectedSheets as Boolean
Public sGOON as String
Public sHELP as String
Public sCANCEL as String
-
+Public sClose as String
Sub InitializeResources()
With DialogModel
@@ -147,6 +146,7 @@ Sub InitializeResources()
sGoOn = GetResText(1003)
sHelp = GetResText(1001)
sCANCEL = GetResText(1000)
+ sClose = GetResText(1008)
.cmdCancel.Label = sCANCEL
.cmdHelp.Label = sHELP
.cmdBack.Label = GetResText(1002)
@@ -198,7 +198,7 @@ Sub InitializeResources()
sStsRELSHEETRANGES = GetResText(1302)
sStsRELRANGES = GetResText(1303)
sStsREPROTECT = GetResText(1304)
- sMsgREADY = GetResText(1400)
+ sREADY = GetResText(1400)
sMsgSELDIR = GetResText(1401)
sMsgSELFILE = GetResText(1402)
sMsgTARGETDIR = GetResText(1403)
diff --git a/wizards/source/euro/euro.src b/wizards/source/euro/euro.src
index eb391ecc73d2..4d26dfe91543 100644
--- a/wizards/source/euro/euro.src
+++ b/wizards/source/euro/euro.src
@@ -2,9 +2,9 @@
*
* $RCSfile: euro.src,v $
*
- * $Revision: 1.31 $
+ * $Revision: 1.32 $
*
- * last change: $Author: kz $ $Date: 2001-06-29 02:26:08 $
+ * last change: $Author: bc $ $Date: 2001-07-12 12:28:36 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -275,6 +275,14 @@ Text[ english_us ] = "C~ontinue>>";
Text[ catalan ] = "~Siguiente>>";
};
+
+String STEP_ZERO + 8
+{
+Text = "~Schlieen";
+Text[English] = "C~lose";
+Text[ english_us ] = "C~lose";
+};
+
String STEP_CONVERTER
{
Text = "Kom~plettes Dokument";
@@ -921,9 +929,9 @@ Text[ english_us ] = "Conversion of the currency units in the cell templates..."
String MESSAGES
{
-Text = " Fertig!";
-Text[English] = " Ready!";
-Text[ english_us ] = "finished!";
+Text = "~Fertig";
+Text[English] = "~finished";
+Text[ english_us ] = "~finished";
Text[ portuguese ] = "....Pronto!";
Text[ russian ] = "!";
Text[ greek ] = "!";
@@ -942,6 +950,7 @@ Text[ english_us ] = "finished!";
Text[ arabic ] = "...!";
Text[ turkish ] = "Bitti!";
Text[ finnish ] = "valmis";
+ Text[ language_user1 ] = "Statt in einer Msgbox taucht dieser String jetzt im Label eines Buttons auf";
Text[ catalan ] = "Terminado!";
};