Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes issues with Godot 3.4.4 in Windows, adds the option to start the week on monday #10

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fixes issues with Godot 3.4.4 in Windows, adds the option to start the week on monday #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
482455b
fix(backend): Renamed class files
pablojimenezmateo Jun 7, 2022
eb06315
feat(backend): Removes an image warning
pablojimenezmateo Jun 7, 2022
4ba2d41
feat(all): We can now choose if the week stars in monday
pablojimenezmateo Jun 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions addons/calendar_button/class/Calendar.gd → addons/calendar_button/class/calendar.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,12 @@ const MONTH_NAME = [

const WEEKDAY_NAME = [
"Sunday", "Monday", "Tuesday", "Wednesday",
"Thursday", "Friday", "Saturday" ]
"Thursday", "Friday", "Saturday", "Sunday" ]

var week_starts_on_sunday : bool

func _init(var week_starts_on_sunday : bool):
self.week_starts_on_sunday = week_starts_on_sunday

func get_days_in_month(month : int, year : int) -> int:
var number_of_days : int
Expand All @@ -36,7 +41,7 @@ func get_weekday(day : int, month : int, year : int) -> int:

func get_weekday_name(day : int, month : int, year : int) -> String:
var day_num = get_weekday(day, month, year)
return WEEKDAY_NAME[day_num]
return WEEKDAY_NAME[day_num + int(!week_starts_on_sunday)]

func get_month_name(month : int) -> String:
return MONTH_NAME[month - 1]
Expand Down
0 addons/calendar_button/class/Date.gd → addons/calendar_button/class/date.gd
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion addons/calendar_button/plugin.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
name="Calendar Button"
description="Calendar Button plugin is a CalendarButton node that will display a popup window for selecting a date in an easy and efficient way."
author="Ivan Skodje"
version="2.0.0"
version="2.1.0"
script="calendar_button.gd"
14 changes: 7 additions & 7 deletions addons/calendar_button/popup.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,53 +77,53 @@ margin_bottom = 57.0
custom_constants/hseparation = 10
columns = 7

[node name="label_sunday" type="Label" parent="PanelContainer/vbox/hbox_label_days"]
[node name="label_first" type="Label" parent="PanelContainer/vbox/hbox_label_days"]
margin_right = 30.0
margin_bottom = 15.0
rect_min_size = Vector2( 30, 15 )
text = "Sun"
align = 1

[node name="label_monday" type="Label" parent="PanelContainer/vbox/hbox_label_days"]
[node name="label_second" type="Label" parent="PanelContainer/vbox/hbox_label_days"]
margin_left = 40.0
margin_right = 70.0
margin_bottom = 15.0
rect_min_size = Vector2( 30, 15 )
text = "Mon"
align = 1

[node name="label_thuesday" type="Label" parent="PanelContainer/vbox/hbox_label_days"]
[node name="label_third" type="Label" parent="PanelContainer/vbox/hbox_label_days"]
margin_left = 80.0
margin_right = 103.0
margin_bottom = 14.0
text = "Tue"
align = 1

[node name="label_wednesday" type="Label" parent="PanelContainer/vbox/hbox_label_days"]
[node name="label_fourth" type="Label" parent="PanelContainer/vbox/hbox_label_days"]
margin_left = 113.0
margin_right = 143.0
margin_bottom = 15.0
rect_min_size = Vector2( 30, 15 )
text = "Wed"
align = 1

[node name="label_thursday" type="Label" parent="PanelContainer/vbox/hbox_label_days"]
[node name="label_fifth" type="Label" parent="PanelContainer/vbox/hbox_label_days"]
margin_left = 153.0
margin_right = 183.0
margin_bottom = 15.0
rect_min_size = Vector2( 30, 15 )
text = "Thu"
align = 1

[node name="label_friday" type="Label" parent="PanelContainer/vbox/hbox_label_days"]
[node name="label_sixth" type="Label" parent="PanelContainer/vbox/hbox_label_days"]
margin_left = 193.0
margin_right = 223.0
margin_bottom = 15.0
rect_min_size = Vector2( 30, 15 )
text = "Fri"
align = 1

[node name="label_saturday" type="Label" parent="PanelContainer/vbox/hbox_label_days"]
[node name="label_seventh" type="Label" parent="PanelContainer/vbox/hbox_label_days"]
margin_left = 233.0
margin_right = 252.0
margin_bottom = 14.0
Expand Down
11 changes: 8 additions & 3 deletions addons/calendar_button/scripts/calendar_buttons.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
class_name CalendarButtons

const BUTTONS_COUNT = 42
var calendar = load("res://addons/calendar_button/class/calendar.gd").new()
var calendar : Calendar
var buttons_container : GridContainer
var week_starts_on_sunday : bool

func _init(var calendar_script, var buttons_container : GridContainer):
func _init(var calendar_script, var buttons_container : GridContainer, var calendar : Calendar, var week_starts_on_sunday : bool):
self.buttons_container = buttons_container
self.calendar = calendar
self.week_starts_on_sunday = week_starts_on_sunday
setup_button_signals(calendar_script)

func setup_button_signals(var calendar_script):
Expand All @@ -17,7 +20,9 @@ func update_calendar_buttons(var selected_date : Date):
_clear_calendar_buttons()

var days_in_month : int = calendar.get_days_in_month(selected_date.month(), selected_date.year())
var start_day_of_week : int = calendar.get_weekday(1, selected_date.month(), selected_date.year())

var start_day_of_week : int = calendar.get_weekday(int(week_starts_on_sunday), selected_date.month(), selected_date.year())

for i in range(days_in_month):
var btn_node : Button = buttons_container.get_node("btn_" + str(i + start_day_of_week))
btn_node.set_text(str(i + 1))
Expand Down
36 changes: 22 additions & 14 deletions addons/calendar_button/scripts/calendar_script.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
tool
extends TextureButton

export var week_starts_on_sunday = true

signal date_selected(date_obj)

var calendar := Calendar.new()
var calendar := Calendar.new(week_starts_on_sunday)
var selected_date := Date.new()
var window_restrictor := WindowRestrictor.new()

Expand All @@ -17,27 +19,18 @@ func _enter_tree():
calendar_buttons = create_calendar_buttons()
setup_month_and_year_signals(popup)
refresh_data()
setup_day_labels()

func setup_calendar_icon():
var normal_texture := create_button_texture("btn_32x32_03.png")
set_normal_texture(normal_texture)

var pressed_texture := create_button_texture("btn_32x32_04.png")
set_pressed_texture(pressed_texture)

func create_button_texture(var image_name : String) -> ImageTexture:
var image_normal := Image.new()
image_normal.load("res://addons/calendar_button/btn_img/" + image_name)
var image_texture_normal := ImageTexture.new()
image_texture_normal.create_from_image(image_normal)
return image_texture_normal
texture_normal = load("res://addons/calendar_button/btn_img/btn_32x32_03.png")
texture_pressed = load("res://addons/calendar_button/btn_img/btn_32x32_04.png")

func create_popup_scene() -> Popup:
return preload("res://addons/calendar_button/popup.tscn").instance() as Popup

func create_calendar_buttons() -> CalendarButtons:
var calendar_container : GridContainer = popup.get_node("PanelContainer/vbox/hbox_days")
return CalendarButtons.new(self, calendar_container)
return CalendarButtons.new(self, calendar_container, calendar, week_starts_on_sunday)

func setup_month_and_year_signals(popup : Popup):
var month_year_path = "PanelContainer/vbox/hbox_month_year/"
Expand All @@ -46,6 +39,21 @@ func setup_month_and_year_signals(popup : Popup):
popup.get_node(month_year_path + "button_prev_year").connect("pressed",self,"go_prev_year")
popup.get_node(month_year_path + "button_next_year").connect("pressed",self,"go_next_year")

func setup_day_labels():

var hbox_label_days = "PanelContainer/vbox/hbox_label_days/"
var hbox_label_days_node = popup.get_node(hbox_label_days)


var day_index = int(!week_starts_on_sunday) # 1 if starts on monday, 0 on sunday

for day in hbox_label_days_node.get_children():
print(day.get_name(), " ", day.text)

day.text = calendar.WEEKDAY_NAME[day_index].substr(0, 3)

day_index += 1

func set_popup_title(title : String):
var label_month_year_node := popup.get_node("PanelContainer/vbox/hbox_month_year/label_month_year") as Label
label_month_year_node.set_text(title)
Expand Down