Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

qt6: Merge latest develop #1164

Open
wants to merge 256 commits into
base: qt6
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 250 commits
Commits
Show all changes
256 commits
Select commit Hold shift + click to select a range
967e339
Update URL
slspencer Aug 15, 2023
0d69763
update to new URL
slspencer Aug 15, 2023
c758473
Merge pull request #1014 from FashionFreedom/update-url
slspencer Aug 15, 2023
2df4aea
feat: update German translation
csett86 Aug 29, 2023
e32db77
fix excessive logging
DSCaskey Sep 18, 2023
22480d4
update dialogs
DSCaskey Sep 5, 2023
83cf622
Merge pull request #1025 from FashionFreedom/issue-1024-fix-logging
slspencer Sep 21, 2023
d1e1407
Merge branch 'develop' into fix-dialog-window-max-scale
DSCaskey Sep 21, 2023
ddbfadc
revert warnings
DSCaskey Sep 28, 2023
36da4c1
migrate to new file extensions
DSCaskey Jun 29, 2023
350a5b3
Merge pull request #1029 from FashionFreedom/issue-1028-fix-logging-w…
DSCaskey Oct 7, 2023
174b182
revert fx warning dialogs
DSCaskey Oct 7, 2023
4e5ba16
Merge pull request #1031 from FashionFreedom/issue-1030-revert-fx-war…
csett86 Oct 8, 2023
2c2a7a4
Merge pull request #1027 from FashionFreedom/issue-1026-fix-dialog-ma…
DSCaskey Oct 8, 2023
b8886c7
revert logging warning(0's
DSCaskey Oct 8, 2023
0bf76e9
Merge pull request #1033 from FashionFreedom/issue-1032-logging-warnings
DSCaskey Oct 8, 2023
2cb5ca7
revert qCWarning() to qCDebug()
DSCaskey Oct 21, 2023
3559a55
Merge pull request #1035 from FashionFreedom/issue-1034-revert-seamly…
DSCaskey Oct 21, 2023
c8062fb
update translations
DSCaskey Oct 17, 2023
d3be223
Merge branch 'develop' into spanish-lupdate
DSCaskey Oct 29, 2023
0b59373
update pattern piece dialog
DSCaskey Oct 29, 2023
e9992b0
fix translations
DSCaskey Nov 5, 2023
bc6cb36
Merge branch 'german-translation' into fix-and-update-translations
DSCaskey Nov 5, 2023
5422839
more translation fixes
DSCaskey Nov 7, 2023
b4a0d3d
Merge pull request #1040 from FashionFreedom/fix-and-update-translations
slspencer Nov 9, 2023
9316121
Merge branch 'develop' into issue-858-new-filename-extensions
DSCaskey Nov 10, 2023
6113b2a
fix name conflict
DSCaskey Nov 12, 2023
196cb98
lupdate
DSCaskey Nov 12, 2023
20e0706
update individual size file icon
DSCaskey Nov 15, 2023
5e7cf9c
Merge pull request #1041 from FashionFreedom/issue-858-new-filename-e…
slspencer Nov 15, 2023
80ee806
fix move tool
DSCaskey Nov 17, 2023
f89dcb0
remove un-needed event() override
DSCaskey Nov 19, 2023
eb847ca
Fix text string
DSCaskey Nov 20, 2023
d86cd3b
Merge pull request #1043 from FashionFreedom/issue-1042-fix-move-tool
DSCaskey Nov 20, 2023
7de3631
lupdate
DSCaskey Nov 22, 2023
ec4e65a
enhance groups dock
DSCaskey Nov 23, 2023
af9de10
enhance piece dock
DSCaskey Nov 23, 2023
c53ff94
add notch subtype to context menu
DSCaskey Nov 25, 2023
afa1945
Merge pull request #1044 from FashionFreedom/russian-lupdate
slspencer Nov 25, 2023
da67188
Merge branch 'develop' into enhance-pattern-piece-dock
DSCaskey Nov 26, 2023
5382e82
add ME splash screen
DSCaskey Nov 27, 2023
89a876e
Merge pull request #1046 from FashionFreedom/enhance-pattern-piece-dock
slspencer Nov 28, 2023
1ad1044
Merge branch 'develop' into enhance-groups-dock
DSCaskey Nov 28, 2023
aec2361
Merge pull request #1048 from FashionFreedom/add-me-splash-screen
DSCaskey Nov 28, 2023
fd05e62
Merge pull request #1049 from FashionFreedom/enhance-groups-dock
slspencer Dec 1, 2023
6f27e4f
Merge branch 'develop' into add-notch-subtype-to-context-menu
DSCaskey Dec 6, 2023
9891812
Merge pull request #1051 from FashionFreedom/add-notch-subtype-to-con…
slspencer Dec 15, 2023
94bb943
add import menu for bodyscans
DSCaskey Nov 26, 2023
b47de1d
Merge branch 'develop' into add-import-menu
DSCaskey Dec 18, 2023
ee8c5dd
lupdate
DSCaskey Dec 18, 2023
7723880
Merge pull request #1052 from FashionFreedom/add-import-bodyscan-menu
slspencer Dec 18, 2023
5ef61b8
add seamlyme welcome screen
DSCaskey Jan 3, 2024
0dee9a2
fix file path prefs
DSCaskey Jan 6, 2024
36e3fc0
Remove leftovers from splash screen
csett86 Jan 6, 2024
b62a763
ci(mac): fix Xcode version to prevent breaking builds when Xcode 15 i…
csett86 Jan 6, 2024
26d0bca
remove qtimer call
DSCaskey Jan 7, 2024
3ec9ef5
revert remove qtimer call
DSCaskey Jan 7, 2024
a45df37
add seamly2d welcome screen
DSCaskey Jan 5, 2024
133eaab
Merge pull request #1057 from FashionFreedom/update-Me-splash-screen-…
slspencer Jan 9, 2024
1c444cb
Merge pull request #1058 from FashionFreedom/issue-1054-fix-file-path…
slspencer Jan 9, 2024
8dc04f5
Merge branch 'develop' into add-welcome-screen-to-seamly2d
DSCaskey Jan 9, 2024
f35045a
Merge pull request #1059 from FashionFreedom/ci-fix-xcode-version
slspencer Jan 10, 2024
b3cb828
cleanup code
DSCaskey Jan 9, 2024
edd6eb1
add selection sound pref
DSCaskey Jan 15, 2024
a5761fc
lupdate
DSCaskey Jan 15, 2024
1b5f945
fix new file extensions
DSCaskey Dec 3, 2023
a3aad68
Merge branch 'develop' into fix-new-file-extensions
DSCaskey Jan 28, 2024
cfaed3e
fix filename case
DSCaskey Jan 28, 2024
cce323e
fix more filenames case issues
DSCaskey Jan 28, 2024
90a59fb
fix filename case
DSCaskey Jan 29, 2024
eb5f74c
Merge pull request #1063 from FashionFreedom/new-measurement--file-sc…
slspencer Jan 30, 2024
445d75a
feat: Base Point Combobox added to point name toolbar
Onetchou Feb 20, 2024
6620612
feat: editable base point combobox with data validation
Onetchou Feb 21, 2024
ae9c352
fix: base point combobox tooltip updated
Onetchou Feb 21, 2024
1eca1dd
refactor: unused getDefaultBasePoint method removed and code simplifi…
Onetchou Feb 22, 2024
13843d6
feat: labels are now using the GUI language instead of the label lang…
Onetchou Feb 22, 2024
ab27e0a
feat: label language combobox has been removed
Onetchou Feb 22, 2024
407e91c
revert: basepoint labels use label language
Onetchou Feb 24, 2024
05403f3
feat: renaming the "label combobox" into a "point name alphabet" comb…
Onetchou Feb 24, 2024
b026e3f
feat: "point name alphabet" combobox renamed "point name text" combobox
Onetchou Feb 26, 2024
fb276d7
fix: .ts files updated
Onetchou Feb 27, 2024
f790c07
Merge pull request #1064 from Onetchou/basepoint-combobox
DSCaskey Feb 28, 2024
422f867
fix export layout dialog
DSCaskey Feb 29, 2024
06123c2
Merge branch 'develop' into add-welcome-screen-to-seamly2d
DSCaskey Mar 2, 2024
23a52de
fix gui language change update
DSCaskey Mar 2, 2024
8cc3ba1
Merge pull request #1066 from FashionFreedom/issue-1065-fix-export-la…
slspencer Mar 5, 2024
c82daa6
Merge pull request #1067 from FashionFreedom/add-welcome-screen-to-se…
slspencer Mar 6, 2024
16ba2a8
remove bug reporting
DSCaskey Mar 7, 2024
5f5e6f1
Update ci.ym use node.js 20
DSCaskey Mar 8, 2024
7b5f7a2
Update ci.yml use node.js 20 for upload artifact action
DSCaskey Mar 8, 2024
9910f12
Merge branch 'develop' into background-image
DSCaskey Aug 8, 2022
ede31ed
Merge branch 'develop' into background-image
DSCaskey Mar 9, 2024
54ebd8b
ci: bump softprops/action-gh-release to address node16 deprecations
csett86 Mar 9, 2024
3025038
Merge pull request #1070 from FashionFreedom/issue-1069-remove-reporting
DSCaskey Mar 10, 2024
e87d092
Merge pull request #1071 from FashionFreedom/ci-node20
DSCaskey Mar 10, 2024
1fa9a6a
add locations to lupdate
DSCaskey Mar 13, 2024
057e636
refactor: replace obsolete Q_DECL_OVERRIDE with override in image_item.h
Onetchou Mar 16, 2024
c9eefdc
refactor: remove unuseful functions in image_item.h and image_item.cpp
Onetchou Mar 16, 2024
3cc6e50
fix: Images can be moved and resized without jumping
Onetchou Mar 16, 2024
1c2a05d
style: Import image dialog is now suggesting png by default
Onetchou Mar 15, 2024
1464f51
fix: opacity combobox for images has a minimum of 5% instead of 1%
Onetchou Mar 15, 2024
5a4c320
fix: images are only moved with left clicks
Onetchou Mar 16, 2024
9a01004
feat: Image_toobar has been removed
jim555-lab Mar 14, 2024
442cbf9
lupdate: run with relative via Makefile
csett86 Mar 16, 2024
b409a46
lupdate: relative is enough on the main file, the measurements anyway…
csett86 Mar 16, 2024
b79d727
widen tool dialogs (#1074)
DSCaskey Mar 16, 2024
5e836e3
Merge pull request #1072 from FashionFreedom/add-location-tags-to-lup…
DSCaskey Mar 16, 2024
2319e10
ci: bump document action for node20 (#1076)
csett86 Mar 17, 2024
597f502
fix: the origin of the images is set at their top left
Onetchou Mar 16, 2024
e1be075
fix: images can be moved and resized according to the values sent by …
Onetchou Mar 17, 2024
da82746
feat: resizing handles are only shown when the image is hovered
Onetchou Mar 19, 2024
84c1167
feat: images keep aspect ratio when resized while pressing shift
Onetchou Mar 20, 2024
7b19318
improve intersect arc line icon and cursor
DSCaskey Mar 22, 2024
c6c610a
Merge pull request #1080 from FashionFreedom/improve-toolicon-and-cursor
DSCaskey Mar 23, 2024
5262048
feat: image can be rotated using image property dialog
Onetchou Mar 20, 2024
2aa02e1
fix: minor fixes to the image properties dialog
Onetchou Mar 20, 2024
1486e2b
fix: unit conversion is working in image properties dialog
Onetchou Mar 21, 2024
62e687c
fix: lock aspect ratio button is working in image properties
Onetchou Mar 21, 2024
b09c417
feat: locking image aspect ratio in image properties dialog also affe…
Onetchou Mar 21, 2024
c5f2c9f
fix: images can be deleted using the right click menu
Onetchou Mar 21, 2024
1c6d673
feat: Images Toolbox added to the interface
jim555-lab Mar 20, 2024
a2e42fb
feat: Add Images ToolBar and Images ToolBox_ToolBar
jim555-lab Mar 22, 2024
15639bb
feat: Import Image shortcut (Alt+ I)
jim555-lab Mar 22, 2024
f1a0bbf
fix: Add icon in file path preferences for image path
jim555-lab Mar 23, 2024
c90f8bb
fix: resizing an image using handles while pressing ctrl keeps its as…
Onetchou Mar 23, 2024
8ff459f
fix: apply button is working in image properties dialog
Onetchou Mar 24, 2024
8ab6992
feat: show hidden from image right click menu
Onetchou Mar 24, 2024
986758c
refactor: origin point combobox removed
Onetchou Mar 24, 2024
fd24d48
fix: image can be locked
Onetchou Mar 24, 2024
68b4a56
fix: New Images Menu/Tools/Toolbar_toolbox Icon
jim555-lab Mar 27, 2024
73ec067
feat: Add an info popup that explains that background images are not …
jim555-lab Mar 27, 2024
4125a68
fix: user can start a rubber band selection inside a locked image
Onetchou Mar 27, 2024
e73dc7f
fix: no more glitch when images are moved or resized when zoomed on
Onetchou Mar 27, 2024
cab1a67
feat: user can move inside the scene using the mouse middle click eve…
Onetchou Mar 27, 2024
40fee90
feat: the user can change images z order
Onetchou Mar 27, 2024
8184b99
bug: fix shortcut tooltips (#1082)
DSCaskey Mar 31, 2024
d8b5d46
add new schema
DSCaskey Apr 2, 2024
b383d4b
code styling maintenance
DSCaskey Apr 2, 2024
710dd5e
lupdate
DSCaskey Apr 2, 2024
2b45d35
fix: no more unexpected crashes at image deletion
Onetchou Mar 30, 2024
29472db
feat: confirmation popup on image deletion linked to the confirm dele…
Onetchou Mar 30, 2024
29584d1
fix: .ts files updated after background image feature MVP
Onetchou Mar 30, 2024
a092fb8
fix: when an image is resized using the handles, the arrow cursor is …
Onetchou Apr 3, 2024
4cce2ae
fix: no more casting warnings generated by the ImageItem class
Onetchou Apr 3, 2024
fe6e305
fix: image resizing handles are not affected by the scene zoom
Onetchou Apr 3, 2024
82a52b4
fix: image properties dialog works if pattern is in mm
Onetchou Apr 5, 2024
dfa202d
feat: the user can use the middle handles when aspect ratio is locked…
Onetchou Apr 5, 2024
e3102b3
feat: error popup if image can't be read
Onetchou Apr 5, 2024
27247db
feat: image can be selected
Onetchou Apr 5, 2024
32661f3
docs: unit icon svgs have been added to the repo
Onetchou Apr 5, 2024
af88ec4
fix: can access the Image page in the Toolbox
jim555-lab Apr 3, 2024
043bb90
feat: Add StatusBar message when resizing an image
jim555-lab Apr 4, 2024
0d0fff1
feat: Add statusbar message when hovering over an image
jim555-lab Apr 4, 2024
2bf1799
refactor: use a lambda function to transmit status message from image…
Onetchou Apr 6, 2024
363197a
feat: Image status message tells image position and if aspect ratio i…
Onetchou Apr 6, 2024
8ef9b54
fix: image selection has been disabled for the MVP to solve resizing …
Onetchou Apr 7, 2024
11fac63
Merge pull request #1084 from FashionFreedom/change-increments-to-var…
slspencer Apr 9, 2024
2674525
fix: Lock icon now updates in the context menu and the dialog
jim555-lab Apr 9, 2024
ac587de
feat: opacity spinbox snaps to its minimum value when the entered val…
jim555-lab Apr 10, 2024
67f1c8d
fix: new design for the image properties dialog
jim555-lab Apr 10, 2024
59954a4
fix: no more cursor change when the image is locked and hovered
Onetchou Apr 9, 2024
ace4c57
fix: no more crash when software is closed due to children calling sl…
Onetchou Apr 9, 2024
4a4d36b
fix: lines are not on top of the background images anymore
Onetchou Apr 9, 2024
5397eb1
fix: image can be zoomed on when double clicked or using the zoom to …
Onetchou Apr 10, 2024
3a638dc
fix: undo does not remove images anymore
Onetchou Apr 10, 2024
5d1e3ab
fix: no more crash due to the property browser
Onetchou Apr 10, 2024
37423c5
refactor: m_imagemap moved into vabstractpattern.h
Onetchou Apr 11, 2024
4a07c79
refactor: images are kept when doing a PrepareForParse
Onetchou Apr 11, 2024
dfc8bef
feat: little locks around the locked images
Onetchou Apr 11, 2024
f0f0eb7
fix: images size limitations are coherent with one another
Onetchou Apr 12, 2024
0c0ecb1
refactor: refactoring of the limitPosition function of resizeHandlesItem
Onetchou Apr 12, 2024
b119cea
fix: no more bug when resizing image to extreme sizes when aspect rat…
Onetchou Apr 12, 2024
95de09b
fix: solve synchronization and extreme values pbms with the size spin…
Onetchou Apr 12, 2024
89f68d5
feat: little locks' size depend on the size of the image
Onetchou Apr 12, 2024
4209a78
style: image resize handles are a little bit darker
Onetchou Apr 12, 2024
58040b8
feat: all images filter in image import dialog
Onetchou Apr 12, 2024
7ed2b8b
fix: images are now clearing selection
Onetchou Apr 12, 2024
f62d4d3
fix: no more crashes when a new pattern is opened after one is closed
Onetchou Apr 12, 2024
680c57b
fix: no more scale attributes to DraftImages / no more sync issues wi…
Onetchou Apr 12, 2024
fe48877
fix: import image info popup updated
Onetchou Apr 12, 2024
286d8e9
fix: .ts files updated
Onetchou Apr 12, 2024
a495f57
fix: layout of image properties dialog updated
Onetchou Apr 13, 2024
e0ebfe8
style: images little locks are grey instead of black
Onetchou Apr 13, 2024
80e47f3
fix: Resolve conflicts between develop and background-image
Onetchou Apr 13, 2024
790b2e5
correct method name (#1088)
DSCaskey Apr 14, 2024
582f3ee
Merge pull request #1085 from FashionFreedom/background-image
DSCaskey Apr 15, 2024
3ab6059
fix: old conditionals have been removed
Onetchou Apr 15, 2024
e829b84
Merge pull request #1091 from FashionFreedom/reporting-compilation-issue
DSCaskey Apr 15, 2024
0357413
fix: intersect arc & line icon visible again in mainwindow
Onetchou Apr 15, 2024
1376666
fix: operations toolbar is no more greyed out
Onetchou Apr 15, 2024
fe07a43
Merge pull request #1092 from FashionFreedom/background-image
DSCaskey Apr 15, 2024
66d7796
Merge remote-tracking branch 'upstream/develop' into develop
xypp3 Apr 16, 2024
83c1433
Merge pull request #3 from FashionFreedom/qt6
xypp3 Apr 18, 2024
d75d936
fix: Include qobject.h and Add string literal to fix warnings
xypp3 Apr 18, 2024
215dab8
Revert "fix: Include qobject.h and Add string literal to fix warnings"
xypp3 Apr 18, 2024
2febc55
fix: Include <qobject.h> in ifcdef.cpp && Add string literal in QStri…
xypp3 Apr 18, 2024
bbfb72e
Merge pull request #4 from De-Rossi-Consulting/minor-fixes
xypp3 Apr 18, 2024
29125f8
fix: Add xerces-c_3_2.dll to fix .dll no found issue, issue#1018 in o…
xypp3 Apr 18, 2024
0bce425
feature: Enhance and update about dialog (#1095)
DSCaskey Apr 20, 2024
1c9292f
ci: pin to macos-13 as macos-latest is too new for Qt5
csett86 Apr 20, 2024
b843e7f
Merge pull request #1096 from FashionFreedom/ci-macos-13
slspencer Apr 21, 2024
0119c03
ci: temporarily disable windows signing (#1107)
csett86 May 10, 2024
cdcd529
switch formula length and angle order (#1106)
DSCaskey May 10, 2024
d045623
Merge pull request #5 from De-Rossi-Consulting/fix-xerces-found
Martin-Nyaga May 10, 2024
68b3e84
Fix: notch geometry max spinbox values (#1118)
DSCaskey Jun 3, 2024
538559d
refactor: image tool class added (#1112)
Onetchou Jun 3, 2024
fa52a9d
Fix license link (#1114)
bkmgit Jun 3, 2024
ee3c3c7
Update Linux install instructions (#1116)
bkmgit Jun 3, 2024
38cec5d
Add doxygen comments for vcontainer (#1119)
sconklin Jun 3, 2024
81029fe
update wiki url (#1125)
DSCaskey Jun 23, 2024
2871629
ci: fix mac hdiutil github actions issues (#1124)
csett86 Jun 23, 2024
74da69b
images can have their origin offset from the top left corner (#1126)
Onetchou Jun 25, 2024
56d225f
Fix: file conversion backup (#1128)
DSCaskey Jun 25, 2024
4bc3942
Add comments (#1108)
slspencer Jun 25, 2024
bc502b4
maintenance: correct comments for vcontainer (#1130)
DSCaskey Jul 2, 2024
7964eae
bug: fix file errors when running collection (#1137)
DSCaskey Jul 5, 2024
c9692d7
fix 100% CPU usage of spline control points (#1129)
DSCaskey Jul 6, 2024
d9fd698
feat: all the UI part of the image origin functionnality has been add…
Onetchou Jun 29, 2024
4cb61ff
feat: image origin can be changed
Onetchou Jun 29, 2024
c00665e
fix: .ts files updated
Onetchou Jun 29, 2024
78b50c1
fix: minor semantic change
Onetchou Jul 6, 2024
4c943d0
add current pen preference
DSCaskey Jun 27, 2024
6a67380
update seamly2d about dialog
DSCaskey Jul 8, 2024
aaaff77
lupdate
DSCaskey Jul 8, 2024
74fd8b0
set lupdate locations to none in pro file
DSCaskey Jul 9, 2024
78f973b
ci: Upgrade Qt version from 6.5.2 to 6.5.3
xypp3 Jul 11, 2024
49ea0f3
PR feedback to remove/inline divergences
xypp3 Jul 12, 2024
e199edc
Merge branch 'qt6' of github.com:De-Rossi-Consulting/Seamly2D into qt6
xypp3 Jul 12, 2024
d643b29
Revert "ci: Upgrade Qt version from 6.5.2 to 6.5.3"
xypp3 Jul 12, 2024
d4e8004
rm superflous asset files
xypp3 Jul 12, 2024
f0e6c17
rm: another batch of extra .val files
xypp3 Jul 12, 2024
2859336
feat: Add end point option to point on arcs, curves, and splines (#1143)
DSCaskey Jul 12, 2024
2f7a7c8
Merge https://github.com/FashionFreedom/Seamly2D into develop
xypp3 Jul 15, 2024
cbdcf97
Add doxygen comment blocks for vtranslatemeasurements
sconklin Jul 11, 2024
c52e9cb
feat: examples have been added to math function comments
Onetchou Jul 25, 2024
ad4e3f7
feat: add info about units and domains in math function comments
Onetchou Jul 25, 2024
37127be
fix: no more warning popup when using a math function with a semicolon
Onetchou Jul 25, 2024
e91b1e1
fix: no more error popup when cancelling image import
Onetchou Jul 25, 2024
e27901a
fix: auto scroll when moving pattern piece is now independent from th…
Onetchou Jul 25, 2024
2438932
Add comments to mainwindow.cpp - partial (#1109)
slspencer Jul 30, 2024
df16541
README: Fix flathub link
csett86 Aug 4, 2024
a467657
README: fixup
csett86 Aug 4, 2024
47dcd65
README: flathub uses shorter URLs now
csett86 Aug 4, 2024
2c739c9
flathub: add linux screenshot
csett86 Aug 3, 2024
05b8be6
Merge remote-tracking branch 'origin/qt6' into qt6
Martin-Nyaga Aug 5, 2024
63d2fe7
Merge remote-tracking branch 'origin/develop' into develop
Martin-Nyaga Aug 5, 2024
fd6e522
Merge branch 'develop' into qt6
Martin-Nyaga Aug 5, 2024
8d12583
Port additional code from develop to qt6
Martin-Nyaga Aug 5, 2024
6d08ed0
xerces: Copy xerces-c dll to dest dir
Martin-Nyaga Aug 9, 2024
1857d36
schema: Update individual size version regex for v0.3.4
Martin-Nyaga Aug 9, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ project may be further defined and clarified by project maintainers.
## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported by contacting the project team at [hello@seamly.net]. All
reported by contacting the project team at [hello@seamly.io]. All
complaints will be reviewed and investigated and will result in a response that
is deemed necessary and appropriate to the circumstances. The project team is
obligated to maintain confidentiality with regard to the reporter of an incident.
Expand Down
27 changes: 15 additions & 12 deletions .github/README-DEVELOPER.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,12 @@
* [Qt 5.15.2](https://www.qt.io/download-open-source) (includes Qt, QtCreator, QtChooser, and Qt Maintenance Tool)
* [Git](https://git-scm.com/downloads) or [Github Desktop for Windows and MacOS](https://desktop.github.com)
* Compiler - MSVC 2022, gcc, and g++ are included with QtCreator, and you can add or update them using the Qt Maintenance Tool (Maintenance.exe).
* Pdftops (from XpdfReader or poppler) - Required to create PS or EPS layout files.
* Pdftops (from XpdfReader or poppler) - Required to create PS or EPS layout files.
* Check the sections below for your operating system to find additional installation requirements.

## Code Documentation
* [Doxygen Docs](https://fashionfreedom.github.io/Seamly2D/)

## Development methods and styles:
* [GitHub Flow workflow](https://githubflow.github.io)
* [Gibhub commit message style guide](https://www.conventionalcommits.org/en/v1.0.0/)
Expand All @@ -15,12 +18,12 @@

## Build method:
* Review our [GitHub Action CI script](workflows/ci.yml).

## Tools for improved Code reviews, Pull Requests, and Commits:
* [Codesee](https://codesee.io), autogenerated maps of code base and PRs. SeamlyTeam contributors can access our map [here](https://app.codesee.io/maps/5fcdb0b0-ffe6-11ed-bb97-c168054a9020)
* [Google Blocks](https://blocks.githubnext.com/fashionfreedom/seamly2d/blob/develop?blockKey=githubnext__blocks-examples__minimap), drill-down tool to visually organize and analyze the code base.
* [What the Diff](https://github.com/apps/what-the-diff), an AI-powered assistant that adds expanded comments to commits.

___________________________________________________
## Build on Linux

Expand All @@ -41,14 +44,14 @@ ___________________________________________________
$ make -j$(nproc)
$ sudo make install
```
_Note: The default prefix for command `make install` is `/usr`. To define another prefix, build with qmake's PREFIX option. This example sets `/usr/local` as the new prefix for Seamly's installation binary files:_
_Note: The default prefix for command `make install` is `/usr`. To define another prefix, install with an INSTALL_ROOT specified. This example sets `/usr/local` as the new prefix for Seamly's installation binary files:_
```
$ qmake PREFIX=/usr/local Seamly2D.pro
$ sudo make INSTALL_ROOT=/usr/local install
```
* Copy pdftops to Seamly build directory if you need to create post script (.ps and .eps) pattern piece layouts.

## Build on MacOSX and Windows 10/11
1. MacOS only:
1. MacOS only:
* Read about Qt for macOS [here](https://doc.qt.io/qt-5/macos.html)
* Install [Xcode 11](https://developer.apple.com/download/all/)
* Setup/validate build environment. Read more [here](https://doc.qt.io/qt-5/macos.html#build-environment).
Expand All @@ -72,7 +75,7 @@ ___________________________________________________
* Qt Creator Debug Symbols
(Qt Maintenance Tool is always installed with Developer & Designer Tools - this will be highlighted)

3. Windows only:
3. Windows only:
* Download [XpdfReader](http://www.xpdfreader.com/download.html) for Windows. Extract to `C:/Program Files`. Rename folder to `C:/Program Files/Xpdf`.
* Read about Qt for Windows [here](https://doc.qt.io/qt-5/windows.html).
* Add Qt and QtCreator directories to the Windows PATH environment variable through Control Panel:
Expand All @@ -84,20 +87,20 @@ ___________________________________________________
qmake Seamly2D.pro CONFIG+=macSign
```

5. Both MacOS and Windows:
5. Both MacOS and Windows:
* Build the Seamly2D project
* To build with Qt's *QtCreator* IDE:
* Create your compiler kit. Read more about adding compilers [on the Qt website](https://doc.qt.io/qtcreator/creator-tool-chains.html).
* Complete your build settings. Read more about build settings [here](https://doc.qt.io/qtcreator/creator-build-settings.html).
* Open the Seamly2D project with 'File > Open File or Project'. Navigate to the 'seamly2d/src' directory and select 'Seamly2D.pro'.
* Open the Seamly2D project with 'File > Open File or Project'. Navigate to the 'seamly2d/src' directory and select 'Seamly2D.pro'.
* Open the Configure Project tab and select your compiler kit. Read more [here](https://doc.qt.io/qtcreator/creator-project-opening.html).
* Build with the 'Build and Run Kit Selector' icon, or use 'Build' and 'Run' from the Tools menu. Read more [here](https://doc.qt.io/qtcreator/creator-building-targets.html).
* Build with the 'Build and Run Kit Selector' icon, or use 'Build' and 'Run' from the Tools menu. Read more [here](https://doc.qt.io/qtcreator/creator-building-targets.html).
* To build with Qt's *qmake* from a terminal window:
* Read more about jom [here](https://wiki.qt.io/Jom)
* Read more about nmake [here](https://learn.microsoft.com/en-us/cpp/build/reference/nmake-reference?view=msvc-170)
```
cd $SOURCE_DIRECTORY\build
qmake ..\Seamly2D.pro
nmake # (or jom. Assign multiple CPUs to speed up compilation time but don't use all - leave at least one CPU for your OS.)
nmake # (or jom. Assign multiple CPUs to speed up compilation time but don't use all - leave at least one CPU for your OS.)
```
* Copy the `C:\Program Files\Xpdf\bin64\pdftops.exe` (or bin32) file to the Seamly build directory to enable creation of post script (.ps and .eps) pattern piece layouts.
* Copy the `C:\Program Files\Xpdf\bin64\pdftops.exe` (or bin32) file to the Seamly build directory to enable creation of post script (.ps and .eps) pattern piece layouts.
20 changes: 10 additions & 10 deletions .github/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
[![GitHub contributors](https://img.shields.io/github/contributors/fashionfreedom/seamly2d?style=flat-square&logo=github)](https://github.com/FashionFreedom/Seamly2D/graphs/contributors)
[![GitHub](https://img.shields.io/github/license/fashionfreedom/seamly2d?color=blue&style=flat-square&logo=creativecommons)](../LICENSE)
![GitHub language count](https://img.shields.io/github/languages/count/fashionfreedom/seamly2d?style=flat-square&logo=github)
[![Website](https://img.shields.io/website?down_message=Down&style=flat-square&up_color=brightgreen&up_message=Up&url=https%3A%2F%2Fseamly.net&logo=wordpress)](https://seamly.net/)
[![Forum posts](https://img.shields.io/discourse/posts?server=https%3A%2F%2Fforum.seamly.net&style=flat-square&logo=discourse)](https://forum.seamly.net/)
[![Website](https://img.shields.io/website?down_message=Down&style=flat-square&up_color=brightgreen&up_message=Up&url=https%3A%2F%2Fseamly.io&logo=wordpress)](https://seamly.io/)
[![Forum posts](https://img.shields.io/discourse/posts?server=https%3A%2F%2Fforum.seamly.io&style=flat-square&logo=discourse)](https://forum.seamly.io/)
![GitHub Repo stars](https://img.shields.io/github/stars/fashionfreedom/seamly2d?style=social)
[![Qt](img/Built_with_Qt_RGB_logo_vertical_transparent_60x65px.png)](https://qt.io)

Expand All @@ -19,24 +19,24 @@ Unlike other pattern design software, Seamly2D allows designers to have complete

Seamly2D is open source software released under the GPLv3+ license. Seamly2D is available for Windows, MacOS, and Linux.

Learn more about Seamly2D by joining our friendly, active user [forum](https://forum.seamly.net) and reading our [Code of Conduct](CODE_OF_CONDUCT.md). On our forum you may post questions about patternmaking and Seamly2D in any language you choose, as sewing terms are rich with idioms that are not always translatable word-for-word.
Learn more about Seamly2D by joining our friendly, active user [forum](https://forum.seamly.io) and reading our [Code of Conduct](CODE_OF_CONDUCT.md). On our forum you may post questions about patternmaking and Seamly2D in any language you choose, as sewing terms are rich with idioms that are not always translatable word-for-word.

## Supported platforms:
* Windows 10 & 11 (32-bit and 64-bit)
* Most current Linux distros via [Flathub](https://flathub.org/apps/details/net.seamly.seamly2d)
* Most current Linux distros via [Flathub](https://flathub.org/apps/io.seamly.seamly2d)
* macOS High Sierra 10.13 (64-bit) or later

## Download Seamly2D:

| Windows 64-bit | Windows 32-bit | MacOS | Linux AppImage | Linux Flatpak |
| :---: | :---: | :---: | :---: | :---: |
| [![Seamly2d-windows.zip](img/Microsoft_logo-60x60px.png)](https://github.com/FashionFreedom/Seamly2D/releases/latest/download/Seamly2D-windows.zip) | [![Seamly2d-win32.zip](img/Microsoft_logo-60x60px.png)](https://github.com/FashionFreedom/Seamly2D/releases/latest/download/Seamly2D-win32.zip) | [<picture><source media="(prefers-color-scheme: dark)" srcset="img/white-apple-logo-transparent-49x60px.png"><source media="(prefers-color-scheme: light)" srcset="img/Apple_logo_black.png" ><img src="img/Apple_logo_black.png" height="60"></picture>](https://github.com/FashionFreedom/Seamly2D/releases/latest/download/Seamly2D-macos.zip) | [![Seamly2D-x86_64.AppImage](img/Tux_Mono_60x60.png)](https://github.com/FashionFreedom/Seamly2D/releases/latest/download/Seamly2D-x86_64.AppImage) | [<img src="https://dl.flathub.org/assets/badges/flathub-badge-en.svg" alt="Download On Flathub" height="60">](https://flathub.org/apps/details/net.seamly.seamly2d) |
| [![Seamly2d-windows.zip](img/Microsoft_logo-60x60px.png)](https://github.com/FashionFreedom/Seamly2D/releases/latest/download/Seamly2D-windows.zip) | [![Seamly2d-win32.zip](img/Microsoft_logo-60x60px.png)](https://github.com/FashionFreedom/Seamly2D/releases/latest/download/Seamly2D-win32.zip) | [<picture><source media="(prefers-color-scheme: dark)" srcset="img/white-apple-logo-transparent-49x60px.png"><source media="(prefers-color-scheme: light)" srcset="img/Apple_logo_black.png" ><img src="img/Apple_logo_black.png" height="60"></picture>](https://github.com/FashionFreedom/Seamly2D/releases/latest/download/Seamly2D-macos.zip) | [![Seamly2D-x86_64.AppImage](img/Tux_Mono_60x60.png)](https://github.com/FashionFreedom/Seamly2D/releases/latest/download/Seamly2D-x86_64.AppImage) | [<img src="https://dl.flathub.org/assets/badges/flathub-badge-en.svg" alt="Download On Flathub" height="60">](https://flathub.org/apps/io.seamly.seamly2d) |

___________________________________________________
## Seamly2D Community Resources:
* [Website and downloads](https://seamly.net) - _current_
* [User Forum](https://forum.seamly.net/) - _current_
* [User Wiki Manual](https://wiki.seamly.net) - _needs updating_
* [Website and downloads](https://seamly.io) - _current_
* [User Forum](https://forum.seamly.io/) - _current_
* [User Wiki Manual](https://wiki.seamly.io) - _needs updating_
___________________________________________________

## Seamly2D Developer Resources:
Expand All @@ -55,9 +55,9 @@ 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.

![GPLv3](img/GPLv3_Logo-121x60px.png)
![GPLv3](img/GPLv3_Logo-121x60px.png)

See our [LICENSE.md](..\LICENSE.md) file or go to [https://www.gnu.org/licenses/gpl-3.0.html](https://www.gnu.org/licenses/gpl-3.0.html) for further information.
See our [LICENSE.md](../LICENSE.md) file or go to [https://www.gnu.org/licenses/gpl-3.0.html](https://www.gnu.org/licenses/gpl-3.0.html) for further information.

Other components released under:
* QMuParser - [Simplified BSD license](https://opensource.org/licenses/BSD-2-Clause)
Expand Down
2 changes: 1 addition & 1 deletion .github/config.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
blank_issues_enabled: false
contact_links:
- name: Problems while making your pattern?
url: https://forum.seamly.net
url: https://forum.seamly.io
about: Please ask for pattern problem support on our user Forum
30 changes: 28 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ jobs:

macos:
name: 'macOS: Build'
runs-on: macos-latest
runs-on: macos-13
needs: version
env:
VERSION_NUMBER: ${{ needs.version.outputs.version_number }}
Expand Down Expand Up @@ -165,6 +165,8 @@ jobs:
env:
APPLE_SIGN_IDENTITY: ${{ secrets.apple_sign_identity }}
run: |
# see https://github.com/actions/runner-images/issues/7522
echo killing XProtect...; sudo pkill -9 XProtect >/dev/null || true;
# run signing part if secrets are available (main builds), otherwise (3rd party PRs etc) skip
if [ -n "$APPLE_SIGN_IDENTITY" ] ; then
qmake Seamly2D.pro -config release CONFIG+=noTests CONFIG+=macSign
Expand Down Expand Up @@ -231,7 +233,7 @@ jobs:
- name: sign installer
env:
PFX_BASE64: ${{ secrets.pfx_base64 }}
if: false # temporarily disable signing until #1104 is solved, then revert to ${{ env.PFX_BASE64 }} run: |
if: false # temporarily disable signing until #1104 is solved, then revert to ${{ env.PFX_BASE64 }}
run: |
cd ..\windows-build\
SignTool sign /fd SHA256 /f ${{ steps.setup_signing.outputs.filePath }} /p ${{ secrets.pfx_password }} /t http://timestamp.sectigo.com Seamly2D-installer.exe
Expand All @@ -257,6 +259,9 @@ jobs:

steps:
- uses: actions/checkout@v4
- uses: ilammy/msvc-dev-cmd@v1
with:
arch: amd64_x86

- uses: jurplel/install-qt-action@v3
with:
Expand Down Expand Up @@ -290,6 +295,24 @@ jobs:
cd ..\windows-build\
& 'C:\Program Files (x86)\NSIS\makensis.exe' seamly2d-installer.nsi

- name: setup signing
id: setup_signing
uses: timheuer/[email protected]
env:
PFX_BASE64: ${{ secrets.pfx_base64 }}
if: ${{ env.PFX_BASE64 }}
with:
encodedString: ${{ secrets.pfx_base64 }}
fileName: seamly2d.pfx

- name: sign installer
env:
PFX_BASE64: ${{ secrets.pfx_base64 }}
if: false # temporarily disable signing until #1104 is solved, then revert to ${{ env.PFX_BASE64 }}
run: |
cd ..\windows-build\
SignTool sign /fd SHA256 /f ${{ steps.setup_signing.outputs.filePath }} /p ${{ secrets.pfx_password }} /t http://timestamp.sectigo.com Seamly2D-installer.exe

- name: pack installer file into .zip
run: |
cd ..\windows-build\
Expand Down Expand Up @@ -319,6 +342,9 @@ jobs:
- uses: actions/download-artifact@v4
with:
name: Seamly2D-windows.zip
- uses: actions/download-artifact@v4
with:
name: Seamly2D-win32.zip
- uses: softprops/action-gh-release@v2
with:
tag_name: v${{ env.VERSION_NUMBER }}
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
*~

# Seamly2D lock files
*.lock
*.locked

# Seamly2D and SeamlyMe makes reserve copy of each pattern file before conversion to higher version.
*(v*).val*
Expand Down
2 changes: 1 addition & 1 deletion AUTHORS.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Project maintainer, Product designer, Prototype developer, Community manager:
Primary code developer:
Douglas Caskey

User community moderators at https://forum.seamly.net:
User community moderators at https://forum.seamly.io:
@Grace
@Pneumarian

Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Thanks for contributing to Seamly code, documentation, translations, website, and wiki!

## How to Contact Us
If you need any help or have any questions, need a lengthy discussion or share documentation, ask on the forum at https://forum.seamly.net. Our users and coders hang out there frequently. You can always find someone there.
If you need any help or have any questions, need a lengthy discussion or share documentation, ask on the forum at https://forum.seamly.io. Our users and coders hang out there frequently. You can always find someone there.
Alternatively, if you leave a comment on a repo issue we'll quickly get back to you.

## How we work
Expand Down
31 changes: 20 additions & 11 deletions Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ JAVADOC_BANNER = NO
# requiring an explicit \brief command for a brief description.)
# The default value is: NO.

QT_AUTOBRIEF = YES
QT_AUTOBRIEF = NO

# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
# multi-line C++ special comment block (i.e. a block of //! or /// comments) as
Expand Down Expand Up @@ -945,7 +945,7 @@ WARN_LOGFILE = docs/Doxygen_logfile.txt

INPUT = src


# This tag can be used to specify the character encoding of the source files
# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
# libiconv (or the iconv built into libc) for the transcoding. See the libiconv
Expand Down Expand Up @@ -1060,12 +1060,21 @@ EXCLUDE_SYMLINKS = NO
# Note that the wildcards are matched against the file with absolute path, so to
# exclude all test directories for example use the pattern */test/*

EXCLUDE_PATTERNS = */test/* \
*/scripts/* \
*/share/* \
*/docs/* \
*/libdxfrw/*

EXCLUDE_PATTERNS = *.svg \
*.val \
*.vit \
*.vst \
*.sm2d \
*.smis \
*.smms \
*.pdf \
*.png \
*.ts \
*/dist/* \
*/docs/* \
*/out/* \
*/scripts/* \
*/.github/*

# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
# (namespaces, classes, functions, etc.) that should be excluded from the
Expand All @@ -1086,7 +1095,7 @@ EXAMPLE_PATH =
# *.h) to filter out the source-files in the directories. If left blank all
# files are included.

EXAMPLE_PATTERNS =
EXAMPLE_PATTERNS =

# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
# searched for input files to be used with the \include or \dontinclude commands
Expand Down Expand Up @@ -1160,7 +1169,7 @@ FILTER_SOURCE_PATTERNS =
# (index.html). This can be useful if you have a project on for instance GitHub
# and want to reuse the introduction page also for the doxygen output.

USE_MDFILE_AS_MAINPAGE =
USE_MDFILE_AS_MAINPAGE =

# The Fortran standard specifies that for fixed formatted Fortran code all
# characters from position 72 are to be considered as comment. A common
Expand Down Expand Up @@ -1422,7 +1431,7 @@ HTML_EXTRA_FILES =
# The default value is: AUTO_LIGHT.
# This tag requires that the tag GENERATE_HTML is set to YES.

HTML_COLORSTYLE = AUTO_LIGHT
HTML_COLORSTYLE = DARK

# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
# will adjust the colors in the style sheet and background images according to
Expand Down
8 changes: 4 additions & 4 deletions Seamly2D.pro
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
message("Entering Seamly2D.pro")

#These checks need because we can quote all paths that contain space.
#Check if spaces are in directory names
LIST = $$split(PWD,' ')
count(LIST, 1, >): error("The build will fail. Path '$${PWD}' contains space!!!")

Expand All @@ -15,7 +15,7 @@ SUBDIRS = \
out.depends = src

qtPrepareTool(LUPDATE, lupdate)
lupdate.commands = $$LUPDATE $$shell_path($${PWD}/share/translations/translations.pro)
lupdate.commands += && $$LUPDATE $$shell_path($${PWD}/share/translations/measurements.pro)
lupdate.commands = $$LUPDATE -noobsolete -locations none $$shell_path($${PWD}/share/translations/translations.pro)
lupdate.commands += && $$LUPDATE -noobsolete $$shell_path($${PWD}/share/translations/measurements.pro)

QMAKE_EXTRA_TARGETS += lupdate
QMAKE_EXTRA_TARGETS += lupdate
Loading
Loading