From f73c967b3e5845efc20e48e120459e42481ed1c4 Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Tue, 1 Dec 2015 18:22:12 +0800
Subject: [PATCH] gui/shortcuts: fix status bar usage

---
 artiq/frontend/artiq_gui.py |  2 +-
 artiq/gui/shortcuts.py      | 15 ++++++---------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/artiq/frontend/artiq_gui.py b/artiq/frontend/artiq_gui.py
index bc72b380b..c92b7940b 100755
--- a/artiq/frontend/artiq_gui.py
+++ b/artiq/frontend/artiq_gui.py
@@ -100,7 +100,7 @@ def main():
                                            sub_clients["schedule"],
                                            rpc_clients["schedule"])
     smgr.register(expmgr)
-    d_shortcuts = shortcuts.ShortcutsDock(win, status_bar, expmgr)
+    d_shortcuts = shortcuts.ShortcutsDock(win, expmgr)
     smgr.register(d_shortcuts)
     d_explorer = explorer.ExplorerDock(status_bar, expmgr, d_shortcuts,
                                        sub_clients["explist"],
diff --git a/artiq/gui/shortcuts.py b/artiq/gui/shortcuts.py
index 03dc315bc..472276c49 100644
--- a/artiq/gui/shortcuts.py
+++ b/artiq/gui/shortcuts.py
@@ -14,12 +14,11 @@ logger = logging.getLogger(__name__)
 
 
 class ShortcutsDock(dockarea.Dock):
-    def __init__(self, main_window, status_bar, exp_manager):
+    def __init__(self, main_window, exp_manager):
         dockarea.Dock.__init__(self, "Shortcuts", size=(1000, 300))
         self.layout.setSpacing(5)
         self.layout.setContentsMargins(5, 5, 5, 5)
 
-        self.status_bar = status_bar
         self.exp_manager = exp_manager
         self.shortcut_widgets = dict()
 
@@ -70,16 +69,12 @@ class ShortcutsDock(dockarea.Dock):
         expname = self.shortcut_widgets[nr]["label"].text()
         if expname:
             try:
-                rid = self.exp_manager.submit(expname)
+                self.exp_manager.submit(expname)
             except:
-                self.status_bar.showMessage("Could not submit experiment '{}'"
-                                            .format(expname))
+                # May happen when experiment has been removed
+                # from repository/explist
                 logger.warning("failed to submit experiment %s",
                                expname, exc_info=True)
-            else:
-                self.status_bar.showMessage("Submitted RID {} "
-                                            "(from global shortcut)"
-                                            .format(rid))
 
     def _open_experiment(self, nr):
         expname = self.shortcut_widgets[nr]["label"].text()
@@ -87,6 +82,8 @@ class ShortcutsDock(dockarea.Dock):
             try:
                 self.exp_manager.open_experiment(expname)
             except:
+                # May happen when experiment has been removed
+                # from repository/explist
                 logger.warning("failed to open experiment %s",
                                expname, exc_info=True)