diff --git a/labelImg.py b/labelImg.py index f2ee59e6..2bed46bd 100755 --- a/labelImg.py +++ b/labelImg.py @@ -39,6 +39,7 @@ from libs.toolBar import ToolBar from libs.pascal_voc_io import PascalVocReader from libs.pascal_voc_io import XML_EXT from libs.ustr import ustr +from libs.version import __version__ __appname__ = 'labelImg' @@ -264,8 +265,8 @@ class MainWindow(QMainWindow, WindowMixin): 'Ctrl+A', 'hide', u'Show all Boxs', enabled=False) - help = action('&Tutorial', self.tutorial, 'Ctrl+T', 'help', - u'Show demos') + help = action('&Tutorial', self.showTutorialDialog, None, 'help', u'Show demos') + showInfo = action('&Information', self.showInfoDialog, None, 'help', u'Information') zoom = QWidgetAction(self) zoom.setDefaultWidget(self.zoomWidget) @@ -362,7 +363,7 @@ class MainWindow(QMainWindow, WindowMixin): addActions(self.menus.file, (open, opendir, changeSavedir, openAnnotation, self.menus.recentFiles, save, saveAs, close, resetAll, quit)) - addActions(self.menus.help, (help,)) + addActions(self.menus.help, (help, showInfo)) addActions(self.menus.view, ( self.autoSaving, self.singleClassMode, @@ -544,9 +545,13 @@ class MainWindow(QMainWindow, WindowMixin): return not self.beginner() ## Callbacks ## - def tutorial(self): + def showTutorialDialog(self): subprocess.Popen([self.screencastViewer, self.screencast]) + def showInfoDialog(self): + msg = u'Name:{0} \nApp Version:{1} \n{2} '.format(__appname__, __version__, sys.version_info) + QMessageBox.information(self, u'Information', msg) + def createShape(self): assert self.beginner() self.canvas.setEditing(False) diff --git a/libs/version.py b/libs/version.py new file mode 100644 index 00000000..23083a27 --- /dev/null +++ b/libs/version.py @@ -0,0 +1,2 @@ +__version_info__ = ('1', '5', '2') +__version__ = '.'.join(__version_info__) diff --git a/setup.cfg b/setup.cfg index d2f80e51..3b273b63 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,11 +1,8 @@ [bumpversion] -current_version = 1.5.2 commit = True tag = True [bumpversion:file:setup.py] -search = version='{current_version}' -replace = version='{new_version}' [bdist_wheel] universal = 1 diff --git a/setup.py b/setup.py index 7836a679..c4c6823a 100644 --- a/setup.py +++ b/setup.py @@ -2,6 +2,7 @@ # -*- coding: utf-8 -*- from setuptools import setup, find_packages +from libs.version import __version__ with open('README.rst') as readme_file: readme = readme_file.read() @@ -18,7 +19,7 @@ required_packages.append('labelImg') setup( name='labelImg', - version='1.5.2', + version=__version__, description="LabelImg is a graphical image annotation tool and label object bounding boxes in images", long_description=readme + '\n\n' + history, author="TzuTa Lin",