fix about dialog credits content + mediainfo lib creds

ozmartian · May 11, 2017 · 8f97950 · 8f97950
1 parent c15ecd8
commit 8f97950
Show file tree

Hide file tree

Showing 8 changed files with 99,972 additions and 99,886 deletions.
diff --git a/vidcutter/about.py b/vidcutter/about.py
@@ -234,7 +234,7 @@ def __init__(self, parent=None):
                     </p>
                 </td>
             </tr>
-        </table>''' % '#EA95FF' if self.parent.parent.theme == 'dark' else '#441D4E')
+        </table>''' % ('#EA95FF' if self.parent.parent.theme == 'dark' else '#441D4E'))
 
 
 class LicenseTab(BaseTab):

diff --git a/vidcutter/images/dark/mediainfo-heading.png b/vidcutter/images/dark/mediainfo-heading.png
diff --git a/vidcutter/images/light/mediainfo-heading.png b/vidcutter/images/light/mediainfo-heading.png
diff --git a/vidcutter/libs/videoservice.py b/vidcutter/libs/videoservice.py
@@ -33,8 +33,6 @@
 from PyQt5.QtGui import QPixmap
 from PyQt5.QtWidgets import QMessageBox
 
-# from vidcutter.libs.mediainfo import MediaInfo
-
 
 class VideoService(QObject):
     def __init__(self, parent=None):

diff --git a/vidcutter/resources.py b/vidcutter/resources.py
diff --git a/vidcutter/styles/dark.qss b/vidcutter/styles/dark.qss
@@ -1,4 +1,4 @@
-/*************************************************************************
+w/*************************************************************************
  *  VidCutter - a simple yet fast & accurate video cutter & joiner
  *
  *  copyright © 2017 Pete Alexandrou
@@ -48,6 +48,11 @@ QDialog#aboutwidget {
     background-color: #1B2326;
 }
 
+QDialog#videoinfo {
+    border-image: url(':/images/dialog-backdrop-02.png') 0 0 0 0 stretch stretch;
+    background-color: #1B2326;
+}
+
 QDialog#updaterdialog {
     border-image: url(':/images/dialog-backdrop.png') 0 0 0 0 stretch stretch;
     background-color: #1B2326;
@@ -220,16 +225,13 @@ QStatusBar::item {
 
 /* -------------------------------------------------------------------------- */
 
-#aboutwidget QTextBrowser {
+QTextBrowser {
     background-color: rgba(12, 15, 16, 0.9);
     color: #FFF;
-    border: none;
 }
 
-#mediainfo_advanced QTextBrowser {
-    background: transparent;
-    color: #FFF;
-    border: none;
+#aboutwidget QTextBrowser {
+    border: no  ne;
 }
 
 /* -------------------------------------------------------------------------- */

diff --git a/vidcutter/styles/light.qss b/vidcutter/styles/light.qss
@@ -48,6 +48,11 @@ QDialog#aboutwidget {
     background-color: #EFF0F1;
 }
 
+QDialog#videoinfo {
+    border-image: url(':/images/dialog-backdrop-02.png') 0 0 0 0 stretch stretch;
+    background-color: #EFF0F1;
+}
+
 QDialog#updaterdialog {
     border-image: url(':/images/dialog-backdrop.png') 0 0 0 0 stretch stretch;
     background-color: #EFF0F1;
@@ -219,15 +224,12 @@ QStatusBar::item {
 
 /* -------------------------------------------------------------------------- */
 
-#aboutwidget QTextBrowser {
+QTextBrowser {
     background-color: rgba(255, 255, 255, 0.8);
     color: #000;
-    border: none;
 }
 
-#mediainfo_advanced QTextBrowser {
-    background: transparent;
-    color: #000;
+#aboutwidget QTextBrowser {
     border: none;
 }
 

diff --git a/vidcutter/videoinfo.py b/vidcutter/videoinfo.py
@@ -26,7 +26,7 @@
 
 from PyQt5.QtCore import QSize, Qt
 from PyQt5.QtGui import QPixmap
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QLabel, QSizePolicy, QTextBrowser, QVBoxLayout
+from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QLabel, QSizePolicy, QTextBrowser, QHBoxLayout, QVBoxLayout
 
 
 class VideoInfo(QDialog):
@@ -36,10 +36,11 @@ class VideoInfo(QDialog):
         'HIGH': QSize(1080, 700)
     }
 
-    def __init__(self, media, parent=None, flags=Qt.WindowCloseButtonHint):
+    def __init__(self, media, parent=None, flags=Qt.Dialog | Qt.WindowCloseButtonHint):
         super(VideoInfo, self).__init__(parent, flags)
         self.logger = logging.getLogger(__name__)
         self.parent = parent
+        self.setObjectName('videoinfo')
         if hasattr(self.parent, 'videoService'):
             self.service = self.parent.videoService
         else:
@@ -48,7 +49,6 @@ def __init__(self, media, parent=None, flags=Qt.WindowCloseButtonHint):
         self.setContentsMargins(0, 0, 0, 0)
         self.setWindowModality(Qt.NonModal)
         self.setWindowIcon(self.parent.parent.windowIcon())
-        self.setObjectName('mediainfo')
         self.setWindowTitle('Media information')
         self.setSizePolicy(QSizePolicy.Preferred, QSizePolicy.Preferred)
         self.setMinimumSize(self.modes.get(self.parent.parent.scale))
@@ -73,8 +73,8 @@ def __init__(self, media, parent=None, flags=Qt.WindowCloseButtonHint):
 <div align="center" style="margin:15px;">%s</div>''' % ('#C681D5' if self.parent.theme == 'dark' else '#642C68',
                                                         '#C681D5' if self.parent.theme == 'dark' else '#642C68',
                                                         self.service.metadata(media))
+
         content = QTextBrowser(self.parent)
-        content.setObjectName('genericdialog2')
         content.setHtml(metadata)
 
         buttons = QDialogButtonBox(QDialogButtonBox.Close)
@@ -83,5 +83,18 @@ def __init__(self, media, parent=None, flags=Qt.WindowCloseButtonHint):
         layout = QVBoxLayout()
         layout.addWidget(QLabel(pixmap=QPixmap(':/images/%s/mediainfo-heading.png' % self.parent.theme)))
         layout.addWidget(content)
-        layout.addWidget(buttons)
+
+        mediainfo_version = self.service.cmdExec(self.service.mediainfo, '--version', True)
+        if len(mediainfo_version) >= 2:
+            mediainfo_version = mediainfo_version.split('\n')[1]
+            mediainfo_label = QLabel('<div style="font-size:11px;"><b>Media information by:</b><br/>%s @ '
+                                     % mediainfo_version + '<a href="https://mediaarea.net" target="_blank">' +
+                                     'https://mediaarea.net</a></div>')
+            button_layout = QHBoxLayout()
+            button_layout.addWidget(mediainfo_label)
+            button_layout.addWidget(buttons)
+            layout.addLayout(button_layout)
+        else:
+            layout.addWidget(buttons)
+
         self.setLayout(layout)