Merge pull request #45 from DiamondLightSource/I04_1-167_version_number

I04_1-167: added version number

Author: IsabellaRey

dls_barcode/config/store_directory_config_control.py

@@ -18,8 +18,8 @@ def before_apply(self):
 
         confirm_msg = "The Startup Store Directory was changed from " + current_dir + " to\n" + new_dir + ".\n\n"\
             "This change will only take effect at the next startup."
-        reply = QtGui.QMessageBox.question(self, 'Startup Store Directory',
-                                           confirm_msg, QtGui.QMessageBox.Ok, QtGui.QMessageBox.Cancel)
+        reply = QtGui.QMessageBox.information(self, 'Startup Store Directory',
+                                              confirm_msg, QtGui.QMessageBox.Ok, QtGui.QMessageBox.Cancel)
 
         if reply == QtGui.QMessageBox.Cancel:
             self.is_confirmed = False

dls_barcode/gui/main_window.py

@@ -23,10 +23,11 @@
 class DiamondBarcodeMainWindow(QtGui.QMainWindow):
     """ Main GUI window for the Barcode Scanner App.
     """
-    def __init__(self, config_file):
+    def __init__(self, config_file, version):
         super(DiamondBarcodeMainWindow, self).__init__()
 
         self._config = BarcodeConfig(config_file, FileManager())
+        self._version = version
 
         # UI elements
         self._record_table = None
@@ -115,7 +116,7 @@ def init_menu_bar(self):
         live_action = QtGui.QAction(QtGui.QIcon('open.png'), '&Camera Capture', self)
         live_action.setShortcut('Ctrl+W')
         live_action.setStatusTip('Capture continuously from camera')
-        live_action.triggered.connect(self._on_scan_menu_clicked)
+        live_action.triggered.connect(self._on_scan_action_clicked)
 
         # Exit Application
         exit_action = QtGui.QAction(QtGui.QIcon('exit.png'), '&Exit', self)
@@ -128,7 +129,11 @@ def init_menu_bar(self):
         options_action = QtGui.QAction(QtGui.QIcon('exit.png'), '&Options', self)
         options_action.setShortcut('Ctrl+O')
         options_action.setStatusTip('Open Options Dialog')
-        options_action.triggered.connect(self._on_options_menu_clicked)
+        options_action.triggered.connect(self._on_options_action_clicked)
+
+        # Show version number
+        about_action = QtGui.QAction("About", self)
+        about_action.triggered.connect(self._on_about_action_clicked)
 
         # Create menu bar
         menu_bar = self.menuBar()
@@ -141,14 +146,20 @@ def init_menu_bar(self):
         option_menu = menu_bar.addMenu('&Option')
         option_menu.addAction(options_action)
 
-    def _on_scan_menu_clicked(self):
+        help_menu = menu_bar.addMenu('?')
+        help_menu.addAction(about_action)
+
+    def _on_about_action_clicked(self):
+        QtGui.QMessageBox.about(self, 'About', "Version: " + self._version)
+
+    def _on_scan_action_clicked(self):
         print("MAIN: Scan menu clicked")
         if not self._camera_capture_alive():
             self._initialise_scanner()
 
         self._camera_switch.restart_live_capture_from_side()
 
-    def _on_options_menu_clicked(self):
+    def _on_options_action_clicked(self):
         result_ok = self._open_options_dialog()
         if not result_ok:
             return

dls_barcode/main.py

@@ -8,8 +8,9 @@
 from dls_util import multiprocessing_support
 
 from PyQt4 import QtGui
-from gui import DiamondBarcodeMainWindow
 import argparse
+from gui import DiamondBarcodeMainWindow
+from version import VERSION
 
 # Detect if the program is running from source or has been bundled
 IS_BUNDLED = getattr(sys, 'frozen', False)
@@ -19,9 +20,9 @@
     DEFAULT_CONFIG_FILE = "../config.ini"
 
 
-def main(config_file):
+def main(config_file, version):
     app = QtGui.QApplication(sys.argv)
-    ex = DiamondBarcodeMainWindow(config_file)
+    ex = DiamondBarcodeMainWindow(config_file, version)
     sys.exit(app.exec_())
 
 
@@ -37,4 +38,4 @@ def main(config_file):
     args = parser.parse_args()
     print("CONFIG: " + args.config_file)
 
-    main(args.config_file)
+    main(args.config_file, VERSION)

dls_barcode/version.py

@@ -0,0 +1 @@
+VERSION = "vX.x.p"