← Back to branch summary

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

« back to all changes in this revision

Viewing changes to mnemosyne/mnemosyne/libmnemosyne/file_formats/mnemosyne2_db.py

  • Committer: Peter.Bienstman at UGent
  • Date: 2015-01-23 19:47:11 UTC
  • Revision ID: peter.bienstman@ugent.be-20150123194711-wbof2sllr0dq89tr
Merge card appearance.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mnemosyne/mnemosyne/libmnemosyne/file_formats/mnemosyne2_db.py
36
36
            db.current_criterion().deactivated_card_type_fact_view_ids
37
37
        user_card_types = [card_type for card_type in db.card_types_in_use() \
38
38
            if db.is_user_card_type(card_type)]
39
 
        
40
 
        # TODO: load config first
41
 
        
 
39
        # Get config info to be merged.
 
40
        old_config_dir = self.config().config_dir
 
41
        self.config().config_dir = os.path.dirname(filename)
 
42
        self.config().load()
42
43
        old_config = self.config().copy()
 
44
        self.config().config_dir = old_config_dir
 
45
        self.config().load()        
43
46
        # Import the *.cards file into the receiving database.
44
47
        db.load(receiving_database_filename)
45
48
        log_index_before_import = db.current_log_index()
50
53
        db.current_criterion().deactivated_card_type_fact_view_ids.update(\
51
54
            old_deactivated_card_type_fact_view_ids)
52
55
        db.set_current_criterion(db.current_criterion())
53
 
        print 'old', old_config
54
56
        for property_name in ["background_colour", "font", "font_colour",
55
57
            "alignment", "hide_pronunciation_field"]:
56
58
            self.log().edited_setting(property_name)
57
59
            for card_type in user_card_types:
58
 
                print property_name, card_type.id
59
60
                if card_type.id in old_config[property_name]:
60
61
                    self.config()[property_name][card_type.id] = \
61
62
                        old_config[property_name][card_type.id]