Update default themes and remove custom style sheet feature
This commit is contained in:
@@ -1,3 +1,4 @@
|
|||||||
[Main]
|
[Main]
|
||||||
name = Default Theme
|
name = Default Theme
|
||||||
icontheme = typicons_light
|
description = Qt standard colours
|
||||||
|
icontheme = typicons_light
|
||||||
@@ -1,11 +1,12 @@
|
|||||||
[Main]
|
[Main]
|
||||||
name = Default Dark Theme
|
name = Default Dark Theme
|
||||||
author = Veronica Berglyd Olsen
|
description = The novelWriter standard dark theme
|
||||||
credit = Veronica Berglyd Olsen
|
author = Veronica Berglyd Olsen
|
||||||
url = https://github.com/vkbo/novelWriter
|
credit = Veronica Berglyd Olsen
|
||||||
license = CC BY-SA 4.0
|
url = https://github.com/vkbo/novelWriter
|
||||||
licenseurl = https://creativecommons.org/licenses/by-sa/4.0/
|
license = CC BY-SA 4.0
|
||||||
icontheme = typicons_dark
|
licenseurl = https://creativecommons.org/licenses/by-sa/4.0/
|
||||||
|
icontheme = typicons_dark
|
||||||
|
|
||||||
[Palette]
|
[Palette]
|
||||||
window = 54, 54, 54
|
window = 54, 54, 54
|
||||||
|
|||||||
@@ -1,5 +0,0 @@
|
|||||||
/**
|
|
||||||
* Default Theme: Dark
|
|
||||||
* This theme doesn't use any custom styles, so the file is only here as
|
|
||||||
* an example. There doesn't have to be a styles.qss file in the folder.
|
|
||||||
*/
|
|
||||||
@@ -38,7 +38,7 @@ from PyQt5.QtGui import (
|
|||||||
|
|
||||||
from novelwriter.enum import nwItemLayout, nwItemType
|
from novelwriter.enum import nwItemLayout, nwItemType
|
||||||
from novelwriter.error import logException
|
from novelwriter.error import logException
|
||||||
from novelwriter.common import NWConfigParser, minmax, readTextFile
|
from novelwriter.common import NWConfigParser, minmax
|
||||||
from novelwriter.constants import nwLabels
|
from novelwriter.constants import nwLabels
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
@@ -246,11 +246,6 @@ class GuiTheme:
|
|||||||
# Icons
|
# Icons
|
||||||
self.iconCache.loadTheme(self.themeIcons)
|
self.iconCache.loadTheme(self.themeIcons)
|
||||||
|
|
||||||
# CSS File
|
|
||||||
cssData = readTextFile(themeFile[:-5]+".qss")
|
|
||||||
if cssData:
|
|
||||||
qApp.setStyleSheet(cssData)
|
|
||||||
|
|
||||||
# Apply Styles
|
# Apply Styles
|
||||||
qApp.setPalette(self._guiPalette)
|
qApp.setPalette(self._guiPalette)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user