diff --git a/core/reader.py b/core/reader.py index d01fbca..92a31a7 100644 --- a/core/reader.py +++ b/core/reader.py @@ -352,6 +352,7 @@ class MainWindowReader(QtGui.QMainWindow, Ui_MainWindowReader): self.setWindowTitle(u'Yomichan - {0} ({1})'.format(os.path.split(filename)[1], encoding)) def openFileByExtension(self, filename): + self.clearArchiveFiles() if tarfile.is_tarfile(filename): # opening an empty tar file raises ReadError with tarfile.open(filename, 'r:*') as tp: @@ -530,8 +531,6 @@ class MainWindowReader(QtGui.QMainWindow, Ui_MainWindowReader): def updateArchiveFiles(self, filename, names): - self.clearArchiveFiles() - self.menuOpenArchive.setEnabled(True) for name in self.formatQStringList(names): (index, ok) = self.getItemIndex(name) diff --git a/core/reader_ui.py b/core/reader_ui.py index dd9dcee..b0ca3fb 100644 --- a/core/reader_ui.py +++ b/core/reader_ui.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'dev/reader.ui' # -# Created: Fri Oct 7 08:55:15 2011 +# Created: Mon Nov 14 19:35:11 2011 # by: PyQt4 UI code generator 4.8.5 # # WARNING! All changes made in this file will be lost! @@ -40,9 +40,9 @@ class Ui_MainWindowReader(object): self.menuFile.setTitle(QtGui.QApplication.translate("MainWindowReader", "&File", None, QtGui.QApplication.UnicodeUTF8)) self.menuFile.setObjectName(_fromUtf8("menuFile")) self.menuOpenArchive = QtGui.QMenu(self.menuFile) + self.menuOpenArchive.setEnabled(False) self.menuOpenArchive.setTitle(QtGui.QApplication.translate("MainWindowReader", "Open from &archive", None, QtGui.QApplication.UnicodeUTF8)) self.menuOpenArchive.setObjectName(_fromUtf8("menuOpenArchive")) - self.menuOpenArchive.setEnabled(False) self.menuOpenRecent = QtGui.QMenu(self.menuFile) self.menuOpenRecent.setTitle(QtGui.QApplication.translate("MainWindowReader", "Open &recent", None, QtGui.QApplication.UnicodeUTF8)) self.menuOpenRecent.setObjectName(_fromUtf8("menuOpenRecent")) diff --git a/dev/reader.ui b/dev/reader.ui index 4316ca3..350ef92 100644 --- a/dev/reader.ui +++ b/dev/reader.ui @@ -47,12 +47,21 @@ &File + + + false + + + Open from &archive + + Open &recent +