Merge pull request #8943 from ronie/dialognotification

rename kaitoast xml to DialogNotification.xml
xbmc · Jan 23, 2016 · 1389ef9 · 1389ef9
2 parents 7244a9b + 1211e94
commit 1389ef9
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/addons/resource.uisounds.confluence/resources/sounds.xml b/addons/resource.uisounds.confluence/resources/sounds.xml
@@ -19,7 +19,7 @@
 
 <!-- To map a sound to a window, add a block like this to <windows>:        -->
 <!--    <window>                                                            -->
-<!--      <name>infodialog</name>                                           -->
+<!--      <name>notification</name>                                         -->
 <!--      <activate>notify.wav</activate>                                   -->
 <!--      <deactivate>out.wav</deactivate>                                  -->
 <!--    </window>                                                           -->
@@ -74,7 +74,7 @@
 
   <windows>
     <window>
-      <name>infodialog</name>
+      <name>notification</name>
       <activate>notify.wav</activate>
       <deactivate>out.wav</deactivate>
     </window>

diff --git a/...s/skin.confluence/720p/DialogKaiToast.xml → ...in.confluence/720p/DialogNotification.xml b/...s/skin.confluence/720p/DialogKaiToast.xml → ...in.confluence/720p/DialogNotification.xml
diff --git a/xbmc/dialogs/GUIDialogKaiToast.cpp b/xbmc/dialogs/GUIDialogKaiToast.cpp
@@ -30,7 +30,7 @@ CGUIDialogKaiToast::TOASTQUEUE CGUIDialogKaiToast::m_notifications;
 CCriticalSection CGUIDialogKaiToast::m_critical;
 
 CGUIDialogKaiToast::CGUIDialogKaiToast(void)
-  : CGUIDialog(WINDOW_DIALOG_KAI_TOAST, "DialogKaiToast.xml", DialogModalityType::MODELESS)
+  : CGUIDialog(WINDOW_DIALOG_KAI_TOAST, "DialogNotification.xml", DialogModalityType::MODELESS)
 {
   m_loadType = LOAD_ON_GUI_INIT;
   m_timer = 0;

diff --git a/xbmc/input/ButtonTranslator.cpp b/xbmc/input/ButtonTranslator.cpp
@@ -335,7 +335,8 @@ static const ActionMapping windows[] =
     { "submenu"                  , WINDOW_DIALOG_SUB_MENU },
     { "favourites"               , WINDOW_DIALOG_FAVOURITES },
     { "contextmenu"              , WINDOW_DIALOG_CONTEXT_MENU },
-    { "infodialog"               , WINDOW_DIALOG_KAI_TOAST },
+    { "notification"             , WINDOW_DIALOG_KAI_TOAST },
+    { "infodialog"               , WINDOW_DIALOG_KAI_TOAST },          // backward compat
     { "numericinput"             , WINDOW_DIALOG_NUMERIC },
     { "gamepadinput"             , WINDOW_DIALOG_GAMEPAD },
     { "shutdownmenu"             , WINDOW_DIALOG_BUTTON_MENU },