Commit 7046700c authored by Jérôme Ortais's avatar Jérôme Ortais
Browse files

Merge branch 'develop'

parents f0953c27 167a5ec6
...@@ -194,6 +194,7 @@ app: version data/qtmac_fr.qm ...@@ -194,6 +194,7 @@ app: version data/qtmac_fr.qm
rm -rf include lib Resources rm -rf include lib Resources
rm -rf $(APP)/Resources/lib/python2.7/pyromaths.ex/examples rm -rf $(APP)/Resources/lib/python2.7/pyromaths.ex/examples
find $(APP)/Resources/lib/python2.7/pyromaths.ex \( -name '*.pyc' \) -delete find $(APP)/Resources/lib/python2.7/pyromaths.ex \( -name '*.pyc' \) -delete
rm -rf $(APP)/Frameworks/pyromaths
# ..Remove all architectures but x86_64..." # ..Remove all architectures but x86_64..."
ditto --rsrc --arch x86_64 --hfsCompression $(DIST)/Pyromaths.app $(DIST)/Pyromaths-x86_64.app ditto --rsrc --arch x86_64 --hfsCompression $(DIST)/Pyromaths.app $(DIST)/Pyromaths-x86_64.app
......
No preview for this file type
This diff is collapsed.
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
from PyQt4 import QtGui, QtCore from PyQt4 import QtGui, QtCore
from PyQt4 import Qt # Cas de Mac OS X, QTBUG-36212
import os, lxml, codecs, sys import os, lxml, codecs, sys
from outils import System from outils import System
from Values import CONFIGDIR, DATADIR, LESFICHES, COPYRIGHTS, VERSION, ICONDIR from Values import CONFIGDIR, DATADIR, LESFICHES, COPYRIGHTS, VERSION, ICONDIR
...@@ -616,12 +617,23 @@ def valide(liste, LesFiches, parametres): ...@@ -616,12 +617,23 @@ def valide(liste, LesFiches, parametres):
saveas = QtGui.QFileDialog() saveas = QtGui.QFileDialog()
filename = System.supprime_extension(parametres['nom_fichier'], filename = System.supprime_extension(parametres['nom_fichier'],
'.tex') '.tex')
if sys.platform == "darwin": # Cas de Mac OS X, QTBUG-36212
f0 = unicode(saveas.getSaveFileName(None, "Enregistrer sous...",
os.path.join(parametres['chemin_fichier'],
u'%s.tex' % filename), "Documents Tex (*.tex)", '', Qt.QFileDialog.DontUseNativeDialog))
else:
f0 = unicode(saveas.getSaveFileName(None, "Enregistrer sous...", f0 = unicode(saveas.getSaveFileName(None, "Enregistrer sous...",
os.path.join(parametres['chemin_fichier'], os.path.join(parametres['chemin_fichier'],
u'%s.tex' % filename), "Documents Tex (*.tex)")) u'%s.tex' % filename), "Documents Tex (*.tex)"))
if f0: if f0:
System.ajoute_extension(f0, '.tex') System.ajoute_extension(f0, '.tex')
if corrige and not parametres['creer_unpdf']: if corrige and not parametres['creer_unpdf']:
if sys.platform == "darwin": # Cas de Mac OS X, QTBUG-36212
f1 = unicode(saveas.getSaveFileName(None, "Enregistrer sous...",
os.path.join(os.path.dirname(f0),
u"%s-corrige.tex" % os.path.splitext(os.path.basename(f0))[0]),
"Documents Tex (*.tex)", '', Qt.QFileDialog.DontUseNativeDialog))
else:
f1 = unicode(saveas.getSaveFileName(None, "Enregistrer sous...", f1 = unicode(saveas.getSaveFileName(None, "Enregistrer sous...",
os.path.join(os.path.dirname(f0), os.path.join(os.path.dirname(f0),
u"%s-corrige.tex" % os.path.splitext(os.path.basename(f0))[0]), u"%s-corrige.tex" % os.path.splitext(os.path.basename(f0))[0]),
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment