748 self.tr("Abort"), 0, numResources, |
748 self.tr("Abort"), 0, numResources, |
749 self.tr("%v/%m Resources"), self) |
749 self.tr("%v/%m Resources"), self) |
750 progress.setModal(True) |
750 progress.setModal(True) |
751 progress.setMinimumDuration(0) |
751 progress.setMinimumDuration(0) |
752 progress.setWindowTitle(self.tr("Resources")) |
752 progress.setWindowTitle(self.tr("Resources")) |
753 i = 0 |
|
754 |
753 |
755 for fn in self.project.pdata["RESOURCES"]: |
754 for prog, fn in enumerate(self.project.pdata["RESOURCES"]): |
756 progress.setValue(i) |
755 progress.setValue(prog) |
757 if progress.wasCanceled(): |
756 if progress.wasCanceled(): |
758 break |
757 break |
759 proc = self.__compileQRC(fn, True, progress) |
758 proc = self.__compileQRC(fn, True, progress) |
760 if proc is not None: |
759 if proc is not None: |
761 while proc.state() == QProcess.ProcessState.Running: |
760 while proc.state() == QProcess.ProcessState.Running: |
762 QApplication.processEvents() |
761 QApplication.processEvents() |
763 QThread.msleep(300) |
762 QThread.msleep(300) |
764 QApplication.processEvents() |
763 QApplication.processEvents() |
765 else: |
764 else: |
766 break |
765 break |
767 i += 1 |
|
768 |
|
769 progress.setValue(numResources) |
766 progress.setValue(numResources) |
770 |
767 |
771 def __compileSelectedResources(self): |
768 def __compileSelectedResources(self): |
772 """ |
769 """ |
773 Private method to compile selected resources to source files. |
770 Private method to compile selected resources to source files. |
785 self.tr("Abort"), 0, numResources, |
782 self.tr("Abort"), 0, numResources, |
786 self.tr("%v/%m Resources"), self) |
783 self.tr("%v/%m Resources"), self) |
787 progress.setModal(True) |
784 progress.setModal(True) |
788 progress.setMinimumDuration(0) |
785 progress.setMinimumDuration(0) |
789 progress.setWindowTitle(self.tr("Resources")) |
786 progress.setWindowTitle(self.tr("Resources")) |
790 i = 0 |
|
791 |
787 |
792 for fn in files: |
788 for prog, fn in enumerate(files): |
793 progress.setValue(i) |
789 progress.setValue(prog) |
794 if progress.wasCanceled(): |
790 if progress.wasCanceled(): |
795 break |
791 break |
796 if not fn.endswith('.ui.h'): |
792 if not fn.endswith('.ui.h'): |
797 proc = self.__compileQRC(fn, True, progress) |
793 proc = self.__compileQRC(fn, True, progress) |
798 if proc is not None: |
794 if proc is not None: |
800 QApplication.processEvents() |
796 QApplication.processEvents() |
801 QThread.msleep(300) |
797 QThread.msleep(300) |
802 QApplication.processEvents() |
798 QApplication.processEvents() |
803 else: |
799 else: |
804 break |
800 break |
805 i += 1 |
|
806 |
|
807 progress.setValue(numResources) |
801 progress.setValue(numResources) |
808 |
802 |
809 def __checkResourcesNewer(self, filename, mtime): |
803 def __checkResourcesNewer(self, filename, mtime): |
810 """ |
804 """ |
811 Private method to check, if any file referenced in a resource |
805 Private method to check, if any file referenced in a resource |
857 progress = E5ProgressDialog( |
851 progress = E5ProgressDialog( |
858 self.tr("Determining changed resources..."), |
852 self.tr("Determining changed resources..."), |
859 self.tr("Abort"), 0, 100, self.tr("%v/%m Resources")) |
853 self.tr("Abort"), 0, 100, self.tr("%v/%m Resources")) |
860 progress.setMinimumDuration(0) |
854 progress.setMinimumDuration(0) |
861 progress.setWindowTitle(self.tr("Resources")) |
855 progress.setWindowTitle(self.tr("Resources")) |
862 i = 0 |
|
863 |
856 |
864 # get list of changed resources |
857 # get list of changed resources |
865 changedResources = [] |
858 changedResources = [] |
866 progress.setMaximum(len(self.project.pdata["RESOURCES"])) |
859 progress.setMaximum(len(self.project.pdata["RESOURCES"])) |
867 for fn in self.project.pdata["RESOURCES"]: |
860 for prog, fn in enumerate(self.project.pdata["RESOURCES"]): |
868 progress.setValue(i) |
861 progress.setValue(prog) |
869 QApplication.processEvents() |
862 QApplication.processEvents() |
870 ifn = os.path.join(self.project.ppath, fn) |
863 ifn = os.path.join(self.project.ppath, fn) |
871 if self.project.getProjectLanguage() == "Python3": |
864 if self.project.getProjectLanguage() == "Python3": |
872 dirname, filename = os.path.split(os.path.splitext(ifn)[0]) |
865 dirname, filename = os.path.split(os.path.splitext(ifn)[0]) |
873 ofn = os.path.join( |
866 ofn = os.path.join( |
883 os.stat(ifn).st_mtime > os.stat(ofn).st_mtime |
876 os.stat(ifn).st_mtime > os.stat(ofn).st_mtime |
884 ): |
877 ): |
885 changedResources.append(fn) |
878 changedResources.append(fn) |
886 elif self.__checkResourcesNewer(ifn, os.stat(ofn).st_mtime): |
879 elif self.__checkResourcesNewer(ifn, os.stat(ofn).st_mtime): |
887 changedResources.append(fn) |
880 changedResources.append(fn) |
888 i += 1 |
881 progress.setValue(len(self.project.pdata["RESOURCES"])) |
889 progress.setValue(i) |
|
890 QApplication.processEvents() |
882 QApplication.processEvents() |
891 |
883 |
892 if changedResources: |
884 if changedResources: |
893 progress.setLabelText( |
885 progress.setLabelText( |
894 self.tr("Compiling changed resources...")) |
886 self.tr("Compiling changed resources...")) |
895 progress.setMaximum(len(changedResources)) |
887 progress.setMaximum(len(changedResources)) |
896 i = 0 |
888 progress.setValue(0) |
897 progress.setValue(i) |
|
898 QApplication.processEvents() |
889 QApplication.processEvents() |
899 for fn in changedResources: |
890 for prog, fn in enumerate(changedResources): |
900 progress.setValue(i) |
891 progress.setValue(prog) |
901 if progress.wasCanceled(): |
892 if progress.wasCanceled(): |
902 break |
893 break |
903 proc = self.__compileQRC(fn, True, progress) |
894 proc = self.__compileQRC(fn, True, progress) |
904 if proc is not None: |
895 if proc is not None: |
905 while proc.state() == QProcess.ProcessState.Running: |
896 while proc.state() == QProcess.ProcessState.Running: |
906 QApplication.processEvents() |
897 QApplication.processEvents() |
907 QThread.msleep(300) |
898 QThread.msleep(300) |
908 QApplication.processEvents() |
899 QApplication.processEvents() |
909 else: |
900 else: |
910 break |
901 break |
911 i += 1 |
|
912 progress.setValue(len(changedResources)) |
902 progress.setValue(len(changedResources)) |
913 QApplication.processEvents() |
903 QApplication.processEvents() |
914 |
904 |
915 def handlePreferencesChanged(self): |
905 def handlePreferencesChanged(self): |
916 """ |
906 """ |