diff --git a/project/JobsPatcher.au3 b/project/JobsPatcher.au3 index d3efd4d..428f342 100644 --- a/project/JobsPatcher.au3 +++ b/project/JobsPatcher.au3 @@ -665,16 +665,18 @@ Func ApplyTheme_Thunderbird() ;Theme - no need for a backup If FileExists($ProgramFiles & "\Mozilla Thunderbird\thunderbird.exe") Then ;Install - InstallTheme("Mozilla Thunderbird", $ProgramFiles & "\Mozilla Thunderbird\thunderbird.exe", $ProgramFiles & "\Mozilla Thunderbird\chrome\icons\default", "abcardWindow.ico", $ResourcesDir & "\themes\Firefox-Thunderbird\Thunderbird\abcardWindow.ico") - InstallTheme("Mozilla Thunderbird", $ProgramFiles & "\Mozilla Thunderbird\thunderbird.exe", $ProgramFiles & "\Mozilla Thunderbird\chrome\icons\default", "addressbookWindow.ico", $ResourcesDir & "\themes\Firefox-Thunderbird\Thunderbird\addressbookWindow.ico") - InstallTheme("Mozilla Thunderbird", $ProgramFiles & "\Mozilla Thunderbird\thunderbird.exe", $ProgramFiles & "\Mozilla Thunderbird\chrome\icons\default", "messengerWindow.ico", $ResourcesDir & "\themes\Firefox-Thunderbird\Thunderbird\messengerWindow.ico") - InstallTheme("Mozilla Thunderbird", $ProgramFiles & "\Mozilla Thunderbird\thunderbird.exe", $ProgramFiles & "\Mozilla Thunderbird\chrome\icons\default", "msgcomposeWindow.ico", $ResourcesDir & "\themes\Firefox-Thunderbird\Thunderbird\msgcomposeWindow.ico") + InstallTheme("Mozilla Thunderbird", $ProgramFiles & "\Mozilla Thunderbird\thunderbird.exe", $ProgramFiles & "\Mozilla Thunderbird\chrome\icons\default", "abcardWindow.ico", $ResourcesDir & "\themes\Thunderbird\icons\abcardWindow.ico") + InstallTheme("Mozilla Thunderbird", $ProgramFiles & "\Mozilla Thunderbird\thunderbird.exe", $ProgramFiles & "\Mozilla Thunderbird\chrome\icons\default", "addressbookWindow.ico", $ResourcesDir & "\themes\Thunderbird\icons\addressbookWindow.ico") + InstallTheme("Mozilla Thunderbird", $ProgramFiles & "\Mozilla Thunderbird\thunderbird.exe", $ProgramFiles & "\Mozilla Thunderbird\chrome\icons\default", "messengerWindow.ico", $ResourcesDir & "\themes\Thunderbird\icons\messengerWindow.ico") + InstallTheme("Mozilla Thunderbird", $ProgramFiles & "\Mozilla Thunderbird\thunderbird.exe", $ProgramFiles & "\Mozilla Thunderbird\chrome\icons\default", "msgcomposeWindow.ico", $ResourcesDir & "\themes\Thunderbird\icons\msgcomposeWindow.ico") InstallMsg("Installing Theme: Mozilla Thunderbird") CheckAndCloseProcess("thunderbird.exe", "Mozilla Thunderbird") FileCopy($ResourcesDir & "\themes\Firefox-Thunderbird\*.xpi", $ProgramFiles & "\Mozilla Thunderbird\extensions", 1) + FileCopy($ResourcesDir & "\themes\Thunderbird\*.xpi", $ProgramFiles & "\Mozilla Thunderbird\extensions", 1) + InstallMsg("done") EndIf EndFunc diff --git a/project/JobsReloader.au3 b/project/JobsReloader.au3 index c887a60..08162a2 100644 --- a/project/JobsReloader.au3 +++ b/project/JobsReloader.au3 @@ -33,10 +33,10 @@ Func ReAppearance() UpdateTheme("LibreOffice", $ProgramFiles & "\LibreOffice 4.0\program\soffice.exe", $ProgramFiles & "\LibreOffice 4.0\program", "intro.png", $ResourcesDir & "\themes\LibreOffice\intro.png") ;Mozilla Thunderbird Icons - UpdateTheme("Mozilla Thunderbird", $ProgramFiles & "\Mozilla Thunderbird\thunderbird.exe", $ProgramFiles & "\Mozilla Thunderbird\chrome\icons\default", "abcardWindow.ico", $ResourcesDir & "\themes\Firefox-Thunderbird\Thunderbird\abcardWindow.ico") - UpdateTheme("Mozilla Thunderbird", $ProgramFiles & "\Mozilla Thunderbird\thunderbird.exe", $ProgramFiles & "\Mozilla Thunderbird\chrome\icons\default", "addressbookWindow.ico", $ResourcesDir & "\themes\Firefox-Thunderbird\Thunderbird\addressbookWindow.ico") - UpdateTheme("Mozilla Thunderbird", $ProgramFiles & "\Mozilla Thunderbird\thunderbird.exe", $ProgramFiles & "\Mozilla Thunderbird\chrome\icons\default", "messengerWindow.ico", $ResourcesDir & "\themes\Firefox-Thunderbird\Thunderbird\messengerWindow.ico") - UpdateTheme("Mozilla Thunderbird", $ProgramFiles & "\Mozilla Thunderbird\thunderbird.exe", $ProgramFiles & "\Mozilla Thunderbird\chrome\icons\default", "msgcomposeWindow.ico", $ResourcesDir & "\themes\Firefox-Thunderbird\Thunderbird\msgcomposeWindow.ico") + UpdateTheme("Mozilla Thunderbird", $ProgramFiles & "\Mozilla Thunderbird\thunderbird.exe", $ProgramFiles & "\Mozilla Thunderbird\chrome\icons\default", "abcardWindow.ico", $ResourcesDir & "\themes\Thunderbird\icons\abcardWindow.ico") + UpdateTheme("Mozilla Thunderbird", $ProgramFiles & "\Mozilla Thunderbird\thunderbird.exe", $ProgramFiles & "\Mozilla Thunderbird\chrome\icons\default", "addressbookWindow.ico", $ResourcesDir & "\themes\Thunderbird\icons\addressbookWindow.ico") + UpdateTheme("Mozilla Thunderbird", $ProgramFiles & "\Mozilla Thunderbird\thunderbird.exe", $ProgramFiles & "\Mozilla Thunderbird\chrome\icons\default", "messengerWindow.ico", $ResourcesDir & "\themes\Thunderbird\icons\messengerWindow.ico") + UpdateTheme("Mozilla Thunderbird", $ProgramFiles & "\Mozilla Thunderbird\thunderbird.exe", $ProgramFiles & "\Mozilla Thunderbird\chrome\icons\default", "msgcomposeWindow.ico", $ResourcesDir & "\themes\Thunderbird\icons\msgcomposeWindow.ico") EndFunc diff --git a/project/JobsUninstaller.au3 b/project/JobsUninstaller.au3 index be3c5bc..754f12d 100644 --- a/project/JobsUninstaller.au3 +++ b/project/JobsUninstaller.au3 @@ -170,6 +170,8 @@ Func UnAppearance() FileDelete($FirefoxAppPath & "\extensions\Tangerine@Windows.xpi") FileDelete($FirefoxAppPath & "\extensions\Elementary@Windows.xpi") FileDelete($FirefoxAppPath & "\extensions\Humanity@Windows.xpi") + FileDelete($FirefoxAppPath & "\extensions\tangofox@haven667.xpi") + FileDelete($FirefoxAppPath & "\extensions\tangerinefox@haven667.xpi") FileDelete($FirefoxAppPath & "\extensions\Gnome-Brave-Extras@Windows.xpi") FileDelete($FirefoxAppPath & "\extensions\Gnome-Human-Extras@Windows.xpi") @@ -182,13 +184,15 @@ Func UnAppearance() FileDelete($FirefoxAppPath & "\extensions\Tangerine-Extras@Windows.xpi") FileDelete($FirefoxAppPath & "\extensions\Elementary-Extras@Windows.xpi") FileDelete($FirefoxAppPath & "\extensions\Humanity-Extras@Windows.xpi") + FileDelete($FirefoxAppPath & "\extensions\tangofox-extras@haven667.xpi") + FileDelete($FirefoxAppPath & "\extensions\tangerinefox-extras@haven667.xpi") ;Mozilla Thunderbird Theme CheckAndCloseProcess("thunderbird.exe", "Mozilla Thunderbird") - UninstallTheme("Mozilla Thunderbird", $ProgramFiles & "\Mozilla Thunderbird\thunderbird.exe", $ProgramFiles & "\Mozilla Thunderbird\chrome\icons\default", "abcardWindow.ico", $ResourcesDir & "\themes\Firefox Thunderbird\Thunderbird\abcardWindow.ico") - UninstallTheme("Mozilla Thunderbird", $ProgramFiles & "\Mozilla Thunderbird\thunderbird.exe", $ProgramFiles & "\Mozilla Thunderbird\chrome\icons\default", "addressbookWindow.ico", $ResourcesDir & "\themes\Firefox Thunderbird\Thunderbird\addressbookWindow.ico") - UninstallTheme("Mozilla Thunderbird", $ProgramFiles & "\Mozilla Thunderbird\thunderbird.exe", $ProgramFiles & "\Mozilla Thunderbird\chrome\icons\default", "messengerWindow.ico", $ResourcesDir & "\themes\Firefox Thunderbird\Thunderbird\messengerWindow.ico") - UninstallTheme("Mozilla Thunderbird", $ProgramFiles & "\Mozilla Thunderbird\thunderbird.exe", $ProgramFiles & "\Mozilla Thunderbird\chrome\icons\default", "msgcomposeWindow.ico", $ResourcesDir & "\themes\Firefox Thunderbird\Thunderbird\msgcomposeWindow.ico") + UninstallTheme("Mozilla Thunderbird", $ProgramFiles & "\Mozilla Thunderbird\thunderbird.exe", $ProgramFiles & "\Mozilla Thunderbird\chrome\icons\default", "abcardWindow.ico", $ResourcesDir & "\themes\Thunderbird\icons\abcardWindow.ico") + UninstallTheme("Mozilla Thunderbird", $ProgramFiles & "\Mozilla Thunderbird\thunderbird.exe", $ProgramFiles & "\Mozilla Thunderbird\chrome\icons\default", "addressbookWindow.ico", $ResourcesDir & "\themes\Thunderbird\icons\addressbookWindow.ico") + UninstallTheme("Mozilla Thunderbird", $ProgramFiles & "\Mozilla Thunderbird\thunderbird.exe", $ProgramFiles & "\Mozilla Thunderbird\chrome\icons\default", "messengerWindow.ico", $ResourcesDir & "\themes\Thunderbird\icons\messengerWindow.ico") + UninstallTheme("Mozilla Thunderbird", $ProgramFiles & "\Mozilla Thunderbird\thunderbird.exe", $ProgramFiles & "\Mozilla Thunderbird\chrome\icons\default", "msgcomposeWindow.ico", $ResourcesDir & "\themes\Thunderbird\icons\msgcomposeWindow.ico") FileDelete($ProgramFiles & "\Mozilla Thunderbird\extensions\Gnome-Brave@Windows.xpi") FileDelete($ProgramFiles & "\Mozilla Thunderbird\extensions\Gnome-Human@Windows.xpi") FileDelete($ProgramFiles & "\Mozilla Thunderbird\extensions\Gnome-Noble@Windows.xpi") @@ -200,6 +204,8 @@ Func UnAppearance() FileDelete($ProgramFiles & "\Mozilla Thunderbird\extensions\Tangerine@Windows.xpi") FileDelete($ProgramFiles & "\Mozilla Thunderbird\extensions\Elementary@Windows.xpi") FileDelete($ProgramFiles & "\Mozilla Thunderbird\extensions\Humanity@Windows.xpi") + FileDelete($ProgramFiles & "\Mozilla Thunderbird\extensions\tangobird@haven667.xpi") + FileDelete($ProgramFiles & "\Mozilla Thunderbird\extensions\tangerinebird@haven667.xpi") ;RadioSure Theme CheckAndCloseProcess("RadioSure.exe", "RadioSure") diff --git a/project/_Resources/_BuildRessources.au3 b/project/_Resources/_BuildRessources.au3 index 4ef00ff..9c9760f 100644 --- a/project/_Resources/_BuildRessources.au3 +++ b/project/_Resources/_BuildRessources.au3 @@ -198,7 +198,8 @@ Func _ActionApps() _RoutineApps("smplayer", $sTheme, 1, 1) _RoutineApps("jdownloader", $sTheme, 1, 1) _RoutineApps("firefox", $sTheme, 1, 1) - _RoutineApps("firefox-thunderbird", $sTheme, 2, 1) + ;_RoutineApps("firefox-thunderbird", $sTheme, 2, 1) ;not TANGO + _RoutineApps("thunderbird", $sTheme, 2, 1) _Compress("theme-apps-" & $sTheme & ".7z") DirRemove($TempDirMain, 1) @@ -222,7 +223,8 @@ Func _ActionApps() _RoutineApps("smplayer", $sTheme, 1, 1) _RoutineApps("jdownloader", $sTheme, 1, 1) _RoutineApps("firefox", $sTheme, 1, 1) - _RoutineApps("firefox-thunderbird", $sTheme, 2, 1) + ;_RoutineApps("firefox-thunderbird", $sTheme, 2, 1) ;not TANGERINE + _RoutineApps("thunderbird", $sTheme, 2, 1) _Compress("theme-apps-" & $sTheme & ".7z") DirRemove($TempDirMain, 1) @@ -247,6 +249,7 @@ Func _ActionApps() _RoutineApps("jdownloader", $sTheme, 1, 1) _RoutineApps("firefox", $sTheme, 1, 1) _RoutineApps("firefox-thunderbird", $sTheme, 2, 1) + _RoutineApps("thunderbird", $sTheme, 1, 1) _Compress("theme-apps-" & $sTheme & ".7z") DirRemove($TempDirMain, 1) @@ -271,6 +274,7 @@ Func _ActionApps() _RoutineApps("jdownloader", $sTheme, 1, 1) _RoutineApps("firefox", $sTheme, 1, 1) _RoutineApps("firefox-thunderbird", $sTheme, 2, 1) + ;_RoutineApps("thunderbird", $sTheme, 1, 1) ;not CHESER _Compress("theme-apps-" & $sTheme & ".7z") DirRemove($TempDirMain, 1) @@ -295,6 +299,7 @@ Func _ActionApps() _RoutineApps("jdownloader", $sTheme, 1, 1) _RoutineApps("firefox", $sTheme, 1, 1) _RoutineApps("firefox-thunderbird", $sTheme, 2, 1) + ;_RoutineApps("thunderbird", $sTheme, 1, 1) _Compress("theme-apps-" & $sTheme & ".7z") DirRemove($TempDirMain, 1) @@ -319,6 +324,7 @@ Func _ActionApps() _RoutineApps("jdownloader", $sTheme, 1, 1) _RoutineApps("firefox", $sTheme, 1, 1) _RoutineApps("firefox-thunderbird", $sTheme, 2, 1) + ;_RoutineApps("thunderbird", $sTheme, 1, 1) _Compress("theme-apps-" & $sTheme & ".7z") DirRemove($TempDirMain, 1) @@ -343,6 +349,7 @@ Func _ActionApps() _RoutineApps("jdownloader", $sTheme, 1, 1) _RoutineApps("firefox", $sTheme, 1, 1) _RoutineApps("firefox-thunderbird", $sTheme, 2, 1) + ;_RoutineApps("thunderbird", $sTheme, 1, 1) _Compress("theme-apps-" & $sTheme & ".7z") DirRemove($TempDirMain, 1) @@ -367,6 +374,7 @@ Func _ActionApps() _RoutineApps("jdownloader", $sTheme, 1, 1) _RoutineApps("firefox", $sTheme, 1, 1) _RoutineApps("firefox-thunderbird", $sTheme, 2, 1) + ;_RoutineApps("thunderbird", $sTheme, 1, 1) _Compress("theme-apps-" & $sTheme & ".7z") DirRemove($TempDirMain, 1) @@ -391,6 +399,7 @@ Func _ActionApps() _RoutineApps("jdownloader", $sTheme, 1, 1) _RoutineApps("firefox", $sTheme, 1, 1) _RoutineApps("firefox-thunderbird", $sTheme, 2, 1) + ;_RoutineApps("thunderbird", $sTheme, 1, 1) _Compress("theme-apps-" & $sTheme & ".7z") DirRemove($TempDirMain, 1) @@ -416,6 +425,7 @@ Func _ActionApps() _RoutineApps("jdownloader", $sTheme, 1, 1) _RoutineApps("firefox", $sTheme, 1, 1) _RoutineApps("firefox-thunderbird", $sTheme, 2, 1) + _RoutineApps("thunderbird", $sTheme, 1, 1) _Compress("theme-apps-" & $sTheme & ".7z") DirRemove($TempDirMain, 1) @@ -440,6 +450,7 @@ Func _ActionApps() _RoutineApps("jdownloader", $sTheme, 1, 1) _RoutineApps("firefox", $sTheme, 1, 1) _RoutineApps("firefox-thunderbird", $sTheme, 2, 1) + _RoutineApps("thunderbird", $sTheme, 1, 1) _Compress("theme-apps-" & $sTheme & ".7z") DirRemove($TempDirMain, 1) @@ -467,6 +478,8 @@ Func _RoutineApps($sApp, $sTheme, $vRoutine = 1, $OnlyCopy = 0) ;Special If $sApp = "firefox-thunderbird" Then FileDelete($dirTemp & "\*.xpi") + If $sApp = "firefox" Then FileDelete($dirTemp & "\*.xpi") + If $sApp = "thunderbird" Then FileDelete($dirTemp & "\*.xpi") If $sApp = "radiosure" and $sTheme <> "gnome" Then DirRemove($dirTemp & "\skins\gnome.rsn", 1) If $sApp = "radiosure" and $sTheme = "humanity" Then DirRemove($dirTemp & "\skins\elementary.rsn", 1) diff --git a/project/_Resources/_BuildRessources.exe b/project/_Resources/_BuildRessources.exe index db79052..afc8526 100644 Binary files a/project/_Resources/_BuildRessources.exe and b/project/_Resources/_BuildRessources.exe differ