Skip to content

Commit 753ecc1

Browse files
change default config
1 parent cdfcccd commit 753ecc1

File tree

2 files changed

+31
-47
lines changed

2 files changed

+31
-47
lines changed

awesomeshot

+19-26
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
# Copyright (c) 2021 - 2022 xShin
77

8-
version=1.1.1
8+
version=1.1.3
99

1010
XDG_CONFIG_HOME=${XDG_CONFIG_HOME:-${HOME}/.config}
1111
config_file="${XDG_CONFIG_HOME}/awesomeshot/awesomeshot.conf"
@@ -49,6 +49,9 @@ hex_color=(
4949
"#282C34" # black-gray
5050
"#333333" # gray
5151
"#A8D7FE" # blue sky
52+
"#6D6B70" # another gray
53+
"#726A7B" # slate gray
54+
"#A2AAAD"
5255
)
5356
5457
# This variable serves to convert title bar when editing the image, change this value
@@ -84,7 +87,7 @@ convert_titlebar_text="yes"
8487
# This variable serves to set titlebar text, if you want to use icon
8588
# you can search on Nerd Fonts Website (https://www.nerdfonts.com/cheat-sheet)
8689
# NOTE: if you use icon from Nerd Fonts, make sure "titlebar_text_font" using nerd fonts to!
87-
titlebar_text="גּ awesomeshot"
90+
titlebar_text="Awesomeshot"
8891
8992
# This variable serves to set text position of titlebar text, the value contain 8 wind direction:
9093
# - NorthWest
@@ -99,11 +102,11 @@ titlebar_text="גּ awesomeshot"
99102
titlebar_text_position="north"
100103
101104
# This variable serves to set font size
102-
titlebar_text_size="35"
105+
titlebar_text_size="30"
103106
104107
# This variable serves to set the text color, if you want to custom the color, you can
105108
# change this value with hex color or use the one in the array list.
106-
titlebar_text_color="${hex_color[0]}"
109+
titlebar_text_color="${hex_color[5]}"
107110
108111
# This variable serves to set titlebar text background color (background text), change this value
109112
# to "none" for transparent background, if you want to custom the color, you can
@@ -113,10 +116,11 @@ titlebar_text_background="none"
113116
# This variable serves to set the font used when converting, you can check the list font
114117
# available to use for ImageMagick by command:
115118
# - magick convert -list font | grep -iE 'font:.*'
116-
titlebar_text_font="JetBrains-Mono-Medium-Nerd-Font-Complete"
119+
#titlebar_text_font="JetBrains-Mono-Medium-Nerd-Font-Complete"
120+
titlebar_text_font="Falling-Sky"
117121
118122
# This variable serves to set position of "X" and "Y" titlebar text
119-
titlebar_text_xy="+0+5"
123+
titlebar_text_xy="+0+7"
120124
121125
# This variable serves to convert rounded corner, change this value
122126
# to blank or whatever for disable convert and "yes" for enable function
@@ -127,29 +131,16 @@ border_radius=20
127131
128132
# This variable serves to convert tiny first border (background image) when editing the image,
129133
# change this value to blank or whatever for disable convert and "yes" for enable function
130-
convert_first_border=""
134+
convert_first_border="yes"
131135
132136
# This variable serves to set tiny first border color (background image), change this value
133137
# to "none" for transparent background, if you want to custom the color, you can
134138
# change this value with hex color or use the one in the array list.
135-
first_border_color="${hex_color[0]}"
139+
first_border_color="${hex_color[5]}"
136140
137141
# This variable serves to set how many size of the first border
138142
# NOTE: make sure this value is small, otherwise it will look weird
139-
first_border_size=7
140-
141-
# This variable serves to convert tiny first border (background image) when editing the image,
142-
# change this value to blank or whatever for disable convert and "yes" for enable function
143-
convert_first_border=""
144-
145-
# This variable serves to set tiny first border color (background image), change this value
146-
# to "none" for transparent background, if you want to custom the color, you can
147-
# change this value with hex color or use the one in the array list.
148-
first_border_color="${hex_color[0]}"
149-
150-
# This variable serves to set how many size of the first border
151-
# NOTE: make sure this value is small, otherwise it will look weird
152-
first_border_size=7
143+
first_border_size=3
153144
154145
# This variable serves to convert border (background image) when editing the image,
155146
# change this value to blank or whatever for disable convert and "yes" for enable function
@@ -303,11 +294,13 @@ function generateDefaultConfig() {
303294
}
304295

305296
function header() {
306-
printf "\n\n %-18s\n\n" "AWESOMESHOT v${version}"
297+
printf "\n\n %-18s\n" "AWESOMESHOT v${version}"
307298
}
308299

309300
function title() {
301+
echo ""
310302
printf "\n\b\r\033[2K***${1}\n" | sed 's/*/ /g'
303+
echo ""
311304
}
312305

313306
function subtitle() {
@@ -328,7 +321,7 @@ function check() {
328321
fi
329322
}
330323

331-
function run () {
324+
function run() {
332325
if [ "${convert_to_png}" == "yes" ]; then
333326
convertToPng
334327
fi
@@ -373,6 +366,7 @@ function run () {
373366
fi
374367

375368
termux-media-scan "${file_name}" &> /dev/null
369+
376370
termux-toast -b "${hex_color[0]}" -c "${hex_color[1]}" -g top "${file_name}"
377371
termux-notification --action "termux-open '${file_name}'" --icon "camera_enhance" \
378372
--image-path "${file_name}" --priority "high" --title "📸 Awesomeshot v${version}"
@@ -882,8 +876,7 @@ case "${1}" in
882876
;;
883877
-m|--manual )
884878
if [ ${2} ]; then
885-
getPwd
886-
file_name="${pwd}/${2}"
879+
file_name="${2}"
887880
main manualRun
888881
else
889882
echo ""

awesomeshot.conf

+12-21
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ hex_color=(
2525
"#282C34" # black-gray
2626
"#333333" # gray
2727
"#A8D7FE" # blue sky
28+
"#6D6B70" # another gray
29+
"#726A7B" # slate gray
30+
"#A2AAAD"
2831
)
2932

3033
# This variable serves to convert title bar when editing the image, change this value
@@ -60,7 +63,7 @@ convert_titlebar_text="yes"
6063
# This variable serves to set titlebar text, if you want to use icon
6164
# you can search on Nerd Fonts Website (https://www.nerdfonts.com/cheat-sheet)
6265
# NOTE: if you use icon from Nerd Fonts, make sure "titlebar_text_font" using nerd fonts to!
63-
titlebar_text="גּ awesomeshot"
66+
titlebar_text="Awesomeshot"
6467

6568
# This variable serves to set text position of titlebar text, the value contain 8 wind direction:
6669
# - NorthWest
@@ -75,11 +78,11 @@ titlebar_text="גּ awesomeshot"
7578
titlebar_text_position="north"
7679

7780
# This variable serves to set font size
78-
titlebar_text_size="35"
81+
titlebar_text_size="30"
7982

8083
# This variable serves to set the text color, if you want to custom the color, you can
8184
# change this value with hex color or use the one in the array list.
82-
titlebar_text_color="${hex_color[0]}"
85+
titlebar_text_color="${hex_color[5]}"
8386

8487
# This variable serves to set titlebar text background color (background text), change this value
8588
# to "none" for transparent background, if you want to custom the color, you can
@@ -89,10 +92,11 @@ titlebar_text_background="none"
8992
# This variable serves to set the font used when converting, you can check the list font
9093
# available to use for ImageMagick by command:
9194
# - magick convert -list font | grep -iE 'font:.*'
92-
titlebar_text_font="JetBrains-Mono-Medium-Nerd-Font-Complete"
95+
#titlebar_text_font="JetBrains-Mono-Medium-Nerd-Font-Complete"
96+
titlebar_text_font="Falling-Sky"
9397

9498
# This variable serves to set position of "X" and "Y" titlebar text
95-
titlebar_text_xy="+0+5"
99+
titlebar_text_xy="+0+7"
96100

97101
# This variable serves to convert rounded corner, change this value
98102
# to blank or whatever for disable convert and "yes" for enable function
@@ -103,29 +107,16 @@ border_radius=20
103107

104108
# This variable serves to convert tiny first border (background image) when editing the image,
105109
# change this value to blank or whatever for disable convert and "yes" for enable function
106-
convert_first_border=""
110+
convert_first_border="yes"
107111

108112
# This variable serves to set tiny first border color (background image), change this value
109113
# to "none" for transparent background, if you want to custom the color, you can
110114
# change this value with hex color or use the one in the array list.
111-
first_border_color="${hex_color[0]}"
115+
first_border_color="${hex_color[5]}"
112116

113117
# This variable serves to set how many size of the first border
114118
# NOTE: make sure this value is small, otherwise it will look weird
115-
first_border_size=7
116-
117-
# This variable serves to convert tiny first border (background image) when editing the image,
118-
# change this value to blank or whatever for disable convert and "yes" for enable function
119-
convert_first_border=""
120-
121-
# This variable serves to set tiny first border color (background image), change this value
122-
# to "none" for transparent background, if you want to custom the color, you can
123-
# change this value with hex color or use the one in the array list.
124-
first_border_color="${hex_color[0]}"
125-
126-
# This variable serves to set how many size of the first border
127-
# NOTE: make sure this value is small, otherwise it will look weird
128-
first_border_size=7
119+
first_border_size=3
129120

130121
# This variable serves to convert border (background image) when editing the image,
131122
# change this value to blank or whatever for disable convert and "yes" for enable function

0 commit comments

Comments
 (0)