diff --git a/novelwriter/assets/images/welcome-dark.jpg b/novelwriter/assets/images/welcome-dark.jpg new file mode 100644 index 00000000..d8fd1c5f Binary files /dev/null and b/novelwriter/assets/images/welcome-dark.jpg differ diff --git a/novelwriter/assets/images/welcome-light.jpg b/novelwriter/assets/images/welcome-light.jpg new file mode 100644 index 00000000..70cf548c Binary files /dev/null and b/novelwriter/assets/images/welcome-light.jpg differ diff --git a/novelwriter/assets/images/welcome.jpg b/novelwriter/assets/images/welcome.jpg deleted file mode 100644 index 7326600f..00000000 Binary files a/novelwriter/assets/images/welcome.jpg and /dev/null differ diff --git a/novelwriter/gui/theme.py b/novelwriter/gui/theme.py index ee01020c..c2d8b7b9 100644 --- a/novelwriter/gui/theme.py +++ b/novelwriter/gui/theme.py @@ -255,9 +255,8 @@ class GuiTheme: backLNess = backCol.lightnessF() textLNess = textCol.lightnessF() - + self.isLightTheme = backLNess > textLNess if self.helpText == [0, 0, 0]: - self.isLightTheme = backLNess > textLNess if self.isLightTheme: helpLCol = textLNess + 0.35*(backLNess - textLNess) else: @@ -487,7 +486,7 @@ class GuiIcons: } IMAGE_MAP: dict[str, tuple[str, str]] = { - "welcome": ("welcome.jpg", "welcome.jpg"), + "welcome": ("welcome-light.jpg", "welcome-dark.jpg"), "nw-text": ("novelwriter-text-light.svg", "novelwriter-text-dark.svg"), } diff --git a/novelwriter/tools/welcome.py b/novelwriter/tools/welcome.py index 89c803e2..0d9c38f1 100644 --- a/novelwriter/tools/welcome.py +++ b/novelwriter/tools/welcome.py @@ -82,6 +82,7 @@ class GuiWelcome(QDialog): self.bgImage = SHARED.theme.loadDecoration("welcome") self.nwImage = SHARED.theme.loadDecoration("nw-text", h=hD) + self.bgColor = QColor(255, 255, 255) if SHARED.theme.isLightTheme else QColor(54, 54, 54) self.nwLogo = QLabel() self.nwLogo.setPixmap(SHARED.theme.getPixmap("novelwriter", (hF, hF))) @@ -139,6 +140,7 @@ class GuiWelcome(QDialog): self.outerBox.setContentsMargins(hF, hE, hC, hE) self.setLayout(self.outerBox) + self.setSizeGripEnabled(True) logger.debug("Ready: GuiWelcome") @@ -158,7 +160,7 @@ class GuiWelcome(QDialog): hPix = min(hWin, 700) tMode = Qt.TransformationMode.SmoothTransformation painter = QPainter(self) - painter.fillRect(self.rect(), QColor(255, 255, 255)) + painter.fillRect(self.rect(), self.bgColor) painter.drawPixmap(0, hWin - hPix, self.bgImage.scaledToHeight(hPix, tMode)) super().paintEvent(event) return @@ -222,9 +224,6 @@ class _OpenProjectPage(QWidget): def __init__(self, parent: QWidget) -> None: super().__init__(parent=parent) - hPx = CONFIG.pxInt(6) - vPx = CONFIG.pxInt(4) - # List View self.listModel = _ProjectListModel(self) self.itemDelegate = _ProjectListItem(self) @@ -239,7 +238,6 @@ class _OpenProjectPage(QWidget): # Info / Tool self.selectedPath = QLineEdit(self) - self.selectedPath.setContentsMargins(hPx, vPx, hPx, vPx) self.selectedPath.setReadOnly(True) self.keyDelete = QShortcut(self) @@ -260,8 +258,8 @@ class _OpenProjectPage(QWidget): baseCol = self.palette().base().color() self.setStyleSheet(( "QListView {{border: none; background: rgba({r},{g},{b},0.65);}} " - "QLineEdit {{border: none; background: rgba({r},{g},{b},0.65);}} " - ).format(r=baseCol.red(), g=baseCol.green(), b=baseCol.blue())) + "QLineEdit {{border: none; background: rgba({r},{g},{b},0.65); padding: {m}px;}} " + ).format(r=baseCol.red(), g=baseCol.green(), b=baseCol.blue(), m=CONFIG.pxInt(4))) return