[Libreoffice-commits] core.git: extras/Package_tplwizbitmap.mk extras/source wizards/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Mon Dec 10 14:49:56 UTC 2018 

 dev/null                                                 |binary
 extras/Package_tplwizbitmap.mk                           |   20 +++++-----
 extras/source/templates/wizard/bitmap/Import_1.png       |binary
 extras/source/templates/wizard/bitmap/Import_3.png       |binary
 extras/source/templates/wizard/bitmap/Import_4.png       |binary
 extras/source/templates/wizard/bitmap/MS-Import_2-1.png  |binary
 extras/source/templates/wizard/bitmap/MS-Import_2-2.png  |binary
 extras/source/templates/wizard/bitmap/MS-Import_2-3.png  |binary
 extras/source/templates/wizard/bitmap/XML-Import_2-1.png |binary
 extras/source/templates/wizard/bitmap/XML-Import_2-2.png |binary
 extras/source/templates/wizard/bitmap/XML-Import_2-3.png |binary
 extras/source/templates/wizard/bitmap/XML-Import_2-4.png |binary
 wizards/source/importwizard/Main.xba                     |   29 ++++++---------
 13 files changed, 23 insertions(+), 26 deletions(-)

New commits:
commit 7e5fd926adbd62148a1fdd6950ba5b33d12874a1
Author:     Matthias Seidel <mseidel at apache.org>
AuthorDate: Thu Nov 8 15:58:53 2018 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Dec 10 15:49:33 2018 +0100

    Cleaning up Document Converter wizard, moving graphics from bmp to png
    
    (cherry picked from commit ab017c683002df7f76a792e369c00fd10e1024f0)
    
    Change-Id: I1904652b60d49d7c2c79e8fda5803a2f0932f61d
    Reviewed-on: https://gerrit.libreoffice.org/64865
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/extras/Package_tplwizbitmap.mk b/extras/Package_tplwizbitmap.mk
index 043e6de0794a..4ebdf03b2b5f 100644
--- a/extras/Package_tplwizbitmap.mk
+++ b/extras/Package_tplwizbitmap.mk
@@ -21,23 +21,23 @@ $(eval $(call gb_Package_add_files,extras_tplwizbitmap,$(LIBO_SHARE_FOLDER)/temp
 	ftpconnecting.gif \
 	ftperror.gif \
 	ftpunknown.gif \
-	Import_1.bmp \
-	Import_3.bmp \
-	Import_4.bmp \
+	Import_1.png \
+	Import_3.png \
+	Import_4.png \
 	maximize.bmp \
 	minimize.bmp \
-	MS-Import_2-1.bmp \
-	MS-Import_2-2.bmp \
-	MS-Import_2-3.bmp \
+	MS-Import_2-1.png \
+	MS-Import_2-2.png \
+	MS-Import_2-3.png \
 	okay_down.bmp \
 	okay_up.bmp \
 	report.bmp \
 	tutorial_background.gif \
 	up.bmp \
-	XML-Import_2-1.bmp \
-	XML-Import_2-2.bmp \
-	XML-Import_2-3.bmp \
-	XML-Import_2-4.bmp \
+	XML-Import_2-1.png \
+	XML-Import_2-2.png \
+	XML-Import_2-3.png \
+	XML-Import_2-4.png \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/extras/source/templates/wizard/bitmap/Import_1.bmp b/extras/source/templates/wizard/bitmap/Import_1.bmp
deleted file mode 100644
index 98457094b3fd..000000000000
Binary files a/extras/source/templates/wizard/bitmap/Import_1.bmp and /dev/null differ
diff --git a/extras/source/templates/wizard/bitmap/Import_1.png b/extras/source/templates/wizard/bitmap/Import_1.png
new file mode 100644
index 000000000000..ea0942103e6a
Binary files /dev/null and b/extras/source/templates/wizard/bitmap/Import_1.png differ
diff --git a/extras/source/templates/wizard/bitmap/Import_3.bmp b/extras/source/templates/wizard/bitmap/Import_3.bmp
deleted file mode 100644
index 37802a50d744..000000000000
Binary files a/extras/source/templates/wizard/bitmap/Import_3.bmp and /dev/null differ
diff --git a/extras/source/templates/wizard/bitmap/Import_3.png b/extras/source/templates/wizard/bitmap/Import_3.png
new file mode 100644
index 000000000000..abffeb3b9a1d
Binary files /dev/null and b/extras/source/templates/wizard/bitmap/Import_3.png differ
diff --git a/extras/source/templates/wizard/bitmap/Import_4.bmp b/extras/source/templates/wizard/bitmap/Import_4.bmp
deleted file mode 100644
index 591c5ded5065..000000000000
Binary files a/extras/source/templates/wizard/bitmap/Import_4.bmp and /dev/null differ
diff --git a/extras/source/templates/wizard/bitmap/Import_4.png b/extras/source/templates/wizard/bitmap/Import_4.png
new file mode 100644
index 000000000000..6529f8e84871
Binary files /dev/null and b/extras/source/templates/wizard/bitmap/Import_4.png differ
diff --git a/extras/source/templates/wizard/bitmap/MS-Import_2-1.bmp b/extras/source/templates/wizard/bitmap/MS-Import_2-1.bmp
deleted file mode 100644
index 085feeca5ab8..000000000000
Binary files a/extras/source/templates/wizard/bitmap/MS-Import_2-1.bmp and /dev/null differ
diff --git a/extras/source/templates/wizard/bitmap/MS-Import_2-1.png b/extras/source/templates/wizard/bitmap/MS-Import_2-1.png
new file mode 100644
index 000000000000..51da77a51f7d
Binary files /dev/null and b/extras/source/templates/wizard/bitmap/MS-Import_2-1.png differ
diff --git a/extras/source/templates/wizard/bitmap/MS-Import_2-2.bmp b/extras/source/templates/wizard/bitmap/MS-Import_2-2.bmp
deleted file mode 100644
index 64fc93f1a579..000000000000
Binary files a/extras/source/templates/wizard/bitmap/MS-Import_2-2.bmp and /dev/null differ
diff --git a/extras/source/templates/wizard/bitmap/MS-Import_2-2.png b/extras/source/templates/wizard/bitmap/MS-Import_2-2.png
new file mode 100644
index 000000000000..ef03f14b8a3a
Binary files /dev/null and b/extras/source/templates/wizard/bitmap/MS-Import_2-2.png differ
diff --git a/extras/source/templates/wizard/bitmap/MS-Import_2-3.bmp b/extras/source/templates/wizard/bitmap/MS-Import_2-3.bmp
deleted file mode 100644
index c8fc6becc718..000000000000
Binary files a/extras/source/templates/wizard/bitmap/MS-Import_2-3.bmp and /dev/null differ
diff --git a/extras/source/templates/wizard/bitmap/MS-Import_2-3.png b/extras/source/templates/wizard/bitmap/MS-Import_2-3.png
new file mode 100644
index 000000000000..22540a46c35f
Binary files /dev/null and b/extras/source/templates/wizard/bitmap/MS-Import_2-3.png differ
diff --git a/extras/source/templates/wizard/bitmap/XML-Import_2-1.bmp b/extras/source/templates/wizard/bitmap/XML-Import_2-1.bmp
deleted file mode 100644
index 95f843d6891f..000000000000
Binary files a/extras/source/templates/wizard/bitmap/XML-Import_2-1.bmp and /dev/null differ
diff --git a/extras/source/templates/wizard/bitmap/XML-Import_2-1.png b/extras/source/templates/wizard/bitmap/XML-Import_2-1.png
new file mode 100644
index 000000000000..2ff4333b5b4d
Binary files /dev/null and b/extras/source/templates/wizard/bitmap/XML-Import_2-1.png differ
diff --git a/extras/source/templates/wizard/bitmap/XML-Import_2-2.bmp b/extras/source/templates/wizard/bitmap/XML-Import_2-2.bmp
deleted file mode 100644
index 0ba9ed8d61ac..000000000000
Binary files a/extras/source/templates/wizard/bitmap/XML-Import_2-2.bmp and /dev/null differ
diff --git a/extras/source/templates/wizard/bitmap/XML-Import_2-2.png b/extras/source/templates/wizard/bitmap/XML-Import_2-2.png
new file mode 100644
index 000000000000..a87f2ec3a49b
Binary files /dev/null and b/extras/source/templates/wizard/bitmap/XML-Import_2-2.png differ
diff --git a/extras/source/templates/wizard/bitmap/XML-Import_2-3.bmp b/extras/source/templates/wizard/bitmap/XML-Import_2-3.bmp
deleted file mode 100644
index 93aaf167e9e8..000000000000
Binary files a/extras/source/templates/wizard/bitmap/XML-Import_2-3.bmp and /dev/null differ
diff --git a/extras/source/templates/wizard/bitmap/XML-Import_2-3.png b/extras/source/templates/wizard/bitmap/XML-Import_2-3.png
new file mode 100644
index 000000000000..a8231ef4a0a2
Binary files /dev/null and b/extras/source/templates/wizard/bitmap/XML-Import_2-3.png differ
diff --git a/extras/source/templates/wizard/bitmap/XML-Import_2-4.bmp b/extras/source/templates/wizard/bitmap/XML-Import_2-4.bmp
deleted file mode 100644
index 7e18ccfe2531..000000000000
Binary files a/extras/source/templates/wizard/bitmap/XML-Import_2-4.bmp and /dev/null differ
diff --git a/extras/source/templates/wizard/bitmap/XML-Import_2-4.png b/extras/source/templates/wizard/bitmap/XML-Import_2-4.png
new file mode 100644
index 000000000000..c68842e01e24
Binary files /dev/null and b/extras/source/templates/wizard/bitmap/XML-Import_2-4.png differ
diff --git a/wizards/source/importwizard/Main.xba b/wizards/source/importwizard/Main.xba
index 46be949f88a0..b8cc8211edfb 100644
--- a/wizards/source/importwizard/Main.xba
+++ b/wizards/source/importwizard/Main.xba
@@ -18,8 +18,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 -->
 <script:module xmlns:script="http://openoffice.org/2000/script" script:name="Main" script:language="StarBasic">Option Explicit
+REM ***** BASIC *****
 
-'  *****  BASIC  *****
 Public HeaderPreviews(4) as Object
 Public ImportDialog as Object
 Public ImportDialogArea as Object
@@ -47,8 +47,8 @@ Sub Main()
 	If GetImportWizardPaths() = False Then
 		Exit Sub
 	End If
-  	bCancelTask = False
-  	bDoKeepApplValues = False
+	bCancelTask = False
+	bDoKeepApplValues = False
 	CurOffice = 0
 	ImportDialogArea = LoadDialog("ImportWizard","ImportDialog")
 	ImportDialog = ImportDialogArea.Model
@@ -57,13 +57,13 @@ Sub Main()
 	MaxApplCount = 3
 	FillStep_Welcome()
 	RepaintHeaderPreview()
-	ImportDialog.ImportPreview.BackGroundColor = RGB(0,60,126)	
+	ImportDialog.ImportPreview.BackGroundColor = RGB(0,60,126)
 	ImportDialog.cmdGoOn.DefaultButton = True
 	ImportDialogArea.GetControl("optMSDocuments").SetFocus()
 	ToggleCheckboxesWithBoolean(True)
 
 	RetValue = ImportDialogArea.Execute()
-	If bShowLogFile=TRUE Then 
+	If bShowLogFile=TRUE Then
 		OpenDocument(sLogUrl, NoArgs())
 	End if
 	If RetValue = 0 Then
@@ -77,7 +77,6 @@ RTError:
 End Sub
 
 
-
 Sub NextStep()
 Dim iCurStep as Integer
 	If Not bDebugWizard Then
@@ -112,15 +111,14 @@ Dim iCurStep as Integer
 	If ((ImportDialog.chkLogfile.State <> 1) OR (iCurStep <> 3)) Then
 		ImportDialog.cmdGoOn.DefaultButton = True
 	End If
-	
-	RepaintHeaderPreview()	
+
+	RepaintHeaderPreview()
 	Exit Sub
 RTError:
 	Msgbox sRTErrorDesc, 16, sRTErrorHeader
 End Sub
 
 
-
 Sub PrevStep()
 Dim iCurStep as Integer
 	If Not bDebugWizard Then
@@ -146,14 +144,13 @@ Dim iCurStep as Integer
 			End If
 	End Select
 	ImportDialog.cmdGoOn.DefaultButton = True
-	RepaintHeaderPreview()	
+	RepaintHeaderPreview()
 	Exit Sub
 RTError:
 	Msgbox sRTErrorDesc, 16, sRTErrorHeader
 End Sub
 
 
-
 Sub CancelTask()
 	If bConversionIsRunning Then
 		If Msgbox(sConvertError1, 36, sConvertError2) = 6 Then
@@ -183,9 +180,9 @@ Dim LocPrefix as String
 	LocPrefix = WizardMode
 	LocPrefix = ReplaceString(LocPrefix,"XML", "SO")
 	If CurStep = 2 Then
-		sBitmapPath = SOBitmapPath & LocPrefix & "-Import_" & CurStep & "-" & Applications(CurOffice,SBAPPLKEY) + 1 & ".bmp"
+		sBitmapPath = SOBitmapPath & LocPrefix & "-Import_" & CurStep & "-" & Applications(CurOffice,SBAPPLKEY) + 1 & ".png"
 	Else
-		sBitmapPath = SOBitmapPath & "Import_" & CurStep & ".bmp"
+		sBitmapPath = SOBitmapPath & "Import_" & CurStep & ".png"
 	End If
 	ImportDialog.ImportPreview.ImageURL = sBitmapPath
 End Sub
@@ -203,7 +200,7 @@ Function CheckInstalledModule(Index as Integer) as Boolean
 Dim ModuleName as String
 Dim NameList() as String
 Dim MaxIndex as Integer
-Dim i as Integer		
+Dim i as Integer
 	ModuleName = ModuleList(Index)
 	If Instr(1,ModuleName,"/") <> 0 Then
 		CheckInstalledModule() = False
@@ -266,7 +263,7 @@ Dim i as Integer
 End Sub
 
 
-Sub TakeOverPathSettings()					
+Sub TakeOverPathSettings()
 'Takes over the Pathsettings from the first selected application to the next applications
 	If Applications(CurOffice,SBDOCSOURCE) = "" Then
 		Applications(CurOffice,SBDOCSOURCE) = Applications(0,SBDOCSOURCE)
@@ -288,7 +285,7 @@ Function GetImportWizardPaths() as Boolean
 				Exit Function
 			End If
 		End If
-	End  If
+	End If
 	GetImportWizardPaths() = False
 End Function
 </script:module>

More information about the Libreoffice-commits mailing list