Some final tweaks
This commit is contained in:
+2
-2
@@ -883,8 +883,8 @@ class NWProject():
|
|||||||
|
|
||||||
else:
|
else:
|
||||||
self.makeAlert((
|
self.makeAlert((
|
||||||
"Failed to create a new example project. "
|
"Failed to create a new example project. Could not find the "
|
||||||
"Could not find the necessary files."
|
"necessary files. They seem to be missing from this installation."
|
||||||
), nwAlert.ERROR)
|
), nwAlert.ERROR)
|
||||||
|
|
||||||
if isSuccess:
|
if isSuccess:
|
||||||
|
|||||||
@@ -31,7 +31,6 @@ import nw
|
|||||||
from os import path
|
from os import path
|
||||||
|
|
||||||
from PyQt5.QtCore import Qt
|
from PyQt5.QtCore import Qt
|
||||||
from PyQt5.QtGui import QPixmap, QColor
|
|
||||||
from PyQt5.QtWidgets import (
|
from PyQt5.QtWidgets import (
|
||||||
QWizard, QWizardPage, QLabel, QVBoxLayout, QLineEdit, QPlainTextEdit,
|
QWizard, QWizardPage, QLabel, QVBoxLayout, QLineEdit, QPlainTextEdit,
|
||||||
QPushButton, QFileDialog, QHBoxLayout, QRadioButton, QFormLayout,
|
QPushButton, QFileDialog, QHBoxLayout, QRadioButton, QFormLayout,
|
||||||
@@ -56,7 +55,7 @@ class GuiProjectWizard(QWizard):
|
|||||||
QWizard.__init__(self, theParent)
|
QWizard.__init__(self, theParent)
|
||||||
|
|
||||||
logger.debug("Initialising GuiProjectWizard ...")
|
logger.debug("Initialising GuiProjectWizard ...")
|
||||||
self.setObjectName("GuiProjectWizard")
|
|
||||||
self.mainConf = nw.CONFIG
|
self.mainConf = nw.CONFIG
|
||||||
self.theParent = theParent
|
self.theParent = theParent
|
||||||
self.theTheme = theParent.theTheme
|
self.theTheme = theParent.theTheme
|
||||||
@@ -240,7 +239,7 @@ class ProjWizardPopulatePage(QWizardPage):
|
|||||||
self.setTitle("Populate Project")
|
self.setTitle("Populate Project")
|
||||||
self.theText = QLabel(
|
self.theText = QLabel(
|
||||||
"Choose how to pre-fill the project. Either with a minimal set of "
|
"Choose how to pre-fill the project. Either with a minimal set of "
|
||||||
"starter items, a sample project explaining and showing many of "
|
"starter items, an example project explaining and showing many of "
|
||||||
"the features, or show further custom options on the next page."
|
"the features, or show further custom options on the next page."
|
||||||
)
|
)
|
||||||
self.theText.setWordWrap(True)
|
self.theText.setWordWrap(True)
|
||||||
@@ -249,19 +248,19 @@ class ProjWizardPopulatePage(QWizardPage):
|
|||||||
fS = self.mainConf.pxInt(4)
|
fS = self.mainConf.pxInt(4)
|
||||||
|
|
||||||
self.popMinimal = QRadioButton("Fill the project with a minimal set of items")
|
self.popMinimal = QRadioButton("Fill the project with a minimal set of items")
|
||||||
self.popCustom = QRadioButton("Show detailed options for filling the project")
|
|
||||||
self.popSample = QRadioButton("Fill the project with example files")
|
self.popSample = QRadioButton("Fill the project with example files")
|
||||||
|
self.popCustom = QRadioButton("Show detailed options for filling the project")
|
||||||
self.popMinimal.setChecked(True)
|
self.popMinimal.setChecked(True)
|
||||||
|
|
||||||
self.popBox = QVBoxLayout()
|
self.popBox = QVBoxLayout()
|
||||||
self.popBox.setSpacing(fS)
|
self.popBox.setSpacing(fS)
|
||||||
self.popBox.addWidget(self.popMinimal)
|
self.popBox.addWidget(self.popMinimal)
|
||||||
self.popBox.addWidget(self.popCustom)
|
|
||||||
self.popBox.addWidget(self.popSample)
|
self.popBox.addWidget(self.popSample)
|
||||||
|
self.popBox.addWidget(self.popCustom)
|
||||||
|
|
||||||
self.registerField("popMinimal", self.popMinimal)
|
self.registerField("popMinimal", self.popMinimal)
|
||||||
self.registerField("popCustom", self.popCustom)
|
|
||||||
self.registerField("popSample", self.popSample)
|
self.registerField("popSample", self.popSample)
|
||||||
|
self.registerField("popCustom", self.popCustom)
|
||||||
|
|
||||||
# Assemble
|
# Assemble
|
||||||
self.outerBox = QVBoxLayout()
|
self.outerBox = QVBoxLayout()
|
||||||
@@ -301,7 +300,6 @@ class ProjWizardCustomPage(QWizardPage):
|
|||||||
self.theText.setWordWrap(True)
|
self.theText.setWordWrap(True)
|
||||||
|
|
||||||
vS = self.mainConf.pxInt(12)
|
vS = self.mainConf.pxInt(12)
|
||||||
fS = self.mainConf.pxInt(4)
|
|
||||||
|
|
||||||
# Root Folders
|
# Root Folders
|
||||||
self.rootGroup = QGroupBox("Additional Root Folders")
|
self.rootGroup = QGroupBox("Additional Root Folders")
|
||||||
|
|||||||
@@ -7,7 +7,6 @@ from nwtools import *
|
|||||||
|
|
||||||
from os import path, unlink
|
from os import path, unlink
|
||||||
from PyQt5.QtCore import Qt
|
from PyQt5.QtCore import Qt
|
||||||
# from PyQt5.QtWidgets import qApp
|
|
||||||
|
|
||||||
from nw.gui import (
|
from nw.gui import (
|
||||||
GuiProjectSettings, GuiItemEditor, GuiAbout, GuiBuildNovel,
|
GuiProjectSettings, GuiItemEditor, GuiAbout, GuiBuildNovel,
|
||||||
|
|||||||
Reference in New Issue
Block a user