From a07e2bedad912d541c03f02478abdbbfb133d79c Mon Sep 17 00:00:00 2001 From: Zwarf Date: Mon, 13 Nov 2023 14:50:04 +0100 Subject: [PATCH] Fix issues which came in by the merges. Delete unnecessary files --- copyright | 9 ++------- data/icons/map-symbolic.svg | 2 -- data/icons/meson.build | 8 -------- data/icons/view-sidebar-start-symbolic.svg | 8 -------- src/calculations/calculations_transformations.c | 2 +- src/picplanner.gresource.xml | 2 -- src/time-picker/time-picker.c | 9 --------- src/window/overview-page/overview-view.c | 2 +- 8 files changed, 4 insertions(+), 38 deletions(-) delete mode 100644 data/icons/map-symbolic.svg delete mode 100644 data/icons/view-sidebar-start-symbolic.svg diff --git a/copyright b/copyright index ded606f..44f5fa2 100644 --- a/copyright +++ b/copyright @@ -1,6 +1,6 @@ Files: * Copyright: - 2020-2022 Zwarf + 2020-2023 Zwarf License: GPL-3+ Files: @@ -24,9 +24,4 @@ Files: data/icons/milky-way-color.svg Copyright: 2022 Rajdeep Singha -License: GPL-3+ - -Files: - data/icons/map-symbolic.svg -Copyright: GNOME -License: GPL-3+ +License: GPL-3+ \ No newline at end of file diff --git a/data/icons/map-symbolic.svg b/data/icons/map-symbolic.svg deleted file mode 100644 index 53fee3e..0000000 --- a/data/icons/map-symbolic.svg +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/data/icons/meson.build b/data/icons/meson.build index b44b0d5..14e3c04 100644 --- a/data/icons/meson.build +++ b/data/icons/meson.build @@ -51,12 +51,4 @@ install_data( install_data( 'elevation-symbolic.svg', install_dir: join_paths(get_option('datadir'), 'icons') -) -install_data( - 'map-symbolic.svg', - install_dir: join_paths(get_option('datadir'), 'icons') -) -install_data( - 'view-sidebar-start-symbolic.svg', - install_dir: join_paths(get_option('datadir'), 'icons') ) \ No newline at end of file diff --git a/data/icons/view-sidebar-start-symbolic.svg b/data/icons/view-sidebar-start-symbolic.svg deleted file mode 100644 index 2d8bbec..0000000 --- a/data/icons/view-sidebar-start-symbolic.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/src/calculations/calculations_transformations.c b/src/calculations/calculations_transformations.c index ee3b912..770fdea 100644 --- a/src/calculations/calculations_transformations.c +++ b/src/calculations/calculations_transformations.c @@ -193,7 +193,7 @@ double y = cos (declination) * sin (time_sidereal - right_ascension); - azimuth = atan2 (y, x); + azimuth = atan2 (-y, -x); elevation = asin (sin (latitude) * sin (declination) + cos (latitude) * cos (declination) * cos (time_sidereal - right_ascension)); diff --git a/src/picplanner.gresource.xml b/src/picplanner.gresource.xml index 6ba2c34..3e99ef0 100644 --- a/src/picplanner.gresource.xml +++ b/src/picplanner.gresource.xml @@ -20,7 +20,5 @@ ../data/icons/milky-way-symbolic.svg ../data/icons/azimuth-symbolic.svg ../data/icons/elevation-symbolic.svg - ../data/icons/map-symbolic.svg - ../data/icons/view-sidebar-start-symbolic.svg diff --git a/src/time-picker/time-picker.c b/src/time-picker/time-picker.c index dc59425..48078e6 100644 --- a/src/time-picker/time-picker.c +++ b/src/time-picker/time-picker.c @@ -168,7 +168,6 @@ day_selected (GtkCalendar *self, TimePicker *time_picker) { g_autoptr (GDateTime) date_selected = NULL; - GtkPopover *popover; g_autofree char *button_text = NULL; (void) self; @@ -184,14 +183,6 @@ day_selected (GtkCalendar *self, gtk_menu_button_set_label (GTK_MENU_BUTTON (time_picker->calendar_button), button_text); - /* - * Close Popover after the day was selected - * TODO: Popdown happens automatically if a month is chosen which has less days then - * the day number previously selected. - */ - popover = GTK_POPOVER(time_picker->calendar_popover); - gtk_popover_popdown (popover); - input_changed (GTK_WIDGET (self), time_picker); } diff --git a/src/window/overview-page/overview-view.c b/src/window/overview-page/overview-view.c index 038010b..f93bd46 100644 --- a/src/window/overview-page/overview-view.c +++ b/src/window/overview-page/overview-view.c @@ -92,7 +92,7 @@ G_DEFINE_TYPE (PicplannerOverview, picplanner_overview, GTK_TYPE_BOX) * picplanner-window to change the stack page. */ static guint signal_button_pressed; -void +static void change_stack_page (GtkButton *self, gpointer user_data) {