diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages index d976b3aace..209f797bc8 100644 --- a/build/jam/OptionalPackages +++ b/build/jam/OptionalPackages @@ -457,6 +457,9 @@ if [ IsOptionalHaikuImagePackageAdded Welcome ] { CopyDirectoryToHaikuImage beos documentation : [ FDirName $(HAIKU_TOP) docs welcome ] : welcome : -x .svn ; + CopyDirectoryToHaikuImage beos documentation + : [ FDirName $(HAIKU_TOP) docs userguide ] + : userguide : -x .svn ; AddSymlinkToHaikuImage home Desktop : /boot/beos/documentation/welcome/welcome.html : Welcome ; } diff --git a/docs/welcome/attributes-images/people.png b/docs/userguide/attributes-images/people.png similarity index 100% rename from docs/welcome/attributes-images/people.png rename to docs/userguide/attributes-images/people.png diff --git a/docs/welcome/attributes.html b/docs/userguide/attributes.html similarity index 94% rename from docs/welcome/attributes.html rename to docs/userguide/attributes.html index d8ef22f38a..3f5ebdfff7 100644 --- a/docs/welcome/attributes.html +++ b/docs/userguide/attributes.html @@ -2,18 +2,18 @@ - File Attributes - + Attributes +

- Welcome + Contents     Previous: Filetypes     @@ -23,7 +23,7 @@

-

File Attributes

+

Attributes are data fields that belong to a file but aren't part of that file, e.g. they are not computed into the file size and can be copied or changed without touching the file itself. The system uses these attributes to store e.g. file size, file type or date of the last modification. This is similar to other operating systems and their filesystems.

What's different is that you can add any kind of attribute to any file and display it or make it editable in a Tracker window. You just have to define the kind of attribute you want to add to a file type (e.g. string, integer or time) and give it a name and description.

The file itself doesn't even need any contents at all. Take a look at these People files for example: @@ -34,7 +34,7 @@

If you index these attributes, as People, Email or audio files are by default, they are also searchable with Haiku's fast query system.

-

Attributes in Tracker

+

Attributes in Tracker

Attributes are displayed quite similar to a database or spreadsheet. Using Tracker you can choose which attributes to display (columns) and sort file listings (rows) accordingly.

To do this, open a Tracker window, click on the Attributes menu, and select the attributes you want to display. Alternatively, simply right-click onto a column heading and mark the items in the context menu. You can rearrange the columns by a simple drag&drop of the column heading. Moving a column out of a window, is a fast way to get rid of columns you don't need.

Double-click on the line between two attributes in the heading to automatically resize a column to its optimal width. @@ -42,7 +42,7 @@

Editing these attributes is as simple as renaming a file: Either click on an entry or press ALT+E and move between the attibutes with TAB and SHIFT+TAB. ESC leaves the editing mode without applying the changes.

-

Attributes in Terminal

+

Attributes in Terminal

If you prefer to use the commandline or plan to work with many files using scripting, there are several commands for controlling attributes from Terminal:

-

Configure Deskbar Menu...

+

Configure Deskbar Menu...

configure.png

In this panel you set how many recent documents, folders and applications are shown in the Deskbar, or if you show them at all. @@ -68,14 +68,14 @@ This part of the panel is just a representation of the folder /boot/home/config/be. You can just as well link or copy files and folders directly in Tracker to configure your Deskbar.

-

The Tray

+

The Tray

calendar.png

Among other things, the tray's housing the clock. Left-click it to toggle between date and time. Right-click it to hide/show it or launch the Time preferences to set it. Here you can also launch a calendar that also appears, when you hold down the left mouse button on the clock for a little time.

Any program can install an icon in the tray to provide an interface to the user. The email system, for instance, shows a different symbol when there's unread mail and offers a context menu to e.g. create or check for new mail. ProcessController is another example that uses its icon in the tray to provide information (CPU/memory usage) and to offer a context menu.

-

The list of running programs

+

The list of running programs

list-of-apps.png.png

You can change to a specific running application by clicking on its entry in the Deskbar and choosing (one of) its windows, from the submenu. By right-clicking you can minimize or close a window or the entire application.

If you activated Expanders in the Deskbar settings, you can show/hide the list of windows directly under an application's entry. @@ -86,9 +86,9 @@ Here you can also launch a calendar that also appears, when you hold down the le

- Welcome + Contents     - Previous: The Tracker + Previous: Tracker Add-Ons     Next: Filetypes

diff --git a/docs/welcome/filetypes-images/filetype-addon-stylededit.png b/docs/userguide/filetypes-images/filetype-addon-stylededit.png similarity index 100% rename from docs/welcome/filetypes-images/filetype-addon-stylededit.png rename to docs/userguide/filetypes-images/filetype-addon-stylededit.png diff --git a/docs/welcome/filetypes-images/filetype-addon.png b/docs/userguide/filetypes-images/filetype-addon.png similarity index 100% rename from docs/welcome/filetypes-images/filetype-addon.png rename to docs/userguide/filetypes-images/filetype-addon.png diff --git a/docs/welcome/filetypes.html b/docs/userguide/filetypes.html similarity index 84% rename from docs/welcome/filetypes.html rename to docs/userguide/filetypes.html index e9c83d9647..2c47f6044c 100644 --- a/docs/welcome/filetypes.html +++ b/docs/userguide/filetypes.html @@ -3,52 +3,52 @@ Filetypes - +

- Welcome + Contents     - Previous: The Deskbar + Previous: Deskbar     - Next: File Attributes + Next: Attributes

-

Filetypes

+

Other than Windows, Haiku doesn't rely on the 3-letter file extension for a file type (e.g. .txt, .jpg, .mp3). This method is only a last resort fallback. Haiku uses MIME types just like it's custom on the internet.

Setting the filetype of a specific file

You can change the type of a specific file, its icon and the associated application. Select the file and invoke the Add-Ons | Filetype add-on from the right-click context menu.

filetype-addon.png -

The File Type

+

The File Type

This is a JPEG file, it's MIME string image/jpeg. Let's say you definitely know that it's not a JPEG but a GIF. You can change that either by entering the correct MIME string by hand or with one of the two buttons below the textbox:

  • Select... shows a hierarchical list of filetypes where you navigate to image | GIF Image.
  • Same as... opens a file dialog where you choose any file that already has the filetype you're looking for.

-

The Preferred Application

+

The Preferred Application

This dropdown menu shows a list of all applications that can handle this particular filetype. From here you can choose which program should open this specific file when it's double-clicked. You could, for example, change a HTML file's preferred application from the browser to a text editor while you're working on it. Every other HTML file still opens in the browser, only this particular one starts in your text editor.

The "Default Application" is the one that's set globally for that filetype. If you don't find the program you want to associate with this file in the dropdown menu, you'll again find the buttons Select... and Same As... which do the similar thing described under "The File Type" above.

-

The Icon

+

The Icon

If you're wondering why the icon well on the top right is empty: Icons are normally inherited from the system default for that filetype. You can open the Filetype Add-On of a file that contains an icon and drag&drop it into your file's icon well. Or you double-click the icon well and create or edit your own icon in Icon-O-Matic.

-

Global settings with the Filetypes Preferences

+

Global settings with the Filetypes Preferences

The Filetypes preferences don't deal with individual files but with global settings of filetypes. You can change default icons and preferred applications or add, remove, or alter attributes of whole filetypes. You can even create your own filetype from scratch.

All filetypes and their configurations are stored in /boot/home/config/settings/beos_mime. Before you start experimenting, it may be prudent to make a backup of that folder...

-

To learn more about the Filetypes preferences see the workshop: DVDdb (Filetypes & Attributes).

+

To learn more about the Filetypes preferences see the workshop: Filetypes, Attributes, Index and Queries.

-

Special settings for applications

+

Special settings for applications

If you invoke the Filetype Add-On on an executable (here: StyledEdit), you'll get a different dialog:

filetype-addon-stylededit.png
@@ -68,11 +68,11 @@

- Welcome + Contents     - Previous: The Deskbar + Previous: Deskbar     - Next: File Attributes + Next: Attributes

diff --git a/docs/welcome/gui-images/gui.png b/docs/userguide/gui-images/gui.png similarity index 100% rename from docs/welcome/gui-images/gui.png rename to docs/userguide/gui-images/gui.png diff --git a/docs/welcome/gui.html b/docs/userguide/gui.html similarity index 93% rename from docs/welcome/gui.html rename to docs/userguide/gui.html index ff443d65fc..657e851b31 100644 --- a/docs/welcome/gui.html +++ b/docs/userguide/gui.html @@ -3,17 +3,17 @@ Haiku's GUI - +

- Welcome + Contents     Next: Workspaces

@@ -21,7 +21,6 @@
-

Haiku's GUI

Haiku's graphical user interface is an integral part of the system. Unlike Unix-based operating systems, there's no separate window manager and booting just into a command line shell is not possible. Haiku's focus being on the desktop user, this is just not considered necessary.

As you probably have experience with other graphical environments, let's skip over the standards like menus, right-click context menus, drag&drop etc. Let's have a look at the few unique aspects of Haiku's GUI instead.


@@ -47,7 +46,7 @@ There are only a few things in Haiku's GUI that aren't obvious and deserve an ex

- Welcome + Contents     Next: Workspaces

diff --git a/docs/welcome/index.html b/docs/userguide/index.html similarity index 80% rename from docs/welcome/index.html rename to docs/userguide/index.html index 998059e800..f9132b00fa 100644 --- a/docs/welcome/index.html +++ b/docs/userguide/index.html @@ -2,20 +2,20 @@ - The Index - + Index +

- Welcome + Contents     - Previous: File Attributes + Previous: Attributes     Next: Queries

@@ -23,13 +23,12 @@
-

The Index

-

-Attributes and Queries are key features of Haiku. While attributes are useful on their own, to display additional information on a file, for a query on them, they need to be indexed. It puts them into a lookup table, which in turn makes queries lightning fast.
+ +

Attributes and Queries are key features of Haiku. While attributes are useful on their own, to display additional information on a file, for a query on them, they need to be indexed. It puts them into a lookup table, which in turn makes queries lightning fast.
The index is part of the filesystem and is kept for every volume/partition separately.

-

Indexing commands in Terminal

+

Indexing commands in Terminal

There are several commands to manage the index:

  • lsindex - Displays the indexed attributes on the current volume/partition. @@ -113,9 +112,9 @@ If no volume is specified, the volume of the current directory is assumed.

    - Welcome + Contents     - Previous: File Attributes + Previous: Attributes     Next: Queries

    diff --git a/docs/welcome/queries-images/basic-query.png b/docs/userguide/queries-images/basic-query.png similarity index 100% rename from docs/welcome/queries-images/basic-query.png rename to docs/userguide/queries-images/basic-query.png diff --git a/docs/welcome/queries-images/formula-query.png b/docs/userguide/queries-images/formula-query.png similarity index 100% rename from docs/welcome/queries-images/formula-query.png rename to docs/userguide/queries-images/formula-query.png diff --git a/docs/welcome/queries-images/query-window-filled.png b/docs/userguide/queries-images/query-window-filled.png similarity index 100% rename from docs/welcome/queries-images/query-window-filled.png rename to docs/userguide/queries-images/query-window-filled.png diff --git a/docs/welcome/queries-images/query-window.png b/docs/userguide/queries-images/query-window.png similarity index 100% rename from docs/welcome/queries-images/query-window.png rename to docs/userguide/queries-images/query-window.png diff --git a/docs/welcome/queries-images/result-window.png b/docs/userguide/queries-images/result-window.png similarity index 100% rename from docs/welcome/queries-images/result-window.png rename to docs/userguide/queries-images/result-window.png diff --git a/docs/welcome/queries.html b/docs/userguide/queries.html similarity index 89% rename from docs/welcome/queries.html rename to docs/userguide/queries.html index 974e0ec1fc..df55a385e5 100644 --- a/docs/welcome/queries.html +++ b/docs/userguide/queries.html @@ -3,29 +3,31 @@ Queries - +

    - Welcome + Contents     - Previous: The Index + Previous: Index +     + Next: Workshop

    -

    Queries

    +

    A query is a file search based on file attributes and can be performed within Tracker or in Terminal. Queries are saved in "/boot/home/queries" and by default last seven days before being purged. Note, that these aren't static result lists of your search, but are the query formulas which trigger a new search whenever you open them.

    -

    The Find window

    +

    The Find window

    You start a query by invoking the Find... menu either from the Deskbar menu or any Tracker window or the Desktop (which is actually a fullscreen Tracker window). The shortcut is ALT+F. You're presented with the Find window:

    @@ -47,11 +49,11 @@ types.
    [10] You can drag&drop the icon to save the query.

    -

    Basic queries - "by Name"

    +

    Basic queries - "by Name"

    If you simply want to find all files on your mounted disks that match a certain pattern, simply leave the search method at "by Name", enter the search term into the text box and press ENTER.

    -

    Advanced queries - "by Attribute"

    +

    Advanced queries - "by Attribute"

    You can create more advanced queries by searching within the attributes of specific file types. For that to work, these attributes have to be indexed (see Index).

    @@ -66,7 +68,7 @@ types.

    This is your Find window when you're looking for all emails Clara Botter has sent to you in the last two months that had in the subject "vibraphone" or "skepticality".

    -

    Even more advanced queries - "by Formula"

    +

    Even more advanced queries - "by Formula"

    Typing in a formula query by hand is daunting and really quite unpractical. It still has its uses.

    Take the above query by attribute of Clara's mails concerning vibraphones etc. If you have all the attributes and their search terms set, try switching to "by Formula mode and be overwhelmed by this one line query string: @@ -88,7 +90,7 @@ types.

  • You can fine tune your query by inserting paranthesis where needed, make parts case-sensitive or negate logical combinations by changing. e.g. "==" to "!=" for a NOT AND. All you need is a basic understanding of regular expressions and maybe some scripting basics.
-

The result window

+

The result window

After you start a search, the Find window will be replaced by a result window. Here is an example that queried for "server":

result-window.png

Besides the grey backgound, result windows work exactly like any other Tracker window. Some things are worth noting: @@ -108,9 +110,11 @@ Open the new folder and paste in the layout with Attributes | Paste Attribute

- Welcome + Contents     - Previous: The Index + Previous: Index +     + Next: Workshop

diff --git a/docs/welcome/teammonitor-images/teammonitor.png b/docs/userguide/teammonitor-images/teammonitor.png similarity index 100% rename from docs/welcome/teammonitor-images/teammonitor.png rename to docs/userguide/teammonitor-images/teammonitor.png diff --git a/docs/welcome/teammonitor.html b/docs/userguide/teammonitor.html similarity index 79% rename from docs/welcome/teammonitor.html rename to docs/userguide/teammonitor.html index 421f9d9483..6ca1b304d6 100644 --- a/docs/welcome/teammonitor.html +++ b/docs/userguide/teammonitor.html @@ -3,27 +3,26 @@ Team Monitor - +

- Welcome + Contents     - Previous: The Twitcher + Previous: Twitcher     - Next: The Tracker + Next: Tracker

-

The Team Monitor

With CTRL+ALT+DEL you invoke the Team Monitor which lists all currently running programs.


@@ -33,16 +32,16 @@ Applications that are unresponsive, which is often a sign the program has crashe

- + diff --git a/docs/userguide/tracker-add-ons.html b/docs/userguide/tracker-add-ons.html new file mode 100644 index 0000000000..54cc50f57e --- /dev/null +++ b/docs/userguide/tracker-add-ons.html @@ -0,0 +1,70 @@ + + + + + Tracker Add-Ons + + + + + +
+

+ Contents +     + Previous: Tracker +     + Next: Deskbar +

+
+ +
+ +

Applications can install add-ons so they can be invoked easily on a selection of files from Tracker. Only the add-ons that can handle a specific filetype are presented under Add-Ons from the context menu or the File menu of a Tracker window. Some add-ons don't necessarily need a file to work on and are thus always present. +

Tracker Add-Ons, or links to applications that can act as add-ons, can be installed in three different locations (see topic Filesystem layout): +
    +
+ + +
/boot/beos/system/add-ons/Tracker/    for system provided add-ons
/boot/common/add-ons/Tracker/    for add-ons available to every user
/boot/home/config/add-ons/Tracker/    for add-ons of a specific user
+

The file name of an add-on can be suffixed with a dash and capital letter, and is then available via keyboard shortcut. For example, Open Target Folder-T opens with ALT+AltGr+T (at least with my keymap, you may have a different key combination).
+Of course, you have to take care of possible shortcut collisions when deciding on a shortcut. You can't have the same for different add-ons. +

+ +

Haiku's Tracker Add-Ons

+

These Tracker Add-Ons come with every Haiku installation: +

+ + + + + + + + + + + + + +
Background-BOpens the Background preferences to change the color or image of the Desktop or any folder. Invoked on an image file the Background panel is launched with that image already loaded as a potential background.
DiskUsage-IStarts the DiskUsage application with the according folder as basis.
FileType-FInvoked on a file, opens its specific FileType panel, otherwise the FileTypes preferences are launched.
Open Target Folder-TIt can only be used on a linked file and opens the folder that file lives in.
TextSearch-GStarts the TextSearch application to look for a string in the selected folder (and its subfolders).
ZipOMatic-ZA selection of files will be added to a zip archive, invoked without a selection opens a panel to create an archive via drag&drop.
+

+ + +
+ +
+

+ Contents +     + Previous: Tracker +     + Next: Deskbar +

+
+ + + diff --git a/docs/welcome/tracker-images/drill-down.png b/docs/userguide/tracker-images/drill-down.png similarity index 100% rename from docs/welcome/tracker-images/drill-down.png rename to docs/userguide/tracker-images/drill-down.png diff --git a/docs/welcome/tracker-images/get-info.png b/docs/userguide/tracker-images/get-info.png similarity index 100% rename from docs/welcome/tracker-images/get-info.png rename to docs/userguide/tracker-images/get-info.png diff --git a/docs/welcome/tracker-images/mount-settings.png b/docs/userguide/tracker-images/mount-settings.png similarity index 100% rename from docs/welcome/tracker-images/mount-settings.png rename to docs/userguide/tracker-images/mount-settings.png diff --git a/docs/welcome/tracker-images/new-menu.png b/docs/userguide/tracker-images/new-menu.png similarity index 100% rename from docs/welcome/tracker-images/new-menu.png rename to docs/userguide/tracker-images/new-menu.png diff --git a/docs/welcome/tracker-images/open-with-preferred.png b/docs/userguide/tracker-images/open-with-preferred.png similarity index 100% rename from docs/welcome/tracker-images/open-with-preferred.png rename to docs/userguide/tracker-images/open-with-preferred.png diff --git a/docs/welcome/tracker-images/open-with.png b/docs/userguide/tracker-images/open-with.png similarity index 100% rename from docs/welcome/tracker-images/open-with.png rename to docs/userguide/tracker-images/open-with.png diff --git a/docs/welcome/tracker-images/tracker-preferences-navigator.png b/docs/userguide/tracker-images/tracker-preferences-navigator.png similarity index 100% rename from docs/welcome/tracker-images/tracker-preferences-navigator.png rename to docs/userguide/tracker-images/tracker-preferences-navigator.png diff --git a/docs/welcome/tracker-images/transaction-status.png b/docs/userguide/tracker-images/transaction-status.png similarity index 100% rename from docs/welcome/tracker-images/transaction-status.png rename to docs/userguide/tracker-images/transaction-status.png diff --git a/docs/welcome/tracker-images/window-drill-down.png b/docs/userguide/tracker-images/window-drill-down.png similarity index 100% rename from docs/welcome/tracker-images/window-drill-down.png rename to docs/userguide/tracker-images/window-drill-down.png diff --git a/docs/welcome/tracker-images/window-menu.png b/docs/userguide/tracker-images/window-menu.png similarity index 100% rename from docs/welcome/tracker-images/window-menu.png rename to docs/userguide/tracker-images/window-menu.png diff --git a/docs/welcome/tracker.html b/docs/userguide/tracker.html similarity index 90% rename from docs/welcome/tracker.html rename to docs/userguide/tracker.html index 1e13393da2..c77030e4d0 100644 --- a/docs/welcome/tracker.html +++ b/docs/userguide/tracker.html @@ -2,33 +2,32 @@ - The Tracker - + Tracker +

- Welcome + Contents     - Previous: The Team Monitor + Previous: Team Monitor     - Next: The Deskbar + Next: Tracker Add-Ons

-

The Tracker

The Tracker is the graphical interface to all your files. It let's you create new files and folders or find, launch or rename as well as copy or delete existing ones.

Being an application like any other (the Desktop with its icons is really just a fullscreen window in the background), Tracker appears with its windows in the Deskbar and can be quit and restarted. The easiest way to quit and restart a crashed or frozen Tracker (or a wayward Deskbar) is to call the Team Monitor.

-

Mounting Volumes

+

Mounting Volumes

In order to access a harddisk, CD, USB stick etc., you first have to mount the volume, that is, let the system know it's there. This is done with a right-click on the Desktop or an already mounted volume (like the boot disk) and choosing the volume from the Mount submenu.

drill-down.png @@ -39,7 +38,7 @@ The above settings will mount all disks on bootup that were mounted previously a Before you disconnect e.g. a harddrive or USB stick, make sure you have successfully unmounted the volume. This guarantees that all data transfer has finished. Otherwise you may lose data or corrupt the disk!

-

Navigating

+

Navigating

Moving through your folders is one of Trackers main purposes, just like the file managers on other platforms. Haiku's Tracker has some unique features that will help you doing that efficiently.

Instead of double-clicking your way down folder after folder, there's a better way to drill down:

@@ -57,7 +56,7 @@ The above settings will mount all disks on bootup that were mounted previously a

By default, when you double-click a folder, Tracker opens a new window while leaving the parent window open. This can quickly lead to an overcrowded desktop.
You can prevent that by holding down the left WIN key, which automatically closes the parent window.
This is also true for keyboard navigation.

-

Keyboard navigation

+

Keyboard navigation

A few shortcuts are essential:

  • ALT+CURSOR-UP - Open parent folder.
  • ALT+CURSOR-DOWN or RETURN - Open selected folder.
  • @@ -66,7 +65,7 @@ This is also true for keyboard navigation.

  • right MENU-KEY - Open Deskbar menu (leave with ESC).

-

Appearance

+

Appearance

window-menu.png

Tracker windows offer three different viewing modes from the Window menu: @@ -81,7 +80,7 @@ This is also true for keyboard navigation.

The rest of the functions are pretty self-explanatory, leaving the Tracker preferences.

-

Tracker preferences

+

Tracker preferences

Window | Preferences... opens a panel that offers a number of setting that, where not obvious, should become clear once tried out. Since all settings are applied live, you'll immediately see the changes.
So, in short, the not so obvious settings:

  • Desktop - Decide if all mounted disks appear directly on the Desktop or in a window after clicking a single Disk icon sitting on the Desktop.
  • @@ -96,7 +95,7 @@ Before you switch Tracker to Single Window Navigation mode, because that may fee

-

Working with files

+

Working with files

When invoked on a selected file, most of the File menu commands are also offered in the context menu by right-clicking that file.

As usual the usage of the commands is pretty clear.

  • Find... - Find a file or folder. See topic Query for more info.
  • @@ -119,10 +118,11 @@ Before you switch Tracker to Single Window Navigation mode, because that may fee
  • Edit Name, Duplicate and Move to Trash - lets you rename or duplicate a file or put the selected file(s) to the trash.
  • Move to, Copy to and Create Link - lets you move, copy or link the selected file(s) using the submenu navigating method. Holding SHIFT while invoking the menu offers the option to create a relative link.
  • Cut, Copy and Paste - lets you cut, copy and paste files using the clipboard. By holding SHIFT while invoking the menu you can Copy/Cut more files, maybe from another folder that you can paste somewhere else later. Also, while holding SHIFT you can paste the copied files in the clipboard as links.
  • -
  • Identify - will sniff out and set the type of a file if it didn't have one before, e.g. if you transfered a file with wget which doesn't set a filetype itself. Holding SHIFT while invoking the menu changes the item to identify the filetype and correct it if it was false before.
+
  • Identify - will sniff out and set the type of a file if it didn't have one before, e.g. if you transfered a file with wget which doesn't set a filetype itself. Holding SHIFT while invoking the menu changes the item to identify the filetype and correct it if it was false before.
  • +
  • Add-Ons - offers you every generic Tracker add-on and those that can handle the selected file(s). See topic Tracker Add-ons for more information.
  • -

    Transaction status

    +

    Transaction status

    When you copy, move or delete files, Tracker shows its progress with a status window. If you initiate more than one transaction, each job gets its own status display.

    @@ -133,11 +133,11 @@ Before you switch Tracker to Single Window Navigation mode, because that may fee

    - Welcome + Contents     - Previous: The Team Monitor + Previous: Team Monitor     - Next: The Deskbar + Next: Tracker Add-Ons

    diff --git a/docs/welcome/twitcher-images/twitcher.png b/docs/userguide/twitcher-images/twitcher.png similarity index 100% rename from docs/welcome/twitcher-images/twitcher.png rename to docs/userguide/twitcher-images/twitcher.png diff --git a/docs/welcome/twitcher.html b/docs/userguide/twitcher.html similarity index 72% rename from docs/welcome/twitcher.html rename to docs/userguide/twitcher.html index b407cfa274..54b02bc2c4 100644 --- a/docs/welcome/twitcher.html +++ b/docs/userguide/twitcher.html @@ -2,28 +2,27 @@ - The Twitcher - + Twitcher +

    - Welcome + Contents     Previous: Workspaces     - Next: The Team Monitor + Next: Team Monitor

    -

    The Twitcher

    The Twitcher is a task switcher to jump between running applications and their windows.

    twitcher.png @@ -34,6 +33,16 @@

    - + diff --git a/docs/welcome/workshop-filetypes+attributes-images/filetype-extra-attribute.png b/docs/userguide/workshop-filetypes+attributes-images/filetype-extra-attribute.png similarity index 100% rename from docs/welcome/workshop-filetypes+attributes-images/filetype-extra-attribute.png rename to docs/userguide/workshop-filetypes+attributes-images/filetype-extra-attribute.png diff --git a/docs/welcome/workshop-filetypes+attributes-images/filetypes-dvddb-empty.png b/docs/userguide/workshop-filetypes+attributes-images/filetypes-dvddb-empty.png similarity index 100% rename from docs/welcome/workshop-filetypes+attributes-images/filetypes-dvddb-empty.png rename to docs/userguide/workshop-filetypes+attributes-images/filetypes-dvddb-empty.png diff --git a/docs/welcome/workshop-filetypes+attributes-images/filetypes-dvddb.png b/docs/userguide/workshop-filetypes+attributes-images/filetypes-dvddb.png similarity index 100% rename from docs/welcome/workshop-filetypes+attributes-images/filetypes-dvddb.png rename to docs/userguide/workshop-filetypes+attributes-images/filetypes-dvddb.png diff --git a/docs/welcome/workshop-filetypes+attributes-images/filetypes-new-file-type.png b/docs/userguide/workshop-filetypes+attributes-images/filetypes-new-file-type.png similarity index 100% rename from docs/welcome/workshop-filetypes+attributes-images/filetypes-new-file-type.png rename to docs/userguide/workshop-filetypes+attributes-images/filetypes-new-file-type.png diff --git a/docs/welcome/workshop-filetypes+attributes-images/query-dvddb.png b/docs/userguide/workshop-filetypes+attributes-images/query-dvddb.png similarity index 100% rename from docs/welcome/workshop-filetypes+attributes-images/query-dvddb.png rename to docs/userguide/workshop-filetypes+attributes-images/query-dvddb.png diff --git a/docs/welcome/workshop-filetypes+attributes.html b/docs/userguide/workshop-filetypes+attributes.html similarity index 94% rename from docs/welcome/workshop-filetypes+attributes.html rename to docs/userguide/workshop-filetypes+attributes.html index 2994896ae3..65d9fcd3ff 100644 --- a/docs/welcome/workshop-filetypes+attributes.html +++ b/docs/userguide/workshop-filetypes+attributes.html @@ -2,28 +2,30 @@ - Workshop: Filetypes & Attributes - + Workshop: Filetypes, Attributes, Index and Queries +

    - Welcome + Contents     - Previous: Filetypes + Previous: Queries +

    -

    Filetypes, Attributes and Queries

    +

    This is a workshop to show the use of Attributes, Queries, the Index and custom Filetypes. As an example, we build a database to keep track of our DVD library.

    @@ -153,11 +155,13 @@ Open the folder containing your DVDdb files and arrange the attributes how you'd

    - Welcome + Contents     - Previous: Filetypes + Previous: Queries +

    diff --git a/docs/welcome/workspaces-images/workspaces.png b/docs/userguide/workspaces-images/workspaces.png similarity index 100% rename from docs/welcome/workspaces-images/workspaces.png rename to docs/userguide/workspaces-images/workspaces.png diff --git a/docs/welcome/workspaces.html b/docs/userguide/workspaces.html similarity index 66% rename from docs/welcome/workspaces.html rename to docs/userguide/workspaces.html index 2a2b00e71c..cf8315656b 100644 --- a/docs/welcome/workspaces.html +++ b/docs/userguide/workspaces.html @@ -3,17 +3,17 @@ Workspaces - +

    - Welcome + Contents     Previous: Haiku's GUI     @@ -23,19 +23,18 @@

    -

    Workspaces

    Workspaces are virtual desktops, complete with their own resolution, colour depth and background. Up to 32 of these workspaces can be set from the Screen preferences.

    -

    The Workspaces Applet

    +

    The Workspaces Applet

    workspaces.png -

    The Workspaces applet shows a miniature version of all workspaces. There are several options available from the context menu of the applet's window, which are all pretty self-explaining. Since the applet is a Replicant, you can resize the window as desired and then drag&drop it by its handle onto the desktop (make sure "Show Replicants" is activated in the Deskbar menu).

    +

    You find the Workspaces applet with the other Desktop Applets in the Deskbar. It shows a miniature version of all workspaces. There are several options available from the context menu of the applet's window, which are all pretty self-explaining. Since the applet is a Replicant, you can resize the window as desired and then drag&drop it by its handle onto the desktop (make sure "Show Replicants" is activated in the Deskbar menu).

    -

    Switching workspaces

    +

    Switching workspaces

    You can switch between workspaces by either clicking into the Workspaces applet or by using the keyboard shortcut ALT+Fx, where "x" is the workspace number. Also, clicking on an application or one of its windows in the Deskbar will send you to the workspace it's in.

    -

    Moving windows between workspaces

    +

    Moving windows between workspaces

    To move a window, you grab it in the Workspaces applet and simply drag it to another workspace. This has the advantage, that you can move it without leaving your current desktop. Of course, that only works well when there aren't too many windows on a workspace and your target isn't obscured by other windows. Another possibility is to grab a window by its tab and just holding on to it while switching workspaces with ALT+Fx.

    @@ -43,7 +42,7 @@

    - Welcome + Contents     Previous: Haiku's GUI     diff --git a/docs/welcome/welcome.css b/docs/welcome/welcome.css index 3ab5f75367..5aaa505c5e 100644 --- a/docs/welcome/welcome.css +++ b/docs/welcome/welcome.css @@ -161,3 +161,8 @@ div.bottomnav p { font-size: 0.9em; } +td.onelinetop { + vertical-align: top; + white-space: nowrap; +} + diff --git a/docs/welcome/welcome.html b/docs/welcome/welcome.html index c00ec76128..cffe91a12c 100644 --- a/docs/welcome/welcome.html +++ b/docs/welcome/welcome.html @@ -13,7 +13,7 @@

    - Next: Haiku's GUI +  

    @@ -40,19 +40,10 @@ One of the main reasons for releasing an alpha version is to attract more people

    Getting to know the system

    -The first release(s) of Haiku will be very much like the BeOS R5, the OS it is reimplementing. If you never experienced it, here are a few short introductions to some of its features: +The first release(s) of Haiku will be very much like the BeOS R5, the OS it is reimplementing. If you never experienced it, have a look at these links:

    @@ -100,12 +91,11 @@ Get in contact with other developers and users and join the discussions in our f

    -

    - Next: Haiku's GUI +   +

    -