From: Dirk-Jan C. Binnema <dirk-jan.binnema@nokia.com>
Date: Thu, 5 Apr 2007 12:20:17 +0000 (+0000)
Subject: * have the folder view use the right icons for the local folders
X-Git-Tag: git_migration_finished~3938
X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=10060520826741101538c7655c54b5992c7cc975

* have the folder view use the right icons for the local folders
* use the right logical ids
* auto-create only the folders we should
* remove some cruft

pmo-trunk-r1514
---

diff --git a/src/gnome/modest-icon-names.h b/src/gnome/modest-icon-names.h
index 75f5833..64e38e6 100644
--- a/src/gnome/modest-icon-names.h
+++ b/src/gnome/modest-icon-names.h
@@ -59,10 +59,9 @@
 #define MODEST_FOLDER_ICON_JUNK			PIXMAP_PREFIX "qgn_list_messagin_mail_deleted.png"
 #define MODEST_FOLDER_ICON_DRAFTS		PIXMAP_PREFIX "qgn_list_messagin_drafts.png"
 #define MODEST_FOLDER_ICON_NORMAL		PIXMAP_PREFIX "qgn_list_gene_fldr_cls.png"
+#define MODEST_FOLDER_ICON_LOCAL_FOLDERS	PIXMAP_PREFIX "qgn_list_gene_fldr_cls.png"
+
 
-#define MODEST_FOLDER_ICON_CONTACTS		PIXMAP_PREFIX "qgn_addr_icon_user_group.png"
-#define MODEST_FOLDER_ICON_NOTES		PIXMAP_PREFIX "qgn_list_messagin_viewer.png"
-#define MODEST_FOLDER_ICON_CALENDAR     	PIXMAP_PREFIX "qgn_widg_datedit.png"
 
 /* toolbar */
 #define  MODEST_TOOLBAR_ICON_MAIL_SEND		PIXMAP_PREFIX "qgn_list_messagin_sent.png"
diff --git a/src/maemo/modest-icon-names.h b/src/maemo/modest-icon-names.h
index 8028e2b..71a80ca 100644
--- a/src/maemo/modest-icon-names.h
+++ b/src/maemo/modest-icon-names.h
@@ -50,7 +50,7 @@
 #define MODEST_FOLDER_ICON_OPEN			"qgn_list_gene_fldr_opn"
 #define MODEST_FOLDER_ICON_CLOSED		"qgn_list_gene_fldr_cls"
 
-#define MODEST_FOLDER_ICON_ACCOUNT		"qgn_addr_icon_user_group"
+#define MODEST_FOLDER_ICON_ACCOUNT		"qgn_list_browser"
 #define MODEST_FOLDER_ICON_INBOX		"qgn_list_messagin_inbox"
 #define MODEST_FOLDER_ICON_OUTBOX		"qgn_list_messagin_outbox"
 #define MODEST_FOLDER_ICON_SENT			"qgn_list_messagin_sent"
@@ -58,10 +58,8 @@
 #define MODEST_FOLDER_ICON_JUNK			"qgn_toolb_messagin_delete"
 #define MODEST_FOLDER_ICON_DRAFTS		"qgn_list_messagin_drafts"
 #define MODEST_FOLDER_ICON_NORMAL		"qgn_list_gene_fldr_cls"
+#define MODEST_FOLDER_ICON_LOCAL_FOLDERS	"qgn_list_shell_mydevice"
 
-#define MODEST_FOLDER_ICON_CONTACTS		"qgn_addr_icon_user_group"
-#define MODEST_FOLDER_ICON_NOTES		"qgn_list_messagin_viewer"
-#define MODEST_FOLDER_ICON_CALENDAR     	"qgn_widg_datedit"
 
 /* toolbar */
 #define  MODEST_TOOLBAR_ICON_MAIL_SEND		"qgn_list_messagin_sent"
diff --git a/src/modest-local-folder-info.c b/src/modest-local-folder-info.c
index 25c02b7..bd91821 100644
--- a/src/modest-local-folder-info.c
+++ b/src/modest-local-folder-info.c
@@ -40,14 +40,14 @@ typedef struct {
 const ModestLocalFolder ModestLocalFolderMap[] = {
 	{ TNY_FOLDER_TYPE_UNKNOWN,  "<unknown>",  N_("<Unknown>")},
 	{ TNY_FOLDER_TYPE_NORMAL,   "<normal>",   N_("<Normal>")},
-	{ TNY_FOLDER_TYPE_INBOX,    "inbox",      N_("Inbox")},
-	{ TNY_FOLDER_TYPE_OUTBOX,   "outbox",     N_("Outbox")},
+	{ TNY_FOLDER_TYPE_INBOX,    "inbox",      N_("mcen_me_folder_inbox")},
+	{ TNY_FOLDER_TYPE_OUTBOX,   "outbox",     N_("mcen_me_folder_outbox")},
 	{ TNY_FOLDER_TYPE_TRASH,    "trash",      N_("Trash")},
 	{ TNY_FOLDER_TYPE_JUNK,     "junk",       N_("Junk")},
-	{ TNY_FOLDER_TYPE_SENT,     "sent",       N_("Sent items")},
+	{ TNY_FOLDER_TYPE_SENT,     "sent",       N_("mcen_me_folder_sent")},
 	{ TNY_FOLDER_TYPE_ROOT,     "<root>",     N_("<root>")},
 	{ TNY_FOLDER_TYPE_NOTES,    "notes",      N_("Notes")},
-	{ TNY_FOLDER_TYPE_DRAFTS,   "drafts",     N_("Drafts")},
+	{ TNY_FOLDER_TYPE_DRAFTS,   "drafts",     N_("mcen_me_folder_drafts")},
 	{ TNY_FOLDER_TYPE_OUTBOX,   "contacts",   N_("Contacts")},
 	{ TNY_FOLDER_TYPE_OUTBOX,   "calendar",   N_("Calendar")},
 	{ TNY_FOLDER_TYPE_ARCHIVE,  "archive",    N_("Archive")}
diff --git a/src/modest-runtime.c b/src/modest-runtime.c
index 5c67519..3f3b107 100644
--- a/src/modest-runtime.c
+++ b/src/modest-runtime.c
@@ -94,7 +94,14 @@ static const FolderCols OUTBOX_COLUMNS_TWOLINES[] = {
 	 {MODEST_HEADER_VIEW_COLUMN_ATTACH,  40},
 	 {MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_OUT,200},
 };
-	 
+
+#ifdef MODEST_PLATFORM_MAEMO
+static const TnyFolderType LOCAL_FOLDERS[] = {
+	TNY_FOLDER_TYPE_OUTBOX,
+	TNY_FOLDER_TYPE_DRAFTS,
+	TNY_FOLDER_TYPE_SENT
+};
+#else
 static const TnyFolderType LOCAL_FOLDERS[] = {
 	TNY_FOLDER_TYPE_OUTBOX,
 	TNY_FOLDER_TYPE_DRAFTS,
@@ -102,6 +109,8 @@ static const TnyFolderType LOCAL_FOLDERS[] = {
 	TNY_FOLDER_TYPE_TRASH,
 	TNY_FOLDER_TYPE_ARCHIVE	
 };
+#endif /* MODEST_PLATFORM_MAEMO */
+
 
 
 gboolean
diff --git a/src/widgets/modest-folder-view.c b/src/widgets/modest-folder-view.c
index 4e90143..ea92742 100644
--- a/src/widgets/modest-folder-view.c
+++ b/src/widgets/modest-folder-view.c
@@ -330,15 +330,6 @@ icon_cell_data  (GtkTreeViewColumn *column,  GtkCellRenderer *renderer,
 	case TNY_FOLDER_TYPE_DRAFTS:
 		pixbuf = get_cached_icon (MODEST_FOLDER_ICON_DRAFTS);
                 break;
-	case TNY_FOLDER_TYPE_NOTES:
-		pixbuf = get_cached_icon (MODEST_FOLDER_ICON_NOTES);
-                break;
-	case TNY_FOLDER_TYPE_CALENDAR:
-		pixbuf = get_cached_icon (MODEST_FOLDER_ICON_CALENDAR);
-                break;
-	case TNY_FOLDER_TYPE_CONTACTS:
-                pixbuf = get_cached_icon (MODEST_FOLDER_ICON_CONTACTS);
-                break;
 	case TNY_FOLDER_TYPE_NORMAL:
         default:
                 pixbuf = get_cached_icon (MODEST_FOLDER_ICON_NORMAL);