xinput bugfixes, autoload pdf.xoj option, papercolor chooser

diff --git a/po/fr.po b/po/fr.po
index 743976f4e745ad25917e423fbd80c28fcd6eddab..e3a4e658dac4884cf29574a119da28b5c1a01124 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,9 +6,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xournal 0.4.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-20 23:57-0700\n"
-"PO-Revision-Date: 2009-08-30 17:00-0700\n"
-"Last-Translator: Denis Auroux <auroux@math.mit.edu\n"
+"POT-Creation-Date: 2009-09-27 21:04-0700\n"
+"PO-Revision-Date: 2009-09-27 21:04-0700\n"
+"Last-Translator: Denis Auroux <auroux@math.mit.edu>\n"
 "Language-Team: French\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,722 +23,726 @@ msgstr ""
 "Paramètres de ligne de commande incorrects.\n"
 "Usage: %s [fichier.xoj]\n"
 
-#: src/main.c:282 src/xo-callbacks.c:104 src/xo-callbacks.c:153
-#: src/xo-callbacks.c:3065
+#: src/main.c:291 src/xo-callbacks.c:105 src/xo-callbacks.c:156
+#: src/xo-callbacks.c:3126
 #, c-format
 msgid "Error opening file '%s'"
 msgstr "Erreur lors de l'ouverture du fichier «%s»"
 
-#: src/xo-interface.c:350 src/xo-interface.c:2953 src/xo-misc.c:1390
+#: src/xo-interface.c:351 src/xo-interface.c:2960 src/xo-misc.c:1396
 msgid "Xournal"
 msgstr ""
 
-#: src/xo-interface.c:360
+#: src/xo-interface.c:361
 msgid "_File"
 msgstr "_Fichier"
 
-#: src/xo-interface.c:371
+#: src/xo-interface.c:372
 msgid "Annotate PD_F"
 msgstr "Annoter PD_F"
 
-#: src/xo-interface.c:396
+#: src/xo-interface.c:397
 msgid "Recent Doc_uments"
 msgstr "Doc_uments récents"
 
-#: src/xo-interface.c:403
+#: src/xo-interface.c:404
 msgid "0"
 msgstr ""
 
-#: src/xo-interface.c:407
+#: src/xo-interface.c:408
 msgid "1"
 msgstr ""
 
-#: src/xo-interface.c:411
+#: src/xo-interface.c:412
 msgid "2"
 msgstr ""
 
-#: src/xo-interface.c:415
+#: src/xo-interface.c:416
 msgid "3"
 msgstr ""
 
-#: src/xo-interface.c:419
+#: src/xo-interface.c:420
 msgid "4"
 msgstr ""
 
-#: src/xo-interface.c:423
+#: src/xo-interface.c:424
 msgid "5"
 msgstr ""
 
-#: src/xo-interface.c:427
+#: src/xo-interface.c:428
 msgid "6"
 msgstr ""
 
-#: src/xo-interface.c:431
+#: src/xo-interface.c:432
 msgid "7"
 msgstr ""
 
-#: src/xo-interface.c:440
+#: src/xo-interface.c:441
 msgid "Print Options"
 msgstr "Options d'impression"
 
-#: src/xo-interface.c:455
+#: src/xo-interface.c:456
 msgid "_Export to PDF"
 msgstr "E_xporter PDF"
 
-#: src/xo-interface.c:471
+#: src/xo-interface.c:472
 msgid "_Edit"
 msgstr "_Edition"
 
-#: src/xo-interface.c:516
+#: src/xo-interface.c:517
 msgid "_View"
 msgstr "_Affichage"
 
-#: src/xo-interface.c:523
+#: src/xo-interface.c:524
 msgid "_Continuous"
 msgstr "_Continu"
 
-#: src/xo-interface.c:529
+#: src/xo-interface.c:530
 msgid "_One Page"
 msgstr "_Une page"
 
-#: src/xo-interface.c:540
+#: src/xo-interface.c:541
 msgid "Full Screen"
 msgstr "Plein écran"
 
-#: src/xo-interface.c:552
+#: src/xo-interface.c:553
 msgid "_Zoom"
 msgstr ""
 
-#: src/xo-interface.c:580
+#: src/xo-interface.c:581
 msgid "Page _Width"
 msgstr "Largeur page"
 
-#: src/xo-interface.c:591
+#: src/xo-interface.c:592
 msgid "_Set Zoom"
 msgstr "Changer zoom"
 
-#: src/xo-interface.c:600
+#: src/xo-interface.c:601
 msgid "_First Page"
 msgstr "Première page"
 
-#: src/xo-interface.c:611
+#: src/xo-interface.c:612
 msgid "_Previous Page"
 msgstr "Page _précédente"
 
-#: src/xo-interface.c:622
+#: src/xo-interface.c:623
 msgid "_Next Page"
 msgstr "Page _suivante"
 
-#: src/xo-interface.c:633
+#: src/xo-interface.c:634
 msgid "_Last Page"
 msgstr "_Dernière page"
 
-#: src/xo-interface.c:649
+#: src/xo-interface.c:650
 msgid "_Show Layer"
 msgstr "Afficher calque"
 
-#: src/xo-interface.c:657
+#: src/xo-interface.c:658
 msgid "_Hide Layer"
 msgstr "Cacher calque"
 
-#: src/xo-interface.c:665
+#: src/xo-interface.c:666
 msgid "_Journal"
 msgstr ""
 
-#: src/xo-interface.c:672
+#: src/xo-interface.c:673
 msgid "New Page _Before"
 msgstr "Nouvelle page a_vant"
 
-#: src/xo-interface.c:676
+#: src/xo-interface.c:677
 msgid "New Page _After"
 msgstr "Nouvelle page _après"
 
-#: src/xo-interface.c:680
+#: src/xo-interface.c:681
 msgid "New Page At _End"
 msgstr "Nouvelle page à la _fin"
 
-#: src/xo-interface.c:684
+#: src/xo-interface.c:685
 msgid "_Delete Page"
 msgstr "Supprimer page"
 
-#: src/xo-interface.c:693
+#: src/xo-interface.c:694
 msgid "_New Layer"
 msgstr "Nouveau calque"
 
-#: src/xo-interface.c:697
+#: src/xo-interface.c:698
 msgid "Delete La_yer"
 msgstr "Supprimer calque"
 
-#: src/xo-interface.c:701
+#: src/xo-interface.c:702
 msgid "_Flatten"
 msgstr "_Aplatir"
 
-#: src/xo-interface.c:710
+#: src/xo-interface.c:711
 msgid "Paper Si_ze"
 msgstr "_Taille du papier"
 
-#: src/xo-interface.c:714
+#: src/xo-interface.c:715
 msgid "Paper _Color"
 msgstr "_Couleur du papier"
 
-#: src/xo-interface.c:721
+#: src/xo-interface.c:722
 msgid "_white paper"
 msgstr "papier _blanc"
 
-#: src/xo-interface.c:727
+#: src/xo-interface.c:728
 msgid "_yellow paper"
 msgstr "papier _jaune"
 
-#: src/xo-interface.c:733
+#: src/xo-interface.c:734
 msgid "_pink paper"
 msgstr "papier _rose"
 
-#: src/xo-interface.c:739
+#: src/xo-interface.c:740
 msgid "_orange paper"
 msgstr "papier _orange"
 
-#: src/xo-interface.c:745
+#: src/xo-interface.c:746
 msgid "_blue paper"
 msgstr "papier b_leu"
 
-#: src/xo-interface.c:751
+#: src/xo-interface.c:752
 msgid "_green paper"
 msgstr "papier _vert"
 
-#: src/xo-interface.c:757 src/xo-interface.c:1027
+#: src/xo-interface.c:758 src/xo-interface.c:1026
 msgid "other..."
 msgstr "autre..."
 
-#: src/xo-interface.c:763 src/xo-interface.c:799 src/xo-interface.c:1031
-#: src/xo-interface.c:1276 src/xo-interface.c:1352
+#: src/xo-interface.c:762 src/xo-interface.c:798 src/xo-interface.c:1030
+#: src/xo-interface.c:1275 src/xo-interface.c:1351
 msgid "NA"
 msgstr ""
 
-#: src/xo-interface.c:768
+#: src/xo-interface.c:767
 msgid "Paper _Style"
 msgstr "_Style de papier "
 
-#: src/xo-interface.c:775
+#: src/xo-interface.c:774
 msgid "_plain"
 msgstr "_vierge"
 
-#: src/xo-interface.c:781
+#: src/xo-interface.c:780
 msgid "_lined"
 msgstr "_lignes"
 
-#: src/xo-interface.c:787
+#: src/xo-interface.c:786
 msgid "_ruled"
 msgstr "_marge"
 
-#: src/xo-interface.c:793
+#: src/xo-interface.c:792
 msgid "_graph"
 msgstr "_carreaux"
 
-#: src/xo-interface.c:804
+#: src/xo-interface.c:803
 msgid "Apply _To All Pages"
 msgstr "Appliquer à toutes les pages"
 
-#: src/xo-interface.c:813
+#: src/xo-interface.c:812
 msgid "_Load Background"
 msgstr "_Ouvrir fond de page"
 
-#: src/xo-interface.c:821
+#: src/xo-interface.c:820
 msgid "Background Screens_hot"
 msgstr "Ca_pture écran"
 
-#: src/xo-interface.c:830
+#: src/xo-interface.c:829
 msgid "Default _Paper"
 msgstr "Papier par défaut"
 
-#: src/xo-interface.c:834
+#: src/xo-interface.c:833
 msgid "Set As De_fault"
 msgstr "Définir papier par défaut"
 
-#: src/xo-interface.c:838
+#: src/xo-interface.c:837
 msgid "_Tools"
 msgstr "_Outils"
 
-#: src/xo-interface.c:845 src/xo-interface.c:1212 src/xo-interface.c:1288
+#: src/xo-interface.c:844 src/xo-interface.c:1211 src/xo-interface.c:1287
 msgid "_Pen"
 msgstr "St_ylo"
 
-#: src/xo-interface.c:854 src/xo-interface.c:1218 src/xo-interface.c:1294
+#: src/xo-interface.c:853 src/xo-interface.c:1217 src/xo-interface.c:1293
 msgid "_Eraser"
 msgstr "_Gomme"
 
-#: src/xo-interface.c:863 src/xo-interface.c:1224 src/xo-interface.c:1300
+#: src/xo-interface.c:862 src/xo-interface.c:1223 src/xo-interface.c:1299
 msgid "_Highlighter"
 msgstr "_Surligneur"
 
-#: src/xo-interface.c:872 src/xo-interface.c:1230 src/xo-interface.c:1306
+#: src/xo-interface.c:871 src/xo-interface.c:1229 src/xo-interface.c:1305
 msgid "_Text"
 msgstr "_Texte"
 
-#: src/xo-interface.c:886
+#: src/xo-interface.c:885
 msgid "_Shape Recognizer"
 msgstr "_Détection de formes"
 
-#: src/xo-interface.c:893
+#: src/xo-interface.c:892
 msgid "Ru_ler"
 msgstr "Règle"
 
-#: src/xo-interface.c:905 src/xo-interface.c:1236 src/xo-interface.c:1312
+#: src/xo-interface.c:904 src/xo-interface.c:1235 src/xo-interface.c:1311
 msgid "Select Re_gion"
 msgstr "Sé_lection région"
 
-#: src/xo-interface.c:914 src/xo-interface.c:1242 src/xo-interface.c:1318
+#: src/xo-interface.c:913 src/xo-interface.c:1241 src/xo-interface.c:1317
 msgid "Select _Rectangle"
 msgstr "Sélection _rectangle"
 
-#: src/xo-interface.c:923 src/xo-interface.c:1248 src/xo-interface.c:1324
+#: src/xo-interface.c:922 src/xo-interface.c:1247 src/xo-interface.c:1323
 msgid "_Vertical Space"
 msgstr "Espace _vertical"
 
-#: src/xo-interface.c:932 src/xo-interface.c:1254 src/xo-interface.c:1330
+#: src/xo-interface.c:931 src/xo-interface.c:1253 src/xo-interface.c:1329
 msgid "H_and Tool"
 msgstr "Outil main"
 
-#: src/xo-interface.c:945
+#: src/xo-interface.c:944
 msgid "_Color"
 msgstr "_Couleur"
 
-#: src/xo-interface.c:956
+#: src/xo-interface.c:955
 msgid "blac_k"
 msgstr "_noir"
 
-#: src/xo-interface.c:962
+#: src/xo-interface.c:961
 msgid "_blue"
 msgstr "_bleu"
 
-#: src/xo-interface.c:968
+#: src/xo-interface.c:967
 msgid "_red"
 msgstr "_rouge"
 
-#: src/xo-interface.c:974
+#: src/xo-interface.c:973
 msgid "_green"
 msgstr "_vert"
 
-#: src/xo-interface.c:980
+#: src/xo-interface.c:979
 msgid "gr_ay"
 msgstr "_gris"
 
-#: src/xo-interface.c:991
+#: src/xo-interface.c:990
 msgid "light bl_ue"
 msgstr "bleu _clair"
 
-#: src/xo-interface.c:997
+#: src/xo-interface.c:996
 msgid "light gr_een"
 msgstr "vert c_lair"
 
-#: src/xo-interface.c:1003
+#: src/xo-interface.c:1002
 msgid "_magenta"
 msgstr "_magenta"
 
-#: src/xo-interface.c:1009
+#: src/xo-interface.c:1008
 msgid "_orange"
 msgstr ""
 
-#: src/xo-interface.c:1015
+#: src/xo-interface.c:1014
 msgid "_yellow"
 msgstr "_jaune"
 
-#: src/xo-interface.c:1021
+#: src/xo-interface.c:1020
 msgid "_white"
 msgstr "_blanc"
 
-#: src/xo-interface.c:1036
+#: src/xo-interface.c:1035
 msgid "Pen _Options"
 msgstr "_Options du stylo"
 
-#: src/xo-interface.c:1043
+#: src/xo-interface.c:1042
 msgid "_very fine"
 msgstr "_très fin"
 
-#: src/xo-interface.c:1049 src/xo-interface.c:1080 src/xo-interface.c:1128
+#: src/xo-interface.c:1048 src/xo-interface.c:1079 src/xo-interface.c:1127
 msgid "_fine"
 msgstr "_fin"
 
-#: src/xo-interface.c:1055 src/xo-interface.c:1086 src/xo-interface.c:1134
+#: src/xo-interface.c:1054 src/xo-interface.c:1085 src/xo-interface.c:1133
 msgid "_medium"
 msgstr "_moyen"
 
-#: src/xo-interface.c:1061 src/xo-interface.c:1092 src/xo-interface.c:1140
+#: src/xo-interface.c:1060 src/xo-interface.c:1091 src/xo-interface.c:1139
 msgid "_thick"
 msgstr "é_pais"
 
-#: src/xo-interface.c:1067
+#: src/xo-interface.c:1066
 msgid "ver_y thick"
 msgstr "t_rès épais"
 
-#: src/xo-interface.c:1073
+#: src/xo-interface.c:1072
 msgid "Eraser Optio_ns"
 msgstr "Optio_ns de la gomme"
 
-#: src/xo-interface.c:1103
+#: src/xo-interface.c:1102
 msgid "_standard"
 msgstr ""
 
-#: src/xo-interface.c:1109
+#: src/xo-interface.c:1108
 msgid "_whiteout"
 msgstr "_blanc"
 
-#: src/xo-interface.c:1115
+#: src/xo-interface.c:1114
 msgid "_delete strokes"
 msgstr "_effacer traits entiers"
 
-#: src/xo-interface.c:1121
+#: src/xo-interface.c:1120
 msgid "Highlighter Opt_ions"
 msgstr "Options du surligneur"
 
-#: src/xo-interface.c:1146
+#: src/xo-interface.c:1145
 msgid "Text _Font..."
 msgstr "_Police de texte..."
 
-#: src/xo-interface.c:1162
+#: src/xo-interface.c:1161
 msgid "_Default Pen"
 msgstr "Stylo par défaut"
 
-#: src/xo-interface.c:1166
+#: src/xo-interface.c:1165
 msgid "Default Eraser"
 msgstr "Gomme par défaut"
 
-#: src/xo-interface.c:1170
+#: src/xo-interface.c:1169
 msgid "Default Highlighter"
 msgstr "Surligneur par défaut"
 
-#: src/xo-interface.c:1174
+#: src/xo-interface.c:1173
 msgid "Default Te_xt"
 msgstr "Texte par défaut"
 
-#: src/xo-interface.c:1178
+#: src/xo-interface.c:1177
 msgid "Set As Default"
 msgstr "Définir outil par défaut"
 
-#: src/xo-interface.c:1182
+#: src/xo-interface.c:1181
 msgid "_Options"
 msgstr "O_ptions"
 
-#: src/xo-interface.c:1189
+#: src/xo-interface.c:1188
 msgid "Use _XInput"
 msgstr "Utiliser XInput"
 
-#: src/xo-interface.c:1193
+#: src/xo-interface.c:1192
 msgid "Discard _Core Events"
 msgstr "Ignorer le pointeur principal"
 
-#: src/xo-interface.c:1197
+#: src/xo-interface.c:1196
 msgid "_Eraser Tip"
 msgstr "Pointe gomme"
 
-#: src/xo-interface.c:1201
+#: src/xo-interface.c:1200
 msgid "_Pressure sensitivity"
 msgstr "Sensible à la pression"
 
-#: src/xo-interface.c:1205
+#: src/xo-interface.c:1204
 msgid "Button _2 Mapping"
 msgstr "Bouton _2"
 
-#: src/xo-interface.c:1264 src/xo-interface.c:1340
+#: src/xo-interface.c:1263 src/xo-interface.c:1339
 msgid "_Link to Primary Brush"
 msgstr "_Lié au pinceau principal"
 
-#: src/xo-interface.c:1270 src/xo-interface.c:1346
+#: src/xo-interface.c:1269 src/xo-interface.c:1345
 msgid "_Copy of Current Brush"
 msgstr "_Copie du pinceau actuel"
 
-#: src/xo-interface.c:1281
+#: src/xo-interface.c:1280
 msgid "Button _3 Mapping"
 msgstr "Bouton _3"
 
-#: src/xo-interface.c:1357
+#: src/xo-interface.c:1356
 msgid "Buttons Switch Mappings"
 msgstr "Boutons changent d'outil"
 
-#: src/xo-interface.c:1366
+#: src/xo-interface.c:1365
 msgid "_Progressive Backgrounds"
 msgstr "Fonds progressifs"
 
-#: src/xo-interface.c:1370
+#: src/xo-interface.c:1369
 msgid "Print Paper _Ruling"
 msgstr "Imprimer les lignes du papier"
 
-#: src/xo-interface.c:1374
+#: src/xo-interface.c:1373
+msgid "Autoload pdf.xoj"
+msgstr "Ouvrir pdf.xoj automatiquement"
+
+#: src/xo-interface.c:1377
 msgid "Left-Handed Scrollbar"
 msgstr "Barre de défilement à gauche"
 
-#: src/xo-interface.c:1378
+#: src/xo-interface.c:1381
 msgid "Shorten _Menus"
 msgstr "Raccourcir les menus"
 
-#: src/xo-interface.c:1387
+#: src/xo-interface.c:1390
 msgid "A_uto-Save Preferences"
 msgstr "Enregistrement automatique des préférences"
 
-#: src/xo-interface.c:1391
+#: src/xo-interface.c:1394
 msgid "_Save Preferences"
 msgstr "_Enregistrer les préférences"
 
-#: src/xo-interface.c:1395
+#: src/xo-interface.c:1398
 msgid "_Help"
 msgstr "_Aide"
 
-#: src/xo-interface.c:1406
+#: src/xo-interface.c:1409
 msgid "_About"
 msgstr "_A propos de"
 
-#: src/xo-interface.c:1419
+#: src/xo-interface.c:1422
 msgid "Save"
 msgstr "Enregistrer"
 
-#: src/xo-interface.c:1424
+#: src/xo-interface.c:1427
 msgid "New"
 msgstr "Nouveau"
 
-#: src/xo-interface.c:1429
+#: src/xo-interface.c:1432
 msgid "Open"
 msgstr "Ouvrir"
 
-#: src/xo-interface.c:1442
+#: src/xo-interface.c:1445
 msgid "Cut"
 msgstr "Couper"
 
-#: src/xo-interface.c:1447
+#: src/xo-interface.c:1450
 msgid "Copy"
 msgstr "Copier"
 
-#: src/xo-interface.c:1452
+#: src/xo-interface.c:1455
 msgid "Paste"
 msgstr "Coller"
 
-#: src/xo-interface.c:1465
+#: src/xo-interface.c:1468
 msgid "Undo"
 msgstr "Annuler"
 
-#: src/xo-interface.c:1470
+#: src/xo-interface.c:1473
 msgid "Redo"
 msgstr "Répéter"
 
-#: src/xo-interface.c:1483
+#: src/xo-interface.c:1486
 msgid "First Page"
 msgstr "Première page"
 
-#: src/xo-interface.c:1488
+#: src/xo-interface.c:1491
 msgid "Previous Page"
 msgstr "Page précédente"
 
-#: src/xo-interface.c:1493
+#: src/xo-interface.c:1496
 msgid "Next Page"
 msgstr "Page suivante"
 
-#: src/xo-interface.c:1498
+#: src/xo-interface.c:1501
 msgid "Last Page"
 msgstr "Dernière page"
 
-#: src/xo-interface.c:1511
+#: src/xo-interface.c:1514
 msgid "Zoom Out"
 msgstr "Zoom arrière"
 
-#: src/xo-interface.c:1516 src/xo-interface.c:3047
+#: src/xo-interface.c:1519 src/xo-interface.c:3054
 msgid "Page Width"
 msgstr "Largeur page"
 
-#: src/xo-interface.c:1522
+#: src/xo-interface.c:1525
 msgid "Zoom In"
 msgstr "Zoom avant"
 
-#: src/xo-interface.c:1527
+#: src/xo-interface.c:1530
 msgid "Normal Size"
 msgstr "Taille normale"
 
-#: src/xo-interface.c:1532 src/xo-interface.c:3006
+#: src/xo-interface.c:1535 src/xo-interface.c:3013
 msgid "Set Zoom"
 msgstr "Réglage zoom"
 
-#: src/xo-interface.c:1541
+#: src/xo-interface.c:1544
 msgid "Toggle Fullscreen"
 msgstr "Plein écran"
 
-#: src/xo-interface.c:1550
+#: src/xo-interface.c:1553
 msgid "Pencil"
 msgstr "Stylo"
 
-#: src/xo-interface.c:1556
+#: src/xo-interface.c:1559
 msgid "Pen"
 msgstr "Stylo"
 
-#: src/xo-interface.c:1561 src/xo-interface.c:1567
+#: src/xo-interface.c:1564 src/xo-interface.c:1570
 msgid "Eraser"
 msgstr "Gomme"
 
-#: src/xo-interface.c:1572 src/xo-interface.c:1578
+#: src/xo-interface.c:1575 src/xo-interface.c:1581
 msgid "Highlighter"
 msgstr "Surligneur"
 
-#: src/xo-interface.c:1583 src/xo-interface.c:1589
+#: src/xo-interface.c:1586 src/xo-interface.c:1592
 msgid "Text"
 msgstr "Texte"
 
-#: src/xo-interface.c:1594 src/xo-interface.c:1600
+#: src/xo-interface.c:1597 src/xo-interface.c:1603
 msgid "Shape Recognizer"
 msgstr "Détection de formes"
 
-#: src/xo-interface.c:1603 src/xo-interface.c:1609
+#: src/xo-interface.c:1606 src/xo-interface.c:1612
 msgid "Ruler"
 msgstr "Règle"
 
-#: src/xo-interface.c:1620 src/xo-interface.c:1626
+#: src/xo-interface.c:1623 src/xo-interface.c:1629
 msgid "Select Region"
 msgstr "Sélection région"
 
-#: src/xo-interface.c:1631 src/xo-interface.c:1637
+#: src/xo-interface.c:1634 src/xo-interface.c:1640
 msgid "Select Rectangle"
 msgstr "Sélection rectangle"
 
-#: src/xo-interface.c:1642 src/xo-interface.c:1648
+#: src/xo-interface.c:1645 src/xo-interface.c:1651
 msgid "Vertical Space"
 msgstr "Espace vertical"
 
-#: src/xo-interface.c:1653
+#: src/xo-interface.c:1656
 msgid "Hand Tool"
 msgstr "Outil main"
 
-#: src/xo-interface.c:1672 src/xo-interface.c:1676
+#: src/xo-interface.c:1675 src/xo-interface.c:1679
 msgid "Default"
 msgstr "Réglages par défaut"
 
-#: src/xo-interface.c:1680 src/xo-interface.c:1683
+#: src/xo-interface.c:1683 src/xo-interface.c:1686
 msgid "Default Pen"
 msgstr "Stylo par défaut"
 
-#: src/xo-interface.c:1694 src/xo-interface.c:1702
+#: src/xo-interface.c:1697 src/xo-interface.c:1705
 msgid "Fine"
 msgstr "Fin"
 
-#: src/xo-interface.c:1707 src/xo-interface.c:1715
+#: src/xo-interface.c:1710 src/xo-interface.c:1718
 msgid "Medium"
 msgstr "Moyen"
 
-#: src/xo-interface.c:1720 src/xo-interface.c:1728
+#: src/xo-interface.c:1723 src/xo-interface.c:1731
 msgid "Thick"
 msgstr "Epais"
 
-#: src/xo-interface.c:1747 src/xo-interface.c:1754
+#: src/xo-interface.c:1750 src/xo-interface.c:1757
 msgid "Black"
 msgstr "Noir"
 
-#: src/xo-interface.c:1759 src/xo-interface.c:1766
+#: src/xo-interface.c:1762 src/xo-interface.c:1769
 msgid "Blue"
 msgstr "Bleu"
 
-#: src/xo-interface.c:1771 src/xo-interface.c:1778
+#: src/xo-interface.c:1774 src/xo-interface.c:1781
 msgid "Red"
 msgstr "Rouge"
 
-#: src/xo-interface.c:1783 src/xo-interface.c:1790
+#: src/xo-interface.c:1786 src/xo-interface.c:1793
 msgid "Green"
 msgstr "Vert"
 
-#: src/xo-interface.c:1795 src/xo-interface.c:1802
+#: src/xo-interface.c:1798 src/xo-interface.c:1805
 msgid "Gray"
 msgstr "Gris"
 
-#: src/xo-interface.c:1807 src/xo-interface.c:1814
+#: src/xo-interface.c:1810 src/xo-interface.c:1817
 msgid "Light Blue"
 msgstr "Bleu clair"
 
-#: src/xo-interface.c:1819 src/xo-interface.c:1826
+#: src/xo-interface.c:1822 src/xo-interface.c:1829
 msgid "Light Green"
 msgstr "Vert clair"
 
-#: src/xo-interface.c:1831 src/xo-interface.c:1838
+#: src/xo-interface.c:1834 src/xo-interface.c:1841
 msgid "Magenta"
 msgstr ""
 
-#: src/xo-interface.c:1843 src/xo-interface.c:1850
+#: src/xo-interface.c:1846 src/xo-interface.c:1853
 msgid "Orange"
 msgstr ""
 
-#: src/xo-interface.c:1855 src/xo-interface.c:1862
+#: src/xo-interface.c:1858 src/xo-interface.c:1865
 msgid "Yellow"
 msgstr "Jaune"
 
-#: src/xo-interface.c:1867 src/xo-interface.c:1874
+#: src/xo-interface.c:1870 src/xo-interface.c:1877
 msgid "White"
 msgstr "Blanc"
 
-#: src/xo-interface.c:1921
+#: src/xo-interface.c:1924
 msgid "  Page  "
 msgstr ""
 
-#: src/xo-interface.c:1929
+#: src/xo-interface.c:1932
 msgid "Set page number"
 msgstr "Changer de page"
 
-#: src/xo-interface.c:1933
+#: src/xo-interface.c:1936
 msgid " of n"
 msgstr " de n"
 
-#: src/xo-interface.c:1941
+#: src/xo-interface.c:1944
 msgid "  Layer:  "
 msgstr "  Calque :  "
 
-#: src/xo-interface.c:2828
+#: src/xo-interface.c:2835
 msgid "Set Paper Size"
 msgstr "Taille du papier"
 
-#: src/xo-interface.c:2840
+#: src/xo-interface.c:2847
 msgid "Standard paper sizes:"
 msgstr "Tailles de papier standard:"
 
-#: src/xo-interface.c:2848
+#: src/xo-interface.c:2855
 msgid "A4"
 msgstr ""
 
-#: src/xo-interface.c:2849
+#: src/xo-interface.c:2856
 msgid "A4 (landscape)"
 msgstr "A4 (paysage)"
 
-#: src/xo-interface.c:2850
+#: src/xo-interface.c:2857
 msgid "US Letter"
 msgstr "Lettre (US)"
 
-#: src/xo-interface.c:2851
+#: src/xo-interface.c:2858
 msgid "US Letter (landscape)"
 msgstr "Lettre (US) (paysage)"
 
-#: src/xo-interface.c:2852
+#: src/xo-interface.c:2859
 msgid "Custom"
 msgstr "Personnalisé"
 
-#: src/xo-interface.c:2858
+#: src/xo-interface.c:2865
 msgid "Width:"
 msgstr "Largeur:"
 
-#: src/xo-interface.c:2867
+#: src/xo-interface.c:2874
 msgid "Height:"
 msgstr "Hauteur:"
 
-#: src/xo-interface.c:2879
+#: src/xo-interface.c:2886
 msgid "cm"
 msgstr ""
 
-#: src/xo-interface.c:2880
+#: src/xo-interface.c:2887
 msgid "in"
 msgstr ""
 
-#: src/xo-interface.c:2881
+#: src/xo-interface.c:2888
 msgid "pixels"
 msgstr ""
 
-#: src/xo-interface.c:2882
+#: src/xo-interface.c:2889
 msgid "points"
 msgstr ""
 
-#: src/xo-interface.c:2942
+#: src/xo-interface.c:2949
 msgid "About Xournal"
 msgstr "A propos de Xournal"
 
-#: src/xo-interface.c:2958
+#: src/xo-interface.c:2965
 msgid ""
 "Written by Denis Auroux\n"
 "       http://xournal.sourceforge.net/       "
@@ -746,37 +750,37 @@ msgstr ""
 "Ecrit par Denis Auroux\n"
 "       http://xournal.sourceforge.net/       "
 
-#: src/xo-interface.c:3022
+#: src/xo-interface.c:3029
 msgid "Zoom: "
 msgstr ""
 
-#: src/xo-interface.c:3035
+#: src/xo-interface.c:3042
 msgid "%"
 msgstr ""
 
-#: src/xo-interface.c:3040
+#: src/xo-interface.c:3047
 msgid "Normal size (100%)"
 msgstr "Taille normale (100%)"
 
-#: src/xo-interface.c:3054
+#: src/xo-interface.c:3061
 msgid "Page Height"
 msgstr "Hauteur page"
 
 #. user aborted on save confirmation
-#: src/xo-callbacks.c:53 src/xo-file.c:664
+#: src/xo-callbacks.c:51 src/xo-file.c:665
 msgid "Open PDF"
 msgstr "Ouvrir PDF"
 
-#: src/xo-callbacks.c:58 src/xo-callbacks.c:129 src/xo-callbacks.c:227
-#: src/xo-callbacks.c:380 src/xo-callbacks.c:1451 src/xo-file.c:669
+#: src/xo-callbacks.c:59 src/xo-callbacks.c:132 src/xo-callbacks.c:231
+#: src/xo-callbacks.c:385 src/xo-callbacks.c:1444 src/xo-file.c:673
 msgid "All files"
 msgstr "Tous"
 
-#: src/xo-callbacks.c:61 src/xo-callbacks.c:383 src/xo-file.c:672
+#: src/xo-callbacks.c:62 src/xo-callbacks.c:388 src/xo-file.c:676
 msgid "PDF files"
 msgstr "Fichiers PDF"
 
-#: src/xo-callbacks.c:69 src/xo-callbacks.c:1474
+#: src/xo-callbacks.c:70 src/xo-callbacks.c:1467
 msgid "Attach file to the journal"
 msgstr "Attacher le fichier au journal"
 
@@ -785,55 +789,59 @@ msgstr "Attacher le fichier au journal"
 msgid "Open Journal"
 msgstr "Ouvrir le journal"
 
-#: src/xo-callbacks.c:132 src/xo-callbacks.c:230
+#: src/xo-callbacks.c:135 src/xo-callbacks.c:234
 msgid "Xournal files"
 msgstr "Fichiers Xournal"
 
-#: src/xo-callbacks.c:182 src/xo-callbacks.c:275
+#: src/xo-callbacks.c:184 src/xo-callbacks.c:279
 #, c-format
 msgid "Error saving file '%s'"
 msgstr "Erreur lors de l'enregistrement du fichier «%s»"
 
-#: src/xo-callbacks.c:202
+#: src/xo-callbacks.c:203
 msgid "Save Journal"
 msgstr "Enregistrer le journal"
 
-#: src/xo-callbacks.c:256 src/xo-callbacks.c:401
+#: src/xo-callbacks.c:260 src/xo-callbacks.c:406
 #, c-format
 msgid "Should the file %s be overwritten?"
 msgstr "Ecraser le contenu du fichier %s ?"
 
-#: src/xo-callbacks.c:357
+#: src/xo-callbacks.c:359
 msgid "Export to PDF"
 msgstr "Exporter PDF"
 
-#: src/xo-callbacks.c:414
+#: src/xo-callbacks.c:419
 #, c-format
 msgid "Error creating file '%s'"
 msgstr "Erreur de création du fichier «%s»"
 
-#: src/xo-callbacks.c:1446
+#: src/xo-callbacks.c:1371
+msgid "Pick a Paper Color"
+msgstr "Choisissez une couleur de papier"
+
+#: src/xo-callbacks.c:1436
 msgid "Open Background"
 msgstr "Ouvrir un fond de page"
 
-#: src/xo-callbacks.c:1459
+#: src/xo-callbacks.c:1452
 msgid "Bitmap files"
 msgstr "Fichiers bitmap"
 
-#: src/xo-callbacks.c:1467
+#: src/xo-callbacks.c:1460
 msgid "PS/PDF files (as bitmaps)"
 msgstr "Fichiers PS/PDF (comme bitmaps)"
 
-#: src/xo-callbacks.c:1497
+#: src/xo-callbacks.c:1490
 #, c-format
 msgid "Error opening background '%s'"
 msgstr "Erreur d'ouverture du fond «%s»"
 
-#: src/xo-callbacks.c:2054
+#: src/xo-callbacks.c:2036
 msgid "Select Font"
 msgstr "Choisir une police"
 
-#: src/xo-callbacks.c:2429
+#: src/xo-callbacks.c:2434
 msgid ""
 "Drawing is not allowed on the background layer.\n"
 " Switching to Layer 1."
@@ -851,17 +859,17 @@ msgstr "Fichier pixmap non trouvé: %s"
 msgid "Could not write background '%s'. Continuing anyway."
 msgstr "Impossible d'écrire le fond «%s». Poursuite de l'enregistrement."
 
-#: src/xo-file.c:251
+#: src/xo-file.c:252
 #, c-format
 msgid "Invalid file contents"
 msgstr "Contenu du fichier invalide"
 
-#: src/xo-file.c:401
+#: src/xo-file.c:402
 #, c-format
 msgid "Could not open background '%s'. Setting background to white."
 msgstr "Impossible d'ouvrir le fond «%s». Le fond restera blanc."
 
-#: src/xo-file.c:659
+#: src/xo-file.c:660
 #, c-format
 msgid ""
 "Could not open background '%s'.\n"
@@ -870,97 +878,103 @@ msgstr ""
 "Impossible d'ouvrir le fond «%s».\n"
 "Choisir un autre fichier ?"
 
-#: src/xo-file.c:772
+#: src/xo-file.c:806
 #, c-format
 msgid "Could not open background '%s'."
 msgstr "Impossible d'ouvrir le fond «%s»."
 
-#: src/xo-file.c:999
+#: src/xo-file.c:1033
 msgid "Unable to render one or more PDF pages."
 msgstr "Impossible d'afficher une ou plusieurs pages du fichier PDF."
 
-#: src/xo-file.c:1392
+#: src/xo-file.c:1429
 msgid " the display resolution, in pixels per inch"
 msgstr " la résolution d'affichage, en pixels par pouce"
 
-#: src/xo-file.c:1395
+#: src/xo-file.c:1432
 msgid " the initial zoom level, in percent"
 msgstr " le niveau de zoom initial, en %"
 
-#: src/xo-file.c:1398
+#: src/xo-file.c:1435
 msgid " maximize the window at startup (true/false)"
 msgstr " maximiser la fenêtre au démarrage (true/false)"
 
-#: src/xo-file.c:1401
+#: src/xo-file.c:1438
 msgid " start in full screen mode (true/false)"
 msgstr " démarrer en mode plein écran (true/false)"
 
-#: src/xo-file.c:1404
+#: src/xo-file.c:1441
 msgid " the window width in pixels (when not maximized)"
 msgstr " largeur de la fenêtre en pixels (si non maximisée)"
 
-#: src/xo-file.c:1407
+#: src/xo-file.c:1444
 msgid " the window height in pixels"
 msgstr " hauteur de la fenêtre en pixels"
 
-#: src/xo-file.c:1410
+#: src/xo-file.c:1447
 msgid " scrollbar step increment (in pixels)"
 msgstr " incrément de la barre de défilement (en pixels)"
 
-#: src/xo-file.c:1413
+#: src/xo-file.c:1450
 msgid " the step increment in the zoom dialog box"
 msgstr " incrément dans la boîte de dialogue zoom"
 
-#: src/xo-file.c:1416
+#: src/xo-file.c:1453
 msgid " the multiplicative factor for zoom in/out"
 msgstr " facteur multiplicatif du zoom avant/arrière"
 
-#: src/xo-file.c:1419
+#: src/xo-file.c:1456
 msgid " document view (true = continuous, false = single page)"
 msgstr " affichage du document (true = continu, false = une seule page)"
 
-#: src/xo-file.c:1422
+#: src/xo-file.c:1459
 msgid " use XInput extensions (true/false)"
 msgstr " utiliser les extensions XInput (true/false)"
 
-#: src/xo-file.c:1425
+#: src/xo-file.c:1462
 msgid " discard Core Pointer events in XInput mode (true/false)"
 msgstr ""
 " supprimer les évènements du pointeur principal en mode XInput (true/false)"
 
-#: src/xo-file.c:1428
+#: src/xo-file.c:1465
 msgid " always map eraser tip to eraser (true/false)"
 msgstr " toujours utiliser la pointe gomme comme outil gomme (true/false)"
 
-#: src/xo-file.c:1431
+#: src/xo-file.c:1468
 msgid ""
 " buttons 2 and 3 switch mappings instead of drawing (useful for some "
 "tablets) (true/false)"
 msgstr ""
-" les buttons 2 et 3 changent d'outil au lieu de dessiner "
-"(utile pour certaines tablettes) (true/false)"
+" les buttons 2 et 3 changent d'outil au lieu de dessiner (utile pour "
+"certaines tablettes) (true/false)"
+
+#: src/xo-file.c:1471
+msgid ""
+" automatically load filename.pdf.xoj instead of filename.pdf (true/false)"
+msgstr ""
+" charger automatiquement fichier.pdf.xoj au lieu de fichier.pdf (true/false)"
 
-#: src/xo-file.c:1434
+#: src/xo-file.c:1474
 msgid " default path for open/save (leave blank for current directory)"
 msgstr ""
 " dossier d'ouverture/enregistrement par défaut (laisser vierge pour dossier "
 "courant)"
 
-#: src/xo-file.c:1437
+#: src/xo-file.c:1477
 msgid " use pressure sensitivity to control pen stroke width (true/false)"
 msgstr ""
 " utiliser la sensibilité à la pression pour contrôler la largeur des traits "
 "de stylo (true/false)"
 
-#: src/xo-file.c:1440
+#: src/xo-file.c:1480
 msgid " minimum width multiplier"
 msgstr " multiplicateur de largeur minimum"
 
-#: src/xo-file.c:1443
+#: src/xo-file.c:1483
 msgid " maximum width multiplier"
 msgstr " multiplicateur de largeur maximum"
 
-#: src/xo-file.c:1446
+#: src/xo-file.c:1486
 msgid ""
 " interface components from top to bottom\n"
 " valid values: drawarea menu main_toolbar pen_toolbar statusbar"
@@ -968,19 +982,19 @@ msgstr ""
 " composants d'interface de haut en bas\n"
 " valeurs permises: drawarea menu main_toolbar pen_toolbar statusbar"
 
-#: src/xo-file.c:1449
+#: src/xo-file.c:1489
 msgid " interface components in fullscreen mode, from top to bottom"
 msgstr " composants d'interface en mode plein écran, de haut en bas"
 
-#: src/xo-file.c:1452
+#: src/xo-file.c:1492
 msgid " interface has left-handed scrollbar (true/false)"
 msgstr " barre de défilement à gauche (true/false)"
 
-#: src/xo-file.c:1455
+#: src/xo-file.c:1495
 msgid " hide some unwanted menu or toolbar items (true/false)"
 msgstr " cacher certains éléments d'interface (true/false)"
 
-#: src/xo-file.c:1458
+#: src/xo-file.c:1498
 msgid ""
 " interface items to hide (customize at your own risk!)\n"
 " see source file xo-interface.c for a list of item names"
@@ -988,7 +1002,7 @@ msgstr ""
 " éléments d'interface à cacher (personnaliser avec précaution!)\n"
 " voir le fichier source xo-interface.c pour une liste de noms d'éléments"
 
-#: src/xo-file.c:1461
+#: src/xo-file.c:1501
 msgid ""
 " highlighter opacity (0 to 1, default 0.5)\n"
 " warning: opacity level is not saved in xoj files!"
@@ -996,57 +1010,57 @@ msgstr ""
 " opacité du surligneur (entre 0 et 1, défaut 0.5)\n"
 " attention: le niveau d'opacité n'est pas enregistré dans les fichiers xoj !"
 
-#: src/xo-file.c:1464
+#: src/xo-file.c:1504
 msgid " auto-save preferences on exit (true/false)"
 msgstr " sauvegarde automatique des préférences en fin de session (true/false)"
 
-#: src/xo-file.c:1468
+#: src/xo-file.c:1508
 msgid " the default page width, in points (1/72 in)"
 msgstr " largeur de page par défaut, en points (1/72 pouce)"
 
-#: src/xo-file.c:1471
+#: src/xo-file.c:1511
 msgid " the default page height, in points (1/72 in)"
 msgstr " hauteur de page par défaut, en points"
 
-#: src/xo-file.c:1474
+#: src/xo-file.c:1514
 msgid " the default paper color"
 msgstr " couleur de papier par défaut"
 
-#: src/xo-file.c:1479
+#: src/xo-file.c:1519
 msgid " the default paper style (plain, lined, ruled, or graph)"
 msgstr " style de papier par défaut (plain, lined, ruled, ou graph)"
 
-#: src/xo-file.c:1482
+#: src/xo-file.c:1522
 msgid " apply paper style changes to all pages (true/false)"
 msgstr ""
 " appliquer les changements de style de papier à toutes les pages (true/false)"
 
-#: src/xo-file.c:1485
+#: src/xo-file.c:1525
 msgid " preferred unit (cm, in, px, pt)"
 msgstr " unité préférée (cm, in, px, pt)"
 
-#: src/xo-file.c:1488
+#: src/xo-file.c:1528
 msgid " include paper ruling when printing or exporting to PDF (true/false)"
 msgstr ""
 " inclure les lignes du papier lors de l'impression ou exportation vers PDF "
 "(true/false)"
 
-#: src/xo-file.c:1491
+#: src/xo-file.c:1531
 msgid " just-in-time update of page backgrounds (true/false)"
 msgstr " mise à jour en temps réel des fonds de page (true/false)"
 
-#: src/xo-file.c:1494
+#: src/xo-file.c:1534
 msgid ""
 " bitmap resolution of PS/PDF backgrounds rendered using ghostscript (dpi)"
 msgstr " résolution bitmap des fonds PS/PDF produits via ghostscript (dpi)"
 
-#: src/xo-file.c:1497
+#: src/xo-file.c:1537
 msgid ""
 " bitmap resolution of PDF backgrounds when printing with libgnomeprint (dpi)"
 msgstr ""
 " résolution bitmap des fonds PDF lors de l'impression via libgnomeprint (dpi)"
 
-#: src/xo-file.c:1501
+#: src/xo-file.c:1541
 msgid ""
 " selected tool at startup (pen, eraser, highlighter, selectrect, vertspace, "
 "hand)"
@@ -1054,54 +1068,54 @@ msgstr ""
 " outil sélectionné au démarrage (pen, eraser, highlighter, selectrect, "
 "vertspace, hand)"
 
-#: src/xo-file.c:1504
+#: src/xo-file.c:1544
 msgid " default pen color"
 msgstr " couleur du stylo par défaut"
 
-#: src/xo-file.c:1509
+#: src/xo-file.c:1549
 msgid " default pen thickness (fine = 1, medium = 2, thick = 3)"
 msgstr " épaisseur du stylo par défaut (fin = 1, moyen = 2, épais = 3)"
 
-#: src/xo-file.c:1512
+#: src/xo-file.c:1552
 msgid " default pen is in ruler mode (true/false)"
 msgstr " stylo par défaut est en mode règle (true/false)"
 
-#: src/xo-file.c:1515
+#: src/xo-file.c:1555
 msgid " default pen is in shape recognizer mode (true/false)"
 msgstr " stylo par défaut est en mode détection de formes (true/false)"
 
-#: src/xo-file.c:1518
+#: src/xo-file.c:1558
 msgid " default eraser thickness (fine = 1, medium = 2, thick = 3)"
 msgstr " épaisseur de la gomme par défaut (fin = 1, moyen = 2, épais = 3)"
 
-#: src/xo-file.c:1521
+#: src/xo-file.c:1561
 msgid " default eraser mode (standard = 0, whiteout = 1, strokes = 2)"
 msgstr ""
 " mode de la gomme par défaut (standard = 0, blanc = 1, traits entiers = 2)"
 
-#: src/xo-file.c:1524
+#: src/xo-file.c:1564
 msgid " default highlighter color"
 msgstr " couleur du surligneur par défaut"
 
-#: src/xo-file.c:1529
+#: src/xo-file.c:1569
 msgid " default highlighter thickness (fine = 1, medium = 2, thick = 3)"
 msgstr " épaisseur du surligneur par défaut (fin = 1, moyen = 2, épais = 3)"
 
-#: src/xo-file.c:1532
+#: src/xo-file.c:1572
 msgid " default highlighter is in ruler mode (true/false)"
 msgstr " surligneur par défaut est en mode règle (true/false)"
 
-#: src/xo-file.c:1535
+#: src/xo-file.c:1575
 msgid " default highlighter is in shape recognizer mode (true/false)"
 msgstr " surligneur par défaut est en mode détection de formes (true/false)"
 
-#: src/xo-file.c:1538
+#: src/xo-file.c:1578
 msgid ""
 " button 2 tool (pen, eraser, highlighter, text, selectrect, vertspace, hand)"
 msgstr ""
 " outil bouton 2 (pen, eraser, highlighter, text, selectrect, vertspace, hand)"
 
-#: src/xo-file.c:1541
+#: src/xo-file.c:1581
 msgid ""
 " button 2 brush linked to primary brush (true/false) (overrides all other "
 "settings)"
@@ -1109,35 +1123,35 @@ msgstr ""
 " outil bouton 2 lié à l'outil principal (true/false) (remplace tous les "
 "autres réglages)"
 
-#: src/xo-file.c:1544
+#: src/xo-file.c:1584
 msgid " button 2 brush color (for pen or highlighter only)"
 msgstr " couleur de brosse bouton 2 (stylo ou surligneur seulement)"
 
-#: src/xo-file.c:1551
+#: src/xo-file.c:1591
 msgid " button 2 brush thickness (pen, eraser, or highlighter only)"
 msgstr " épaisseur de brosse bouton 2 (stylo, gomme, surligneur seulement)"
 
-#: src/xo-file.c:1555
+#: src/xo-file.c:1595
 msgid " button 2 ruler mode (true/false) (for pen or highlighter only)"
 msgstr " bouton 2 en mode règle (true/false) (stylo ou surligneur seulement)"
 
-#: src/xo-file.c:1559
+#: src/xo-file.c:1599
 msgid " button 2 shape recognizer mode (true/false) (pen or highlighter only)"
 msgstr ""
 " bouton 2 en mode détection de formes (true/false) (stylo ou surligneur "
 "seulement)"
 
-#: src/xo-file.c:1563
+#: src/xo-file.c:1603
 msgid " button 2 eraser mode (eraser only)"
 msgstr " options de la gomme bouton 2 (gomme seulement)"
 
-#: src/xo-file.c:1566
+#: src/xo-file.c:1606
 msgid ""
 " button 3 tool (pen, eraser, highlighter, text, selectrect, vertspace, hand)"
 msgstr ""
 " outil bouton 3 (pen, eraser, highlighter, text, selectrect, vertspace, hand)"
 
-#: src/xo-file.c:1569
+#: src/xo-file.c:1609
 msgid ""
 " button 3 brush linked to primary brush (true/false) (overrides all other "
 "settings)"
@@ -1145,49 +1159,49 @@ msgstr ""
 " outil bouton 3 lié à l'outil principal (true/false) (remplace tous les "
 "autres réglages)"
 
-#: src/xo-file.c:1572
+#: src/xo-file.c:1612
 msgid " button 3 brush color (for pen or highlighter only)"
 msgstr " couleur de brosse bouton 3 (stylo ou surligneur seulement)"
 
-#: src/xo-file.c:1579
+#: src/xo-file.c:1619
 msgid " button 3 brush thickness (pen, eraser, or highlighter only)"
 msgstr " épaisseur de brosse bouton 3 (stylo, gomme, surligneur seulement)"
 
-#: src/xo-file.c:1583
+#: src/xo-file.c:1623
 msgid " button 3 ruler mode (true/false) (for pen or highlighter only)"
 msgstr " bouton 3 en mode règle (true/false) (stylo ou surligneur seulement)"
 
-#: src/xo-file.c:1587
+#: src/xo-file.c:1627
 msgid " button 3 shape recognizer mode (true/false) (pen or highlighter only)"
 msgstr ""
 " bouton 3 en mode détection de formes (true/false) (stylo ou surligneur "
 "seulement)"
 
-#: src/xo-file.c:1591
+#: src/xo-file.c:1631
 msgid " button 3 eraser mode (eraser only)"
 msgstr " options de la gomme bouton 3 (gomme seulement)"
 
-#: src/xo-file.c:1595
+#: src/xo-file.c:1635
 msgid " thickness of the various pens (in points, 1 pt = 1/72 in)"
 msgstr " épaisseurs des divers stylos (en points, 1 pt = 1/72 pouce)"
 
-#: src/xo-file.c:1601
+#: src/xo-file.c:1641
 msgid " thickness of the various erasers (in points, 1 pt = 1/72 in)"
 msgstr " épaisseurs des diverses gommes (en points, 1 pt = 1/72 pouce)"
 
-#: src/xo-file.c:1606
+#: src/xo-file.c:1646
 msgid " thickness of the various highlighters (in points, 1 pt = 1/72 in)"
 msgstr " épaisseurs des divers surligneurs (en points, 1 pt = 1/72 pouce)"
 
-#: src/xo-file.c:1611
+#: src/xo-file.c:1651
 msgid " name of the default font"
 msgstr " nom de la police par défaut"
 
-#: src/xo-file.c:1614
+#: src/xo-file.c:1654
 msgid " default font size"
 msgstr " taille de la police par défaut"
 
-#: src/xo-file.c:1792
+#: src/xo-file.c:1832
 msgid ""
 " Xournal configuration file.\n"
 " This file is generated automatically upon saving preferences.\n"
@@ -1199,30 +1213,30 @@ msgstr ""
 " La plus grande prudence est recommandée lors de l'édition manuelle de ce "
 "fichier.\n"
 
-#: src/xo-misc.c:1261
+#: src/xo-misc.c:1265
 #, c-format
 msgid " of %d"
 msgstr " de %d"
 
-#: src/xo-misc.c:1266
+#: src/xo-misc.c:1270
 msgid "Background"
 msgstr "Fond"
 
-#: src/xo-misc.c:1274
+#: src/xo-misc.c:1278
 #, c-format
 msgid "Layer %d"
 msgstr "Calque %d"
 
-#: src/xo-misc.c:1396
+#: src/xo-misc.c:1402
 #, c-format
 msgid "Xournal - %s"
 msgstr ""
 
-#: src/xo-misc.c:1649
+#: src/xo-misc.c:1654
 #, c-format
 msgid "Save changes to '%s'?"
 msgstr "Enregistrer les modifications de '%s' ?"
 
-#: src/xo-misc.c:1650
+#: src/xo-misc.c:1655
 msgid "Untitled"
 msgstr "Sans titre"

diff --git a/src/TODO b/src/TODO
index eb3caec9728e923eb11f74d3f14953647c85a14d..bcd49e34b7bbe7a3ff8c04d861f0ae8aa029f999 100644 (file)
--- a/src/TODO
+++ b/src/TODO
@@ -51,10 +51,22 @@ DONE: patch to fix focus + allow up/dn in single page mode (Bob McElrath)
 DONE: patch to fix underscores in MRU filename display (Bob McElrath)
 DONE: patch to avoid tiny file dialogs (Bob McElrath)
 DONE: further fixes for focus; can Esc out of page selection box
+DONE: further fixes for xinput under GTK+ 2.17
+DONE: option to auto-load *.pdf.xoj instead of *.pdf (Bob McElrath)
+DONE: look for PDF backgrounds in path of xoj file before prompting user
+DONE: paper color chooser (after a patch by ojb)
 
-(go through Patches tracker and take the good stuff... now at 2009-05-09)
+** patch: ortho/snap (revised Apr 13 2009)
+   xournal_ortho_snap_patch_4 (by Josef Pavlicek)
+
+** patch (Ian-Woo Kim): multicolumn mode + LASSO SELECTION
+   xournal_lasso_multipage_zoom_button_20090620.patch
+
+** autosave patch (Edward Yang) (fix: optional only, w/ menu + cfgfile
+   entries; fix: should clean up autosave.xoj.bg* files too; config interval)
+   0001-Implement-autosave-for-documents-revised.patch (2 seconds after
+   modification, vs original 5 seconds)
 
-- paper color chooser (see tracker 2083103)
 - prerelease: update help file (remove references to pdftoppm/libgnomeprint
   & update to poppler/gtkprint)
 - REMOVE BINARY INSTALLER (poppler breaks ABI all the time)
@@ -65,16 +77,10 @@ DONE: further fixes for focus; can Esc out of page selection box
 - auto-hide patch from ~/prog/src/xournal-autohide/ ?
      (check for cpu usage; handle BOTH edges
       and only (un)hide stuff at the correct edge!)
-** if bg pdf not found in absolute path, look in path of xoj file before
-   prompting user.
 ** UI update (Bob McElrath) -- eliminating status bar, compact layout,
    "compact interface" by default; themes, with line in config file
    to load pixmaps from pixmaps/$THEME/ (see Jan 9, 2009 emails)
-** autosave patch (Edward Yang) (fix: optional only, w/ menu + cfgfile
-   entries; fix: should clean up autosave.xoj.bg* files too; config interval)
 - horizontal mode instead of dual-view / multicolumn ?
-- patch (ikim@physics.wisc.edu): multicolumn mode + LASSO SELECTION
-- patch: ortho/snap (revised Apr 13 2009)
 ** FIXME: get_pressure_multiplier() should access correct members
    of event struct, like xinput_coords()
 ** FIX RECOGNIZER BUG: for single-segment strokes (e.g. single click),

diff --git a/src/main.c b/src/main.c
index 433fc298c3c37000a14d7bb3827a149596161c47..54fd51d404ae2f146019a5428f3d22710d7b12eb 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -204,12 +204,13 @@ void init_stuff (int argc, char *argv[])
     gtk_widget_set_sensitive(GET_COMPONENT("optionsUseXInput"), FALSE);
 
   ui.use_xinput = ui.allow_xinput && can_xinput;
-  ui.need_emergency_disable_xinput = FALSE;
 
   gtk_check_menu_item_set_active(
     GTK_CHECK_MENU_ITEM(GET_COMPONENT("optionsProgressiveBG")), ui.progressive_bg);
   gtk_check_menu_item_set_active(
     GTK_CHECK_MENU_ITEM(GET_COMPONENT("optionsPrintRuling")), ui.print_ruling);
+  gtk_check_menu_item_set_active(
+    GTK_CHECK_MENU_ITEM(GET_COMPONENT("optionsAutoloadPdfXoj")), ui.autoload_pdf_xoj);
   gtk_check_menu_item_set_active(
     GTK_CHECK_MENU_ITEM(GET_COMPONENT("optionsLeftHanded")), ui.left_handed);
   gtk_check_menu_item_set_active(
@@ -265,12 +266,6 @@ void init_stuff (int argc, char *argv[])
       "event", G_CALLBACK (filter_extended_events),
       NULL);
   }
-  if (!gtk_check_version(2, 17, 0)) {
-    g_signal_connect (
-      GET_COMPONENT("comboLayer"),
-      "notify::popup-shown", G_CALLBACK (combobox_popup_disable_xinput),
-      NULL);
-  }
 
   // load the MRU
   

diff --git a/src/xo-callbacks.c b/src/xo-callbacks.c
index 43c96fdfc409400a96e5d94aab9fd1ba0c7a6be1..6254ab80aa0110b1adcac86009ea5b0f8d2151ff 100644 (file)
--- a/src/xo-callbacks.c
+++ b/src/xo-callbacks.c
@@ -1308,7 +1308,7 @@ on_papercolorWhite_activate            (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
 {
   end_text();
-  process_papercolor_activate(menuitem, COLOR_WHITE);
+  process_papercolor_activate(menuitem, COLOR_WHITE, predef_bgcolors_rgba[COLOR_WHITE]);
 }
 
 
@@ -1317,7 +1317,7 @@ on_papercolorYellow_activate           (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
 {
   end_text();
-  process_papercolor_activate(menuitem, COLOR_YELLOW);
+  process_papercolor_activate(menuitem, COLOR_YELLOW, predef_bgcolors_rgba[COLOR_YELLOW]);
 }
 
 
@@ -1326,7 +1326,7 @@ on_papercolorPink_activate             (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
 {
   end_text();
-  process_papercolor_activate(menuitem, COLOR_RED);
+  process_papercolor_activate(menuitem, COLOR_RED, predef_bgcolors_rgba[COLOR_RED]);
 }
 
 
@@ -1335,7 +1335,7 @@ on_papercolorOrange_activate           (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
 {
   end_text();
-  process_papercolor_activate(menuitem, COLOR_ORANGE);
+  process_papercolor_activate(menuitem, COLOR_ORANGE, predef_bgcolors_rgba[COLOR_ORANGE]);
 }
 
 
@@ -1344,7 +1344,7 @@ on_papercolorBlue_activate             (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
 {
   end_text();
-  process_papercolor_activate(menuitem, COLOR_BLUE);
+  process_papercolor_activate(menuitem, COLOR_BLUE, predef_bgcolors_rgba[COLOR_BLUE]);
 }
 
 
@@ -1353,7 +1353,7 @@ on_papercolorGreen_activate            (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
 {
   end_text();
-  process_papercolor_activate(menuitem, COLOR_GREEN);
+  process_papercolor_activate(menuitem, COLOR_GREEN, predef_bgcolors_rgba[COLOR_GREEN]);
 }
 
 
@@ -1361,7 +1361,25 @@ void
 on_papercolorOther_activate            (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
 {
-
+  GtkWidget *dialog;
+  GtkColorSelection *colorsel;
+  gint result;
+  guint rgba;
+  GdkColor gdkcolor;
+  
+  end_text();
+  dialog = gtk_color_selection_dialog_new(_("Pick a Paper Color"));
+  colorsel = GTK_COLOR_SELECTION(GTK_COLOR_SELECTION_DIALOG(dialog)->colorsel);
+  if (ui.cur_page->bg->type == BG_SOLID) rgba = ui.cur_page->bg->color_rgba;
+  else rgba = ui.default_page.bg->color_rgba;
+  rgb_to_gdkcolor(rgba, &gdkcolor);
+  gtk_color_selection_set_current_color(colorsel, &gdkcolor);
+  
+  if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_OK) {
+    gtk_color_selection_get_current_color(colorsel, &gdkcolor);
+    process_papercolor_activate(menuitem, COLOR_OTHER, gdkcolor_to_rgba(gdkcolor, 0xffff));
+  }
+  gtk_widget_destroy(dialog);
 }
 
 
@@ -2526,7 +2544,20 @@ on_canvas_enter_notify_event           (GtkWidget       *widget,
                                         GdkEventCrossing *event,
                                         gpointer         user_data)
 {
+  GList *dev_list;
+  GdkDevice *dev;
 
+#ifdef INPUT_DEBUG
+  printf("DEBUG: enter notify\n");
+#endif
+    /* re-enable input devices after they've been emergency-disabled
+       by leave_notify */
+  if (!gtk_check_version(2, 17, 0)) {
+    for (dev_list = gdk_devices_list(); dev_list != NULL; dev_list = dev_list->next) {
+      dev = GDK_DEVICE(dev_list->data);
+      gdk_device_set_mode(dev, GDK_MODE_SCREEN);
+    }
+  }
   return FALSE;
 }
 
@@ -2535,12 +2566,19 @@ on_canvas_leave_notify_event           (GtkWidget       *widget,
                                         GdkEventCrossing *event,
                                         gpointer         user_data)
 {
+  GList *dev_list;
+  GdkDevice *dev;
+
 #ifdef INPUT_DEBUG
-  printf("DEBUG: leave notify\n");
+  printf("DEBUG: leave notify (mode=%d, details=%d)\n", event->mode, event->detail);
 #endif
-  if (ui.need_emergency_disable_xinput) {
-    gtk_widget_set_extension_events(GTK_WIDGET (canvas), GDK_EXTENSION_EVENTS_NONE);
-    ui.need_emergency_disable_xinput = FALSE;
+    /* emergency disable XInput to avoid segfaults (GTK+ 2.17) or 
+       interface non-responsiveness (GTK+ 2.18) */
+  if (!gtk_check_version(2, 17, 0)) { 
+    for (dev_list = gdk_devices_list(); dev_list != NULL; dev_list = dev_list->next) {
+      dev = GDK_DEVICE(dev_list->data);
+      gdk_device_set_mode(dev, GDK_MODE_DISABLED);
+    }
   }
   return FALSE;
 }
@@ -3419,6 +3457,14 @@ on_optionsPrintRuling_activate         (GtkMenuItem     *menuitem,
   ui.print_ruling = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM (menuitem));
 }
 
+void
+on_optionsAutoloadPdfXoj_activate      (GtkMenuItem     *menuitem,
+                                        gpointer         user_data)
+{
+  end_text();
+  ui.autoload_pdf_xoj = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM (menuitem));
+}
+
 void
 on_optionsDiscardCore_activate         (GtkMenuItem     *menuitem,
                                         gpointer         user_data)

diff --git a/src/xo-callbacks.h b/src/xo-callbacks.h
index c371ddd88143af14d712ac2474967054b31659f3..c1291687c223a462b2474da559f82fb416295a14 100644 (file)
--- a/src/xo-callbacks.h
+++ b/src/xo-callbacks.h
@@ -597,6 +597,10 @@ void
 on_optionsPrintRuling_activate         (GtkMenuItem     *menuitem,
                                         gpointer         user_data);
 
+void
+on_optionsAutoloadPdfXoj_activate      (GtkMenuItem     *menuitem,
+                                        gpointer         user_data);
+
 void
 on_optionsDiscardCore_activate         (GtkMenuItem     *menuitem,
                                         gpointer         user_data);

diff --git a/src/xo-file.c b/src/xo-file.c
index 00075f4e51329f9c2bb430aeceb41113d6ba8b38..ad596201a0196fc15232769515cdd4547b445ac3 100644 (file)
--- a/src/xo-file.c
+++ b/src/xo-file.c
@@ -665,7 +665,10 @@ gboolean user_wants_second_chance(char **filename)
   dialog = gtk_file_chooser_dialog_new(_("Open PDF"), GTK_WINDOW (winMain),
      GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
      GTK_STOCK_OPEN, GTK_RESPONSE_OK, NULL);
-
+#ifdef FILE_DIALOG_SIZE_BUGFIX
+  gtk_window_set_default_size(GTK_WINDOW(dialog), 500, 400);
+#endif
+  
   filt_all = gtk_file_filter_new();
   gtk_file_filter_set_name(filt_all, _("All files"));
   gtk_file_filter_add_pattern(filt_all, "*");
@@ -675,6 +678,8 @@ gboolean user_wants_second_chance(char **filename)
   gtk_file_chooser_add_filter(GTK_FILE_CHOOSER (dialog), filt_pdf);
   gtk_file_chooser_add_filter(GTK_FILE_CHOOSER (dialog), filt_all);
 
+  if (ui.default_path!=NULL) gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER (dialog), ui.default_path);
+
   if (gtk_dialog_run(GTK_DIALOG(dialog)) != GTK_RESPONSE_OK) {
     gtk_widget_destroy(dialog);
     return FALSE;
@@ -697,11 +702,25 @@ gboolean open_journal(char *filename)
   gzFile f;
   char buffer[1000];
   int len;
-  gchar *tmpfn;
+  gchar *tmpfn, *tmpfn2, *p, *q;
   gboolean maybe_pdf;
   
+  tmpfn = g_strdup_printf("%s.xoj", filename);
+  if (ui.autoload_pdf_xoj && g_file_test(tmpfn, G_FILE_TEST_EXISTS) &&
+      (g_str_has_suffix(filename, ".pdf") || g_str_has_suffix(filename, ".PDF")))
+  {
+    valid = open_journal(tmpfn);
+    g_free(tmpfn);
+    return valid;
+  }
+  g_free(tmpfn);
+
   f = gzopen(filename, "r");
   if (f==NULL) return FALSE;
+  if (filename[0]=='/') {
+    if (ui.default_path != NULL) g_free(ui.default_path);
+    ui.default_path = g_path_get_dirname(filename);
+  }
   
   context = g_markup_parse_context_new(&parser, 0, NULL, NULL);
   valid = TRUE;
@@ -756,7 +775,21 @@ gboolean open_journal(char *filename)
     else
       tmpfn = g_strdup(tmpBg_pdf->filename->s);
     valid = init_bgpdf(tmpfn, FALSE, tmpBg_pdf->file_domain);
-    // in case the file name became invalid
+    // if file name is invalid: first try in xoj file's directory
+    if (!valid && tmpBg_pdf->file_domain != DOMAIN_ATTACH) {
+      p = g_path_get_dirname(filename);
+      q = g_path_get_basename(tmpfn);
+      tmpfn2 = g_strdup_printf("%s/%s", p, q);
+      g_free(p); g_free(q);
+      valid = init_bgpdf(tmpfn2, FALSE, tmpBg_pdf->file_domain);
+      if (valid) {  // change the file name...
+        printf("substituting %s -> %s\n", tmpfn, tmpfn2);
+        g_free(tmpBg_pdf->filename->s);
+        tmpBg_pdf->filename->s = tmpfn2;
+      }
+      else g_free(tmpfn2);
+    }
+    // if file name is invalid: next prompt user
     if (!valid && tmpBg_pdf->file_domain != DOMAIN_ATTACH)
       if (user_wants_second_chance(&tmpfn)) {
         valid = init_bgpdf(tmpfn, FALSE, tmpBg_pdf->file_domain);
@@ -1012,13 +1045,13 @@ gboolean bgpdf_scheduler_callback(gpointer data)
 
 /* make a request */
 
-void add_bgpdf_request(int pageno, double zoom)
+gboolean add_bgpdf_request(int pageno, double zoom)
 {
   struct BgPdfRequest *req, *cmp_req;
   GList *list;
-  
+
   if (bgpdf.status == STATUS_NOT_INIT)
-    return; // don't accept requests
+    return FALSE; // don't accept requests
   req = g_new(struct BgPdfRequest, 1);
   req->pageno = pageno;
   req->dpi = 72*zoom;
@@ -1034,6 +1067,7 @@ void add_bgpdf_request(int pageno, double zoom)
   // make the request
   bgpdf.requests = g_list_append(bgpdf.requests, req);
   if (!bgpdf.pid) bgpdf.pid = g_idle_add(bgpdf_scheduler_callback, NULL);
+  return TRUE;
 }
 
 /* shutdown the PDF reader */
@@ -1300,6 +1334,7 @@ void init_config_default(void)
   ui.width_minimum_multiplier = 0.0;
   ui.width_maximum_multiplier = 1.25;
   ui.button_switch_mapping = FALSE;
+  ui.autoload_pdf_xoj = FALSE;
   
   // the default UI vertical order
   ui.vertical_order[0][0] = 1; 
@@ -1432,6 +1467,9 @@ void save_config_to_file(void)
   update_keyval("general", "buttons_switch_mappings",
     _(" buttons 2 and 3 switch mappings instead of drawing (useful for some tablets) (true/false)"),
     g_strdup(ui.button_switch_mapping?"true":"false"));
+  update_keyval("general", "autoload_pdf_xoj",
+    _(" automatically load filename.pdf.xoj instead of filename.pdf (true/false)"),
+    g_strdup(ui.autoload_pdf_xoj?"true":"false"));
   update_keyval("general", "default_path",
     _(" default path for open/save (leave blank for current directory)"),
     g_strdup((ui.default_path!=NULL)?ui.default_path:""));
@@ -1815,6 +1853,7 @@ void load_config_from_file(void)
   parse_keyval_boolean("general", "discard_corepointer", &ui.discard_corepointer);
   parse_keyval_boolean("general", "use_erasertip", &ui.use_erasertip);
   parse_keyval_boolean("general", "buttons_switch_mappings", &ui.button_switch_mapping);
+  parse_keyval_boolean("general", "autoload_pdf_xoj", &ui.autoload_pdf_xoj);
   parse_keyval_string("general", "default_path", &ui.default_path);
   parse_keyval_boolean("general", "pressure_sensitivity", &ui.pressure_sensitivity);
   parse_keyval_float("general", "width_minimum_multiplier", &ui.width_minimum_multiplier, 0., 10.);

diff --git a/src/xo-file.h b/src/xo-file.h
index 6b35597a997481fdde1cf4bcadcf2e24a179537b..c94064511e9dcef69543332a85d5fca2e8b77de7 100644 (file)
--- a/src/xo-file.h
+++ b/src/xo-file.h
@@ -19,7 +19,7 @@ GList *attempt_load_gv_bg(char *filename);
 struct Background *attempt_screenshot_bg(void);
 
 void cancel_bgpdf_request(struct BgPdfRequest *req);
-void add_bgpdf_request(int pageno, double zoom);
+gboolean add_bgpdf_request(int pageno, double zoom);
 gboolean bgpdf_scheduler_callback(gpointer data);
 void shutdown_bgpdf(void);
 gboolean init_bgpdf(char *pdfname, gboolean create_pages, int file_domain);

diff --git a/src/xo-interface.c b/src/xo-interface.c
index df236d8bb8e63325ad3eecc370cee6d17395c899..f7d8b95d02623d1f0978b37d869f094f40b0b4e6 100644 (file)
--- a/src/xo-interface.c
+++ b/src/xo-interface.c
@@ -245,6 +245,7 @@ create_winMain (void)
   GtkWidget *separator18;
   GtkWidget *optionsProgressiveBG;
   GtkWidget *optionsPrintRuling;
+  GtkWidget *optionsAutoloadPdfXoj;
   GtkWidget *optionsLeftHanded;
   GtkWidget *optionsShortenMenus;
   GtkWidget *separator21;
@@ -754,11 +755,9 @@ create_winMain (void)
   gtk_container_add (GTK_CONTAINER (journalPaperColor_menu), papercolorGreen);
   gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (papercolorGreen), TRUE);
 
-  papercolorOther = gtk_radio_menu_item_new_with_mnemonic (papercolorWhite_group, _("other..."));
-  papercolorWhite_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (papercolorOther));
+  papercolorOther = gtk_menu_item_new_with_mnemonic (_("other..."));
   gtk_widget_show (papercolorOther);
   gtk_container_add (GTK_CONTAINER (journalPaperColor_menu), papercolorOther);
-  gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (papercolorOther), TRUE);
 
   papercolorNA = gtk_radio_menu_item_new_with_mnemonic (papercolorWhite_group, _("NA"));
   papercolorWhite_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (papercolorNA));
@@ -1371,6 +1370,10 @@ create_winMain (void)
   gtk_widget_show (optionsPrintRuling);
   gtk_container_add (GTK_CONTAINER (menuOptions_menu), optionsPrintRuling);
 
+  optionsAutoloadPdfXoj = gtk_check_menu_item_new_with_mnemonic (_("Autoload pdf.xoj"));
+  gtk_widget_show (optionsAutoloadPdfXoj);
+  gtk_container_add (GTK_CONTAINER (menuOptions_menu), optionsAutoloadPdfXoj);
+
   optionsLeftHanded = gtk_check_menu_item_new_with_mnemonic (_("Left-Handed Scrollbar"));
   gtk_widget_show (optionsLeftHanded);
   gtk_container_add (GTK_CONTAINER (menuOptions_menu), optionsLeftHanded);
@@ -2107,7 +2110,7 @@ create_winMain (void)
   g_signal_connect ((gpointer) papercolorGreen, "toggled",
                     G_CALLBACK (on_papercolorGreen_activate),
                     NULL);
-  g_signal_connect ((gpointer) papercolorOther, "toggled",
+  g_signal_connect ((gpointer) papercolorOther, "activate",
                     G_CALLBACK (on_papercolorOther_activate),
                     NULL);
   g_signal_connect ((gpointer) paperstylePlain, "toggled",
@@ -2344,6 +2347,9 @@ create_winMain (void)
   g_signal_connect ((gpointer) optionsPrintRuling, "activate",
                     G_CALLBACK (on_optionsPrintRuling_activate),
                     NULL);
+  g_signal_connect ((gpointer) optionsAutoloadPdfXoj, "activate",
+                    G_CALLBACK (on_optionsAutoloadPdfXoj_activate),
+                    NULL);
   g_signal_connect ((gpointer) optionsLeftHanded, "toggled",
                     G_CALLBACK (on_optionsLeftHanded_activate),
                     NULL);
@@ -2711,6 +2717,7 @@ create_winMain (void)
   GLADE_HOOKUP_OBJECT (winMain, separator18, "separator18");
   GLADE_HOOKUP_OBJECT (winMain, optionsProgressiveBG, "optionsProgressiveBG");
   GLADE_HOOKUP_OBJECT (winMain, optionsPrintRuling, "optionsPrintRuling");
+  GLADE_HOOKUP_OBJECT (winMain, optionsAutoloadPdfXoj, "optionsAutoloadPdfXoj");
   GLADE_HOOKUP_OBJECT (winMain, optionsLeftHanded, "optionsLeftHanded");
   GLADE_HOOKUP_OBJECT (winMain, optionsShortenMenus, "optionsShortenMenus");
   GLADE_HOOKUP_OBJECT (winMain, separator21, "separator21");

diff --git a/src/xo-misc.c b/src/xo-misc.c
index 988811eb2291356b6f290935ca7acd0b300f834e..080d98c2b0279f7716117d09ce41c265942d2493 100644 (file)
--- a/src/xo-misc.c
+++ b/src/xo-misc.c
@@ -653,7 +653,7 @@ void rescale_bg_pixmaps(void)
     // in progressive mode we scale only visible pages
     if (ui.progressive_bg && !is_visible(pg)) continue;
 
-    if (pg->bg->type == BG_PIXMAP && pg->bg->canvas_item!=NULL) { // do the rescaling ourselves
+    if (pg->bg->type == BG_PIXMAP && pg->bg->canvas_item!=NULL) {
       g_object_get(G_OBJECT(pg->bg->canvas_item), "pixbuf", &pix, NULL);
       if (pix!=pg->bg->pixbuf)
         gnome_canvas_item_set(pg->bg->canvas_item, "pixbuf", pg->bg->pixbuf, NULL);
@@ -675,8 +675,8 @@ void rescale_bg_pixmaps(void)
       // request an asynchronous update to a better pixmap if needed
       zoom_to_request = MIN(ui.zoom, MAX_SAFE_RENDER_DPI/72.0);
       if (pg->bg->pixbuf_scale == zoom_to_request) continue;
-      add_bgpdf_request(pg->bg->file_page_seq, zoom_to_request);
-      pg->bg->pixbuf_scale = zoom_to_request;
+      if (add_bgpdf_request(pg->bg->file_page_seq, zoom_to_request))
+        pg->bg->pixbuf_scale = zoom_to_request;
     }
   }
 }
@@ -1320,7 +1320,7 @@ void update_page_stuff(void)
         break;
       default:
         gtk_check_menu_item_set_active(
-          GTK_CHECK_MENU_ITEM(GET_COMPONENT("papercolorOther")), TRUE);
+          GTK_CHECK_MENU_ITEM(GET_COMPONENT("papercolorNA")), TRUE);
         break;
     }
     switch (ui.cur_page->bg->ruling) {
@@ -1561,16 +1561,18 @@ void process_thickness_activate(GtkMenuItem *menuitem, int tool, int val)
   update_cursor();
 }
 
-void process_papercolor_activate(GtkMenuItem *menuitem, int color)
+void process_papercolor_activate(GtkMenuItem *menuitem, int color, guint rgba)
 {
   struct Page *pg;
   GList *pglist;
   gboolean hasdone;
 
-  if (!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM (menuitem)))
-    return;
+  if (GTK_OBJECT_TYPE(menuitem) == GTK_TYPE_RADIO_MENU_ITEM) {
+    if (!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM (menuitem)))
+      return;
+  }
 
-  if ((ui.cur_page->bg->type != BG_SOLID) || ui.bg_apply_all_pages)
+  if ((ui.cur_page->bg->type != BG_SOLID) || ui.bg_apply_all_pages || color == COLOR_OTHER)
     gtk_check_menu_item_set_active(
       GTK_CHECK_MENU_ITEM(GET_COMPONENT("papercolorNA")), TRUE);
 
@@ -1578,7 +1580,7 @@ void process_papercolor_activate(GtkMenuItem *menuitem, int color)
   hasdone = FALSE;
   for (pglist = journal.pages; pglist!=NULL; pglist = pglist->next) {
     if (ui.bg_apply_all_pages) pg = (struct Page *)pglist->data;
-    if (pg->bg->type == BG_SOLID && pg->bg->color_no != color) {
+    if (pg->bg->type == BG_SOLID && pg->bg->color_rgba != rgba) {
       prepare_new_undo();
       if (hasdone) undo->multiop |= MULTIOP_CONT_UNDO;
       undo->multiop |= MULTIOP_CONT_REDO;
@@ -1589,7 +1591,7 @@ void process_papercolor_activate(GtkMenuItem *menuitem, int color)
       undo->bg->canvas_item = NULL;
 
       pg->bg->color_no = color;
-      pg->bg->color_rgba = predef_bgcolors_rgba[color];
+      pg->bg->color_rgba = rgba;
       update_canvas_bg(pg);
     }
     if (!ui.bg_apply_all_pages) break;
@@ -2014,7 +2016,6 @@ void hide_unimplemented(void)
 {
   gtk_widget_hide(GET_COMPONENT("filePrintOptions"));
   gtk_widget_hide(GET_COMPONENT("journalFlatten"));  
-  gtk_widget_hide(GET_COMPONENT("papercolorOther")); 
   gtk_widget_hide(GET_COMPONENT("toolsSelectRegion"));
   gtk_widget_hide(GET_COMPONENT("buttonSelectRegion"));
   gtk_widget_hide(GET_COMPONENT("button2SelectRegion"));
@@ -2110,17 +2111,6 @@ gboolean fix_extended_events (GtkWidget *widget, GdkEvent *event,
 }
 */
 
-// disable xinput when layer combo box is popped up, to avoid GTK+ 2.17 crash
-
-gboolean combobox_popup_disable_xinput (GtkWidget *widget, GdkEvent *event,
-                                   gpointer user_data)
-{
-  gboolean is_shown;
-  
-  g_object_get(G_OBJECT(widget), "popup-shown", &is_shown, NULL);
-  gtk_widget_set_extension_events(GTK_WIDGET (canvas), 
-       (ui.use_xinput && !is_shown)?GDK_EXTENSION_EVENTS_ALL:GDK_EXTENSION_EVENTS_NONE);
-}
 
 /* When enter is pressed into page spinbox, send focus back to canvas. */
 

diff --git a/src/xo-misc.h b/src/xo-misc.h
index f16a6d9240883d0674f1b7cae1fd8a24450ea154..5be0c13b647cac31c9e80d4d501e61c486777fbc 100644 (file)
--- a/src/xo-misc.h
+++ b/src/xo-misc.h
@@ -65,7 +65,7 @@ void set_cur_color(int color_no, guint color_rgba);
 void recolor_temp_text(int color_no, guint color_rgba);
 void process_color_activate(GtkMenuItem *menuitem, int color_no, guint color_rgba);
 void process_thickness_activate(GtkMenuItem *menuitem, int tool, int val);
-void process_papercolor_activate(GtkMenuItem *menuitem, int color);
+void process_papercolor_activate(GtkMenuItem *menuitem, int color, guint rgba);
 void process_paperstyle_activate(GtkMenuItem *menuitem, int style);
 
 gboolean ok_to_close(void);
@@ -100,7 +100,6 @@ void do_fullscreen(gboolean active);
 // fix GTK+ 2.16/2.17 issues with XInput events
 gboolean filter_extended_events(GtkWidget *widget, GdkEvent *event, gpointer user_data);
 // gboolean fix_extended_events(GtkWidget *widget, GdkEvent *event, gpointer user_data);
-gboolean combobox_popup_disable_xinput(GtkWidget *widget, GdkEvent *event, gpointer user_data);
 
 // help with focus
 gboolean handle_activate_signal(GtkWidget *widget, gpointer user_data);

diff --git a/src/xo-paint.c b/src/xo-paint.c
index c865ac1c1880750bc7a49f80e53578b12bf40967..7ab18469f3006edaa2eacc5e3f523cc4f0fbed75 100644 (file)
--- a/src/xo-paint.c
+++ b/src/xo-paint.c
@@ -1109,7 +1109,7 @@ void recolor_selection(int color_no, guint color_rgba)
     undo->auxlist = g_list_append(undo->auxlist, brush);
     // repaint the stroke
     item->brush.color_no = color_no;
-    item->brush.color_rgba = color_rgba;
+    item->brush.color_rgba = color_rgba | 0xff; // no alpha
     if (item->canvas_item!=NULL) {
       if (!item->brush.variable_width)
         gnome_canvas_item_set(item->canvas_item, 
@@ -1216,14 +1216,6 @@ void start_text(GdkEvent *event, struct Item *item)
 
   ui.cur_item_type = ITEM_TEXT;
 
-  // HACK TO BYPASS GTK+ 2.17 issue: crash if move text within selection
-  // also bypass: non-responsiveness of clicks in text box with 2.17 & 2.18
-  if (!gtk_check_version(2, 17, 0)) {
-    /* ask the canvas's leave-notify handler to disable 
-       xinput when it's safe to do so... */
-    ui.need_emergency_disable_xinput = TRUE;
-  }
-
   if (item==NULL) {
     item = g_new(struct Item, 1);
     item->text = NULL;
@@ -1287,13 +1279,6 @@ void end_text(void)
 
   if (ui.cur_item_type!=ITEM_TEXT) return; // nothing for us to do!
 
-  // HACK TO BYPASS GTK+ 2.17 issues
-  if (!gtk_check_version(2, 17, 0)) {
-    // re-enable XInput if needed (we disabled it during text edition)
-    gtk_widget_set_extension_events(GTK_WIDGET (canvas), 
-       ui.use_xinput?GDK_EXTENSION_EVENTS_ALL:GDK_EXTENSION_EVENTS_NONE);
-  }
-  
   // finalize the text that's been edited... 
   buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(ui.cur_item->widget));
   gtk_text_buffer_get_bounds(buffer, &start, &end);

diff --git a/src/xournal.h b/src/xournal.h
index 277b1d0b84e91806889a3287a8e6a2d057b7249d..48ae81a9f63158d731872214797550b5fb78819b 100644 (file)
--- a/src/xournal.h
+++ b/src/xournal.h
@@ -267,6 +267,7 @@ typedef struct UIData {
   int zoom_step_increment; // the increment in the zoom dialog box
   double zoom_step_factor; // the multiplicative factor in zoom in/out
   double startup_zoom;
+  gboolean autoload_pdf_xoj;
 #if GLIB_CHECK_VERSION(2,6,0)
   GKeyFile *config_data;
 #endif
@@ -281,7 +282,6 @@ typedef struct UIData {
   gboolean shorten_menus; // shorten menus ?
   gchar *shorten_menu_items; // which items to hide
   gboolean is_sel_cursor; // displaying a selection-related cursor
-  gboolean need_emergency_disable_xinput; // need to disable xinput to avoid GTK+ 2.17 bug ?
 #if GTK_CHECK_VERSION(2,10,0)
   GtkPrintSettings *print_settings;
 #endif

diff --git a/xournal.glade b/xournal.glade
index c160040fdb4e75a7a53a2893a62a15fda9c57f8c..eaebc16854925a22c4455d02bdb8c555cafc567c 100644 (file)
--- a/xournal.glade
+++ b/xournal.glade
@@ -772,13 +772,11 @@
                          </child>
 
                          <child>
-                           <widget class="GtkRadioMenuItem" id="papercolorOther">
+                           <widget class="GtkMenuItem" id="papercolorOther">
                              <property name="visible">True</property>
                              <property name="label" translatable="yes">other...</property>
                              <property name="use_underline">True</property>
-                             <property name="active">True</property>
-                             <property name="group">papercolorWhite</property>
-                             <signal name="toggled" handler="on_papercolorOther_activate" last_modification_time="Thu, 01 Dec 2005 22:00:06 GMT"/>
+                             <signal name="activate" handler="on_papercolorOther_activate" last_modification_time="Sun, 27 Sep 2009 22:00:06 GMT"/>
                            </widget>
                          </child>
 
@@ -1876,6 +1874,16 @@
                    </widget>
                  </child>
 
+                 <child>
+                   <widget class="GtkCheckMenuItem" id="optionsAutoloadPdfXoj">
+                     <property name="visible">True</property>
+                     <property name="label" translatable="yes">Autoload pdf.xoj</property>
+                     <property name="use_underline">True</property>
+                     <property name="active">False</property>
+                     <signal name="activate" handler="on_optionsAutoloadPdfXoj_activate" last_modification_time="Sat, 25 Nov 2006 03:42:27 GMT"/>
+                   </widget>
+                 </child>
+
                  <child>
                    <widget class="GtkCheckMenuItem" id="optionsLeftHanded">
                      <property name="visible">True</property>