GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-24 16:56:36 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

start work on improved colour choosing

Browse source
This commit is contained in:
Damien Elmes 2009-02-08 20:35:28 +09:00
parent 8484bcc653
commit ed30a36916
2 changed files with 38 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ankiqt/config.py
View file

@ -83,6 +83,7 @@ class Config(dict):
'editFontSize': 12, 'editFontSize': 12,
'factEditorAdvanced': False, 'factEditorAdvanced': False,
'typeAnswerFontSize': 20, 'typeAnswerFontSize': 20,
'recentColours': ["#000000", "#0000ff"],
} }
for (k,v) in fields.items(): for (k,v) in fields.items():
if not self.has_key(k): if not self.has_key(k):

56
ankiqt/ui/facteditor.py
View file

@ -133,10 +133,10 @@ class FactEditor(object):
self.underline.setEnabled(False) self.underline.setEnabled(False)
self.iconsBox.addWidget(self.underline) self.iconsBox.addWidget(self.underline)
self.underline.setStyle(self.plastiqueStyle) self.underline.setStyle(self.plastiqueStyle)
# foreground color - not working on mac # foreground color
self.foreground = QPushButton() self.foreground = QPushButton()
self.foreground.connect(self.foreground, SIGNAL("clicked()"), self.selectForeground) self.foreground.connect(self.foreground, SIGNAL("clicked()"), self.setForeground)
self.foreground.setToolTip(_("Foreground colour (Ctrl+r)")) self.foreground.setToolTip(_("Set foreground colour (Ctrl+r)"))
self.foreground.setShortcut(_("Ctrl+r")) self.foreground.setShortcut(_("Ctrl+r"))
self.foreground.setFocusPolicy(Qt.NoFocus) self.foreground.setFocusPolicy(Qt.NoFocus)
self.foreground.setEnabled(False) self.foreground.setEnabled(False)
@ -150,6 +150,18 @@ class FactEditor(object):
self.foreground.setLayout(hbox) self.foreground.setLayout(hbox)
self.iconsBox.addWidget(self.foreground) self.iconsBox.addWidget(self.foreground)
self.foreground.setStyle(self.plastiqueStyle) self.foreground.setStyle(self.plastiqueStyle)
# picker
self.fchoose = QPushButton()
self.fchoose.connect(self.fchoose, SIGNAL("clicked()"), self.selectForeground)
self.fchoose.setToolTip(_("Choose colour (Ctrl+r)"))
self.fchoose.setText("v")
#self.fchoose.setShortcut(_("Ctrl+r"))
self.fchoose.setFocusPolicy(Qt.NoFocus)
self.fchoose.setEnabled(False)
self.fchoose.setFixedWidth(15)
self.fchoose.setFixedHeight(26)
self.iconsBox.addWidget(self.fchoose)
self.fchoose.setStyle(self.plastiqueStyle)
# pictures # pictures
spc = QSpacerItem(5,5) spc = QSpacerItem(5,5)
self.iconsBox.addItem(spc) self.iconsBox.addItem(spc)
@ -281,6 +293,8 @@ class FactEditor(object):
# show advanced buttons? # show advanced buttons?
if not ankiqt.mw.config['factEditorAdvanced']: if not ankiqt.mw.config['factEditorAdvanced']:
self.onMore(False) self.onMore(False)
# set initial colour
self._updateForegroundButton(ankiqt.mw.config['recentColours'][-1])
def _makeGrid(self): def _makeGrid(self):
"Rebuild the grid to avoid trigging QT bugs." "Rebuild the grid to avoid trigging QT bugs."
@ -493,9 +507,6 @@ class FactEditor(object):
self.bold.setChecked(w.fontWeight() == QFont.Bold) self.bold.setChecked(w.fontWeight() == QFont.Bold)
self.italic.setChecked(w.fontItalic()) self.italic.setChecked(w.fontItalic())
self.underline.setChecked(w.fontUnderline()) self.underline.setChecked(w.fontUnderline())
self.foregroundFrame.setPalette(QPalette(w.textColor()))
self.foregroundFrame.setStyleSheet("* {background-color: %s}" %
unicode(w.textColor().name()))
def resetFormatButtons(self): def resetFormatButtons(self):
self.bold.setChecked(False) self.bold.setChecked(False)
@ -507,6 +518,7 @@ class FactEditor(object):
self.italic.setEnabled(val) self.italic.setEnabled(val)
self.underline.setEnabled(val) self.underline.setEnabled(val)
self.foreground.setEnabled(val) self.foreground.setEnabled(val)
self.fchoose.setEnabled(val)
self.addPicture.setEnabled(val) self.addPicture.setEnabled(val)
self.addSound.setEnabled(val) self.addSound.setEnabled(val)
self.latex.setEnabled(val) self.latex.setEnabled(val)
@ -545,23 +557,29 @@ class FactEditor(object):
self.fontChanged = True self.fontChanged = True
w.setFontUnderline(bool) w.setFontUnderline(bool)
def selectForeground(self): def _updateForegroundButton(self, txtcol):
# FIXME: working on mac?
self.foregroundFrame.setPalette(QPalette(QColor(txtcol)))
self.foregroundFrame.setStyleSheet("* {background-color: %s}" %
txtcol)
def setForeground(self):
recent = ankiqt.mw.config['recentColours']
w = self.focusedEdit() w = self.focusedEdit()
if w: if w:
# we lose the selection when we open the colour dialog on win32, w.setTextColor(QColor(recent[-1]))
# so we need to save it
cursor = w.textCursor()
haveSel = cursor.hasSelection()
new = QColorDialog.getColor(w.textColor(), self.parent)
if new.isValid():
w.setTextCursor(cursor)
self.foregroundFrame.setPalette(QPalette(new))
w.setTextColor(new)
# now we clear the selection
if haveSel:
w.setTextCursor(cursor)
self.fontChanged = True self.fontChanged = True
def selectForeground(self):
recent = ankiqt.mw.config['recentColours']
new = QColorDialog.getColor(QColor(recent[-1]))
if new.isValid():
txtcol = unicode(new.name())
self._updateForegroundButton(txtcol)
if txtcol in recent:
recent.remove(txtcol)
recent.append(txtcol)
def insertLatex(self): def insertLatex(self):
w = self.focusedEdit() w = self.focusedEdit()
if w: if w: