Skip to content

Commit edebd6c

Browse files
All4GisAll4Gis
committed
compile ui/update ts/update metadata
1 parent 9ccefb1 commit edebd6c

21 files changed

+2591
-2763
lines changed

‎code/gui/resources_rc.py

+2,120-2,125
Large diffs are not rendered by default.

‎code/gui/ui_ColorDialog.py

+14-30
Original file line numberDiff line numberDiff line change
@@ -8,83 +8,68 @@
88

99
from PyQt5 import QtCore, QtGui, QtWidgets
1010

11-
1211
class Ui_ColorDialog(object):
1312
def setupUi(self, ColorDialog):
1413
ColorDialog.setObjectName("ColorDialog")
1514
ColorDialog.resize(347, 161)
1615
ColorDialog.setMaximumSize(QtCore.QSize(16777215, 220))
1716
icon = QtGui.QIcon()
18-
icon.addPixmap(QtGui.QPixmap(
19-
":/imgFMV/images/color_picker.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
17+
icon.addPixmap(QtGui.QPixmap(":/imgFMV/images/color_picker.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
2018
ColorDialog.setWindowIcon(icon)
21-
ColorDialog.setLocale(QtCore.QLocale(
22-
QtCore.QLocale.English, QtCore.QLocale.UnitedStates))
19+
ColorDialog.setLocale(QtCore.QLocale(QtCore.QLocale.English, QtCore.QLocale.UnitedStates))
2320
self.verticalLayout = QtWidgets.QVBoxLayout(ColorDialog)
2421
self.verticalLayout.setObjectName("verticalLayout")
2522
self.formLayout_2 = QtWidgets.QFormLayout()
2623
self.formLayout_2.setObjectName("formLayout_2")
2724
self.label = QtWidgets.QLabel(ColorDialog)
2825
self.label.setObjectName("label")
29-
self.formLayout_2.setWidget(
30-
0, QtWidgets.QFormLayout.LabelRole, self.label)
26+
self.formLayout_2.setWidget(0, QtWidgets.QFormLayout.LabelRole, self.label)
3127
self.brightnessSlider = QtWidgets.QSlider(ColorDialog)
3228
self.brightnessSlider.setMinimum(-100)
3329
self.brightnessSlider.setMaximum(100)
3430
self.brightnessSlider.setOrientation(QtCore.Qt.Horizontal)
3531
self.brightnessSlider.setObjectName("brightnessSlider")
36-
self.formLayout_2.setWidget(
37-
0, QtWidgets.QFormLayout.FieldRole, self.brightnessSlider)
32+
self.formLayout_2.setWidget(0, QtWidgets.QFormLayout.FieldRole, self.brightnessSlider)
3833
self.label_2 = QtWidgets.QLabel(ColorDialog)
3934
self.label_2.setObjectName("label_2")
40-
self.formLayout_2.setWidget(
41-
1, QtWidgets.QFormLayout.LabelRole, self.label_2)
35+
self.formLayout_2.setWidget(1, QtWidgets.QFormLayout.LabelRole, self.label_2)
4236
self.label_3 = QtWidgets.QLabel(ColorDialog)
4337
self.label_3.setObjectName("label_3")
44-
self.formLayout_2.setWidget(
45-
2, QtWidgets.QFormLayout.LabelRole, self.label_3)
38+
self.formLayout_2.setWidget(2, QtWidgets.QFormLayout.LabelRole, self.label_3)
4639
self.label_4 = QtWidgets.QLabel(ColorDialog)
4740
self.label_4.setObjectName("label_4")
48-
self.formLayout_2.setWidget(
49-
3, QtWidgets.QFormLayout.LabelRole, self.label_4)
41+
self.formLayout_2.setWidget(3, QtWidgets.QFormLayout.LabelRole, self.label_4)
5042
self.contrastSlider = QtWidgets.QSlider(ColorDialog)
5143
self.contrastSlider.setMinimum(-100)
5244
self.contrastSlider.setMaximum(100)
5345
self.contrastSlider.setOrientation(QtCore.Qt.Horizontal)
5446
self.contrastSlider.setObjectName("contrastSlider")
55-
self.formLayout_2.setWidget(
56-
1, QtWidgets.QFormLayout.FieldRole, self.contrastSlider)
47+
self.formLayout_2.setWidget(1, QtWidgets.QFormLayout.FieldRole, self.contrastSlider)
5748
self.hueSlider = QtWidgets.QSlider(ColorDialog)
5849
self.hueSlider.setMinimum(-100)
5950
self.hueSlider.setMaximum(100)
6051
self.hueSlider.setOrientation(QtCore.Qt.Horizontal)
6152
self.hueSlider.setObjectName("hueSlider")
62-
self.formLayout_2.setWidget(
63-
2, QtWidgets.QFormLayout.FieldRole, self.hueSlider)
53+
self.formLayout_2.setWidget(2, QtWidgets.QFormLayout.FieldRole, self.hueSlider)
6454
self.saturationSlider = QtWidgets.QSlider(ColorDialog)
6555
self.saturationSlider.setMinimum(-100)
6656
self.saturationSlider.setMaximum(100)
6757
self.saturationSlider.setOrientation(QtCore.Qt.Horizontal)
6858
self.saturationSlider.setObjectName("saturationSlider")
69-
self.formLayout_2.setWidget(
70-
3, QtWidgets.QFormLayout.FieldRole, self.saturationSlider)
59+
self.formLayout_2.setWidget(3, QtWidgets.QFormLayout.FieldRole, self.saturationSlider)
7160
self.verticalLayout.addLayout(self.formLayout_2)
72-
spacerItem = QtWidgets.QSpacerItem(
73-
20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
61+
spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
7462
self.verticalLayout.addItem(spacerItem)
7563
self.pushButton = QtWidgets.QPushButton(ColorDialog)
7664
self.pushButton.setObjectName("pushButton")
7765
self.verticalLayout.addWidget(self.pushButton)
7866

7967
self.retranslateUi(ColorDialog)
8068
self.pushButton.clicked.connect(ColorDialog.ResetColorValues)
81-
self.brightnessSlider.valueChanged['int'].connect(
82-
ColorDialog.ColorChange)
83-
self.contrastSlider.valueChanged['int'].connect(
84-
ColorDialog.ColorChange)
69+
self.brightnessSlider.valueChanged['int'].connect(ColorDialog.ColorChange)
70+
self.contrastSlider.valueChanged['int'].connect(ColorDialog.ColorChange)
8571
self.hueSlider.valueChanged['int'].connect(ColorDialog.ColorChange)
86-
self.saturationSlider.valueChanged['int'].connect(
87-
ColorDialog.ColorChange)
72+
self.saturationSlider.valueChanged['int'].connect(ColorDialog.ColorChange)
8873
QtCore.QMetaObject.connectSlotsByName(ColorDialog)
8974

9075
def retranslateUi(self, ColorDialog):
@@ -96,5 +81,4 @@ def retranslateUi(self, ColorDialog):
9681
self.label_4.setText(_translate("ColorDialog", "Saturation"))
9782
self.pushButton.setText(_translate("ColorDialog", "Reset"))
9883

99-
10084
from QGIS_FMV.gui import resources_rc

‎code/gui/ui_FmvAbout.py

+1-4
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,12 @@
88

99
from PyQt5 import QtCore, QtGui, QtWidgets
1010

11-
1211
class Ui_FmvAbout(object):
1312
def setupUi(self, FmvAbout):
1413
FmvAbout.setObjectName("FmvAbout")
1514
FmvAbout.resize(643, 559)
1615
FmvAbout.setMinimumSize(QtCore.QSize(200, 250))
17-
FmvAbout.setLocale(QtCore.QLocale(
18-
QtCore.QLocale.English, QtCore.QLocale.UnitedStates))
16+
FmvAbout.setLocale(QtCore.QLocale(QtCore.QLocale.English, QtCore.QLocale.UnitedStates))
1917
self.verticalLayout = QtWidgets.QVBoxLayout(FmvAbout)
2018
self.verticalLayout.setObjectName("verticalLayout")
2119
self.webView = QtWebKitWidgets.QWebView(FmvAbout)
@@ -30,5 +28,4 @@ def retranslateUi(self, FmvAbout):
3028
_translate = QtCore.QCoreApplication.translate
3129
FmvAbout.setWindowTitle(_translate("FmvAbout", "Dialog"))
3230

33-
3431
from PyQt5 import QtWebKitWidgets

‎code/gui/ui_FmvManager.py

+35-51
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,14 @@
88

99
from PyQt5 import QtCore, QtGui, QtWidgets
1010

11-
1211
class Ui_ManagerWindow(object):
1312
def setupUi(self, ManagerWindow):
1413
ManagerWindow.setObjectName("ManagerWindow")
1514
ManagerWindow.resize(678, 180)
1615
icon = QtGui.QIcon()
17-
icon.addPixmap(QtGui.QPixmap(":/imgFMV/images/manager.png"),
18-
QtGui.QIcon.Normal, QtGui.QIcon.Off)
16+
icon.addPixmap(QtGui.QPixmap(":/imgFMV/images/manager.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
1917
ManagerWindow.setWindowIcon(icon)
20-
ManagerWindow.setLocale(QtCore.QLocale(
21-
QtCore.QLocale.English, QtCore.QLocale.UnitedStates))
18+
ManagerWindow.setLocale(QtCore.QLocale(QtCore.QLocale.English, QtCore.QLocale.UnitedStates))
2219
ManagerWindow.setFeatures(QtWidgets.QDockWidget.AllDockWidgetFeatures)
2320
self.dockWidgetContents = QtWidgets.QWidget()
2421
self.dockWidgetContents.setObjectName("dockWidgetContents")
@@ -27,8 +24,8 @@ def setupUi(self, ManagerWindow):
2724
self.verticalLayout.setObjectName("verticalLayout")
2825
self.menubarwidget = QtWidgets.QMenuBar(self.dockWidgetContents)
2926
self.menubarwidget.setStyleSheet("QMenuBar {\n"
30-
" background-color: transparent;\n"
31-
"}")
27+
" background-color: transparent;\n"
28+
"}")
3229
self.menubarwidget.setObjectName("menubarwidget")
3330
self.menuFile = QtWidgets.QMenu(self.menubarwidget)
3431
self.menuFile.setObjectName("menuFile")
@@ -41,38 +38,34 @@ def setupUi(self, ManagerWindow):
4138
font.setWeight(75)
4239
font.setStyleStrategy(QtGui.QFont.PreferAntialias)
4340
self.VManager.setFont(font)
44-
self.VManager.viewport().setProperty(
45-
"cursor", QtGui.QCursor(QtCore.Qt.PointingHandCursor))
41+
self.VManager.viewport().setProperty("cursor", QtGui.QCursor(QtCore.Qt.PointingHandCursor))
4642
self.VManager.setFocusPolicy(QtCore.Qt.NoFocus)
4743
self.VManager.setContextMenuPolicy(QtCore.Qt.CustomContextMenu)
4844
self.VManager.setStyleSheet("QHeaderView::section\n"
49-
"{\n"
50-
"spacing: 10px;\n"
51-
"background-color: rgb(88,150,50);\n"
52-
"color: white;\n"
53-
"border: 1px solid rgb(147,176,35);\n"
54-
"margin: 0px;\n"
55-
"text-align: center;\n"
56-
"font-family: arial;\n"
57-
"font-size:12px;\n"
58-
"}\n"
59-
"\n"
60-
"QTableView\n"
61-
" {\n"
62-
" alternate-background-color: rgb(221, 233, 237); \n"
63-
" background-color: none;\n"
64-
"font-weight: bold;\n"
65-
"color: rgb(56, 95, 107);\n"
66-
" }\n"
67-
"")
68-
self.VManager.setEditTriggers(
69-
QtWidgets.QAbstractItemView.NoEditTriggers)
45+
"{\n"
46+
"spacing: 10px;\n"
47+
"background-color: rgb(88,150,50);\n"
48+
"color: white;\n"
49+
"border: 1px solid rgb(147,176,35);\n"
50+
"margin: 0px;\n"
51+
"text-align: center;\n"
52+
"font-family: arial;\n"
53+
"font-size:12px;\n"
54+
"}\n"
55+
"\n"
56+
"QTableView\n"
57+
" {\n"
58+
" alternate-background-color: rgb(221, 233, 237); \n"
59+
" background-color: none;\n"
60+
"font-weight: bold;\n"
61+
"color: rgb(56, 95, 107);\n"
62+
" }\n"
63+
"")
64+
self.VManager.setEditTriggers(QtWidgets.QAbstractItemView.NoEditTriggers)
7065
self.VManager.setDragDropMode(QtWidgets.QAbstractItemView.NoDragDrop)
7166
self.VManager.setAlternatingRowColors(True)
72-
self.VManager.setSelectionMode(
73-
QtWidgets.QAbstractItemView.SingleSelection)
74-
self.VManager.setSelectionBehavior(
75-
QtWidgets.QAbstractItemView.SelectRows)
67+
self.VManager.setSelectionMode(QtWidgets.QAbstractItemView.SingleSelection)
68+
self.VManager.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectRows)
7669
self.VManager.setGridStyle(QtCore.Qt.SolidLine)
7770
self.VManager.setObjectName("VManager")
7871
self.VManager.setColumnCount(4)
@@ -91,33 +84,27 @@ def setupUi(self, ManagerWindow):
9184
ManagerWindow.setWidget(self.dockWidgetContents)
9285
self.actionOpen_Stream = QtWidgets.QAction(ManagerWindow)
9386
icon1 = QtGui.QIcon()
94-
icon1.addPixmap(QtGui.QPixmap(":/imgFMV/images/stream.png"),
95-
QtGui.QIcon.Normal, QtGui.QIcon.Off)
87+
icon1.addPixmap(QtGui.QPixmap(":/imgFMV/images/stream.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
9688
self.actionOpen_Stream.setIcon(icon1)
9789
self.actionOpen_Stream.setObjectName("actionOpen_Stream")
9890
self.actionOpen_MPEG2_File = QtWidgets.QAction(ManagerWindow)
9991
icon2 = QtGui.QIcon()
100-
icon2.addPixmap(QtGui.QPixmap(":/imgFMV/images/misb-file.png"),
101-
QtGui.QIcon.Normal, QtGui.QIcon.Off)
92+
icon2.addPixmap(QtGui.QPixmap(":/imgFMV/images/misb-file.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
10293
self.actionOpen_MPEG2_File.setIcon(icon2)
10394
self.actionOpen_MPEG2_File.setObjectName("actionOpen_MPEG2_File")
10495
self.menuFile.addAction(self.actionOpen_Stream)
10596
self.menuFile.addAction(self.actionOpen_MPEG2_File)
10697
self.menubarwidget.addAction(self.menuFile.menuAction())
10798

10899
self.retranslateUi(ManagerWindow)
109-
self.actionOpen_Stream.triggered.connect(
110-
ManagerWindow.openStreamDialog)
111-
self.VManager.doubleClicked['QModelIndex'].connect(
112-
ManagerWindow.PlayVideoFromManager)
113-
self.actionOpen_MPEG2_File.triggered.connect(
114-
ManagerWindow.openVideoFileDialog)
100+
self.actionOpen_Stream.triggered.connect(ManagerWindow.openStreamDialog)
101+
self.VManager.doubleClicked['QModelIndex'].connect(ManagerWindow.PlayVideoFromManager)
102+
self.actionOpen_MPEG2_File.triggered.connect(ManagerWindow.openVideoFileDialog)
115103
QtCore.QMetaObject.connectSlotsByName(ManagerWindow)
116104

117105
def retranslateUi(self, ManagerWindow):
118106
_translate = QtCore.QCoreApplication.translate
119-
ManagerWindow.setWindowTitle(
120-
_translate("ManagerWindow", "Video Manager"))
107+
ManagerWindow.setWindowTitle(_translate("ManagerWindow", "Video Manager"))
121108
self.menuFile.setTitle(_translate("ManagerWindow", "File"))
122109
item = self.VManager.horizontalHeaderItem(0)
123110
item.setText(_translate("ManagerWindow", "Id"))
@@ -127,10 +114,7 @@ def retranslateUi(self, ManagerWindow):
127114
item.setText(_translate("ManagerWindow", "Status"))
128115
item = self.VManager.horizontalHeaderItem(3)
129116
item.setText(_translate("ManagerWindow", "Source"))
130-
self.actionOpen_Stream.setText(
131-
_translate("ManagerWindow", "Open Stream"))
132-
self.actionOpen_MPEG2_File.setText(
133-
_translate("ManagerWindow", "Open MPEG2 File"))
134-
117+
self.actionOpen_Stream.setText(_translate("ManagerWindow", "Open Stream"))
118+
self.actionOpen_MPEG2_File.setText(_translate("ManagerWindow", "Open MPEG2 File"))
135119

136120
from QGIS_FMV.gui import resources_rc

‎code/gui/ui_FmvMetadata.py

+29-40
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,11 @@
88

99
from PyQt5 import QtCore, QtGui, QtWidgets
1010

11-
1211
class Ui_FmvMetadata(object):
1312
def setupUi(self, FmvMetadata):
1413
FmvMetadata.setObjectName("FmvMetadata")
1514
FmvMetadata.resize(780, 491)
16-
FmvMetadata.setLocale(QtCore.QLocale(
17-
QtCore.QLocale.English, QtCore.QLocale.UnitedStates))
15+
FmvMetadata.setLocale(QtCore.QLocale(QtCore.QLocale.English, QtCore.QLocale.UnitedStates))
1816
self.dockWidgetContents = QtWidgets.QWidget()
1917
self.dockWidgetContents.setMinimumSize(QtCore.QSize(300, 0))
2018
self.dockWidgetContents.setObjectName("dockWidgetContents")
@@ -23,8 +21,8 @@ def setupUi(self, FmvMetadata):
2321
self.verticalLayout.setObjectName("verticalLayout")
2422
self.menubarwidget = QtWidgets.QMenuBar(self.dockWidgetContents)
2523
self.menubarwidget.setStyleSheet("QMenuBar {\n"
26-
" background-color: transparent;\n"
27-
"}")
24+
" background-color: transparent;\n"
25+
"}")
2826
self.menubarwidget.setObjectName("menubarwidget")
2927
self.menuSave = QtWidgets.QMenu(self.menubarwidget)
3028
self.menuSave.setEnabled(False)
@@ -37,30 +35,28 @@ def setupUi(self, FmvMetadata):
3735
self.verticalLayout.addWidget(self.line)
3836
self.VManager = QtWidgets.QTableWidget(self.dockWidgetContents)
3937
self.VManager.setStyleSheet("QHeaderView::section\n"
40-
"{\n"
41-
"spacing: 10px;\n"
42-
"background-color: rgb(88,150,50);\n"
43-
"color: white;\n"
44-
"border: 1px solid rgb(147,176,35);\n"
45-
"margin: 1px;\n"
46-
"text-align: center;\n"
47-
"font-family: arial;\n"
48-
"font-size:12px;\n"
49-
"}\n"
50-
"\n"
51-
"QTableView\n"
52-
" {\n"
53-
" alternate-background-color: rgb(221, 233, 237); \n"
54-
" background-color: none;\n"
55-
"font-weight: bold;\n"
56-
"color: rgb(56, 95, 107);\n"
57-
" }")
58-
self.VManager.setEditTriggers(
59-
QtWidgets.QAbstractItemView.NoEditTriggers)
38+
"{\n"
39+
"spacing: 10px;\n"
40+
"background-color: rgb(88,150,50);\n"
41+
"color: white;\n"
42+
"border: 1px solid rgb(147,176,35);\n"
43+
"margin: 1px;\n"
44+
"text-align: center;\n"
45+
"font-family: arial;\n"
46+
"font-size:12px;\n"
47+
"}\n"
48+
"\n"
49+
"QTableView\n"
50+
" {\n"
51+
" alternate-background-color: rgb(221, 233, 237); \n"
52+
" background-color: none;\n"
53+
"font-weight: bold;\n"
54+
"color: rgb(56, 95, 107);\n"
55+
" }")
56+
self.VManager.setEditTriggers(QtWidgets.QAbstractItemView.NoEditTriggers)
6057
self.VManager.setAlternatingRowColors(True)
6158
self.VManager.setSelectionMode(QtWidgets.QAbstractItemView.NoSelection)
62-
self.VManager.setSelectionBehavior(
63-
QtWidgets.QAbstractItemView.SelectColumns)
59+
self.VManager.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectColumns)
6460
self.VManager.setTextElideMode(QtCore.Qt.ElideMiddle)
6561
self.VManager.setCornerButtonEnabled(False)
6662
self.VManager.setObjectName("VManager")
@@ -80,14 +76,12 @@ def setupUi(self, FmvMetadata):
8076
FmvMetadata.setWidget(self.dockWidgetContents)
8177
self.actionSave_as_PDF = QtWidgets.QAction(FmvMetadata)
8278
icon = QtGui.QIcon()
83-
icon.addPixmap(QtGui.QPixmap(":/imgFMV/images/pdf.png"),
84-
QtGui.QIcon.Normal, QtGui.QIcon.Off)
79+
icon.addPixmap(QtGui.QPixmap(":/imgFMV/images/pdf.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
8580
self.actionSave_as_PDF.setIcon(icon)
8681
self.actionSave_as_PDF.setObjectName("actionSave_as_PDF")
8782
self.actionSave_as_CSV = QtWidgets.QAction(FmvMetadata)
8883
icon1 = QtGui.QIcon()
89-
icon1.addPixmap(QtGui.QPixmap(":/imgFMV/images/csv.png"),
90-
QtGui.QIcon.Normal, QtGui.QIcon.Off)
84+
icon1.addPixmap(QtGui.QPixmap(":/imgFMV/images/csv.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
9185
self.actionSave_as_CSV.setIcon(icon1)
9286
self.actionSave_as_CSV.setObjectName("actionSave_as_CSV")
9387
self.menuSave.addAction(self.actionSave_as_PDF)
@@ -109,14 +103,9 @@ def retranslateUi(self, FmvMetadata):
109103
item.setText(_translate("FmvMetadata", "Key"))
110104
item = self.VManager.horizontalHeaderItem(2)
111105
item.setText(_translate("FmvMetadata", "Value"))
112-
self.actionSave_as_PDF.setText(
113-
_translate("FmvMetadata", "Save as PDF"))
114-
self.actionSave_as_PDF.setShortcut(
115-
_translate("FmvMetadata", "Ctrl+Shift+P"))
116-
self.actionSave_as_CSV.setText(
117-
_translate("FmvMetadata", "Save as CSV"))
118-
self.actionSave_as_CSV.setShortcut(
119-
_translate("FmvMetadata", "Ctrl+Shift+C"))
120-
106+
self.actionSave_as_PDF.setText(_translate("FmvMetadata", "Save as PDF"))
107+
self.actionSave_as_PDF.setShortcut(_translate("FmvMetadata", "Ctrl+Shift+P"))
108+
self.actionSave_as_CSV.setText(_translate("FmvMetadata", "Save as CSV"))
109+
self.actionSave_as_CSV.setShortcut(_translate("FmvMetadata", "Ctrl+Shift+C"))
121110

122111
from QGIS_FMV.gui import resources_rc

0 commit comments

Comments
 (0)