Mercurial Repositories > eric / file comparison
comparison: Project/Project.py
Project/Project.py
- changeset 3600
- 7d17c492ab95
- parent 3591
- 2f2a4a76dd22
- child 3621
- 15f23ed3f216
equal
deleted
inserted
replaced
| 3598:37fdb72a2388 | 3600:7d17c492ab95 |
|---|---|
| 850 enable = True | 850 enable = True |
| 851 if self.pfile is None: | 851 if self.pfile is None: |
| 852 enable = False | 852 enable = False |
| 853 else: | 853 else: |
| 854 fn, ext = os.path.splitext(os.path.basename(self.pfile)) | 854 fn, ext = os.path.splitext(os.path.basename(self.pfile)) |
| 855 fn = os.path.join(self.getProjectManagementDir(), | 855 fn_new = os.path.join(self.getProjectManagementDir(), |
| 856 '{0}.e4s'.format(fn)) | 856 '{0}.e5s'.format(fn)) |
| 857 enable = os.path.exists(fn) | 857 fn_old = os.path.join(self.getProjectManagementDir(), |
| 858 '{0}.e4s'.format(fn)) | |
| 859 enable = os.path.exists(fn_new) or os.path.exists(fn_old) | |
| 858 self.sessActGrp.findChild( | 860 self.sessActGrp.findChild( |
| 859 QAction, "project_load_session").setEnabled(enable) | 861 QAction, "project_load_session").setEnabled(enable) |
| 860 self.sessActGrp.findChild( | 862 self.sessActGrp.findChild( |
| 861 QAction, "project_delete_session").setEnabled(enable) | 863 QAction, "project_delete_session").setEnabled(enable) |
| 862 | 864 |
| 863 @pyqtSlot() | 865 @pyqtSlot() |
| 864 def __readSession(self, quiet=False, indicator=""): | 866 def __readSession(self, quiet=False, indicator=""): |
| 865 """ | 867 """ |
| 866 Private method to read in the project session file (.e4s). | 868 Private method to read in the project session file (.e5s or .e4s). |
| 867 | 869 |
| 868 @param quiet flag indicating quiet operations. | 870 @param quiet flag indicating quiet operations. |
| 869 If this flag is true, no errors are reported. | 871 If this flag is true, no errors are reported. |
| 870 @keyparam indicator indicator string (string) | 872 @keyparam indicator indicator string (string) |
| 871 """ | 873 """ |
| 875 self.ui, | 877 self.ui, |
| 876 self.tr("Read project session"), | 878 self.tr("Read project session"), |
| 877 self.tr("Please save the project first.")) | 879 self.tr("Please save the project first.")) |
| 878 return | 880 return |
| 879 | 881 |
| 880 fn, ext = os.path.splitext(os.path.basename(self.pfile)) | 882 fn1, ext = os.path.splitext(os.path.basename(self.pfile)) |
| 881 fn = os.path.join(self.getProjectManagementDir(), | 883 fn = os.path.join(self.getProjectManagementDir(), |
| 882 '{0}{1}.e4s'.format(fn, indicator)) | 884 '{0}{1}.e5s'.format(fn1, indicator)) |
| 885 if not os.path.exists(fn): | |
| 886 fn = os.path.join(self.getProjectManagementDir(), | |
| 887 '{0}{1}.e4s'.format(fn1, indicator)) | |
| 883 | 888 |
| 884 f = QFile(fn) | 889 f = QFile(fn) |
| 885 if f.open(QIODevice.ReadOnly): | 890 if f.open(QIODevice.ReadOnly): |
| 886 from E5XML.SessionReader import SessionReader | 891 from E5XML.SessionReader import SessionReader |
| 887 reader = SessionReader(f, False) | 892 reader = SessionReader(f, False) |
| 897 " read.</p>").format(fn)) | 902 " read.</p>").format(fn)) |
| 898 | 903 |
| 899 @pyqtSlot() | 904 @pyqtSlot() |
| 900 def __writeSession(self, quiet=False, indicator=""): | 905 def __writeSession(self, quiet=False, indicator=""): |
| 901 """ | 906 """ |
| 902 Private method to write the session data to an XML file (.e4s). | 907 Private method to write the session data to an XML file (.e5s). |
| 903 | 908 |
| 904 @param quiet flag indicating quiet operations. | 909 @param quiet flag indicating quiet operations. |
| 905 If this flag is true, no errors are reported. | 910 If this flag is true, no errors are reported. |
| 906 @keyparam indicator indicator string (string) | 911 @keyparam indicator indicator string (string) |
| 907 """ | 912 """ |
| 913 self.tr("Please save the project first.")) | 918 self.tr("Please save the project first.")) |
| 914 return | 919 return |
| 915 | 920 |
| 916 fn, ext = os.path.splitext(os.path.basename(self.pfile)) | 921 fn, ext = os.path.splitext(os.path.basename(self.pfile)) |
| 917 fn = os.path.join(self.getProjectManagementDir(), | 922 fn = os.path.join(self.getProjectManagementDir(), |
| 918 '{0}{1}.e4s'.format(fn, indicator)) | 923 '{0}{1}.e5s'.format(fn, indicator)) |
| 919 | 924 |
| 920 f = QFile(fn) | 925 f = QFile(fn) |
| 921 if f.open(QIODevice.WriteOnly): | 926 if f.open(QIODevice.WriteOnly): |
| 922 from E5XML.SessionWriter import SessionWriter | 927 from E5XML.SessionWriter import SessionWriter |
| 923 SessionWriter( | 928 SessionWriter( |
| 943 self.tr("Please save the project first.")) | 948 self.tr("Please save the project first.")) |
| 944 return | 949 return |
| 945 | 950 |
| 946 fname, ext = os.path.splitext(os.path.basename(self.pfile)) | 951 fname, ext = os.path.splitext(os.path.basename(self.pfile)) |
| 947 | 952 |
| 948 for fn in [os.path.join( | 953 for fn in [ |
| 954 os.path.join( | |
| 955 self.getProjectManagementDir(), "{0}.e5s".format(fname)), | |
| 956 os.path.join( | |
| 949 self.getProjectManagementDir(), "{0}.e4s".format(fname))]: | 957 self.getProjectManagementDir(), "{0}.e4s".format(fname))]: |
| 950 if os.path.exists(fn): | 958 if os.path.exists(fn): |
| 951 try: | 959 try: |
| 952 os.remove(fn) | 960 os.remove(fn) |
| 953 except OSError: | 961 except OSError: |
