diff --git a/autotagmatchwindow.py b/autotagmatchwindow.py index abeb8c7..5cba397 100644 --- a/autotagmatchwindow.py +++ b/autotagmatchwindow.py @@ -48,7 +48,10 @@ class AutoTagMatchWindow(QtGui.QDialog): gridlayout = QtGui.QGridLayout( self.archiveCoverContainer ) gridlayout.addWidget( self.archiveCoverWidget ) gridlayout.setContentsMargins(0,0,0,0) - + + self.setWindowFlags(self.windowFlags() | + QtCore.Qt.WindowSystemMenuHint | + QtCore.Qt.WindowMaximizeButtonHint) self.skipButton = QtGui.QPushButton(self.tr("Skip to Next")) self.buttonBox.addButton(self.skipButton, QtGui.QDialogButtonBox.ActionRole) diff --git a/autotagprogresswindow.py b/autotagprogresswindow.py index fbf5075..058bb32 100644 --- a/autotagprogresswindow.py +++ b/autotagprogresswindow.py @@ -34,7 +34,11 @@ class AutoTagProgressWindow(QtGui.QDialog): self.lblTest.setPixmap(QtGui.QPixmap(os.path.join(ComicTaggerSettings.baseDir(), 'graphics/nocover.png' ))) self.lblArchive.setPixmap(QtGui.QPixmap(os.path.join(ComicTaggerSettings.baseDir(), 'graphics/nocover.png' ))) self.isdone = False - + + self.setWindowFlags(self.windowFlags() | + QtCore.Qt.WindowSystemMenuHint | + QtCore.Qt.WindowMaximizeButtonHint) + # we can't specify relative font sizes in the UI designer, so # make font for scroll window a smidge smaller f = self.textEdit.font() diff --git a/autotagstartwindow.py b/autotagstartwindow.py index ee77821..b2b0037 100644 --- a/autotagstartwindow.py +++ b/autotagstartwindow.py @@ -35,6 +35,9 @@ class AutoTagStartWindow(QtGui.QDialog): uic.loadUi(os.path.join(ComicTaggerSettings.baseDir(), 'autotagstartwindow.ui' ), self) self.label.setText( msg ) + self.setWindowFlags(self.windowFlags() & + ~QtCore.Qt.WindowContextHelpButtonHint ) + self.settings = settings self.cbxSaveOnLowConfidence.setCheckState( QtCore.Qt.Unchecked ) diff --git a/exportwindow.py b/exportwindow.py index 27f7d3f..ba62ba8 100644 --- a/exportwindow.py +++ b/exportwindow.py @@ -39,6 +39,9 @@ class ExportWindow(QtGui.QDialog): uic.loadUi(os.path.join(ComicTaggerSettings.baseDir(), 'exportwindow.ui' ), self) self.label.setText( msg ) + self.setWindowFlags(self.windowFlags() & + ~QtCore.Qt.WindowContextHelpButtonHint ) + self.settings = settings self.cbxDeleteOriginal.setCheckState( QtCore.Qt.Unchecked ) diff --git a/imagepopup.py b/imagepopup.py index 030357e..20b7e08 100644 --- a/imagepopup.py +++ b/imagepopup.py @@ -57,16 +57,11 @@ class ImagePopup(QtGui.QDialog): self.raise_( ) QtGui.QApplication.restoreOverrideCursor() - - def closeme( self ): - self.close() - def paintEvent (self, event): self.painter = QtGui.QPainter(self) self.painter.setRenderHint(QtGui.QPainter.Antialiasing) self.painter.drawPixmap(0, 0, self.desktopBg) self.painter.drawPixmap(0, 0, self.clientBgPixmap) - self.painter.end() def applyImagePixmap( self ): diff --git a/issueselectionwindow.py b/issueselectionwindow.py index a46ac1b..04d7008 100644 --- a/issueselectionwindow.py +++ b/issueselectionwindow.py @@ -44,7 +44,11 @@ class IssueSelectionWindow(QtGui.QDialog): gridlayout = QtGui.QGridLayout( self.coverImageContainer ) gridlayout.addWidget( self.coverWidget ) gridlayout.setContentsMargins(0,0,0,0) - + + self.setWindowFlags(self.windowFlags() | + QtCore.Qt.WindowSystemMenuHint | + QtCore.Qt.WindowMaximizeButtonHint) + self.setWindowModality(QtCore.Qt.WindowModal) self.series_id = series_id self.settings = settings diff --git a/logwindow.py b/logwindow.py index 5bf6cf8..fba98b5 100644 --- a/logwindow.py +++ b/logwindow.py @@ -32,7 +32,9 @@ class LogWindow(QtGui.QDialog): uic.loadUi(os.path.join(ComicTaggerSettings.baseDir(), 'logwindow.ui' ), self) - + self.setWindowFlags(self.windowFlags() | + QtCore.Qt.WindowSystemMenuHint | + QtCore.Qt.WindowMaximizeButtonHint) def setText( self, text ): self.textEdit.setPlainText( text ) \ No newline at end of file diff --git a/matchselectionwindow.py b/matchselectionwindow.py index 69f53e0..3741245 100644 --- a/matchselectionwindow.py +++ b/matchselectionwindow.py @@ -48,7 +48,11 @@ class MatchSelectionWindow(QtGui.QDialog): gridlayout = QtGui.QGridLayout( self.archiveCoverContainer ) gridlayout.addWidget( self.archiveCoverWidget ) gridlayout.setContentsMargins(0,0,0,0) - + + self.setWindowFlags(self.windowFlags() | + QtCore.Qt.WindowSystemMenuHint | + QtCore.Qt.WindowMaximizeButtonHint) + self.matches = matches self.comic_archive = comic_archive diff --git a/pagebrowser.py b/pagebrowser.py index 6ea78e1..4508e04 100644 --- a/pagebrowser.py +++ b/pagebrowser.py @@ -36,6 +36,10 @@ class PageBrowserWindow(QtGui.QDialog): gridlayout.addWidget( self.pageWidget ) gridlayout.setContentsMargins(0,0,0,0) self.pageWidget.showControls = False + + self.setWindowFlags(self.windowFlags() | + QtCore.Qt.WindowSystemMenuHint | + QtCore.Qt.WindowMaximizeButtonHint) self.comic_archive = None self.page_count = 0 diff --git a/progresswindow.py b/progresswindow.py index 7ebf631..5ddab2c 100644 --- a/progresswindow.py +++ b/progresswindow.py @@ -31,7 +31,11 @@ class IDProgressWindow(QtGui.QDialog): super(IDProgressWindow, self).__init__(parent) uic.loadUi(os.path.join(ComicTaggerSettings.baseDir(), 'progresswindow.ui' ), self) - + + self.setWindowFlags(self.windowFlags() | + QtCore.Qt.WindowSystemMenuHint | + QtCore.Qt.WindowMaximizeButtonHint) + # we can't specify relative font sizes in the UI designer, so # make font for scroll window a smidge smaller f = self.textEdit.font() diff --git a/renamewindow.py b/renamewindow.py index a1fdf80..ebe593d 100644 --- a/renamewindow.py +++ b/renamewindow.py @@ -36,6 +36,10 @@ class RenameWindow(QtGui.QDialog): uic.loadUi(os.path.join(ComicTaggerSettings.baseDir(), 'renamewindow.ui' ), self) self.label.setText("Preview (based on {0} tags):".format(MetaDataStyle.name[data_style])) + self.setWindowFlags(self.windowFlags() | + QtCore.Qt.WindowSystemMenuHint | + QtCore.Qt.WindowMaximizeButtonHint) + self.settings = settings self.comic_archive_list = comic_archive_list self.data_style = data_style diff --git a/settingswindow.py b/settingswindow.py index 1a0206f..3e1b8e8 100644 --- a/settingswindow.py +++ b/settingswindow.py @@ -56,8 +56,10 @@ class SettingsWindow(QtGui.QDialog): uic.loadUi(os.path.join(ComicTaggerSettings.baseDir(), 'settingswindow.ui' ), self) - self.settings = settings - + self.setWindowFlags(self.windowFlags() & + ~QtCore.Qt.WindowContextHelpButtonHint ) + + self.settings = settings self.name = "Settings" if platform.system() == "Windows": diff --git a/volumeselectionwindow.py b/volumeselectionwindow.py index 672d44a..a90d7d8 100644 --- a/volumeselectionwindow.py +++ b/volumeselectionwindow.py @@ -96,6 +96,10 @@ class VolumeSelectionWindow(QtGui.QDialog): gridlayout.addWidget( self.imageWidget ) gridlayout.setContentsMargins(0,0,0,0) + self.setWindowFlags(self.windowFlags() | + QtCore.Qt.WindowSystemMenuHint | + QtCore.Qt.WindowMaximizeButtonHint) + self.settings = settings self.series_name = series_name self.issue_number = issue_number