Mercurial Repositories > eric / changeset
changeset
Removed capability to write compressed project (and related) files.
Mon, 13 Sep 2010 16:14:10 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Mon, 13 Sep 2010 16:14:10 +0200
- changeset 608
- d8fea1e76975
- parent 607
- d95d60ba16aa
- child 609
- 463fc2891cbf
- child 610
- 3a625b0793d8
Removed capability to write compressed project (and related) files.
--- a/E5Gui/E5SingleApplication.py Mon Sep 13 15:59:43 2010 +0200 +++ b/E5Gui/E5SingleApplication.py Mon Sep 13 16:14:10 2010 +0200 @@ -124,7 +124,7 @@ ext = os.path.splitext(arg)[1] ext = os.path.normcase(ext) - if ext in ['.e4p', '.e4pz']: + if ext in ['.e4p']: self.__openProject(arg) else: self.__openFile(arg)
--- a/MultiProject/AddProjectDialog.py Mon Sep 13 15:59:43 2010 +0200 +++ b/MultiProject/AddProjectDialog.py Mon Sep 13 16:14:10 2010 +0200 @@ -61,7 +61,7 @@ self, self.trUtf8("Add Project"), startdir, - self.trUtf8("Project Files (*.e4p *.e4pz)")) + self.trUtf8("Project Files (*.e4p)")) if projectFile: self.filenameEdit.setText(Utilities.toNativeSeparators(projectFile)) @@ -98,4 +98,4 @@ Private method to update the dialog. """ self.__okButton.setEnabled(self.nameEdit.text() != "" and \ - self.filenameEdit.text() != "") \ No newline at end of file + self.filenameEdit.text() != "")
--- a/MultiProject/MultiProject.py Mon Sep 13 15:59:43 2010 +0200 +++ b/MultiProject/MultiProject.py Mon Sep 13 16:14:10 2010 +0200 @@ -407,7 +407,7 @@ self.parent(), self.trUtf8("Open multiproject"), "", - self.trUtf8("Multiproject Files (*.e4m *.e4mz)")) + self.trUtf8("Multiproject Files (*.e4m)")) if fn == "": fn = None @@ -456,16 +456,12 @@ @return flag indicating success (boolean) """ - if Preferences.getProject("CompressedProjectFiles"): - defaultFilter = self.trUtf8("Compressed Multiproject Files (*.e4mz)") - else: - defaultFilter = self.trUtf8("Multiproject Files (*.e4m)") + defaultFilter = self.trUtf8("Multiproject Files (*.e4m)") fn, selectedFilter = E5FileDialog.getSaveFileNameAndFilter( self.parent(), self.trUtf8("Save multiproject as"), self.ppath, - self.trUtf8("Multiproject Files (*.e4m);;" - "Compressed Multiproject Files (*.e4mz)"), + self.trUtf8("Multiproject Files (*.e4m)"), defaultFilter, QFileDialog.Options(QFileDialog.DontConfirmOverwrite))
--- a/MultiProject/__init__.py Mon Sep 13 15:59:43 2010 +0200 +++ b/MultiProject/__init__.py Mon Sep 13 16:14:10 2010 +0200 @@ -7,8 +7,8 @@ Package implementing the multi project management module of eric5. The multi project management module consists of the main part, which is -used for reading and writing of eric5 multi project files (*.e4m *.e4mz) and +used for reading and writing of eric5 multi project files (*.e4m) and for performing all operations on the multi project. It is accompanied by various UI related modules implementing different dialogs and a browser for the display of projects belonging to the current multi project. -""" \ No newline at end of file +"""
--- a/Preferences/ConfigurationPages/ProjectPage.py Mon Sep 13 15:59:43 2010 +0200 +++ b/Preferences/ConfigurationPages/ProjectPage.py Mon Sep 13 16:14:10 2010 +0200 @@ -25,8 +25,6 @@ self.setObjectName("ProjectPage") # set initial values - self.projectCompressedProjectFilesCheckBox.setChecked( - Preferences.getProject("CompressedProjectFiles")) self.projectSearchNewFilesRecursiveCheckBox.setChecked( Preferences.getProject("SearchNewFilesRecursively")) self.projectSearchNewFilesCheckBox.setChecked( @@ -56,8 +54,6 @@ """ Public slot to save the Project configuration. """ - Preferences.setProject("CompressedProjectFiles", - self.projectCompressedProjectFilesCheckBox.isChecked()) Preferences.setProject("SearchNewFilesRecursively", self.projectSearchNewFilesRecursiveCheckBox.isChecked()) Preferences.setProject("SearchNewFiles", @@ -90,4 +86,4 @@ @param dlg reference to the configuration dialog """ page = ProjectPage() - return page \ No newline at end of file + return page
--- a/Preferences/ConfigurationPages/ProjectPage.ui Mon Sep 13 15:59:43 2010 +0200 +++ b/Preferences/ConfigurationPages/ProjectPage.ui Mon Sep 13 16:14:10 2010 +0200 @@ -1,7 +1,8 @@ -<ui version="4.0" > +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> <class>ProjectPage</class> - <widget class="QWidget" name="ProjectPage" > - <property name="geometry" > + <widget class="QWidget" name="ProjectPage"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -9,58 +10,39 @@ <height>624</height> </rect> </property> - <layout class="QVBoxLayout" name="verticalLayout" > + <layout class="QVBoxLayout" name="verticalLayout"> <item> - <widget class="QLabel" name="headerLabel" > - <property name="text" > - <string><b>Configure project settings</b></string> + <widget class="QLabel" name="headerLabel"> + <property name="text"> + <string><b>Configure project settings</b></string> </property> </widget> </item> <item> - <widget class="Line" name="line8" > - <property name="frameShape" > + <widget class="Line" name="line8"> + <property name="frameShape"> <enum>QFrame::HLine</enum> </property> - <property name="frameShadow" > + <property name="frameShadow"> <enum>QFrame::Sunken</enum> </property> - <property name="orientation" > + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> </widget> </item> <item> - <widget class="QGroupBox" name="groupBox" > - <property name="title" > - <string>Compression</string> - </property> - <layout class="QVBoxLayout" > - <item> - <widget class="QCheckBox" name="projectCompressedProjectFilesCheckBox" > - <property name="toolTip" > - <string>Select, if the project file of a new project should be compressed</string> - </property> - <property name="text" > - <string>Compress project file upon creation</string> - </property> - </widget> - </item> - </layout> - </widget> - </item> - <item> - <widget class="QGroupBox" name="groupBox_6" > - <property name="title" > + <widget class="QGroupBox" name="groupBox_6"> + <property name="title"> <string>XML</string> </property> - <layout class="QVBoxLayout" > + <layout class="QVBoxLayout"> <item> - <widget class="QCheckBox" name="projectTimestampCheckBox" > - <property name="toolTip" > + <widget class="QCheckBox" name="projectTimestampCheckBox"> + <property name="toolTip"> <string>Select, if a timestamp should be written to all project related XML files</string> </property> - <property name="text" > + <property name="text"> <string>Include timestamp in project related XML files</string> </property> </widget> @@ -69,37 +51,37 @@ </widget> </item> <item> - <widget class="QGroupBox" name="groupBox_2" > - <property name="title" > + <widget class="QGroupBox" name="groupBox_2"> + <property name="title"> <string>Search new files</string> </property> - <layout class="QGridLayout" > - <item row="0" column="0" > - <widget class="QCheckBox" name="projectSearchNewFilesRecursiveCheckBox" > - <property name="text" > + <layout class="QGridLayout"> + <item row="0" column="0"> + <widget class="QCheckBox" name="projectSearchNewFilesRecursiveCheckBox"> + <property name="text"> <string>Search for new files recursively</string> </property> </widget> </item> - <item row="0" column="1" > - <widget class="QCheckBox" name="projectSearchNewFilesCheckBox" > - <property name="toolTip" > + <item row="0" column="1"> + <widget class="QCheckBox" name="projectSearchNewFilesCheckBox"> + <property name="toolTip"> <string>Select whether a search for new files on a project open should be performed.</string> </property> - <property name="text" > + <property name="text"> <string>Search for new files on open</string> </property> </widget> </item> - <item row="1" column="1" > - <widget class="QCheckBox" name="projectAutoIncludeNewFilesCheckBox" > - <property name="enabled" > + <item row="1" column="1"> + <widget class="QCheckBox" name="projectAutoIncludeNewFilesCheckBox"> + <property name="enabled"> <bool>false</bool> </property> - <property name="toolTip" > + <property name="toolTip"> <string>Select whether the found files should be included automatically.</string> </property> - <property name="text" > + <property name="text"> <string>Automatically include found files</string> </property> </widget> @@ -108,27 +90,27 @@ </widget> </item> <item> - <widget class="QGroupBox" name="groupBox_4" > - <property name="title" > + <widget class="QGroupBox" name="groupBox_4"> + <property name="title"> <string>Debugger Properties</string> </property> - <layout class="QGridLayout" > - <item row="0" column="0" > - <widget class="QCheckBox" name="projectLoadDebugPropertiesCheckBox" > - <property name="toolTip" > + <layout class="QGridLayout"> + <item row="0" column="0"> + <widget class="QCheckBox" name="projectLoadDebugPropertiesCheckBox"> + <property name="toolTip"> <string>Select, whether a project debugger properties file shall be read on opening the project</string> </property> - <property name="text" > + <property name="text"> <string>Load debugger properties upon opening</string> </property> </widget> </item> - <item row="0" column="1" > - <widget class="QCheckBox" name="projectSaveDebugPropertiesCheckBox" > - <property name="toolTip" > + <item row="0" column="1"> + <widget class="QCheckBox" name="projectSaveDebugPropertiesCheckBox"> + <property name="toolTip"> <string>Select, whether a project debugger properties file shall be written on closing the project</string> </property> - <property name="text" > + <property name="text"> <string>Save debugger properties upon closing</string> </property> </widget> @@ -137,37 +119,37 @@ </widget> </item> <item> - <widget class="QGroupBox" name="groupBox_3" > - <property name="title" > + <widget class="QGroupBox" name="groupBox_3"> + <property name="title"> <string>Sessions</string> </property> - <layout class="QGridLayout" > - <item row="0" column="0" > - <widget class="QCheckBox" name="projectLoadSessionCheckBox" > - <property name="toolTip" > + <layout class="QGridLayout"> + <item row="0" column="0"> + <widget class="QCheckBox" name="projectLoadSessionCheckBox"> + <property name="toolTip"> <string>Select, whether a project session file shall be read on opening the project</string> </property> - <property name="text" > + <property name="text"> <string>Load session upon opening</string> </property> </widget> </item> - <item row="0" column="1" > - <widget class="QCheckBox" name="projectSaveSessionCheckBox" > - <property name="toolTip" > + <item row="0" column="1"> + <widget class="QCheckBox" name="projectSaveSessionCheckBox"> + <property name="toolTip"> <string>Select, whether a project session file shall be written on closing the project</string> </property> - <property name="text" > + <property name="text"> <string>Save session upon closing</string> </property> </widget> </item> - <item row="1" column="1" > - <widget class="QCheckBox" name="projectSessionAllBpCheckBox" > - <property name="toolTip" > + <item row="1" column="1"> + <widget class="QCheckBox" name="projectSessionAllBpCheckBox"> + <property name="toolTip"> <string>Select whether all breakpoints should be saved to the session file.</string> </property> - <property name="text" > + <property name="text"> <string>Save all breakpoints</string> </property> </widget> @@ -176,27 +158,27 @@ </widget> </item> <item> - <widget class="QGroupBox" name="groupBox_5" > - <property name="title" > + <widget class="QGroupBox" name="groupBox_5"> + <property name="title"> <string>Automatically compile</string> </property> - <layout class="QGridLayout" > - <item row="0" column="0" > - <widget class="QCheckBox" name="projectAutoCompileFormsCheckBox" > - <property name="toolTip" > + <layout class="QGridLayout"> + <item row="0" column="0"> + <widget class="QCheckBox" name="projectAutoCompileFormsCheckBox"> + <property name="toolTip"> <string>Select, if changed forms should be compiled automatically upon a run action</string> </property> - <property name="text" > + <property name="text"> <string>changed forms</string> </property> </widget> </item> - <item row="0" column="1" > - <widget class="QCheckBox" name="projectAutoCompileResourcesCheckBox" > - <property name="toolTip" > + <item row="0" column="1"> + <widget class="QCheckBox" name="projectAutoCompileResourcesCheckBox"> + <property name="toolTip"> <string>Select, if changed resources should be compiled automatically upon a run action</string> </property> - <property name="text" > + <property name="text"> <string>changed resources</string> </property> </widget> @@ -205,40 +187,40 @@ </widget> </item> <item> - <widget class="QGroupBox" name="groupBox_7" > - <property name="title" > + <widget class="QGroupBox" name="groupBox_7"> + <property name="title"> <string>Recent Projects</string> </property> - <layout class="QHBoxLayout" name="horizontalLayout" > + <layout class="QHBoxLayout" name="horizontalLayout"> <item> - <widget class="QLabel" name="label" > - <property name="text" > + <widget class="QLabel" name="label"> + <property name="text"> <string>Number of recent projects:</string> </property> </widget> </item> <item> - <widget class="QSpinBox" name="projectRecentSpinBox" > - <property name="toolTip" > + <widget class="QSpinBox" name="projectRecentSpinBox"> + <property name="toolTip"> <string>Enter the number of recent projects to remember</string> </property> - <property name="alignment" > + <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> </property> - <property name="minimum" > + <property name="minimum"> <number>5</number> </property> - <property name="maximum" > + <property name="maximum"> <number>50</number> </property> </widget> </item> <item> <spacer> - <property name="orientation" > + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>40</width> <height>20</height> @@ -251,10 +233,10 @@ </item> <item> <spacer> - <property name="orientation" > + <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>584</width> <height>20</height> @@ -265,16 +247,15 @@ </layout> </widget> <tabstops> - <tabstop>projectCompressedProjectFilesCheckBox</tabstop> <tabstop>projectTimestampCheckBox</tabstop> <tabstop>projectSearchNewFilesRecursiveCheckBox</tabstop> <tabstop>projectSearchNewFilesCheckBox</tabstop> <tabstop>projectAutoIncludeNewFilesCheckBox</tabstop> + <tabstop>projectLoadDebugPropertiesCheckBox</tabstop> + <tabstop>projectSaveDebugPropertiesCheckBox</tabstop> <tabstop>projectLoadSessionCheckBox</tabstop> <tabstop>projectSaveSessionCheckBox</tabstop> <tabstop>projectSessionAllBpCheckBox</tabstop> - <tabstop>projectLoadDebugPropertiesCheckBox</tabstop> - <tabstop>projectSaveDebugPropertiesCheckBox</tabstop> <tabstop>projectAutoCompileFormsCheckBox</tabstop> <tabstop>projectAutoCompileResourcesCheckBox</tabstop> <tabstop>projectRecentSpinBox</tabstop> @@ -287,11 +268,11 @@ <receiver>projectAutoIncludeNewFilesCheckBox</receiver> <slot>setEnabled(bool)</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>50</x> <y>133</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>73</x> <y>190</y> </hint>
--- a/Preferences/__init__.py Mon Sep 13 15:59:43 2010 +0200 +++ b/Preferences/__init__.py Mon Sep 13 16:14:10 2010 +0200 @@ -478,7 +478,6 @@ "AutoLoadSession" : False, "AutoSaveSession" : False, "SessionAllBreakpoints" : False, - "CompressedProjectFiles" : False, "XMLTimestamp" : True, "AutoCompileForms" : False, "AutoCompileResources" : False, @@ -2235,4 +2234,4 @@ return value initPreferences() -initRecentSettings() \ No newline at end of file +initRecentSettings()
--- a/Project/Project.py Mon Sep 13 15:59:43 2010 +0200 +++ b/Project/Project.py Mon Sep 13 16:14:10 2010 +0200 @@ -568,7 +568,7 @@ def __readProject(self, fn): """ - Private method to read in a project (.e4p, .e4pz) file. + Private method to read in a project (.e4p) file. @param fn filename of the project file to be read (string) @return flag indicating success @@ -930,8 +930,7 @@ fname, ext = os.path.splitext(os.path.basename(self.pfile)) - for fn in [os.path.join(self.getProjectManagementDir(), "{0}.e4sz".format(fname)), - os.path.join(self.getProjectManagementDir(), "{0}.e4s".format(fname))]: + for fn in [os.path.join(self.getProjectManagementDir(), "{0}.e4s".format(fname))]: if os.path.exists(fn): try: os.remove(fn) @@ -1060,8 +1059,7 @@ fname, ext = os.path.splitext(os.path.basename(self.pfile)) - for fn in [os.path.join(self.getProjectManagementDir(), "{0}.e4dz".format(fname)), - os.path.join(self.getProjectManagementDir(), "{0}.e4d".format(fname))]: + for fn in [os.path.join(self.getProjectManagementDir(), "{0}.e4d".format(fname))]: if os.path.exists(fn): try: os.remove(fn) @@ -2323,7 +2321,7 @@ self.parent(), self.trUtf8("Open project"), "", - self.trUtf8("Project Files (*.e4p *.e4pz)")) + self.trUtf8("Project Files (*.e4p)")) QApplication.processEvents() @@ -2479,16 +2477,12 @@ @return flag indicating success (boolean) """ - if Preferences.getProject("CompressedProjectFiles"): - defaultFilter = self.trUtf8("Compressed Project Files (*.e4pz)") - else: - defaultFilter = self.trUtf8("Project Files (*.e4p)") + defaultFilter = self.trUtf8("Project Files (*.e4p)") fn, selectedFilter = E5FileDialog.getSaveFileNameAndFilter( self.parent(), self.trUtf8("Save project as"), self.ppath, - self.trUtf8("Project Files (*.e4p);;" - "Compressed Project Files (*.e4pz)"), + self.trUtf8("Project Files (*.e4p)"), defaultFilter, QFileDialog.Options(QFileDialog.DontConfirmOverwrite))
--- a/Project/PropertiesDialog.py Mon Sep 13 15:59:43 2010 +0200 +++ b/Project/PropertiesDialog.py Mon Sep 13 16:14:10 2010 +0200 @@ -22,7 +22,6 @@ from VCS.RepositoryInfoDialog import VcsRepositoryInfoDialog -import Preferences import Utilities class PropertiesDialog(QDialog, Ui_PropertiesDialog): @@ -230,10 +229,7 @@ fn = self.nameEdit.text() if fn: self.project.name = fn - if Preferences.getProject("CompressedProjectFiles"): - fn = "{0}.e4pz".format(fn) - else: - fn = "{0}.e4p".format(fn) + fn = "{0}.e4p".format(fn) self.project.pfile = os.path.join(self.project.ppath, fn) else: self.project.pfile = "" @@ -261,4 +257,4 @@ self.spellPropertiesDlg.storeData() if self.transPropertiesDlg is not None: - self.transPropertiesDlg.storeData() \ No newline at end of file + self.transPropertiesDlg.storeData()
--- a/Project/__init__.py Mon Sep 13 15:59:43 2010 +0200 +++ b/Project/__init__.py Mon Sep 13 16:14:10 2010 +0200 @@ -7,7 +7,7 @@ Package implementing the project management module of eric5. The project management module consists of the main part, which is -used for reading and writing of eric4 and eric5 project files (*.e4p *.e4pz) +used for reading and writing of eric4 and eric5 project files (*.e4p) and for performing all operations on the project. It is accompanied by various UI related modules implementing different dialogs and a tabbed tree browser for the display of files belonging to the current project
--- a/UI/BrowserModel.py Mon Sep 13 15:59:43 2010 +0200 +++ b/UI/BrowserModel.py Mon Sep 13 16:14:10 2010 +0200 @@ -1112,7 +1112,7 @@ @return flag indicating an eric project file (boolean) """ - return self.fileext in ['.e4p', '.e4pz'] + return self.fileext in ['.e4p'] def isMultiProjectFile(self): """ @@ -1120,7 +1120,7 @@ @return flag indicating an eric project file (boolean) """ - return self.fileext in ['.e4m', '.e4mz'] + return self.fileext in ['.e4m'] def isIdlFile(self): """ @@ -1533,4 +1533,4 @@ issubclass(other.__class__, BrowserClassAttributesItem): return order == Qt.AscendingOrder - return BrowserItem.lessThan(self, other, column, order) \ No newline at end of file + return BrowserItem.lessThan(self, other, column, order)
--- a/UI/UserInterface.py Mon Sep 13 15:59:43 2010 +0200 +++ b/UI/UserInterface.py Mon Sep 13 16:14:10 2010 +0200 @@ -1153,8 +1153,8 @@ '--' option are considered debug arguments to the program for the debugger. All files named before the '--' option are opened in a text editor, unless the argument ends in - .e4p or .e4pz, then it is opened as a project file. - If it ends in .e4m or .e4mz, it is opened as a multiproject. + .e4p, then it is opened as a project file. If it ends in + .e4m, it is opened as a multiproject. """ # no args, return if args is None: @@ -1195,10 +1195,10 @@ ext = os.path.splitext(arg)[1] ext = os.path.normcase(ext) - if ext in ['.e4p', '.e4pz']: + if ext in ['.e4p']: self.project.openProject(arg) opens += 1 - elif ext in ['.e4m', '.e4mz']: + elif ext in ['.e4m']: self.multiProject.openMultiProject(arg) opens += 1 else: @@ -4885,8 +4885,7 @@ None, self.trUtf8("Export Keyboard Shortcuts"), "", - self.trUtf8("Keyboard shortcut file (*.e4k);;" - "Compressed keyboard shortcut file (*.e4kz)"), + self.trUtf8("Keyboard shortcut file (*.e4k)"), "", QFileDialog.Options(QFileDialog.DontConfirmOverwrite)) @@ -4909,7 +4908,7 @@ None, self.trUtf8("Import Keyboard Shortcuts"), "", - self.trUtf8("Keyboard shortcut file (*.e4k *.e4kz)")) + self.trUtf8("Keyboard shortcut file (*.e4k)")) if fn: Shortcuts.importShortcuts(fn)
--- a/VCS/ProjectHelper.py Mon Sep 13 15:59:43 2010 +0200 +++ b/VCS/ProjectHelper.py Mon Sep 13 16:14:10 2010 +0200 @@ -184,7 +184,7 @@ ok = self.project.vcs.vcsCheckout(vcsDataDict, projectdir, False) if ok: projectdir = os.path.normpath(projectdir) - filters = ["*.e4p", "*.e4pz"] + filters = ["*.e4p"] d = QDir(projectdir) plist = d.entryInfoList(filters) if len(plist): @@ -212,8 +212,7 @@ self.trUtf8("New project from repository"), self.trUtf8("The project retrieved from the repository" " does not contain an eric project file" - " (*.e4p *.e4pz)." - " Create it?"), + " (*.e4p). Create it?"), yesDefault = True) if res: self.project.ppath = projectdir @@ -448,4 +447,4 @@ """ info = self.vcs.vcsRepositoryInfos(self.project.ppath) dlg = VcsRepositoryInfoDialog(None, info) - dlg.exec_() \ No newline at end of file + dlg.exec_()
