Merge pull request #195 from iXce/experimental

- update French translation
- store elapsed time since the actual beginning of the print to make ETA non crazy when pausing in the middle of the print
- handle another exception which happens when the printer gets disconnected

locale/fr/LC_MESSAGES/pronterface.po

@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Pronterface jm1\n"
-"POT-Creation-Date: 2012-02-26 02:12+CET\n"
-"PO-Revision-Date: 2012-02-26 02:13+0100\n"
+"POT-Creation-Date: 2012-03-16 03:48+CET\n"
+"PO-Revision-Date: 2012-03-16 03:50+0100\n"
 "Last-Translator: Guillaume Seguin <guillaume@segu.in>\n"
 "Language-Team: FR <c.laguilhon.debat@gmail.com>\n"
 "Language: \n"
@@ -64,23 +64,23 @@ msgstr "Couleur de fond de la Pronterface (défaut : #FFFFFF)"
 msgid "Printer Interface"
 msgstr "Interface de l'imprimante"
 
-#: pronterface.py:108
+#: pronterface.py:109
 msgid "Motors off"
 msgstr "Arrêter les moteurs"
 
-#: pronterface.py:109
+#: pronterface.py:110
 msgid "Check temp"
 msgstr "Lire les températures"
 
-#: pronterface.py:110
+#: pronterface.py:111
 msgid "Extrude"
 msgstr "Extruder"
 
-#: pronterface.py:111
+#: pronterface.py:112
 msgid "Reverse"
 msgstr "Inverser"
 
-#: pronterface.py:129
+#: pronterface.py:130
 msgid ""
 "# I moved all your custom buttons into .pronsolerc.\n"
 "# Please don't add them here any more.\n"
@@ -91,7 +91,7 @@ msgstr ""
 "# Veuillez ne plus en ajouter ici.\n"
 "# Une sauvegarde de vos anciens boutons est dans le fichier custombtn.old\n"
 
-#: pronterface.py:134
+#: pronterface.py:135
 msgid ""
 "Note!!! You have specified custom buttons in both custombtn.txt and ."
 "pronsolerc"
@@ -99,36 +99,36 @@ msgstr ""
 "Remarque! Vous avez spécifié des boutons personnalisés dans custombtn.txt et "
 "aussi dans .pronsolerc"
 
-#: pronterface.py:135
+#: pronterface.py:136
 msgid ""
 "Ignoring custombtn.txt. Remove all current buttons to revert to custombtn.txt"
 msgstr ""
 "custombtn.txt ignoré. Retirez tous les boutons en cours pour revenir à "
 "custombtn.txt"
 
-#: pronterface.py:163 pronterface.py:514 pronterface.py:1333
-#: pronterface.py:1387 pronterface.py:1509 pronterface.py:1543
-#: pronterface.py:1558
+#: pronterface.py:165 pronterface.py:520 pronterface.py:1343
+#: pronterface.py:1397 pronterface.py:1521 pronterface.py:1555
+#: pronterface.py:1567
 msgid "Print"
 msgstr "Imprimer"
 
-#: pronterface.py:167
+#: pronterface.py:169
 msgid "Printer is now online."
 msgstr "L'imprimante est connectée"
 
-#: pronterface.py:168
+#: pronterface.py:170
 msgid "Disconnect"
 msgstr "Déconnecter"
 
-#: pronterface.py:227
+#: pronterface.py:229
 msgid "Setting hotend temperature to %f degrees Celsius."
 msgstr "Réglage de la température de la buse à %f degrés Celsius."
 
-#: pronterface.py:246 pronterface.py:282 pronterface.py:340
+#: pronterface.py:248 pronterface.py:284 pronterface.py:346
 msgid "Printer is not online."
 msgstr "L'imprimante est déconnectée"
 
-#: pronterface.py:248
+#: pronterface.py:250
 msgid ""
 "You cannot set negative temperatures. To turn the hotend off entirely, set "
 "its temperature to 0."
@@ -136,15 +136,15 @@ msgstr ""
 "Vous ne pouvez pas régler une température négative. Pour éteindre la buse, "
 "réglez sa température à 0°C."
 
-#: pronterface.py:250
+#: pronterface.py:252
 msgid "You must enter a temperature. (%s)"
 msgstr "Vous devez saisir une température. (%s)"
 
-#: pronterface.py:263
+#: pronterface.py:265
 msgid "Setting bed temperature to %f degrees Celsius."
 msgstr "Réglage de la température du plateau à %f degrés Celsius."
 
-#: pronterface.py:284
+#: pronterface.py:286
 msgid ""
 "You cannot set negative temperatures. To turn the bed off entirely, set its "
 "temperature to 0."
@@ -152,360 +152,363 @@ msgstr ""
 "Vous ne pouvez pas régler une température négative. Pour désactiver votre "
 "plateau chauffant, réglez sa température à 0°C."
 
-#: pronterface.py:286
+#: pronterface.py:288
 msgid "You must enter a temperature."
 msgstr "Vous devez saisir une température."
 
-#: pronterface.py:301
+#: pronterface.py:303
 msgid "Do you want to erase the macro?"
 msgstr "Voulez-vous effacer la macro ?"
 
-#: pronterface.py:305
+#: pronterface.py:307
 msgid "Cancelled."
 msgstr "Annulé"
 
-#: pronterface.py:346
+#: pronterface.py:352
 msgid " Opens file"
 msgstr " Ouvrir un fichier"
 
-#: pronterface.py:346
+#: pronterface.py:352
 msgid "&Open..."
 msgstr "&Ouvrir..."
 
-#: pronterface.py:347
+#: pronterface.py:353
 msgid " Edit open file"
 msgstr " Éditer le fichier ouvert"
 
-#: pronterface.py:347
+#: pronterface.py:353
 msgid "&Edit..."
 msgstr "&Éditer..."
 
-#: pronterface.py:348
+#: pronterface.py:354
 msgid " Clear output console"
 msgstr " Effacer le contenu de la console de sortie"
 
-#: pronterface.py:348
+#: pronterface.py:354
 msgid "Clear console"
 msgstr "Effacer la console"
 
-#: pronterface.py:349
+#: pronterface.py:355
 msgid " Project slices"
 msgstr " Projeter les couches"
 
-#: pronterface.py:349
+#: pronterface.py:355
 msgid "Projector"
 msgstr "Projecteur"
 
-#: pronterface.py:350
+#: pronterface.py:356
 msgid " Closes the Window"
 msgstr " Quitter le programme"
 
-#: pronterface.py:350
+#: pronterface.py:356
 msgid "E&xit"
 msgstr "&Quitter"
 
-#: pronterface.py:351
+#: pronterface.py:357
 msgid "&File"
 msgstr "&Fichier"
 
-#: pronterface.py:356
+#: pronterface.py:362
 msgid "&Macros"
 msgstr "&Macros"
 
-#: pronterface.py:357
+#: pronterface.py:363
 msgid "<&New...>"
 msgstr "<&Nouvelle...>"
 
-#: pronterface.py:358
+#: pronterface.py:364
 msgid " Options dialog"
 msgstr " Fenêtre des options"
 
-#: pronterface.py:358
+#: pronterface.py:364
 msgid "&Options"
 msgstr "&Options"
 
-#: pronterface.py:360
+#: pronterface.py:366
 msgid " Adjust slicing settings"
 msgstr " Régler les paramètres de slicing"
 
-#: pronterface.py:360
+#: pronterface.py:366
 msgid "Slicing Settings"
 msgstr "Paramètres de slicing"
 
-#: pronterface.py:367
+#: pronterface.py:373
 msgid "&Settings"
 msgstr "&Paramètres"
 
-#: pronterface.py:383
+#: pronterface.py:389
 msgid "Enter macro name"
 msgstr "Saisissez le nom de la macro"
 
-#: pronterface.py:386
+#: pronterface.py:392
 msgid "Macro name:"
 msgstr "Nom :"
 
-#: pronterface.py:389
+#: pronterface.py:395
 msgid "Ok"
 msgstr "Valider"
 
-#: pronterface.py:393 pronterface.py:1344 pronterface.py:1601
+#: pronterface.py:399 pronterface.py:1354 pronterface.py:1613
 msgid "Cancel"
 msgstr "Annuler"
 
-#: pronterface.py:411
+#: pronterface.py:417
 msgid "Name '%s' is being used by built-in command"
 msgstr "Le nom '%s' est utilisé par une commande interne"
 
-#: pronterface.py:414
+#: pronterface.py:420
 msgid "Macro name may contain only alphanumeric symbols and underscores"
 msgstr ""
 "Un nom de macro ne peut contenir que des caractères alphanumérique et des "
 "underscore (_)"
 
-#: pronterface.py:463
+#: pronterface.py:469
 msgid "Port"
 msgstr "Port"
 
-#: pronterface.py:482
+#: pronterface.py:488
 msgid "Connect"
 msgstr "Connecter"
 
-#: pronterface.py:484
+#: pronterface.py:490
 msgid "Connect to the printer"
 msgstr "Connecter l'imprimante"
 
-#: pronterface.py:486
+#: pronterface.py:492
 msgid "Reset"
 msgstr "Réinitialiser"
 
-#: pronterface.py:489 pronterface.py:766
+#: pronterface.py:495 pronterface.py:772
 msgid "Mini mode"
 msgstr "Mode réduit"
 
-#: pronterface.py:493
+#: pronterface.py:499
 msgid "Monitor Printer"
 msgstr "Surveiller l'imprimante"
 
-#: pronterface.py:503
+#: pronterface.py:509
 msgid "Load file"
 msgstr "Charger un fichier"
 
-#: pronterface.py:506
+#: pronterface.py:512
 msgid "Compose"
 msgstr "Composer"
 
-#: pronterface.py:510
+#: pronterface.py:516
 msgid "SD"
 msgstr "SD"
 
-#: pronterface.py:518 pronterface.py:1388 pronterface.py:1433
-#: pronterface.py:1483 pronterface.py:1508 pronterface.py:1542
-#: pronterface.py:1557
+#: pronterface.py:524 pronterface.py:1398 pronterface.py:1444
+#: pronterface.py:1495 pronterface.py:1520 pronterface.py:1554
+#: pronterface.py:1570
 msgid "Pause"
 msgstr "Pause"
 
-#: pronterface.py:531
+#: pronterface.py:537
 msgid "Send"
 msgstr "Envoyer"
 
-#: pronterface.py:539 pronterface.py:640
+#: pronterface.py:545 pronterface.py:646
 msgid "mm/min"
 msgstr "mm/min"
 
-#: pronterface.py:541
+#: pronterface.py:547
 msgid "XY:"
 msgstr "XY:"
 
-#: pronterface.py:543
+#: pronterface.py:549
 msgid "Z:"
 msgstr "Z:"
 
-#: pronterface.py:566 pronterface.py:647
+#: pronterface.py:572 pronterface.py:653
 msgid "Heater:"
 msgstr "Buse :"
 
-#: pronterface.py:569 pronterface.py:589
+#: pronterface.py:575 pronterface.py:595
 msgid "Off"
 msgstr "Off"
 
-#: pronterface.py:581 pronterface.py:601
+#: pronterface.py:587 pronterface.py:607
 msgid "Set"
 msgstr "Régler"
 
-#: pronterface.py:586 pronterface.py:649
+#: pronterface.py:592 pronterface.py:655
 msgid "Bed:"
 msgstr "Plateau :"
 
-#: pronterface.py:634
+#: pronterface.py:640
 msgid "mm"
 msgstr "mm"
 
-#: pronterface.py:692 pronterface.py:1196 pronterface.py:1427
+#: pronterface.py:698 pronterface.py:1206 pronterface.py:1438
 msgid "Not connected to printer."
 msgstr "Imprimante non connectée."
 
-#: pronterface.py:721
+#: pronterface.py:727
 msgid "SD Upload"
 msgstr "Copier sur SD"
 
-#: pronterface.py:725
+#: pronterface.py:731
 msgid "SD Print"
 msgstr "Imprimer depuis SD"
 
-#: pronterface.py:773
+#: pronterface.py:779
 msgid "Full mode"
 msgstr "Mode complet"
 
-#: pronterface.py:798
+#: pronterface.py:804
 msgid "Execute command: "
 msgstr "Exécuter la commande :"
 
-#: pronterface.py:809
+#: pronterface.py:815
 msgid "click to add new custom button"
 msgstr "Ajouter un bouton personnalisé"
 
-#: pronterface.py:828
+#: pronterface.py:834
 msgid ""
 "Defines custom button. Usage: button <num> \"title\" [/c \"colour\"] command"
 msgstr ""
 "Définit des boutons personnalidés. Utilisation : <numero> \"Libelle\" [/c "
 "\"couleur\"] commande"
 
-#: pronterface.py:850
+#: pronterface.py:856
 msgid "Custom button number should be between 0 and 63"
 msgstr ""
 "Les numéros des boutons personnalisés doivent être compris entre 0 et 63."
 
-#: pronterface.py:942
+#: pronterface.py:948
 msgid "Edit custom button '%s'"
 msgstr "Editer le bouton personnalisé '%s'"
 
-#: pronterface.py:944
+#: pronterface.py:950
 msgid "Move left <<"
 msgstr "Déplacer vers la gauche <<"
 
-#: pronterface.py:947
+#: pronterface.py:953
 msgid "Move right >>"
 msgstr "Déplacer vers la droite >>"
 
-#: pronterface.py:951
+#: pronterface.py:957
 msgid "Remove custom button '%s'"
 msgstr "Supprimer le bouton personnalisé '%s'"
 
-#: pronterface.py:954
+#: pronterface.py:960
 msgid "Add custom button"
 msgstr "Ajouter un bouton personnalisé"
 
-#: pronterface.py:1099
+#: pronterface.py:1105
 msgid "event object missing"
 msgstr "événement d'objet manquant"
 
-#: pronterface.py:1127
+#: pronterface.py:1133
 msgid "Invalid period given."
 msgstr "La période donnée est invalide"
 
-#: pronterface.py:1130
+#: pronterface.py:1136
 msgid "Monitoring printer."
 msgstr "Imprimante sous surveillance."
 
-#: pronterface.py:1132
+#: pronterface.py:1138
 msgid "Done monitoring."
 msgstr "Surveillance de l'imprimante effectuée."
 
-#: pronterface.py:1154
+#: pronterface.py:1160
 msgid "Printer is online. "
 msgstr "L'imprimante est connectée. "
 
-#: pronterface.py:1156 pronterface.py:1331
+#: pronterface.py:1162 pronterface.py:1341
 msgid "Loaded "
 msgstr "Chargé "
 
-#: pronterface.py:1159
+#: pronterface.py:1165
 msgid "Bed"
 msgstr "Plateau"
 
-#: pronterface.py:1159
+#: pronterface.py:1165
 msgid "Hotend"
 msgstr "Buse"
 
-#: pronterface.py:1169
+#: pronterface.py:1175
 msgid " SD printing:%04.2f %%"
-msgstr "Impression SD : %04.2f %%"
+msgstr " Impression SD : %04.2f %%"
 
-#: pronterface.py:1172
+#: pronterface.py:1178
 msgid " Printing:%04.2f %% |"
-msgstr "Impression : %04.2f %% |"
+msgstr " Impression : %04.2f %% |"
 
-#: pronterface.py:1173
+#: pronterface.py:1179
 msgid " Line# %d of %d lines |"
-msgstr "Ligne# %d sur %d lignes |"
+msgstr " Ligne# %d sur %d lignes |"
 
-#: pronterface.py:1178
+#: pronterface.py:1184
 msgid " Est: %s of %s remaining | "
 msgstr " ETA: %s restant sur %s | "
 
-#: pronterface.py:1180
+#: pronterface.py:1186
 msgid " Z: %0.2f mm"
 msgstr " Z: %0.2f mm"
 
-#: pronterface.py:1247
+#: pronterface.py:1257
 msgid "Opening file failed."
 msgstr "L'ouverture du fichier a échoué"
 
-#: pronterface.py:1253
+#: pronterface.py:1263
 msgid "Starting print"
 msgstr "Début de l'impression..."
 
-#: pronterface.py:1276
+#: pronterface.py:1286
 msgid "Pick SD file"
 msgstr "Choisir un fichier sur la carte SD"
 
-#: pronterface.py:1276
+#: pronterface.py:1286
 msgid "Select the file to print"
 msgstr "Sélectionnez le fichier à imprimer :"
 
-#: pronterface.py:1311
+#: pronterface.py:1321
 msgid "Failed to execute slicing software: "
 msgstr "Une erreur s'est produite lors du slicing : "
 
-#: pronterface.py:1318
+#: pronterface.py:1328
 msgid "Slicing..."
 msgstr "Slicing..."
 
-#: pronterface.py:1331
+#: pronterface.py:1341
 msgid ", %d lines"
 msgstr ", %d lignes"
 
-#: pronterface.py:1338
+#: pronterface.py:1348
 msgid "Load File"
 msgstr "Charger un fichier"
 
-#: pronterface.py:1345
+#: pronterface.py:1355
 msgid "Slicing "
 msgstr "Slicing "
 
-#: pronterface.py:1364
+#: pronterface.py:1374
 msgid "Open file to print"
 msgstr "Ouvrir un fichier à imprimer"
 
-#: pronterface.py:1365
-msgid "OBJ, STL, and GCODE files (;*.gcode;*.gco;*.g;*.stl;*.STL;*.obj;*.OBJ;)"
+#: pronterface.py:1375
+msgid ""
+"OBJ, STL, and GCODE files (*.gcode;*.gco;*.g;*.stl;*.STL;*.obj;*.OBJ)|*."
+"gcode;*.gco;*.g;*.stl;*.STL;*.obj;*.OBJ|All Files (*.*)|*.*"
 msgstr ""
-"Fichiers OBJ, STL et GCODE (;*.gcode;*.gco;*.g;*.stl;*.STL;*.obj;*.OBJ;)"
+"Fichiers OBJ, STL et GCODE (;*.gcode;*.gco;*.g;*.stl;*.STL;*.obj;*.OBJ;)|*."
+"gcode;*.gco;*.g;*.stl;*.STL;*.obj;*.OBJ|Tous les fichiers (*.*)|*.*"
 
-#: pronterface.py:1372
+#: pronterface.py:1382
 msgid "File not found!"
 msgstr "Fichier non trouvé"
 
-#: pronterface.py:1386
+#: pronterface.py:1396
 msgid "Loaded %s, %d lines"
 msgstr "%s chargé, %d lignes"
 
-#: pronterface.py:1396
+#: pronterface.py:1406
 msgid "mm of filament used in this print\n"
 msgstr "mm de filament utilisés pour cette impression\n"
 
-#: pronterface.py:1397
+#: pronterface.py:1407
 msgid ""
 "the print goes from %f mm to %f mm in X\n"
 "and is %f mm wide\n"
@@ -513,7 +516,7 @@ msgstr ""
 "L'impression va de %f mm à %f m en X\n"
 "et mesure %f mm de large\n"
 
-#: pronterface.py:1398
+#: pronterface.py:1408
 msgid ""
 "the print goes from %f mm to %f mm in Y\n"
 "and is %f mm wide\n"
@@ -521,7 +524,7 @@ msgstr ""
 "L'impression va de %f mm à %f m en Y\n"
 "et mesure %f mm de large\n"
 
-#: pronterface.py:1399
+#: pronterface.py:1409
 msgid ""
 "the print goes from %f mm to %f mm in Z\n"
 "and is %f mm high\n"
@@ -529,78 +532,78 @@ msgstr ""
 "L'impression va de %f mm à %f m en Y\n"
 "et mesure %f mm de haut\n"
 
-#: pronterface.py:1400
+#: pronterface.py:1410
 msgid "Estimated duration (pessimistic): "
 msgstr "Durée estimée (pessimiste) : "
 
-#: pronterface.py:1424
+#: pronterface.py:1435
 msgid "No file loaded. Please use load first."
 msgstr "Aucun fichier chargé. Veuillez charger un fichier avant."
 
-#: pronterface.py:1435
+#: pronterface.py:1446
 msgid "Restart"
 msgstr "Recommencer"
 
-#: pronterface.py:1439
+#: pronterface.py:1450
 msgid "File upload complete"
 msgstr "Envoi du fichier terminé"
 
-#: pronterface.py:1458
+#: pronterface.py:1469
 msgid "Pick SD filename"
 msgstr "Lister les fichiers sur la carte SD"
 
-#: pronterface.py:1466
+#: pronterface.py:1477
 msgid "Paused."
 msgstr "En pause."
 
-#: pronterface.py:1476
+#: pronterface.py:1488
 msgid "Resume"
 msgstr "Reprendre"
 
-#: pronterface.py:1492
+#: pronterface.py:1504
 msgid "Connecting..."
 msgstr "Connection en cours..."
 
-#: pronterface.py:1523
+#: pronterface.py:1535
 msgid "Disconnected."
 msgstr "Déconnecté."
 
-#: pronterface.py:1550
+#: pronterface.py:1562
 msgid "Reset."
 msgstr "Réinitialisée."
 
-#: pronterface.py:1551
+#: pronterface.py:1563
 msgid "Are you sure you want to reset the printer?"
 msgstr "Etes-vous sûr de vouloir réinitialiser l'imprimante?"
 
-#: pronterface.py:1551
+#: pronterface.py:1563
 msgid "Reset?"
 msgstr "Réinitialiser ?"
 
-#: pronterface.py:1597
+#: pronterface.py:1609
 msgid "Save"
 msgstr "Enregistrer"
 
-#: pronterface.py:1653
+#: pronterface.py:1665
 msgid "Edit settings"
 msgstr "Modifier les paramètres"
 
-#: pronterface.py:1655
+#: pronterface.py:1667
 msgid "Defaults"
 msgstr "Paramètres par défaut"
 
-#: pronterface.py:1684
+#: pronterface.py:1696
 msgid "Custom button"
 msgstr "Commande personnalisée"
 
-#: pronterface.py:1689
+#: pronterface.py:1701
 msgid "Button title"
 msgstr "Titre du bouton"
 
-#: pronterface.py:1692
+#: pronterface.py:1704
 msgid "Command"
 msgstr "Commande"
 
-#: pronterface.py:1701
+#: pronterface.py:1713
 msgid "Color"
 msgstr "Couleur"

locale/pronterface.pot

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-02-26 02:12+CET\n"
+"POT-Creation-Date: 2012-03-16 03:48+CET\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,513 +62,513 @@ msgstr ""
 msgid "Printer Interface"
 msgstr ""
 
-#: pronterface.py:108
+#: pronterface.py:109
 msgid "Motors off"
 msgstr ""
 
-#: pronterface.py:109
+#: pronterface.py:110
 msgid "Check temp"
 msgstr ""
 
-#: pronterface.py:110
+#: pronterface.py:111
 msgid "Extrude"
 msgstr ""
 
-#: pronterface.py:111
+#: pronterface.py:112
 msgid "Reverse"
 msgstr ""
 
-#: pronterface.py:129
+#: pronterface.py:130
 msgid ""
 "# I moved all your custom buttons into .pronsolerc.\n"
 "# Please don't add them here any more.\n"
 "# Backup of your old buttons is in custombtn.old\n"
 msgstr ""
 
-#: pronterface.py:134
+#: pronterface.py:135
 msgid "Note!!! You have specified custom buttons in both custombtn.txt and .pronsolerc"
 msgstr ""
 
-#: pronterface.py:135
+#: pronterface.py:136
 msgid "Ignoring custombtn.txt. Remove all current buttons to revert to custombtn.txt"
 msgstr ""
 
-#: pronterface.py:163 pronterface.py:514 pronterface.py:1333
-#: pronterface.py:1387 pronterface.py:1509 pronterface.py:1543
-#: pronterface.py:1558
+#: pronterface.py:165 pronterface.py:520 pronterface.py:1343
+#: pronterface.py:1397 pronterface.py:1521 pronterface.py:1555
+#: pronterface.py:1567
 msgid "Print"
 msgstr ""
 
-#: pronterface.py:167
+#: pronterface.py:169
 msgid "Printer is now online."
 msgstr ""
 
-#: pronterface.py:168
+#: pronterface.py:170
 msgid "Disconnect"
 msgstr ""
 
-#: pronterface.py:227
+#: pronterface.py:229
 msgid "Setting hotend temperature to %f degrees Celsius."
 msgstr ""
 
-#: pronterface.py:246 pronterface.py:282 pronterface.py:340
+#: pronterface.py:248 pronterface.py:284 pronterface.py:346
 msgid "Printer is not online."
 msgstr ""
 
-#: pronterface.py:248
+#: pronterface.py:250
 msgid "You cannot set negative temperatures. To turn the hotend off entirely, set its temperature to 0."
 msgstr ""
 
-#: pronterface.py:250
+#: pronterface.py:252
 msgid "You must enter a temperature. (%s)"
 msgstr ""
 
-#: pronterface.py:263
+#: pronterface.py:265
 msgid "Setting bed temperature to %f degrees Celsius."
 msgstr ""
 
-#: pronterface.py:284
+#: pronterface.py:286
 msgid "You cannot set negative temperatures. To turn the bed off entirely, set its temperature to 0."
 msgstr ""
 
-#: pronterface.py:286
+#: pronterface.py:288
 msgid "You must enter a temperature."
 msgstr ""
 
-#: pronterface.py:301
+#: pronterface.py:303
 msgid "Do you want to erase the macro?"
 msgstr ""
 
-#: pronterface.py:305
+#: pronterface.py:307
 msgid "Cancelled."
 msgstr ""
 
-#: pronterface.py:346
+#: pronterface.py:352
 msgid " Opens file"
 msgstr ""
 
-#: pronterface.py:346
+#: pronterface.py:352
 msgid "&Open..."
 msgstr ""
 
-#: pronterface.py:347
+#: pronterface.py:353
 msgid " Edit open file"
 msgstr ""
 
-#: pronterface.py:347
+#: pronterface.py:353
 msgid "&Edit..."
 msgstr ""
 
-#: pronterface.py:348
+#: pronterface.py:354
 msgid " Clear output console"
 msgstr ""
 
-#: pronterface.py:348
+#: pronterface.py:354
 msgid "Clear console"
 msgstr ""
 
-#: pronterface.py:349
+#: pronterface.py:355
 msgid " Project slices"
 msgstr ""
 
-#: pronterface.py:349
+#: pronterface.py:355
 msgid "Projector"
 msgstr ""
 
-#: pronterface.py:350
+#: pronterface.py:356
 msgid " Closes the Window"
 msgstr ""
 
-#: pronterface.py:350
+#: pronterface.py:356
 msgid "E&xit"
 msgstr ""
 
-#: pronterface.py:351
+#: pronterface.py:357
 msgid "&File"
 msgstr ""
 
-#: pronterface.py:356
+#: pronterface.py:362
 msgid "&Macros"
 msgstr ""
 
-#: pronterface.py:357
+#: pronterface.py:363
 msgid "<&New...>"
 msgstr ""
 
-#: pronterface.py:358
+#: pronterface.py:364
 msgid " Options dialog"
 msgstr ""
 
-#: pronterface.py:358
+#: pronterface.py:364
 msgid "&Options"
 msgstr ""
 
-#: pronterface.py:360
+#: pronterface.py:366
 msgid " Adjust slicing settings"
 msgstr ""
 
-#: pronterface.py:360
+#: pronterface.py:366
 msgid "Slicing Settings"
 msgstr ""
 
-#: pronterface.py:367
+#: pronterface.py:373
 msgid "&Settings"
 msgstr ""
 
-#: pronterface.py:383
+#: pronterface.py:389
 msgid "Enter macro name"
 msgstr ""
 
-#: pronterface.py:386
+#: pronterface.py:392
 msgid "Macro name:"
 msgstr ""
 
-#: pronterface.py:389
+#: pronterface.py:395
 msgid "Ok"
 msgstr ""
 
-#: pronterface.py:393 pronterface.py:1344 pronterface.py:1601
+#: pronterface.py:399 pronterface.py:1354 pronterface.py:1613
 msgid "Cancel"
 msgstr ""
 
-#: pronterface.py:411
+#: pronterface.py:417
 msgid "Name '%s' is being used by built-in command"
 msgstr ""
 
-#: pronterface.py:414
+#: pronterface.py:420
 msgid "Macro name may contain only alphanumeric symbols and underscores"
 msgstr ""
 
-#: pronterface.py:463
+#: pronterface.py:469
 msgid "Port"
 msgstr ""
 
-#: pronterface.py:482
+#: pronterface.py:488
 msgid "Connect"
 msgstr ""
 
-#: pronterface.py:484
+#: pronterface.py:490
 msgid "Connect to the printer"
 msgstr ""
 
-#: pronterface.py:486
+#: pronterface.py:492
 msgid "Reset"
 msgstr ""
 
-#: pronterface.py:489 pronterface.py:766
+#: pronterface.py:495 pronterface.py:772
 msgid "Mini mode"
 msgstr ""
 
-#: pronterface.py:493
+#: pronterface.py:499
 msgid "Monitor Printer"
 msgstr ""
 
-#: pronterface.py:503
+#: pronterface.py:509
 msgid "Load file"
 msgstr ""
 
-#: pronterface.py:506
+#: pronterface.py:512
 msgid "Compose"
 msgstr ""
 
-#: pronterface.py:510
+#: pronterface.py:516
 msgid "SD"
 msgstr ""
 
-#: pronterface.py:518 pronterface.py:1388 pronterface.py:1433
-#: pronterface.py:1483 pronterface.py:1508 pronterface.py:1542
-#: pronterface.py:1557
+#: pronterface.py:524 pronterface.py:1398 pronterface.py:1444
+#: pronterface.py:1495 pronterface.py:1520 pronterface.py:1554
+#: pronterface.py:1570
 msgid "Pause"
 msgstr ""
 
-#: pronterface.py:531
+#: pronterface.py:537
 msgid "Send"
 msgstr ""
 
-#: pronterface.py:539 pronterface.py:640
+#: pronterface.py:545 pronterface.py:646
 msgid "mm/min"
 msgstr ""
 
-#: pronterface.py:541
+#: pronterface.py:547
 msgid "XY:"
 msgstr ""
 
-#: pronterface.py:543
+#: pronterface.py:549
 msgid "Z:"
 msgstr ""
 
-#: pronterface.py:566 pronterface.py:647
+#: pronterface.py:572 pronterface.py:653
 msgid "Heater:"
 msgstr ""
 
-#: pronterface.py:569 pronterface.py:589
+#: pronterface.py:575 pronterface.py:595
 msgid "Off"
 msgstr ""
 
-#: pronterface.py:581 pronterface.py:601
+#: pronterface.py:587 pronterface.py:607
 msgid "Set"
 msgstr ""
 
-#: pronterface.py:586 pronterface.py:649
+#: pronterface.py:592 pronterface.py:655
 msgid "Bed:"
 msgstr ""
 
-#: pronterface.py:634
+#: pronterface.py:640
 msgid "mm"
 msgstr ""
 
-#: pronterface.py:692 pronterface.py:1196 pronterface.py:1427
+#: pronterface.py:698 pronterface.py:1206 pronterface.py:1438
 msgid "Not connected to printer."
 msgstr ""
 
-#: pronterface.py:721
+#: pronterface.py:727
 msgid "SD Upload"
 msgstr ""
 
-#: pronterface.py:725
+#: pronterface.py:731
 msgid "SD Print"
 msgstr ""
 
-#: pronterface.py:773
+#: pronterface.py:779
 msgid "Full mode"
 msgstr ""
 
-#: pronterface.py:798
+#: pronterface.py:804
 msgid "Execute command: "
 msgstr ""
 
-#: pronterface.py:809
+#: pronterface.py:815
 msgid "click to add new custom button"
 msgstr ""
 
-#: pronterface.py:828
+#: pronterface.py:834
 msgid "Defines custom button. Usage: button <num> \"title\" [/c \"colour\"] command"
 msgstr ""
 
-#: pronterface.py:850
+#: pronterface.py:856
 msgid "Custom button number should be between 0 and 63"
 msgstr ""
 
-#: pronterface.py:942
+#: pronterface.py:948
 msgid "Edit custom button '%s'"
 msgstr ""
 
-#: pronterface.py:944
+#: pronterface.py:950
 msgid "Move left <<"
 msgstr ""
 
-#: pronterface.py:947
+#: pronterface.py:953
 msgid "Move right >>"
 msgstr ""
 
-#: pronterface.py:951
+#: pronterface.py:957
 msgid "Remove custom button '%s'"
 msgstr ""
 
-#: pronterface.py:954
+#: pronterface.py:960
 msgid "Add custom button"
 msgstr ""
 
-#: pronterface.py:1099
+#: pronterface.py:1105
 msgid "event object missing"
 msgstr ""
 
-#: pronterface.py:1127
+#: pronterface.py:1133
 msgid "Invalid period given."
 msgstr ""
 
-#: pronterface.py:1130
+#: pronterface.py:1136
 msgid "Monitoring printer."
 msgstr ""
 
-#: pronterface.py:1132
+#: pronterface.py:1138
 msgid "Done monitoring."
 msgstr ""
 
-#: pronterface.py:1154
+#: pronterface.py:1160
 msgid "Printer is online. "
 msgstr ""
 
-#: pronterface.py:1156 pronterface.py:1331
+#: pronterface.py:1162 pronterface.py:1341
 msgid "Loaded "
 msgstr ""
 
-#: pronterface.py:1159
+#: pronterface.py:1165
 msgid "Bed"
 msgstr ""
 
-#: pronterface.py:1159
+#: pronterface.py:1165
 msgid "Hotend"
 msgstr ""
 
-#: pronterface.py:1169
+#: pronterface.py:1175
 msgid " SD printing:%04.2f %%"
 msgstr ""
 
-#: pronterface.py:1172
+#: pronterface.py:1178
 msgid " Printing:%04.2f %% |"
 msgstr ""
 
-#: pronterface.py:1173
+#: pronterface.py:1179
 msgid " Line# %d of %d lines |"
 msgstr ""
 
-#: pronterface.py:1178
+#: pronterface.py:1184
 msgid " Est: %s of %s remaining | "
 msgstr ""
 
-#: pronterface.py:1180
+#: pronterface.py:1186
 msgid " Z: %0.2f mm"
 msgstr ""
 
-#: pronterface.py:1247
+#: pronterface.py:1257
 msgid "Opening file failed."
 msgstr ""
 
-#: pronterface.py:1253
+#: pronterface.py:1263
 msgid "Starting print"
 msgstr ""
 
-#: pronterface.py:1276
+#: pronterface.py:1286
 msgid "Pick SD file"
 msgstr ""
 
-#: pronterface.py:1276
+#: pronterface.py:1286
 msgid "Select the file to print"
 msgstr ""
 
-#: pronterface.py:1311
+#: pronterface.py:1321
 msgid "Failed to execute slicing software: "
 msgstr ""
 
-#: pronterface.py:1318
+#: pronterface.py:1328
 msgid "Slicing..."
 msgstr ""
 
-#: pronterface.py:1331
+#: pronterface.py:1341
 msgid ", %d lines"
 msgstr ""
 
-#: pronterface.py:1338
+#: pronterface.py:1348
 msgid "Load File"
 msgstr ""
 
-#: pronterface.py:1345
+#: pronterface.py:1355
 msgid "Slicing "
 msgstr ""
 
-#: pronterface.py:1364
+#: pronterface.py:1374
 msgid "Open file to print"
 msgstr ""
 
-#: pronterface.py:1365
-msgid "OBJ, STL, and GCODE files (;*.gcode;*.gco;*.g;*.stl;*.STL;*.obj;*.OBJ;)"
+#: pronterface.py:1375
+msgid "OBJ, STL, and GCODE files (*.gcode;*.gco;*.g;*.stl;*.STL;*.obj;*.OBJ)|*.gcode;*.gco;*.g;*.stl;*.STL;*.obj;*.OBJ|All Files (*.*)|*.*"
 msgstr ""
 
-#: pronterface.py:1372
+#: pronterface.py:1382
 msgid "File not found!"
 msgstr ""
 
-#: pronterface.py:1386
+#: pronterface.py:1396
 msgid "Loaded %s, %d lines"
 msgstr ""
 
-#: pronterface.py:1396
+#: pronterface.py:1406
 msgid ""
 "mm of filament used in this print\n"
 msgstr ""
 
-#: pronterface.py:1397
+#: pronterface.py:1407
 msgid ""
 "the print goes from %f mm to %f mm in X\n"
 "and is %f mm wide\n"
 msgstr ""
 
-#: pronterface.py:1398
+#: pronterface.py:1408
 msgid ""
 "the print goes from %f mm to %f mm in Y\n"
 "and is %f mm wide\n"
 msgstr ""
 
-#: pronterface.py:1399
+#: pronterface.py:1409
 msgid ""
 "the print goes from %f mm to %f mm in Z\n"
 "and is %f mm high\n"
 msgstr ""
 
-#: pronterface.py:1400
+#: pronterface.py:1410
 msgid "Estimated duration (pessimistic): "
 msgstr ""
 
-#: pronterface.py:1424
+#: pronterface.py:1435
 msgid "No file loaded. Please use load first."
 msgstr ""
 
-#: pronterface.py:1435
+#: pronterface.py:1446
 msgid "Restart"
 msgstr ""
 
-#: pronterface.py:1439
+#: pronterface.py:1450
 msgid "File upload complete"
 msgstr ""
 
-#: pronterface.py:1458
+#: pronterface.py:1469
 msgid "Pick SD filename"
 msgstr ""
 
-#: pronterface.py:1466
+#: pronterface.py:1477
 msgid "Paused."
 msgstr ""
 
-#: pronterface.py:1476
+#: pronterface.py:1488
 msgid "Resume"
 msgstr ""
 
-#: pronterface.py:1492
+#: pronterface.py:1504
 msgid "Connecting..."
 msgstr ""
 
-#: pronterface.py:1523
+#: pronterface.py:1535
 msgid "Disconnected."
 msgstr ""
 
-#: pronterface.py:1550
+#: pronterface.py:1562
 msgid "Reset."
 msgstr ""
 
-#: pronterface.py:1551
+#: pronterface.py:1563
 msgid "Are you sure you want to reset the printer?"
 msgstr ""
 
-#: pronterface.py:1551
+#: pronterface.py:1563
 msgid "Reset?"
 msgstr ""
 
-#: pronterface.py:1597
+#: pronterface.py:1609
 msgid "Save"
 msgstr ""
 
-#: pronterface.py:1653
+#: pronterface.py:1665
 msgid "Edit settings"
 msgstr ""
 
-#: pronterface.py:1655
+#: pronterface.py:1667
 msgid "Defaults"
 msgstr ""
 
-#: pronterface.py:1684
+#: pronterface.py:1696
 msgid "Custom button"
 msgstr ""
 
-#: pronterface.py:1689
+#: pronterface.py:1701
 msgid "Button title"
 msgstr ""
 
-#: pronterface.py:1692
+#: pronterface.py:1704
 msgid "Command"
 msgstr ""
 
-#: pronterface.py:1701
+#: pronterface.py:1713
 msgid "Color"
 msgstr ""
 

printcore.py

@@ -104,6 +104,9 @@ class printcore():
             except SerialException, e:
                 print "Can't read from printer (disconnected?)."
                 break
+            except OSError, e:
+                print "Can't read from printer (disconnected?)."
+                break
 
             if(len(line)>1):
                 self.log+=[line]

pronterface.py

@@ -147,6 +147,7 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
         self.p.startcb=self.startcb
         self.p.endcb=self.endcb
         self.starttime=0
+        self.extra_print_time=0
         self.curlayer=0
         self.cur_button=None
         self.hsetpoint=0.0
@@ -159,7 +160,7 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
     def endcb(self):
         if(self.p.queueindex==0):
             print "Print ended at: " +time.strftime('%H:%M:%S',time.localtime(time.time()))
-            print "and took: "+time.strftime('%H:%M:%S', time.gmtime(int(time.time()-self.starttime)))  #+str(int(time.time()-self.starttime)/60)+" minutes "+str(int(time.time()-self.starttime)%60)+" seconds."
+            print "and took: "+time.strftime('%H:%M:%S', time.gmtime(int(time.time()-self.starttime+self.extra_print_time)))  #+str(int(time.time()-self.starttime)/60)+" minutes "+str(int(time.time()-self.starttime)%60)+" seconds."
             wx.CallAfter(self.pausebtn.Disable)
             wx.CallAfter(self.printbtn.SetLabel,_("Print"))
             
@@ -1177,7 +1178,7 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
                     string+= _(" Printing:%04.2f %% |") % (100*float(self.p.queueindex)/len(self.p.mainqueue),)
                     string+= _(" Line# %d of %d lines |" ) % (self.p.queueindex, len(self.p.mainqueue))
                 if fractioncomplete > 0.0:
-                    secondselapsed = int(time.time()-self.starttime)
+                    secondselapsed = int(time.time()-self.starttime+self.extra_print_time)
                     secondsestimate = secondselapsed/fractioncomplete
                     secondsremain = secondsestimate - secondselapsed
                     string+= _(" Est: %s of %s remaining | ") % (time.strftime('%H:%M:%S', time.gmtime(secondsremain)),
@@ -1417,6 +1418,7 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
         wx.CallAfter(self.gviz.Refresh)
                 
     def printfile(self,event):
+        self.extra_print_time=0
         if self.paused:
             self.p.paused=0
             self.paused=0
@@ -1479,6 +1481,7 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
                     return
                 self.p.pause()
             self.paused=True
+            self.extra_print_time += int(time.time() - self.starttime)
             wx.CallAfter(self.pausebtn.SetLabel, _("Resume"))
         else:
             self.paused=False