Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adding the Quick Tour

Browse Source 
* Add a link to the Quick Tour to the desktop.
* Remove the Welcome page from desktop. We don't want to clutter
  the user's desktop more than necessary. As "Home" page of
  WebPositive, it's still very visible.
* Mention the Quick Tour in the Welcome package description.
* Add a "quicktour" script similar to the welcome/userguide
  that opens the online version if it's not installed locally.
* Add icons to the userguide and quicktour scripts. Fixes #14706.
* Add bookmark and launcher for the Quick Tour.

Adjust the AddFileDataAttributeRule to create its temporary file in
the "common" architecture, the file is not architecture specific.

Add a rule PrepareScriptWithIcon in src/data/bin/Jamfile to assign
an icon and make the script executable.

Change-Id: Ia7604ff4715a5aaf9a645c1b3333a954d6a4dafc
Reviewed-on: https://review.haiku-os.org/c/haiku/+/1924
Reviewed-by: Adrien Destugues <pulkomandy@gmail.com>
This commit is contained in:
Humdinger 2019-10-20 08:20:43 +02:00 committed by humdinger
parent edfd1a7b68
commit 9e15c9f153
11 changed files with 43 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/jam/BeOSRules
View File

@ -24,7 +24,7 @@ rule AddFileDataAttribute target : attrName : attrType : dataFile
ATTRIBUTE_NAME on $(attrMetaFile) = $(attrName) ; ATTRIBUTE_NAME on $(attrMetaFile) = $(attrName) ;
ATTRIBUTE_TYPE on $(attrMetaFile) = $(attrType) ; ATTRIBUTE_TYPE on $(attrMetaFile) = $(attrType) ;
MakeLocateArch $(attrMetaFile) ; MakeLocateCommonPlatform $(attrMetaFile) ;
CreateAttributeMetaFile $(attrMetaFile) ; CreateAttributeMetaFile $(attrMetaFile) ;
Depends $(target) : <build>addattr $(attrMetaFile) $(dataFile) ; Depends $(target) : <build>addattr $(attrMetaFile) $(dataFile) ;

5
build/jam/OptionalPackages
View File

@ -184,8 +184,9 @@ if [ IsOptionalHaikuImagePackageAdded Welcome ] {
AddPackageFilesToHaikuImage system : haiku_welcome.hpkg : nameFromMetaInfo ; AddPackageFilesToHaikuImage system : haiku_welcome.hpkg : nameFromMetaInfo ;
AddSymlinkToHaikuImage home Desktop : /boot/system/bin/welcome AddSymlinkToHaikuImage home Desktop : /boot/system/bin/quicktour
: Welcome ; : Quick\ Tour ;
AddSymlinkToHaikuImage home Desktop : /boot/system/bin/userguide AddSymlinkToHaikuImage home Desktop : /boot/system/bin/userguide
: User\ Guide ; : User\ Guide ;
} }

4
build/jam/packages/HaikuWelcome
View File

@ -3,7 +3,9 @@ HaikuPackage $(haikuWelcomePackage) ;
CopyDirectoryToPackage documentation : [ FDirName $(HAIKU_TOP) docs welcome ] CopyDirectoryToPackage documentation : [ FDirName $(HAIKU_TOP) docs welcome ]
: welcome ; : welcome ;
SEARCH on welcome = [ FDirName $(HAIKU_TOP) data bin ] ; SEARCH on welcome = [ FDirName $(HAIKU_TOP) data bin ] ;
AddFilesToPackage bin : welcome ;
AddFilesToPackage bin : quicktour welcome ;
BuildHaikuPackage $(haikuWelcomePackage) : haiku_welcome ; BuildHaikuPackage $(haikuWelcomePackage) : haiku_welcome ;

BIN
src/apps/webpositive/bookmarks/WebPositiveBookmarks.zip
View File

Binary file not shown.

1
src/data/Jamfile
View File

@ -1,5 +1,6 @@
SubDir HAIKU_TOP src data ; SubDir HAIKU_TOP src data ;
HaikuSubInclude bin ;
HaikuSubInclude deskbar ; HaikuSubInclude deskbar ;
HaikuSubInclude keyboard_layouts ; HaikuSubInclude keyboard_layouts ;
HaikuSubInclude keymaps ; HaikuSubInclude keymaps ;

BIN
src/data/bin/Alert_Idea.hvif Normal file
View File

Binary file not shown.

16
src/data/bin/Jamfile Normal file
View File

@ -0,0 +1,16 @@
SubDir HAIKU_TOP src data bin ;
rule PrepareScriptWithIcon file : iconFile
{
local source = [ FGristFiles $(file) ] ;
local icon = [ FGristFiles $(iconFile) ] ;
SEARCH on $(icon) = [ FDirName $(HAIKU_TOP) src data bin ] ;
local target = $(source:G=) ;
MakeLocateCommonPlatform $(target) ;
File $(target) : $(source) ;
MODE on $(target) = 755 ;
AddFileDataAttribute $(target) : BEOS:ICON : icon : $(icon) ;
}
PrepareScriptWithIcon quicktour : Alert_Idea.hvif ;
PrepareScriptWithIcon userguide : Misc_Book.hvif ;

BIN
src/data/bin/Misc_Book.hvif Normal file
View File

Binary file not shown.

16
src/data/bin/quicktour Executable file
View File

@ -0,0 +1,16 @@
#!/bin/sh
quicktourURL="\
https://www.haiku-os.org/docs/welcome/en/quicktour.html"
quicktourDir=/boot/system/documentation/welcome/en/
quicktourFile=$quicktourDir/quicktour.html
localizedQuicktourDir=/boot/system/documentation/welcome/"$LANG"/
localizedQuicktourFile=$localizedQuicktourDir/quicktour.html
if [ -f $localizedQuicktourFile ]; then
open file://$localizedQuicktourFile
elif [ -f $quicktourFile ]; then
open $quicktourFile
else
open $quicktourURL
fi

0
data/bin/userguide → src/data/bin/userguide
View File

4
src/data/package_infos/any/haiku_welcome
View File

@ -6,8 +6,10 @@ description "The Haiku welcome documentation was put together especially \
for new users. It provides information on how to report bugs and answers the \ for new users. It provides information on how to report bugs and answers the \
most pressing questions like how to find and install software, how to get in \ most pressing questions like how to find and install software, how to get in \
contact and where to find more resources for programmers and endusers online. contact and where to find more resources for programmers and endusers online.
A quick tour of the system shows many of Haiku's distinguishing (and at times \
not obvious) features.
This package includes several translations of the welcome documentation. \ This package includes several translations of the welcome documentation.
Thanks to everyone who contributed!" Thanks to everyone who contributed!"
packager "The Haiku build system" packager "The Haiku build system"