Connected the last items added to preferences gui to config

This commit is contained in:
Veronica K. B. Olsen
2019-06-10 23:14:53 +02:00
parent 8fd7d8c666
commit 4aa6e25acd
3 changed files with 39 additions and 7 deletions
+18 -6
View File
@@ -182,12 +182,8 @@ class Config:
for i in range(10):
self.recentList[i] = self._parseLine(cnfParse, cnfSec, "recent%d" % i,self.CNF_STR, self.recentList[i])
if self.styleSQuote >= 0 and self.styleSQuote < len(nwQuotes.SINGLE):
self.fmtSingleQuotes[0] = nwQuotes.SINGLE[self.styleSQuote][0]
self.fmtSingleQuotes[1] = nwQuotes.SINGLE[self.styleSQuote][1]
if self.styleDQuote >= 0 and self.styleDQuote < len(nwQuotes.DOUBLE):
self.fmtDoubleQuotes[0] = nwQuotes.DOUBLE[self.styleDQuote][0]
self.fmtDoubleQuotes[1] = nwQuotes.DOUBLE[self.styleDQuote][1]
self.setSingleQuotes(self.styleSQuote)
self.setDoubleQuotes(self.styleDQuote)
return True
@@ -309,6 +305,22 @@ class Config:
self.confChanged = True
return True
def setSingleQuotes(self, quoteStyle):
if quoteStyle >= 0 and quoteStyle < len(nwQuotes.SINGLE):
self.fmtSingleQuotes[0] = nwQuotes.SINGLE[quoteStyle][0]
self.fmtSingleQuotes[1] = nwQuotes.SINGLE[quoteStyle][1]
self.styleSQuote = quoteStyle
return True
return False
def setDoubleQuotes(self, quoteStyle):
if quoteStyle >= 0 and quoteStyle < len(nwQuotes.DOUBLE):
self.fmtDoubleQuotes[0] = nwQuotes.DOUBLE[quoteStyle][0]
self.fmtDoubleQuotes[1] = nwQuotes.DOUBLE[quoteStyle][1]
self.styleDQuote = quoteStyle
return True
return False
##
# Internal Functions
##
+9 -1
View File
@@ -76,12 +76,20 @@ class nwQuotes():
SINGLE = [
("'", "'", "Straight"),
("", "", "English"),
("", "", "French"),
("", "", "Danish"),
("", "", "Swedish"),
("", "", "German"),
("", "", "Dutch"),
]
DOUBLE = [
("\"", "\"", "Straight"),
("", "", "English"),
("«", "»", "Frensh"),
("«", "»", "French"),
("»", "«", "Danish"),
("", "", "Swedish"),
("", "", "German"),
("", "", "Dutch"),
]
# END Class nwQuotes
+12
View File
@@ -361,6 +361,18 @@ class GuiConfigEditEditor(QWidget):
self.mainConf.textMargin[1] = textMarginV
self.mainConf.tabWidth = tabWidth
doReplace = self.autoReplaceMain.isChecked()
doReplaceSQuote = self.autoReplaceSQ.isChecked()
doReplaceDQuote = self.autoReplaceDQ.isChecked()
styleSQuote = self.autoReplaceSStyle.currentData()
styleDQuote = self.autoReplaceDStyle.currentData()
self.mainConf.doReplace = doReplace
self.mainConf.doReplaceSQuote = doReplaceSQuote
self.mainConf.doReplaceDQuote = doReplaceDQuote
self.mainConf.setSingleQuotes(styleSQuote)
self.mainConf.setDoubleQuotes(styleDQuote)
self.mainConf.confChanged = True
return False