aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog5
-rw-r--r--calendar/doc/C/gnomecal.sgml191
2 files changed, 100 insertions, 96 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index c0b2ebc4ed..3e41a0bb9b 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,8 @@
+1999-09-14 Kjartan Maraas <kmaraas@online.no>
+
+ * doc/C/gnomecal.sgml: Merge from HEAD. Synced with newest
+ user-guide.
+
1999-09-01 Miguel de Icaza <miguel@gnu.org>
* eventedit.c (ee_create_buttons): Make the OK button the default
diff --git a/calendar/doc/C/gnomecal.sgml b/calendar/doc/C/gnomecal.sgml
index fd5b98c581..00c9c8bb72 100644
--- a/calendar/doc/C/gnomecal.sgml
+++ b/calendar/doc/C/gnomecal.sgml
@@ -24,7 +24,7 @@
</author>
</authorgroup>
<copyright>
- <year>1998, 1999</year> <holder>Miguel de Icaza</holder>
+ <year>1998, 1999</year> <holder>Miguel de Icaza, Dave Mason</holder>
</copyright>
<legalnotice>
<para>This documentation is free software; you can redistribute
@@ -178,17 +178,17 @@
</primary>
</indexterm>
The GNOME Calendar is a simple calendar applications which can be quite
- useful in your daily work. The Calendar, like much of GNOME, is in its
- infancy and while it is a very useful application, there is some very
+ useful in your daily work. The Calendar, like much of GNOME, is in its
+ infancy and while it is a very useful application, there is some very
impressive functionality still to come like network shared calendar usage,
and syncing capability with Palm Pilots and other hand held PDAs. The
Calendar can be launched from the <guimenu>Applications</guimenu> submenu of
the Main Menu.
</para>
<para>
- The Calendar is broken up into four main tabs: Day, Week, Month,
- and Year. Each view allows you to view the respective time period
- but will also allow you to schedule appointments from any one of
+ The Calendar is broken up into four main tabs: Day, Week, Month,
+ and Year. Each view allows you to view the respective time period
+ but will also allow you to schedule appointments from any one of
the tabs.
</para>
<figure>
@@ -218,12 +218,13 @@
</figure>
</para>
<para>
- The Calendar Preferences dialog is broken up into three tabs, Time
- display and Colors, and Todo list
- </para>
+ The Calendar Preferences dialog is broken up into three tabs, Time display,
+ Colors, and Todo list.
+ </para>
<para>
- Time - This tab is broken up into three main sections: Time format, Weeks
- start on, and Time range. </para>
+ Time - This tab is broken up into three main sections: Time format, Weeks
+ start on, and Day range.
+ </para>
<para>
Time format - This allows you to choose between a 12 or 24 hour format
clock.
@@ -234,46 +235,46 @@
Day and Week views.
</para>
<para>
- Day range - This section lets you choose what time your days will start
- and end. Any hours outside the range selected will be shaded on your Day
+ Day range - This section lets you choose what time your days will start
+ and end. Any hours outside the range selected will be shaded on your Day
view.
</para>
<para>
- Colors - This tab allows you to change the default colors used in the
- Calendar. There are seven color choices you can customize: Outline,
- Headings, Empty days, Appointments, Highlighted day, Day numbers, and
- Current day's number. Each choice has a small color selector box next to
+ Colors - This tab allows you to change the default colors used in the
+ Calendar. There are seven color choices you can customize: Outline,
+ Headings, Empty days, Appointments, Highlighted day, Day numbers, and
+ Current day's number. Each choice has a small color selector box next to
it. When you press this box you will be given a color selector dialog in
- which you can choose the color you want. Once you have selected a color the
+ which you can choose the color you want. Once you have selected a color the
small sample calendar on the right side of the tab will preview your choice.
</para>
<para>
Todo List - This tab allows you to define which columns will be shown in the
Todo List in the Day View. You can set the Summary, Due Date, and Priority
columns.
- </para>
+ </para>
<para>
- Once you have made the changes to the Calendar Preferences you may press the
+ Once you have made the changes to the Calendar Preferences you may press the
<guibutton>Apply</guibutton> button to apply them.
</para>
</sect1>
<sect1 id="caluse">
<title>Using the GNOME Calendar</title>
<para>
- Using the GNOME Calendar is quite simple and most tasks can be performed
- from any of the major views, Day, Week, Month or Year. Probably one of the
- most important features to remember is that at any time you may right mouse
+ Using the GNOME Calendar is quite simple and most tasks can be performed
+ from any of the major views, Day, Week, Month or Year. Probably one of the
+ most important features to remember is that at any time you may right mouse
click on a particular day and add a new appointment. There are many other
features which will be described below in each of the major views.
</para>
<sect2 id="calday">
<title>The Day View</title>
<para>
- The Day tab is probably the most useful view in the GNOME Calendar as it
- acts just as a day timer would. On the left of the tab is the hour listing
- for the current day. The light grey coloring in the hour list separates
- the work hours from the non-work hours. If you would like to change the
- work hours displayed in light grey you can do so in <xref
+ The Day tab is probably the most useful view in the GNOME Calendar as it
+ acts just as a day timer would. On the left of the tab is the hour listing
+ for the current day. The light grey coloring in the hour list separates the
+ work hours from the non-work hours. If you would like to change the work
+ hours displayed in light grey you can do so in <xref
LinkEnd="calsetup">.
</para>
<figure>
@@ -287,42 +288,41 @@
<tip>
<title>TIP</title>
<para>
- One tip for adding a new appointment in the Day View is to
- select a few hours in the hours list by clicking and dragging
- your mouse down the hours list. Once the correct range of time
- has been selected you may press Enter and type in the
- appointment. This will allow you to skip the Create New
+ One tip for adding a new appointment in the Day View is to select a few
+ hours in the hours list by clicking and dragging your mouse down the hours
+ list. Once the correct range of time has been selected you may press Enter
+ and type in the appointment. This will allow you to skip the Create New
Appointment dialog.
</para>
</tip>
<para>
- Next to the hours listing in the top right hand corner is a small full
- month calendar. You may change the month or year of the small month
- calendar by pressing the forward and backward arrows on the top. You may
- use the small month calendar to navigate the days as well. Double clicking
- on any day in the small month calendar will move the current day view to
+ Next to the hours listing in the top right hand corner is a small full
+ month calendar. You may change the month or year of the small month
+ calendar by pressing the forward and backward arrows on the top. You may
+ use the small month calendar to navigate the days as well. Double clicking
+ on any day in the small month calendar will move the current day view to
that particular day.
</para>
<para>
- Below the small month calendar is your Todo list. The Todo list is a
- simple list where you can keep all your tasks on hand. To add an item to
- the Todo list press the <guibutton>Add</guibutton> button. This will
- launch a small editing box where you can type in the item. Once you have
+ Below the small month calendar is your Todo list. The Todo list is a
+ simple list where you can keep all your tasks on hand. To add an item to
+ the Todo list press the <guibutton>Add</guibutton> button. This will
+ launch a small editing box where you can type in the item. Once you have
entered an item in the Todo list you may use the
- <guibutton>Edit</guibutton> and <guibutton>Delete</guibutton> to manage your
- items. The To-do items are available no matter which days are displayed in
- the Day View and can only be deleted with the <guibutton>Delete</guibutton>
- button.
+ <guibutton>Edit</guibutton> and <guibutton>Delete</guibutton> to manage
+ your items. The Todo items are available no matter which days are displayed
+ in the Day View and can only be deleted with the
+ <guibutton>Delete</guibutton> button.
</para>
</sect2>
<sect2 id="calweek">
<title>The Week View</title>
<para>
- The Week View shows the current week with detailed descriptions of your
- appointments. If you would like to add an appointment for any of the days
- in the week view, you may right mouse click on the day and select the
- <guimenuitem>New appointment</guimenuitem> menu item from the
- <guimenu>pop-up</guimenu> menu. You may also use the week view to navigate
+ The Week View shows the current week with detailed descriptions of your
+ appointments. If you would like to add an appointment for any of the days
+ in the week view you may right mouse click on the day and select the
+ <guimenuitem>New appointment</guimenuitem> menu item from the
+ <guimenu>pop-up</guimenu> menu. You may also use the week view to navigate
to particular days in the Day View. Double-click on any day in the Week
View and you will go to that day in the Day View.
</para>
@@ -335,29 +335,29 @@
</screenshot>
</figure>
<para>
- In the lower left corner of the Week View there is a small month
- calendar. You may change the month or year of the small month
- calendar by pressing the forward and backward arrows on the
- top. You may use the small month calendar to navigate the days as
- well. Double clicking on any day in the small month calendar will
- move the current week view to that particular week.
+ In the lower left corner of the Week View there is a small month calendar.
+ You may change the month or year of the small month calendar by pressing
+ the forward and backward arrows on the top. You may use the small month
+ calendar to navigate the days as well. Double clicking on any day in the
+ small month calendar will move the current week view to that particular
+ week.
</para>
</sect2>
<sect2 id="calmonth">
<title>The Month View</title>
<para>
The Month View shows the entire month with brief detailed descriptions of
- your appointments. The Month View makes use of the customized colors
+ your appointments. The Month View makes use of the customized colors
available in the Calendar. You may read about how to set these colors in
- <xref Linkend="calsetup">. For any day with a brief description of an
- appointment you may click on the day to display a detailed description of
- the appointment in a pop-up window. If you would like to add an
- appointment to a day in the Month View you may right mouse click on any day
- and select the <guimenuitem>New Appointment in this day</guimenuitem> item
- from the <guimenu>pop-up</guimenu> menu. You may use the items in the
+ <xref Linkend="calsetup">. For any day with a brief description of an
+ appointment you may click on the day to display a detailed description of
+ the appointment in a pop-up window. If you would like to add an appointment
+ to a day in the Month View you may right mouse click on any day and select
+ the <guimenuitem>New Appointment in this day</guimenuitem> item from the
+ <guimenu>pop-up</guimenu> menu. You may use the items in the
<guimenu>pop-up</guimenu> menu to navigate in the Day, Week, and Year views
- by selecting either <guimenuitem>Jump to this day</guimenuitem>,
- <guimenuitem>Jump to this week</guimenuitem>, or <guimenuitem>Jump to this
+ by selecting either <guimenuitem>Jump to this day</guimenuitem>,
+ <guimenuitem>Jump to this week</guimenuitem>, or<guimenuitem>Jump to this
Year</guimenuitem>.
</para>
<figure>
@@ -372,20 +372,19 @@
<sect2 id="calyear">
<title>The Year View</title>
<para>
- The Year View shows you the entire year with no descriptions of
- appointments. Like the Month View, the Year View makes use of the
- customized colors available in the Calendar. You may read about
- how to set these colors in <xref Linkend="calsetup">. If you have
- an appointment on a day you may click on that day and a
- description of the appointment will be displayed in the pop-up
- window. If you would like to add an appointment to a day in the
- Year View you may right mouse click on any day and select the
- <guimenuitem>New Appointment in this day</guimenuitem> item from
- the <guimenu>pop-up</guimenu> menu. You may use the items in the
- <guimenu>pop-up</guimenu> menu to navigate in the Day, Week, and
- Month views by selecting either <guimenuitem>Jump to this
- day</guimenuitem>, <guimenuitem>Jump to this week</guimenuitem>,
- or <guimenuitem>Jump to this Month</guimenuitem>.
+ The Year View shows you the entire year with no descriptions of
+ appointments. Like the Month View, the Year View makes use of the
+ customized colors available in the Calendar. You may read about how to set
+ these colors in <xref Linkend="calsetup">. If you have an appointment on a
+ day you may click on that day and a description of the appointment will be
+ displayed in the pop-up window. If you would like to add an appointment to
+ a day in the Year View you may right mouse click on any day and select the
+ <guimenuitem>New Appointment in this day</guimenuitem> item from the
+ <guimenu>pop-up</guimenu> menu. You may use the items in the
+ <guimenu>pop-up</guimenu> menu to navigate in the Day, Week, and Month
+ views by selecting either <guimenuitem>Jump to this day</guimenuitem>,
+ <guimenuitem>Jump to this week</guimenuitem>, or <guimenuitem>Jump to this
+ Month</guimenuitem>.
</para>
<figure>
<title>The Year View</title>
@@ -401,10 +400,10 @@
<title>Making a New Appointment</title>
<para>
There are many methods for making a new appointment in the GNOME Calendar,
- the easiest by pressing the <guibutton>New</guibutton> button on the
+ the easiest is by pressing the <guibutton>New</guibutton> button on the
button bar. Whenever you make a new appointment you will launch the Create
New Appointment dialog that allows you to set the properties of that
- appointment. The Create New Appointment dialog is broken into two
+ appointment. The Create New Appointment dialog is broken into two
different tabs, the General and the Recurrence tabs.
</para>
<para>
@@ -414,20 +413,20 @@
<ITEMIZEDLIST MARK="bullet">
<listitem>
<para>
- Summary - The Summary box allows you to type a description of
- the appointment. Keep in mind that only a portion of this
- description will be available in the Week and Month Views.
+ Summary - The Summary box allows you to type a description of the
+ appointment. Keep in mind that only a portion of this description will
+ be available in the Week and Month Views.
</para>
</listitem>
<listitem>
<para>
Time - The Time area allows you to set the time range for the
- appointment by selecting the date and hours. To the right of the start
+ appointment by selecting the date and hours. To the right of the start
and end days there is a small selection box named Calendar. This will
bring up a small Calendar when pressed. You may select the start and end
- date in the small calendar. To the right of the start and end hours
+ date in the small calendar. To the right of the start en end hours
there is a small button which will display the hours of the day when
- pressed. Each hour in the list will have a sub menu displaying each
+ pressed. Each hour in the list will have a sub menu displaying each
quarter hour so you may select them. The hours are restricted to those
included in the Day Range.
</para>
@@ -437,10 +436,10 @@
Alarms - The Alarms area allows you to set up an alarm to remind you of
an appointment. There are four different types of alarms you may use to
remind yourself of appointments: Display, Audio, Program, and Mail. The
- Display alarm will display a message on your screen at the time you
- set. The Audio alarm will play an audio file at the time you set. The
+ Display alarm will display a message on your screen in the time you
+ set. The Audio alarm will play an audio file at the time you set. The
Program alarm will run a program you specify at the time you set. The
- Mail alarm will send email to the user specified at the time you set.
+ Mail alarm will send email to the user specified at the time you set.
</para>
</listitem>
<!-- <listitem>
@@ -451,11 +450,11 @@
</itemizedlist>
</para>
<para>
- Recurrence - The Recurrence tab allows you to specify how often an
- appointment should recur, if at all. The first property you should set if
- you want a recurring appointment is the Recurrence rule. You may choose
+ Recurrence - The Recurrence tab allows you to specify how often an
+ appointment should recur, if at all. The first property you should set if
+ you want a recurring appointment is the Recurrence rule. You may choose
among None, Daily, Weekly, Monthly, and Yearly. For each selection you may
- adjust the recurrence properties for your selection. In the Ending date
+ adjust the recurrence properties for your selection. In the Ending date
area you may set a rule which will stop the recurrence of your appointment
or allow it to repeat forever. In the Exceptions area you may make
exceptions to the recurring appointment by double-clicking the date and
@@ -463,4 +462,4 @@
</para>
</sect1>
</chapter>
-</book> \ No newline at end of file
+</book>