~kevang/mnemosyne-proj/grade-shortcuts-improvements

« back to all changes in this revision

Viewing changes to mnemosyne.wpu

  • Committer: Peter.Bienstman at UGent
  • Date: 2015-01-21 20:50:29 UTC
  • Revision ID: peter.bienstman@ugent.be-20150121205029-236t3m15u0q5pzho
Start working on merging card appearance.

Show diffs side-by-side

added added

removed removed

Lines of Context:
596
596
                      {'attrib-starts': [],
597
597
                       'first-line': 0,
598
598
                       'folded-linenos': [],
599
 
                       'sel-line': 10,
600
 
                       'sel-line-start': 297,
601
 
                       'selection_end': 297,
602
 
                       'selection_start': 297}),
 
599
                       'sel-line': 33,
 
600
                       'sel-line-start': 6737,
 
601
                       'selection_end': 6779,
 
602
                       'selection_start': 6779}),
603
603
                     ('debug-probe',
604
604
                      'wide',
605
605
                      2,
664
664
                                      'top-node': (0,)}})],
665
665
        'primary_view_state': {'editor_states': ('horizontal',
666
666
        0.5,
667
 
        ({'bookmarks': ([[loc('mnemosyne/mnemosyne/libmnemosyne/databases/SQLite_logging.py'),
668
 
                          {'attrib-starts': [('SQLiteLogging',
669
 
        15),
670
 
        ('SQLiteLogging.update_card_after_log_import',
671
 
         311)],
672
 
                           'first-line': 84,
673
 
                           'folded-linenos': [],
674
 
                           'sel-line': 317,
675
 
                           'sel-line-start': 14244,
676
 
                           'selection_end': 14271,
677
 
                           'selection_start': 14271},
678
 
                          1421417380.999],
679
 
                         [loc('mnemosyne/mnemosyne/libmnemosyne/databases/SQLite_media.py'),
680
 
                          {'attrib-starts': [('SQLiteMedia',
681
 
        19),
682
 
        ('SQLiteMedia.active_dynamic_media_files',
683
 
         97)],
684
 
                           'first-line': 84,
685
 
                           'folded-linenos': [],
686
 
                           'sel-line': 103,
687
 
                           'sel-line-start': 3667,
688
 
                           'selection_end': 3709,
689
 
                           'selection_start': 3709},
690
 
                          1421417383.885],
691
 
                         [loc('mnemosyne/mnemosyne/libmnemosyne/databases/SQLite_sync.py'),
692
 
                          {'attrib-starts': [('SQLiteSync',
693
 
        31),
694
 
        ('SQLiteSync.number_of_log_entries',
695
 
         141)],
696
 
                           'first-line': 213,
697
 
                           'folded-linenos': [],
698
 
                           'sel-line': 142,
699
 
                           'sel-line-start': 5862,
700
 
                           'selection_end': 5896,
701
 
                           'selection_start': 5896},
702
 
                          1421417965.893],
703
 
                         [loc('mnemosyne/ChangeLog'),
 
667
        ({'bookmarks': ([[loc('mnemosyne/ChangeLog'),
704
668
                          {'attrib-starts': [],
705
669
                           'first-line': 0,
706
670
                           'folded-linenos': [],
888
852
                           'sel-line-start': 625,
889
853
                           'selection_end': 679,
890
854
                           'selection_start': 678},
891
 
                          1421750206.881]],
 
855
                          1421750206.881],
 
856
                         [loc('mnemosyne/TODO'),
 
857
                          {'attrib-starts': [],
 
858
                           'first-line': 0,
 
859
                           'folded-linenos': [],
 
860
                           'sel-line': 25,
 
861
                           'sel-line-start': 976,
 
862
                           'selection_end': 989,
 
863
                           'selection_start': 989},
 
864
                          1421834833.001],
 
865
                         [loc('mnemosyne/mnemosyne/libmnemosyne/file_formats/mnemosyne2_db.py'),
 
866
                          {'attrib-starts': [('Mnemosyne2Db',
 
867
        12),
 
868
        ('Mnemosyne2Db.do_import',
 
869
         20)],
 
870
                           'first-line': 14,
 
871
                           'folded-linenos': [],
 
872
                           'sel-line': 38,
 
873
                           'sel-line-start': 1549,
 
874
                           'selection_end': 1557,
 
875
                           'selection_start': 1557},
 
876
                          1421834904.886],
 
877
                         [loc('mnemosyne/mnemosyne/libmnemosyne/configuration.py'),
 
878
                          {'attrib-starts': [('Configuration',
 
879
        68),
 
880
        ('Configuration.set_card_type_property',
 
881
         302)],
 
882
                           'first-line': 301,
 
883
                           'folded-linenos': [],
 
884
                           'sel-line': 321,
 
885
                           'sel-line-start': 12919,
 
886
                           'selection_end': 12978,
 
887
                           'selection_start': 12978},
 
888
                          1421835945.236]],
892
889
                        20),
893
890
          'current-loc': loc('mnemosyne/TODO'),
894
891
          'editor-state-list': [(loc('mnemosyne/mnemosyne/cle/android_render_chain.py'),
1192
1189
                                (loc('mnemosyne/mnemosyne/libmnemosyne/configuration.py'),
1193
1190
                                 {'attrib-starts': [('Configuration',
1194
1191
        68),
1195
 
        ('Configuration.delete_card_type_properties',
1196
 
         364)],
1197
 
                                  'first-line': 352,
 
1192
        ('Configuration.set_card_type_property',
 
1193
         302)],
 
1194
                                  'first-line': 301,
1198
1195
                                  'folded-linenos': [],
1199
 
                                  'sel-line': 369,
1200
 
                                  'sel-line-start': 15133,
1201
 
                                  'selection_end': 15133,
1202
 
                                  'selection_start': 15133}),
 
1196
                                  'sel-line': 321,
 
1197
                                  'sel-line-start': 12919,
 
1198
                                  'selection_end': 12978,
 
1199
                                  'selection_start': 12978}),
1203
1200
                                (loc('mnemosyne/mnemosyne/libmnemosyne/utils.py'),
1204
1201
                                 {'attrib-starts': [('copyfile',
1205
1202
        41)],
1307
1304
         20)],
1308
1305
                                  'first-line': 14,
1309
1306
                                  'folded-linenos': [],
1310
 
                                  'sel-line': 37,
1311
 
                                  'sel-line-start': 1484,
1312
 
                                  'selection_end': 1524,
1313
 
                                  'selection_start': 1524}),
 
1307
                                  'sel-line': 41,
 
1308
                                  'sel-line-start': 1604,
 
1309
                                  'selection_end': 1645,
 
1310
                                  'selection_start': 1645}),
1314
1311
                                (loc('mnemosyne/mnemosyne/pyqt_ui/mnemosyne.pro'),
1315
1312
                                 {}),
1316
1313
                                (loc('mnemosyne/mnemosyne/sl4a/mnemosyne.py'),
1770
1767
                                 {'attrib-starts': [],
1771
1768
                                  'first-line': 0,
1772
1769
                                  'folded-linenos': [],
1773
 
                                  'sel-line': 2,
1774
 
                                  'sel-line-start': 31,
1775
 
                                  'selection_end': 31,
1776
 
                                  'selection_start': 31}),
 
1770
                                  'sel-line': 4,
 
1771
                                  'sel-line-start': 96,
 
1772
                                  'selection_end': 144,
 
1773
                                  'selection_start': 144}),
1777
1774
                                (loc('mnemosyne/mnemosyne/libmnemosyne/translator.py'),
1778
1775
                                 {'attrib-starts': [],
1779
1776
                                  'first-line': 0,
1869
1866
                                  'sel-line-start': 573,
1870
1867
                                  'selection_end': 583,
1871
1868
                                  'selection_start': 583})],
1872
 
          'has-focus': True,
 
1869
          'has-focus': False,
1873
1870
          'locked': False},
1874
1871
         [loc('mnemosyne/mnemosyne/cle/android_render_chain.py'),
1875
1872
          loc('mnemosyne/tests/benchmark_sync_client.py'),
1998
1995
         298)],
1999
1996
                           'first-line': 299,
2000
1997
                           'folded-linenos': [],
2001
 
                           'sel-line': 323,
2002
 
                           'sel-line-start': 11059,
2003
 
                           'selection_end': 11087,
2004
 
                           'selection_start': 11079},
2005
 
                          1421748867.517],
2006
 
                         [loc('mnemosyne/mnemosyne/libmnemosyne/databases/SQLite.py'),
2007
 
                          {'attrib-starts': [('SQLite',
2008
 
        207),
2009
 
        ('SQLite.new',
2010
 
         298)],
2011
 
                           'first-line': 299,
2012
 
                           'folded-linenos': [],
2013
 
                           'sel-line': 324,
2014
 
                           'sel-line-start': 11089,
2015
 
                           'selection_end': 11119,
2016
 
                           'selection_start': 11111},
2017
 
                          1421748867.971],
2018
 
                         [loc('mnemosyne/mnemosyne/libmnemosyne/databases/SQLite.py'),
2019
 
                          {'attrib-starts': [('SQLite',
2020
 
        207),
2021
 
        ('SQLite.new',
2022
 
         298)],
2023
 
                           'first-line': 299,
2024
 
                           'folded-linenos': [],
2025
 
                           'sel-line': 324,
2026
 
                           'sel-line-start': 11089,
2027
 
                           'selection_end': 11138,
2028
 
                           'selection_start': 11130},
2029
 
                          1421748868.37],
2030
 
                         [loc('mnemosyne/mnemosyne/libmnemosyne/databases/SQLite.py'),
2031
 
                          {'attrib-starts': [('SQLite',
2032
 
        207),
2033
 
        ('SQLite.new',
2034
 
         298)],
2035
 
                           'first-line': 299,
2036
 
                           'folded-linenos': [],
2037
 
                           'sel-line': 325,
2038
 
                           'sel-line-start': 11164,
2039
 
                           'selection_end': 11194,
2040
 
                           'selection_start': 11186},
2041
 
                          1421748868.667],
2042
 
                         [loc('mnemosyne/mnemosyne/libmnemosyne/databases/SQLite.py'),
2043
 
                          {'attrib-starts': [('SQLite',
2044
 
        207),
2045
 
        ('SQLite.new',
2046
 
         298)],
2047
 
                           'first-line': 299,
2048
 
                           'folded-linenos': [],
2049
1998
                           'sel-line': 326,
2050
1999
                           'sel-line-start': 11204,
2051
2000
                           'selection_end': 11234,
2221
2170
                           'sel-line-start': 2031,
2222
2171
                           'selection_end': 2117,
2223
2172
                           'selection_start': 2039},
2224
 
                          1421749235.041]],
 
2173
                          1421749235.041],
 
2174
                         [loc('mnemosyne/tests/test_db_import.py'),
 
2175
                          {'attrib-starts': [('TestDBImport',
 
2176
        26),
 
2177
        ('TestDBImport.test_2',
 
2178
         51)],
 
2179
                           'first-line': 39,
 
2180
                           'folded-linenos': [],
 
2181
                           'sel-line': 56,
 
2182
                           'sel-line-start': 1911,
 
2183
                           'selection_end': 1958,
 
2184
                           'selection_start': 1958},
 
2185
                          1421834721.178],
 
2186
                         [loc('mnemosyne/mnemosyne/libmnemosyne/database.py'),
 
2187
                          {'attrib-starts': [('Database',
 
2188
        7),
 
2189
        ('Database.release_connection',
 
2190
         53)],
 
2191
                           'first-line': 192,
 
2192
                           'folded-linenos': [],
 
2193
                           'sel-line': 60,
 
2194
                           'sel-line-start': 1310,
 
2195
                           'selection_end': 1343,
 
2196
                           'selection_start': 1343},
 
2197
                          1421834741.797],
 
2198
                         [loc('mnemosyne/mnemosyne/libmnemosyne/databases/SQLite.py'),
 
2199
                          {'attrib-starts': [('SQLite',
 
2200
        207),
 
2201
        ('SQLite.is_user_card_type',
 
2202
         1155)],
 
2203
                           'first-line': 1144,
 
2204
                           'folded-linenos': [],
 
2205
                           'sel-line': 1155,
 
2206
                           'sel-line-start': 49224,
 
2207
                           'selection_end': 49613,
 
2208
                           'selection_start': 49224},
 
2209
                          1421834799.253],
 
2210
                         [loc('mnemosyne/mnemosyne/libmnemosyne/database.py'),
 
2211
                          {'attrib-starts': [('Database',
 
2212
        7),
 
2213
        ('Database.delete_card_type',
 
2214
         194)],
 
2215
                           'first-line': 174,
 
2216
                           'folded-linenos': [],
 
2217
                           'sel-line': 195,
 
2218
                           'sel-line-start': 4420,
 
2219
                           'selection_end': 4453,
 
2220
                           'selection_start': 4453},
 
2221
                          1421834989.059]],
2225
2222
                        20),
2226
 
          'current-loc': loc('mnemosyne/tests/test_db_import.py'),
 
2223
          'current-loc': loc('mnemosyne/mnemosyne/libmnemosyne/file_formats/mnemosyne2_db.py'),
2227
2224
          'editor-state-list': [(loc('mnemosyne/mnemosyne/cle/android_render_chain.py'),
2228
2225
                                 {'attrib-starts': [('AndroidRenderChain',
2229
2226
        15)],
2417
2414
                                (loc('mnemosyne/mnemosyne/libmnemosyne/database.py'),
2418
2415
                                 {'attrib-starts': [('Database',
2419
2416
        7),
2420
 
        ('Database.release_connection',
2421
 
         53)],
2422
 
                                  'first-line': 252,
 
2417
        ('Database.delete_card_type',
 
2418
         194)],
 
2419
                                  'first-line': 174,
2423
2420
                                  'folded-linenos': [],
2424
 
                                  'sel-line': 60,
2425
 
                                  'sel-line-start': 1310,
2426
 
                                  'selection_end': 1343,
2427
 
                                  'selection_start': 1343}),
 
2421
                                  'sel-line': 195,
 
2422
                                  'sel-line-start': 4420,
 
2423
                                  'selection_end': 4453,
 
2424
                                  'selection_start': 4453}),
2428
2425
                                (loc('mnemosyne/mnemosyne/libmnemosyne/loggers/database_logger.py'),
2429
2426
                                 {'attrib-starts': [],
2430
2427
                                  'first-line': 131,
2661
2658
        12),
2662
2659
        ('Mnemosyne2Db.do_import',
2663
2660
         20)],
2664
 
                                  'first-line': 6,
 
2661
                                  'first-line': 21,
2665
2662
                                  'folded-linenos': [],
2666
 
                                  'sel-line': 24,
2667
 
                                  'sel-line-start': 729,
2668
 
                                  'selection_end': 780,
2669
 
                                  'selection_start': 780}),
 
2663
                                  'sel-line': 39,
 
2664
                                  'sel-line-start': 1559,
 
2665
                                  'selection_end': 1573,
 
2666
                                  'selection_start': 1573}),
2670
2667
                                (loc('mnemosyne/mnemosyne/pyqt_ui/mnemosyne.pro'),
2671
2668
                                 {'attrib-starts': [],
2672
2669
                                  'first-line': 33,
2911
2908
                                (loc('mnemosyne/mnemosyne/libmnemosyne/databases/SQLite.py'),
2912
2909
                                 {'attrib-starts': [('SQLite',
2913
2910
        207),
2914
 
        ('SQLite.add_tag',
2915
 
         577)],
2916
 
                                  'first-line': 571,
 
2911
        ('SQLite.is_user_card_type',
 
2912
         1155)],
 
2913
                                  'first-line': 1144,
2917
2914
                                  'folded-linenos': [],
2918
 
                                  'sel-line': 589,
2919
 
                                  'sel-line-start': 22046,
2920
 
                                  'selection_end': 22095,
2921
 
                                  'selection_start': 22095}),
 
2915
                                  'sel-line': 1155,
 
2916
                                  'sel-line-start': 49224,
 
2917
                                  'selection_end': 49613,
 
2918
                                  'selection_start': 49224}),
2922
2919
                                (loc('mnemosyne/mnemosyne/libmnemosyne/databases/SQLite_criterion_applier.py'),
2923
2920
                                 {'attrib-starts': [('DefaultCriterionApplie'\
2924
2921
        'r',
3059
3056
         51)],
3060
3057
                                  'first-line': 39,
3061
3058
                                  'folded-linenos': [],
3062
 
                                  'sel-line': 65,
3063
 
                                  'sel-line-start': 2256,
3064
 
                                  'selection_end': 2284,
3065
 
                                  'selection_start': 2284}),
 
3059
                                  'sel-line': 56,
 
3060
                                  'sel-line-start': 1911,
 
3061
                                  'selection_end': 1958,
 
3062
                                  'selection_start': 1958}),
3066
3063
                                (loc('mnemosyne/tests/test_filter.py'),
3067
3064
                                 {'attrib-starts': [('TestFilter',
3068
3065
        14),
3258
3255
                                  'sel-line-start': 1708,
3259
3256
                                  'selection_end': 1732,
3260
3257
                                  'selection_start': 1732})],
3261
 
          'has-focus': False,
 
3258
          'has-focus': True,
3262
3259
          'locked': False},
3263
3260
         [loc('mnemosyne/mnemosyne/cle/android_render_chain.py'),
3264
3261
          loc('mnemosyne/tests/benchmark_sync_client.py'),
3400
3397
        u'mnemosyne/mnemosyne/libmnemosyne/card_types/cloze.py',
3401
3398
        u'mnemosyne/mnemosyne/libmnemosyne/component.py',
3402
3399
        u'mnemosyne/mnemosyne/libmnemosyne/component_manager.py',
3403
 
        u'mnemosyne/mnemosyne/libmnemosyne/configuration.py',
3404
3400
        u'mnemosyne/mnemosyne/libmnemosyne/controller.py',
3405
3401
        u'mnemosyne/mnemosyne/libmnemosyne/controllers/default_controller.py',
3406
 
        u'mnemosyne/mnemosyne/libmnemosyne/database.py',
3407
3402
        u'mnemosyne/mnemosyne/libmnemosyne/databases/SQLite_logging.py',
3408
3403
        u'mnemosyne/mnemosyne/libmnemosyne/databases/SQLite_media.py',
3409
3404
        u'mnemosyne/mnemosyne/libmnemosyne/databases/_sqlite3.py',
3490
3485
        u'mnemosyne/mnemosyne/libmnemosyne/criteria/default_criterion.py',
3491
3486
        u'mnemosyne/mnemosyne/libmnemosyne/criterion.py',
3492
3487
        u'mnemosyne/mnemosyne/libmnemosyne/databases/SQLite_criterion_applier.py',
3493
 
        u'mnemosyne/mnemosyne/libmnemosyne/databases/SQLite.py',
3494
3488
        u'mnemosyne/mnemosyne/pyqt_ui/ui_criterion_wdgt_default.py',
3495
3489
        u'mnemosyne/mnemosyne/pyqt_ui/criterion_wdgt_default.py',
3496
3490
        u'mnemosyne/mnemosyne/pyqt_ui/activate_cards_dlg.py',
3497
3491
        u'mnemosyne/openSM2sync/log_entry.py',
3498
 
        u'mnemosyne/tests/test_db_import.py',
3499
 
        u'mnemosyne/mnemosyne/libmnemosyne/file_formats/mnemosyne2_db.py',
3500
3492
        u'mnemosyne/mnemosyne/libmnemosyne/databases/SQLite_statistics.py',
3501
3493
        u'mnemosyne/mnemosyne/libmnemosyne/statistics_pages/grades.py',
3502
 
        u'mnemosyne/TODO']},
 
3494
        u'mnemosyne/tests/test_db_import.py',
 
3495
        u'mnemosyne/mnemosyne/libmnemosyne/databases/SQLite.py',
 
3496
        u'mnemosyne/mnemosyne/libmnemosyne/database.py',
 
3497
        u'mnemosyne/mnemosyne/libmnemosyne/configuration.py',
 
3498
        u'mnemosyne/TODO',
 
3499
        u'mnemosyne/mnemosyne/libmnemosyne/file_formats/mnemosyne2_db.py']},
3503
3500
        'saved_notebook_display': None,
3504
3501
        'split_percents': {0: 0.4821973550356053},
3505
3502
        'splits': 2,
3515
3512
                         1900,
3516
3513
                         1060)}]}
3517
3514
guimgr.recent-documents = [loc('mnemosyne/TODO'),
 
3515
                           loc('mnemosyne/mnemosyne/libmnemosyne/file_formats/mnemosyne2_db.py'),
 
3516
                           loc('mnemosyne/mnemosyne/libmnemosyne/configuration.py'),
 
3517
                           loc('mnemosyne/mnemosyne/libmnemosyne/database.py'),
 
3518
                           loc('mnemosyne/mnemosyne/libmnemosyne/databases/SQLite.py'),
3518
3519
                           loc('mnemosyne/mnemosyne/libmnemosyne/statistics_pages/grades.py'),
3519
3520
                           loc('mnemosyne/mnemosyne/libmnemosyne/databases/SQLite_statistics.py'),
3520
3521
                           loc('mnemosyne/tests/test_db_import.py'),
3522
3523
                           loc('mnemosyne/mnemosyne/pyqt_ui/activate_cards_dlg.py'),
3523
3524
                           loc('mnemosyne/mnemosyne/pyqt_ui/criterion_wdgt_default.py'),
3524
3525
                           loc('mnemosyne/mnemosyne/pyqt_ui/ui_criterion_wdgt_default.py'),
3525
 
                           loc('mnemosyne/mnemosyne/libmnemosyne/file_formats/mnemosyne2_db.py'),
3526
 
                           loc('mnemosyne/mnemosyne/libmnemosyne/databases/SQLite.py'),
3527
3526
                           loc('mnemosyne/mnemosyne/libmnemosyne/databases/SQLite_criterion_applier.py'),
3528
3527
                           loc('mnemosyne/mnemosyne/libmnemosyne/criterion.py'),
3529
3528
                           loc('mnemosyne/mnemosyne/libmnemosyne/criteria/default_criterion.py'),
3544
3543
                           loc('mnemosyne/mnemosyne/libmnemosyne/__init__.py'),
3545
3544
                           loc('mnemosyne/mnemosyne/libmnemosyne/databases/_sqlite3.py'),
3546
3545
                           loc('mnemosyne/mnemosyne/cle/mnemosyne_android.py'),
3547
 
                           loc('mnemosyne/mnemosyne/libmnemosyne/configuration.py'),
3548
3546
                           loc('mnemosyne/mnemosyne/cle/configuration.py'),
3549
3547
                           loc('mnemosyne/mnemosyne/libmnemosyne/filters/latex.py'),
3550
3548
                           loc('mnemosyne/mnemosyne/libmnemosyne/upgrades/upgrade1.py'),