-
Notifications
You must be signed in to change notification settings - Fork 3
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
Feature/adjust style for add layer button #385
Merged
GaryChunChiaChiu
merged 2 commits into
develop
from
feature/Adjust-style-for-add-layer-button
Nov 22, 2022
Merged
Feature/adjust style for add layer button #385
GaryChunChiaChiu
merged 2 commits into
develop
from
feature/Adjust-style-for-add-layer-button
Nov 22, 2022
Conversation
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
GaryChunChiaChiu
approved these changes
Nov 22, 2022
GaryChunChiaChiu
deleted the
feature/Adjust-style-for-add-layer-button
branch
November 22, 2022 08:43
JasonShiao
added a commit
that referenced
this pull request
Dec 29, 2022
commit 0430756 Merge: 5b4a49b a6e86f1 Author: Jau-Shiuan(Jason) Shiao <b01901105@ntu.edu.tw> Date: Thu Dec 29 00:11:04 2022 +0800 Merge pull request #400 from flux3dp/release/v1.1.2 Release/v1.1.2 commit a6e86f1 Author: GaryChunChiaChiu <gary@flux3dp.com> Date: Tue Dec 27 17:38:20 2022 +0800 Change Single Layer to RejectRole for msgbox close commit 304eb32 Author: Jason Shiao <b01901105@ntu.edu.tw> Date: Tue Dec 27 16:29:33 2022 +0800 Fix type cast compiler error commit f0f6003 Author: GaryChunChiaChiu <gary@flux3dp.com> Date: Mon Dec 26 16:49:01 2022 +0800 Remove old code commit 565ca09 Author: GaryChunChiaChiu <gary@flux3dp.com> Date: Mon Dec 26 16:44:57 2022 +0800 Version update commit b9ff01f Author: GaryChunChiaChiu <gary@flux3dp.com> Date: Mon Dec 26 16:44:35 2022 +0800 Fix select when open dxf commit 5b4a49b Author: GaryChunChiaChiu <106943724+GaryChunChiaChiu@users.noreply.github.com> Date: Mon Dec 26 15:54:26 2022 +0800 Bug/fix dxf reader (#393) * test input info * Check layer when add shpae * Add dxf block * Add dxf insert and check addLWPolyline * Add insert and update but still wait to remove some shape over range * Add LWPolyline to generate arc * Remove rs_handle * Add file to read dxf(by LibreCAD) * Add include for M_PI info * Fix emit * Fix bug * Fix arc and spline * Add ellopse * Fix ellipse and move dxf to 0 when open file * Remove log * Fix open chinese name file sometimes crash * Fix drop file for dxf * Refine QMessageBox button handling * Fix typo * Fix typo * Fix typo Co-authored-by: Jason Shiao <b01901105@ntu.edu.tw> commit 7c802b4 Author: GaryChunChiaChiu <106943724+GaryChunChiaChiu@users.noreply.github.com> Date: Mon Dec 26 13:53:01 2022 +0800 Add link to design market (#396) commit 02cdb0f Author: GaryChunChiaChiu <106943724+GaryChunChiaChiu@users.noreply.github.com> Date: Mon Dec 19 14:29:55 2022 +0800 Add machine width protect when read jason and setting by machine manager (#395) commit 0ed47ed Author: GaryChunChiaChiu <106943724+GaryChunChiaChiu@users.noreply.github.com> Date: Fri Dec 16 16:23:05 2022 +0800 Enable about to link git (#394) commit 91685e5 Author: GaryChunChiaChiu <106943724+GaryChunChiaChiu@users.noreply.github.com> Date: Tue Dec 6 11:37:50 2022 +0800 Feature/fix reader file name check (#390) * Add check file extension with uppercase * test to pass dxf file name by QString * Add define to test wstring * To use wstring in windows os * copy by char array * use toLocal8Bit to pass char data commit 255c6a9 Author: GaryChunChiaChiu <106943724+GaryChunChiaChiu@users.noreply.github.com> Date: Tue Nov 29 14:45:09 2022 +0800 Feature/add canvas scale control (#389) * Add canvas scale control by +- * Add check key + commit 198ec35 Author: GaryChunChiaChiu <106943724+GaryChunChiaChiu@users.noreply.github.com> Date: Tue Nov 29 14:44:03 2022 +0800 Add pdf and ai drop. Fix svg drop size (#387) commit b8e3497 Author: GaryChunChiaChiu <106943724+GaryChunChiaChiu@users.noreply.github.com> Date: Tue Nov 29 14:42:11 2022 +0800 Update laser panel min size (#388) commit d39ca2b Author: GaryChunChiaChiu <106943724+GaryChunChiaChiu@users.noreply.github.com> Date: Wed Nov 23 16:58:11 2022 +0800 Feature/update UI (#386) * Update rotary UI * Fix image line display * Update rotary axis setting UI position * Fix laser UI * Update preset default to 10W * Update type select with dark mode * update border style commit 574f06e Author: Jau-Shiuan(Jason) Shiao <b01901105@ntu.edu.tw> Date: Tue Nov 22 16:43:45 2022 +0800 Feature/adjust style for add layer button (#385) * Remove border/shadow from the button * Fixup
JasonShiao
added a commit
to JasonShiao/swiftray-test
that referenced
this pull request
Dec 31, 2022
* Restrict the dependency for potrace to QxPotrace lib only * Conan with CMake (tested with Windows) * Add conanfile.py for libpotrace * Local windows runner * handle poppler, cairo and glib packages with vcpkg * add sentry * Manage sentry-native (with crashpad_handler) with vcpkg * Test sentry upload debug file * Remove unused file * Ignore conan for macOS * Update README.md * Add winsparkle * Add WinSparkle library with vcpkg. Add check update function for Windows. * Modify Check for updates button text * Fix incorrect version string * Support Sparkle framework for macOS. Use cmake generated files. * fallback conan handling * enable sparkle * Fix pacakge manager problems * restrict vcpkg packages on x64 windows platfomr * Fix icon * Fix sparkle for macOS * Refine app bundle for macOS with cmake * Refine GitHub workflow action for building macOS app bundle * Squashed commit of the following: commit 0430756 Merge: 5b4a49b a6e86f1 Author: Jau-Shiuan(Jason) Shiao <b01901105@ntu.edu.tw> Date: Thu Dec 29 00:11:04 2022 +0800 Merge pull request flux3dp#400 from flux3dp/release/v1.1.2 Release/v1.1.2 commit a6e86f1 Author: GaryChunChiaChiu <gary@flux3dp.com> Date: Tue Dec 27 17:38:20 2022 +0800 Change Single Layer to RejectRole for msgbox close commit 304eb32 Author: Jason Shiao <b01901105@ntu.edu.tw> Date: Tue Dec 27 16:29:33 2022 +0800 Fix type cast compiler error commit f0f6003 Author: GaryChunChiaChiu <gary@flux3dp.com> Date: Mon Dec 26 16:49:01 2022 +0800 Remove old code commit 565ca09 Author: GaryChunChiaChiu <gary@flux3dp.com> Date: Mon Dec 26 16:44:57 2022 +0800 Version update commit b9ff01f Author: GaryChunChiaChiu <gary@flux3dp.com> Date: Mon Dec 26 16:44:35 2022 +0800 Fix select when open dxf commit 5b4a49b Author: GaryChunChiaChiu <106943724+GaryChunChiaChiu@users.noreply.github.com> Date: Mon Dec 26 15:54:26 2022 +0800 Bug/fix dxf reader (flux3dp#393) * test input info * Check layer when add shpae * Add dxf block * Add dxf insert and check addLWPolyline * Add insert and update but still wait to remove some shape over range * Add LWPolyline to generate arc * Remove rs_handle * Add file to read dxf(by LibreCAD) * Add include for M_PI info * Fix emit * Fix bug * Fix arc and spline * Add ellopse * Fix ellipse and move dxf to 0 when open file * Remove log * Fix open chinese name file sometimes crash * Fix drop file for dxf * Refine QMessageBox button handling * Fix typo * Fix typo * Fix typo Co-authored-by: Jason Shiao <b01901105@ntu.edu.tw> commit 7c802b4 Author: GaryChunChiaChiu <106943724+GaryChunChiaChiu@users.noreply.github.com> Date: Mon Dec 26 13:53:01 2022 +0800 Add link to design market (flux3dp#396) commit 02cdb0f Author: GaryChunChiaChiu <106943724+GaryChunChiaChiu@users.noreply.github.com> Date: Mon Dec 19 14:29:55 2022 +0800 Add machine width protect when read jason and setting by machine manager (flux3dp#395) commit 0ed47ed Author: GaryChunChiaChiu <106943724+GaryChunChiaChiu@users.noreply.github.com> Date: Fri Dec 16 16:23:05 2022 +0800 Enable about to link git (flux3dp#394) commit 91685e5 Author: GaryChunChiaChiu <106943724+GaryChunChiaChiu@users.noreply.github.com> Date: Tue Dec 6 11:37:50 2022 +0800 Feature/fix reader file name check (flux3dp#390) * Add check file extension with uppercase * test to pass dxf file name by QString * Add define to test wstring * To use wstring in windows os * copy by char array * use toLocal8Bit to pass char data commit 255c6a9 Author: GaryChunChiaChiu <106943724+GaryChunChiaChiu@users.noreply.github.com> Date: Tue Nov 29 14:45:09 2022 +0800 Feature/add canvas scale control (flux3dp#389) * Add canvas scale control by +- * Add check key + commit 198ec35 Author: GaryChunChiaChiu <106943724+GaryChunChiaChiu@users.noreply.github.com> Date: Tue Nov 29 14:44:03 2022 +0800 Add pdf and ai drop. Fix svg drop size (flux3dp#387) commit b8e3497 Author: GaryChunChiaChiu <106943724+GaryChunChiaChiu@users.noreply.github.com> Date: Tue Nov 29 14:42:11 2022 +0800 Update laser panel min size (flux3dp#388) commit d39ca2b Author: GaryChunChiaChiu <106943724+GaryChunChiaChiu@users.noreply.github.com> Date: Wed Nov 23 16:58:11 2022 +0800 Feature/update UI (flux3dp#386) * Update rotary UI * Fix image line display * Update rotary axis setting UI position * Fix laser UI * Update preset default to 10W * Update type select with dark mode * update border style commit 574f06e Author: Jau-Shiuan(Jason) Shiao <b01901105@ntu.edu.tw> Date: Tue Nov 22 16:43:45 2022 +0800 Feature/adjust style for add layer button (flux3dp#385) * Remove border/shadow from the button * Fixup * Allow Windows to close app for software update * Fixup * resolve warning * Change ed25519 signing key for macOS sparkle update * Resolve duplicate macro define * Change appcast url * Allow no secondary executable (e.g. crashpad_handler) when codesign the app * Sign the built dmg * Prevent unexpected trigger of github action * Fixup * Fix .dmg path * Try signing for sparkle * Complete most of the steps in appcast.xml generation * test windows
JasonShiao
added a commit
to JasonShiao/swiftray-test
that referenced
this pull request
Dec 31, 2022
* Restrict the dependency for potrace to QxPotrace lib only * Conan with CMake (tested with Windows) * Fixup * Fixup * Add conanfile.py for libpotrace * test * test * try * try * try * try * try * try * try * fix * try * try * Fix * try * fix * try * fixup * fixup * Fixup * test * fixup * test * try deploy * Local windows runner * handle poppler, cairo and glib packages with vcpkg * Fixup * FIXUP * Use command prompt * fixup * fixup * add sentry * Manage sentry-native (with crashpad_handler) with vcpkg * Test sentry upload debug file * fixup * Fixup * fixup * Remove unused file * Ignore conan for macOS * Update README.md * Update README.md * Update README.md * fixup * fixup * Add winsparkle * Add WinSparkle library with vcpkg. Add check update function for Windows. * Modify Check for updates button text * Fix incorrect version string * Support Sparkle framework for macOS. Use cmake generated files. * Fixup * Try conan with cmake * fallback conan handling * test * test build * enable sparkle * fixup * fixup * test * test * Fix pacakge manager problems * restrict vcpkg packages on x64 windows platfomr * try * FIXUP * Fixup * Fix settings var missing * Fixup * fixup * Fix icon * Fix sparkle for macOS * Refine app bundle for macOS with cmake * Refine GitHub workflow action for building macOS app bundle * Squashed commit of the following: commit 0430756 Merge: 5b4a49b a6e86f1 Author: Jau-Shiuan(Jason) Shiao <b01901105@ntu.edu.tw> Date: Thu Dec 29 00:11:04 2022 +0800 Merge pull request flux3dp#400 from flux3dp/release/v1.1.2 Release/v1.1.2 commit a6e86f1 Author: GaryChunChiaChiu <gary@flux3dp.com> Date: Tue Dec 27 17:38:20 2022 +0800 Change Single Layer to RejectRole for msgbox close commit 304eb32 Author: Jason Shiao <b01901105@ntu.edu.tw> Date: Tue Dec 27 16:29:33 2022 +0800 Fix type cast compiler error commit f0f6003 Author: GaryChunChiaChiu <gary@flux3dp.com> Date: Mon Dec 26 16:49:01 2022 +0800 Remove old code commit 565ca09 Author: GaryChunChiaChiu <gary@flux3dp.com> Date: Mon Dec 26 16:44:57 2022 +0800 Version update commit b9ff01f Author: GaryChunChiaChiu <gary@flux3dp.com> Date: Mon Dec 26 16:44:35 2022 +0800 Fix select when open dxf commit 5b4a49b Author: GaryChunChiaChiu <106943724+GaryChunChiaChiu@users.noreply.github.com> Date: Mon Dec 26 15:54:26 2022 +0800 Bug/fix dxf reader (flux3dp#393) * test input info * Check layer when add shpae * Add dxf block * Add dxf insert and check addLWPolyline * Add insert and update but still wait to remove some shape over range * Add LWPolyline to generate arc * Remove rs_handle * Add file to read dxf(by LibreCAD) * Add include for M_PI info * Fix emit * Fix bug * Fix arc and spline * Add ellopse * Fix ellipse and move dxf to 0 when open file * Remove log * Fix open chinese name file sometimes crash * Fix drop file for dxf * Refine QMessageBox button handling * Fix typo * Fix typo * Fix typo Co-authored-by: Jason Shiao <b01901105@ntu.edu.tw> commit 7c802b4 Author: GaryChunChiaChiu <106943724+GaryChunChiaChiu@users.noreply.github.com> Date: Mon Dec 26 13:53:01 2022 +0800 Add link to design market (flux3dp#396) commit 02cdb0f Author: GaryChunChiaChiu <106943724+GaryChunChiaChiu@users.noreply.github.com> Date: Mon Dec 19 14:29:55 2022 +0800 Add machine width protect when read jason and setting by machine manager (flux3dp#395) commit 0ed47ed Author: GaryChunChiaChiu <106943724+GaryChunChiaChiu@users.noreply.github.com> Date: Fri Dec 16 16:23:05 2022 +0800 Enable about to link git (flux3dp#394) commit 91685e5 Author: GaryChunChiaChiu <106943724+GaryChunChiaChiu@users.noreply.github.com> Date: Tue Dec 6 11:37:50 2022 +0800 Feature/fix reader file name check (flux3dp#390) * Add check file extension with uppercase * test to pass dxf file name by QString * Add define to test wstring * To use wstring in windows os * copy by char array * use toLocal8Bit to pass char data commit 255c6a9 Author: GaryChunChiaChiu <106943724+GaryChunChiaChiu@users.noreply.github.com> Date: Tue Nov 29 14:45:09 2022 +0800 Feature/add canvas scale control (flux3dp#389) * Add canvas scale control by +- * Add check key + commit 198ec35 Author: GaryChunChiaChiu <106943724+GaryChunChiaChiu@users.noreply.github.com> Date: Tue Nov 29 14:44:03 2022 +0800 Add pdf and ai drop. Fix svg drop size (flux3dp#387) commit b8e3497 Author: GaryChunChiaChiu <106943724+GaryChunChiaChiu@users.noreply.github.com> Date: Tue Nov 29 14:42:11 2022 +0800 Update laser panel min size (flux3dp#388) commit d39ca2b Author: GaryChunChiaChiu <106943724+GaryChunChiaChiu@users.noreply.github.com> Date: Wed Nov 23 16:58:11 2022 +0800 Feature/update UI (flux3dp#386) * Update rotary UI * Fix image line display * Update rotary axis setting UI position * Fix laser UI * Update preset default to 10W * Update type select with dark mode * update border style commit 574f06e Author: Jau-Shiuan(Jason) Shiao <b01901105@ntu.edu.tw> Date: Tue Nov 22 16:43:45 2022 +0800 Feature/adjust style for add layer button (flux3dp#385) * Remove border/shadow from the button * Fixup * Allow Windows to close app for software update * Fixup * resolve warning * Change ed25519 signing key for macOS sparkle update * Resolve duplicate macro define * Change appcast url * Allow no secondary executable (e.g. crashpad_handler) when codesign the app * Sign the built dmg * Prevent unexpected trigger of github action * Fixup * Fix .dmg path * Try signing for sparkle * Complete most of the steps in appcast.xml generation * test windows * Fixup * Fixup * Fixup * Add artifact upload
GaryChunChiaChiu
pushed a commit
that referenced
this pull request
Jan 6, 2023
… auto update with sparkle framework. (#401) * Restrict the dependency for potrace to QxPotrace lib only * Conan with CMake (tested with Windows) * Fixup * Fixup * Add conanfile.py for libpotrace * test * test * try * try * try * try * try * try * try * fix * try * try * Fix * try * fix * try * fixup * fixup * Fixup * test * fixup * test * try deploy * Local windows runner * handle poppler, cairo and glib packages with vcpkg * Fixup * FIXUP * Use command prompt * fixup * fixup * add sentry * Manage sentry-native (with crashpad_handler) with vcpkg * Test sentry upload debug file * fixup * Fixup * fixup * Remove unused file * Ignore conan for macOS * Update README.md * Update README.md * Update README.md * fixup * fixup * Add winsparkle * Add WinSparkle library with vcpkg. Add check update function for Windows. * Modify Check for updates button text * Fix incorrect version string * Support Sparkle framework for macOS. Use cmake generated files. * Fixup * Try conan with cmake * fallback conan handling * test * test build * enable sparkle * fixup * fixup * test * test * Fix pacakge manager problems * restrict vcpkg packages on x64 windows platfomr * try * FIXUP * Fixup * Fix settings var missing * Fixup * fixup * Fix icon * Fix sparkle for macOS * Refine app bundle for macOS with cmake * Refine GitHub workflow action for building macOS app bundle * Squashed commit of the following: commit 0430756 Merge: 5b4a49b a6e86f1 Author: Jau-Shiuan(Jason) Shiao <b01901105@ntu.edu.tw> Date: Thu Dec 29 00:11:04 2022 +0800 Merge pull request #400 from flux3dp/release/v1.1.2 Release/v1.1.2 commit a6e86f1 Author: GaryChunChiaChiu <gary@flux3dp.com> Date: Tue Dec 27 17:38:20 2022 +0800 Change Single Layer to RejectRole for msgbox close commit 304eb32 Author: Jason Shiao <b01901105@ntu.edu.tw> Date: Tue Dec 27 16:29:33 2022 +0800 Fix type cast compiler error commit f0f6003 Author: GaryChunChiaChiu <gary@flux3dp.com> Date: Mon Dec 26 16:49:01 2022 +0800 Remove old code commit 565ca09 Author: GaryChunChiaChiu <gary@flux3dp.com> Date: Mon Dec 26 16:44:57 2022 +0800 Version update commit b9ff01f Author: GaryChunChiaChiu <gary@flux3dp.com> Date: Mon Dec 26 16:44:35 2022 +0800 Fix select when open dxf commit 5b4a49b Author: GaryChunChiaChiu <106943724+GaryChunChiaChiu@users.noreply.github.com> Date: Mon Dec 26 15:54:26 2022 +0800 Bug/fix dxf reader (#393) * test input info * Check layer when add shpae * Add dxf block * Add dxf insert and check addLWPolyline * Add insert and update but still wait to remove some shape over range * Add LWPolyline to generate arc * Remove rs_handle * Add file to read dxf(by LibreCAD) * Add include for M_PI info * Fix emit * Fix bug * Fix arc and spline * Add ellopse * Fix ellipse and move dxf to 0 when open file * Remove log * Fix open chinese name file sometimes crash * Fix drop file for dxf * Refine QMessageBox button handling * Fix typo * Fix typo * Fix typo Co-authored-by: Jason Shiao <b01901105@ntu.edu.tw> commit 7c802b4 Author: GaryChunChiaChiu <106943724+GaryChunChiaChiu@users.noreply.github.com> Date: Mon Dec 26 13:53:01 2022 +0800 Add link to design market (#396) commit 02cdb0f Author: GaryChunChiaChiu <106943724+GaryChunChiaChiu@users.noreply.github.com> Date: Mon Dec 19 14:29:55 2022 +0800 Add machine width protect when read jason and setting by machine manager (#395) commit 0ed47ed Author: GaryChunChiaChiu <106943724+GaryChunChiaChiu@users.noreply.github.com> Date: Fri Dec 16 16:23:05 2022 +0800 Enable about to link git (#394) commit 91685e5 Author: GaryChunChiaChiu <106943724+GaryChunChiaChiu@users.noreply.github.com> Date: Tue Dec 6 11:37:50 2022 +0800 Feature/fix reader file name check (#390) * Add check file extension with uppercase * test to pass dxf file name by QString * Add define to test wstring * To use wstring in windows os * copy by char array * use toLocal8Bit to pass char data commit 255c6a9 Author: GaryChunChiaChiu <106943724+GaryChunChiaChiu@users.noreply.github.com> Date: Tue Nov 29 14:45:09 2022 +0800 Feature/add canvas scale control (#389) * Add canvas scale control by +- * Add check key + commit 198ec35 Author: GaryChunChiaChiu <106943724+GaryChunChiaChiu@users.noreply.github.com> Date: Tue Nov 29 14:44:03 2022 +0800 Add pdf and ai drop. Fix svg drop size (#387) commit b8e3497 Author: GaryChunChiaChiu <106943724+GaryChunChiaChiu@users.noreply.github.com> Date: Tue Nov 29 14:42:11 2022 +0800 Update laser panel min size (#388) commit d39ca2b Author: GaryChunChiaChiu <106943724+GaryChunChiaChiu@users.noreply.github.com> Date: Wed Nov 23 16:58:11 2022 +0800 Feature/update UI (#386) * Update rotary UI * Fix image line display * Update rotary axis setting UI position * Fix laser UI * Update preset default to 10W * Update type select with dark mode * update border style commit 574f06e Author: Jau-Shiuan(Jason) Shiao <b01901105@ntu.edu.tw> Date: Tue Nov 22 16:43:45 2022 +0800 Feature/adjust style for add layer button (#385) * Remove border/shadow from the button * Fixup * Allow Windows to close app for software update * Fixup * resolve warning * Change ed25519 signing key for macOS sparkle update * Resolve duplicate macro define * Change appcast url * Allow no secondary executable (e.g. crashpad_handler) when codesign the app * Sign the built dmg * Prevent unexpected trigger of github action * Fixup * Fix .dmg path * Generate appcast.xml with github workflow Fixup * Fix Chinese language for software update dialog * Fix QMake Fix qmake * Add translations
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Adjust the style of add layer button
Fixes # (issue)
Type of change
Please delete options that are not relevant.
How Has This Been Tested?
Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration