From 9b50d065d9e075abe4b5cd04ccfdf65ccc775bc8 Mon Sep 17 00:00:00 2001 From: Michel Mastriani Date: Mon, 24 Jul 2023 21:28:36 -0300 Subject: [PATCH 1/2] =?UTF-8?q?--Bug=20fixes=C2=A0-Error=20when=20saving?= =?UTF-8?q?=20screen=20on=20macOS=20at=20first=20time.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Source/Fractorium/FractoriumSettings.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Source/Fractorium/FractoriumSettings.cpp b/Source/Fractorium/FractoriumSettings.cpp index df0947b..8952650 100644 --- a/Source/Fractorium/FractoriumSettings.cpp +++ b/Source/Fractorium/FractoriumSettings.cpp @@ -86,7 +86,11 @@ void FractoriumSettings::EnsureDefaults() OpenImageExt("*.png"); if (SaveImageExt() == "") - SaveImageExt(".png"); +#ifndef __APPLE__ + SaveImageExt(".png"); +#else + SaveImageExt("Png (*.png)"); +#endif if (FinalExt() != "jpg" && FinalExt() != "png" && FinalExt() != "exr" #ifdef _WIN32 From 640944f60fb4dc1b1423bfca0330c9fdcdfec980 Mon Sep 17 00:00:00 2001 From: Michel Mastriani Date: Mon, 24 Jul 2023 22:20:53 -0300 Subject: [PATCH 2/2] =?UTF-8?q?--Bug=20fixes=C2=A0-fractorium-sh=20was=20c?= =?UTF-8?q?onverted=20to=20windows=20format=20and=20someone=20changed=20qs?= =?UTF-8?q?s=20file=20location.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Data/fractorium-sh | 46 ++++++++++++++++----------------- Source/Fractorium/QssDialog.cpp | 2 +- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/Data/fractorium-sh b/Data/fractorium-sh index 63cff6e..2d4b9c1 100644 --- a/Data/fractorium-sh +++ b/Data/fractorium-sh @@ -1,23 +1,23 @@ -#!/bin/bash - -CONFIG_PATH=~/.config/fractorium -DARK_MAC=~/.config/fractorium/dark_mac.qss -LIGHT_DARK=~/.config/fractorium/lightdark.qss -URANIUM=~/.config/fractorium/uranium.qss - -#./fractorium - -if [ ! -e "$DARK_LINUX" ] ; then - mkdir -p $CONFIG_PATH - cp dark_mac.qss $CONFIG_PATH -fi - -if [ ! -e "$LIGHT_DARK" ] ; then - mkdir -p $CONFIG_PATH - cp lightdark.qss $CONFIG_PATH -fi - -if [ ! -e "$URANIUM" ] ; then - mkdir -p $CONFIG_PATH - cp uranium.qss $CONFIG_PATH -fi +#!/bin/bash + +CONFIG_PATH=~/.config/fractorium +DARK_MAC=~/.config/fractorium/dark_mac.qss +LIGHT_DARK=~/.config/fractorium/lightdark.qss +URANIUM=~/.config/fractorium/uranium.qss + +#./fractorium + +if [ ! -e "$DARK_LINUX" ] ; then + mkdir -p $CONFIG_PATH + cp dark_mac.qss $CONFIG_PATH +fi + +if [ ! -e "$LIGHT_DARK" ] ; then + mkdir -p $CONFIG_PATH + cp lightdark.qss $CONFIG_PATH +fi + +if [ ! -e "$URANIUM" ] ; then + mkdir -p $CONFIG_PATH + cp uranium.qss $CONFIG_PATH +fi diff --git a/Source/Fractorium/QssDialog.cpp b/Source/Fractorium/QssDialog.cpp index d3f0065..7fb867e 100644 --- a/Source/Fractorium/QssDialog.cpp +++ b/Source/Fractorium/QssDialog.cpp @@ -666,7 +666,7 @@ QString QssDialog::OpenFile() return !filenames.empty() ? filenames[0] : ""; #else - auto filename = QFileDialog::getOpenFileName(this, tr("Open Stylesheet"), /*m_Parent->m_SettingsPath*/ "./", tr("Qss (*.qss)")); + auto filename = QFileDialog::getOpenFileName(this, tr("Open Stylesheet"), m_Parent->m_SettingsPath, tr("Qss (*.qss)")); return filename.size() > 0 ? filename : ""; #endif }