refacor media widget, apply clang format rule
This commit is contained in:
34
.clang-tidy
Normal file
34
.clang-tidy
Normal file
@@ -0,0 +1,34 @@
|
||||
Checks: 'clang-analyzer-*,cppcoreguidelines-*,modernize-*,-modernize-use-trailing-return-type'
|
||||
WarningsAsErrors: true
|
||||
HeaderFilterRegex: ''
|
||||
FormatStyle: google
|
||||
CheckOptions:
|
||||
- key: cert-dcl16-c.NewSuffixes
|
||||
value: 'L;LL;LU;LLU'
|
||||
- key: cert-oop54-cpp.WarnOnlyIfThisHasSuspiciousField
|
||||
value: '0'
|
||||
- key: cppcoreguidelines-explicit-virtual-functions.IgnoreDestructors
|
||||
value: '1'
|
||||
- key: cppcoreguidelines-non-private-member-variables-in-classes.IgnoreClassesWithAllMemberVariablesBeingPublic
|
||||
value: '1'
|
||||
- key: google-readability-braces-around-statements.ShortStatementLines
|
||||
value: '1'
|
||||
- key: google-readability-function-size.StatementThreshold
|
||||
value: '800'
|
||||
- key: google-readability-namespace-comments.ShortNamespaceLines
|
||||
value: '10'
|
||||
- key: google-readability-namespace-comments.SpacesBeforeComments
|
||||
value: '2'
|
||||
- key: modernize-loop-convert.MaxCopySize
|
||||
value: '16'
|
||||
- key: modernize-loop-convert.MinConfidence
|
||||
value: reasonable
|
||||
- key: modernize-loop-convert.NamingStyle
|
||||
value: CamelCase
|
||||
- key: modernize-pass-by-value.IncludeStyle
|
||||
value: llvm
|
||||
- key: modernize-replace-auto-ptr.IncludeStyle
|
||||
value: llvm
|
||||
- key: modernize-use-nullptr.NullMacros
|
||||
value: 'NULL'
|
||||
|
||||
@@ -39,6 +39,7 @@ target_sources(bar_lib
|
||||
|
||||
src/bar/bar.cpp
|
||||
|
||||
src/components/mediaPlayer.cpp
|
||||
src/components/button/iconButton.cpp
|
||||
src/components/button/textButton.cpp
|
||||
src/components/button/tabButton.cpp
|
||||
@@ -54,21 +55,22 @@ target_sources(bar_lib
|
||||
src/widgets/notification/copyNotification.cpp
|
||||
src/widgets/notification/notificationWindow.cpp
|
||||
src/widgets/notification/spotifyNotification.cpp
|
||||
src/widgets/controlCenter/controlCenter.cpp
|
||||
src/widgets/controlCenter/mediaWidget.cpp
|
||||
src/widgets/volumeWidget.cpp
|
||||
src/widgets/weather.cpp
|
||||
src/widgets/webWidget.cpp
|
||||
src/widgets/tray.cpp
|
||||
|
||||
src/services/hyprland.cpp
|
||||
src/services/notificationController.cpp
|
||||
src/services/textureCache.cpp
|
||||
|
||||
src/widgets/tray.cpp
|
||||
src/widgets/controlCenter/controlCenter.cpp
|
||||
src/widgets/controlCenter/mediaControl.cpp
|
||||
|
||||
src/components/popover.cpp
|
||||
src/components/workspaceIndicator.cpp
|
||||
)
|
||||
|
||||
include_directories(bar_lib PRIVATE
|
||||
include
|
||||
)
|
||||
|
||||
@@ -3,9 +3,9 @@
|
||||
#include <vector>
|
||||
|
||||
#include "bar/bar.hpp"
|
||||
#include "services/hyprland.hpp"
|
||||
#include "connection/dbus/notification.hpp"
|
||||
#include "connection/dbus/tray.hpp"
|
||||
#include "services/hyprland.hpp"
|
||||
|
||||
#include "glibmm/refptr.h"
|
||||
#include "gtkmm/application.h"
|
||||
|
||||
@@ -6,11 +6,11 @@
|
||||
|
||||
#include "components/button/iconButton.hpp"
|
||||
#include "widgets/clock.hpp"
|
||||
#include "widgets/controlCenter/controlCenter.hpp"
|
||||
#include "widgets/date.hpp"
|
||||
#include "widgets/tray.hpp"
|
||||
#include "widgets/volumeWidget.hpp"
|
||||
#include "widgets/webWidget.hpp"
|
||||
#include "widgets/controlCenter/controlCenter.hpp"
|
||||
|
||||
class Bar : public Gtk::Window {
|
||||
public:
|
||||
@@ -29,12 +29,11 @@ class Bar : public Gtk::Window {
|
||||
Clock clock;
|
||||
Date date;
|
||||
WebWidget homeAssistant{Icon::HOME_ASSISTANT, "Home Assistant", "https://home.rivercry.com"};
|
||||
ControlCenter controlCenter{Icon::CONTROL_CENTER, "Control Center"};
|
||||
ControlCenter controlCenter{Icon::MENU, "Control Center"};
|
||||
|
||||
std::shared_ptr<TrayWidget> trayWidget = nullptr;
|
||||
std::shared_ptr<VolumeWidget> volumeWidget = nullptr;
|
||||
|
||||
|
||||
void setup_ui();
|
||||
void setup_left_box();
|
||||
void setup_center_box();
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
#pragma once
|
||||
|
||||
|
||||
|
||||
#include <string>
|
||||
|
||||
#include "gtkmm/button.h"
|
||||
|
||||
@@ -1,18 +1,17 @@
|
||||
#pragma once
|
||||
#include "components/button/iconButton.hpp"
|
||||
#include "connection/dbus/mpris.hpp"
|
||||
|
||||
#include "gtkmm/box.h"
|
||||
#include "gtkmm/button.h"
|
||||
#include "gtkmm/label.h"
|
||||
#include "gtkmm/overlay.h"
|
||||
#include "gtkmm/picture.h"
|
||||
#include "gtkmm/scale.h"
|
||||
#include "gtkmm/scrolledwindow.h"
|
||||
|
||||
#include "components/button/iconButton.hpp"
|
||||
#include "connection/dbus/mpris.hpp"
|
||||
|
||||
class MediaControlWidget : public Gtk::Box {
|
||||
class MediaPlayer : public Gtk::Box {
|
||||
public:
|
||||
explicit MediaControlWidget(std::shared_ptr<MprisController> controller);
|
||||
explicit MediaPlayer(std::shared_ptr<MprisController> controller);
|
||||
|
||||
private:
|
||||
std::shared_ptr<MprisController> mprisController;
|
||||
@@ -32,8 +31,6 @@ class MediaControlWidget : public Gtk::Box {
|
||||
void schedulePauseAfterSeek();
|
||||
void setCanSeek(bool can_seek);
|
||||
|
||||
Gtk::Box spotifyContainer;
|
||||
|
||||
// image as background, artist, title
|
||||
Gtk::Overlay topContainer;
|
||||
Gtk::Picture backgroundImage;
|
||||
@@ -3,6 +3,7 @@
|
||||
#include <gtkmm/button.h>
|
||||
#include <gtkmm/popover.h>
|
||||
#include <string>
|
||||
|
||||
#include "components/button/iconButton.hpp"
|
||||
#include "components/button/textButton.hpp"
|
||||
|
||||
|
||||
1
include/components/tab.hpp
Normal file
1
include/components/tab.hpp
Normal file
@@ -0,0 +1 @@
|
||||
#pragma once
|
||||
@@ -4,12 +4,10 @@
|
||||
#include <string>
|
||||
|
||||
class Icon {
|
||||
|
||||
public:
|
||||
enum Type {
|
||||
|
||||
HOME_ASSISTANT,
|
||||
CONTROL_CENTER,
|
||||
MENU,
|
||||
|
||||
SKIP_PREVIOUS,
|
||||
SKIP_NEXT,
|
||||
@@ -22,6 +20,8 @@ class Icon {
|
||||
|
||||
SAVE,
|
||||
CONTENT_COPY,
|
||||
|
||||
TOKEN,
|
||||
};
|
||||
|
||||
static const std::string toString(Type type) {
|
||||
@@ -31,7 +31,7 @@ class Icon {
|
||||
private:
|
||||
static inline std::map<Type, const std::string> typeToString = {
|
||||
{HOME_ASSISTANT, "\uf024"},
|
||||
{CONTROL_CENTER, "\ue062"},
|
||||
{MENU, "\ue5d2"},
|
||||
|
||||
{SKIP_PREVIOUS, "\ue045"},
|
||||
{SKIP_NEXT, "\ue044"},
|
||||
@@ -44,5 +44,7 @@ class Icon {
|
||||
|
||||
{SAVE, "\ue161"},
|
||||
{CONTENT_COPY, "\ue14d"},
|
||||
|
||||
{TOKEN, "\uea25"},
|
||||
};
|
||||
};
|
||||
@@ -8,7 +8,6 @@
|
||||
|
||||
class WorkspaceIndicator : public Gtk::Box {
|
||||
public:
|
||||
|
||||
enum InidicatorState {
|
||||
EMPTY,
|
||||
ALIVE,
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
#include <string>
|
||||
#include <sys/types.h>
|
||||
#include <vector>
|
||||
|
||||
#include "gdkmm/pixbuf.h"
|
||||
#include "glibmm/variant.h"
|
||||
|
||||
@@ -38,7 +39,7 @@ struct NotifyMessage {
|
||||
NotificationUrgency urgency = NORMAL;
|
||||
int32_t expire_timeout;
|
||||
// Callback to invoke when an action is triggered
|
||||
std::function<void(const std::string& action_id)> on_action;
|
||||
std::function<void(const std::string &action_id)> on_action;
|
||||
// Guard to prevent multiple action invocations across mirrors
|
||||
std::shared_ptr<bool> actionInvoked;
|
||||
// image data (if any) from dbus
|
||||
|
||||
@@ -2,9 +2,10 @@
|
||||
|
||||
#include <cstdint>
|
||||
#include <giomm.h>
|
||||
#include <sigc++/sigc++.h>
|
||||
#include <set>
|
||||
#include <sigc++/sigc++.h>
|
||||
#include <vector>
|
||||
|
||||
#include "connection/dbus/dbus.hpp"
|
||||
#include "connection/dbus/messages.hpp"
|
||||
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
#include <sigc++/sigc++.h>
|
||||
|
||||
#include "connection/dbus/dbus.hpp"
|
||||
|
||||
#include "giomm/dbusconnection.h"
|
||||
#include "giomm/dbusownname.h"
|
||||
#include "glib.h"
|
||||
|
||||
@@ -19,6 +19,7 @@
|
||||
|
||||
class TrayService : public DbusConnection {
|
||||
inline static TrayService *instance = nullptr;
|
||||
|
||||
public:
|
||||
struct Item {
|
||||
std::string id;
|
||||
|
||||
@@ -1,17 +1,17 @@
|
||||
#pragma once
|
||||
|
||||
#include <array>
|
||||
#include <cstdio>
|
||||
#include <memory>
|
||||
#include <stdexcept>
|
||||
#include <string>
|
||||
#include <cstdio>
|
||||
|
||||
class CommandHelper {
|
||||
public:
|
||||
static std::string exec(const char *cmd) {
|
||||
std::array<char, 128> buffer;
|
||||
std::string result;
|
||||
std::unique_ptr<FILE, int(*)(FILE*)> pipe(popen(cmd, "r"), pclose);
|
||||
std::unique_ptr<FILE, int (*)(FILE *)> pipe(popen(cmd, "r"), pclose);
|
||||
if (!pipe) {
|
||||
throw std::runtime_error("popen() failed!");
|
||||
}
|
||||
|
||||
@@ -3,9 +3,8 @@
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
|
||||
class StringHelper {
|
||||
public:
|
||||
public:
|
||||
static std::vector<std::string> split(const std::string &input, char delimiter) {
|
||||
std::vector<std::string> tokens;
|
||||
std::string token;
|
||||
|
||||
0
include/services/timeSignal.hpp
Normal file
0
include/services/timeSignal.hpp
Normal file
@@ -6,8 +6,6 @@
|
||||
|
||||
#include "components/base/button.hpp"
|
||||
|
||||
|
||||
|
||||
class BluetoothEntry : Gtk::Box {
|
||||
public:
|
||||
BluetoothEntry(std::string name, std::string address) {
|
||||
@@ -38,7 +36,6 @@ class BluetoothEntry : Gtk::Box {
|
||||
sigc::signal<void(std::string)> connect_clicked;
|
||||
};
|
||||
|
||||
|
||||
class BluetoothWidget : public Gtk::Box {
|
||||
public:
|
||||
BluetoothWidget();
|
||||
|
||||
@@ -1,16 +1,16 @@
|
||||
#pragma once
|
||||
|
||||
#include <memory>
|
||||
|
||||
#include "components/button/iconButton.hpp"
|
||||
#include "components/button/tabButton.hpp"
|
||||
#include "components/popover.hpp"
|
||||
#include "widgets/controlCenter/mediaWidget.hpp"
|
||||
#include "widgets/weather.hpp"
|
||||
|
||||
#include "gtkmm/box.h"
|
||||
#include "gtkmm/scrolledwindow.h"
|
||||
#include "gtkmm/stack.h"
|
||||
#include "widgets/controlCenter/mediaControl.hpp"
|
||||
#include "widgets/weather.hpp"
|
||||
|
||||
#include <memory>
|
||||
#include <unordered_map>
|
||||
|
||||
class ControlCenter : public Popover {
|
||||
public:
|
||||
@@ -18,18 +18,19 @@ class ControlCenter : public Popover {
|
||||
|
||||
private:
|
||||
Gtk::ScrolledWindow scrollview;
|
||||
|
||||
Gtk::Box container;
|
||||
Gtk::Box tabRow;
|
||||
Gtk::Stack contentStack;
|
||||
Gtk::Box controlCenterContainer;
|
||||
WeatherWidget weatherWidget;
|
||||
std::unique_ptr<TabButton> mediaControl;
|
||||
std::unique_ptr<TabButton> testTabButton;
|
||||
std::shared_ptr<MprisController> mprisController = MprisController::getInstance();
|
||||
std::unordered_map<std::string, MediaControlWidget*> mediaWidgets;
|
||||
|
||||
std::unique_ptr<TabButton> mediaTabButton;
|
||||
std::unique_ptr<TabButton> infoTabButton;
|
||||
std::unique_ptr<TabButton> timerButton;
|
||||
|
||||
std::unique_ptr<WeatherWidget> weatherWidget;
|
||||
std::unique_ptr<MediaWidget> mediaControlWidget;
|
||||
|
||||
void addPlayerWidget(const std::string &bus_name);
|
||||
void removePlayerWidget(const std::string &bus_name);
|
||||
void setActiveTab(const std::string &tab_name);
|
||||
|
||||
};
|
||||
24
include/widgets/controlCenter/mediaWidget.hpp
Normal file
24
include/widgets/controlCenter/mediaWidget.hpp
Normal file
@@ -0,0 +1,24 @@
|
||||
#pragma once
|
||||
|
||||
#include "components/mediaPlayer.hpp"
|
||||
#include <map>
|
||||
#include <memory>
|
||||
#include <string>
|
||||
|
||||
#include "connection/dbus/mpris.hpp"
|
||||
|
||||
#include "gtkmm/box.h"
|
||||
|
||||
class MediaWidget : public Gtk::Box {
|
||||
public:
|
||||
MediaWidget();
|
||||
|
||||
private:
|
||||
Gtk::Box container;
|
||||
|
||||
std::shared_ptr<MprisController> mprisController = MprisController::getInstance();
|
||||
void addPlayerWidget(const std::string &bus_name);
|
||||
void removePlayerWidget(const std::string &bus_name);
|
||||
|
||||
std::map<std::string, std::unique_ptr<MediaPlayer>> mediaWidgets;
|
||||
};
|
||||
@@ -1,12 +1,10 @@
|
||||
#pragma once
|
||||
|
||||
#include <chrono>
|
||||
#include <csignal>
|
||||
#include <cstdint>
|
||||
#include <sigc++/connection.h>
|
||||
|
||||
#include "gdkmm/monitor.h"
|
||||
#include "gtkmm/scrolledwindow.h"
|
||||
#include "gtkmm/window.h"
|
||||
|
||||
#define DEFAULT_NOTIFICATION_TIMEOUT 6700
|
||||
@@ -19,11 +17,9 @@ class BaseNotification : public Gtk::Window {
|
||||
void resumeAutoClose();
|
||||
void startAutoClose(int timeoutMs);
|
||||
|
||||
sigc::signal<void(int)> signal_close;
|
||||
sigc::signal<void(uint64_t)> signal_close;
|
||||
sigc::signal<void(bool)> signal_hover_changed;
|
||||
|
||||
virtual ~BaseNotification() = default;
|
||||
|
||||
uint64_t getNotificationId() const {
|
||||
return this->notificationId;
|
||||
}
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
|
||||
#include "connection/dbus/messages.hpp"
|
||||
#include "widgets/notification/baseNotification.hpp"
|
||||
|
||||
#include "gtkmm/box.h"
|
||||
|
||||
class CopyNotification : public BaseNotification {
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <cstdint>
|
||||
|
||||
#include "connection/dbus/messages.hpp"
|
||||
#include "widgets/notification/baseNotification.hpp"
|
||||
|
||||
@@ -9,5 +10,4 @@ class NotificationWindow : public BaseNotification {
|
||||
public:
|
||||
NotificationWindow(uint64_t notificationId, std::shared_ptr<Gdk::Monitor> monitor, NotifyMessage message);
|
||||
virtual ~NotificationWindow() = default;
|
||||
|
||||
};
|
||||
|
||||
@@ -7,18 +7,16 @@
|
||||
:root {
|
||||
--icon-font-material: "Material Icons", sans-serif;
|
||||
--icon-font-awesome: "Font Awesome 7 Free", sans-serif;
|
||||
--text-font: "Hack Nerd Font Mono", sans-serif;
|
||||
--text-font: "Hack Nerd Font", sans-serif;
|
||||
--text-font-mono: "Hack Nerd Font Mono", monospace;
|
||||
}
|
||||
|
||||
window {
|
||||
background-color: #191919c6;
|
||||
color: #ffffff;
|
||||
padding-left: 4px;
|
||||
padding-right: 4px;
|
||||
padding-bottom: 2px;
|
||||
font-size: 14px;
|
||||
font-family: var(--text-font);
|
||||
padding: 2px 6px;
|
||||
}
|
||||
|
||||
.material-icons {
|
||||
@@ -26,20 +24,16 @@ window {
|
||||
}
|
||||
|
||||
.icon-button {
|
||||
font-size: 16px;
|
||||
font-size: 20px;
|
||||
}
|
||||
|
||||
.tab-icon {
|
||||
font-size: 20px;
|
||||
margin-right: 6px;
|
||||
border-radius: 4px;
|
||||
border: 1px solid transparent;
|
||||
padding: 2px 4px;
|
||||
}
|
||||
|
||||
.control-center-tab-row {
|
||||
background-color: rgba(50, 50, 50, 0.8);
|
||||
border-radius: 8px;
|
||||
border-radius: 4px;
|
||||
padding: 2px 4px;
|
||||
margin-bottom: 4px;
|
||||
}
|
||||
@@ -54,25 +48,24 @@ window {
|
||||
popover {
|
||||
margin-top: 4px;
|
||||
font-family: var(--text-font);
|
||||
border-radius: 8px;
|
||||
border-radius: 4px;
|
||||
|
||||
background: rgba(25, 25, 25, 0.8);
|
||||
box-shadow: 0 4px 30px rgba(0, 0, 0, 0.1);
|
||||
border: 1px solid rgba(57, 57, 57, 0.71);
|
||||
font-size: 14px;
|
||||
}
|
||||
|
||||
.control-center-popover {
|
||||
background-color: rgba(35, 35, 35, 0.95);
|
||||
padding: 12px;
|
||||
padding-top : 6px;
|
||||
border-radius: 8px;
|
||||
border-radius: 4px;
|
||||
box-shadow: 0 4px 30px rgba(0, 0, 0, 0.3);
|
||||
border: 1px solid rgba(57, 57, 57, 0.8);
|
||||
}
|
||||
|
||||
.control-center-player-container {
|
||||
border-radius: 8px;
|
||||
border-radius: 4px;
|
||||
background: rgba(35, 35, 35, 0.95);
|
||||
margin-bottom: 6px;
|
||||
}
|
||||
@@ -131,11 +124,10 @@ tooltip {
|
||||
font-size: 12px;
|
||||
}
|
||||
|
||||
button {
|
||||
.button {
|
||||
font-size: 14px;
|
||||
padding: 4px 8px;
|
||||
border-radius: 4px;
|
||||
color: #ffffff;
|
||||
transition:
|
||||
background-color 0.2s,
|
||||
color 0.2s,
|
||||
@@ -157,7 +149,7 @@ button {
|
||||
.workspace-pill {
|
||||
padding: 2px 5px;
|
||||
margin-right: 6px;
|
||||
border-radius: 5px;
|
||||
border-radius: 4px;
|
||||
text-shadow: 0 0 2px #646464;
|
||||
transition:
|
||||
background-color 0.2s,
|
||||
|
||||
@@ -2,8 +2,9 @@
|
||||
|
||||
#include <sigc++/sigc++.h>
|
||||
#include <vector>
|
||||
#include "connection/dbus/notification.hpp"
|
||||
|
||||
#include "connection/dbus/mpris.hpp"
|
||||
#include "connection/dbus/notification.hpp"
|
||||
#include "services/notificationController.hpp"
|
||||
#include "services/textureCache.hpp"
|
||||
|
||||
@@ -26,8 +27,7 @@ App::App() {
|
||||
|
||||
for (guint i = 0; i < monitors->get_n_items(); ++i) {
|
||||
auto monitor = std::dynamic_pointer_cast<Gdk::Monitor>(
|
||||
monitors->get_object(i)
|
||||
);
|
||||
monitors->get_object(i));
|
||||
|
||||
if (monitor) {
|
||||
auto bar = std::make_shared<Bar>(monitor->gobj());
|
||||
@@ -44,7 +44,6 @@ App::App() {
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
app->signal_shutdown().connect([&]() {
|
||||
this->trayService->stop();
|
||||
});
|
||||
|
||||
@@ -43,7 +43,7 @@ Bar::Bar(GdkMonitor *monitor) {
|
||||
date.onUpdate();
|
||||
|
||||
Glib::signal_timeout().connect(sigc::mem_fun(clock, &Clock::onUpdate), 1000);
|
||||
Glib::signal_timeout().connect(sigc::mem_fun(date, &Date::onUpdate), 1000);
|
||||
Glib::signal_timeout().connect(sigc::mem_fun(date, &Date::onUpdate), 1000);
|
||||
}
|
||||
|
||||
void Bar::setup_ui() {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#include "widgets/controlCenter/mediaControl.hpp"
|
||||
#include "components/mediaPlayer.hpp"
|
||||
|
||||
#include "components/button/iconButton.hpp"
|
||||
#include "helpers/string.hpp"
|
||||
@@ -23,10 +23,8 @@ std::string formatTimeUs(int64_t time_us) {
|
||||
}
|
||||
} // namespace
|
||||
|
||||
MediaControlWidget::MediaControlWidget(std::shared_ptr<MprisController> controller)
|
||||
: Gtk::Box(Gtk::Orientation::VERTICAL) {
|
||||
|
||||
this->mprisController = std::move(controller);
|
||||
MediaPlayer::MediaPlayer(std::shared_ptr<MprisController> controller)
|
||||
: Gtk::Box(Gtk::Orientation::VERTICAL), mprisController(controller) {
|
||||
|
||||
this->set_orientation(Gtk::Orientation::VERTICAL);
|
||||
this->set_hexpand(false);
|
||||
@@ -133,7 +131,7 @@ MediaControlWidget::MediaControlWidget(std::shared_ptr<MprisController> controll
|
||||
});
|
||||
|
||||
this->mprisController->signal_mpris_updated().connect(
|
||||
sigc::mem_fun(*this, &MediaControlWidget::onSpotifyMprisUpdated));
|
||||
sigc::mem_fun(*this, &MediaPlayer::onSpotifyMprisUpdated));
|
||||
|
||||
this->mprisController->signal_playback_status_changed().connect(
|
||||
[this](MprisController::PlaybackStatus status) {
|
||||
@@ -158,12 +156,12 @@ MediaControlWidget::MediaControlWidget(std::shared_ptr<MprisController> controll
|
||||
this->resetSeekTimer(0);
|
||||
}
|
||||
|
||||
void MediaControlWidget::setCanSeek(bool can_seek) {
|
||||
void MediaPlayer::setCanSeek(bool can_seek) {
|
||||
this->canSeek = can_seek;
|
||||
this->seekBarContainer.set_visible(can_seek);
|
||||
}
|
||||
|
||||
void MediaControlWidget::onSpotifyMprisUpdated(const MprisPlayer2Message &message) {
|
||||
void MediaPlayer::onSpotifyMprisUpdated(const MprisPlayer2Message &message) {
|
||||
std::string artistText = "Unknown Artist";
|
||||
if (!message.artist.empty()) {
|
||||
artistText = StringHelper::trimToSize(message.artist[0], 30);
|
||||
@@ -191,7 +189,7 @@ void MediaControlWidget::onSpotifyMprisUpdated(const MprisPlayer2Message &messag
|
||||
}
|
||||
}
|
||||
|
||||
void MediaControlWidget::setCurrentPosition(int64_t position_us) {
|
||||
void MediaPlayer::setCurrentPosition(int64_t position_us) {
|
||||
this->currentPositionUs = position_us;
|
||||
this->currentTimeLabel.set_text(formatTimeUs(position_us));
|
||||
if (totalLengthUs > 0) {
|
||||
@@ -202,12 +200,12 @@ void MediaControlWidget::setCurrentPosition(int64_t position_us) {
|
||||
}
|
||||
}
|
||||
|
||||
void MediaControlWidget::setTotalLength(int64_t length_us) {
|
||||
void MediaPlayer::setTotalLength(int64_t length_us) {
|
||||
this->totalLengthUs = length_us;
|
||||
this->totalTimeLabel.set_text(formatTimeUs(length_us));
|
||||
}
|
||||
|
||||
void MediaControlWidget::resetSeekTimer(int64_t start_position_us) {
|
||||
void MediaPlayer::resetSeekTimer(int64_t start_position_us) {
|
||||
if (seekTimerConnection.connected()) {
|
||||
seekTimerConnection.disconnect();
|
||||
}
|
||||
@@ -215,19 +213,20 @@ void MediaControlWidget::resetSeekTimer(int64_t start_position_us) {
|
||||
setCurrentPosition(start_position_us);
|
||||
|
||||
seekTimerConnection = Glib::signal_timeout().connect(
|
||||
sigc::mem_fun(*this, &MediaControlWidget::onSeekTick),
|
||||
sigc::mem_fun(*this, &MediaPlayer::onSeekTick),
|
||||
1000);
|
||||
}
|
||||
|
||||
void MediaControlWidget::schedulePauseAfterSeek() {
|
||||
void MediaPlayer::schedulePauseAfterSeek() {
|
||||
Glib::signal_timeout().connect_once([this]() {
|
||||
if (this->playbackStatus != MprisController::PlaybackStatus::Playing) {
|
||||
this->mprisController->pause();
|
||||
}
|
||||
}, 100);
|
||||
},
|
||||
100);
|
||||
}
|
||||
|
||||
bool MediaControlWidget::onSeekTick() {
|
||||
bool MediaPlayer::onSeekTick() {
|
||||
if (totalLengthUs <= 0) {
|
||||
return true;
|
||||
}
|
||||
@@ -240,7 +239,7 @@ bool MediaControlWidget::onSeekTick() {
|
||||
return true;
|
||||
}
|
||||
|
||||
void MediaControlWidget::onRunningStateChanged(MprisController::PlaybackStatus status) {
|
||||
void MediaPlayer::onRunningStateChanged(MprisController::PlaybackStatus status) {
|
||||
this->playbackStatus = status;
|
||||
switch (status) {
|
||||
case MprisController::PlaybackStatus::Playing:
|
||||
@@ -255,12 +254,12 @@ void MediaControlWidget::onRunningStateChanged(MprisController::PlaybackStatus s
|
||||
}
|
||||
}
|
||||
|
||||
void MediaControlWidget::onPlay() {
|
||||
void MediaPlayer::onPlay() {
|
||||
this->playPauseButton->setIcon(Icon::PAUSE);
|
||||
this->resetSeekTimer(currentPositionUs);
|
||||
}
|
||||
|
||||
void MediaControlWidget::onPause() {
|
||||
void MediaPlayer::onPause() {
|
||||
this->playPauseButton->setIcon(Icon::PLAY_ARROW);
|
||||
|
||||
if (seekTimerConnection.connected()) {
|
||||
@@ -268,7 +267,7 @@ void MediaControlWidget::onPause() {
|
||||
}
|
||||
}
|
||||
|
||||
void MediaControlWidget::onStop() {
|
||||
void MediaPlayer::onStop() {
|
||||
this->playPauseButton->setIcon(Icon::PLAY_ARROW);
|
||||
|
||||
if (seekTimerConnection.connected()) {
|
||||
277
src/components/mediaPlayer.cpp
Normal file
277
src/components/mediaPlayer.cpp
Normal file
@@ -0,0 +1,277 @@
|
||||
#include "components/mediaPlayer.hpp"
|
||||
|
||||
#include "components/button/iconButton.hpp"
|
||||
#include "helpers/string.hpp"
|
||||
#include "services/textureCache.hpp"
|
||||
|
||||
namespace {
|
||||
std::string formatTimeUs(int64_t time_us) {
|
||||
if (time_us < 0) {
|
||||
time_us = 0;
|
||||
}
|
||||
int64_t totalSeconds = time_us / 1000000;
|
||||
int64_t hours = totalSeconds / 3600;
|
||||
int64_t minutes = (totalSeconds / 60) % 60;
|
||||
int64_t seconds = totalSeconds % 60;
|
||||
|
||||
if (hours > 0) {
|
||||
return std::to_string(hours) + ":" +
|
||||
(minutes < 10 ? "0" : "") + std::to_string(minutes) + ":" +
|
||||
(seconds < 10 ? "0" : "") + std::to_string(seconds);
|
||||
}
|
||||
return std::to_string(minutes) + ":" + (seconds < 10 ? "0" : "") + std::to_string(seconds);
|
||||
}
|
||||
} // namespace
|
||||
|
||||
MediaPlayer::MediaPlayer(std::shared_ptr<MprisController> controller)
|
||||
: Gtk::Box(Gtk::Orientation::VERTICAL), mprisController(controller) {
|
||||
|
||||
this->set_orientation(Gtk::Orientation::VERTICAL);
|
||||
this->set_hexpand(false);
|
||||
this->set_vexpand(false);
|
||||
this->add_css_class("control-center-player-container");
|
||||
|
||||
this->append(this->topContainer);
|
||||
this->append(this->seekBarContainer);
|
||||
this->append(this->bottomContainer);
|
||||
|
||||
this->backgroundImage.set_content_fit(Gtk::ContentFit::COVER);
|
||||
this->backgroundImage.set_can_shrink(true);
|
||||
|
||||
this->imageWrapper.set_policy(Gtk::PolicyType::NEVER, Gtk::PolicyType::NEVER);
|
||||
this->imageWrapper.set_child(this->backgroundImage);
|
||||
|
||||
this->topContainer.set_child(this->imageWrapper);
|
||||
|
||||
this->topContainer.set_size_request(-1, 120);
|
||||
this->topContainer.set_vexpand(false);
|
||||
this->topContainer.set_hexpand(true);
|
||||
|
||||
this->infoContainer.set_orientation(Gtk::Orientation::VERTICAL);
|
||||
this->infoContainer.set_valign(Gtk::Align::END);
|
||||
this->infoContainer.set_halign(Gtk::Align::START);
|
||||
this->infoContainer.append(this->artistLabel);
|
||||
this->infoContainer.append(this->titleLabel);
|
||||
this->topContainer.add_overlay(this->infoContainer);
|
||||
|
||||
this->artistLabel.set_halign(Gtk::Align::START);
|
||||
this->titleLabel.set_halign(Gtk::Align::START);
|
||||
|
||||
this->seekBarContainer.set_orientation(Gtk::Orientation::HORIZONTAL);
|
||||
this->seekBarContainer.set_vexpand(false);
|
||||
this->seekBarContainer.set_hexpand(true);
|
||||
this->seekBarContainer.set_halign(Gtk::Align::CENTER);
|
||||
this->seekBarContainer.append(this->currentTimeLabel);
|
||||
this->seekBarContainer.append(this->seekBar);
|
||||
this->seekBarContainer.append(this->totalTimeLabel);
|
||||
this->seekBarContainer.set_visible(true);
|
||||
|
||||
this->currentTimeLabel.set_text("0:00");
|
||||
this->currentTimeLabel.set_halign(Gtk::Align::START);
|
||||
this->totalTimeLabel.set_text("0:00");
|
||||
this->totalTimeLabel.set_halign(Gtk::Align::END);
|
||||
this->seekBar.set_range(0, 100);
|
||||
this->seekBar.set_value(0);
|
||||
this->seekBar.set_orientation(Gtk::Orientation::HORIZONTAL);
|
||||
this->seekBar.set_draw_value(false);
|
||||
this->seekBar.set_hexpand(true);
|
||||
this->seekBar.set_halign(Gtk::Align::CENTER);
|
||||
this->seekBar.add_css_class("control-center-seek-bar");
|
||||
|
||||
this->seekBar.signal_value_changed().connect([this]() {
|
||||
if (this->suppressSeekSignal || this->totalLengthUs <= 0) {
|
||||
return;
|
||||
}
|
||||
double fraction = this->seekBar.get_value() / 100.0;
|
||||
int64_t new_position_us =
|
||||
static_cast<int64_t>(fraction * static_cast<double>(this->totalLengthUs));
|
||||
if (new_position_us == this->currentPositionUs) {
|
||||
return;
|
||||
}
|
||||
if (!this->currentTrackId.empty()) {
|
||||
this->mprisController->set_position(this->currentTrackId, new_position_us);
|
||||
if (this->playbackStatus != MprisController::PlaybackStatus::Playing) {
|
||||
this->schedulePauseAfterSeek();
|
||||
}
|
||||
} else if (this->playbackStatus == MprisController::PlaybackStatus::Playing) {
|
||||
this->mprisController->emit_seeked(new_position_us - this->currentPositionUs); // in us
|
||||
} else {
|
||||
return;
|
||||
}
|
||||
if (this->playbackStatus == MprisController::PlaybackStatus::Playing) {
|
||||
this->resetSeekTimer(new_position_us);
|
||||
} else {
|
||||
this->setCurrentPosition(new_position_us);
|
||||
}
|
||||
});
|
||||
|
||||
this->previousButton = std::make_unique<IconButton>(Icon::SKIP_PREVIOUS);
|
||||
this->playPauseButton = std::make_unique<IconButton>(Icon::PLAY_ARROW);
|
||||
this->nextButton = std::make_unique<IconButton>(Icon::SKIP_NEXT);
|
||||
|
||||
this->bottomContainer.set_orientation(Gtk::Orientation::HORIZONTAL);
|
||||
this->bottomContainer.set_vexpand(false);
|
||||
this->bottomContainer.set_hexpand(false);
|
||||
this->bottomContainer.set_valign(Gtk::Align::START);
|
||||
this->bottomContainer.set_homogeneous(true);
|
||||
this->topContainer.set_vexpand(false);
|
||||
this->topContainer.set_hexpand(true);
|
||||
this->bottomContainer.append(*this->previousButton);
|
||||
this->bottomContainer.append(*this->playPauseButton);
|
||||
this->bottomContainer.append(*this->nextButton);
|
||||
|
||||
this->previousButton->signal_clicked().connect([this]() {
|
||||
this->mprisController->previous_song();
|
||||
});
|
||||
this->playPauseButton->signal_clicked().connect([this]() {
|
||||
this->mprisController->toggle_play();
|
||||
});
|
||||
this->nextButton->signal_clicked().connect([this]() {
|
||||
this->mprisController->next_song();
|
||||
});
|
||||
|
||||
this->mprisController->signal_mpris_updated().connect(
|
||||
sigc::mem_fun(*this, &MediaPlayer::onSpotifyMprisUpdated));
|
||||
|
||||
this->mprisController->signal_playback_status_changed().connect(
|
||||
[this](MprisController::PlaybackStatus status) {
|
||||
this->onRunningStateChanged(status);
|
||||
});
|
||||
|
||||
this->mprisController->signal_playback_position_changed().connect(
|
||||
[this](int64_t position_us) {
|
||||
this->setCurrentPosition(position_us);
|
||||
});
|
||||
|
||||
this->mprisController->signal_can_seek_changed().connect(
|
||||
[this](bool can_seek) {
|
||||
this->setCanSeek(can_seek);
|
||||
});
|
||||
|
||||
this->artistLabel.set_text("Artist Name");
|
||||
this->artistLabel.add_css_class("control-center-player-artist-label");
|
||||
this->titleLabel.set_text("Song Title");
|
||||
this->titleLabel.add_css_class("control-center-player-title-label");
|
||||
|
||||
this->resetSeekTimer(0);
|
||||
}
|
||||
|
||||
void MediaPlayer::setCanSeek(bool can_seek) {
|
||||
this->canSeek = can_seek;
|
||||
this->seekBarContainer.set_visible(can_seek);
|
||||
}
|
||||
|
||||
void MediaPlayer::onSpotifyMprisUpdated(const MprisPlayer2Message &message) {
|
||||
std::string artistText = "Unknown Artist";
|
||||
if (!message.artist.empty()) {
|
||||
artistText = StringHelper::trimToSize(message.artist[0], 30);
|
||||
}
|
||||
this->artistLabel.set_text(artistText);
|
||||
this->titleLabel.set_text(message.title);
|
||||
const bool trackChanged = !this->currentTrackId.empty() && this->currentTrackId != message.track_id;
|
||||
this->currentTrackId = message.track_id;
|
||||
|
||||
if (trackChanged) {
|
||||
this->currentPositionUs = 0;
|
||||
}
|
||||
|
||||
if (auto texture = TextureCacheService::getInstance()->getTexture(message.artwork_url)) {
|
||||
this->backgroundImage.set_paintable(texture);
|
||||
}
|
||||
|
||||
this->setTotalLength(message.length_ms * 1000);
|
||||
this->setCurrentPosition(this->currentPositionUs);
|
||||
|
||||
if (this->playbackStatus == MprisController::PlaybackStatus::Playing) {
|
||||
this->resetSeekTimer(this->currentPositionUs);
|
||||
} else if (seekTimerConnection.connected()) {
|
||||
seekTimerConnection.disconnect();
|
||||
}
|
||||
}
|
||||
|
||||
void MediaPlayer::setCurrentPosition(int64_t position_us) {
|
||||
this->currentPositionUs = position_us;
|
||||
this->currentTimeLabel.set_text(formatTimeUs(position_us));
|
||||
if (totalLengthUs > 0) {
|
||||
double fraction = static_cast<double>(currentPositionUs) / static_cast<double>(totalLengthUs);
|
||||
this->suppressSeekSignal = true;
|
||||
this->seekBar.set_value(fraction * 100);
|
||||
this->suppressSeekSignal = false;
|
||||
}
|
||||
}
|
||||
|
||||
void MediaPlayer::setTotalLength(int64_t length_us) {
|
||||
this->totalLengthUs = length_us;
|
||||
this->totalTimeLabel.set_text(formatTimeUs(length_us));
|
||||
}
|
||||
|
||||
void MediaPlayer::resetSeekTimer(int64_t start_position_us) {
|
||||
if (seekTimerConnection.connected()) {
|
||||
seekTimerConnection.disconnect();
|
||||
}
|
||||
|
||||
setCurrentPosition(start_position_us);
|
||||
|
||||
seekTimerConnection = Glib::signal_timeout().connect(
|
||||
sigc::mem_fun(*this, &MediaPlayer::onSeekTick),
|
||||
1000);
|
||||
}
|
||||
|
||||
void MediaPlayer::schedulePauseAfterSeek() {
|
||||
Glib::signal_timeout().connect_once([this]() {
|
||||
if (this->playbackStatus != MprisController::PlaybackStatus::Playing) {
|
||||
this->mprisController->pause();
|
||||
}
|
||||
},
|
||||
100);
|
||||
}
|
||||
|
||||
bool MediaPlayer::onSeekTick() {
|
||||
if (totalLengthUs <= 0) {
|
||||
return true;
|
||||
}
|
||||
|
||||
int64_t nextPosition = currentPositionUs + 1000000;
|
||||
if (nextPosition > totalLengthUs) {
|
||||
nextPosition = totalLengthUs;
|
||||
}
|
||||
setCurrentPosition(nextPosition);
|
||||
return true;
|
||||
}
|
||||
|
||||
void MediaPlayer::onRunningStateChanged(MprisController::PlaybackStatus status) {
|
||||
this->playbackStatus = status;
|
||||
switch (status) {
|
||||
case MprisController::PlaybackStatus::Playing:
|
||||
this->onPlay();
|
||||
break;
|
||||
case MprisController::PlaybackStatus::Paused:
|
||||
this->onPause();
|
||||
break;
|
||||
case MprisController::PlaybackStatus::Stopped:
|
||||
this->onStop();
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
void MediaPlayer::onPlay() {
|
||||
this->playPauseButton->setIcon(Icon::PAUSE);
|
||||
this->resetSeekTimer(currentPositionUs);
|
||||
}
|
||||
|
||||
void MediaPlayer::onPause() {
|
||||
this->playPauseButton->setIcon(Icon::PLAY_ARROW);
|
||||
|
||||
if (seekTimerConnection.connected()) {
|
||||
seekTimerConnection.disconnect();
|
||||
}
|
||||
}
|
||||
|
||||
void MediaPlayer::onStop() {
|
||||
this->playPauseButton->setIcon(Icon::PLAY_ARROW);
|
||||
|
||||
if (seekTimerConnection.connected()) {
|
||||
seekTimerConnection.disconnect();
|
||||
}
|
||||
this->setCurrentPosition(0);
|
||||
}
|
||||
@@ -1,7 +1,8 @@
|
||||
#include "components/popover.hpp"
|
||||
|
||||
#include "components/button/iconButton.hpp"
|
||||
|
||||
Popover::Popover(Icon::Type icon, std::string name): IconButton(icon) {
|
||||
Popover::Popover(Icon::Type icon, std::string name) : IconButton(icon) {
|
||||
signal_clicked().connect(sigc::mem_fun(*this, &Popover::on_toggle_window));
|
||||
|
||||
set_name(name);
|
||||
|
||||
0
src/components/tab.cpp
Normal file
0
src/components/tab.cpp
Normal file
@@ -398,10 +398,8 @@ void MprisController::set_position(const std::string &track_id, int64_t position
|
||||
}
|
||||
|
||||
try {
|
||||
Glib::VariantContainerBase params = Glib::VariantContainerBase::create_tuple({
|
||||
Glib::Variant<Glib::DBusObjectPathString>::create(track_id),
|
||||
Glib::Variant<gint64>::create(position_us)
|
||||
});
|
||||
Glib::VariantContainerBase params = Glib::VariantContainerBase::create_tuple({Glib::Variant<Glib::DBusObjectPathString>::create(track_id),
|
||||
Glib::Variant<gint64>::create(position_us)});
|
||||
|
||||
m_proxy->call("SetPosition", params);
|
||||
} catch (const Glib::Error &ex) {
|
||||
|
||||
@@ -160,7 +160,7 @@ void NotificationService::handle_notify(const Glib::VariantContainerBase ¶me
|
||||
notify.expire_timeout = expire_timeout;
|
||||
|
||||
guint id = notificationIdCounter++;
|
||||
if (app_name == "image-copy" ) {
|
||||
if (app_name == "image-copy") {
|
||||
NotificationController::getInstance()->showCopyNotification(notify);
|
||||
invocation->return_value(Glib::VariantContainerBase::create_tuple(
|
||||
Glib::Variant<guint>::create(id)));
|
||||
|
||||
@@ -9,8 +9,8 @@
|
||||
#include <giomm/dbusactiongroup.h>
|
||||
#include <giomm/dbusownname.h>
|
||||
#include <giomm/menumodel.h>
|
||||
#include <spdlog/spdlog.h>
|
||||
#include <memory>
|
||||
#include <spdlog/spdlog.h>
|
||||
#include <tuple>
|
||||
#include <vector>
|
||||
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
#include <algorithm>
|
||||
#include <cctype>
|
||||
#include <curl/curl.h>
|
||||
#include <ranges>
|
||||
#include <string>
|
||||
#include <utility>
|
||||
|
||||
@@ -17,8 +18,8 @@ size_t write_to_string(void *contents, size_t size, size_t nmemb, void *userp) {
|
||||
std::string trim(std::string value) {
|
||||
auto not_space = [](unsigned char c) { return std::isspace(c) == 0; };
|
||||
value.erase(value.begin(),
|
||||
std::find_if(value.begin(), value.end(), not_space));
|
||||
value.erase(std::find_if(value.rbegin(), value.rend(), not_space).base(),
|
||||
std::ranges::find_if(value, not_space));
|
||||
value.erase(std::ranges::find_if(std::ranges::reverse_view(value), not_space).base(),
|
||||
value.end());
|
||||
return value;
|
||||
}
|
||||
@@ -38,7 +39,7 @@ size_t header_to_map(char *buffer, size_t size, size_t nitems, void *userdata) {
|
||||
}
|
||||
return total;
|
||||
}
|
||||
}
|
||||
} // namespace
|
||||
|
||||
HttpResponse HttpConnection::get(const std::string &url,
|
||||
const std::map<std::string, std::string> &headers,
|
||||
|
||||
@@ -14,7 +14,6 @@
|
||||
#include "helpers/string.hpp"
|
||||
|
||||
#include "gtkmm/box.h"
|
||||
|
||||
#include "spdlog/spdlog.h"
|
||||
|
||||
HyprlandService::HyprlandService() {
|
||||
|
||||
@@ -66,8 +66,7 @@ std::filesystem::path get_cache_path_for_url(const std::string &url) {
|
||||
|
||||
std::chrono::system_clock::time_point to_system_clock(std::filesystem::file_time_type time) {
|
||||
return std::chrono::time_point_cast<std::chrono::system_clock::duration>(
|
||||
time - std::filesystem::file_time_type::clock::now() + std::chrono::system_clock::now()
|
||||
);
|
||||
time - std::filesystem::file_time_type::clock::now() + std::chrono::system_clock::now());
|
||||
}
|
||||
|
||||
size_t write_to_buffer(void *contents, size_t size, size_t nmemb, void *userp) {
|
||||
|
||||
0
src/services/timeSignal.cpp
Normal file
0
src/services/timeSignal.cpp
Normal file
@@ -1,7 +1,8 @@
|
||||
#include "widgets/controlCenter/controlCenter.hpp"
|
||||
|
||||
#include "components/button/iconButton.hpp"
|
||||
#include "components/button/tabButton.hpp"
|
||||
|
||||
#include "components/mediaPlayer.hpp"
|
||||
|
||||
ControlCenter::ControlCenter(Icon::Type icon, std::string name)
|
||||
: Popover(icon, name) {
|
||||
@@ -10,9 +11,6 @@ ControlCenter::ControlCenter(Icon::Type icon, std::string name)
|
||||
this->container.set_spacing(10);
|
||||
|
||||
this->scrollview.set_child(this->container);
|
||||
this->scrollview.set_min_content_width(220);
|
||||
this->scrollview.set_max_content_width(220);
|
||||
this->scrollview.set_size_request(220, -1);
|
||||
this->scrollview.set_policy(
|
||||
Gtk::PolicyType::NEVER, Gtk::PolicyType::AUTOMATIC);
|
||||
this->scrollview.set_hexpand(false);
|
||||
@@ -26,84 +24,60 @@ ControlCenter::ControlCenter(Icon::Type icon, std::string name)
|
||||
this->tabRow.set_margin_bottom(4);
|
||||
this->tabRow.add_css_class("control-center-tab-row");
|
||||
|
||||
this->mediaControl = std::make_unique<TabButton>(Icon::PLAY_CIRCLE);
|
||||
this->testTabButton = std::make_unique<TabButton>(Icon::EMPTY_DASHBOARD);
|
||||
this->mediaTabButton = std::make_unique<TabButton>(Icon::PLAY_CIRCLE);
|
||||
this->infoTabButton = std::make_unique<TabButton>(Icon::EMPTY_DASHBOARD);
|
||||
this->timerButton = std::make_unique<TabButton>(Icon::TOKEN);
|
||||
|
||||
this->tabRow.append(*this->mediaControl);
|
||||
this->tabRow.append(*this->testTabButton);
|
||||
this->tabRow.append(*this->mediaTabButton);
|
||||
this->tabRow.append(*this->infoTabButton);
|
||||
this->tabRow.append(*this->timerButton);
|
||||
|
||||
this->container.append(this->tabRow);
|
||||
|
||||
this->contentStack.set_hhomogeneous(true);
|
||||
this->contentStack.set_vhomogeneous(false);
|
||||
this->contentStack.set_transition_type(Gtk::StackTransitionType::CROSSFADE);
|
||||
this->contentStack.set_transition_duration(150);
|
||||
|
||||
this->controlCenterContainer.set_orientation(Gtk::Orientation::VERTICAL);
|
||||
this->controlCenterContainer.set_spacing(4);
|
||||
this->mediaControlWidget = std::make_unique<MediaWidget>();
|
||||
|
||||
this->weatherWidget = std::make_unique<WeatherWidget>();
|
||||
|
||||
this->contentStack.add(*this->mediaControlWidget, "controls", "Controls");
|
||||
this->contentStack.add(*this->weatherWidget, "info", "Info");
|
||||
this->contentStack.add(*Gtk::make_managed<Gtk::Label>("Timer"), "timer", "Timer");
|
||||
|
||||
this->contentStack.add(this->controlCenterContainer, "controls", "Controls");
|
||||
this->contentStack.add(this->weatherWidget, "test", "Test");
|
||||
this->contentStack.set_visible_child("controls");
|
||||
this->setActiveTab("controls");
|
||||
this->setActiveTab("info");
|
||||
|
||||
this->container.append(this->contentStack);
|
||||
|
||||
this->mediaControl->signal_clicked().connect([this]() {
|
||||
this->mediaTabButton->signal_clicked().connect([this]() {
|
||||
this->setActiveTab("controls");
|
||||
});
|
||||
|
||||
this->testTabButton->signal_clicked().connect([this]() {
|
||||
this->setActiveTab("test");
|
||||
this->infoTabButton->signal_clicked().connect([this]() {
|
||||
this->setActiveTab("info");
|
||||
});
|
||||
|
||||
this->mprisController->signal_player_registered().connect(
|
||||
[this](const std::string &bus_name) {
|
||||
this->addPlayerWidget(bus_name);
|
||||
this->timerButton->signal_clicked().connect([this]() {
|
||||
this->setActiveTab("timer");
|
||||
});
|
||||
|
||||
this->mprisController->signal_player_deregistered().connect(
|
||||
[this](const std::string &bus_name) {
|
||||
this->removePlayerWidget(bus_name);
|
||||
});
|
||||
|
||||
for (const auto &bus_name : this->mprisController->get_registered_players()) {
|
||||
this->addPlayerWidget(bus_name);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
void ControlCenter::setActiveTab(const std::string &tab_name) {
|
||||
this->contentStack.set_visible_child(tab_name);
|
||||
|
||||
this->mediaControl->setActive(false);
|
||||
this->testTabButton->setActive(false);
|
||||
this->mediaTabButton->setActive(false);
|
||||
this->infoTabButton->setActive(false);
|
||||
this->timerButton->setActive(false);
|
||||
|
||||
if (tab_name == "controls") {
|
||||
this->mediaControl->setActive(true);
|
||||
} else if (tab_name == "test") {
|
||||
this->testTabButton->setActive(true);
|
||||
this->mediaTabButton->setActive(true);
|
||||
} else if (tab_name == "info") {
|
||||
this->infoTabButton->setActive(true);
|
||||
} else if (tab_name == "timer") {
|
||||
this->timerButton->setActive(true);
|
||||
}
|
||||
}
|
||||
|
||||
void ControlCenter::addPlayerWidget(const std::string &bus_name) {
|
||||
if (this->mediaWidgets.find(bus_name) != this->mediaWidgets.end()) {
|
||||
return;
|
||||
}
|
||||
|
||||
auto controller = MprisController::createForPlayer(bus_name);
|
||||
auto widget = Gtk::make_managed<MediaControlWidget>(controller);
|
||||
this->mediaWidgets.emplace(bus_name, widget);
|
||||
this->controlCenterContainer.append(*widget);
|
||||
}
|
||||
|
||||
void ControlCenter::removePlayerWidget(const std::string &bus_name) {
|
||||
auto it = this->mediaWidgets.find(bus_name);
|
||||
if (it == this->mediaWidgets.end()) {
|
||||
return;
|
||||
}
|
||||
|
||||
this->controlCenterContainer.remove(*it->second);
|
||||
this->mediaWidgets.erase(it);
|
||||
}
|
||||
|
||||
|
||||
50
src/widgets/controlCenter/mediaWidget.cpp
Normal file
50
src/widgets/controlCenter/mediaWidget.cpp
Normal file
@@ -0,0 +1,50 @@
|
||||
#include "widgets/controlCenter/mediaWidget.hpp"
|
||||
|
||||
#include <memory>
|
||||
|
||||
MediaWidget::MediaWidget() : Gtk::Box(Gtk::Orientation::VERTICAL) {
|
||||
this->set_hexpand(true);
|
||||
this->set_vexpand(false);
|
||||
this->add_css_class("control-center-media-widget");
|
||||
this->container.set_orientation(Gtk::Orientation::VERTICAL);
|
||||
this->container.set_hexpand(true);
|
||||
this->container.set_vexpand(false);
|
||||
this->append(this->container);
|
||||
|
||||
this->mprisController->signal_player_registered().connect(
|
||||
[this](const std::string &bus_name) {
|
||||
this->addPlayerWidget(bus_name);
|
||||
});
|
||||
|
||||
this->mprisController->signal_player_deregistered().connect(
|
||||
[this](const std::string &bus_name) {
|
||||
this->removePlayerWidget(bus_name);
|
||||
});
|
||||
|
||||
for (const auto &bus_name : this->mprisController->get_registered_players()) {
|
||||
this->addPlayerWidget(bus_name);
|
||||
}
|
||||
}
|
||||
|
||||
void MediaWidget::addPlayerWidget(const std::string &bus_name) {
|
||||
if (this->mediaWidgets.find(bus_name) != this->mediaWidgets.end()) {
|
||||
return;
|
||||
}
|
||||
|
||||
auto controller = MprisController::createForPlayer(bus_name);
|
||||
auto widget = std::make_unique<MediaPlayer>(controller);
|
||||
|
||||
this->mediaWidgets.emplace(bus_name, std::move(widget));
|
||||
this->container.append(*this->mediaWidgets[bus_name]);
|
||||
}
|
||||
|
||||
void MediaWidget::removePlayerWidget(const std::string &bus_name) {
|
||||
auto it = this->mediaWidgets.find(bus_name);
|
||||
|
||||
if (it == this->mediaWidgets.end()) {
|
||||
return;
|
||||
}
|
||||
|
||||
this->container.remove(*it->second);
|
||||
this->mediaWidgets.erase(it);
|
||||
}
|
||||
@@ -2,6 +2,7 @@
|
||||
|
||||
#include <memory>
|
||||
#include <spdlog/spdlog.h>
|
||||
|
||||
#include "components/button/iconButton.hpp"
|
||||
|
||||
#include "glibmm/datetime.h"
|
||||
@@ -86,7 +87,6 @@ void CopyNotification::createImageNotification(NotifyMessage notify) {
|
||||
auto buttonBox = Gtk::make_managed<Gtk::Box>();
|
||||
buttonBox->set_spacing(10);
|
||||
|
||||
|
||||
auto saveToClipboardButton = Gtk::make_managed<IconButton>(Icon::CONTENT_COPY);
|
||||
saveToClipboardButton->signal_clicked().connect([this]() {
|
||||
copyToClipboard(this->copiedImage);
|
||||
@@ -103,7 +103,7 @@ void CopyNotification::createImageNotification(NotifyMessage notify) {
|
||||
// xdg-pic/screenshot // use env
|
||||
auto xdgPicturesDir = Glib::get_user_special_dir(Glib::UserDirectory::PICTURES);
|
||||
auto dateStamp = Glib::DateTime::create_now_local().format("%Y%m%d_%H%M%S");
|
||||
auto filepath = xdgPicturesDir + "/screenshot" ;
|
||||
auto filepath = xdgPicturesDir + "/screenshot";
|
||||
auto filename = dateStamp + ".png";
|
||||
saveImageToFile(this->copiedImage, filepath, filename);
|
||||
spdlog::info("Saved image to {}", filepath.c_str());
|
||||
@@ -119,7 +119,6 @@ void CopyNotification::createImageNotification(NotifyMessage notify) {
|
||||
contentBox->append(*buttonBox);
|
||||
|
||||
this->mainBox.append(*contentBox);
|
||||
|
||||
}
|
||||
|
||||
void CopyNotification::createTextNotification(NotifyMessage notify) {
|
||||
|
||||
@@ -1,19 +1,18 @@
|
||||
#include "widgets/notification/notificationWindow.hpp"
|
||||
|
||||
#include <cstdint>
|
||||
#include <sys/types.h>
|
||||
#include "components/button/iconButton.hpp"
|
||||
|
||||
#include "components/button/textButton.hpp"
|
||||
#include "helpers/string.hpp"
|
||||
|
||||
#include "gtkmm/box.h"
|
||||
#include "gtkmm/button.h"
|
||||
#include "gtkmm/image.h"
|
||||
#include "gtkmm/label.h"
|
||||
|
||||
NotificationWindow::NotificationWindow(uint64_t notificationId, std::shared_ptr<Gdk::Monitor> monitor, NotifyMessage notify) : BaseNotification(notificationId, monitor) {
|
||||
set_title(notify.summary);
|
||||
|
||||
|
||||
// Main vertical box
|
||||
auto vbox = Gtk::make_managed<Gtk::Box>(Gtk::Orientation::VERTICAL, 8);
|
||||
vbox->set_halign(Gtk::Align::FILL);
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
#include "widgets/notification/spotifyNotification.hpp"
|
||||
|
||||
#include <sys/types.h>
|
||||
|
||||
#include "components/button/iconButton.hpp"
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
#include "widgets/tray.hpp"
|
||||
|
||||
#include <cmath>
|
||||
#include <gdkmm/rectangle.h>
|
||||
#include <gio/gmenu.h>
|
||||
#include <gtk/gtk.h>
|
||||
#include <cmath>
|
||||
#include <graphene.h>
|
||||
#include <utility>
|
||||
#include <gtk/gtk.h>
|
||||
#include <spdlog/spdlog.h>
|
||||
#include <utility>
|
||||
|
||||
namespace {
|
||||
bool is_wayland_display(GtkWidget *widget) {
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
#include "widgets/volumeWidget.hpp"
|
||||
|
||||
#include <cmath>
|
||||
#include <spdlog/spdlog.h>
|
||||
#include <regex>
|
||||
#include <sigc++/functors/mem_fun.h>
|
||||
#include <spdlog/spdlog.h>
|
||||
|
||||
#include "helpers/command.hpp"
|
||||
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
|
||||
#include <gtkmm/label.h>
|
||||
#include <webkit/webkit.h>
|
||||
|
||||
#include "components/button/iconButton.hpp"
|
||||
|
||||
WebWidget::WebWidget(Icon::Type icon, std::string name, std::string url) : Popover(icon, name) {
|
||||
|
||||
580
weather.json
580
weather.json
@@ -1,580 +0,0 @@
|
||||
{
|
||||
"latitude": 49.0,
|
||||
"longitude": 8.4,
|
||||
"generationtime_ms": 0.23317337036132812,
|
||||
"utc_offset_seconds": 3600,
|
||||
"timezone": "Europe/Berlin",
|
||||
"timezone_abbreviation": "GMT+1",
|
||||
"elevation": 122.0,
|
||||
"current_units": {
|
||||
"time": "iso8601",
|
||||
"interval": "seconds",
|
||||
"temperature_2m": "°C"
|
||||
},
|
||||
"current": {
|
||||
"time": "2026-02-03T23:00",
|
||||
"interval": 900,
|
||||
"temperature_2m": -0.7
|
||||
},
|
||||
"hourly_units": {
|
||||
"time": "iso8601",
|
||||
"temperature_2m": "°C",
|
||||
"rain": "mm"
|
||||
},
|
||||
"hourly": {
|
||||
"time": [
|
||||
"2026-02-03T00:00",
|
||||
"2026-02-03T01:00",
|
||||
"2026-02-03T02:00",
|
||||
"2026-02-03T03:00",
|
||||
"2026-02-03T04:00",
|
||||
"2026-02-03T05:00",
|
||||
"2026-02-03T06:00",
|
||||
"2026-02-03T07:00",
|
||||
"2026-02-03T08:00",
|
||||
"2026-02-03T09:00",
|
||||
"2026-02-03T10:00",
|
||||
"2026-02-03T11:00",
|
||||
"2026-02-03T12:00",
|
||||
"2026-02-03T13:00",
|
||||
"2026-02-03T14:00",
|
||||
"2026-02-03T15:00",
|
||||
"2026-02-03T16:00",
|
||||
"2026-02-03T17:00",
|
||||
"2026-02-03T18:00",
|
||||
"2026-02-03T19:00",
|
||||
"2026-02-03T20:00",
|
||||
"2026-02-03T21:00",
|
||||
"2026-02-03T22:00",
|
||||
"2026-02-03T23:00",
|
||||
"2026-02-04T00:00",
|
||||
"2026-02-04T01:00",
|
||||
"2026-02-04T02:00",
|
||||
"2026-02-04T03:00",
|
||||
"2026-02-04T04:00",
|
||||
"2026-02-04T05:00",
|
||||
"2026-02-04T06:00",
|
||||
"2026-02-04T07:00",
|
||||
"2026-02-04T08:00",
|
||||
"2026-02-04T09:00",
|
||||
"2026-02-04T10:00",
|
||||
"2026-02-04T11:00",
|
||||
"2026-02-04T12:00",
|
||||
"2026-02-04T13:00",
|
||||
"2026-02-04T14:00",
|
||||
"2026-02-04T15:00",
|
||||
"2026-02-04T16:00",
|
||||
"2026-02-04T17:00",
|
||||
"2026-02-04T18:00",
|
||||
"2026-02-04T19:00",
|
||||
"2026-02-04T20:00",
|
||||
"2026-02-04T21:00",
|
||||
"2026-02-04T22:00",
|
||||
"2026-02-04T23:00",
|
||||
"2026-02-05T00:00",
|
||||
"2026-02-05T01:00",
|
||||
"2026-02-05T02:00",
|
||||
"2026-02-05T03:00",
|
||||
"2026-02-05T04:00",
|
||||
"2026-02-05T05:00",
|
||||
"2026-02-05T06:00",
|
||||
"2026-02-05T07:00",
|
||||
"2026-02-05T08:00",
|
||||
"2026-02-05T09:00",
|
||||
"2026-02-05T10:00",
|
||||
"2026-02-05T11:00",
|
||||
"2026-02-05T12:00",
|
||||
"2026-02-05T13:00",
|
||||
"2026-02-05T14:00",
|
||||
"2026-02-05T15:00",
|
||||
"2026-02-05T16:00",
|
||||
"2026-02-05T17:00",
|
||||
"2026-02-05T18:00",
|
||||
"2026-02-05T19:00",
|
||||
"2026-02-05T20:00",
|
||||
"2026-02-05T21:00",
|
||||
"2026-02-05T22:00",
|
||||
"2026-02-05T23:00",
|
||||
"2026-02-06T00:00",
|
||||
"2026-02-06T01:00",
|
||||
"2026-02-06T02:00",
|
||||
"2026-02-06T03:00",
|
||||
"2026-02-06T04:00",
|
||||
"2026-02-06T05:00",
|
||||
"2026-02-06T06:00",
|
||||
"2026-02-06T07:00",
|
||||
"2026-02-06T08:00",
|
||||
"2026-02-06T09:00",
|
||||
"2026-02-06T10:00",
|
||||
"2026-02-06T11:00",
|
||||
"2026-02-06T12:00",
|
||||
"2026-02-06T13:00",
|
||||
"2026-02-06T14:00",
|
||||
"2026-02-06T15:00",
|
||||
"2026-02-06T16:00",
|
||||
"2026-02-06T17:00",
|
||||
"2026-02-06T18:00",
|
||||
"2026-02-06T19:00",
|
||||
"2026-02-06T20:00",
|
||||
"2026-02-06T21:00",
|
||||
"2026-02-06T22:00",
|
||||
"2026-02-06T23:00",
|
||||
"2026-02-07T00:00",
|
||||
"2026-02-07T01:00",
|
||||
"2026-02-07T02:00",
|
||||
"2026-02-07T03:00",
|
||||
"2026-02-07T04:00",
|
||||
"2026-02-07T05:00",
|
||||
"2026-02-07T06:00",
|
||||
"2026-02-07T07:00",
|
||||
"2026-02-07T08:00",
|
||||
"2026-02-07T09:00",
|
||||
"2026-02-07T10:00",
|
||||
"2026-02-07T11:00",
|
||||
"2026-02-07T12:00",
|
||||
"2026-02-07T13:00",
|
||||
"2026-02-07T14:00",
|
||||
"2026-02-07T15:00",
|
||||
"2026-02-07T16:00",
|
||||
"2026-02-07T17:00",
|
||||
"2026-02-07T18:00",
|
||||
"2026-02-07T19:00",
|
||||
"2026-02-07T20:00",
|
||||
"2026-02-07T21:00",
|
||||
"2026-02-07T22:00",
|
||||
"2026-02-07T23:00",
|
||||
"2026-02-08T00:00",
|
||||
"2026-02-08T01:00",
|
||||
"2026-02-08T02:00",
|
||||
"2026-02-08T03:00",
|
||||
"2026-02-08T04:00",
|
||||
"2026-02-08T05:00",
|
||||
"2026-02-08T06:00",
|
||||
"2026-02-08T07:00",
|
||||
"2026-02-08T08:00",
|
||||
"2026-02-08T09:00",
|
||||
"2026-02-08T10:00",
|
||||
"2026-02-08T11:00",
|
||||
"2026-02-08T12:00",
|
||||
"2026-02-08T13:00",
|
||||
"2026-02-08T14:00",
|
||||
"2026-02-08T15:00",
|
||||
"2026-02-08T16:00",
|
||||
"2026-02-08T17:00",
|
||||
"2026-02-08T18:00",
|
||||
"2026-02-08T19:00",
|
||||
"2026-02-08T20:00",
|
||||
"2026-02-08T21:00",
|
||||
"2026-02-08T22:00",
|
||||
"2026-02-08T23:00",
|
||||
"2026-02-09T00:00",
|
||||
"2026-02-09T01:00",
|
||||
"2026-02-09T02:00",
|
||||
"2026-02-09T03:00",
|
||||
"2026-02-09T04:00",
|
||||
"2026-02-09T05:00",
|
||||
"2026-02-09T06:00",
|
||||
"2026-02-09T07:00",
|
||||
"2026-02-09T08:00",
|
||||
"2026-02-09T09:00",
|
||||
"2026-02-09T10:00",
|
||||
"2026-02-09T11:00",
|
||||
"2026-02-09T12:00",
|
||||
"2026-02-09T13:00",
|
||||
"2026-02-09T14:00",
|
||||
"2026-02-09T15:00",
|
||||
"2026-02-09T16:00",
|
||||
"2026-02-09T17:00",
|
||||
"2026-02-09T18:00",
|
||||
"2026-02-09T19:00",
|
||||
"2026-02-09T20:00",
|
||||
"2026-02-09T21:00",
|
||||
"2026-02-09T22:00",
|
||||
"2026-02-09T23:00"
|
||||
],
|
||||
"temperature_2m": [
|
||||
2.2,
|
||||
2.2,
|
||||
2.2,
|
||||
2.2,
|
||||
2.0,
|
||||
1.9,
|
||||
1.8,
|
||||
1.5,
|
||||
1.2,
|
||||
1.4,
|
||||
1.8,
|
||||
2.2,
|
||||
2.5,
|
||||
1.9,
|
||||
2.6,
|
||||
3.0,
|
||||
2.7,
|
||||
3.0,
|
||||
3.0,
|
||||
2.4,
|
||||
1.7,
|
||||
1.3,
|
||||
0.9,
|
||||
-0.7,
|
||||
-0.2,
|
||||
-0.1,
|
||||
-0.5,
|
||||
-0.7,
|
||||
-1.4,
|
||||
-1.1,
|
||||
-1.0,
|
||||
-1.0,
|
||||
-1.1,
|
||||
-0.9,
|
||||
1.7,
|
||||
3.7,
|
||||
5.0,
|
||||
5.8,
|
||||
6.5,
|
||||
6.9,
|
||||
6.6,
|
||||
5.9,
|
||||
4.8,
|
||||
3.6,
|
||||
2.7,
|
||||
2.0,
|
||||
1.5,
|
||||
1.1,
|
||||
0.5,
|
||||
0.2,
|
||||
0.4,
|
||||
0.9,
|
||||
1.2,
|
||||
1.3,
|
||||
1.5,
|
||||
1.7,
|
||||
1.8,
|
||||
2.0,
|
||||
2.2,
|
||||
2.7,
|
||||
3.4,
|
||||
4.2,
|
||||
5.2,
|
||||
6.1,
|
||||
6.4,
|
||||
5.9,
|
||||
4.5,
|
||||
3.2,
|
||||
2.4,
|
||||
1.9,
|
||||
1.4,
|
||||
1.1,
|
||||
1.0,
|
||||
0.8,
|
||||
0.5,
|
||||
0.3,
|
||||
0.1,
|
||||
-0.1,
|
||||
-0.2,
|
||||
-0.3,
|
||||
-0.3,
|
||||
-0.1,
|
||||
0.7,
|
||||
1.7,
|
||||
2.9,
|
||||
4.1,
|
||||
5.0,
|
||||
5.2,
|
||||
5.1,
|
||||
4.8,
|
||||
4.3,
|
||||
4.1,
|
||||
4.2,
|
||||
4.1,
|
||||
3.8,
|
||||
3.5,
|
||||
3.3,
|
||||
3.4,
|
||||
3.4,
|
||||
3.5,
|
||||
3.5,
|
||||
3.5,
|
||||
3.4,
|
||||
3.4,
|
||||
3.5,
|
||||
3.6,
|
||||
4.1,
|
||||
5.2,
|
||||
6.6,
|
||||
7.8,
|
||||
8.4,
|
||||
8.8,
|
||||
8.8,
|
||||
8.1,
|
||||
6.9,
|
||||
5.9,
|
||||
5.3,
|
||||
4.9,
|
||||
4.6,
|
||||
4.3,
|
||||
4.2,
|
||||
4.0,
|
||||
3.9,
|
||||
3.9,
|
||||
3.8,
|
||||
3.8,
|
||||
3.8,
|
||||
3.9,
|
||||
4.3,
|
||||
4.7,
|
||||
5.3,
|
||||
6.0,
|
||||
6.9,
|
||||
7.5,
|
||||
7.6,
|
||||
7.5,
|
||||
7.2,
|
||||
6.6,
|
||||
5.8,
|
||||
5.0,
|
||||
4.4,
|
||||
3.9,
|
||||
3.5,
|
||||
3.1,
|
||||
2.9,
|
||||
2.8,
|
||||
3.0,
|
||||
3.3,
|
||||
3.6,
|
||||
3.5,
|
||||
3.4,
|
||||
3.4,
|
||||
3.7,
|
||||
4.2,
|
||||
4.7,
|
||||
5.3,
|
||||
6.0,
|
||||
6.5,
|
||||
6.8,
|
||||
6.8,
|
||||
6.6,
|
||||
5.9,
|
||||
4.8,
|
||||
3.9,
|
||||
3.5,
|
||||
3.3,
|
||||
3.1,
|
||||
2.9
|
||||
],
|
||||
"rain": [
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.10,
|
||||
0.40,
|
||||
0.00,
|
||||
0.00,
|
||||
0.20,
|
||||
0.60,
|
||||
0.30,
|
||||
1.30,
|
||||
0.00,
|
||||
0.00,
|
||||
0.40,
|
||||
0.10,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.10,
|
||||
0.20,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.10,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00,
|
||||
0.00
|
||||
]
|
||||
},
|
||||
"daily_units": {
|
||||
"time": "iso8601",
|
||||
"temperature_2m_max": "°C",
|
||||
"temperature_2m_min": "°C",
|
||||
"weather_code": "wmo code"
|
||||
},
|
||||
"daily": {
|
||||
"time": [
|
||||
"2026-02-03",
|
||||
"2026-02-04",
|
||||
"2026-02-05",
|
||||
"2026-02-06",
|
||||
"2026-02-07",
|
||||
"2026-02-08",
|
||||
"2026-02-09"
|
||||
],
|
||||
"temperature_2m_max": [
|
||||
3.0,
|
||||
6.9,
|
||||
6.4,
|
||||
5.2,
|
||||
8.8,
|
||||
7.6,
|
||||
6.8
|
||||
],
|
||||
"temperature_2m_min": [
|
||||
-0.7,
|
||||
-1.4,
|
||||
0.2,
|
||||
-0.3,
|
||||
3.3,
|
||||
3.1,
|
||||
2.8
|
||||
],
|
||||
"weather_code": [
|
||||
61,
|
||||
45,
|
||||
45,
|
||||
61,
|
||||
61,
|
||||
3,
|
||||
3
|
||||
]
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user