Merge pull request #259 from dubstar-04/blockmanager

Sync with core changes to table management
dubstar-04 · May 31, 2024 · 997648c · 997648c
2 parents 19226b6 + d58df48
commit 997648c
Show file tree

Hide file tree

Showing 9 changed files with 49 additions and 49 deletions.
diff --git a/data/ui/preferencePageDimensionStyle.blp b/data/ui/preferencePageDimensionStyle.blp
@@ -31,7 +31,7 @@ template $PreferencePageDimensionStyle : Adw.PreferencesPage {
 
                   Button {
                     icon-name: 'list-add-symbolic';
-                    clicked => $addStyle();
+                    clicked => $addItem();
                   }
 
                   Button {

diff --git a/data/ui/preferencePageTextStyle.blp b/data/ui/preferencePageTextStyle.blp
@@ -36,7 +36,7 @@ template $PreferencePageTextStyle : Adw.PreferencesPage {
 
                   Button {
                     icon-name: 'list-add-symbolic';
-                    clicked => $addStyle();
+                    clicked => $addItem();
                   }
 
                   Button {

diff --git a/src/Design-Core b/src/Design-Core
diff --git a/src/Design/layersWindow.js b/src/Design/layersWindow.js
@@ -69,14 +69,14 @@ export const LayersWindow = GObject.registerClass({
 
   onEditAction(simpleAction, parameters) {
     const layerName = parameters.deep_unpack();
-    this.selected_layer = DesignCore.LayerManager.getStyleByName(layerName);
+    this.selected_layer = DesignCore.LayerManager.getItemByName(layerName);
     this.onEditLayer();
   }
 
   onDeleteAction(simpleAction, parameters) {
     // console.log("delete action")
     const layerName = parameters.deep_unpack();
-    this.selected_layer = DesignCore.LayerManager.getStyleByName(layerName);
+    this.selected_layer = DesignCore.LayerManager.getItemByName(layerName);
     this.onLayerDelete();
   }
 
@@ -98,7 +98,7 @@ export const LayersWindow = GObject.registerClass({
   }
 
   getLineTypes() {
-    const lineStyles = DesignCore.LTypeManager.getStyles();
+    const lineStyles = DesignCore.LTypeManager.getItems();
     const lineStyleNames = lineStyles.map((style) => style.name);
     return lineStyleNames;
   }
@@ -120,7 +120,7 @@ export const LayersWindow = GObject.registerClass({
   }
 
   loadLayers() {
-    const layers = DesignCore.LayerManager.getStyles();
+    const layers = DesignCore.LayerManager.getItems();
     const clayer = DesignCore.LayerManager.getCstyle();
 
     for (let i = 0; i < layers.length; i++) {
@@ -156,7 +156,7 @@ export const LayersWindow = GObject.registerClass({
 
   onColourChange(colourButton) {
     const row = colourButton.get_ancestor(Adw.ActionRow);
-    const layer = DesignCore.LayerManager.getStyleByName(row.title);
+    const layer = DesignCore.LayerManager.getItemByName(row.title);
     const rgba = colourButton.rgba.to_string();
     const rgb = rgba.substr(4).split(')')[0].split(',');
     // log(rgb)
@@ -170,7 +170,7 @@ export const LayersWindow = GObject.registerClass({
     // Get the row of the switch
     const row = toggle.get_ancestor(Adw.ActionRow);
     // get the layer reference from the layer manager
-    const layer = DesignCore.LayerManager.getStyleByName(row.title);
+    const layer = DesignCore.LayerManager.getItemByName(row.title);
     // change the layer state
     layer.on = state;
     // redraw
@@ -185,14 +185,14 @@ export const LayersWindow = GObject.registerClass({
 
   onNewClicked() {
     // console.log("new clicked")
-    DesignCore.LayerManager.newStyle();
+    DesignCore.LayerManager.newItem();
     this.reload();
   }
 
   onLayerSelected(row) {
     if (row) {
       this._layerList.unselect_row(row);
-      this.selected_layer = DesignCore.LayerManager.getStyleByName(row.title);
+      this.selected_layer = DesignCore.LayerManager.getItemByName(row.title);
       this.onEditLayer();
     }
   }
@@ -230,7 +230,7 @@ export const LayersWindow = GObject.registerClass({
       return;
     }
 
-    const layerIndex = DesignCore.LayerManager.getStyleIndex(this.selected_layer.name);
+    const layerIndex = DesignCore.LayerManager.getItemIndex(this.selected_layer.name);
     DesignCore.LayerManager.renameStyle(layerIndex, this._nameEntry.text);
     this.selected_layer.frozen = this._frozenSwitch.active;
     this.selected_layer.locked = this._lockedSwitch.active;
@@ -264,7 +264,7 @@ export const LayersWindow = GObject.registerClass({
 
   deleteStyle(layerName) {
     // console.log("delete layer")
-    DesignCore.LayerManager.deleteStyle(DesignCore.LayerManager.getStyleIndex(layerName));
+    DesignCore.LayerManager.deleteStyle(DesignCore.LayerManager.getItemIndex(layerName));
     this.get_transient_for().getActiveCanvas().queue_draw();
   }
 }, // window

diff --git a/src/Design/preferencePageDimensionStyle.js b/src/Design/preferencePageDimensionStyle.js
@@ -50,15 +50,15 @@ export const PreferencePageDimensionStyle = GObject.registerClass({
   }
 
   setModels() {
-    const styles = DesignCore.StyleManager.getStyles();
+    const styles = DesignCore.StyleManager.getItems();
     const styleNames = styles.map((style) => style.name);
     const textStyleModel = Gtk.StringList.new(styleNames);
     this._DIMTXSTY.set_model(textStyleModel);
 
 
     /*
     // Line Types only supported from R2007
-    const lineTypes = DesignCore.LTypeManager.getStyles();
+    const lineTypes = DesignCore.LTypeManager.getItems();
     const lineTypeNames = lineTypes.map((ltype) => ltype.name);
     const lineTypeModel = Gtk.StringList.new(lineTypeNames);
     this._DIMLTYPE.set_model(lineTypeModel);
@@ -89,7 +89,7 @@ export const PreferencePageDimensionStyle = GObject.registerClass({
 
 
   load() {
-    const styles = DesignCore.DimStyleManager.getStyles();
+    const styles = DesignCore.DimStyleManager.getItems();
 
     styles.forEach((style, index) => {
       const row = new Adw.ActionRow({title: style.name, activatable: true});
@@ -123,7 +123,7 @@ export const PreferencePageDimensionStyle = GObject.registerClass({
       // set the selected row
       this._stylesList.select_row(row);
 
-      const style = DesignCore.DimStyleManager.getStyleByName(row.title);
+      const style = DesignCore.DimStyleManager.getItemByName(row.title);
 
       for (const property in style) {
         if (Object.hasOwn(style, property)) {
@@ -183,10 +183,10 @@ export const PreferencePageDimensionStyle = GObject.registerClass({
     }
   }
 
-  addStyle() {
-    DesignCore.DimStyleManager.newStyle();
+  addItem() {
+    DesignCore.DimStyleManager.newItem();
     this.reload();
-    const newRow = this._stylesList.get_row_at_index(DesignCore.DimStyleManager.styleCount() - 1);
+    const newRow = this._stylesList.get_row_at_index(DesignCore.DimStyleManager.itemCount() - 1);
     this.onStyleSelected(newRow);
   }
 
@@ -230,11 +230,11 @@ export const PreferencePageDimensionStyle = GObject.registerClass({
       const row = this._stylesList.get_selected_row();
       if (row) {
         // console.log('Style Update - Property:', widget.name, 'value:', value);
-        DesignCore.DimStyleManager.updateStyle(row.id, widget.name, value);
+        DesignCore.DimStyleManager.updateItem(row.id, widget.name, value);
 
         if (widget.name === 'name') {
           // update the name in the style list if the name in core has changed
-          const newName = DesignCore.DimStyleManager.getStyleByIndex(row.id).name;
+          const newName = DesignCore.DimStyleManager.getItemByIndex(row.id).name;
           row.title = newName;
           // set the _name string - this is needed when the style name passed to core was invalid and a different name is used
           this._name.text = newName;

diff --git a/src/Design/preferencePageLineType.js b/src/Design/preferencePageLineType.js
@@ -57,8 +57,8 @@ export const PreferencePageLineType = GObject.registerClass({
             subtitle: style.description,
           });
 
-      const styleLoaded = DesignCore.LTypeManager.styleExists(style.name);
-      const indelibleStyle = DesignCore.LTypeManager.indelibleStyles.some((iStyle) => iStyle.toUpperCase() === style.name);
+      const styleLoaded = DesignCore.LTypeManager.itemExists(style.name);
+      const indelibleStyle = DesignCore.LTypeManager.indelibleItems.some((iStyle) => iStyle.toUpperCase() === style.name);
 
       const checkBox = new Gtk.CheckButton({active: styleLoaded, sensitive: !(styleLoaded||indelibleStyle)});
       checkBox.connect('toggled', this.styleChecked.bind(this, row));
@@ -73,7 +73,7 @@ export const PreferencePageLineType = GObject.registerClass({
   styleChecked(row, checkBox) {
     if (row) {
       const optionalStyles = DesignCore.LTypeManager.getOptionalStyles();
-      DesignCore.LTypeManager.addStyle(optionalStyles[row.id]);
+      DesignCore.LTypeManager.addItem(optionalStyles[row.id]);
       this.reload();
     }
   }

diff --git a/src/Design/preferencePageTextStyle.js b/src/Design/preferencePageTextStyle.js
@@ -50,7 +50,7 @@ export const PreferencePageTextStyle = GObject.registerClass({
   }
 
   load() {
-    const styles = DesignCore.StyleManager.getStyles();
+    const styles = DesignCore.StyleManager.getItems();
 
     styles.forEach((style, index) => {
       const row = new Adw.ActionRow({title: style.name, activatable: true});
@@ -83,7 +83,7 @@ export const PreferencePageTextStyle = GObject.registerClass({
       // set the selected row
       this._stylesList.select_row(row);
 
-      const style = DesignCore.StyleManager.getStyleByName(row.title);
+      const style = DesignCore.StyleManager.getItemByName(row.title);
       const fontDesc = Pango.font_description_from_string(`${style.font} ${style.textHeight}`);
       this._name.set_text(style.name);
       this._font.set_font_desc(fontDesc);
@@ -100,11 +100,11 @@ export const PreferencePageTextStyle = GObject.registerClass({
     }
   }
 
-  addStyle() {
-    DesignCore.StyleManager.newStyle();
+  addItem() {
+    DesignCore.StyleManager.newItem();
     this.reload();
 
-    const newRow = this._stylesList.get_row_at_index(DesignCore.StyleManager.styleCount() - 1);
+    const newRow = this._stylesList.get_row_at_index(DesignCore.StyleManager.itemCount() - 1);
     this.onStyleSelected(newRow);
   }
 
@@ -149,14 +149,14 @@ export const PreferencePageTextStyle = GObject.registerClass({
         if (widget.name === 'font') {
           const font = value.get_family();
           const textHeight = value.get_size() / Pango.SCALE;
-          DesignCore.StyleManager.updateStyle(row.id, 'font', font);
-          DesignCore.StyleManager.updateStyle(row.id, 'textHeight', textHeight);
+          DesignCore.StyleManager.updateItem(row.id, 'font', font);
+          DesignCore.StyleManager.updateItem(row.id, 'textHeight', textHeight);
         } else {
-          DesignCore.StyleManager.updateStyle(row.id, widget.name, value);
+          DesignCore.StyleManager.updateItem(row.id, widget.name, value);
 
           if (widget.name === 'name') {
             // update the name in the style list if the name in core has changed
-            const newName = DesignCore.StyleManager.getStyleByIndex(row.id).name;
+            const newName = DesignCore.StyleManager.getItemByIndex(row.id).name;
             row.title = newName;
             // set the _name string - this is needed when the style name passed to core was invalid and a different name is used
             this._name.text = newName;

diff --git a/src/Design/propertiesWindow.js b/src/Design/propertiesWindow.js
@@ -257,12 +257,12 @@ export const PropertiesWindow = GObject.registerClass({
     switch (property) {
       case 'layer':
         model = [];
-        for (const layer of DesignCore.LayerManager.getStyles()) {
+        for (const layer of DesignCore.LayerManager.getItems()) {
           model.push(layer.name);
         }
         break;
       case 'styleName':
-        const styles = DesignCore.StyleManager.getStyles();
+        const styles = DesignCore.StyleManager.getItems();
         const styleNames = styles.map((style) => style.name);
         model = styleNames;
         break;
@@ -275,7 +275,7 @@ export const PropertiesWindow = GObject.registerClass({
         model = ['Baseline', 'Bottom', 'Middle', 'Top'];
         break;
       case 'lineType':
-        const lineStyles = DesignCore.LTypeManager.getStyles();
+        const lineStyles = DesignCore.LTypeManager.getItems();
         const lineStyleNames = lineStyles.map((style) => style.name);
         model = lineStyleNames;
         break;

diff --git a/src/io.github.dubstar_04.design.src.gresource.xml b/src/io.github.dubstar_04.design.src.gresource.xml
@@ -75,9 +75,6 @@
     <file>Design-Core/core/entities/solid.js</file>
     <file>Design-Core/core/entities/text.js</file>
 
-    <file>Design-Core/core/blocks/block.js</file>
-    <file>Design-Core/core/blocks/blockManager.js</file>
-
     <file>Design-Core/core/tools/copy.js</file>
     <file>Design-Core/core/tools/distance.js</file>
     <file>Design-Core/core/tools/erase.js</file>
@@ -90,14 +87,17 @@
     <file>Design-Core/core/tools/tool.js</file>
     <file>Design-Core/core/tools/purge.js</file>
 
-    <file>Design-Core/core/styles/layer.js</file>
-    <file>Design-Core/core/styles/layerManager.js</file>
-    <file>Design-Core/core/styles/ltype.js</file>
-    <file>Design-Core/core/styles/ltypeManager.js</file>
-    <file>Design-Core/core/styles/styleManagerBase.js</file>
-    <file>Design-Core/core/styles/dimStyle.js</file>
-    <file>Design-Core/core/styles/dimStyleManager.js</file>
-    <file>Design-Core/core/styles/style.js</file>
-    <file>Design-Core/core/styles/styleManager.js</file>
+    <file>Design-Core/core/tables/block.js</file>
+    <file>Design-Core/core/tables/blockManager.js</file>
+    <file>Design-Core/core/tables/dimStyle.js</file>
+    <file>Design-Core/core/tables/dimStyleManager.js</file>
+    <file>Design-Core/core/tables/layer.js</file>
+    <file>Design-Core/core/tables/layerManager.js</file>
+    <file>Design-Core/core/tables/ltype.js</file>
+    <file>Design-Core/core/tables/ltypeManager.js</file>
+    <file>Design-Core/core/tables/style.js</file>
+    <file>Design-Core/core/tables/styleManager.js</file>
+    <file>Design-Core/core/tables/styleManagerBase.js</file>
+    <file>Design-Core/core/tables/tableManagerBase.js</file>
   </gresource>
 </gresources>