[evolution-patches] Patch to replace vFolder with the term Search Folder
- From: Rodney Dawes <dobey novell com>
- To: evolution-patches lists ximian com
- Subject: [evolution-patches] Patch to replace vFolder with the term Search Folder
- Date: Wed, 27 Jul 2005 12:15:28 -0400
This patch replaces the usage of the term vFolder in the UI, with the
term "Search Folder", and also in a few code comments.
-- dobey
Index: help/C/evolution.xml
===================================================================
RCS file: /cvs/gnome/evolution/help/C/evolution.xml,v
retrieving revision 1.6
diff -u -p -r1.6 evolution.xml
--- help/C/evolution.xml 15 Mar 2005 02:51:47 -0000 1.6
+++ help/C/evolution.xml 27 Jul 2005 16:00:55 -0000
@@ -82,7 +82,7 @@
<title>Getting Started</title>
<para>Evolution™ makes the tasks of storing, organizing, and retrieving your personal information easy, so you can work and communicate more effectively with others. It's a highly evolved <link linkend="groupware">groupware</link> program, an integral part of the Internet-connected desktop.</para>
<para>Evolution can help you work in a group by handling e-mail, address, and other contact information, and one or more calendars. It can do that on one or several computers, connected directly or over a network, for one person or for large groups.</para>
- <para>With Evolution, you can accomplish your most common daily tasks quickly. For example, it takes only one or two clicks to enter appointment or contact information sent to you by e-mail, or to send e-mail to a contact or appointment. People who get lots of e-mail will appreciate advanced features like <link linkend="vfolder">vFolders</link>, which let you save searches as though they were ordinary e-mail folders.</para>
+ <para>With Evolution, you can accomplish your most common daily tasks quickly. For example, it takes only one or two clicks to enter appointment or contact information sent to you by e-mail, or to send e-mail to a contact or appointment. People who get lots of e-mail will appreciate advanced features like <link linkend="vfolder">Search Folders</link>, which let you save searches as though they were ordinary e-mail folders.</para>
<itemizedlist>
<listitem>
<para><link linkend="usage-mainwindow-starting">Starting Evolution for the First Time</link></para>
@@ -681,7 +681,7 @@
<section id="usage-mainwindow-shortcutbar">
<title>The Shortcut Bar</title>
<para>Evolution's most important job is to give you access to your information and help you use it quickly. One way it does that is through the shortcut bar, which is the column on the left side of the main window. The buttons, such as Mail and Contacts, are the shortcuts. Above them is a list of folders for the current Evolution tool.</para>
- <para>The folder list organizes your e-mail, calendars, contact lists, and task lists in a tree, similar to a <link linkend="filetree">file tree</link>. Most people will find one to four folders at the base of the tree, depending on the tool and their system configuration. Each Evolution tool has at least one, called On This Computer, for local information. For example, the folder list for the e-mail tool shows any remote e-mail storage you have set up, plus local folders and vFolders, or virtual folders, which are discussed in <link linkend="usage-mail-organize-vfolders">Using vFolders</link>. </para>
+ <para>The folder list organizes your e-mail, calendars, contact lists, and task lists in a tree, similar to a <link linkend="filetree">file tree</link>. Most people will find one to four folders at the base of the tree, depending on the tool and their system configuration. Each Evolution tool has at least one, called On This Computer, for local information. For example, the folder list for the e-mail tool shows any remote e-mail storage you have set up, plus local folders and Search Folders, or Search Folders, which are discussed in <link linkend="usage-mail-organize-vfolders">Using Search Folders</link>. </para>
<para>If you get large amounts of e-mail, you might want more folders than just your Inbox. You can create multiple calendar, task, or contacts folders. </para>
<para>To create a new folder:</para>
<orderedlist>
@@ -752,14 +752,14 @@
<para>It lets you guard your privacy with encryption.</para>
</listitem>
</itemizedlist>
- <para>However, Evolution has some important differences from other e-mail programs. First, it's built to handle very large amounts of e-mail. The <link linkend="usage-mail-organize-spam">junk e-mail</link>, message <link linkend="usage-mail-organize-filters">filtering</link> and <link linkend="usage-mail-organize-search">searching</link> functions were built for speed and efficiency. There's also the <link linkend="usage-mail-organize-vfolders">vFolder</link>, an advanced organizational feature not found in some e-mail clients. If you get a lot of e-mail, or if you keep every message you get in case you need to refer to it later, you'll find this feature especially useful. Here's a quick explanation of what's happening in your main Evolution e-mail window. </para>
+ <para>However, Evolution has some important differences from other e-mail programs. First, it's built to handle very large amounts of e-mail. The <link linkend="usage-mail-organize-spam">junk e-mail</link>, message <link linkend="usage-mail-organize-filters">filtering</link> and <link linkend="usage-mail-organize-search">searching</link> functions were built for speed and efficiency. There's also the <link linkend="usage-mail-organize-vfolders">Search Folder</link>, an advanced organizational feature not found in some e-mail clients. If you get a lot of e-mail, or if you keep every message you get in case you need to refer to it later, you'll find this feature especially useful. Here's a quick explanation of what's happening in your main Evolution e-mail window. </para>
<mediaobject id="usage-mail-intro-fig"><imageobject><imagedata format="PNG" fileref="figures/evo_email_a.png"/></imageobject></mediaobject>
<bridgehead id="bt4ckee">Message list</bridgehead>
<para>The message list displays all the e-mails that you have. This includes all your read and unread messages, and e-mail that is flagged to be deleted.</para>
<bridgehead id="bt4ckef">Preview pane</bridgehead>
<para>This is where your e-mail is displayed.</para>
<para>If you find the view pane too small, you can resize the pane, enlarge the whole window, or double-click the message in the message list to have it open in a new window. To change the size of a pane, drag on the divider between the two panes. </para>
- <para>As with folders, you can right-click messages in the message list and get a menu of possible actions, including moving or deleting them, creating filters or vFolders based on them, and marking them as junk mail.</para>
+ <para>As with folders, you can right-click messages in the message list and get a menu of possible actions, including moving or deleting them, creating filters or Search Folders based on them, and marking them as junk mail.</para>
<para>Most of the e-mail-related actions you want to perform are listed in the Actions menu in the menu bar. The most frequently used ones, like Reply and Forward, also appear as buttons in the toolbar. Most of them are also located in the right-click menu and as keyboard shortcuts.</para>
<para>For an in-depth guide to the e-mail capabilities of Evolution, read <link linkend="usage-mail">Sending and Receiving E-Mail</link>.</para>
</section>
@@ -916,7 +916,7 @@
<para>After you read your mail, you might want to delete it. To delete a message, select it and press the Delete key, click the Trash button, press Ctrl+D, or right-click the message, then click Delete. </para>
<para>When you press Delete or click the Trash button, your mail isn’t actually deleted, but is marked for deletion. Your e-mail is recoverable until you have expunged your mail. When you expunge a folder, you remove all the mail that you have marked for deletion. To show deleted messages, click View > Hide Deleted Messages. You can also find deleted messages in the your Trash folder. </para>
<para>To permanently erase all the deleted messages in a folder, click Actions > Expunge or press Ctrl+E. To expunge all folders at once, click Actions > Empty Trash.</para>
- <para>Both local and IMAP Trash folders are actually vFolders that display all messages you have marked for later deletion. For more information about vFolders, see <link linkend="usage-mail-organize-vfolders">Using vFolders</link>. Because emptying your trash expunges the messages in your Trash folder, emptying Trash is the same as expunging deleted mail from all your folders.</para>
+ <para>Both local and IMAP Trash folders are actually Search Folders that display all messages you have marked for later deletion. For more information about Search Folders, see <link linkend="usage-mail-organize-vfolders">Using Search Folders</link>. Because emptying your trash expunges the messages in your Trash folder, emptying Trash is the same as expunging deleted mail from all your folders.</para>
<para>However, this is not true for the Trash folder on Exchange servers, which behaves just the same as it does in Outlook. It is a normal folder with actual messages in it.</para>
</section>
@@ -1820,7 +1820,7 @@
<para>The Flag itself is the action you want to remind yourself about. Several are provided for you, such as Call, Forward, and Reply, but you can enter your own note or action if you want. You can set a deadline for the flag as well.</para>
<para>After you have added a flag, you can mark it as complete or remove it entirely by right-clicking the message, then click either Flag Completed or Clear Flag.</para>
<para>When you read a flagged message, its flag status is displayed at the top, before the message headers. An overdue message might tell you “Overdue: Call by April 07, 2003, 5:00 PM.”</para>
- <para>Flags can help you organize your work in a number of ways. For example, you might add a Flag Status column to your message list and sort that way. Alternately, you could create a vFolder that displays all your flagged messages, then clear the flags when you're done, so the vFolder contains only messages with upcoming deadlines.</para>
+ <para>Flags can help you organize your work in a number of ways. For example, you might add a Flag Status column to your message list and sort that way. Alternately, you could create a Search Folder that displays all your flagged messages, then clear the flags when you're done, so the Search Folder contains only messages with upcoming deadlines.</para>
<para>If you prefer a simpler way to remind yourself about messages, you can mark them as Important by right-clicking the message, then click Mark Important.</para>
</section>
</section>
@@ -1871,7 +1871,7 @@
<para>Searches the message body and all headers for the specified text.</para>
</formalpara>
<para>When you've typed your search phrase, press Enter or click the Find Now button. Evolution will shows your search results in the message list.</para>
- <para>For more complex search rules, select Advanced from the Search menu. You might want to create a vFolder instead; see <link linkend="usage-mail-organize-vfolders">Using vFolders</link> for more detail.</para>
+ <para>For more complex search rules, select Advanced from the Search menu. You might want to create a Search Folder instead; see <link linkend="usage-mail-organize-vfolders">Using Search Folders</link> for more detail.</para>
<para>When you have finished searching, go back to seeing all your messages by clicking the Clear button, or by entering a blank search.</para>
</section>
@@ -2083,7 +2083,7 @@
<para>Click OK twice.</para>
</listitem>
</orderedlist>
- <para>There is an easy shortcut for fast filter or vFolder creation. </para>
+ <para>There is an easy shortcut for fast filter or Search Folder creation. </para>
<orderedlist>
<listitem id="bsh2232">
<para>Right-click the message in the e-mail list.</para>
@@ -2130,16 +2130,16 @@
</section>
<section id="usage-mail-organize-vfolders">
- <title>Using vFolders</title>
- <para>If filters aren't flexible enough, or you find yourself performing the same search again and again, consider a vFolder. vFolders, or virtual folders, are an advanced way of viewing your e-mail messages within Evolution. If you get a lot of mail or often forget where you put messages, vFolders can help you keep things organized.</para>
- <para>A vFolder is really a hybrid of all the other organizational tools: it looks like a folder, it acts like a search, and you set it up like a filter. In other words, a conventional folder actually contains messages, but a vFolder is a view of messages that might be in several different folders. The messages it contains are determined on the fly using a set of criteria you choose in advance.</para>
- <para>As messages that meet the vFolder criteria arrive or are deleted, Evolution automatically adjusts the vFolder contents. When you delete a message, it is erased from the folder in which it actually exists, as well as any vFolders that display it.</para>
- <para>The Unmatched vFolder is the opposite of other vFolders: it displays all messages that do not appear in other vFolders.</para>
- <para>If you use remote e-mail storage like IMAP or Microsoft Exchange, and have created vFolders to search through them, the Unmatched vFolder also searches the remote folders. If you do not create any vFolders that search remote mail stores, the Unmatched vFolder does not search in them either.</para>
- <para>As an example of using folders, searches, and vFolders, consider the following: To organize his mailbox, Jim sets up a virtual folder for e-mail from his friend and co-worker Anna. He has another vFolder for messages that have novell.com in the address and Evolution in the subject line, so he can keep a record of what people from work send him about Evolution. If Anna sends him a message about anything other than Evolution, it only shows up in the “Anna” vFolder. When Anna sends him mail about the user interface for Evolution, he can see the message both in the “Anna” vFolder and in the “Internal Evolution Discussion” vFolder. </para>
+ <title>Using Search Folders</title>
+ <para>If filters aren't flexible enough, or you find yourself performing the same search again and again, consider a Search Folder. Search Folders, or Search Folders, are an advanced way of viewing your e-mail messages within Evolution. If you get a lot of mail or often forget where you put messages, Search Folders can help you keep things organized.</para>
+ <para>A Search Folder is really a hybrid of all the other organizational tools: it looks like a folder, it acts like a search, and you set it up like a filter. In other words, a conventional folder actually contains messages, but a Search Folder is a view of messages that might be in several different folders. The messages it contains are determined on the fly using a set of criteria you choose in advance.</para>
+ <para>As messages that meet the Search Folder criteria arrive or are deleted, Evolution automatically adjusts the Search Folder contents. When you delete a message, it is erased from the folder in which it actually exists, as well as any Search Folders that display it.</para>
+ <para>The Unmatched Search Folder is the opposite of other Search Folders: it displays all messages that do not appear in other Search Folders.</para>
+ <para>If you use remote e-mail storage like IMAP or Microsoft Exchange, and have created Search Folders to search through them, the Unmatched Search Folder also searches the remote folders. If you do not create any Search Folders that search remote mail stores, the Unmatched Search Folder does not search in them either.</para>
+ <para>As an example of using folders, searches, and Search Folders, consider the following: To organize his mailbox, Jim sets up a Search Folder for e-mail from his friend and co-worker Anna. He has another Search Folder for messages that have novell.com in the address and Evolution in the subject line, so he can keep a record of what people from work send him about Evolution. If Anna sends him a message about anything other than Evolution, it only shows up in the “Anna” Search Folder. When Anna sends him mail about the user interface for Evolution, he can see the message both in the “Anna” Search Folder and in the “Internal Evolution Discussion” Search Folder. </para>
<section id="vfolder-create">
- <title>Creating A vFolder</title>
+ <title>Creating A Search Folder</title>
<orderedlist>
<listitem id="bsazs7h">
<para>Click Tools > Virtual Folder Editor.</para>
@@ -2150,7 +2150,7 @@
</listitem>
<listitem id="bsazsbo">
- <para>Type the name of the vFolder in the Rule Name field.</para>
+ <para>Type the name of the Search Folder in the Rule Name field.</para>
</listitem>
<listitem id="bsazsjd">
<para>Select your search criteria. For each criterion, you must first select which of the following parts of the message you want the search to examine. The criteria are similar to those for filters.</para>
@@ -2212,22 +2212,22 @@
</formalpara>
</listitem>
<listitem id="bsazxjk">
- <para>Select the folders where this vFolder will search. Your options are:</para>
+ <para>Select the folders where this Search Folder will search. Your options are:</para>
<formalpara id="bsmr7jw">
<title>Specific Folders Only: </title>
- <para>Uses individual folders for the vFolder source.</para>
+ <para>Uses individual folders for the Search Folder source.</para>
</formalpara>
<formalpara id="bsmr82i">
<title>With All Local Folders: </title>
- <para>Uses all local folders for the vFolder source in addition to individual folders that are selected.</para>
+ <para>Uses all local folders for the Search Folder source in addition to individual folders that are selected.</para>
</formalpara>
<formalpara id="bsmr8jg">
<title>With All Active Remote Folders: </title>
- <para>Remote folders are considered active if you are connected to the server; you must be connected to your mail server for the vFolder to include any messages from that source in addition to individual folders that are selected.</para>
+ <para>Remote folders are considered active if you are connected to the server; you must be connected to your mail server for the Search Folder to include any messages from that source in addition to individual folders that are selected.</para>
</formalpara>
<formalpara id="bsmr8zu">
<title>With All Local and Active Remote Folders: </title>
- <para>Uses all local and active remote folders for the vFolder source in addition to individual folders that are selected.</para>
+ <para>Uses all local and active remote folders for the Search Folder source in addition to individual folders that are selected.</para>
</formalpara>
</listitem>
<listitem id="bsazxwc">
@@ -4079,7 +4079,7 @@ Accepting and Replying to a Meeting Requ
<bridgehead id="bt4ckgc">Opening a Message In a New Window</bridgehead>
<para>Double-click the message you want to view, or select it and press Enter or Ctrl+O. </para>
<bridgehead id="bt4ckgd">Creating Filters and Virtual Folders</bridgehead>
- <para>Right-click a message and select Create Rule From Message. You can also create filters and virtual folders in the Tools menu. </para>
+ <para>Right-click a message and select Create Rule From Message. You can also create filters and Search Folders in the Tools menu. </para>
<bridgehead id="bt4ckge">Adding a Sender to the Address Book</bridgehead>
<para>Right-click a message and select Add Sender to Address Book. You can also right-click on any e-mail address to add it to your address book. </para>
</section>
@@ -4332,13 +4332,13 @@ Accepting and Replying to a Meeting Requ
<glossentry id="vcard">
<glossterm>vCard</glossterm>
<glossdef>
- <para>A file format for the exchange of contact information. When you get an address card attached to an e-mail, it's probably in vCard format. Contrast with vFolder.</para>
+ <para>A file format for the exchange of contact information. When you get an address card attached to an e-mail, it's probably in vCard format. Contrast with Search Folder.</para>
</glossdef>
</glossentry>
<glossentry id="vfolder">
- <glossterm>vFolder</glossterm>
+ <glossterm>Search Folder</glossterm>
<glossdef>
- <para>An e-mail organization tool. vFolders allow you to create a folder that contains the results of a complex search. vFolder contents are updated dynamically.</para>
+ <para>An e-mail organization tool. Search Folders allow you to create a folder that contains the results of a complex search. Search Folder contents are updated dynamically.</para>
</glossdef>
</glossentry>
</glossary>
@@ -4375,4 +4375,4 @@ Accepting and Replying to a Meeting Requ
<member>All third-party trademarks are the property of their respective owners.</member>
</simplelist>
</appendix>
-</book>
\ No newline at end of file
+</book>
Index: mail/em-folder-browser.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-folder-browser.c,v
retrieving revision 1.65
diff -u -p -r1.65 em-folder-browser.c
--- mail/em-folder-browser.c 21 Jul 2005 07:08:45 -0000 1.65
+++ mail/em-folder-browser.c 27 Jul 2005 16:00:55 -0000
@@ -131,7 +131,7 @@ static ESearchBarItem emfb_search_items[
E_FILTERBAR_SAVE,
E_FILTERBAR_EDIT,
{ NULL, 0, NULL },
- { N_("Create _vFolder From Search..."), ESB_SAVE, NULL },
+ { N_("C_reate Search Folder From Search..."), ESB_SAVE, NULL },
{ NULL, -1, NULL }
};
Index: mail/em-folder-tree-model.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-folder-tree-model.c,v
retrieving revision 1.68
diff -u -p -r1.68 em-folder-tree-model.c
--- mail/em-folder-tree-model.c 21 Jul 2005 04:15:21 -0000 1.68
+++ mail/em-folder-tree-model.c 27 Jul 2005 16:00:55 -0000
@@ -193,14 +193,14 @@ sort_cb (GtkTreeModel *model, GtkTreeIte
gtk_tree_model_get (model, b, COL_STRING_DISPLAY_NAME, &bname, COL_UINT_FLAGS, &bflags, -1);
if (is_store) {
- /* On This Computer is always first and vFolders is always last */
+ /* On This Computer is always first and Search Folders is always last */
if (!strcmp (aname, _("On This Computer")))
rv = -1;
else if (!strcmp (bname, _("On This Computer")))
rv = 1;
- else if (!strcmp (aname, _("vFolders")))
+ else if (!strcmp (aname, _("Search Folders")))
rv = 1;
- else if (!strcmp (bname, _("vFolders")))
+ else if (!strcmp (bname, _("Search Folders")))
rv = -1;
} else if (store == vfolder_store) {
/* UNMATCHED is always last */
@@ -331,7 +331,7 @@ em_folder_tree_model_load_state (EMFolde
if (stat (filename, &st) == 0 && (model->state = xmlParseFile (filename)))
return;
- /* setup some defaults - expand "Local Folders" and "vFolders" */
+ /* setup some defaults - expand "Local Folders" and "Search Folders" */
model->state = xmlNewDoc ("1.0");
root = xmlNewDocNode (model->state, NULL, "tree-state", NULL);
xmlDocSetRootElement (model->state, root);
Index: mail/em-folder-tree.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-folder-tree.c,v
retrieving revision 1.152
diff -u -p -r1.152 em-folder-tree.c
--- mail/em-folder-tree.c 21 Jul 2005 04:15:21 -0000 1.152
+++ mail/em-folder-tree.c 27 Jul 2005 16:00:56 -0000
@@ -1268,7 +1268,7 @@ emft_drop_target(EMFolderTree *emft, Gdk
}
camel_url_free(url);
- /* vFolders can only be dropped into other vFolders */
+ /* Search Folders can only be dropped into other Search Folders */
if (strncmp(src_uri, "vfolder:", 8) == 0) {
/* TODO: not sure if this is legal, but it works, force move only for vfolders */
context->suggested_action = GDK_ACTION_MOVE;
Index: mail/em-folder-view.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-folder-view.c,v
retrieving revision 1.127
diff -u -p -r1.127 em-folder-view.c
--- mail/em-folder-view.c 21 Jul 2005 04:15:21 -0000 1.127
+++ mail/em-folder-view.c 27 Jul 2005 16:00:57 -0000
@@ -1070,10 +1070,10 @@ static EPopupItem emfv_popup_items[] = {
{ E_POPUP_BAR, "90.filter", NULL, NULL, NULL, NULL },
{ E_POPUP_SUBMENU, "90.filter.00", N_("Crea_te Rule From Message"), NULL, NULL, NULL, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY },
- { E_POPUP_ITEM, "90.filter.00/00.00", N_("vFolder on _Subject"), emfv_popup_vfolder_subject, NULL, NULL, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY },
- { E_POPUP_ITEM, "90.filter.00/00.01", N_("vFolder on Se_nder"), emfv_popup_vfolder_sender, NULL, NULL, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY },
- { E_POPUP_ITEM, "90.filter.00/00.02", N_("vFolder on _Recipients"), emfv_popup_vfolder_recipients, NULL, NULL, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY },
- { E_POPUP_ITEM, "90.filter.00/00.03", N_("vFolder on Mailing _List"),
+ { E_POPUP_ITEM, "90.filter.00/00.00", N_("Search Folder on _Subject"), emfv_popup_vfolder_subject, NULL, NULL, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY },
+ { E_POPUP_ITEM, "90.filter.00/00.01", N_("Search Folder on Se_nder"), emfv_popup_vfolder_sender, NULL, NULL, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY },
+ { E_POPUP_ITEM, "90.filter.00/00.02", N_("Search Folder on _Recipients"), emfv_popup_vfolder_recipients, NULL, NULL, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY },
+ { E_POPUP_ITEM, "90.filter.00/00.03", N_("Search Folder on Mailing _List"),
emfv_popup_vfolder_mlist, NULL, NULL, EM_POPUP_SELECT_ONE|EM_POPUP_SELECT_MAILING_LIST|EM_FOLDER_VIEW_SELECT_LISTONLY },
{ E_POPUP_BAR, "90.filter.00/10", NULL, NULL, NULL, NULL },
@@ -2414,7 +2414,7 @@ emp_uri_popup_link_copy(EPopup *ep, EPop
static EPopupItem emfv_uri_popups[] = {
{ E_POPUP_ITEM, "00.uri.15", N_("_Copy Link Location"), emp_uri_popup_link_copy, NULL, NULL, EM_POPUP_URI_NOT_MAILTO },
- { E_POPUP_SUBMENU, "99.uri.00", N_("Create _vFolder"), NULL, NULL, NULL, EM_POPUP_URI_MAILTO },
+ { E_POPUP_SUBMENU, "99.uri.00", N_("Create _Search Folder"), NULL, NULL, NULL, EM_POPUP_URI_MAILTO },
{ E_POPUP_ITEM, "99.uri.00/00.10", N_("_From this Address"), emp_uri_popup_vfolder_sender, NULL, NULL, EM_POPUP_URI_MAILTO },
{ E_POPUP_ITEM, "99.uri.00/00.00", N_("_To this Address"), emp_uri_popup_vfolder_recipient, NULL, NULL, EM_POPUP_URI_MAILTO },
};
Index: mail/em-utils.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-utils.c,v
retrieving revision 1.62
diff -u -p -r1.62 em-utils.c
--- mail/em-utils.c 25 Jul 2005 04:23:41 -0000 1.62
+++ mail/em-utils.c 27 Jul 2005 16:00:57 -0000
@@ -226,7 +226,7 @@ em_utils_check_user_can_send_mail (GtkWi
return TRUE;
}
-/* Editing Filters/vFolders... */
+/* Editing Filters/Search Folders... */
static GtkWidget *filter_editor = NULL;
Index: mail/em-vfolder-editor.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-vfolder-editor.c,v
retrieving revision 1.3
diff -u -p -r1.3 em-vfolder-editor.c
--- mail/em-vfolder-editor.c 1 Feb 2005 19:30:49 -0000 1.3
+++ mail/em-vfolder-editor.c 27 Jul 2005 16:00:57 -0000
@@ -101,7 +101,7 @@ em_vfolder_editor_new (EMVFolderContext
GladeXML *gui;
gui = glade_xml_new (EVOLUTION_GLADEDIR "/filter.glade", "rule_editor", NULL);
- rule_editor_construct ((RuleEditor *) ve, (RuleContext *) vc, gui, "incoming", _("v_Folders"));
+ rule_editor_construct ((RuleEditor *) ve, (RuleContext *) vc, gui, "incoming", _("Search _Folders"));
gtk_widget_hide(glade_xml_get_widget (gui, "filter_source"));
g_object_unref (gui);
Index: mail/em-vfolder-rule.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-vfolder-rule.c,v
retrieving revision 1.6
diff -u -p -r1.6 em-vfolder-rule.c
--- mail/em-vfolder-rule.c 16 May 2005 06:15:38 -0000 1.6
+++ mail/em-vfolder-rule.c 27 Jul 2005 16:00:57 -0000
@@ -571,7 +571,7 @@ em_vfolder_editor_sourcelist_new(char *w
renderer = gtk_cell_renderer_text_new();
gtk_tree_view_insert_column_with_attributes((GtkTreeView *)table, -1,
- _("vFolder source"), renderer,
+ _("Search Folder source"), renderer,
"text", 0, NULL);
selection = gtk_tree_view_get_selection((GtkTreeView *)table);
Index: mail/mail-dialogs.glade
===================================================================
RCS file: /cvs/gnome/evolution/mail/mail-dialogs.glade,v
retrieving revision 1.4
diff -u -p -r1.4 mail-dialogs.glade
--- mail/mail-dialogs.glade 3 Mar 2005 04:00:16 -0000 1.4
+++ mail/mail-dialogs.glade 27 Jul 2005 16:00:58 -0000
@@ -18,6 +18,7 @@
<property name="skip_pager_hint">False</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+ <property name="focus_on_map">True</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
@@ -92,6 +93,10 @@
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">search_entry</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -109,7 +114,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">False</property>
</widget>
<packing>
@@ -139,6 +144,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -190,6 +199,7 @@
<property name="skip_pager_hint">False</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+ <property name="focus_on_map">True</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
@@ -261,6 +271,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -288,6 +302,10 @@
<property name="yalign">0.5</property>
<property name="xpad">12</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -363,6 +381,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -390,6 +412,10 @@
<property name="yalign">0.5</property>
<property name="xpad">12</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -465,6 +491,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="type">tab</property>
@@ -488,6 +518,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="type">tab</property>
@@ -518,6 +552,7 @@
<property name="skip_pager_hint">False</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+ <property name="focus_on_map">True</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
@@ -592,6 +627,10 @@
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">store_menu</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -632,8 +671,9 @@
<property name="visible">True</property>
<property name="orientation">GTK_PROGRESS_LEFT_TO_RIGHT</property>
<property name="fraction">0</property>
- <property name="pulse_step">0.1</property>
+ <property name="pulse_step">0.10000000149</property>
<property name="text" translatable="yes"></property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -718,6 +758,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -788,6 +832,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -840,6 +888,7 @@
<property name="skip_pager_hint">False</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+ <property name="focus_on_map">True</property>
<property name="has_separator">True</property>
<child internal-child="vbox">
@@ -923,6 +972,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -954,7 +1007,7 @@
<child>
<widget class="GtkLabel" id="license_top_label">
<property name="visible">True</property>
- <property name="label" translatable="no"></property>
+ <property name="label"></property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -964,6 +1017,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -1052,6 +1109,7 @@
<property name="skip_pager_hint">False</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+ <property name="focus_on_map">True</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
@@ -1142,6 +1200,10 @@ Please select a follow up action from th
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -1173,6 +1235,9 @@ Please select a follow up action from th
<property name="rules_hint">False</property>
<property name="reorderable">False</property>
<property name="enable_search">True</property>
+ <property name="fixed_height_mode">False</property>
+ <property name="hover_selection">False</property>
+ <property name="hover_expand">False</property>
</widget>
</child>
</widget>
@@ -1206,6 +1271,10 @@ Please select a follow up action from th
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">combo-entry</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -1230,6 +1299,10 @@ Please select a follow up action from th
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -1278,7 +1351,7 @@ Please select a follow up action from th
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">False</property>
</widget>
</child>
@@ -1305,6 +1378,10 @@ Please select a follow up action from th
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
</child>
</widget>
@@ -1391,6 +1468,7 @@ Please select a follow up action from th
<property name="skip_pager_hint">False</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+ <property name="focus_on_map">True</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
@@ -1460,7 +1538,7 @@ Please select a follow up action from th
<child>
<widget class="GtkLabel" id="label13">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>vFolder Sources</b></property>
+ <property name="label" translatable="yes"><b>Search Folder Sources</b></property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1470,6 +1548,10 @@ Please select a follow up action from th
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -1497,6 +1579,10 @@ Please select a follow up action from th
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
Index: mail/mail-vfolder.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/mail-vfolder.c,v
retrieving revision 1.133
diff -u -p -r1.133 mail-vfolder.c
--- mail/mail-vfolder.c 16 May 2005 07:53:53 -0000 1.133
+++ mail/mail-vfolder.c 27 Jul 2005 16:00:58 -0000
@@ -88,7 +88,7 @@ vfolder_setup_desc(struct _mail_msg *mm,
{
struct _setup_msg *m = (struct _setup_msg *)mm;
- return g_strdup_printf(_("Setting up vFolder: %s"), m->folder->full_name);
+ return g_strdup_printf(_("Setting up Search Folder: %s"), m->folder->full_name);
}
static void
@@ -98,7 +98,7 @@ vfolder_setup_do(struct _mail_msg *mm)
GList *l, *list = NULL;
CamelFolder *folder;
- d(printf("Setting up vFolder: %s\n", m->folder->full_name));
+ d(printf("Setting up Search Folder: %s\n", m->folder->full_name));
camel_vee_folder_set_expression((CamelVeeFolder *)m->folder, m->query);
@@ -237,14 +237,14 @@ vfolder_adduri_desc(struct _mail_msg *mm
}
if (loc && url->path)
- desc = g_strdup_printf(_("Updating vFolders for '%s:%s'"), loc, url->path);
+ desc = g_strdup_printf(_("Updating Search Folders for '%s:%s'"), loc, url->path);
camel_url_free(url);
}
g_free(euri);
}
if (desc == NULL)
- desc = g_strdup_printf(_("Updating vFolders for '%s'"), m->uri);
+ desc = g_strdup_printf(_("Updating Search Folders for '%s'"), m->uri);
return desc;
}
@@ -897,7 +897,7 @@ vfolder_load_storage(void)
(CamelObjectEventHookFunc)store_folder_renamed, NULL);
d(printf("got store '%s' = %p\n", storeuri, vfolder_store));
- mail_component_load_store_by_uri (mail_component_peek (), storeuri, _("vFolders"));
+ mail_component_load_store_by_uri (mail_component_peek (), storeuri, _("Search Folders"));
/* load our rules */
user = g_strdup_printf ("%s/mail/vfolders.xml", mail_component_peek_base_directory (mail_component_peek ()));
@@ -967,7 +967,7 @@ vfolder_edit (void)
}
vfolder_editor = GTK_WIDGET (em_vfolder_editor_new (context));
- gtk_window_set_title (GTK_WINDOW (vfolder_editor), _("vFolders"));
+ gtk_window_set_title (GTK_WINDOW (vfolder_editor), _("Search Folders"));
g_signal_connect(vfolder_editor, "response", G_CALLBACK(em_vfolder_editor_response), NULL);
gtk_widget_show (vfolder_editor);
@@ -1006,7 +1006,7 @@ vfolder_edit_rule(const char *uri)
w = filter_rule_get_widget((FilterRule *)newrule, (RuleContext *)context);
- gd = (GtkDialog *)gtk_dialog_new_with_buttons(_("Edit vFolder"), NULL,
+ gd = (GtkDialog *)gtk_dialog_new_with_buttons(_("Edit Search Folder"), NULL,
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_STOCK_CANCEL,
GTK_RESPONSE_CANCEL,
@@ -1090,7 +1090,7 @@ vfolder_gui_add_rule(EMVFolderRule *rule
w = filter_rule_get_widget((FilterRule *)rule, (RuleContext *)context);
- gd = (GtkDialog *)gtk_dialog_new_with_buttons(_("New vFolder"),
+ gd = (GtkDialog *)gtk_dialog_new_with_buttons(_("New Search Folder"),
NULL,
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_STOCK_CANCEL,
Index: mail/mail.error.xml
===================================================================
RCS file: /cvs/gnome/evolution/mail/mail.error.xml,v
retrieving revision 1.4
diff -u -p -r1.4 mail.error.xml
--- mail/mail.error.xml 10 Jul 2005 10:03:56 -0000 1.4
+++ mail/mail.error.xml 27 Jul 2005 16:00:58 -0000
@@ -278,18 +278,19 @@ all proxy information will be deleted pe
</error>
<error id="vfolder-notexist" type="error">
- <_primary>Cannot edit vFolder "{0}" as it does not exist.</_primary>
- <_secondary xml:space="preserve">This folder may have been added implicitly, go to the vFolder editor to add it explicitly, if required.</_secondary>
+ <_primary>Cannot edit Search Folder "{0}" as it does not exist.</_primary>
+ <_secondary xml:space="preserve">This folder may have been added implicitly,
+go to the Search Folder editor to add it explicitly, if required.</_secondary>
</error>
<error id="vfolder-notunique" type="error">
- <_primary>Cannot add vFolder "{0}".</_primary>
+ <_primary>Cannot add Search Folder "{0}".</_primary>
<_secondary xml:space="preserve">A folder named "{1}" already exists. Please use a different name.</_secondary>
</error>
<error id="vfolder-updated" type="info">
- <_primary>vFolders automatically updated.</_primary>
- <_secondary xml:space="preserve">The following vFolder(s):
+ <_primary>Search Folders automatically updated.</_primary>
+ <_secondary xml:space="preserve">The following Search Folder(s):
{0}
Used the now removed folder:
"{1}"
@@ -312,7 +313,7 @@ And have been updated.</_secondary>
<error id="no-name-vfolder" type="error">
<_primary>Missing name.</_primary>
- <_secondary xml:space="preserve">You must name this vFolder.</_secondary>
+ <_secondary xml:space="preserve">You must name this Search Folder.</_secondary>
</error>
<error id="vfolder-no-source" type="error">
Index: ui/evolution-mail-global.xml
===================================================================
RCS file: /cvs/gnome/evolution/ui/evolution-mail-global.xml,v
retrieving revision 1.32
diff -u -p -r1.32 evolution-mail-global.xml
--- ui/evolution-mail-global.xml 21 Jul 2005 07:08:09 -0000 1.32
+++ ui/evolution-mail-global.xml 27 Jul 2005 16:00:58 -0000
@@ -33,7 +33,7 @@
_tip="Subscribe or unsubscribe to folders on remote servers"/>
<cmd name="ToolsVFolders"
- _tip="Create or edit vFolder definitions"/>
+ _tip="Create or edit Search Folder definitions"/>
<cmd name="ViewPreview"
_tip="Show message preview window"
Index: ui/evolution-mail-message.xml
===================================================================
RCS file: /cvs/gnome/evolution/ui/evolution-mail-message.xml,v
retrieving revision 1.73
diff -u -p -r1.73 evolution-mail-message.xml
--- ui/evolution-mail-message.xml 7 Jun 2005 06:02:01 -0000 1.73
+++ ui/evolution-mail-message.xml 27 Jul 2005 16:00:58 -0000
@@ -195,16 +195,16 @@
_tip="Create a rule to filter messages with this subject"/>
<cmd name="ToolsVFolderMailingList"
- _tip="Create a vFolder for this mailing list"/>
+ _tip="Create a Search Folder for this mailing list"/>
<cmd name="ToolsVFolderRecipient"
- _tip="Create a vFolder for these recipients"/>
+ _tip="Create a Search Folder for these recipients"/>
<cmd name="ToolsVFolderSender"
- _tip="Create a vFolder for this sender"/>
+ _tip="Create a Search Folder for this sender"/>
<cmd name="ToolsVFolderSubject"
- _tip="Create a vFolder for this subject"/>
+ _tip="Create a Search Folder for this subject"/>
<cmd name="ViewFullHeaders"
_tip="Show message with all email headers"
@@ -374,10 +374,10 @@
<separator f="" name="RuleSeparator"/>
- <menuitem name="ToolsVFolderSubject" verb="" _label="VFolder on S_ubject..."/>
- <menuitem name="ToolsVFolderSender" verb="" _label="VFolder on Sen_der..."/>
- <menuitem name="ToolsVFolderRecipient" verb="" _label="VFolder on Recipients..."/>
- <menuitem name="ToolsVFolderMailingList" verb="" _label="VFolder on Mailing _List..."/>
+ <menuitem name="ToolsVFolderSubject" verb="" _label="Search Folder on S_ubject..."/>
+ <menuitem name="ToolsVFolderSender" verb="" _label="Search Folder on Sen_der..."/>
+ <menuitem name="ToolsVFolderRecipient" verb="" _label="Search Folder on Recipients..."/>
+ <menuitem name="ToolsVFolderMailingList" verb="" _label="Search Folder on Mailing _List..."/>
</submenu>
</placeholder>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
