Fixes: NB#202160 - Spinner is not visible when In Application Menu Selected.

RevBy: Stanislav Ionascu

Details:
Removes the action of showing the spinner in the application's menu since
it is deprecated.

2 files changed, 0 insertions, 32 deletions

diff --git a/demos/widgetsgallery/spinnerpage.cpp b/demos/widgetsgallery/spinnerpage.cpp
index ccab5720..3cef2a40 100644
--- a/demos/widgetsgallery/spinnerpage.cpp
+++ b/demos/widgetsgallery/spinnerpage.cpp
@@ -51,7 +51,6 @@ SpinnerPage::SpinnerPage() :
     imageContainerPolicy(0),
     actionInMainArea(0),
     actionInContainerHeader(0),
-    actionInAppMenu(0),
     actionInDialog(0)
 {
 }
@@ -79,11 +78,6 @@ void SpinnerPage::createContent()
     connect(actionInContainerHeader, SIGNAL(triggered()), this, SLOT(inContainerHeader()));
     addAction(actionInContainerHeader);
 
-    actionInAppMenu = new MAction(this);
-    actionInAppMenu->setLocation(MAction::ApplicationMenuLocation);
-    connect(actionInAppMenu, SIGNAL(triggered()), this, SLOT(inApplicationMenu()));
-    addAction(actionInAppMenu);
-
     actionInDialog = new MAction(this);
     actionInDialog->setLocation(MAction::ApplicationMenuLocation);
     connect(actionInDialog, SIGNAL(triggered()), this, SLOT(inDialog()));
@@ -112,8 +106,6 @@ void SpinnerPage::retranslateUi()
     actionInMainArea->setText(qtTrId("xx_spinner_page_application_main_area"));
     //% "In container header"
     actionInContainerHeader->setText(qtTrId("xx_spinner_page_container_header"));
-    //% "In application menu"
-    actionInAppMenu->setText(qtTrId("xx_spinner_page_menu"));
     //% "In dialog"
     actionInDialog->setText(qtTrId("xx_spinner_page_dialog"));
 }
@@ -204,20 +196,6 @@ void SpinnerPage::timeout()
     }
 }
 
-void SpinnerPage::inApplicationMenu()
-{
-    reset();
-    view = Menu;
-
-    description = new MLabel(centralWidget());
-    //% "Spinner in the application menu area indicates that the whole view is pending for update."
-    description->setText("<a></a>" + qtTrId("xx_spinner_page_application_menu_description"));
-    description->setWordWrap(true);
-    containerPolicy->addItem(description);
-    setProgressIndicatorVisible(true);
-
-}
-
 void SpinnerPage::inDialog()
 {
     reset();
@@ -284,13 +262,6 @@ void SpinnerPage::reset()
         description = NULL;
     } break;
 
-    case Menu: {
-        setProgressIndicatorVisible(false);
-        containerPolicy->removeItem(description);
-        delete description;
-        description = NULL;
-    } break;
-
     case Dialog: {
         containerPolicy->removeItem(description);
         delete description;
diff --git a/demos/widgetsgallery/spinnerpage.h b/demos/widgetsgallery/spinnerpage.h
index 7828cd50..a48cc91b 100644
--- a/demos/widgetsgallery/spinnerpage.h
+++ b/demos/widgetsgallery/spinnerpage.h
@@ -37,7 +37,6 @@ class SpinnerPage : public TemplatePage
         Unknown,
         ApplicationMainArea,
         ContainerHeader,
-        Menu,
         Dialog
     };
 
@@ -49,7 +48,6 @@ public:
 public slots:
     void inApplicationMainArea();
     void inContainerHeader();
-    void inApplicationMenu();
     void inDialog();
     void launchDialog();
 
@@ -71,7 +69,6 @@ private:
     MFlowLayoutPolicy *imageContainerPolicy;
     MAction *actionInMainArea;
     MAction *actionInContainerHeader;
-    MAction *actionInAppMenu;
     MAction *actionInDialog;
 };