eric: comparison IconEditor/IconEditorWindow.py

-:b852fe4d153a
+:1843ef6e2656
 Module implementing the icon editor main window.
 """
 from __future__ import unicode_literals    # __IGNORE_WARNING__
+import os
 from PyQt4.QtCore import pyqtSignal, Qt, QSize, QSignalMapper, QFileInfo, QFile, \
 QEvent
 from PyQt4.QtGui import QScrollArea, QPalette, QImage, QImageReader, QImageWriter, \
-QKeySequence, qApp, QLabel, QDockWidget, QWhatsThis
+QKeySequence, QLabel, QDockWidget, QWhatsThis
 from E5Gui.E5Action import E5Action, createActionGroup
 from E5Gui import E5FileDialog, E5MessageBox
 from E5Gui.E5MainWindow import E5MainWindow
 from E5Gui.E5ZoomWidget import E5ZoomWidget
 editorClosed = pyqtSignal()
 windows = []
 def __init__(self, fileName="", parent=None, fromEric=False,
-initShortcutsOnly=False):
+initShortcutsOnly=False, project=None):
 """
 Constructor
 @param fileName name of a file to load on startup (string)
 @param parent parent widget of this window (QWidget)
 @keyparam fromEric flag indicating whether it was called from within
 eric5 (boolean)
 @keyparam initShortcutsOnly flag indicating to just initialize the keyboard
 shortcuts (boolean)
+@keyparam project reference to the project object (Project)
 """
 super(IconEditorWindow, self).__init__(parent)
 self.setObjectName("eric5_icon_editor")
 self.setAttribute(Qt.WA_DeleteOnClose)
 self.__setCurrentFile("")
 if fileName:
 self.__loadIconFile(fileName)
 self.__checkActions()
+self.__project = project
+self.__lastOpenPath = ""
+self.__lastSavePath = ""
 self.grabGesture(Qt.PinchGesture)
 def __initFileFilters(self):
 """
 self.exitAct.setStatusTip(self.trUtf8('Quit the icon editor'))
 self.exitAct.setWhatsThis(self.trUtf8(
 """<b>Quit</b>"""
 """<p>Quit the icon editor.</p>"""
 ))
-if self.fromEric:
+if not self.fromEric:
-self.exitAct.triggered[()].connect(self.close)
+self.exitAct.triggered[()].connect(self.__closeAll)
-else:
-self.exitAct.triggered[()].connect(qApp.closeAllWindows)
 self.__actions.append(self.exitAct)
 def __initEditActions(self):
 """
 Private method to create the Edit actions.
 menu.addAction(self.saveAct)
 menu.addAction(self.saveAsAct)
 menu.addSeparator()
 menu.addAction(self.closeAct)
 menu.addAction(self.closeAllAct)
-menu.addSeparator()
+if not self.fromEric:
-menu.addAction(self.exitAct)
+menu.addSeparator()
+menu.addAction(self.exitAct)
 menu = mb.addMenu(self.trUtf8("&Edit"))
 menu.setTearOffEnabled(True)
 menu.addAction(self.undoAct)
 menu.addAction(self.redoAct)
 filetb.addSeparator()
 filetb.addAction(self.saveAct)
 filetb.addAction(self.saveAsAct)
 filetb.addSeparator()
 filetb.addAction(self.closeAct)
-filetb.addAction(self.exitAct)
+if not self.fromEric:
+filetb.addAction(self.exitAct)
 edittb = self.addToolBar(self.trUtf8("Edit"))
 edittb.setObjectName("EditToolBar")
 edittb.setIconSize(UI.Config.ToolBarIconSize)
 edittb.addAction(self.undoAct)
 Preferences.setIconEditor("IconEditorState", state)
 Preferences.setGeometry("IconEditorGeometry", self.saveGeometry())
 try:
-del self.__class__.windows[self.__class__.windows.index(self)]
+if self.fromEric or len(self.__class__.windows) > 1:
+del self.__class__.windows[self.__class__.windows.index(self)]
 except ValueError:
 pass
 if not self.fromEric:
 Preferences.syncPreferences()
 def __newWindow(self):
 """
 Public slot called to open a new icon editor window.
 """
-ie = IconEditorWindow(parent=self.parent(), fromEric=self.fromEric)
+ie = IconEditorWindow(parent=self.parent(), fromEric=self.fromEric,
+project=self.__project)
+ie.setRecentPaths(self.__lastOpenPath, self.__lastSavePath)
 ie.show()
 def __openIcon(self):
 """
 Private slot to open an icon file.
 """
 if self.__maybeSave():
+if not self.__lastOpenPath:
+if self.__project and self.__project.isOpen():
+self.__lastOpenPath = self.__project.getProjectPath()
 fileName = E5FileDialog.getOpenFileNameAndFilter(
 self,
 self.trUtf8("Open icon file"),
-"",
+self.__lastOpenPath,
 self.__inputFilter,
 self.__defaultFilter)[0]
 if fileName:
 self.__loadIconFile(fileName)
+self.__lastOpenPath = os.path.dirname(fileName)
 self.__checkActions()
 def __saveIcon(self):
 """
 Private slot to save the icon.
 def __saveIconAs(self):
 """
 Private slot to save the icon with a new name.
 """
+if not self.__lastSavePath:
+if self.__project and self.__project.isOpen():
+self.__lastSavePath = self.__project.getProjectPath()
+if not self.__lastSavePath and self.__lastOpenPath:
+self.__lastSavePath = self.__lastOpenPath
 fileName, selectedFilter = E5FileDialog.getSaveFileNameAndFilter(
 self,
 self.trUtf8("Save icon file"),
-"",
+self.__lastSavePath,
 self.__outputFilter,
 self.__defaultFilter,
 E5FileDialog.Options(E5FileDialog.DontConfirmOverwrite))
 if not fileName:
 return False
 " Overwrite it?</p>").format(fileName),
 icon=E5MessageBox.Warning)
 if not res:
 return False
+self.__lastSavePath = os.path.dirname(fileName)
 return self.__saveIconFile(fileName)
 def __closeAll(self):
 """
 Private slot to close all other windows.
 """
 for win in self.__class__.windows[:]:
 if win != self:
 win.close()
+self.close()
 def __loadIconFile(self, fileName):
 """
 Private method to load an icon file.
 self.__saveIcon)
 if not ret:
 return False
 return True
+def setRecentPaths(self, openPath, savePath):
+"""
+Public method to set the last open and save paths.
+@param openPath least recently used open path (string)
+@param savePath least recently used save path (string)
+"""
+if openPath:
+self.__lastOpenPath = openPath
+if savePath:
+self.__lastSavePath = savePath
 def __checkActions(self):
 """
 Private slot to check some actions for their enable/disable status.
 """
 self.saveAct.setEnabled(self.__editor.isDirty())

Mercurial Repositories > eric / file comparison

comparison: IconEditor/IconEditorWindow.py

IconEditor/IconEditorWindow.py