aboutsummaryrefslogtreecommitdiffstats
path: root/views
diff options
context:
space:
mode:
Diffstat (limited to 'views')
-rw-r--r--views/.cvsignore2
-rw-r--r--views/ChangeLog96
-rw-r--r--views/Makefile.am4
-rw-r--r--views/addressbook/.cvsignore2
-rw-r--r--views/addressbook/Address_Cards.galview2
-rw-r--r--views/addressbook/By_Company.galview14
-rw-r--r--views/addressbook/Makefile.am8
-rw-r--r--views/addressbook/Phone_List.galview14
-rw-r--r--views/addressbook/galview.xml2
-rw-r--r--views/calendar/.cvsignore2
-rw-r--r--views/calendar/List_View.galview (renamed from views/tasks/With_Category.galview)5
-rw-r--r--views/calendar/Makefile.am8
-rw-r--r--views/calendar/galview.xml2
-rw-r--r--views/mail/.cvsignore2
-rw-r--r--views/mail/Makefile.am8
-rw-r--r--views/mail/Wide_View_Normal.galview7
-rw-r--r--views/mail/Wide_View_Sent.galview7
-rw-r--r--views/mail/galview.xml14
-rw-r--r--views/memos/Makefile.am5
-rw-r--r--views/memos/Memos.galview7
-rw-r--r--views/memos/galview.xml4
-rw-r--r--views/tasks/.cvsignore2
-rw-r--r--views/tasks/Makefile.am8
-rw-r--r--views/tasks/Tasks.galview6
-rw-r--r--views/tasks/With_DueDate.galview8
-rw-r--r--views/tasks/With_Status.galview8
-rw-r--r--views/tasks/galview.xml3
27 files changed, 100 insertions, 150 deletions
diff --git a/views/.cvsignore b/views/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/views/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/views/ChangeLog b/views/ChangeLog
deleted file mode 100644
index 258fc2fabd..0000000000
--- a/views/ChangeLog
+++ /dev/null
@@ -1,96 +0,0 @@
-2002-07-10 Ettore Perazzoli <ettore@ximian.com>
-
- * tasks/galview.xml: Add accelerators. [#10069]
-
-2002-07-10 Ettore Perazzoli <ettore@ximian.com>
-
- * calendar/galview.xml: Add accelerators. [#10067]
-
-2002-07-10 Ettore Perazzoli <ettore@ximian.com>
-
- * addressbook/galview.xml: Add accelerators. [#10068]
-
-2002-02-12 Jeffrey Stedfast <fejj@ximian.com>
-
- * mail/galview.xml: Offer the new By Follow Up Flag view.
-
- * mail/By_Follow_Up_Flag.galview: New galview for Follow Up Flag.
-
-2002-02-13 Christopher James Lahey <clahey@ximian.com>
-
- * addressbook/Makefile.am (defaultaddressbook_DATA): Added
- Address_Cards.galview.
-
- * addressbook/Address_Cards.galview: New galview file for the
- minicard view since they save data now.
-
-2002-02-07 Christopher James Lahey <clahey@ximian.com>
-
- * addressbook/galview.xml, calendar/galview.xml, mail/galview.xml,
- tasks/galview.xml: Added default-view parameters.
-
- * mail/As_Sent_Folder.galview: New galview.
-
- * mail/Makefile.am, mail/galview.xml: Added As_Sent_Folder
- galview.
-
-2001-10-21 Christopher James Lahey <clahey@ximian.com>
-
- * addressbook/By_Company.galview: Group by the correct column.
-
- * addressbook/By_Company.galview, addressbook/Phone_List.galview:
- Updated both sets of columns here to make more sense.
-
-2001-10-05 Christopher James Lahey <clahey@ximian.com>
-
- * mail/By_Sender.galview, mail/By_Status.galview,
- mail/By_Subject.galview: Fixed these. Fixes Ximian bug #6803.
-
-2001-06-15 Federico Mena Quintero <federico@ximian.com>
-
- * calendar/galview.xml: New list of the default calendar views.
-
-2001-05-21 Chris Toshok <toshok@ximian.com>
-
- * addressbook/galview.xml: correct typo.
-
-2001-04-11 Christopher James Lahey <clahey@ximian.com>
-
- * addressbook/galview.xml, mail/galview.xml, tasks/galview.xml:
- Translate the titles here.
-
-2001-03-04 Christopher James Lahey <clahey@ximian.com>
-
- * addressbook/By_Company.galview: New view.
-
- * addressbook/Makefile.am: Added By_Company.galview.
-
- * addressbook/Phone_List.galview: Updated this a bit.
-
- * addressbook/galview.xml: Added By Company and Address Cards (No
- Address_Cards.galview is required for now.)
-
-2001-03-04 Christopher James Lahey <clahey@ximian.com>
-
- * addressbook/.cvsignore, addressbook/Makefile.am,
- addressbook/Phone_List.galview, addressbook/galview.xml: Added a
- built in view menu for addressbook.
-
-2001-03-04 Christopher James Lahey <clahey@ximian.com>
-
- * mail/By_Sender.galview, mail/By_Subject.galview: Corrected these
- views a bit.
-
- * mail/By_Status.galview, mail/Messages.galview: New views for "By
- Status" and "Messages".
-
- * mail/Makefile.am, mail/galview.xml: Added By_Status.galview and
- Messages.galview.
-
-2001-03-01 Christopher James Lahey <clahey@ximian.com>
-
- * .cvsignore, Makefile.am, mail/.cvsignore,
- mail/By_Sender.galview, mail/By_Subject.galview, mail/Makefile.am,
- mail/galview.xml, tasks/.cvsignore, tasks/Makefile.am,
- tasks/Tasks.galview, tasks/With_Category.galview,
- tasks/galview.xml: Builtin View menus for tasks and mail.
diff --git a/views/Makefile.am b/views/Makefile.am
index f6439105cc..24c8b2f465 100644
--- a/views/Makefile.am
+++ b/views/Makefile.am
@@ -1 +1,3 @@
-SUBDIRS = addressbook mail tasks calendar
+SUBDIRS = addressbook mail tasks calendar memos
+
+-include $(top_srcdir)/git.mk
diff --git a/views/addressbook/.cvsignore b/views/addressbook/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/views/addressbook/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/views/addressbook/Address_Cards.galview b/views/addressbook/Address_Cards.galview
index 4f6a865a1e..70466da8a2 100644
--- a/views/addressbook/Address_Cards.galview
+++ b/views/addressbook/Address_Cards.galview
@@ -1,2 +1,2 @@
<?xml version="1.0"?>
-<EMinicardViewState column_width="150.0"/>
+<EMinicardViewState column_width="225.0"/>
diff --git a/views/addressbook/By_Company.galview b/views/addressbook/By_Company.galview
index e658639226..5d28aec02f 100644
--- a/views/addressbook/By_Company.galview
+++ b/views/addressbook/By_Company.galview
@@ -1,16 +1,12 @@
<?xml version="1.0"?>
<ETableState state-version="0.100000">
- <column source="1"/>
- <column source="31"/>
- <column source="8"/>
<column source="0"/>
- <column source="29"/>
+ <column source="1"/>
<column source="5"/>
- <column source="14"/>
- <column source="8"/>
- <column source="12"/>
+ <column source="23"/>
+ <column source="36"/>
<grouping>
- <group column="9" ascending="true"/>
- <leaf column="0" ascending="true"/>
+ <group column="35" ascending="true"/>
+ <leaf column="2" ascending="true"/>
</grouping>
</ETableState>
diff --git a/views/addressbook/Makefile.am b/views/addressbook/Makefile.am
index e7e055ef6c..b83bcf2a76 100644
--- a/views/addressbook/Makefile.am
+++ b/views/addressbook/Makefile.am
@@ -1,3 +1,5 @@
-defaultaddressbookdir = $(datadir)/evolution/views/addressbook
-defaultaddressbook_DATA = Address_Cards.galview By_Company.galview Phone_List.galview galview.xml
-EXTRA_DIST = $(defaultaddressbook_DATA)
+addressviewsdir = $(viewsdir)/addressbook
+addressviews_DATA = Address_Cards.galview By_Company.galview Phone_List.galview galview.xml
+EXTRA_DIST = $(addressviews_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/views/addressbook/Phone_List.galview b/views/addressbook/Phone_List.galview
index b9e2b1a553..3c091df1ad 100644
--- a/views/addressbook/Phone_List.galview
+++ b/views/addressbook/Phone_List.galview
@@ -1,13 +1,13 @@
<?xml version="1.0"?>
<ETableState state-version="0.100000">
- <column source="0"/>
- <column source="9"/>
- <column source="2"/>
+ <column source="1"/>
<column source="5"/>
- <column source="14"/>
- <column source="8"/>
- <column source="12"/>
+ <column source="9"/>
+ <column source="15"/>
+ <column source="11"/>
+ <column source="17"/>
+ <column source="19"/>
<grouping>
- <leaf column="0" ascending="true"/>
+ <leaf column="4" ascending="true"/>
</grouping>
</ETableState>
diff --git a/views/addressbook/galview.xml b/views/addressbook/galview.xml
index b8f5ef81dd..39c9b3ad59 100644
--- a/views/addressbook/galview.xml
+++ b/views/addressbook/galview.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<GalViewCollection default-view="Address_Cards">
<GalView id="Address_Cards" _title="_Address Cards" filename="Address_Cards.galview" type="minicard"/>
- <GalView id="Phone_List" _title="_Phone List" filename="Phone_List.galview" type="etable"/>
+ <GalView id="Phone_List" _title="_List View" filename="Phone_List.galview" type="etable"/>
<GalView id="By_Company" _title="By _Company" filename="By_Company.galview" type="etable"/>
</GalViewCollection>
diff --git a/views/calendar/.cvsignore b/views/calendar/.cvsignore
deleted file mode 100644
index 3dda72986f..0000000000
--- a/views/calendar/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile.in
-Makefile
diff --git a/views/tasks/With_Category.galview b/views/calendar/List_View.galview
index 270bd2ea3f..83ea13ca59 100644
--- a/views/tasks/With_Category.galview
+++ b/views/calendar/List_View.galview
@@ -1,8 +1,7 @@
<?xml version="1.0"?>
<ETableState state-version="0.100000">
- <column source="13"/>
- <column source="14"/>
- <column source="9"/>
+ <column source="2"/>
<column source="0"/>
+ <column source="1"/>
<grouping/>
</ETableState>
diff --git a/views/calendar/Makefile.am b/views/calendar/Makefile.am
index f993c4e036..ef82dd7425 100644
--- a/views/calendar/Makefile.am
+++ b/views/calendar/Makefile.am
@@ -1,5 +1,7 @@
-defaultcalendardir = $(datadir)/evolution/views/calendar
+calendarviewsdir = $(viewsdir)/calendar
-defaultcalendar_DATA = galview.xml
+calendarviews_DATA = List_View.galview galview.xml
-EXTRA_DIST = $(defaultcalendar_DATA)
+EXTRA_DIST = $(calendarviews_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/views/calendar/galview.xml b/views/calendar/galview.xml
index 572ad0cc87..4654217a29 100644
--- a/views/calendar/galview.xml
+++ b/views/calendar/galview.xml
@@ -8,4 +8,6 @@
type="week_view"/>
<GalView id="Month_View" _title="_Month View" filename="Month_View.galview"
type="month_view"/>
+ <GalView id="List_View" _title="_List View" filename="List_View.galview"
+ type="etable"/>
</GalViewCollection>
diff --git a/views/mail/.cvsignore b/views/mail/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/views/mail/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/views/mail/Makefile.am b/views/mail/Makefile.am
index c6b9726ae4..02c69e5153 100644
--- a/views/mail/Makefile.am
+++ b/views/mail/Makefile.am
@@ -1,3 +1,5 @@
-defaultmaildir = $(datadir)/evolution/views/mail
-defaultmail_DATA = As_Sent_Folder.galview By_Sender.galview By_Status.galview By_Subject.galview Messages.galview By_Follow_Up_Flag.galview galview.xml
-EXTRA_DIST = $(defaultmail_DATA)
+mailviewsdir = $(viewsdir)/mail
+mailviews_DATA = As_Sent_Folder.galview By_Sender.galview By_Status.galview By_Subject.galview Messages.galview By_Follow_Up_Flag.galview galview.xml Wide_View_Normal.galview Wide_View_Sent.galview
+EXTRA_DIST = $(mailviews_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/views/mail/Wide_View_Normal.galview b/views/mail/Wide_View_Normal.galview
new file mode 100644
index 0000000000..9baed882a6
--- /dev/null
+++ b/views/mail/Wide_View_Normal.galview
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<ETableState state-version="0.100000000000000">
+ <column source="0"/>
+ <column source="1"/>
+ <column source="16"/>
+ <grouping/>
+</ETableState>
diff --git a/views/mail/Wide_View_Sent.galview b/views/mail/Wide_View_Sent.galview
new file mode 100644
index 0000000000..1f1e488550
--- /dev/null
+++ b/views/mail/Wide_View_Sent.galview
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<ETableState state-version="0.100000000000000">
+ <column source="0"/>
+ <column source="1"/>
+ <column source="17"/>
+ <grouping/>
+</ETableState>
diff --git a/views/mail/galview.xml b/views/mail/galview.xml
index c92bbc2aeb..11fe5fc61d 100644
--- a/views/mail/galview.xml
+++ b/views/mail/galview.xml
@@ -1,9 +1,11 @@
<?xml version="1.0"?>
<GalViewCollection default-view="Messages">
- <GalView id="Messages" _title="Messages" filename="Messages.galview" type="etable"/>
- <GalView id="As_Sent_Folder" _title="As Sent Folder" filename="As_Sent_Folder.galview" type="etable"/>
- <GalView id="By_Subject" _title="By Subject" filename="By_Subject.galview" type="etable"/>
- <GalView id="By_Sender" _title="By Sender" filename="By_Sender.galview" type="etable"/>
- <GalView id="By_Status" _title="By Status" filename="By_Status.galview" type="etable"/>
- <GalView id="By_Follow_Up_Flag" _title="By Follow Up Flag" filename="By_Follow_Up_Flag.galview" type="etable"/>
+ <GalView id="Messages" _title="_Messages" filename="Messages.galview" type="etable"/>
+ <GalView id="As_Sent_Folder" _title="As _Sent Folder" filename="As_Sent_Folder.galview" type="etable"/>
+ <GalView id="By_Subject" _title="By Su_bject" filename="By_Subject.galview" type="etable"/>
+ <GalView id="By_Sender" _title="By Se_nder" filename="By_Sender.galview" type="etable"/>
+ <GalView id="By_Status" _title="By S_tatus" filename="By_Status.galview" type="etable"/>
+ <GalView id="By_Follow_Up_Flag" _title="By _Follow Up Flag" filename="By_Follow_Up_Flag.galview" type="etable"/>
+ <GalView id="Wide_View_Normal" _title="For _Wide View" filename="Wide_View_Normal.galview" type="etable"/>
+ <GalView id="Wide_View_Sent" _title="As Sent Folder for Wi_de View" filename="Wide_View_Sent.galview" type="etable"/>
</GalViewCollection>
diff --git a/views/memos/Makefile.am b/views/memos/Makefile.am
new file mode 100644
index 0000000000..1385004dc9
--- /dev/null
+++ b/views/memos/Makefile.am
@@ -0,0 +1,5 @@
+memosviewsdir = $(viewsdir)/memos
+memosviews_DATA = Memos.galview galview.xml
+EXTRA_DIST = $(memosviews_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/views/memos/Memos.galview b/views/memos/Memos.galview
new file mode 100644
index 0000000000..ac19a0daa4
--- /dev/null
+++ b/views/memos/Memos.galview
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<ETableState state-version="0.100000">
+ <column source="1"/>
+ <column source="0"/>
+ <column source="2"/>
+ <grouping></grouping>
+</ETableState>
diff --git a/views/memos/galview.xml b/views/memos/galview.xml
new file mode 100644
index 0000000000..b06be9c64a
--- /dev/null
+++ b/views/memos/galview.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<GalViewCollection default-view="Memos">
+ <GalView id="Memos" _title="_Memos" filename="Memos.galview" type="etable"/>
+</GalViewCollection>
diff --git a/views/tasks/.cvsignore b/views/tasks/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/views/tasks/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/views/tasks/Makefile.am b/views/tasks/Makefile.am
index 306e63cbca..eaef1dbd93 100644
--- a/views/tasks/Makefile.am
+++ b/views/tasks/Makefile.am
@@ -1,3 +1,5 @@
-defaulttasksdir = $(datadir)/evolution/views/tasks
-defaulttasks_DATA = Tasks.galview With_Category.galview galview.xml
-EXTRA_DIST = $(defaulttasks_DATA)
+tasksviewsdir = $(viewsdir)/tasks
+tasksviews_DATA = Tasks.galview With_DueDate.galview With_Status.galview galview.xml
+EXTRA_DIST = $(tasksviews_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/views/tasks/Tasks.galview b/views/tasks/Tasks.galview
index 090c3e524e..9cbc7f9ce7 100644
--- a/views/tasks/Tasks.galview
+++ b/views/tasks/Tasks.galview
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<ETableState state-version="0.100000">
- <column source="13"/>
- <column source="14"/>
- <column source="9"/>
+ <column source="1"/>
+ <column source="4"/>
+ <column source="2"/>
<grouping/>
</ETableState>
diff --git a/views/tasks/With_DueDate.galview b/views/tasks/With_DueDate.galview
new file mode 100644
index 0000000000..0b60475cca
--- /dev/null
+++ b/views/tasks/With_DueDate.galview
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<ETableState state-version="0.100000">
+ <column source="1"/>
+ <column source="4"/>
+ <column source="2"/>
+ <column source="5"/>
+ <grouping/>
+</ETableState>
diff --git a/views/tasks/With_Status.galview b/views/tasks/With_Status.galview
new file mode 100644
index 0000000000..d9978b6b2d
--- /dev/null
+++ b/views/tasks/With_Status.galview
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<ETableState state-version="0.100000">
+ <column source="1"/>
+ <column source="4"/>
+ <column source="2"/>
+ <column source="8"/>
+ <grouping/>
+</ETableState>
diff --git a/views/tasks/galview.xml b/views/tasks/galview.xml
index 6f32e821f8..0091adc72b 100644
--- a/views/tasks/galview.xml
+++ b/views/tasks/galview.xml
@@ -1,5 +1,6 @@
<?xml version="1.0"?>
<GalViewCollection default-view="Tasks">
<GalView id="Tasks" _title="_Tasks" filename="Tasks.galview" type="etable"/>
- <GalView id="With_Category" _title="With _Category" filename="With_Category.galview" type="etable"/>
+ <GalView id="With_DueDate" _title="With _Due Date" filename="With_DueDate.galview" type="etable"/>
+ <GalView id="With_Status" _title="With _Status" filename="With_Status.galview" type="etable"/>
</GalViewCollection>