mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-08 07:27:41 -06:00
Minor fixes continued
This commit is contained in:
parent
17811c997b
commit
ea46af82d6
3 changed files with 6 additions and 13 deletions
2
.github/workflows/build_orca.yml
vendored
2
.github/workflows/build_orca.yml
vendored
|
@ -133,7 +133,7 @@ jobs:
|
||||||
|
|
||||||
# Thanks to RaySajuuk, it's working now
|
# Thanks to RaySajuuk, it's working now
|
||||||
- name: Notarize the app
|
- name: Notarize the app
|
||||||
if: matrix.os == 'macos-12'
|
if: github.ref == 'refs/heads/main' && matrix.os == 'macos-12'
|
||||||
working-directory: ${{ github.workspace }}
|
working-directory: ${{ github.workspace }}
|
||||||
run: |
|
run: |
|
||||||
xcrun notarytool store-credentials "notarytool-profile" --apple-id "${{ secrets.APPLE_DEV_ACCOUNT }}" --team-id "${{ secrets.TEAM_ID }}" --password "${{ secrets.APP_PWD }}"
|
xcrun notarytool store-credentials "notarytool-profile" --apple-id "${{ secrets.APPLE_DEV_ACCOUNT }}" --team-id "${{ secrets.TEAM_ID }}" --password "${{ secrets.APP_PWD }}"
|
||||||
|
|
|
@ -4467,17 +4467,7 @@ std::string GUI_App::format_display_version()
|
||||||
{
|
{
|
||||||
if (!version_display.empty()) return version_display;
|
if (!version_display.empty()) return version_display;
|
||||||
|
|
||||||
auto version_text = std::string(SLIC3R_VERSION);
|
version_display = SoftFever_VERSION;
|
||||||
int len = version_text.length();
|
|
||||||
for (int i = 0, j = 0; i < len; ++i) {
|
|
||||||
if (!(version_text[i] == '0' && j == 0))
|
|
||||||
version_display += version_text[i];
|
|
||||||
|
|
||||||
if (version_text[i] == '.')
|
|
||||||
j = 0;
|
|
||||||
else
|
|
||||||
++j;
|
|
||||||
}
|
|
||||||
return version_display;
|
return version_display;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -4626,6 +4616,9 @@ void GUI_App::sync_preset(Preset* preset)
|
||||||
|
|
||||||
void GUI_App::start_sync_user_preset(bool with_progress_dlg)
|
void GUI_App::start_sync_user_preset(bool with_progress_dlg)
|
||||||
{
|
{
|
||||||
|
if (app_config->get("stealth_mode") == "true")
|
||||||
|
return;
|
||||||
|
|
||||||
if (!m_agent || !m_agent->is_user_login()) return;
|
if (!m_agent || !m_agent->is_user_login()) return;
|
||||||
|
|
||||||
// has already start sync
|
// has already start sync
|
||||||
|
|
|
@ -5,7 +5,7 @@ set(SLIC3R_APP_NAME "OrcaSlicer")
|
||||||
set(SLIC3R_APP_KEY "OrcaSlicer")
|
set(SLIC3R_APP_KEY "OrcaSlicer")
|
||||||
|
|
||||||
if(NOT DEFINED BBL_RELEASE_TO_PUBLIC)
|
if(NOT DEFINED BBL_RELEASE_TO_PUBLIC)
|
||||||
set(BBL_RELEASE_TO_PUBLIC "0")
|
set(BBL_RELEASE_TO_PUBLIC "1")
|
||||||
endif()
|
endif()
|
||||||
if(NOT DEFINED BBL_INTERNAL_TESTING)
|
if(NOT DEFINED BBL_INTERNAL_TESTING)
|
||||||
set(BBL_INTERNAL_TESTING "1")
|
set(BBL_INTERNAL_TESTING "1")
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue