Skip to content

Commit 5e44654

Browse files
All4GisAll4Gis
committed
New Icons/Compile ui
1 parent 8e59bc0 commit 5e44654

18 files changed

+4543
-4414
lines changed

‎code/gui/resources_rc.py

+4,269-4,162
Large diffs are not rendered by default.

‎code/gui/ui_FmvPlayer.py

+60-54
Original file line numberDiff line numberDiff line change
@@ -362,122 +362,128 @@ def setupUi(self, PlayerWindow):
362362
self.actionInvert_Color.setObjectName("actionInvert_Color")
363363
self.actionMono_Filter = QtWidgets.QAction(PlayerWindow)
364364
self.actionMono_Filter.setCheckable(True)
365+
icon20 = QtGui.QIcon()
366+
icon20.addPixmap(QtGui.QPixmap(":/imgFMV/images/mono.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
367+
self.actionMono_Filter.setIcon(icon20)
365368
self.actionMono_Filter.setObjectName("actionMono_Filter")
366369
self.actionCanny_edge_detection = QtWidgets.QAction(PlayerWindow)
367370
self.actionCanny_edge_detection.setCheckable(True)
371+
icon21 = QtGui.QIcon()
372+
icon21.addPixmap(QtGui.QPixmap(":/imgFMV/images/canny.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
373+
self.actionCanny_edge_detection.setIcon(icon21)
368374
self.actionCanny_edge_detection.setObjectName("actionCanny_edge_detection")
369375
self.actionZoom_Rectangle = QtWidgets.QAction(PlayerWindow)
370376
self.actionZoom_Rectangle.setCheckable(True)
371377
self.actionZoom_Rectangle.setEnabled(True)
372378
self.actionZoom_Rectangle.setObjectName("actionZoom_Rectangle")
373379
self.actionMagnifying_glass = QtWidgets.QAction(PlayerWindow)
374380
self.actionMagnifying_glass.setCheckable(True)
375-
icon20 = QtGui.QIcon()
376-
icon20.addPixmap(QtGui.QPixmap(":/imgFMV/images/magnifier-glass.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
377-
self.actionMagnifying_glass.setIcon(icon20)
381+
icon22 = QtGui.QIcon()
382+
icon22.addPixmap(QtGui.QPixmap(":/imgFMV/images/magnifier-glass.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
383+
self.actionMagnifying_glass.setIcon(icon22)
378384
self.actionMagnifying_glass.setObjectName("actionMagnifying_glass")
379385
self.actionAuto_Contrast_Filter = QtWidgets.QAction(PlayerWindow)
380386
self.actionAuto_Contrast_Filter.setCheckable(True)
381-
icon21 = QtGui.QIcon()
382-
icon21.addPixmap(QtGui.QPixmap(":/imgFMV/images/automatic-contrast.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
383-
self.actionAuto_Contrast_Filter.setIcon(icon21)
387+
icon23 = QtGui.QIcon()
388+
icon23.addPixmap(QtGui.QPixmap(":/imgFMV/images/automatic-contrast.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
389+
self.actionAuto_Contrast_Filter.setIcon(icon23)
384390
self.actionAuto_Contrast_Filter.setObjectName("actionAuto_Contrast_Filter")
385391
self.actionCreate_Mosaic = QtWidgets.QAction(PlayerWindow)
386392
self.actionCreate_Mosaic.setIcon(icon3)
387393
self.actionCreate_Mosaic.setObjectName("actionCreate_Mosaic")
388394
self.actionDraw_Pinpoint = QtWidgets.QAction(PlayerWindow)
389395
self.actionDraw_Pinpoint.setCheckable(True)
390-
icon22 = QtGui.QIcon()
391-
icon22.addPixmap(QtGui.QPixmap(":/imgFMV/images/draw-point.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
392-
self.actionDraw_Pinpoint.setIcon(icon22)
396+
icon24 = QtGui.QIcon()
397+
icon24.addPixmap(QtGui.QPixmap(":/imgFMV/images/draw-point.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
398+
self.actionDraw_Pinpoint.setIcon(icon24)
393399
self.actionDraw_Pinpoint.setObjectName("actionDraw_Pinpoint")
394400
self.actionDraw_Line = QtWidgets.QAction(PlayerWindow)
395401
self.actionDraw_Line.setCheckable(True)
396-
icon23 = QtGui.QIcon()
397-
icon23.addPixmap(QtGui.QPixmap(":/imgFMV/images/draw-polyline.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
398-
self.actionDraw_Line.setIcon(icon23)
402+
icon25 = QtGui.QIcon()
403+
icon25.addPixmap(QtGui.QPixmap(":/imgFMV/images/draw-polyline.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
404+
self.actionDraw_Line.setIcon(icon25)
399405
self.actionDraw_Line.setObjectName("actionDraw_Line")
400406
self.actionDraw_Polygon = QtWidgets.QAction(PlayerWindow)
401407
self.actionDraw_Polygon.setCheckable(True)
402-
icon24 = QtGui.QIcon()
403-
icon24.addPixmap(QtGui.QPixmap(":/imgFMV/images/draw-polygon.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
404-
self.actionDraw_Polygon.setIcon(icon24)
408+
icon26 = QtGui.QIcon()
409+
icon26.addPixmap(QtGui.QPixmap(":/imgFMV/images/draw-polygon.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
410+
self.actionDraw_Polygon.setIcon(icon26)
405411
self.actionDraw_Polygon.setObjectName("actionDraw_Polygon")
406412
self.actionObject_Tracking = QtWidgets.QAction(PlayerWindow)
407413
self.actionObject_Tracking.setCheckable(True)
408-
icon25 = QtGui.QIcon()
409-
icon25.addPixmap(QtGui.QPixmap(":/imgFMV/images/object-tracking.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
410-
self.actionObject_Tracking.setIcon(icon25)
414+
icon27 = QtGui.QIcon()
415+
icon27.addPixmap(QtGui.QPixmap(":/imgFMV/images/object-tracking.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
416+
self.actionObject_Tracking.setIcon(icon27)
411417
self.actionObject_Tracking.setObjectName("actionObject_Tracking")
412418
self.actionRuler = QtWidgets.QAction(PlayerWindow)
413419
self.actionRuler.setCheckable(True)
414-
icon26 = QtGui.QIcon()
415-
icon26.addPixmap(QtGui.QPixmap(":/imgFMV/images/ruler.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
416-
self.actionRuler.setIcon(icon26)
420+
icon28 = QtGui.QIcon()
421+
icon28.addPixmap(QtGui.QPixmap(":/imgFMV/images/ruler.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
422+
self.actionRuler.setIcon(icon28)
417423
self.actionRuler.setObjectName("actionRuler")
418424
self.actionMirroredH = QtWidgets.QAction(PlayerWindow)
419425
self.actionMirroredH.setCheckable(True)
420-
icon27 = QtGui.QIcon()
421-
icon27.addPixmap(QtGui.QPixmap(":/imgFMV/images/mirrored.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
422-
self.actionMirroredH.setIcon(icon27)
426+
icon29 = QtGui.QIcon()
427+
icon29.addPixmap(QtGui.QPixmap(":/imgFMV/images/mirrored.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
428+
self.actionMirroredH.setIcon(icon29)
423429
self.actionMirroredH.setObjectName("actionMirroredH")
424430
self.actionCensure = QtWidgets.QAction(PlayerWindow)
425431
self.actionCensure.setCheckable(True)
426-
icon28 = QtGui.QIcon()
427-
icon28.addPixmap(QtGui.QPixmap(":/imgFMV/images/censure-pencil.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
428-
self.actionCensure.setIcon(icon28)
432+
icon30 = QtGui.QIcon()
433+
icon30.addPixmap(QtGui.QPixmap(":/imgFMV/images/censure-pencil.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
434+
self.actionCensure.setIcon(icon30)
429435
self.actionCensure.setObjectName("actionCensure")
430436
self.actionRemove_Last_censured = QtWidgets.QAction(PlayerWindow)
431-
icon29 = QtGui.QIcon()
432-
icon29.addPixmap(QtGui.QPixmap(":/imgFMV/images/censure-pencil-remove-last.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
433-
self.actionRemove_Last_censured.setIcon(icon29)
437+
icon31 = QtGui.QIcon()
438+
icon31.addPixmap(QtGui.QPixmap(":/imgFMV/images/censure-pencil-remove-last.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
439+
self.actionRemove_Last_censured.setIcon(icon31)
434440
self.actionRemove_Last_censured.setObjectName("actionRemove_Last_censured")
435441
self.actionRemove_All_censured = QtWidgets.QAction(PlayerWindow)
436-
icon30 = QtGui.QIcon()
437-
icon30.addPixmap(QtGui.QPixmap(":/imgFMV/images/censure-pencil-remove-all.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
438-
self.actionRemove_All_censured.setIcon(icon30)
442+
icon32 = QtGui.QIcon()
443+
icon32.addPixmap(QtGui.QPixmap(":/imgFMV/images/censure-pencil-remove-all.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
444+
self.actionRemove_All_censured.setIcon(icon32)
439445
self.actionRemove_All_censured.setObjectName("actionRemove_All_censured")
440446
self.actionDraw_Polygon_remove_last = QtWidgets.QAction(PlayerWindow)
441447
self.actionDraw_Polygon_remove_last.setCheckable(False)
442-
icon31 = QtGui.QIcon()
443-
icon31.addPixmap(QtGui.QPixmap(":/imgFMV/images/draw-polygon-remove-last.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
444-
self.actionDraw_Polygon_remove_last.setIcon(icon31)
448+
icon33 = QtGui.QIcon()
449+
icon33.addPixmap(QtGui.QPixmap(":/imgFMV/images/draw-polygon-remove-last.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
450+
self.actionDraw_Polygon_remove_last.setIcon(icon33)
445451
self.actionDraw_Polygon_remove_last.setObjectName("actionDraw_Polygon_remove_last")
446452
self.actionDraw_Polygon_remove_all = QtWidgets.QAction(PlayerWindow)
447453
self.actionDraw_Polygon_remove_all.setCheckable(False)
448-
icon32 = QtGui.QIcon()
449-
icon32.addPixmap(QtGui.QPixmap(":/imgFMV/images/draw-polygon-remove-all.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
450-
self.actionDraw_Polygon_remove_all.setIcon(icon32)
454+
icon34 = QtGui.QIcon()
455+
icon34.addPixmap(QtGui.QPixmap(":/imgFMV/images/draw-polygon-remove-all.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
456+
self.actionDraw_Polygon_remove_all.setIcon(icon34)
451457
self.actionDraw_Polygon_remove_all.setObjectName("actionDraw_Polygon_remove_all")
452458
self.actionRemove_Last_Pinpoint = QtWidgets.QAction(PlayerWindow)
453459
self.actionRemove_Last_Pinpoint.setCheckable(False)
454-
icon33 = QtGui.QIcon()
455-
icon33.addPixmap(QtGui.QPixmap(":/imgFMV/images/draw-point-remove-last.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
456-
self.actionRemove_Last_Pinpoint.setIcon(icon33)
460+
icon35 = QtGui.QIcon()
461+
icon35.addPixmap(QtGui.QPixmap(":/imgFMV/images/draw-point-remove-last.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
462+
self.actionRemove_Last_Pinpoint.setIcon(icon35)
457463
self.actionRemove_Last_Pinpoint.setObjectName("actionRemove_Last_Pinpoint")
458464
self.actionRemove_All_Pinpoint = QtWidgets.QAction(PlayerWindow)
459465
self.actionRemove_All_Pinpoint.setCheckable(False)
460-
icon34 = QtGui.QIcon()
461-
icon34.addPixmap(QtGui.QPixmap(":/imgFMV/images/draw-point-remove-all.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
462-
self.actionRemove_All_Pinpoint.setIcon(icon34)
466+
icon36 = QtGui.QIcon()
467+
icon36.addPixmap(QtGui.QPixmap(":/imgFMV/images/draw-point-remove-all.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
468+
self.actionRemove_All_Pinpoint.setIcon(icon36)
463469
self.actionRemove_All_Pinpoint.setObjectName("actionRemove_All_Pinpoint")
464470
self.actionRemove_All_Line = QtWidgets.QAction(PlayerWindow)
465471
self.actionRemove_All_Line.setCheckable(False)
466-
icon35 = QtGui.QIcon()
467-
icon35.addPixmap(QtGui.QPixmap(":/imgFMV/images/draw-polyline-remove-all.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
468-
self.actionRemove_All_Line.setIcon(icon35)
472+
icon37 = QtGui.QIcon()
473+
icon37.addPixmap(QtGui.QPixmap(":/imgFMV/images/draw-polyline-remove-all.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
474+
self.actionRemove_All_Line.setIcon(icon37)
469475
self.actionRemove_All_Line.setObjectName("actionRemove_All_Line")
470476
self.actionLast_Segment_Line = QtWidgets.QAction(PlayerWindow)
471477
self.actionLast_Segment_Line.setCheckable(False)
472-
icon36 = QtGui.QIcon()
473-
icon36.addPixmap(QtGui.QPixmap(":/imgFMV/images/draw-polyline-remove-last-segment.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
474-
self.actionLast_Segment_Line.setIcon(icon36)
478+
icon38 = QtGui.QIcon()
479+
icon38.addPixmap(QtGui.QPixmap(":/imgFMV/images/draw-polyline-remove-last-segment.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
480+
self.actionLast_Segment_Line.setIcon(icon38)
475481
self.actionLast_Segment_Line.setObjectName("actionLast_Segment_Line")
476482
self.actionRemove_Last_Line = QtWidgets.QAction(PlayerWindow)
477483
self.actionRemove_Last_Line.setCheckable(False)
478-
icon37 = QtGui.QIcon()
479-
icon37.addPixmap(QtGui.QPixmap(":/imgFMV/images/draw-polyline-remove-last.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
480-
self.actionRemove_Last_Line.setIcon(icon37)
484+
icon39 = QtGui.QIcon()
485+
icon39.addPixmap(QtGui.QPixmap(":/imgFMV/images/draw-polyline-remove-last.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
486+
self.actionRemove_Last_Line.setIcon(icon39)
481487
self.actionRemove_Last_Line.setObjectName("actionRemove_Last_Line")
482488
self.toolBtn_DPoint.addAction(self.actionDraw_Pinpoint)
483489
self.toolBtn_DPoint.addAction(self.actionRemove_Last_Pinpoint)

‎code/i18n/qgisfmv_ca.ts

+24-24
Original file line numberDiff line numberDiff line change
@@ -437,62 +437,62 @@
437437
<translation>Inverteix el color</translation>
438438
</message>
439439
<message>
440-
<location filename="../ui/ui_FmvPlayer.ui" line="848"/>
440+
<location filename="../ui/ui_FmvPlayer.ui" line="852"/>
441441
<source>Mono Filter</source>
442442
<translation type="unfinished"></translation>
443443
</message>
444444
<message>
445-
<location filename="../ui/ui_FmvPlayer.ui" line="856"/>
445+
<location filename="../ui/ui_FmvPlayer.ui" line="864"/>
446446
<source>Canny edge detection</source>
447447
<translation type="unfinished"></translation>
448448
</message>
449449
<message>
450-
<location filename="../ui/ui_FmvPlayer.ui" line="867"/>
450+
<location filename="../ui/ui_FmvPlayer.ui" line="875"/>
451451
<source>Zoom Rectangle</source>
452452
<translation>Zoom rectangle</translation>
453453
</message>
454454
<message>
455-
<location filename="../ui/ui_FmvPlayer.ui" line="879"/>
455+
<location filename="../ui/ui_FmvPlayer.ui" line="887"/>
456456
<source>Magnifying glass</source>
457457
<translation>Lupa</translation>
458458
</message>
459459
<message>
460-
<location filename="../ui/ui_FmvPlayer.ui" line="891"/>
460+
<location filename="../ui/ui_FmvPlayer.ui" line="899"/>
461461
<source>Auto Contrast Filter</source>
462462
<translation type="unfinished"></translation>
463463
</message>
464464
<message>
465-
<location filename="../ui/ui_FmvPlayer.ui" line="900"/>
465+
<location filename="../ui/ui_FmvPlayer.ui" line="908"/>
466466
<source>Create Mosaic</source>
467467
<translation>Crear mosaic</translation>
468468
</message>
469469
<message>
470-
<location filename="../ui/ui_FmvPlayer.ui" line="912"/>
470+
<location filename="../ui/ui_FmvPlayer.ui" line="920"/>
471471
<source>Draw Pinpoint</source>
472472
<translation type="unfinished"></translation>
473473
</message>
474474
<message>
475-
<location filename="../ui/ui_FmvPlayer.ui" line="924"/>
475+
<location filename="../ui/ui_FmvPlayer.ui" line="932"/>
476476
<source>Draw Line</source>
477477
<translation type="unfinished"></translation>
478478
</message>
479479
<message>
480-
<location filename="../ui/ui_FmvPlayer.ui" line="1044"/>
480+
<location filename="../ui/ui_FmvPlayer.ui" line="1052"/>
481481
<source>Draw Polygon</source>
482482
<translation type="unfinished"></translation>
483483
</message>
484484
<message>
485-
<location filename="../ui/ui_FmvPlayer.ui" line="954"/>
485+
<location filename="../ui/ui_FmvPlayer.ui" line="962"/>
486486
<source>Object Tracking</source>
487487
<translation type="unfinished"></translation>
488488
</message>
489489
<message>
490-
<location filename="../ui/ui_FmvPlayer.ui" line="966"/>
490+
<location filename="../ui/ui_FmvPlayer.ui" line="974"/>
491491
<source>Ruler</source>
492492
<translation type="unfinished"></translation>
493493
</message>
494494
<message>
495-
<location filename="../ui/ui_FmvPlayer.ui" line="978"/>
495+
<location filename="../ui/ui_FmvPlayer.ui" line="986"/>
496496
<source>Horizontal Mirrored</source>
497497
<translation type="unfinished"></translation>
498498
</message>
@@ -502,47 +502,47 @@
502502
<translation type="unfinished"></translation>
503503
</message>
504504
<message>
505-
<location filename="../ui/ui_FmvPlayer.ui" line="993"/>
505+
<location filename="../ui/ui_FmvPlayer.ui" line="1001"/>
506506
<source>Censure</source>
507507
<translation type="unfinished"></translation>
508508
</message>
509509
<message>
510-
<location filename="../ui/ui_FmvPlayer.ui" line="1002"/>
510+
<location filename="../ui/ui_FmvPlayer.ui" line="1010"/>
511511
<source>Remove Last</source>
512512
<translation type="unfinished"></translation>
513513
</message>
514514
<message>
515-
<location filename="../ui/ui_FmvPlayer.ui" line="1092"/>
515+
<location filename="../ui/ui_FmvPlayer.ui" line="1100"/>
516516
<source>Remove All</source>
517517
<translation type="unfinished"></translation>
518518
</message>
519519
<message>
520-
<location filename="../ui/ui_FmvPlayer.ui" line="1029"/>
520+
<location filename="../ui/ui_FmvPlayer.ui" line="1037"/>
521521
<source>Remove Last Polygon</source>
522522
<translation type="unfinished"></translation>
523523
</message>
524524
<message>
525-
<location filename="../ui/ui_FmvPlayer.ui" line="1047"/>
525+
<location filename="../ui/ui_FmvPlayer.ui" line="1055"/>
526526
<source>Remove All Polygon</source>
527527
<translation type="unfinished"></translation>
528528
</message>
529529
<message>
530-
<location filename="../ui/ui_FmvPlayer.ui" line="1062"/>
530+
<location filename="../ui/ui_FmvPlayer.ui" line="1070"/>
531531
<source>Remove Last Pinpoint</source>
532532
<translation type="unfinished"></translation>
533533
</message>
534534
<message>
535-
<location filename="../ui/ui_FmvPlayer.ui" line="1077"/>
535+
<location filename="../ui/ui_FmvPlayer.ui" line="1085"/>
536536
<source>Remove All Pinpoint</source>
537537
<translation type="unfinished"></translation>
538538
</message>
539539
<message>
540-
<location filename="../ui/ui_FmvPlayer.ui" line="1107"/>
540+
<location filename="../ui/ui_FmvPlayer.ui" line="1115"/>
541541
<source>Remove Last Segment</source>
542542
<translation type="unfinished"></translation>
543543
</message>
544544
<message>
545-
<location filename="../ui/ui_FmvPlayer.ui" line="1122"/>
545+
<location filename="../ui/ui_FmvPlayer.ui" line="1130"/>
546546
<source>Remove Last Line</source>
547547
<translation type="unfinished"></translation>
548548
</message>
@@ -605,7 +605,7 @@
605605
<translation type="unfinished"></translation>
606606
</message>
607607
<message>
608-
<location filename="../player/QgsFmvPlayer.py" line="1042"/>
608+
<location filename="../player/QgsFmvPlayer.py" line="1044"/>
609609
<source>Video Information : </source>
610610
<translation type="unfinished"></translation>
611611
</message>
@@ -621,7 +621,7 @@
621621
</translation>
622622
</message>
623623
<message>
624-
<location filename="../player/QgsFmvPlayer.py" line="1000"/>
624+
<location filename="../player/QgsFmvPlayer.py" line="1002"/>
625625
<source>Save Current Frame</source>
626626
<translation type="unfinished"></translation>
627627
</message>
@@ -641,7 +641,7 @@
641641
<translation type="unfinished"></translation>
642642
</message>
643643
<message>
644-
<location filename="../player/QgsFmvPlayer.py" line="967"/>
644+
<location filename="../player/QgsFmvPlayer.py" line="969"/>
645645
<source>Save all Frames</source>
646646
<translation type="unfinished"></translation>
647647
</message>

0 commit comments

Comments
 (0)