diff --git a/.gitmodules b/.gitmodules index 541fe6c..54c4817 100644 --- a/.gitmodules +++ b/.gitmodules @@ -71,3 +71,6 @@ path = plugins/pythonvideoannotator-module-idtrackerai url = https://github.com/UmSenhorQualquer/pythonvideoannotator-module-idtrackerai.git +[submodule "plugins/pythonvideoannotator-module-gitsync"] + path = plugins/pythonvideoannotator-module-gitsync + url = https://github.com/fchampalimaud/pythonvideoannotator-module-gitsync.git diff --git a/base/pythonvideoannotator-models b/base/pythonvideoannotator-models index 31c2e28..aa8522d 160000 --- a/base/pythonvideoannotator-models +++ b/base/pythonvideoannotator-models @@ -1 +1 @@ -Subproject commit 31c2e2896bceb0bed6c166952adcd22f4769b332 +Subproject commit aa8522d43fc4a67c4c662c19bcb8d0a861dab5da diff --git a/base/pythonvideoannotator-models-gui b/base/pythonvideoannotator-models-gui index 3d0d810..770b604 160000 --- a/base/pythonvideoannotator-models-gui +++ b/base/pythonvideoannotator-models-gui @@ -1 +1 @@ -Subproject commit 3d0d81077b02cc0d02c1147a2af1cbde3ffd8285 +Subproject commit 770b604a0a817869c7d814dcc5da8073e82abe36 diff --git a/base/pythonvideoannotator/pythonvideoannotator/resources/__init__.py b/base/pythonvideoannotator/pythonvideoannotator/resources/__init__.py index 7a0bebc..72b2e17 100644 --- a/base/pythonvideoannotator/pythonvideoannotator/resources/__init__.py +++ b/base/pythonvideoannotator/pythonvideoannotator/resources/__init__.py @@ -33,6 +33,8 @@ def path(filename): return os.path.join(os.path.dirname(__file__), 'icons', file ANNOTATOR_ICON_OBJECT = QtGui.QIcon(path('object.png')) ANNOTATOR_ICON_OPEN = QtGui.QIcon(path('open.png')) ANNOTATOR_ICON_SAVE = QtGui.QIcon(path('save.png')) +ANNOTATOR_ICON_IMPORTDB = QtGui.QIcon(path('import_db.png')) +ANNOTATOR_ICON_SYNC = QtGui.QIcon(path('sync.png')) ANNOTATOR_ICON_EXIT = QtGui.QIcon(path('exit.png')) ANNOTATOR_ICON_EDIT = QtGui.QIcon(path('edit.png')) ANNOTATOR_ICON_DELETE = QtGui.QIcon(path('delete.png')) diff --git a/base/pythonvideoannotator/pythonvideoannotator/resources/icons/import_db.png b/base/pythonvideoannotator/pythonvideoannotator/resources/icons/import_db.png new file mode 100644 index 0000000..84151f3 Binary files /dev/null and b/base/pythonvideoannotator/pythonvideoannotator/resources/icons/import_db.png differ diff --git a/base/pythonvideoannotator/pythonvideoannotator/resources/icons/sync.png b/base/pythonvideoannotator/pythonvideoannotator/resources/icons/sync.png new file mode 100644 index 0000000..261cace Binary files /dev/null and b/base/pythonvideoannotator/pythonvideoannotator/resources/icons/sync.png differ diff --git a/base/pythonvideoannotator/pythonvideoannotator/settings.py b/base/pythonvideoannotator/pythonvideoannotator/settings.py index 04036fd..e925c2a 100644 --- a/base/pythonvideoannotator/pythonvideoannotator/settings.py +++ b/base/pythonvideoannotator/pythonvideoannotator/settings.py @@ -58,6 +58,7 @@ MODULES += 'pythonvideoannotator_module_pathmap' MODULES += 'pythonvideoannotator_module_deeplab' MODULES += 'pythonvideoannotator_module_idtrackerai' +MODULES += 'pythonvideoannotator_module_gitsync' diff --git a/plugins/pythonvideoannotator-module-gitsync b/plugins/pythonvideoannotator-module-gitsync new file mode 160000 index 0000000..ab97ddc --- /dev/null +++ b/plugins/pythonvideoannotator-module-gitsync @@ -0,0 +1 @@ +Subproject commit ab97ddc3bf3d7944be60d594a63f6faea2643079