-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
e7a6a2e
commit 3acd229
Showing
6 changed files
with
180 additions
and
108 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| /*************************************************************************** | ||
| * Copyright (C) 2006-2023 M Wellings * | ||
| * Copyright (C) 2006-2024 M Wellings * | ||
| * [email protected] * | ||
| * * | ||
| * This program is free software; you can redistribute it and/or modify * | ||
|
|
@@ -72,6 +72,7 @@ void appearanceDialog::setDoc(WordSearchDoc *wsd) | |
| gridWidth=wsd->getGridWidth(); | ||
| gridlinewidthSpinBox->setValue(gridWidth); | ||
| showGridCheckBox->setChecked(wsd->getShowGrid()); | ||
| outlineRadioButton->setChecked(!wsd->getHLSolid()); | ||
| } | ||
|
|
||
| QString appearanceDialog::fontstring(QFont font) | ||
|
|
@@ -179,6 +180,7 @@ void appearanceDialog::okPressed() | |
| wsd->setWordsColor(wlColor); | ||
| wsd->setBgColor(bgColor); | ||
| wsd->setHlColor(hlColor); | ||
| wsd->setHlSolid(solidRadioButton->isChecked()); | ||
| wsd->setGridColor(gridColor); | ||
| wsd->setGridWidth(gridWidth); | ||
| wsd->setShowGrid(showGridCheckBox->isChecked()); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| /*************************************************************************** | ||
| * Copyright (C) 2006-2023 M Wellings * | ||
| * Copyright (C) 2006-2024 M Wellings * | ||
| * [email protected] * | ||
| * * | ||
| * This program is free software; you can redistribute it and/or modify * | ||
|
|
@@ -47,6 +47,7 @@ WordSearchDoc::WordSearchDoc(QWidget *parent) | |
| wordlistorder=UserDefined; | ||
| bgColor=Qt::white; | ||
| hlColor=Qt::blue; | ||
| hlSolid=true; | ||
| } | ||
|
|
||
| void WordSearchDoc::Create() | ||
|
|
@@ -417,6 +418,7 @@ int WordSearchDoc::OpenFromIO(QIODevice &file) | |
| setBgColor(BGColor); | ||
| QColor HLColor; | ||
| HLColor.setNamedColor(DEFormat.firstChildElement("Highlight").attribute("color", "blue")); | ||
| setHlSolid(DEFormat.firstChildElement("Highlight").attribute("style", "solid")!="outline"); | ||
| setHlColor(HLColor); | ||
| setShowGrid((DEFormat.firstChildElement("Grid").attribute("Visible","yes").toLower() == "yes" || wordsearch.attribute("Visible","yes").toLower() =="true")); | ||
| QColor GridColor; | ||
|
|
@@ -616,6 +618,7 @@ bool WordSearchDoc::saveToIO(QIODevice &file){ | |
| QDomElement DEHighlight = doc.createElement("Highlight"); | ||
| DEFormat.appendChild(DEHighlight); | ||
| DEHighlight.setAttribute( "color", getHLColor().name()); | ||
| DEHighlight.setAttribute( "style", getHLSolid() ? "solid" : "outline"); | ||
|
|
||
| QDomElement DEAllowedDirections = doc.createElement("AllowedDirections"); | ||
| wordsearch.appendChild(DEAllowedDirections); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| /*************************************************************************** | ||
| * Copyright (C) 2006-2023 M Wellings * | ||
| * Copyright (C) 2006-2024 M Wellings * | ||
| * [email protected] * | ||
| * * | ||
| * This program is free software; you can redistribute it and/or modify * | ||
|
|
@@ -45,7 +45,8 @@ class WordSearchDoc : public QObject | |
| QFont getWordsFont(); | ||
| QFont getCLFont(); | ||
| QColor getBGColor() {return bgColor;} | ||
| QColor getHLColor() {return hlColor;} | ||
| QColor getHLColor() {return hlColor;} | ||
| bool getHLSolid() {return hlSolid;} | ||
| QColor getWSColor() {return wsColor;} | ||
| QColor getTitleColor() {return titleColor;} | ||
| QColor getWLColor() {return wlColor;} | ||
|
|
@@ -79,6 +80,7 @@ class WordSearchDoc : public QObject | |
| QFont WordsFont; | ||
| QColor bgColor; | ||
| QColor hlColor; | ||
| bool hlSolid; | ||
| QColor titleColor; | ||
| QColor wsColor; | ||
| QColor wlColor; | ||
|
|
@@ -115,6 +117,7 @@ public slots: | |
| void setWordsColor(QColor wlColor) {this->wlColor = wlColor;} | ||
| void setBgColor(QColor bgColor) {this->bgColor = bgColor;} | ||
| void setHlColor(QColor hlColor) {this->hlColor = hlColor;} | ||
| void setHlSolid(bool hlSolid) {this->hlSolid = hlSolid;} | ||
| void setGridColor(QColor gridColor) {this->gridColor = gridColor;} | ||
| void setGridWidth(double gridWidth) {this->gridWidth = gridWidth;} | ||
| void setSize(int x, int y); | ||
|
|
||
Oops, something went wrong.