snxrzx
/
mkxp-sunshine
mirror of https://forgejo.xatacraft.ru/Sunshine/mkxp-sunshine.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make Journal not create a symlink and instead a .desktop file on select DEs, make Color an array of strings

This commit is contained in:
KockaAdmiralac 2018-08-03 00:25:31 +02:00
parent a59e26595d
commit 5e47258600
No known key found for this signature in database
GPG Key ID: A6007A5107D8CFBD
3 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
binding-mri/wallpaper-binding.cpp
View File

@ -338,11 +338,11 @@ end:
"d.writeConfig(\"Image\", \"file://" << concatPath << "\");" << "d.writeConfig(\"Image\", \"file://" << concatPath << "\");" <<
"d.writeConfig(\"FillMode\", \"6\");" << "d.writeConfig(\"FillMode\", \"6\");" <<
"d.writeConfig(\"Blur\", false);" << "d.writeConfig(\"Blur\", false);" <<
"d.writeConfig(\"Color\", \"" << "d.writeConfig(\"Color\", [\"" <<
std::to_string((color >> 16) & 0xFF) << "," << std::to_string((color >> 16) & 0xFF) << "\", \"" <<
std::to_string((color >> 8) & 0xFF) << "," << std::to_string((color >> 8) & 0xFF) << "\", \"" <<
std::to_string(color & 0xFF) << std::to_string(color & 0xFF) <<
"\");" << "\"]);" <<
"}" << "}" <<
"'"; "'";
Debug() << "Wallpaper command:" << command.str(); Debug() << "Wallpaper command:" << command.str();
@ -458,7 +458,7 @@ RB_METHOD(wallpaperReset)
"d.writeConfig(\"Image\", dat.picture);" << "d.writeConfig(\"Image\", dat.picture);" <<
"}" << "}" <<
"if (dat.color) {" << "if (dat.color) {" <<
"d.writeConfig(\"Color\", dat.color);" << "d.writeConfig(\"Color\", dat.color.split(\",\"));" <<
"}" << "}" <<
"if (dat.mode) {" << "if (dat.mode) {" <<
"d.writeConfig(\"FillMode\", dat.mode);" << "d.writeConfig(\"FillMode\", dat.mode);" <<

BIN
journal/unix/images/icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 22 KiB

18
scripts/Script.rb
View File

@ -2,6 +2,8 @@ PROTO_TEXT = "put me in the big portal"
CEDRIC_TEXT = "put me in the big portal" CEDRIC_TEXT = "put me in the big portal"
RUE_TEXT = "put me in the big portal" RUE_TEXT = "put me in the big portal"
SUPPORTED_DE = ["cinnamon", "gnome", "mate", "kde", "xfce"]
module Script module Script
def self.px def self.px
logpos($game_player.x, $game_player.real_x, $game_player.direction == 6) logpos($game_player.x, $game_player.real_x, $game_player.direction == 6)
@ -385,7 +387,21 @@ module Script
end end
end end
else else
File.symlink Dir.pwd + "/" + Oneshot::JOURNAL, Oneshot::GAME_PATH + "/Oneshot/" + Oneshot::JOURNAL if Oneshot::OS == "linux" and SUPPORTED_DE.include? Oneshot::DE
path = Oneshot::GAME_PATH + "/Oneshot/" + Oneshot::JOURNAL + ".desktop"
File.open(path, "wb") do |output|
output.write("[Desktop Entry]\n")
output.write("Comment=...\n")
output.write("Terminal=false\n")
output.write("Name=_______\n")
output.write("Exec=#{Dir.pwd}/#{Oneshot::JOURNAL}\n")
output.write("Type=Application\n")
output.write("Icon=#{Dir.pwd}/images/icon.png\n")
end
FileUtils.chmod 0777 path
else
File.symlink Dir.pwd + "/" + Oneshot::JOURNAL, Oneshot::GAME_PATH + "/Oneshot/" + Oneshot::JOURNAL
end
end end
rescue Errno::EACCES => e rescue Errno::EACCES => e
#this probably means the clover.exe already exists and is running, so no need to create it again #this probably means the clover.exe already exists and is running, so no need to create it again