Mercurial Repositories > eric / file comparison
comparison: eric7/QScintilla/MiniEditor.py
eric7/QScintilla/MiniEditor.py
- branch
- eric7
- changeset 8637
- 394377638256
- parent 8437
- 3408f5174e2f
- child 8701
- 9a7ef33a4534
equal
deleted
inserted
replaced
| 8636:c0a3a6e40815 | 8637:394377638256 |
|---|---|
| 512 | 512 |
| 513 @param act reference to the action object (EricAction) | 513 @param act reference to the action object (EricAction) |
| 514 @param category category the action belongs to (string) | 514 @param category category the action belongs to (string) |
| 515 """ | 515 """ |
| 516 if act.objectName(): | 516 if act.objectName(): |
| 517 accel = Preferences.Prefs.settings.value( | 517 accel = Preferences.getSettings().value( |
| 518 "Shortcuts/{0}/{1}/Accel".format(category, act.objectName())) | 518 "Shortcuts/{0}/{1}/Accel".format(category, act.objectName())) |
| 519 if accel is not None: | 519 if accel is not None: |
| 520 act.setShortcut(QKeySequence(accel)) | 520 act.setShortcut(QKeySequence(accel)) |
| 521 accel = Preferences.Prefs.settings.value( | 521 accel = Preferences.getSettings().value( |
| 522 "Shortcuts/{0}/{1}/AltAccel".format( | 522 "Shortcuts/{0}/{1}/AltAccel".format( |
| 523 category, act.objectName())) | 523 category, act.objectName())) |
| 524 if accel is not None: | 524 if accel is not None: |
| 525 act.setAlternateShortcut(QKeySequence(accel), removeEmpty=True) | 525 act.setAlternateShortcut(QKeySequence(accel), removeEmpty=True) |
| 526 | 526 |
| 2560 | 2560 |
| 2561 def __readSettings(self): | 2561 def __readSettings(self): |
| 2562 """ | 2562 """ |
| 2563 Private method to read the settings remembered last time. | 2563 Private method to read the settings remembered last time. |
| 2564 """ | 2564 """ |
| 2565 settings = Preferences.Prefs.settings | 2565 settings = Preferences.getSettings() |
| 2566 pos = settings.value("MiniEditor/Position", QPoint(0, 0)) | 2566 pos = settings.value("MiniEditor/Position", QPoint(0, 0)) |
| 2567 size = settings.value("MiniEditor/Size", QSize(800, 600)) | 2567 size = settings.value("MiniEditor/Size", QSize(800, 600)) |
| 2568 self.resize(size) | 2568 self.resize(size) |
| 2569 self.move(pos) | 2569 self.move(pos) |
| 2570 | 2570 |
| 2571 def __writeSettings(self): | 2571 def __writeSettings(self): |
| 2572 """ | 2572 """ |
| 2573 Private method to write the settings for reuse. | 2573 Private method to write the settings for reuse. |
| 2574 """ | 2574 """ |
| 2575 settings = Preferences.Prefs.settings | 2575 settings = Preferences.getSettings() |
| 2576 settings.setValue("MiniEditor/Position", self.pos()) | 2576 settings.setValue("MiniEditor/Position", self.pos()) |
| 2577 settings.setValue("MiniEditor/Size", self.size()) | 2577 settings.setValue("MiniEditor/Size", self.size()) |
| 2578 | 2578 |
| 2579 def __maybeSave(self): | 2579 def __maybeSave(self): |
| 2580 """ | 2580 """ |
| 3397 key = ( | 3397 key = ( |
| 3398 'Scintilla/Guessed/style0/font' | 3398 'Scintilla/Guessed/style0/font' |
| 3399 if pyname and pyname.startswith("Pygments|") else | 3399 if pyname and pyname.startswith("Pygments|") else |
| 3400 'Scintilla/{0}/style0/font'.format(self.lexer_.language()) | 3400 'Scintilla/{0}/style0/font'.format(self.lexer_.language()) |
| 3401 ) | 3401 ) |
| 3402 fdesc = Preferences.Prefs.settings.value(key) | 3402 fdesc = Preferences.getSettings().value(key) |
| 3403 if fdesc is not None: | 3403 if fdesc is not None: |
| 3404 font = QFont([fdesc[0]], int(fdesc[1])) | 3404 font = QFont([fdesc[0]], int(fdesc[1])) |
| 3405 self.lexer_.setDefaultFont(font) | 3405 self.lexer_.setDefaultFont(font) |
| 3406 self.lexer_.readSettings(Preferences.Prefs.settings, "Scintilla") | 3406 self.lexer_.readSettings(Preferences.getSettings(), "Scintilla") |
| 3407 if self.lexer_.hasSubstyles(): | 3407 if self.lexer_.hasSubstyles(): |
| 3408 self.lexer_.readSubstyles(self.__textEdit) | 3408 self.lexer_.readSubstyles(self.__textEdit) |
| 3409 | 3409 |
| 3410 # now set the lexer properties | 3410 # now set the lexer properties |
| 3411 self.lexer_.initProperties() | 3411 self.lexer_.initProperties() |
