mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-02-01 10:30:08 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merged in master (pull request #68)

Browse Source 
--Bug fixes -Error when saving screen on macOS at first time.

Approved-by: Matt Feemster
This commit is contained in:
Michel Mastriani 2023-07-25 02:26:17 +00:00 committed by Matt Feemster
commit d629c629e5
3 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
Data/fractorium-sh
View File

@ -1,23 +1,23 @@
#!/bin/bash #!/bin/bash
CONFIG_PATH=~/.config/fractorium CONFIG_PATH=~/.config/fractorium
DARK_MAC=~/.config/fractorium/dark_mac.qss DARK_MAC=~/.config/fractorium/dark_mac.qss
LIGHT_DARK=~/.config/fractorium/lightdark.qss LIGHT_DARK=~/.config/fractorium/lightdark.qss
URANIUM=~/.config/fractorium/uranium.qss URANIUM=~/.config/fractorium/uranium.qss
#./fractorium #./fractorium
if [ ! -e "$DARK_LINUX" ] ; then if [ ! -e "$DARK_LINUX" ] ; then
mkdir -p $CONFIG_PATH mkdir -p $CONFIG_PATH
cp dark_mac.qss $CONFIG_PATH cp dark_mac.qss $CONFIG_PATH
fi fi
if [ ! -e "$LIGHT_DARK" ] ; then if [ ! -e "$LIGHT_DARK" ] ; then
mkdir -p $CONFIG_PATH mkdir -p $CONFIG_PATH
cp lightdark.qss $CONFIG_PATH cp lightdark.qss $CONFIG_PATH
fi fi
if [ ! -e "$URANIUM" ] ; then if [ ! -e "$URANIUM" ] ; then
mkdir -p $CONFIG_PATH mkdir -p $CONFIG_PATH
cp uranium.qss $CONFIG_PATH cp uranium.qss $CONFIG_PATH
fi fi

6
Source/Fractorium/FractoriumSettings.cpp
View File

@ -86,7 +86,11 @@ void FractoriumSettings::EnsureDefaults()
OpenImageExt("*.png"); OpenImageExt("*.png");
if (SaveImageExt() == "") if (SaveImageExt() == "")
SaveImageExt(".png"); #ifndef __APPLE__
SaveImageExt(".png");
#else
SaveImageExt("Png (*.png)");
#endif
if (FinalExt() != "jpg" && FinalExt() != "png" && FinalExt() != "exr" if (FinalExt() != "jpg" && FinalExt() != "png" && FinalExt() != "exr"
#ifdef _WIN32 #ifdef _WIN32

2
Source/Fractorium/QssDialog.cpp
View File

@ -666,7 +666,7 @@ QString QssDialog::OpenFile()
return !filenames.empty() ? filenames[0] : ""; return !filenames.empty() ? filenames[0] : "";
#else #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 : ""; return filename.size() > 0 ? filename : "";
#endif #endif
} }