[maemo-commits] [maemo-commits] r16984 - in projects/haf/branches/hildon-fm/fremantle: . hildon-fm

From: subversion at stage.maemo.org subversion at stage.maemo.org
Date: Tue Dec 16 17:15:07 EET 2008
Author: mtuhkanen
Date: 2008-12-16 17:14:50 +0200 (Tue, 16 Dec 2008)
New Revision: 16984

Modified:
   projects/haf/branches/hildon-fm/fremantle/ChangeLog
   projects/haf/branches/hildon-fm/fremantle/hildon-fm/hildon-file-chooser-dialog.c
   projects/haf/branches/hildon-fm/fremantle/hildon-fm/hildon-file-system-local-device.c
   projects/haf/branches/hildon-fm/fremantle/hildon-fm/hildon-file-system-mmc.c
   projects/haf/branches/hildon-fm/fremantle/hildon-fm/hildon-file-system-obex.c
   projects/haf/branches/hildon-fm/fremantle/hildon-fm/hildon-file-system-private.c
   projects/haf/branches/hildon-fm/fremantle/hildon-fm/hildon-file-system-storage-dialog.c
   projects/haf/branches/hildon-fm/fremantle/hildon-fm/hildon-file-system-upnp.c
Log:
New icons taken into use and long path names are truncated from the left

Modified: projects/haf/branches/hildon-fm/fremantle/ChangeLog
===================================================================
--- projects/haf/branches/hildon-fm/fremantle/ChangeLog	2008-12-16 14:09:57 UTC (rev 16983)
+++ projects/haf/branches/hildon-fm/fremantle/ChangeLog	2008-12-16 15:14:50 UTC (rev 16984)
@@ -1,3 +1,16 @@
+2008-12-05 Mikko Tuhkanen <mikko.tuhkanen at d\igia.com>
+	* hildon-fm/hildon-file-system-upnp.c:
+	* hildon-fm/hildon-file-system-mmc.c
+	* hildon-fm/hildon-file-system-storage-dialog.c
+	* hildon-fm/hildon-file-system-private.c 
+	* hildon-fm/hildon-file-system-obex.c
+	* hildon-fm/hildon-file-system-local-device.c
+	New icons taken into use.
+
+	* hildon-fm/hildon-file-chooser-dialog.c
+	New icons taken into use.
+	Long path names are truncated from the left.
+
 2008-12-15 Yang Li <yang.li at d\igia.com>
 	* hildon-fm/hildon-file-selection.c:
 	no creating the sort model, filter model for root

Modified: projects/haf/branches/hildon-fm/fremantle/hildon-fm/hildon-file-chooser-dialog.c
===================================================================
--- projects/haf/branches/hildon-fm/fremantle/hildon-fm/hildon-file-chooser-dialog.c	2008-12-16 14:09:57 UTC (rev 16983)
+++ projects/haf/branches/hildon-fm/fremantle/hildon-fm/hildon-file-chooser-dialog.c	2008-12-16 15:14:50 UTC (rev 16984)
@@ -2248,10 +2248,8 @@
     priv->stub_name = priv->ext_name = NULL;
     priv->action = GTK_FILE_CHOOSER_ACTION_OPEN;
 
-    image = gtk_image_new_from_stock(GTK_STOCK_GO_BACK, GTK_ICON_SIZE_BUTTON);
-    gtk_widget_set_size_request(GTK_WIDGET(image), 
-				FILE_SELECTION_UP_LEVEL_ICON_WIDTH,
-				FILE_SELECTION_UP_LEVEL_ICON_HEIGHT);
+	image = gtk_image_new_from_icon_name ("filemanager_folder_up",
+                                                   HILDON_ICON_SIZE_THUMB);	
 
     priv->up_button = hildon_button_new(HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH, 
 					HILDON_BUTTON_ARRANGEMENT_HORIZONTAL);
@@ -2270,6 +2268,9 @@
     gtk_widget_show(priv->path_button);
 
     priv->path_label = g_object_new(GTK_TYPE_LABEL, "xalign", 0.0f, NULL);
+	// Set path to be truncated from the left
+	gtk_label_set_ellipsize (priv->path_label, PANGO_ELLIPSIZE_START);	
+
     gtk_widget_show(priv->path_label);
 
     priv->action_button =

Modified: projects/haf/branches/hildon-fm/fremantle/hildon-fm/hildon-file-system-local-device.c
===================================================================
--- projects/haf/branches/hildon-fm/fremantle/hildon-fm/hildon-file-system-local-device.c	2008-12-16 14:09:57 UTC (rev 16983)
+++ projects/haf/branches/hildon-fm/fremantle/hildon-fm/hildon-file-system-local-device.c	2008-12-16 15:14:50 UTC (rev 16984)
@@ -74,7 +74,7 @@
                                                   device);
 
     location = HILDON_FILE_SYSTEM_SPECIAL_LOCATION (device);
-    location->fixed_icon = g_strdup ("qgn_list_filesys_divc_cls");
+    location->fixed_icon = g_strdup ("general_device_root_folder");
     location->compatibility_type = HILDON_FILE_SYSTEM_MODEL_LOCAL_DEVICE;
     location->sort_weight = SORT_WEIGHT_DEVICE;
 }

Modified: projects/haf/branches/hildon-fm/fremantle/hildon-fm/hildon-file-system-mmc.c
===================================================================
--- projects/haf/branches/hildon-fm/fremantle/hildon-fm/hildon-file-system-mmc.c	2008-12-16 14:09:57 UTC (rev 16983)
+++ projects/haf/branches/hildon-fm/fremantle/hildon-fm/hildon-file-system-mmc.c	2008-12-16 15:14:50 UTC (rev 16984)
@@ -141,7 +141,7 @@
     HildonFileSystemSpecialLocation *location;
 
     location = HILDON_FILE_SYSTEM_SPECIAL_LOCATION (device);
-    location->fixed_icon = g_strdup ("qgn_list_filesys_mmc_root");
+    location->fixed_icon = g_strdup ("general_removable_memory_card");
     location->compatibility_type = HILDON_FILE_SYSTEM_MODEL_MMC;
 }
 

Modified: projects/haf/branches/hildon-fm/fremantle/hildon-fm/hildon-file-system-obex.c
===================================================================
--- projects/haf/branches/hildon-fm/fremantle/hildon-fm/hildon-file-system-obex.c	2008-12-16 14:09:57 UTC (rev 16983)
+++ projects/haf/branches/hildon-fm/fremantle/hildon-fm/hildon-file-system-obex.c	2008-12-16 15:14:50 UTC (rev 16984)
@@ -107,7 +107,7 @@
 
     location = HILDON_FILE_SYSTEM_SPECIAL_LOCATION (device);
     location->compatibility_type = HILDON_FILE_SYSTEM_MODEL_GATEWAY;
-    location->fixed_icon = g_strdup ("qgn_list_filesys_bluetooth");
+    location->fixed_icon = g_strdup ("general_bluetooth");
     location->fixed_title = g_strdup (_("sfil_li_bluetooth"));
     location->failed_access_message = NULL;
 

Modified: projects/haf/branches/hildon-fm/fremantle/hildon-fm/hildon-file-system-private.c
===================================================================
--- projects/haf/branches/hildon-fm/fremantle/hildon-fm/hildon-file-system-private.c	2008-12-16 14:09:57 UTC (rev 16983)
+++ projects/haf/branches/hildon-fm/fremantle/hildon-fm/hildon-file-system-private.c	2008-12-16 15:14:50 UTC (rev 16984)
@@ -176,19 +176,19 @@
 
         /* Setup safe folders */
         setup_safe_folder(rootnode, rootpath, ".images",
-            _("sfil_li_folder_images"), "qgn_list_filesys_image_fldr",
+            _("sfil_li_folder_images"), "filemanager_image_folder",
             HILDON_FILE_SYSTEM_MODEL_SAFE_FOLDER_IMAGES);
         setup_safe_folder(rootnode, rootpath, ".videos",
-            _("sfil_li_folder_video_clips"), "qgn_list_filesys_video_fldr",
+            _("sfil_li_folder_video_clips"), "filemanager_video_folder",
             HILDON_FILE_SYSTEM_MODEL_SAFE_FOLDER_VIDEOS);
         setup_safe_folder(rootnode, rootpath, ".sounds",
-            _("sfil_li_folder_sound_clips"), "qgn_list_filesys_audio_fldr",
+            _("sfil_li_folder_sound_clips"), "filemanager_audio_folder",
             HILDON_FILE_SYSTEM_MODEL_SAFE_FOLDER_SOUNDS);
         setup_safe_folder(rootnode, rootpath, ".documents",
-            _("sfil_li_folder_documents"), "qgn_list_filesys_doc_fldr",
+            _("sfil_li_folder_documents"), "filemanager_document_folder",
             HILDON_FILE_SYSTEM_MODEL_SAFE_FOLDER_DOCUMENTS);
         setup_safe_folder(rootnode, rootpath, ".games",
-            _("sfil_li_folder_games"), "qgn_list_filesys_games_fldr",
+            _("sfil_li_folder_games"), "filemanager_games_folder",
             HILDON_FILE_SYSTEM_MODEL_SAFE_FOLDER_GAMES);
 
         g_free(rootpath);

Modified: projects/haf/branches/hildon-fm/fremantle/hildon-fm/hildon-file-system-storage-dialog.c
===================================================================
--- projects/haf/branches/hildon-fm/fremantle/hildon-fm/hildon-file-system-storage-dialog.c	2008-12-16 14:09:57 UTC (rev 16983)
+++ projects/haf/branches/hildon-fm/fremantle/hildon-fm/hildon-file-system-storage-dialog.c	2008-12-16 15:14:50 UTC (rev 16984)
@@ -277,7 +277,7 @@
                           (GtkAttachOptions) (GTK_FILL),
                           (GtkAttachOptions) (GTK_FILL), 0, 0);
 
-	image_type = gtk_image_new_from_icon_name ("qgn_list_filesys_removable_storage",
+	image_type = gtk_image_new_from_icon_name ("filemanager_removable_storage",
                                                    HILDON_ICON_SIZE_SMALL);
         gtk_widget_show (image_type);
         gtk_box_pack_start (GTK_BOX (hbox), image_type, FALSE, FALSE, 0);
@@ -1283,7 +1283,7 @@
 	/* Type label and icon */
 	switch (priv->uri_type) {
 	case URI_TYPE_FILE_SYSTEM:
-		type_icon_name = "qgn_list_filesys_divc_cls";
+		type_icon_name = "general_device_root_folder";
 		type_name = _("sfil_va_type_internal_memory");
 		break;
 	case URI_TYPE_INTERNAL_MMC:
@@ -1296,7 +1296,7 @@
 		break;
 	case URI_TYPE_UNKNOWN:
 	default:
-		type_icon_name = "qgn_list_filesys_removable_storage";
+		type_icon_name = "filemanager_removable_storage";
 		type_name = _("sfil_va_type_storage_other");
 		break;
 	}

Modified: projects/haf/branches/hildon-fm/fremantle/hildon-fm/hildon-file-system-upnp.c
===================================================================
--- projects/haf/branches/hildon-fm/fremantle/hildon-fm/hildon-file-system-upnp.c	2008-12-16 14:09:57 UTC (rev 16983)
+++ projects/haf/branches/hildon-fm/fremantle/hildon-fm/hildon-file-system-upnp.c	2008-12-16 15:14:50 UTC (rev 16984)
@@ -83,7 +83,7 @@
 
     location = HILDON_FILE_SYSTEM_SPECIAL_LOCATION (device);
     location->compatibility_type = HILDON_FILE_SYSTEM_MODEL_GATEWAY;
-    location->fixed_icon = g_strdup ("qgn_list_filesys_mediaserver");
+    location->fixed_icon = g_strdup ("filemanager_media_server");
     location->fixed_title = g_strdup (_("sfil_li_shared_media"));
     location->failed_access_message = NULL;
     location->sort_weight = SORT_WEIGHT_UPNP;
@@ -136,7 +136,7 @@
       HILDON_FILE_SYSTEM_REMOTE_DEVICE (child)->accessible =
           HILDON_FILE_SYSTEM_REMOTE_DEVICE (location)->accessible;
       hildon_file_system_special_location_set_icon
-        (child, "qgn_list_filesys_mediaserver");
+        (child, "filemanager_media_server");
       child->failed_access_message = _("sfil_ib_cannot_connect_device");
       child->basepath = g_strdup (uri);
       child->permanent = FALSE;


More information about the maemo-commits mailing list