--- a/photosgallery/viewframework/uiutilities/data/glxuiutilities.rss	Fri Mar 12 15:42:44 2010 +0200
+++ b/photosgallery/viewframework/uiutilities/data/glxuiutilities.rss	Mon Mar 15 12:40:30 2010 +0200
@@ -32,10 +32,6 @@
 #include "glxutilities.hrh"
 #include <glxcommandhandlers.hrh>
 
-#if defined(FF_IMAGE_EDITOR) || defined(FF_VIDEO_EDITOR)
-#include <bldnokia.hrh> //for Editor feature flags
-#endif
-
 NAME GLXR    // 4 letter ID
 
 //  RESOURCE DEFINITIONS
@@ -455,8 +451,8 @@
 // AIW interest structure for assign
 //
 // -----------------------------------------------------------------------------
-#if defined(FF_IMAGE_EDITOR) || defined(FF_VIDEO_EDITOR)
-RESOURCE AIW_INTEREST r_glx_aiw_assign_to_contact_interest
+
+RESOURCE AIW_INTEREST r_glx_aiw_assign_to_contact_interest_mediaeditor
     {
     items=
         {
@@ -469,7 +465,7 @@
             }
         };
     }
-#else
+
 RESOURCE AIW_INTEREST r_glx_aiw_assign_to_contact_interest
     {
     items=
@@ -484,7 +480,7 @@
             }
         };
     }
-#endif
+
 
 // -----------------------------------------------------------------------------
 //
@@ -836,3 +832,27 @@
     //buf = qtn_lgal_note_remove_from_favourites;
     buf = "#Removed from Favourites";
     }
+
+//resource for waiting dialog
+RESOURCE TBUF r_glx_main_list_view_processing_dialog
+    { 
+    buf = qtn_lgal_note_wait_processing; 
+    }
+RESOURCE DIALOG r_progress_note
+    {
+    flags = EAknProgressNoteFlags;
+    buttons = R_AVKON_SOFTKEYS_CANCEL;
+    items =
+        {
+        DLG_LINE
+            {
+            type = EAknCtNote;
+            id = EAknCtNote;
+            control = AVKON_NOTE
+                {
+                layout = EProgressLayout;
+                singular_label =qtn_lgal_note_wait_processing;
+                };
+            }
+        };
+    }