-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #243 from dubstar-04/fixes/styles
Fixes/styles
- Loading branch information
Showing
13 changed files
with
170 additions
and
27 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
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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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 |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| using Gtk 4.0; | ||
| using Adw 1; | ||
|
|
||
| template $PreferencePageLineType : Adw.PreferencesPage { | ||
| icon-name: "function-linear-symbolic"; | ||
| title: _("Line Type"); | ||
|
|
||
| ScrolledWindow { | ||
| child: Adw.Clamp { | ||
| child: Box { | ||
| orientation: vertical; | ||
| margin-top: 24; | ||
| margin-bottom: 24; | ||
| margin-start: 12; | ||
| margin-end: 12; | ||
| spacing: 6; | ||
|
|
||
| Box { | ||
| orientation: vertical; | ||
| spacing: 6; | ||
|
|
||
| ListBox stylesList{ | ||
| selection-mode: none; | ||
| styles ["boxed-list"] | ||
| } | ||
| } | ||
|
|
||
| }; //Box | ||
| }; //Clamp | ||
| } //ScrolledWindow | ||
| } |
Submodule Design-Core
updated
24 files
| +1 −1 | core/core/core.js | |
| +1 −1 | core/entities/block.js | |
| +4 −4 | core/entities/entity.js | |
| +11 −0 | core/entities/text.js | |
| +0 −185 | core/layers/layerManager.js | |
| +1 −1 | core/lib/canvas.js | |
| +5 −5 | core/lib/dxf/dxf.js | |
| +1 −1 | core/lib/dxf/dxfWrite.js | |
| +1 −1 | core/lib/inputManager.js | |
| +1 −1 | core/lib/snapping.js | |
| +3 −2 | core/lib/strings.js | |
| +34 −17 | core/styles/dimStyle.js | |
| +3 −0 | core/styles/dimStyleManager.js | |
| +0 −0 | core/styles/layer.js | |
| +40 −0 | core/styles/layerManager.js | |
| +16 −8 | core/styles/ltypeManager.js | |
| +3 −0 | core/styles/styleManager.js | |
| +89 −42 | core/styles/styleManagerBase.js | |
| +0 −147 | test/layers/layerManager.test.js | |
| +19 −0 | test/styles/dimstyle.test.js | |
| +150 −0 | test/styles/layerManager.test.js | |
| +12 −0 | test/styles/ltypeManager.test.js | |
| +33 −0 | test/styles/style.test.js | |
| +18 −3 | test/styles/stylemanagerbase.test.js |
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 |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| /* preferencesWindow.js | ||
| * | ||
| * Copyright 2024 Daniel Wood | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| import GObject from 'gi://GObject'; | ||
| import Adw from 'gi://Adw?version=1'; | ||
| import Gtk from 'gi://Gtk'; | ||
|
|
||
| import {DesignCore} from '../Design-Core/core/designCore.js'; | ||
|
|
||
| export const PreferencePageLineType = GObject.registerClass({ | ||
| GTypeName: 'PreferencePageLineType', | ||
| Template: 'resource:///io/github/dubstar_04/design/ui/preferencePageLineType.ui', | ||
| InternalChildren: ['stylesList'], | ||
| }, class PreferencePageLineType extends Adw.PreferencesPage { | ||
| constructor() { | ||
| super({}); | ||
| this.reload(); | ||
| } | ||
|
|
||
| reload() { | ||
| this.clearStyleList(); | ||
| this.load(); | ||
| } | ||
|
|
||
| clearStyleList() { | ||
| // delete all current children | ||
| let child = this._stylesList.get_first_child(); | ||
| while (child) { | ||
| const next = child.get_next_sibling(); | ||
| this._stylesList.remove(child); | ||
| child = next; | ||
| } | ||
| } | ||
|
|
||
| load() { | ||
| const optionalStyles = DesignCore.LTypeManager.getOptionalStyles(); | ||
|
|
||
| optionalStyles.forEach((style, index) => { | ||
| const row = new Adw.ActionRow( | ||
| { | ||
| title: style.name, | ||
| subtitle: style.description, | ||
| }); | ||
|
|
||
| const styleLoaded = DesignCore.LTypeManager.styleExists(style.name); | ||
| const indelibleStyle = DesignCore.LTypeManager.indelibleStyles.some((iStyle) => iStyle.toUpperCase() === style.name); | ||
|
|
||
| const checkBox = new Gtk.CheckButton({active: styleLoaded, sensitive: !(styleLoaded||indelibleStyle)}); | ||
| checkBox.connect('toggled', this.styleChecked.bind(this, row)); | ||
| row.id = index; | ||
|
|
||
| row.add_prefix(checkBox); | ||
| this._stylesList.append(row); | ||
| }); | ||
| } | ||
|
|
||
|
|
||
| styleChecked(row, checkBox) { | ||
| if (row) { | ||
| const optionalStyles = DesignCore.LTypeManager.getOptionalStyles(); | ||
| DesignCore.LTypeManager.addStyle(optionalStyles[row.id]); | ||
| this.reload(); | ||
| } | ||
| } | ||
| }, | ||
| ); | ||
|
|
||
|
|
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
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