[gimp/gimp-2-10] app, icons, menus: add performance-log recording to the dashboard
- From: Ell <ell src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/gimp-2-10] app, icons, menus: add performance-log recording to the dashboard
- Date: Wed, 12 Sep 2018 11:55:21 +0000 (UTC)
commit 40ac4f7bc0f43aee24dc7ae1cf674d1a59612f55
Author: Ell <ell_se yahoo com>
Date: Sun Sep 2 01:46:27 2018 -0400
app, icons, menus: add performance-log recording to the dashboard
Add an option to record a performance log through the dashboard.
The log contains a series of samples of the dashboard variables, as
well as the full program backtrace, when available. As such, it
essentially acts as a built-in profiler, which allows us to
correlate program execution with the information available through
the dashboard. It is meant to be used for creating logs to
accompany perofrmance-related bug reports, as well as for profiling
GIMP during development.
The sample frequency defaults to 10 samples per second, but can be
overridden using the GIMP_PERFORMANCE_LOG_SAMPLE_FREQUENCY
environment variable. Backtraces are included by default when
available, but can be suppressed using the
GIMP_PERFORMANCE_LOG_NO_BACKTRACE environment variable.
Logs are created through the new "record" button at the bottom of
the dashboard dialog. When pressed, a file dialog is opened to
select the log file, and, once confirmed, data is being recorded to
the selected file. Recording is stopped by pressing the "record"
button again (we use a highlight to indicate that recording is
active.)
While recording, the "reset" button is replaced with an "add marker"
button, which can be used to add event markers to the log. These
can be used to mark events of interest, such as "started painting"
and "stopped painting", which then appear in the log as part of the
sample stream. Markers are numbered sequentually, and the number
of the next (to-be-added) marker appears on the button. Shift-
clicking the button adds an empty (description-less) marker, which
is only identified by its number; this can be used when markers
need to be added quickly.
The log is an XML file, containing some extra information (such as
the output of "$ gimp -v", and symbol information) in addition to
the samples. The data in the file is delta-encoded to reduce the
file size, meaning that samples (as well as some other elements)
only specify the changes since the previous sample. This adds a
necessary decoding step before data can be processed; the next
commit adds a tool that does that.
There are currently no tools to actually analyze the data -- that's
still TBD -- but at least we can start gathering it.
app/actions/dashboard-actions.c | 28 +
app/actions/dashboard-commands.c | 200 +++++
app/actions/dashboard-commands.h | 7 +
app/widgets/gimpdashboard.c | 1246 +++++++++++++++++++++++++++---
app/widgets/gimpdashboard.h | 47 +-
app/widgets/gimphelp-ids.h | 3 +
icons/Color/16/gimp-marker.png | Bin 0 -> 489 bytes
icons/Color/16/media-record.png | Bin 0 -> 717 bytes
icons/Color/color-scalable.svg | 199 ++++-
icons/Color/scalable/gimp-marker.svg | 172 +++++
icons/Color/scalable/media-record.svg | 125 +++
icons/Symbolic/16/gimp-marker.png | Bin 0 -> 379 bytes
icons/Symbolic/16/media-record.png | Bin 0 -> 496 bytes
icons/Symbolic/scalable/gimp-marker.svg | 153 ++++
icons/Symbolic/scalable/media-record.svg | 93 +++
icons/Symbolic/symbolic-scalable.svg | 181 ++++-
icons/icon-list.mk | 4 +
libgimpwidgets/gimpicons.h | 2 +
menus/dashboard-menu.xml | 5 +
19 files changed, 2274 insertions(+), 191 deletions(-)
---
diff --git a/app/actions/dashboard-actions.c b/app/actions/dashboard-actions.c
index 3c359b5d82..b8eb5a7d6a 100644
--- a/app/actions/dashboard-actions.c
+++ b/app/actions/dashboard-actions.c
@@ -47,6 +47,24 @@ static const GimpActionEntry dashboard_actions[] =
{ "dashboard-history-duration", NULL,
NC_("dashboard-action", "_History Duration") },
+ { "dashboard-log-record", GIMP_ICON_RECORD,
+ NC_("dashboard-action", "_Start/Stop Recording..."), NULL,
+ NC_("dashboard-action", "Start/stop recording performance log"),
+ G_CALLBACK (dashboard_log_record_cmd_callback),
+ GIMP_HELP_DASHBOARD_LOG_RECORD },
+ { "dashboard-log-add-marker", GIMP_ICON_MARKER,
+ NC_("dashboard-action", "_Add Marker..."), NULL,
+ NC_("dashboard-action", "Add an event marker "
+ "to the performance log"),
+ G_CALLBACK (dashboard_log_add_marker_cmd_callback),
+ GIMP_HELP_DASHBOARD_LOG_ADD_MARKER },
+ { "dashboard-log-add-empty-marker", GIMP_ICON_MARKER,
+ NC_("dashboard-action", "Add _Empty Marker"), NULL,
+ NC_("dashboard-action", "Add an empty event marker "
+ "to the performance log"),
+ G_CALLBACK (dashboard_log_add_empty_marker_cmd_callback),
+ GIMP_HELP_DASHBOARD_LOG_ADD_EMPTY_MARKER },
+
{ "dashboard-reset", GIMP_ICON_RESET,
NC_("dashboard-action", "_Reset"), NULL,
NC_("dashboard-action", "Reset cumulative data"),
@@ -153,7 +171,12 @@ dashboard_actions_update (GimpActionGroup *group,
gpointer data)
{
GimpDashboard *dashboard = GIMP_DASHBOARD (data);
+ gboolean recording;
+
+ recording = gimp_dashboard_log_is_recording (dashboard);
+#define SET_SENSITIVE(action,condition) \
+ gimp_action_group_set_action_sensitive (group, action, (condition) != 0)
#define SET_ACTIVE(action,condition) \
gimp_action_group_set_action_active (group, action, (condition) != 0)
@@ -195,8 +218,13 @@ dashboard_actions_update (GimpActionGroup *group,
break;
}
+ SET_SENSITIVE ("dashboard-log-add-marker", recording);
+ SET_SENSITIVE ("dashboard-log-add-empty-marker", recording);
+ SET_SENSITIVE ("dashboard-reset", !recording);
+
SET_ACTIVE ("dashboard-low-swap-space-warning",
gimp_dashboard_get_low_swap_space_warning (dashboard));
+#undef SET_SENSITIVE
#undef SET_ACTIVE
}
diff --git a/app/actions/dashboard-commands.c b/app/actions/dashboard-commands.c
index 10ecbe6e64..c628e9858e 100644
--- a/app/actions/dashboard-commands.c
+++ b/app/actions/dashboard-commands.c
@@ -24,14 +24,30 @@
#include "actions-types.h"
+#include "core/gimp.h"
+
#include "widgets/gimpdashboard.h"
#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpuimanager.h"
+
+#include "dialogs/dialogs.h"
#include "dashboard-commands.h"
#include "gimp-intl.h"
+/* local function prototypes */
+
+static void dashboard_log_record_response (GtkWidget *dialog,
+ int response_id,
+ GimpDashboard *dashboard);
+
+static void dashboard_log_add_marker_response (GtkWidget *dialog,
+ const gchar *description,
+ GimpDashboard *dashboard);
+
+
/* public functions */
@@ -61,6 +77,148 @@ dashboard_history_duration_cmd_callback (GtkAction *action,
gimp_dashboard_set_history_duration (dashboard, history_duration);
}
+void
+dashboard_log_record_cmd_callback (GtkAction *action,
+ gpointer data)
+{
+ GimpDashboard *dashboard = GIMP_DASHBOARD (data);
+
+ if (! gimp_dashboard_log_is_recording (dashboard))
+ {
+ GtkWidget *dialog;
+
+ #define LOG_RECORD_KEY "gimp-dashboard-log-record-dialog"
+
+ dialog = dialogs_get_dialog (G_OBJECT (dashboard), LOG_RECORD_KEY);
+
+ if (! dialog)
+ {
+ GtkFileFilter *filter;
+ GFile *folder;
+
+ dialog = gtk_file_chooser_dialog_new (
+ "Record Performance Log", NULL, GTK_FILE_CHOOSER_ACTION_SAVE,
+
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_Record"), GTK_RESPONSE_OK,
+
+ NULL);
+
+ gtk_dialog_set_default_response (GTK_DIALOG (dialog),
+ GTK_RESPONSE_OK);
+ gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+ GTK_RESPONSE_OK,
+ GTK_RESPONSE_CANCEL,
+ -1);
+
+ gtk_window_set_screen (
+ GTK_WINDOW (dialog),
+ gtk_widget_get_screen (GTK_WIDGET (dashboard)));
+ gtk_window_set_role (GTK_WINDOW (dialog),
+ "gimp-dashboard-log-record");
+ gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE);
+
+ gtk_file_chooser_set_do_overwrite_confirmation (
+ GTK_FILE_CHOOSER (dialog), TRUE);
+
+ filter = gtk_file_filter_new ();
+ gtk_file_filter_set_name (filter, _("All Files"));
+ gtk_file_filter_add_pattern (filter, "*");
+ gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
+
+ filter = gtk_file_filter_new ();
+ gtk_file_filter_set_name (filter, _("Log Files (*.log)"));
+ gtk_file_filter_add_pattern (filter, "*.log");
+ gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
+
+ gtk_file_chooser_set_filter (GTK_FILE_CHOOSER (dialog), filter);
+
+ folder = g_object_get_data (G_OBJECT (dashboard),
+ "gimp-dashboard-log-record-folder");
+
+ if (folder)
+ {
+ gtk_file_chooser_set_current_folder_file (
+ GTK_FILE_CHOOSER (dialog), folder, NULL);
+ }
+
+ gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dialog),
+ "gimp-performance.log");
+
+ g_signal_connect (dialog, "response",
+ G_CALLBACK (dashboard_log_record_response),
+ dashboard);
+ g_signal_connect (dialog, "delete-event",
+ G_CALLBACK (gtk_true),
+ NULL);
+
+ gimp_help_connect (dialog, gimp_standard_help_func,
+ GIMP_HELP_DASHBOARD_LOG_RECORD, NULL);
+
+ dialogs_attach_dialog (G_OBJECT (dashboard), LOG_RECORD_KEY, dialog);
+
+ g_signal_connect_object (dashboard, "destroy",
+ G_CALLBACK (gtk_widget_destroy),
+ dialog,
+ G_CONNECT_SWAPPED);
+
+ #undef LOG_RECORD_KEY
+ }
+
+ gtk_window_present (GTK_WINDOW (dialog));
+ }
+ else
+ {
+ GError *error = NULL;
+
+ if (! gimp_dashboard_log_stop_recording (dashboard, &error))
+ {
+ gimp_message_literal (
+ gimp_editor_get_ui_manager (GIMP_EDITOR (dashboard))->gimp,
+ NULL, GIMP_MESSAGE_ERROR, error->message);
+ }
+ }
+}
+
+void
+dashboard_log_add_marker_cmd_callback (GtkAction *action,
+ gpointer data)
+{
+ GimpDashboard *dashboard = GIMP_DASHBOARD (data);
+ GtkWidget *dialog;
+
+ #define LOG_ADD_MARKER_KEY "gimp-dashboard-log-add-marker-dialog"
+
+ dialog = dialogs_get_dialog (G_OBJECT (dashboard), LOG_ADD_MARKER_KEY);
+
+ if (! dialog)
+ {
+ dialog = gimp_query_string_box (
+ _("Add Marker"), GTK_WIDGET (dashboard),
+ gimp_standard_help_func, GIMP_HELP_DASHBOARD_LOG_ADD_MARKER,
+ _("Enter a description for the marker"),
+ NULL,
+ G_OBJECT (dashboard), "destroy",
+ (GimpQueryStringCallback) dashboard_log_add_marker_response,
+ dashboard);
+
+ dialogs_attach_dialog (G_OBJECT (dashboard), LOG_ADD_MARKER_KEY, dialog);
+
+ #undef LOG_ADD_MARKER_KEY
+ }
+
+ gtk_window_present (GTK_WINDOW (dialog));
+}
+
+void
+dashboard_log_add_empty_marker_cmd_callback (GtkAction *action,
+ gpointer data)
+{
+ GimpDashboard *dashboard = GIMP_DASHBOARD (data);
+
+ gimp_dashboard_log_add_marker (dashboard, NULL);
+}
+
void
dashboard_reset_cmd_callback (GtkAction *action,
gpointer data)
@@ -81,3 +239,45 @@ dashboard_low_swap_space_warning_cmd_callback (GtkAction *action,
gimp_dashboard_set_low_swap_space_warning (dashboard, low_swap_space_warning);
}
+
+
+/* private functions */
+
+
+static void
+dashboard_log_record_response (GtkWidget *dialog,
+ int response_id,
+ GimpDashboard *dashboard)
+{
+ if (response_id == GTK_RESPONSE_OK)
+ {
+ GFile *file = gtk_file_chooser_get_file (GTK_FILE_CHOOSER (dialog));
+ GError *error = NULL;
+
+ g_object_set_data_full (G_OBJECT (dashboard),
+ "gimp-dashboard-log-record-folder",
+ g_file_get_parent (file),
+ g_object_unref);
+
+ if (! gimp_dashboard_log_start_recording (dashboard, file, &error))
+ {
+ gimp_message_literal (
+ gimp_editor_get_ui_manager (GIMP_EDITOR (dashboard))->gimp,
+ NULL, GIMP_MESSAGE_ERROR, error->message);
+
+ g_clear_error (&error);
+ }
+
+ g_object_unref (file);
+ }
+
+ gtk_widget_destroy (dialog);
+}
+
+static void
+dashboard_log_add_marker_response (GtkWidget *dialog,
+ const gchar *description,
+ GimpDashboard *dashboard)
+{
+ gimp_dashboard_log_add_marker (dashboard, description);
+}
diff --git a/app/actions/dashboard-commands.h b/app/actions/dashboard-commands.h
index 803049936a..326721e9fd 100644
--- a/app/actions/dashboard-commands.h
+++ b/app/actions/dashboard-commands.h
@@ -26,6 +26,13 @@ void dashboard_history_duration_cmd_callback (GtkAction *action,
GtkAction *current,
gpointer data);
+void dashboard_log_record_cmd_callback (GtkAction *action,
+ gpointer data);
+void dashboard_log_add_marker_cmd_callback (GtkAction *action,
+ gpointer data);
+void dashboard_log_add_empty_marker_cmd_callback (GtkAction *action,
+ gpointer data);
+
void dashboard_reset_cmd_callback (GtkAction *action,
gpointer data);
diff --git a/app/widgets/gimpdashboard.c b/app/widgets/gimpdashboard.c
index 6627ef6ff9..a0fda047d2 100644
--- a/app/widgets/gimpdashboard.c
+++ b/app/widgets/gimpdashboard.c
@@ -22,6 +22,7 @@
#include <stdlib.h>
#include <string.h>
+#include <stdarg.h>
#include <gegl.h>
#include <gio/gio.h>
@@ -53,14 +54,19 @@
#include "widgets-types.h"
#include "core/gimp.h"
+#include "core/gimp-gui.h"
#include "core/gimp-utils.h"
+#include "core/gimp-parallel.h"
#include "core/gimpasync.h"
+#include "core/gimpbacktrace.h"
+#include "core/gimpwaitable.h"
#include "gimpactiongroup.h"
#include "gimpdocked.h"
#include "gimpdashboard.h"
#include "gimpdialogfactory.h"
#include "gimphelp-ids.h"
+#include "gimphighlightablebutton.h"
#include "gimpmeter.h"
#include "gimpsessioninfo-aux.h"
#include "gimpuimanager.h"
@@ -68,6 +74,7 @@
#include "gimpwindowstrategy.h"
#include "gimp-intl.h"
+#include "gimp-version.h"
#define DEFAULT_UPDATE_INTERVAL GIMP_DASHBOARD_UPDATE_INTERVAL_0_25_SEC
@@ -80,6 +87,9 @@
#define CPU_ACTIVE_ON /* individual cpu usage is above */ 0.75
#define CPU_ACTIVE_OFF /* individual cpu usage is below */ 0.25
+#define LOG_VERSION 1
+#define LOG_SAMPLE_FREQUENCY 10 /* samples per second */
+
typedef enum
{
@@ -182,6 +192,7 @@ struct _VariableInfo
const gchar *title;
const gchar *description;
VariableType type;
+ gboolean exclude_from_log;
GimpRGB color;
VariableFunc sample_func;
VariableFunc reset_func;
@@ -286,6 +297,20 @@ struct _GimpDashboardPrivate
GimpDashboardUpdateInteval update_interval;
GimpDashboardHistoryDuration history_duration;
gboolean low_swap_space_warning;
+
+ GOutputStream *log_output;
+ GError *log_error;
+ gint64 log_start_time;
+ gint log_sample_frequency;
+ gint log_n_samples;
+ gint log_n_markers;
+ VariableData log_variables[N_VARIABLES];
+ gboolean log_include_backtrace;
+ GimpBacktrace *log_backtrace;
+ GHashTable *log_addresses;
+
+ GimpHighlightableButton *log_record_button;
+ GtkLabel *log_add_marker_label;
};
@@ -372,6 +397,8 @@ static void gimp_dashboard_field_set_active (GimpDashboard
gint field,
gboolean active);
+static void gimp_dashboard_reset_unlocked (GimpDashboard *dashboard);
+
static void gimp_dashboard_reset_variables (GimpDashboard *dashboard);
static gpointer gimp_dashboard_variable_get_data (GimpDashboard *dashboard,
@@ -388,6 +415,20 @@ static gchar * gimp_dashboard_field_to_string (GimpDashboard
gint field,
gboolean full);
+static gboolean gimp_dashboard_log_printf (GimpDashboard *dashboard,
+ const gchar *format,
+ ...) G_GNUC_PRINTF (2, 3);
+static gboolean gimp_dashboard_log_print_escaped (GimpDashboard *dashboard,
+ const gchar *string);
+static gint64 gimp_dashboard_log_time (GimpDashboard *dashboard);
+static void gimp_dashboard_log_sample (GimpDashboard *dashboard,
+ gboolean variables_changed);
+static void gimp_dashboard_log_update_highlight (GimpDashboard *dashboard);
+static void gimp_dashboard_log_update_n_markers (GimpDashboard *dashboard);
+
+static void gimp_dashboard_log_write_address_map (GimpAsync *async,
+ GimpDashboard *dashboard);
+
static gboolean gimp_dashboard_field_use_meter_underlay (Group group,
gint field);
@@ -1169,6 +1210,12 @@ gimp_dashboard_constructed (GObject *object)
GimpDashboardPrivate *priv = dashboard->priv;
GimpUIManager *ui_manager;
GimpActionGroup *action_group;
+ GtkAction *action;
+ GtkWidget *button;
+ GtkWidget *alignment;
+ GtkWidget *box;
+ GtkWidget *image;
+ GtkWidget *label;
Group group;
G_OBJECT_CLASS (parent_class)->constructed (object);
@@ -1182,7 +1229,6 @@ gimp_dashboard_constructed (GObject *object)
const GroupInfo *group_info = &groups[group];
GroupData *group_data = &priv->groups[group];
GimpToggleActionEntry entry = {};
- GtkAction *action;
entry.name = g_strdup_printf ("dashboard-group-%s", group_info->name);
entry.label = g_dpgettext2 (NULL, "dashboard-group", group_info->title);
@@ -1205,8 +1251,54 @@ gimp_dashboard_constructed (GObject *object)
g_free ((gpointer) entry.name);
}
- gimp_editor_add_action_button (GIMP_EDITOR (dashboard), "dashboard",
- "dashboard-reset", NULL);
+ button = gimp_editor_add_action_button (GIMP_EDITOR (dashboard), "dashboard",
+ "dashboard-log-record", NULL);
+ priv->log_record_button = GIMP_HIGHLIGHTABLE_BUTTON (button);
+ gimp_highlightable_button_set_highlight_color (
+ GIMP_HIGHLIGHTABLE_BUTTON (button),
+ GIMP_HIGHLIGHTABLE_BUTTON_COLOR_AFFIRMATIVE);
+
+ button = gimp_editor_add_action_button (GIMP_EDITOR (dashboard), "dashboard",
+ "dashboard-log-add-marker",
+ "dashboard-log-add-empty-marker",
+ gimp_get_extend_selection_mask (),
+ NULL);
+
+ action = gtk_action_group_get_action (GTK_ACTION_GROUP (action_group),
+ "dashboard-log-add-marker");
+ g_object_bind_property (action, "sensitive",
+ button, "visible",
+ G_BINDING_DEFAULT | G_BINDING_SYNC_CREATE);
+
+ image = g_object_ref (gtk_bin_get_child (GTK_BIN (button)));
+ gtk_container_remove (GTK_CONTAINER (button), image);
+
+ alignment = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
+ gtk_container_add (GTK_CONTAINER (button), alignment);
+ gtk_widget_show (alignment);
+
+ box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
+ gtk_container_add (GTK_CONTAINER (alignment), box);
+ gtk_widget_show (box);
+
+ gtk_box_pack_start (GTK_BOX (box), image, FALSE, FALSE, 0);
+ g_object_unref (image);
+
+ label = gtk_label_new (NULL);
+ priv->log_add_marker_label = GTK_LABEL (label);
+ gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0);
+ gtk_widget_show (label);
+
+ button = gimp_editor_add_action_button (GIMP_EDITOR (dashboard), "dashboard",
+ "dashboard-reset", NULL);
+
+ action = gtk_action_group_get_action (GTK_ACTION_GROUP (action_group),
+ "dashboard-reset");
+ g_object_bind_property (action, "sensitive",
+ button, "visible",
+ G_BINDING_DEFAULT | G_BINDING_SYNC_CREATE);
+
+ gimp_action_group_update (action_group, dashboard);
}
static void
@@ -1239,6 +1331,8 @@ gimp_dashboard_dispose (GObject *object)
priv->low_swap_space_idle_id = 0;
}
+ gimp_dashboard_log_stop_recording (dashboard, NULL);
+
gimp_dashboard_reset_variables (dashboard);
G_OBJECT_CLASS (parent_class)->dispose (object);
@@ -1583,26 +1677,39 @@ gimp_dashboard_field_menu_item_toggled (GimpDashboard *dashboard,
static gpointer
gimp_dashboard_sample (GimpDashboard *dashboard)
{
- GimpDashboardPrivate *priv = dashboard->priv;
- GimpDashboardUpdateInteval update_interval;
- gint64 end_time;
- gboolean seen_low_swap_space = FALSE;
+ GimpDashboardPrivate *priv = dashboard->priv;
+ gint64 last_sample_time = 0;
+ gint64 last_update_time = 0;
+ gboolean seen_low_swap_space = FALSE;
g_mutex_lock (&priv->mutex);
- update_interval = priv->update_interval;
- end_time = g_get_monotonic_time ();
-
while (! priv->quit)
{
+ gint64 update_interval;
+ gint64 sample_interval;
+ gint64 end_time;
+
+ update_interval = priv->update_interval * G_TIME_SPAN_SECOND / 1000;
+
+ if (priv->log_output)
+ sample_interval = G_TIME_SPAN_SECOND / priv->log_sample_frequency;
+ else
+ sample_interval = update_interval;
+
+ end_time = last_sample_time + sample_interval;
+
if (! g_cond_wait_until (&priv->cond, &priv->mutex, end_time) ||
priv->update_now)
{
+ gint64 time;
gboolean variables_changed = FALSE;
Variable variable;
Group group;
gint field;
+ time = g_get_monotonic_time ();
+
/* sample all variables */
for (variable = FIRST_VARIABLE; variable < N_VARIABLES; variable++)
{
@@ -1617,119 +1724,123 @@ gimp_dashboard_sample (GimpDashboard *dashboard)
sizeof (VariableData));
}
- /* add samples to meters */
- for (group = FIRST_GROUP; group < N_GROUPS; group++)
- {
- const GroupInfo *group_info = &groups[group];
- GroupData *group_data = &priv->groups[group];
- gdouble *sample;
- gdouble total = 0.0;
-
- if (! group_info->has_meter)
- continue;
+ /* log sample */
+ if (priv->log_output)
+ gimp_dashboard_log_sample (dashboard, variables_changed);
- sample = g_new (gdouble, group_data->n_meter_values);
-
- for (field = 0; field < group_data->n_fields; field++)
+ /* update gui */
+ if (priv->update_now ||
+ ! priv->log_output ||
+ time - last_update_time >= update_interval)
+ {
+ /* add samples to meters */
+ for (group = FIRST_GROUP; group < N_GROUPS; group++)
{
- const FieldInfo *field_info = &group_info->fields[field];
-
- if (field_info->meter_value)
- {
- gdouble value;
+ const GroupInfo *group_info = &groups[group];
+ GroupData *group_data = &priv->groups[group];
+ gdouble *sample;
+ gdouble total = 0.0;
- if (field_info->meter_variable)
- variable = field_info->meter_variable;
- else
- variable = field_info->variable;
+ if (! group_info->has_meter)
+ continue;
- value = gimp_dashboard_variable_to_double (dashboard,
- variable);
+ sample = g_new (gdouble, group_data->n_meter_values);
- if (value &&
- gimp_dashboard_field_use_meter_underlay (group,
- field))
- {
- value = G_MAXDOUBLE;
- }
+ for (field = 0; field < group_data->n_fields; field++)
+ {
+ const FieldInfo *field_info = &group_info->fields[field];
- if (field_info->meter_cumulative)
+ if (field_info->meter_value)
{
- total += value;
- value = total;
+ gdouble value;
+
+ if (field_info->meter_variable)
+ variable = field_info->meter_variable;
+ else
+ variable = field_info->variable;
+
+ value = gimp_dashboard_variable_to_double (dashboard,
+ variable);
+
+ if (value &&
+ gimp_dashboard_field_use_meter_underlay (group,
+ field))
+ {
+ value = G_MAXDOUBLE;
+ }
+
+ if (field_info->meter_cumulative)
+ {
+ total += value;
+ value = total;
+ }
+
+ sample[field_info->meter_value - 1] = value;
}
-
- sample[field_info->meter_value - 1] = value;
}
- }
-
- gimp_meter_add_sample (group_data->meter, sample);
- g_free (sample);
- }
+ gimp_meter_add_sample (group_data->meter, sample);
- if (variables_changed)
- {
- /* enqueue update source */
- if (! priv->update_idle_id &&
- gtk_widget_get_mapped (GTK_WIDGET (dashboard)))
- {
- priv->update_idle_id = g_idle_add_full (
- G_PRIORITY_DEFAULT,
- (GSourceFunc) gimp_dashboard_update,
- dashboard, NULL);
+ g_free (sample);
}
- /* check for low swap space */
- if (priv->low_swap_space_warning &&
- priv->variables[VARIABLE_SWAP_OCCUPIED].available &&
- priv->variables[VARIABLE_SWAP_LIMIT].available)
+ if (variables_changed)
{
- guint64 swap_occupied;
- guint64 swap_limit;
-
- swap_occupied = priv->variables[VARIABLE_SWAP_OCCUPIED].value.size;
- swap_limit = priv->variables[VARIABLE_SWAP_LIMIT].value.size;
+ /* enqueue update source */
+ if (! priv->update_idle_id &&
+ gtk_widget_get_mapped (GTK_WIDGET (dashboard)))
+ {
+ priv->update_idle_id = g_idle_add_full (
+ G_PRIORITY_DEFAULT,
+ (GSourceFunc) gimp_dashboard_update,
+ dashboard, NULL);
+ }
- if (! seen_low_swap_space &&
- swap_occupied >= LOW_SWAP_SPACE_WARNING_ON * swap_limit)
+ /* check for low swap space */
+ if (priv->low_swap_space_warning &&
+ priv->variables[VARIABLE_SWAP_OCCUPIED].available &&
+ priv->variables[VARIABLE_SWAP_LIMIT].available)
{
- if (! priv->low_swap_space_idle_id)
+ guint64 swap_occupied;
+ guint64 swap_limit;
+
+ swap_occupied = priv->variables[VARIABLE_SWAP_OCCUPIED].value.size;
+ swap_limit = priv->variables[VARIABLE_SWAP_LIMIT].value.size;
+
+ if (! seen_low_swap_space &&
+ swap_occupied >= LOW_SWAP_SPACE_WARNING_ON * swap_limit)
{
- priv->low_swap_space_idle_id =
- g_idle_add_full (G_PRIORITY_HIGH,
- (GSourceFunc) gimp_dashboard_low_swap_space,
- dashboard, NULL);
+ if (! priv->low_swap_space_idle_id)
+ {
+ priv->low_swap_space_idle_id =
+ g_idle_add_full (G_PRIORITY_HIGH,
+ (GSourceFunc) gimp_dashboard_low_swap_space,
+ dashboard, NULL);
+ }
+
+ seen_low_swap_space = TRUE;
}
-
- seen_low_swap_space = TRUE;
- }
- else if (seen_low_swap_space &&
- swap_occupied <= LOW_SWAP_SPACE_WARNING_OFF * swap_limit)
- {
- if (priv->low_swap_space_idle_id)
+ else if (seen_low_swap_space &&
+ swap_occupied <= LOW_SWAP_SPACE_WARNING_OFF * swap_limit)
{
- g_source_remove (priv->low_swap_space_idle_id);
+ if (priv->low_swap_space_idle_id)
+ {
+ g_source_remove (priv->low_swap_space_idle_id);
- priv->low_swap_space_idle_id = 0;
- }
+ priv->low_swap_space_idle_id = 0;
+ }
- seen_low_swap_space = FALSE;
+ seen_low_swap_space = FALSE;
+ }
}
}
- }
- priv->update_now = FALSE;
+ priv->update_now = FALSE;
- end_time = g_get_monotonic_time () +
- update_interval * G_TIME_SPAN_SECOND / 1000;
- }
+ last_update_time = time;
+ }
- if (priv->update_interval != update_interval)
- {
- update_interval = priv->update_interval;
- end_time = g_get_monotonic_time () +
- update_interval * G_TIME_SPAN_SECOND / 1000;
+ last_sample_time = time;
}
}
@@ -2866,6 +2977,27 @@ gimp_dashboard_field_set_active (GimpDashboard *dashboard,
}
}
+static void
+gimp_dashboard_reset_unlocked (GimpDashboard *dashboard)
+{
+ GimpDashboardPrivate *priv;
+ Group group;
+
+ priv = dashboard->priv;
+
+ gegl_reset_stats ();
+
+ gimp_dashboard_reset_variables (dashboard);
+
+ for (group = FIRST_GROUP; group < N_GROUPS; group++)
+ {
+ GroupData *group_data = &priv->groups[group];
+
+ if (group_data->meter)
+ gimp_meter_clear_history (group_data->meter);
+ }
+}
+
static void
gimp_dashboard_reset_variables (GimpDashboard *dashboard)
{
@@ -3186,6 +3318,638 @@ gimp_dashboard_field_to_string (GimpDashboard *dashboard,
return (gpointer) str;
}
+static gboolean
+gimp_dashboard_log_printf (GimpDashboard *dashboard,
+ const gchar *format,
+ ...)
+{
+ GimpDashboardPrivate *priv = dashboard->priv;
+ va_list args;
+ gboolean result;
+
+ if (priv->log_error)
+ return FALSE;
+
+ va_start (args, format);
+
+ result = g_output_stream_vprintf (priv->log_output,
+ NULL, NULL,
+ &priv->log_error,
+ format, args);
+
+ va_end (args);
+
+ return result;
+}
+
+static gboolean
+gimp_dashboard_log_print_escaped (GimpDashboard *dashboard,
+ const gchar *string)
+{
+ GimpDashboardPrivate *priv = dashboard->priv;
+ gchar buffer[1024];
+ const gchar *s;
+ gint i;
+
+ if (priv->log_error)
+ return FALSE;
+
+ i = 0;
+
+ #define FLUSH() \
+ G_STMT_START \
+ { \
+ if (! g_output_stream_write_all (priv->log_output, \
+ buffer, i, NULL, \
+ NULL, &priv->log_error)) \
+ { \
+ return FALSE; \
+ } \
+ \
+ i = 0; \
+ } \
+ G_STMT_END
+
+ #define RESERVE(n) \
+ G_STMT_START \
+ { \
+ if (i + (n) > sizeof (buffer)) \
+ FLUSH (); \
+ } \
+ G_STMT_END
+
+ for (s = string; *s; s++)
+ {
+ #define ESCAPE(from, to) \
+ case from: \
+ RESERVE (sizeof (to) - 1); \
+ memcpy (&buffer[i], to, sizeof (to) - 1); \
+ i += sizeof (to) - 1; \
+ break;
+
+ switch (*s)
+ {
+ ESCAPE ('"', """)
+ ESCAPE ('\'', "'")
+ ESCAPE ('<', "<")
+ ESCAPE ('>', ">")
+ ESCAPE ('&', "&")
+
+ default:
+ RESERVE (1);
+ buffer[i++] = *s;
+ break;
+ }
+
+ #undef ESCAPE
+ }
+
+ FLUSH ();
+
+ #undef FLUSH
+ #undef RESERVE
+
+ return TRUE;
+}
+
+static gint64
+gimp_dashboard_log_time (GimpDashboard *dashboard)
+{
+ GimpDashboardPrivate *priv = dashboard->priv;
+
+ return g_get_monotonic_time () - priv->log_start_time;
+}
+
+static void
+gimp_dashboard_log_sample (GimpDashboard *dashboard,
+ gboolean variables_changed)
+{
+ GimpDashboardPrivate *priv = dashboard->priv;
+ GimpBacktrace *backtrace = NULL;
+ gboolean empty = TRUE;
+ Variable variable;
+
+ #define NONEMPTY() \
+ G_STMT_START \
+ { \
+ if (empty) \
+ { \
+ gimp_dashboard_log_printf (dashboard, \
+ ">\n"); \
+ \
+ empty = FALSE; \
+ } \
+ } \
+ G_STMT_END
+
+ gimp_dashboard_log_printf (dashboard,
+ "\n"
+ "<sample id=\"%d\" t=\"%lld\"",
+ priv->log_n_samples,
+ (long long) gimp_dashboard_log_time (dashboard));
+
+ if (priv->log_n_samples == 0 || variables_changed)
+ {
+ NONEMPTY ();
+
+ gimp_dashboard_log_printf (dashboard,
+ "<vars>\n");
+
+ for (variable = FIRST_VARIABLE; variable < N_VARIABLES; variable++)
+ {
+ const VariableInfo *variable_info = &variables[variable];
+ const VariableData *variable_data = &priv->variables[variable];
+ VariableData *log_variable_data = &priv->log_variables[variable];
+
+ if (variable_info->exclude_from_log)
+ continue;
+
+ if (priv->log_n_samples > 0 &&
+ ! memcmp (variable_data, log_variable_data,
+ sizeof (VariableData)))
+ {
+ continue;
+ }
+
+ *log_variable_data = *variable_data;
+
+ if (variable_data->available)
+ {
+ #define LOG_VAR(format, ...) \
+ gimp_dashboard_log_printf (dashboard, \
+ "<%s>" format "</%s>\n", \
+ variable_info->name, \
+ __VA_ARGS__, \
+ variable_info->name)
+
+ switch (variable_info->type)
+ {
+ case VARIABLE_TYPE_BOOLEAN:
+ LOG_VAR (
+ "%d",
+ variable_data->value.boolean);
+ break;
+
+ case VARIABLE_TYPE_INTEGER:
+ LOG_VAR (
+ "%d",
+ variable_data->value.integer);
+ break;
+
+ case VARIABLE_TYPE_SIZE:
+ LOG_VAR (
+ "%llu",
+ (unsigned long long) variable_data->value.size);
+ break;
+
+ case VARIABLE_TYPE_SIZE_RATIO:
+ LOG_VAR (
+ "%llu/%llu",
+ (unsigned long long) variable_data->value.size_ratio.antecedent,
+ (unsigned long long) variable_data->value.size_ratio.consequent);
+ break;
+
+ case VARIABLE_TYPE_INT_RATIO:
+ LOG_VAR (
+ "%d:%d",
+ variable_data->value.int_ratio.antecedent,
+ variable_data->value.int_ratio.consequent);
+ break;
+
+ case VARIABLE_TYPE_PERCENTAGE:
+ LOG_VAR (
+ "%.16g",
+ variable_data->value.percentage);
+ break;
+
+ case VARIABLE_TYPE_DURATION:
+ LOG_VAR (
+ "%.16g",
+ variable_data->value.duration);
+ break;
+
+ case VARIABLE_TYPE_RATE_OF_CHANGE:
+ LOG_VAR (
+ "%.16g",
+ variable_data->value.rate_of_change);
+ break;
+ }
+
+ #undef LOG_VAR
+ }
+ else
+ {
+ gimp_dashboard_log_printf (dashboard,
+ "<%s />\n",
+ variable_info->name);
+ }
+ }
+
+ gimp_dashboard_log_printf (dashboard,
+ "</vars>\n");
+ }
+
+ if (priv->log_include_backtrace)
+ backtrace = gimp_backtrace_new (FALSE);
+
+ if (backtrace)
+ {
+ gboolean backtrace_empty = TRUE;
+ gint n_threads;
+ gint thread;
+
+ #define BACKTRACE_NONEMPTY() \
+ G_STMT_START \
+ { \
+ if (backtrace_empty) \
+ { \
+ NONEMPTY (); \
+ \
+ gimp_dashboard_log_printf (dashboard, \
+ "<backtrace>\n"); \
+ \
+ backtrace_empty = FALSE; \
+ } \
+ } \
+ G_STMT_END
+
+ if (priv->log_backtrace)
+ {
+ n_threads = gimp_backtrace_get_n_threads (priv->log_backtrace);
+
+ for (thread = 0; thread < n_threads; thread++)
+ {
+ guintptr thread_id;
+
+ thread_id = gimp_backtrace_get_thread_id (priv->log_backtrace,
+ thread);
+
+ if (gimp_backtrace_find_thread_by_id (backtrace,
+ thread_id, thread) < 0)
+ {
+ const gchar *thread_name;
+
+ BACKTRACE_NONEMPTY ();
+
+ thread_name =
+ gimp_backtrace_get_thread_name (priv->log_backtrace,
+ thread);
+
+ gimp_dashboard_log_printf (dashboard,
+ "<thread id=\"%llu\"",
+ (unsigned long long) thread_id);
+
+ if (thread_name)
+ {
+ gimp_dashboard_log_printf (dashboard,
+ " name=\"");
+ gimp_dashboard_log_print_escaped (dashboard, thread_name);
+ gimp_dashboard_log_printf (dashboard,
+ "\"");
+ }
+
+ gimp_dashboard_log_printf (dashboard,
+ " />\n");
+ }
+ }
+ }
+
+ n_threads = gimp_backtrace_get_n_threads (backtrace);
+
+ for (thread = 0; thread < n_threads; thread++)
+ {
+ guintptr thread_id;
+ const gchar *thread_name;
+ gint n_frames;
+ gint n_head = 0;
+ gint n_tail = 0;
+ gint frame;
+
+ thread_id = gimp_backtrace_get_thread_id (backtrace, thread);
+ thread_name = gimp_backtrace_get_thread_name (backtrace, thread);
+
+ n_frames = gimp_backtrace_get_n_frames (backtrace, thread);
+
+ if (priv->log_backtrace)
+ {
+ gint other_thread = gimp_backtrace_find_thread_by_id (
+ priv->log_backtrace, thread_id, thread);
+
+ if (other_thread >= 0)
+ {
+ gint n;
+ gint i;
+
+ n = gimp_backtrace_get_n_frames (priv->log_backtrace,
+ other_thread);
+ n = MIN (n, n_frames);
+
+ for (i = 0; i < n; i++)
+ {
+ if (gimp_backtrace_get_frame_address (backtrace,
+ thread, i) !=
+ gimp_backtrace_get_frame_address (priv->log_backtrace,
+ other_thread, i))
+ {
+ break;
+ }
+ }
+
+ n_head = i;
+ n -= i;
+
+ for (i = 0; i < n; i++)
+ {
+ if (gimp_backtrace_get_frame_address (backtrace,
+ thread, -i - 1) !=
+ gimp_backtrace_get_frame_address (priv->log_backtrace,
+ other_thread, -i - 1))
+ {
+ break;
+ }
+ }
+
+ n_tail = i;
+ }
+ }
+
+ if (n_head + n_tail == n_frames)
+ continue;
+
+ BACKTRACE_NONEMPTY ();
+
+ gimp_dashboard_log_printf (dashboard,
+ "<thread id=\"%llu\"",
+ (unsigned long long) thread_id);
+
+ if (thread_name)
+ {
+ gimp_dashboard_log_printf (dashboard,
+ " name=\"");
+ gimp_dashboard_log_print_escaped (dashboard, thread_name);
+ gimp_dashboard_log_printf (dashboard,
+ "\"");
+ }
+
+ if (n_head > 0)
+ {
+ gimp_dashboard_log_printf (dashboard,
+ " head=\"%d\"",
+ n_head);
+ }
+
+ if (n_tail > 0)
+ {
+ gimp_dashboard_log_printf (dashboard,
+ " tail=\"%d\"",
+ n_tail);
+ }
+
+ gimp_dashboard_log_printf (dashboard,
+ ">\n");
+
+ for (frame = n_head; frame < n_frames - n_tail; frame++)
+ {
+ unsigned long long address;
+
+ address = gimp_backtrace_get_frame_address (backtrace,
+ thread, frame);
+
+ gimp_dashboard_log_printf (dashboard,
+ "<frame address=\"0x%llx\" />\n",
+ address);
+
+ g_hash_table_add (priv->log_addresses, (gpointer) address);
+ }
+
+ gimp_dashboard_log_printf (dashboard,
+ "</thread>\n");
+ }
+
+ if (! backtrace_empty)
+ {
+ gimp_dashboard_log_printf (dashboard,
+ "</backtrace>\n");
+ }
+
+ #undef BACKTRACE_NONEMPTY
+ }
+ else if (priv->log_backtrace)
+ {
+ NONEMPTY ();
+
+ gimp_dashboard_log_printf (dashboard,
+ "<backtrace />\n");
+ }
+
+ gimp_backtrace_free (priv->log_backtrace);
+ priv->log_backtrace = backtrace;
+
+ if (empty)
+ {
+ gimp_dashboard_log_printf (dashboard,
+ " />\n");
+ }
+ else
+ {
+ gimp_dashboard_log_printf (dashboard,
+ "</sample>\n");
+ }
+
+ #undef NONEMPTY
+
+ priv->log_n_samples++;
+}
+
+static void
+gimp_dashboard_log_update_highlight (GimpDashboard *dashboard)
+{
+ GimpDashboardPrivate *priv = dashboard->priv;
+
+ gimp_highlightable_button_set_highlight (
+ priv->log_record_button,
+ gimp_dashboard_log_is_recording (dashboard));
+}
+
+static void
+gimp_dashboard_log_update_n_markers (GimpDashboard *dashboard)
+{
+ GimpDashboardPrivate *priv = dashboard->priv;
+ gchar buffer[32];
+
+ g_snprintf (buffer, sizeof (buffer), "%d", priv->log_n_markers + 1);
+
+ gtk_label_set_text (priv->log_add_marker_label, buffer);
+}
+
+static gint
+gimp_dashboard_log_compare_addresses (gconstpointer a1,
+ gconstpointer a2)
+{
+ guintptr address1 = *(const guintptr *) a1;
+ guintptr address2 = *(const guintptr *) a2;
+
+ if (address1 < address2)
+ return -1;
+ else if (address1 > address2)
+ return +1;
+ else
+ return 0;
+}
+
+static void
+gimp_dashboard_log_write_address_map (GimpAsync *async,
+ GimpDashboard *dashboard)
+{
+ GimpDashboardPrivate *priv = dashboard->priv;
+ GimpBacktraceSymbolInfo infos[2];
+ guintptr *addresses;
+ gint n_addresses;
+ GList *iter;
+ gint i;
+ gint n;
+
+ n_addresses = g_hash_table_size (priv->log_addresses);
+
+ if (n_addresses == 0)
+ {
+ gimp_async_finish (async, NULL);
+
+ return;
+ }
+
+ addresses = g_new (guintptr, n_addresses);
+
+ for (iter = g_hash_table_get_keys (priv->log_addresses), i = 0;
+ iter;
+ iter = g_list_next (iter), i++)
+ {
+ addresses[i] = (guintptr) iter->data;
+ }
+
+ qsort (addresses, n_addresses, sizeof (guintptr),
+ gimp_dashboard_log_compare_addresses);
+
+ gimp_dashboard_log_printf (dashboard,
+ "\n"
+ "<address-map>\n");
+
+ n = 0;
+
+ for (i = 0; i < n_addresses; i++)
+ {
+ GimpBacktraceSymbolInfo *info = &infos[n % 2];
+ const GimpBacktraceSymbolInfo *prev_info = &infos[(n + 1) % 2];
+
+ if (gimp_async_is_canceled (async))
+ break;
+
+ if (gimp_backtrace_get_symbol_info (addresses[i], info))
+ {
+ gboolean empty = TRUE;
+
+ #define NONEMPTY() \
+ G_STMT_START \
+ { \
+ if (empty) \
+ { \
+ gimp_dashboard_log_printf (dashboard, \
+ ">\n"); \
+ \
+ empty = FALSE; \
+ } \
+ } \
+ G_STMT_END
+
+ gimp_dashboard_log_printf (dashboard,
+ "\n"
+ "<address value=\"0x%llx\"",
+ (unsigned long long) addresses[i]);
+
+ if (n == 0 || strcmp (info->object_name, prev_info->object_name))
+ {
+ NONEMPTY ();
+
+ if (info->object_name[0])
+ {
+ gimp_dashboard_log_printf (dashboard,
+ "<object>");
+ gimp_dashboard_log_print_escaped (dashboard,
+ info->object_name);
+ gimp_dashboard_log_printf (dashboard,
+ "</object>\n");
+ }
+ else
+ {
+ gimp_dashboard_log_printf (dashboard,
+ "<object />\n");
+ }
+ }
+
+ if (n == 0 || strcmp (info->symbol_name, prev_info->symbol_name))
+ {
+ NONEMPTY ();
+
+ if (info->symbol_name[0])
+ {
+ gimp_dashboard_log_printf (dashboard,
+ "<symbol>");
+ gimp_dashboard_log_print_escaped (dashboard,
+ info->symbol_name);
+ gimp_dashboard_log_printf (dashboard,
+ "</symbol>\n");
+ }
+ else
+ {
+ gimp_dashboard_log_printf (dashboard,
+ "<symbol />\n");
+ }
+ }
+
+ if (n == 0 || info->symbol_address != prev_info->symbol_address)
+ {
+ NONEMPTY ();
+
+ if (info->symbol_address)
+ {
+ gimp_dashboard_log_printf (dashboard,
+ "<base>0x%llx</base>\n",
+ (unsigned long long)
+ info->symbol_address);
+ }
+ else
+ {
+ gimp_dashboard_log_printf (dashboard,
+ "<base />\n");
+ }
+ }
+
+ if (empty)
+ {
+ gimp_dashboard_log_printf (dashboard,
+ " />\n");
+ }
+ else
+ {
+ gimp_dashboard_log_printf (dashboard,
+ "</address>\n");
+ }
+
+ #undef NONEMPTY
+
+ n++;
+ }
+ }
+
+ g_free (addresses);
+
+ gimp_dashboard_log_printf (dashboard,
+ "\n"
+ "</address-map>\n");
+
+ gimp_async_finish (async, NULL);
+}
+
static gboolean
gimp_dashboard_field_use_meter_underlay (Group group,
gint field)
@@ -3326,30 +4090,300 @@ gimp_dashboard_new (Gimp *gimp,
return GTK_WIDGET (dashboard);
}
+gboolean
+gimp_dashboard_log_start_recording (GimpDashboard *dashboard,
+ GFile *file,
+ GError **error)
+{
+ GimpDashboardPrivate *priv;
+ GimpUIManager *ui_manager;
+ GimpActionGroup *action_group;
+ gchar *version;
+ gboolean has_backtrace;
+ Variable variable;
+
+ g_return_val_if_fail (GIMP_IS_DASHBOARD (dashboard), FALSE);
+ g_return_val_if_fail (G_IS_FILE (file), FALSE);
+ g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+ priv = dashboard->priv;
+
+ g_return_val_if_fail (! gimp_dashboard_log_is_recording (dashboard), FALSE);
+
+ g_mutex_lock (&priv->mutex);
+
+ priv->log_output = G_OUTPUT_STREAM (g_file_replace (file,
+ NULL, FALSE, G_FILE_CREATE_NONE, NULL,
+ error));
+
+ if (! priv->log_output)
+ {
+ g_mutex_unlock (&priv->mutex);
+
+ return FALSE;
+ }
+
+ priv->log_error = NULL;
+ priv->log_start_time = g_get_monotonic_time ();
+ priv->log_sample_frequency = LOG_SAMPLE_FREQUENCY;
+ priv->log_n_samples = 0;
+ priv->log_n_markers = 0;
+ priv->log_include_backtrace = TRUE;
+ priv->log_backtrace = NULL;
+ priv->log_addresses = g_hash_table_new (NULL, NULL);
+
+ if (g_getenv ("GIMP_PERFORMANCE_LOG_SAMPLE_FREQUENCY"))
+ {
+ priv->log_sample_frequency =
+ atoi (g_getenv ("GIMP_PERFORMANCE_LOG_SAMPLE_FREQUENCY"));
+
+ priv->log_sample_frequency = CLAMP (priv->log_sample_frequency,
+ 1, 1000);
+ }
+
+ if (g_getenv ("GIMP_PERFORMANCE_LOG_NO_BACKTRACE"))
+ priv->log_include_backtrace = FALSE;
+
+ if (priv->log_include_backtrace)
+ has_backtrace = gimp_backtrace_init ();
+ else
+ has_backtrace = FALSE;
+
+ gimp_dashboard_log_printf (dashboard,
+ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+ "<gimp-performance-log version=\"%d\">\n",
+ LOG_VERSION);
+
+ version = gimp_version (TRUE, FALSE);
+
+ gimp_dashboard_log_printf (dashboard,
+ "\n"
+ "<gimp-version>\n");
+ gimp_dashboard_log_print_escaped (dashboard, version);
+ gimp_dashboard_log_printf (dashboard,
+ "</gimp-version>\n");
+
+ g_free (version);
+
+ gimp_dashboard_log_printf (dashboard,
+ "\n"
+ "<params>\n"
+ "<sample-frequency>%d</sample-frequency>\n"
+ "<backtrace>%d</backtrace>\n"
+ "</params>\n",
+ priv->log_sample_frequency,
+ has_backtrace);
+
+ gimp_dashboard_log_printf (dashboard,
+ "\n"
+ "<var-defs>\n");
+
+ for (variable = FIRST_VARIABLE; variable < N_VARIABLES; variable++)
+ {
+ const VariableInfo *variable_info = &variables[variable];
+ const gchar *type = "";
+
+ if (variable_info->exclude_from_log)
+ continue;
+
+ switch (variable_info->type)
+ {
+ case VARIABLE_TYPE_BOOLEAN: type = "boolean"; break;
+ case VARIABLE_TYPE_INTEGER: type = "integer"; break;
+ case VARIABLE_TYPE_SIZE: type = "size"; break;
+ case VARIABLE_TYPE_SIZE_RATIO: type = "size-ratio"; break;
+ case VARIABLE_TYPE_INT_RATIO: type = "int-ratio"; break;
+ case VARIABLE_TYPE_PERCENTAGE: type = "percentage"; break;
+ case VARIABLE_TYPE_DURATION: type = "duration"; break;
+ case VARIABLE_TYPE_RATE_OF_CHANGE: type = "rate-of-change"; break;
+ }
+
+ gimp_dashboard_log_printf (dashboard,
+ "<var name=\"%s\" type=\"%s\" />\n",
+ variable_info->name,
+ type);
+ }
+
+ gimp_dashboard_log_printf (dashboard,
+ "</var-defs>\n");
+
+ gimp_dashboard_log_printf (dashboard,
+ "\n"
+ "<samples>\n");
+
+ if (priv->log_error)
+ {
+ gimp_backtrace_shutdown ();
+
+ g_clear_object (&priv->log_output);
+
+ g_propagate_error (error, priv->log_error);
+ priv->log_error = NULL;
+
+ g_mutex_unlock (&priv->mutex);
+
+ return FALSE;
+ }
+
+ gimp_dashboard_reset_unlocked (dashboard);
+
+ priv->update_now = TRUE;
+ g_cond_signal (&priv->cond);
+
+ g_mutex_unlock (&priv->mutex);
+
+ gimp_dashboard_log_update_n_markers (dashboard);
+
+ ui_manager = gimp_editor_get_ui_manager (GIMP_EDITOR (dashboard));
+ action_group = gimp_ui_manager_get_action_group (ui_manager, "dashboard");
+
+ gimp_action_group_update (action_group, dashboard);
+
+ gimp_dashboard_log_update_highlight (dashboard);
+
+ return TRUE;
+}
+
+gboolean
+gimp_dashboard_log_stop_recording (GimpDashboard *dashboard,
+ GError **error)
+{
+ GimpDashboardPrivate *priv;
+ GimpUIManager *ui_manager;
+ GimpActionGroup *action_group;
+ gboolean result = TRUE;
+
+ g_return_val_if_fail (GIMP_IS_DASHBOARD (dashboard), FALSE);
+ g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+ priv = dashboard->priv;
+
+ if (! gimp_dashboard_log_is_recording (dashboard))
+ return TRUE;
+
+ g_mutex_lock (&priv->mutex);
+
+ if (priv->log_include_backtrace)
+ gimp_backtrace_shutdown ();
+
+ gimp_dashboard_log_printf (dashboard,
+ "\n"
+ "</samples>\n");
+
+
+ if (g_hash_table_size (priv->log_addresses) > 0)
+ {
+ GimpAsync *async;
+
+ async = gimp_parallel_run_async_full (
+ -1,
+ (GimpParallelRunAsyncFunc) gimp_dashboard_log_write_address_map,
+ dashboard, NULL);
+
+ gimp_wait (priv->gimp, GIMP_WAITABLE (async),
+ _("Resolving symbol information..."));
+
+ g_object_unref (async);
+ }
+
+ gimp_dashboard_log_printf (dashboard,
+ "\n"
+ "</gimp-performance-log>\n");
+
+ if (! priv->log_error)
+ g_output_stream_close (priv->log_output, NULL, &priv->log_error);
+
+ g_clear_object (&priv->log_output);
+
+ if (priv->log_error)
+ {
+ g_propagate_error (error, priv->log_error);
+ priv->log_error = NULL;
+
+ result = FALSE;
+ }
+
+ g_clear_pointer (&priv->log_backtrace, gimp_backtrace_free);
+ g_clear_pointer (&priv->log_addresses, g_hash_table_unref);
+
+ g_mutex_unlock (&priv->mutex);
+
+ ui_manager = gimp_editor_get_ui_manager (GIMP_EDITOR (dashboard));
+ action_group = gimp_ui_manager_get_action_group (ui_manager, "dashboard");
+
+ gimp_action_group_update (action_group, dashboard);
+
+ gimp_dashboard_log_update_highlight (dashboard);
+
+ return result;
+}
+
+gboolean
+gimp_dashboard_log_is_recording (GimpDashboard *dashboard)
+{
+ GimpDashboardPrivate *priv;
+
+ g_return_val_if_fail (GIMP_IS_DASHBOARD (dashboard), FALSE);
+
+ priv = dashboard->priv;
+
+ return priv->log_output != NULL;
+}
+
void
-gimp_dashboard_reset (GimpDashboard *dashboard)
+gimp_dashboard_log_add_marker (GimpDashboard *dashboard,
+ const gchar *description)
{
GimpDashboardPrivate *priv;
- Group group;
g_return_if_fail (GIMP_IS_DASHBOARD (dashboard));
+ g_return_if_fail (gimp_dashboard_log_is_recording (dashboard));
priv = dashboard->priv;
g_mutex_lock (&priv->mutex);
- gegl_reset_stats ();
+ priv->log_n_markers++;
- gimp_dashboard_reset_variables (dashboard);
+ gimp_dashboard_log_printf (dashboard,
+ "\n"
+ "<marker id=\"%d\" t=\"%lld\"",
+ priv->log_n_markers,
+ (long long) gimp_dashboard_log_time (dashboard));
- for (group = FIRST_GROUP; group < N_GROUPS; group++)
+ if (description && description[0])
{
- GroupData *group_data = &priv->groups[group];
-
- if (group_data->meter)
- gimp_meter_clear_history (group_data->meter);
+ gimp_dashboard_log_printf (dashboard,
+ ">\n");
+ gimp_dashboard_log_print_escaped (dashboard, description);
+ gimp_dashboard_log_printf (dashboard,
+ "\n"
+ "</marker>\n");
+ }
+ else
+ {
+ gimp_dashboard_log_printf (dashboard,
+ " />\n");
}
+ g_mutex_unlock (&priv->mutex);
+
+ gimp_dashboard_log_update_n_markers (dashboard);
+}
+
+void
+gimp_dashboard_reset (GimpDashboard *dashboard)
+{
+ GimpDashboardPrivate *priv;
+
+ g_return_if_fail (GIMP_IS_DASHBOARD (dashboard));
+
+ priv = dashboard->priv;
+
+ g_mutex_lock (&priv->mutex);
+
+ gimp_dashboard_reset_unlocked (dashboard);
+
priv->update_now = TRUE;
g_cond_signal (&priv->cond);
diff --git a/app/widgets/gimpdashboard.h b/app/widgets/gimpdashboard.h
index d39e3634bf..3255775cd0 100644
--- a/app/widgets/gimpdashboard.h
+++ b/app/widgets/gimpdashboard.h
@@ -51,25 +51,34 @@ struct _GimpDashboardClass
GType gimp_dashboard_get_type (void) G_GNUC_CONST;
-GtkWidget * gimp_dashboard_new (Gimp *gimp,
- GimpMenuFactory
*menu_factory);
-
-void gimp_dashboard_reset (GimpDashboard
*dashboard);
-
-void gimp_dashboard_set_update_interval (GimpDashboard
*dashboard,
- GimpDashboardUpdateInteval
update_interval);
-GimpDashboardUpdateInteval gimp_dashboard_get_update_interval (GimpDashboard
*dashboard);
-
-void gimp_dashboard_set_history_duration (GimpDashboard
*dashboard,
- GimpDashboardHistoryDuration
history_duration);
-GimpDashboardHistoryDuration gimp_dashboard_get_history_duration (GimpDashboard
*dashboard);
-
-void gimp_dashboard_set_low_swap_space_warning (GimpDashboard
*dashboard,
- gboolean
low_swap_space_warning);
-gboolean gimp_dashboard_get_low_swap_space_warning (GimpDashboard
*dashboard);
-
-void gimp_dashboard_menu_setup (GimpUIManager
*manager,
- const gchar
*ui_path);
+GtkWidget * gimp_dashboard_new (Gimp
*gimp,
+ GimpMenuFactory
*menu_factory);
+
+gboolean gimp_dashboard_log_start_recording (GimpDashboard
*dashboard,
+ GFile
*file,
+ GError
**error);
+gboolean gimp_dashboard_log_stop_recording (GimpDashboard
*dashboard,
+ GError
**error);
+gboolean gimp_dashboard_log_is_recording (GimpDashboard
*dashboard);
+void gimp_dashboard_log_add_marker (GimpDashboard
*dashboard,
+ const gchar
*description);
+
+void gimp_dashboard_reset (GimpDashboard
*dashboard);
+
+void gimp_dashboard_set_update_interval (GimpDashboard
*dashboard,
+ GimpDashboardUpdateInteval
update_interval);
+GimpDashboardUpdateInteval gimp_dashboard_get_update_interval (GimpDashboard
*dashboard);
+
+void gimp_dashboard_set_history_duration (GimpDashboard
*dashboard,
+ GimpDashboardHistoryDuration
history_duration);
+GimpDashboardHistoryDuration gimp_dashboard_get_history_duration (GimpDashboard
*dashboard);
+
+void gimp_dashboard_set_low_swap_space_warning (GimpDashboard
*dashboard,
+ gboolean
low_swap_space_warning);
+gboolean gimp_dashboard_get_low_swap_space_warning (GimpDashboard
*dashboard);
+
+void gimp_dashboard_menu_setup (GimpUIManager
*manager,
+ const gchar
*ui_path);
#endif /* __GIMP_DASHBOARD_H__ */
diff --git a/app/widgets/gimphelp-ids.h b/app/widgets/gimphelp-ids.h
index 9c2b232590..450dfd7de3 100644
--- a/app/widgets/gimphelp-ids.h
+++ b/app/widgets/gimphelp-ids.h
@@ -674,6 +674,9 @@
#define GIMP_HELP_DASHBOARD_GROUPS "gimp-dashboard-groups"
#define GIMP_HELP_DASHBOARD_UPDATE_INTERVAL "gimp-dashboard-update-interval"
#define GIMP_HELP_DASHBOARD_HISTORY_DURATION "gimp-dashboard-history-duration"
+#define GIMP_HELP_DASHBOARD_LOG_RECORD "gimp-dashboard-log-record"
+#define GIMP_HELP_DASHBOARD_LOG_ADD_MARKER "gimp-dashboard-log-add-marker"
+#define GIMP_HELP_DASHBOARD_LOG_ADD_EMPTY_MARKER "gimp-dashboard-log-add-empty-marker"
#define GIMP_HELP_DASHBOARD_RESET "gimp-dashboard-reset"
#define GIMP_HELP_DASHBOARD_LOW_SWAP_SPACE_WARNING "gimp-dashboard-low-swap-space-warning"
diff --git a/icons/Color/16/gimp-marker.png b/icons/Color/16/gimp-marker.png
new file mode 100644
index 0000000000..f75eecb6bf
Binary files /dev/null and b/icons/Color/16/gimp-marker.png differ
diff --git a/icons/Color/16/media-record.png b/icons/Color/16/media-record.png
new file mode 100644
index 0000000000..aaaf2ee5b4
Binary files /dev/null and b/icons/Color/16/media-record.png differ
diff --git a/icons/Color/color-scalable.svg b/icons/Color/color-scalable.svg
index d25998923b..27efde655d 100644
--- a/icons/Color/color-scalable.svg
+++ b/icons/Color/color-scalable.svg
@@ -13,7 +13,7 @@
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
viewBox="0 0 1411.4984 384.2294"
sodipodi:docname="color-scalable.svg"
- inkscape:version="0.92.2 2405546, 2018-03-11"
+ inkscape:version="0.92.3 (2405546, 2018-03-11)"
id="svg"
height="384.2294"
width="1411.4984"
@@ -59,15 +59,15 @@
showborder="false"
inkscape:current-layer="stock"
inkscape:window-maximized="1"
- inkscape:window-y="27"
- inkscape:window-x="0"
- inkscape:cy="166.99597"
- inkscape:cx="794.81478"
- inkscape:zoom="10.24"
+ inkscape:window-y="24"
+ inkscape:window-x="65"
+ inkscape:cy="118.27566"
+ inkscape:cx="616.06499"
+ inkscape:zoom="1"
showgrid="false"
id="namedview88"
- inkscape:window-height="741"
- inkscape:window-width="1366"
+ inkscape:window-height="876"
+ inkscape:window-width="1535"
inkscape:pageshadow="2"
inkscape:pageopacity="0"
guidetolerance="10"
@@ -18338,6 +18338,27 @@
y1="234.1875"
x2="76.0625"
y2="252.02119" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient846"
+ id="linearGradient848"
+ x1="2.1166668"
+ y1="293.29581"
+ x2="2.1166668"
+ y2="296.47083"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient846">
+ <stop
+ style="stop-color:#f95757;stop-opacity:1"
+ offset="0"
+ id="stop842" />
+ <stop
+ style="stop-color:#d91919;stop-opacity:1"
+ offset="1"
+ id="stop844" />
+ </linearGradient>
</defs>
<g
inkscape:groupmode="layer"
@@ -36523,7 +36544,7 @@
inkscape:connector-curvature="0" />
<path
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ce5c00;fill-opacity:1;fill-ru
le:nonze
ro;stroke:none;stroke-width:0.39487001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
- d="m 7.5136719,1038.3633 v 0.022 c -0.00453,9e-4 -0.00915,9e-4 -0.013672,0 -0.7838827,0.147
-1.0722728,1.1571 -0.4882812,1.7051 l 2.2324218,2.2676 H 3 v 1.9863 h 6.25 l -2.2441406,2.2793 h 0.00195 c
-0.2254897,0.2257 -0.3227676,0.5024 -0.3085937,0.7598 0.014174,0.2574 0.1304023,0.4909 0.3027343,0.666
0.172332,0.1751 0.4042657,0.296 0.6601563,0.3105 0.2558906,0.015 0.5298386,-0.085 0.7519531,-0.3144 l
3.9179685,-3.9824 0.667969,-0.709 -0.667969,-0.709 -3.9160154,-3.9785 c -0.1839276,-0.1933 -0.4391596,-0.3041
-0.7050781,-0.3047 z m 0.1953125,0.3945 h 0.00195 c 0.1576386,4e-4 0.3094092,0.065 0.4199219,0.1817 v 0 l
3.9179686,3.9785 0.408203,0.4356 -0.408203,0.4355 -3.9179686,3.9805 c -0.1532572,0.1581 -0.3025366,0.2035
-0.4472656,0.1953 -0.1447291,-0.01 -0.2897546,-0.081 -0.4003907,-0.1934 -0.1106361,-0.1124 -0.1812098,-0.2604
-0.1894531,-0.4101 -0.00824,-0.1497 0.037816,-0.3033 0.1933594,-0.459 v -0 l 2.9042966,-2.9511 H 3.3945312 v
-1.1973 h 6.7910158 l -2.9003908,-2
.9473 -0
.00391,-0 c -0.3651457,-0.3426 -0.1929869,-0.9397 0.2929688,-1.0293 h 0.00391 l 0.00195,-0 c 0.04229,-0.01
0.085671,-0.014 0.1289063,-0.014 z"
+ d="m 7.5136719,1038.3633 v 0.022 c -0.00453,9e-4 -0.00915,9e-4 -0.013672,0 -0.7838827,0.147
-1.0722728,1.1571 -0.4882812,1.7051 l 2.2324218,2.2676 H 3 v 1.9863 h 6.25 l -2.2441406,2.2793 h 0.00195 c
-0.2254897,0.2257 -0.3227676,0.5024 -0.3085937,0.7598 0.014174,0.2574 0.1304023,0.4909 0.3027343,0.666
0.172332,0.1751 0.4042657,0.296 0.6601563,0.3105 0.2558906,0.015 0.5298386,-0.085 0.7519531,-0.3144 l
3.9179686,-3.9824 0.667969,-0.709 -0.667969,-0.709 -3.9160155,-3.9785 c -0.1839276,-0.1933 -0.4391596,-0.3041
-0.7050781,-0.3047 z m 0.1953125,0.3945 h 0.00195 c 0.1576386,4e-4 0.3094092,0.065 0.4199219,0.1817 v 0 l
3.9179687,3.9785 0.408203,0.4356 -0.408203,0.4355 -3.9179687,3.9805 c -0.1532572,0.1581 -0.3025366,0.2035
-0.4472656,0.1953 -0.1447291,-0.01 -0.2897546,-0.081 -0.4003907,-0.1934 -0.1106361,-0.1124 -0.1812098,-0.2604
-0.1894531,-0.4101 -0.00824,-0.1497 0.037816,-0.3033 0.1933594,-0.459 v 0 l 2.9042967,-2.9511 H 3.3945312 v
-1.1973 h 6.7910158 l -2.9003908,-2.
9473 h -
0.00391 c -0.3651457,-0.3426 -0.1929869,-0.9397 0.2929688,-1.0293 h 0.00391 0.00195 c 0.04229,-0.01
0.085671,-0.014 0.1289063,-0.014 z"
id="path82351"
inkscape:connector-curvature="0" />
</g>
@@ -38645,7 +38666,7 @@
transform="matrix(0.10215483,0,0,0.10215483,-0.52798284,140.10035)" />
<path
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;str
oke-widt
h:0.30645564;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
- d="m 9.4824219,142.31641 c -4.3202035,0.10957 -7.7949219,3.65425 -7.7949219,8 0,4.4147
3.5850582,8 8,8 4.414942,0 8,-3.5853 8,-8 0,-4.41471 -3.585058,-8 -8,-8 -0.06467,0 -0.1317841,-0.002
-0.2050781,0 z m 0.00781,0.30664 c 0.061265,-0.002 0.1265593,0 0.1972656,0 4.249196,0 7.693359,3.44442
7.693359,7.69336 0,4.24893 -3.444163,7.69336 -7.693359,7.69336 -4.2491956,0 -7.6933594,-3.44443
-7.6933594,-7.69336 0,-4.18251 3.3390492,-7.58793 7.4960938,-7.69336 z m 0.1972656,2.5 c -2.8660266,0
-5.1933594,2.32748 -5.1933594,5.19336 0,2.86587 2.3273325,5.19336 5.1933594,5.19336 2.866028,0
5.193358,-2.32749 5.193359,-5.19336 0,-2.86588 -2.327331,-5.19336 -5.193359,-5.19336 z m 0,0.30664 c
2.70032,0 4.886719,2.18657 4.886719,4.88672 -10e-7,2.70014 -2.186399,4.88671 -4.886719,4.88671 -2.7003185,0
-4.8867187,-2.18657 -4.8867188,-4.88671 0,-2.70015 2.1864,-4.88672 4.8867188,-4.88672 z"
+ d="m 9.4824219,142.31641 c -4.3202035,0.10957 -7.7949219,3.65425 -7.7949219,8 0,4.4147
3.5850582,8 8,8 4.414942,0 8,-3.5853 8,-8 0,-4.41471 -3.585058,-8 -8,-8 -0.06467,0 -0.1317841,-0.002
-0.2050781,0 z m 0.00781,0.30664 c 0.061265,-0.002 0.1265593,0 0.1972656,0 4.2491965,0 7.6933585,3.44442
7.6933585,7.69336 0,4.24893 -3.444162,7.69336 -7.6933585,7.69336 -4.2491956,0 -7.6933594,-3.44443
-7.6933594,-7.69336 0,-4.18251 3.3390492,-7.58793 7.4960938,-7.69336 z m 0.1972656,2.5 c -2.8660266,0
-5.1933594,2.32748 -5.1933594,5.19336 0,2.86587 2.3273325,5.19336 5.1933594,5.19336 2.8660275,0
5.1933575,-2.32749 5.1933595,-5.19336 0,-2.86588 -2.327332,-5.19336 -5.1933595,-5.19336 z m 0,0.30664 c
2.7003195,0 4.8867185,2.18657 4.8867185,4.88672 -10e-7,2.70014 -2.186399,4.88671 -4.8867185,4.88671
-2.7003185,0 -4.8867187,-2.18657 -4.8867188,-4.88671 0,-2.70015 2.1864,-4.88672 4.8867188,-4.88672 z"
id="path4644-9"
inkscape:connector-curvature="0" />
</g>
@@ -44184,7 +44205,7 @@
inkscape:r_cy="true"
inkscape:r_cx="true"
id="path4926"
- d="M 7.8738374,1044.3622 C 6.8302869,1044.4246 6,1045.2489 6,1046.2491 c 0,0.039 0.00388,0.075
0.00629,0.1131 h 3.9874254 c 0.00241,-0.038 0.00629,-0.074 0.00629,-0.1131 0,-1.0409 -0.8967349,-1.8869
-1.9999944,-1.8869 -0.043099,0 -0.083767,0 -0.1261851,0 z"
+ d="M 7.8738374,1044.3622 C 6.8302869,1044.4246 6,1045.2489 6,1046.2491 c 0,0.039 0.00388,0.075
0.00629,0.1131 h 3.9874254 c 0.00241,-0.038 0.00629,-0.074 0.00629,-0.1131 0,-1.0409 -0.8967289,-1.8869
-1.9999884,-1.8869 -0.043099,0 -0.083767,0 -0.1261851,0 z"
style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#fffbd7;fill-opacity:0.55681817;fill-rule:evenodd;stroke:none;stroke-width:1.01903164;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
inkscape:connector-curvature="0" />
</g>
@@ -46478,7 +46499,7 @@
inkscape:connector-curvature="0" />
<path
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#f57900;fill-opacity:1;fill-rule:nonzero;stroke:none;strok
e-width:
0.34453622;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
- d="m 9.1855469,1036.3574 -0.1777344,0 c -0.5321994,0.012 -0.9670855,0.4423 -0.9589844,0.9688 v
0.3769 c -0.6451718,-0.4901 -1.3673681,-0.8909 -2.1855469,-1.0234 -0.5531686,-0.089 -1.711981,-0.1947
-2.3203124,-0.043 -1.2624642,0.3152 -2.0326618,0.9216 -2.76367192,1.9668 -0.45565198,0.6515 -0.6698189,1.0587
-0.75195313,1.6699 -0.08213423,0.6113 -0.04401275,1.4134 -0.04296875,2.9336 v 0.1719 h 2.1582031 l
0.00781,-0.166 c 0.0396,-0.9477 -0.019625,-1.5509 -0.017578,-2.0137 0.00205,-0.4627 0.054606,-0.7772
0.3242187,-1.2343 0.4148127,-0.7035 1.2281829,-1.2911 2.0273438,-1.4024 0.8092285,-0.1127 1.6856145,0.1711
2.3671875,0.6699 H 6.0800781 c -0.3161577,0 -0.5755994,0.1421 -0.7382812,0.3477 -0.1626818,0.2055
-0.2366178,0.4671 -0.2363281,0.7265 2.896e-4,0.2595 0.075235,0.5212 0.2382812,0.7266 0.1630459,0.2054
0.4221245,0.3457 0.7382812,0.3457 H 10.001953 L 10,1037.332 c 0.0072,-0.4705 -0.3627225,-0.8126
-0.8144531,-0.8984 z m -0.171875,0.3516 c 5.6e-4,0 0.00139,0 0.00195,0
0.36072
81,-0.01 0.6458924,0.2748 0.640625,0.6172 v 0 l 0.00195,3.711 H 6.0820312 c -0.2195515,0 -0.3635641,-0.084
-0.46875,-0.2168 -0.1051858,-0.1326 -0.163849,-0.3206 -0.1640624,-0.5118 -2.135e-4,-0.1911 0.059267,-0.3812
0.1640624,-0.5136 0.1047959,-0.1324 0.2472441,-0.2168 0.4667969,-0.2168 h 1.7441407 l -0.2558594,-0.2871 c
-0.7693775,-0.8617 -2.0360981,-1.2209 -3.1308594,-1.0684 -0.9279067,0.1293 -1.80689,0.7725 -2.2773438,1.5703
-0.2968477,0.5034 -0.3708693,0.9159 -0.3730468,1.4082 -0.002,0.4515 0.037322,1.0348 0.015625,1.834 H
0.33007812 c -0.004043,-1.3554 -0.0312834,-2.1913 0.0390625,-2.7148 0.0747993,-0.5567 0.24444467,-0.8785
0.69140628,-1.5176 0.7032918,-1.0056 1.3700771,-1.5314 2.5664062,-1.8301 0.455007,-0.1135 1.6695391,-0.034
2.1816407,0.049 0.8602946,0.1393 1.6543449,0.5181 2.3007812,1.0762 l 0.2851562,0.2461 v -1.0215 c
-0.00514,-0.3339 0.2663133,-0.6056 0.6191407,-0.6152 z"
+ d="M 9.1855469,1036.3574 H 9.0078125 c -0.5321994,0.012 -0.9670855,0.4423 -0.9589844,0.9688 v
0.3769 c -0.6451718,-0.4901 -1.3673681,-0.8909 -2.1855469,-1.0234 -0.5531686,-0.089 -1.711981,-0.1947
-2.3203124,-0.043 -1.2624642,0.3152 -2.0326618,0.9216 -2.76367192,1.9668 -0.45565198,0.6515 -0.6698189,1.0587
-0.75195313,1.6699 -0.08213423,0.6113 -0.04401275,1.4134 -0.04296875,2.9336 v 0.1719 h 2.1582031 l
0.00781,-0.166 c 0.0396,-0.9477 -0.019625,-1.5509 -0.017578,-2.0137 0.00205,-0.4627 0.054606,-0.7772
0.3242187,-1.2343 0.4148127,-0.7035 1.2281829,-1.2911 2.0273438,-1.4024 0.8092285,-0.1127 1.6856145,0.1711
2.3671875,0.6699 h -0.771482 c -0.3161577,0 -0.5755994,0.1421 -0.7382812,0.3477 -0.1626818,0.2055
-0.2366178,0.4671 -0.2363281,0.7265 2.896e-4,0.2595 0.075235,0.5212 0.2382812,0.7266 0.1630459,0.2054
0.4221245,0.3457 0.7382812,0.3457 H 10.001953 L 10,1037.332 c 0.0072,-0.4705 -0.3627225,-0.8126
-0.8144531,-0.8984 z m -0.171875,0.3516 c 5.6e-4,0 0.00139,0 0.00195,0
0.360728
1,-0.01 0.6458924,0.2748 0.640625,0.6172 v 0 l 0.00195,3.711 H 6.0820312 c -0.2195515,0 -0.3635641,-0.084
-0.46875,-0.2168 -0.1051858,-0.1326 -0.163849,-0.3206 -0.1640624,-0.5118 -2.135e-4,-0.1911 0.059267,-0.3812
0.1640624,-0.5136 0.1047959,-0.1324 0.2472441,-0.2168 0.4667969,-0.2168 h 1.7441407 l -0.2558594,-0.2871 c
-0.7693775,-0.8617 -2.0360981,-1.2209 -3.1308594,-1.0684 -0.9279067,0.1293 -1.80689,0.7725 -2.2773438,1.5703
-0.2968477,0.5034 -0.3708693,0.9159 -0.3730468,1.4082 -0.002,0.4515 0.037322,1.0348 0.015625,1.834 H
0.33007812 c -0.004043,-1.3554 -0.0312834,-2.1913 0.0390625,-2.7148 0.0747993,-0.5567 0.24444467,-0.8785
0.69140628,-1.5176 0.7032918,-1.0056 1.3700771,-1.5314 2.5664062,-1.8301 0.455007,-0.1135 1.6695391,-0.034
2.1816407,0.049 0.8602946,0.1393 1.6543449,0.5181 2.3007812,1.0762 l 0.2851562,0.2461 v -1.0215 c
-0.00514,-0.3339 0.2663133,-0.6056 0.6191407,-0.6152 z"
id="path82304"
inkscape:connector-curvature="0" />
</g>
@@ -46945,7 +46966,7 @@
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#fcaf3e;fill-opacity:1;stroke:none;stroke-width:0.27636784;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate"
/>
<path
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ce5c00;fill-opacity:1;fill-ru
le:nonze
ro;stroke:none;stroke-width:0.27636784;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
- d="m 3.1601562,1040.8633 v 0.014 c -0.00261,5e-4 -0.00521,0 -0.00781,0 -0.5503109,0.1014
-0.7530579,0.8094 -0.34375,1.1934 l 1.5605468,1.5859 H 0 v 1.3906 h 4.375 l -1.5703125,1.5957 c
-0.158434,0.1576 -0.2283037,0.3511 -0.21875,0.5313 0.00958,0.1807 0.091845,0.3458 0.2128906,0.4687
0.1210459,0.123 0.2851019,0.207 0.4648438,0.2168 0.1791768,0.01 0.3702825,-0.062 0.5253906,-0.2226 L
6.5332031,1044.8535 7,1044.3574 l -0.4667969,-0.498 -2.7421875,-2.7832 c -0.1288007,-0.1352
-0.3061043,-0.2126 -0.4921875,-0.2129 z m 0.1367188,0.2754 c 0.1103395,2e-4 0.2175343,0.046 0.2949219,0.1269
v 0 l 2.7421875,2.7851 0.2871094,0.3047 -0.2871094,0.3028 -2.7421875,2.7851 v 0 c -0.1073624,0.1119
-0.2128465,0.1442 -0.3144531,0.1386 -0.1016067,-0.01 -0.2034716,-0.056 -0.28125,-0.1347 -0.077778,-0.079
-0.1272445,-0.1841 -0.1328126,-0.2891 -0.00557,-0.105 0.026549,-0.2132 0.1367188,-0.3223 l 2.0351562,-2.0664
H 0.27734375 v -0.8379 H 5.0292969 L 3,1041.873 l -0.00195,-0 c -0.2555848,-0.23
98 -0.13
70748,-0.658 0.203125,-0.7207 h 0.00391 l 0.00195,-0 c 0.029597,-0.01 0.059563,-0.01 0.089844,-0.01 z"
+ d="m 3.1601562,1040.8633 v 0.014 c -0.00261,5e-4 -0.00521,0 -0.00781,0 -0.5503109,0.1014
-0.7530579,0.8094 -0.34375,1.1934 l 1.5605468,1.5859 H 0 v 1.3906 h 4.375 l -1.5703125,1.5957 c
-0.158434,0.1576 -0.2283037,0.3511 -0.21875,0.5313 0.00958,0.1807 0.091845,0.3458 0.2128906,0.4687
0.1210459,0.123 0.2851019,0.207 0.4648438,0.2168 0.1791768,0.01 0.3702825,-0.062 0.5253906,-0.2226 L
6.5332031,1044.8535 7,1044.3574 l -0.4667969,-0.498 -2.7421875,-2.7832 c -0.1288007,-0.1352
-0.3061043,-0.2126 -0.4921875,-0.2129 z m 0.1367188,0.2754 c 0.1103395,2e-4 0.2175343,0.046 0.2949219,0.1269
v 0 l 2.7421875,2.7851 0.2871094,0.3047 -0.2871094,0.3028 -2.7421875,2.7851 v 0 c -0.1073624,0.1119
-0.2128465,0.1442 -0.3144531,0.1386 -0.1016067,-0.01 -0.2034716,-0.056 -0.28125,-0.1347 -0.077778,-0.079
-0.1272445,-0.1841 -0.1328126,-0.2891 -0.00557,-0.105 0.026549,-0.2132 0.1367188,-0.3223 l 2.0351562,-2.0664
H 0.27734375 v -0.8379 H 5.0292969 L 3,1041.873 H 2.99805 c -0.2555848,-0.2398 -
0.137074
8,-0.658 0.203125,-0.7207 h 0.00391 0.00195 c 0.029597,-0.01 0.059563,-0.01 0.089844,-0.01 z"
id="path82224"
inkscape:connector-curvature="0" />
<path
@@ -46955,7 +46976,7 @@
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#fcaf3e;fill-opacity:1;stroke:none;stroke-width:0.27636784;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate"
/>
<path
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ce5c00;fill-opacity:1;fill-ru
le:nonze
ro;stroke:none;stroke-width:0.27636784;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
- d="m 12.701172,1040.8633 c -0.185192,3e-4 -0.361582,0.077 -0.490234,0.2109 L 9.4667969,1043.8594
9,1044.3574 l 0.4667969,0.4961 2.7441411,2.7852 c 0.155108,0.1609 0.346217,0.2324 0.52539,0.2226
0.179739,-0.01 0.3438,-0.094 0.464844,-0.2168 0.121044,-0.1229 0.203305,-0.288 0.21289,-0.4687 0.0096,-0.1802
-0.06032,-0.3737 -0.21875,-0.5313 v -0 L 11.625,1045.0488 H 16 v -1.3906 h -4.369141 l 1.560547,-1.5859 c
0.409308,-0.384 0.206561,-1.092 -0.34375,-1.1934 -0.0026,-6e-4 -0.0052,-0 -0.0078,-0 v -0.014 z m
0.002,0.2754 c 0.03028,-2e-4 0.06025,0 0.08984,0.01 l 0.002,0 h 0.0039 c 0.3402,0.063 0.45871,0.4809
0.203125,0.7207 l -0.002,0 -2.029297,2.0625 h 4.753906 v 0.8379 H 10.964844 L 13,1046.8398 c 0.110163,0.1091
0.142288,0.2173 0.136719,0.3223 -0.0056,0.105 -0.05504,0.2101 -0.132813,0.2891 -0.07778,0.079
-0.179645,0.1292 -0.28125,0.1347 -0.101605,0.01 -0.207091,-0.027 -0.314453,-0.1386 v -0 l -2.7421874,-2.7851
-0.2871094,-0.3028 0.2871094,-0.3047 2.7421874,-2.7851 v -0
c 0.077
39,-0.081 0.184582,-0.1267 0.294922,-0.1269 z"
+ d="m 12.701172,1040.8633 c -0.185192,3e-4 -0.361582,0.077 -0.490234,0.2109 L 9.4667969,1043.8594
9,1044.3574 l 0.4667969,0.4961 2.7441411,2.7852 c 0.155108,0.1609 0.346217,0.2324 0.52539,0.2226
0.179739,-0.01 0.3438,-0.094 0.464844,-0.2168 0.121044,-0.1229 0.203305,-0.288 0.21289,-0.4687 0.0096,-0.1802
-0.06032,-0.3737 -0.21875,-0.5313 v 0 L 11.625,1045.0488 H 16 v -1.3906 h -4.369141 l 1.560547,-1.5859 c
0.409308,-0.384 0.206561,-1.092 -0.34375,-1.1934 -0.0026,-6e-4 -0.0052,0 -0.0078,0 v -0.014 z m 0.002,0.2754
c 0.03028,-2e-4 0.06025,0 0.08984,0.01 h 0.002 0.0039 c 0.3402,0.063 0.45871,0.4809 0.203125,0.7207 h -0.002
l -2.029297,2.0625 h 4.753906 v 0.8379 H 10.964844 L 13,1046.8398 c 0.110163,0.1091 0.142288,0.2173
0.136719,0.3223 -0.0056,0.105 -0.05504,0.2101 -0.132813,0.2891 -0.07778,0.079 -0.179645,0.1292
-0.28125,0.1347 -0.101605,0.01 -0.207091,-0.027 -0.314453,-0.1386 v 0 l -2.7421874,-2.7851 -0.2871094,-0.3028
0.2871094,-0.3047 2.7421874,-2.7851 v 0 c 0.0773
9,-0.081
0.184582,-0.1267 0.294922,-0.1269 z"
id="path82228"
inkscape:connector-curvature="0" />
<path
@@ -46965,7 +46986,7 @@
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#fcaf3e;fill-opacity:1;stroke:none;stroke-width:0.27636784;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate"
/>
<path
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ce5c00;fill-opacity:1;fill-ru
le:nonze
ro;stroke:none;stroke-width:0.27636784;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
- d="m 7.296875,1036.3613 v 4.3711 l -1.5878906,-1.5625 c -0.382848,-0.4081 -1.0867776,-0.2068
-1.1914063,0.3399 -1.429e-4,6e-4 1.411e-4,0 0,0 -7.217e-4,0 -0.00128,0.01 -0.00195,0.01 H 4.5 v 0.1387 c
3.245e-4,0.1851 0.077001,0.3635 0.2109375,0.4921 l 2.7871094,2.7422 0.4960937,0.4668 0.4960938,-0.4668
2.7851566,-2.7422 c 0.161242,-0.1554 0.232622,-0.3479 0.222656,-0.5273 -0.01,-0.1794 -0.09405,-0.342
-0.216797,-0.4629 -0.122748,-0.1209 -0.288275,-0.2031 -0.46875,-0.2129 -0.180475,-0.01 -0.373326,0.06
-0.53125,0.2188 v -0 l -1.59375,1.5703 v -4.375 z m 0.2753906,0.2774 h 0.8378906 v 4.7578 l 2.0664058,-2.0332
c 0.109016,-0.1096 0.217375,-0.1424 0.322266,-0.1367 0.104892,0.01 0.210223,0.055 0.289063,0.1328
0.07884,0.078 0.127176,0.1797 0.132812,0.2812 0.0056,0.1015 -0.02537,0.2052 -0.136719,0.3125 v 0 l
-2.7851559,2.7402 -0.3046875,0.2871 -0.3046875,-0.2871 -2.7851562,-2.7422 c -0.081192,-0.077
-0.1267598,-0.1826 -0.1269531,-0.2929 -1.833e-4,-0.03 0.00315,-0.062 0.00977
,-0.092
v -0 -0 c 0.062695,-0.3402 0.4809452,-0.4607 0.7207031,-0.2051 l 0.00195,0 2.0625,2.0313 z"
+ d="m 7.296875,1036.3613 v 4.3711 l -1.5878906,-1.5625 c -0.382848,-0.4081 -1.0867776,-0.2068
-1.1914063,0.3399 -1.429e-4,6e-4 1.411e-4,0 0,0 -7.217e-4,0 -0.00128,0.01 -0.00195,0.01 H 4.5 v 0.1387 c
3.245e-4,0.1851 0.077001,0.3635 0.2109375,0.4921 l 2.7871094,2.7422 0.4960937,0.4668 0.4960938,-0.4668
2.7851566,-2.7422 c 0.161242,-0.1554 0.232622,-0.3479 0.222656,-0.5273 -0.01,-0.1794 -0.09405,-0.342
-0.216797,-0.4629 -0.122748,-0.1209 -0.288275,-0.2031 -0.46875,-0.2129 -0.180475,-0.01 -0.373326,0.06
-0.53125,0.2188 v 0 l -1.59375,1.5703 v -4.375 z m 0.2753906,0.2774 h 0.8378906 v 4.7578 l 2.0664058,-2.0332
c 0.109016,-0.1096 0.217375,-0.1424 0.322266,-0.1367 0.104892,0.01 0.210223,0.055 0.289063,0.1328
0.07884,0.078 0.127176,0.1797 0.132812,0.2812 0.0056,0.1015 -0.02537,0.2052 -0.136719,0.3125 v 0 l
-2.7851559,2.7402 -0.3046875,0.2871 -0.3046875,-0.2871 -2.7851562,-2.7422 c -0.081192,-0.077
-0.1267598,-0.1826 -0.1269531,-0.2929 -1.833e-4,-0.03 0.00315,-0.062 0.00977,
-0.092 v
0 0 c 0.062695,-0.3402 0.4809452,-0.4607 0.7207031,-0.2051 h 0.00195 l 2.0625,2.0313 z"
id="path82232"
inkscape:connector-curvature="0" />
<path
@@ -46975,7 +46996,7 @@
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#fcaf3e;fill-opacity:1;stroke:none;stroke-width:0.27636784;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate"
/>
<path
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ce5c00;fill-opacity:1;fill-ru
le:nonze
ro;stroke:none;stroke-width:0.27636784;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
- d="m 7.9941406,1045.3613 -0.4960937,0.4688 -2.7871094,2.7422 c -0.1334876,0.1282 -0.2101073,0.3057
-0.2109375,0.4902 -3.9e-6,6e-4 2.1e-6,0 0,0 v 0.1386 h 0.015625 c 6.651e-4,0 0.00124,0.01 0.00195,0.01
1.393e-4,6e-4 -1.411e-4,0 0,0 0.1046287,0.5467 0.8085583,0.748 1.1914063,0.3399 l 1.5878906,-1.5645 v 4.3711
H 8.6875 v -4.373 l 1.59375,1.5703 v -0 c 0.157924,0.1588 0.350775,0.2285 0.53125,0.2188 0.180475,-0.01
0.346002,-0.092 0.46875,-0.2129 0.122748,-0.1209 0.206831,-0.2834 0.216797,-0.4629 0.01,-0.1794
-0.06141,-0.3719 -0.222656,-0.5273 l -2.7851566,-2.7422 z m 0,0.3809 0.3046875,0.2871 2.7851559,2.7402 c
0.111347,0.1074 0.142355,0.213 0.136719,0.3145 -0.0056,0.1015 -0.05397,0.2036 -0.132812,0.2812 -0.07884,0.078
-0.184171,0.1272 -0.289063,0.1328 -0.104891,0.01 -0.21325,-0.027 -0.322266,-0.1367 l -2.0664058,-2.0332 v
4.7578 H 7.5722656 v -4.7539 l -2.0625,2.0313 -0.00195,0 c -0.2397579,0.2556 -0.6580082,0.1352
-0.7207031,-0.205 v -0 -0 c -0.00662,-0.03 -0.00995,-
0.06 -0.
00977,-0.09 1.933e-4,-0.1104 0.045761,-0.2156 0.1269531,-0.293 v -0 l 2.7851562,-2.7402 z"
+ d="m 7.9941406,1045.3613 -0.4960937,0.4688 -2.7871094,2.7422 c -0.1334876,0.1282 -0.2101073,0.3057
-0.2109375,0.4902 -3.9e-6,6e-4 2.1e-6,0 0,0 v 0.1386 h 0.015625 c 6.651e-4,0 0.00124,0.01 0.00195,0.01
1.393e-4,6e-4 -1.411e-4,0 0,0 0.1046287,0.5467 0.8085583,0.748 1.1914063,0.3399 l 1.5878906,-1.5645 v 4.3711
H 8.6875 v -4.373 l 1.59375,1.5703 v 0 c 0.157924,0.1588 0.350775,0.2285 0.53125,0.2188 0.180475,-0.01
0.346002,-0.092 0.46875,-0.2129 0.122748,-0.1209 0.206831,-0.2834 0.216797,-0.4629 0.01,-0.1794
-0.06141,-0.3719 -0.222656,-0.5273 l -2.7851566,-2.7422 z m 0,0.3809 0.3046875,0.2871 2.7851559,2.7402 c
0.111347,0.1074 0.142355,0.213 0.136719,0.3145 -0.0056,0.1015 -0.05397,0.2036 -0.132812,0.2812 -0.07884,0.078
-0.184171,0.1272 -0.289063,0.1328 -0.104891,0.01 -0.21325,-0.027 -0.322266,-0.1367 l -2.0664058,-2.0332 v
4.7578 H 7.5722656 v -4.7539 l -2.0625,2.0313 h -0.00195 c -0.2397579,0.2556 -0.6580082,0.1352
-0.7207031,-0.205 v 0 0 c -0.00662,-0.03 -0.00995,-0.0
6 -0.009
77,-0.09 1.933e-4,-0.1104 0.045761,-0.2156 0.1269531,-0.293 v 0 l 2.7851562,-2.7402 z"
id="path82236"
inkscape:connector-curvature="0" />
</g>
@@ -48206,7 +48227,7 @@
style="opacity:1;fill:#f57900;fill-opacity:1;stroke:none;stroke-width:0.30461028;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
/>
<path
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ce5c00;fill-opacity:1;fill-rule:nonzero;stroke:none;strok
e-width:
0.30461028;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
- d="m 2.4960938,1038.8613 c -0.8261602,0 -1.49740595,0.6778 -1.4960938,1.5039 0.00131,0.8262
0.6757909,1.4968 1.5019531,1.4961 C 3.3281153,1041.8607 4,1041.1875 4,1040.3613 H 3.6953125 c 0,0.6617
-0.5336883,1.1948 -1.1953125,1.1953 -0.6616242,6e-4 -1.1942617,-0.5317 -1.1953125,-1.1933 -0.00105,-0.6616
0.5317369,-1.1957 1.1933594,-1.1973 0.6616225,-0 1.1951639,0.5298 1.1972656,1.1914 H 4 c -0.00262,-0.8261
-0.6777461,-1.498 -1.5039062,-1.4961 z"
+ d="m 2.4960938,1038.8613 c -0.8261602,0 -1.49740595,0.6778 -1.4960938,1.5039 0.00131,0.8262
0.6757909,1.4968 1.5019531,1.4961 C 3.3281153,1041.8607 4,1041.1875 4,1040.3613 H 3.6953125 c 0,0.6617
-0.5336883,1.1948 -1.1953125,1.1953 -0.6616242,6e-4 -1.1942617,-0.5317 -1.1953125,-1.1933 -0.00105,-0.6616
0.5317369,-1.1957 1.1933594,-1.1973 0.6616225,0 1.1951639,0.5298 1.1972656,1.1914 H 4 c -0.00262,-0.8261
-0.6777461,-1.498 -1.5039062,-1.4961 z"
id="path82339"
inkscape:connector-curvature="0" />
<path
@@ -48223,7 +48244,7 @@
style="opacity:1;fill:#f57900;fill-opacity:1;stroke:none;stroke-width:0.30461028;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
/>
<path
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ce5c00;fill-opacity:1;fill-rule:nonzero;stroke:none;strok
e-width:
0.30461028;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
- d="m 2.4960938,1042.8613 c -0.8261602,0 -1.49740595,0.6778 -1.4960938,1.5039 0.00131,0.8262
0.6757909,1.4968 1.5019531,1.4961 C 3.3281153,1045.8607 4,1045.1875 4,1044.3613 H 3.6953125 c 0,0.6617
-0.5336883,1.1948 -1.1953125,1.1953 -0.6616242,6e-4 -1.1942617,-0.5317 -1.1953125,-1.1933 -0.00105,-0.6616
0.5317369,-1.1957 1.1933594,-1.1973 0.6616225,-0 1.1951639,0.5298 1.1972656,1.1914 H 4 c -0.00262,-0.8261
-0.6777461,-1.498 -1.5039062,-1.4961 z"
+ d="m 2.4960938,1042.8613 c -0.8261602,0 -1.49740595,0.6778 -1.4960938,1.5039 0.00131,0.8262
0.6757909,1.4968 1.5019531,1.4961 C 3.3281153,1045.8607 4,1045.1875 4,1044.3613 H 3.6953125 c 0,0.6617
-0.5336883,1.1948 -1.1953125,1.1953 -0.6616242,6e-4 -1.1942617,-0.5317 -1.1953125,-1.1933 -0.00105,-0.6616
0.5317369,-1.1957 1.1933594,-1.1973 0.6616225,0 1.1951639,0.5298 1.1972656,1.1914 H 4 c -0.00262,-0.8261
-0.6777461,-1.498 -1.5039062,-1.4961 z"
id="path82343"
inkscape:connector-curvature="0" />
<path
@@ -48240,7 +48261,7 @@
style="opacity:1;fill:#f57900;fill-opacity:1;stroke:none;stroke-width:0.30461028;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
/>
<path
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ce5c00;fill-opacity:1;fill-rule:nonzero;stroke:none;strok
e-width:
0.30461028;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
- d="m 2.4960938,1046.8613 c -0.8261602,0 -1.49740595,0.6778 -1.4960938,1.5039 0.00131,0.8262
0.6757909,1.4968 1.5019531,1.4961 C 3.3281153,1049.8607 4,1049.1875 4,1048.3613 H 3.6953125 c 0,0.6617
-0.5336883,1.1948 -1.1953125,1.1953 -0.6616242,6e-4 -1.1942617,-0.5317 -1.1953125,-1.1933 -0.00105,-0.6616
0.5317369,-1.1957 1.1933594,-1.1973 0.6616225,-0 1.1951639,0.5298 1.1972656,1.1914 H 4 c -0.00262,-0.8261
-0.6777461,-1.498 -1.5039062,-1.4961 z"
+ d="m 2.4960938,1046.8613 c -0.8261602,0 -1.49740595,0.6778 -1.4960938,1.5039 0.00131,0.8262
0.6757909,1.4968 1.5019531,1.4961 C 3.3281153,1049.8607 4,1049.1875 4,1048.3613 H 3.6953125 c 0,0.6617
-0.5336883,1.1948 -1.1953125,1.1953 -0.6616242,6e-4 -1.1942617,-0.5317 -1.1953125,-1.1933 -0.00105,-0.6616
0.5317369,-1.1957 1.1933594,-1.1973 0.6616225,0 1.1951639,0.5298 1.1972656,1.1914 H 4 c -0.00262,-0.8261
-0.6777461,-1.498 -1.5039062,-1.4961 z"
id="path82347"
inkscape:connector-curvature="0" />
</g>
@@ -49319,7 +49340,7 @@
inkscape:connector-curvature="0" />
<path
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;strok
e-width:
0.4848485;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
- d="m 8,1036.3613 c -0.6672963,0 -1.2128906,0.5456 -1.2128906,1.2129 v 1.9121 c -1.8120197,0.4557
-3.2113313,1.8517 -3.6660156,3.6641 H 1.2128906 C 0.54556419,1043.1504 0,1043.694 0,1044.3613 c 0,0.6673
0.54556419,1.2129 1.2128906,1.2129 h 1.9101563 c 0.4553706,1.8112 1.8528722,3.2087 3.6640625,3.6641 v 1.9121
c 0,0.6673 0.5455642,1.2109 1.2128906,1.2109 0.6673264,0 1.2128906,-0.5436 1.2128906,-1.2109 v -1.9395 c
0,-0.013 -0.00141,-0 -0.00195,-0.014 l 0.037109,-2.1817 -0.3300781,0.1192 c -0.2035792,0.073 -0.52155,-0.016
-0.9179688,-0.016 -1.4664911,0 -2.7578125,-1.2912 -2.7578125,-2.7578 0,-1.4664 1.2913314,-2.7558
2.7578125,-2.7558 1.4664811,0 2.757813,1.2894 2.757812,2.7558 0,0.3497 0.0029,0.6725 -0.08594,0.9199 l
-0.119141,0.3282 2.294922,-0.033 h 1.939453 c 0.668019,0 1.212891,-0.5476 1.212891,-1.2149 0,-0.6673
-0.546256,-1.209 -1.212891,-1.209 h -1.910156 c -0.45537,-1.8111 -1.85288,-3.2086 -3.6640624,-3.664 v -1.9121
c 0,-0.5728 -0.4350734,-0.9842 -0.9707031,-1
.1094 v
-0.1055 z m -0.00391,0.4883 H 8 c 0.4071279,0 0.7265625,0.3195 0.7265625,0.7266 v 1.9394 c 0,-0.04
-0.00808,-0.025 -0.017578,0.07 l -0.021484,0.2188 0.2167969,0.043 c 1.8186671,0.3617 3.2496171,1.7946
3.6113281,3.6132 l 0.04297,0.2149 0.216797,-0.022 c 0.09807,-0.01 0.115691,-0.018 0.07226,-0.018 h 1.939453 c
0.40779,0 0.728516,0.3175 0.728516,0.7246 0,0.4071 -0.32211,0.7305 -0.728516,0.7305 h -1.939453 c 0.05572,0
0.03227,-0.018 -0.08789,-0.018 h -0.201172 l -0.0039,0.022 -1.390626,0.019 c 0.03938,-0.2562 0.07813,-0.5169
0.07813,-0.7539 0,-1.7467 -1.4953765,-3.2422 -3.242188,-3.2422 -1.7468115,0 -3.2421875,1.4955
-3.2421875,3.2422 0,1.7469 1.495386,3.2442 3.2421875,3.2442 0.2042208,0 0.4848926,-0 0.7539062,-0.012 l
-0.023437,1.2851 h -0.044922 l 0.025391,0.2656 c 0.00856,0.091 0.015625,0.1058 0.015625,0.066 v 1.9395 c
0,0.4071 -0.3194647,0.7266 -0.7265625,0.7266 -0.4070978,0 -0.7265625,-0.3195 -0.7265625,-0.7266 v -1.9395 c
0,0.04 0.00808,0.025 0.017578,-0.07 l 0.021484,-0.
2207 -0.
2167969,-0.041 c -1.8186582,-0.3617 -3.2496163,-1.7946 -3.6113281,-3.6133 l -0.042969,-0.2148
-0.2167968,0.022 c -0.098067,0.01 -0.1157047,0.017 -0.072266,0.017 H 1.2128906 c -0.40709776,0
-0.7285156,-0.3214 -0.7285156,-0.7285 0,-0.4071 0.32141784,-0.7265 0.7285156,-0.7265 h 1.9394532 c -0.05788,0
-0.032897,0.019 0.09375,0.019 h 0.1992187 l 0.039063,-0.1953 c 0.3617118,-1.8187 1.7926608,-3.2515
3.6113281,-3.6133 l 0.2167969,-0.043 -0.021484,-0.2187 c -0.00949,-0.095 -0.017578,-0.1107 -0.017578,-0.07 v
-1.9395 c 0,-0.4049 0.31865,-0.7212 0.7226563,-0.7246 z"
+ d="m 8,1036.3613 c -0.6672963,0 -1.2128906,0.5456 -1.2128906,1.2129 v 1.9121 c -1.8120197,0.4557
-3.2113313,1.8517 -3.6660156,3.6641 H 1.2128906 C 0.54556419,1043.1504 0,1043.694 0,1044.3613 c 0,0.6673
0.54556419,1.2129 1.2128906,1.2129 h 1.9101563 c 0.4553706,1.8112 1.8528722,3.2087 3.6640625,3.6641 v 1.9121
c 0,0.6673 0.5455642,1.2109 1.2128906,1.2109 0.6673264,0 1.2128906,-0.5436 1.2128906,-1.2109 v -1.9395 c
0,-0.013 -0.00141,0 -0.00195,-0.014 l 0.037109,-2.1817 -0.3300781,0.1192 c -0.2035792,0.073 -0.52155,-0.016
-0.9179688,-0.016 -1.4664911,0 -2.7578125,-1.2912 -2.7578125,-2.7578 0,-1.4664 1.2913314,-2.7558
2.7578125,-2.7558 1.4664811,0 2.7578133,1.2894 2.7578123,2.7558 0,0.3497 0.0029,0.6725 -0.08594,0.9199 l
-0.119141,0.3282 2.294922,-0.033 h 1.939453 c 0.668019,0 1.212891,-0.5476 1.212891,-1.2149 0,-0.6673
-0.546256,-1.209 -1.212891,-1.209 h -1.910156 c -0.45537,-1.8111 -1.85288,-3.2086 -3.6640627,-3.664 v -1.9121
c 0,-0.5728 -0.4350734,-0.9842 -0.9707031,-
1.1094 v
-0.1055 z m -0.00391,0.4883 H 8 c 0.4071279,0 0.7265625,0.3195 0.7265625,0.7266 v 1.9394 c 0,-0.04
-0.00808,-0.025 -0.017578,0.07 l -0.021484,0.2188 0.2167969,0.043 c 1.8186676,0.3617 3.2496176,1.7946
3.6113286,3.6132 l 0.04297,0.2149 0.216797,-0.022 c 0.09807,-0.01 0.115691,-0.018 0.07226,-0.018 h 1.939453 c
0.40779,0 0.728516,0.3175 0.728516,0.7246 0,0.4071 -0.32211,0.7305 -0.728516,0.7305 h -1.939453 c 0.05572,0
0.03227,-0.018 -0.08789,-0.018 h -0.201172 l -0.0039,0.022 -1.390626,0.019 c 0.03938,-0.2562 0.07813,-0.5169
0.07813,-0.7539 0,-1.7467 -1.495377,-3.2422 -3.2421885,-3.2422 -1.7468115,0 -3.2421875,1.4955
-3.2421875,3.2422 0,1.7469 1.495386,3.2442 3.2421875,3.2442 0.2042208,0 0.4848926,0 0.7539062,-0.012 l
-0.023437,1.2851 h -0.044922 l 0.025391,0.2656 c 0.00856,0.091 0.015625,0.1058 0.015625,0.066 v 1.9395 c
0,0.4071 -0.3194647,0.7266 -0.7265625,0.7266 -0.4070978,0 -0.7265625,-0.3195 -0.7265625,-0.7266 v -1.9395 c
0,0.04 0.00808,0.025 0.017578,-0.07 l 0.021484,-0.
2207 -0.
2167969,-0.041 c -1.8186582,-0.3617 -3.2496163,-1.7946 -3.6113281,-3.6133 l -0.042969,-0.2148
-0.2167968,0.022 c -0.098067,0.01 -0.1157047,0.017 -0.072266,0.017 H 1.2128906 c -0.40709776,0
-0.7285156,-0.3214 -0.7285156,-0.7285 0,-0.4071 0.32141784,-0.7265 0.7285156,-0.7265 h 1.9394532 c -0.05788,0
-0.032897,0.019 0.09375,0.019 h 0.1992187 l 0.039063,-0.1953 c 0.3617118,-1.8187 1.7926608,-3.2515
3.6113281,-3.6133 l 0.2167969,-0.043 -0.021484,-0.2187 c -0.00949,-0.095 -0.017578,-0.1107 -0.017578,-0.07 v
-1.9395 c 0,-0.4049 0.31865,-0.7212 0.7226563,-0.7246 z"
id="path82817"
inkscape:connector-curvature="0" />
<path
@@ -51194,7 +51215,7 @@
inkscape:connector-curvature="0" />
<path
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;strok
e-width:
0.72718936;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
- d="m 11.636719,1028.3633 v 0.1504 c -0.80405,0.1873 -1.455078,0.8085 -1.455078,1.6679 v 2.834 c
-2.6810077,0.6334 -4.8688027,2.7709 -5.5527348,5.5274 H 1.8183594 C 0.81743742,1038.543 0,1039.3605
0,1040.3613 c 0,1.0008 0.81743742,1.8184 1.8183594,1.8184 h 2.7304687 c -0.00637,0 0.054139,0 0.095703,0
0.5371901,2.7838 2.7300456,4.8659 5.5078128,5.5176 l 0.0293,2.8476 c 0.01039,0.9962 0.817437,1.8145
1.818359,1.8145 1.000922,0 1.818359,-0.8176 1.818359,-1.8184 v -0 -0 c -0.02322,-1.8845 0.02793,-3.7758
0.04492,-5.6738 l 0.0039,-0.3984 -0.398438,0.033 c -0.507823,0.043 -0.94584,0.014 -1.476562,0.014
-2.199789,-0.01 -4.1289067,-1.954 -4.1289068,-4.1543 0,-2.1991 1.9369237,-4.1347 4.1367188,-4.1347 2.199795,0
4.136719,1.9356 4.136719,4.1347 0,0.5243 0.0043,1.0059 -0.128907,1.377 l -0.177734,0.498 0.527344,-0.012 c
2.008193,-0.043 3.770285,-0.043 5.824219,-0.043 1.001944,0 1.818359,-0.8195 1.818359,-1.8203 0,-1.0008
-0.81846,-1.8144 -1.818359,-1.8144 h -2.855469 c -0.63282
7,-2.565
4 -2.750364,-4.8779 -5.507813,-5.5821 v -2.7851 c 0,-1.0009 -0.817498,-1.8164 -1.818359,-1.8164 z M
12,1029.0898 c 0.610773,0 1.091797,0.4794 1.091797,1.0899 v 2.8672 c -0.02137,0.045 -0.03832,0.024
-0.04687,0.1093 l -0.0332,0.3282 0.324219,0.064 c 2.709138,0.5388 4.877951,2.9362 5.378906,5.418 l
0.05859,0.293 h 0.298828 c -0.01258,0 0.02447,0 0.0625,0.01 0.03803,0 0.07739,0.01 0.138672,0.01 h 2.908203 c
0.611736,0 1.091797,0.4775 1.091797,1.0879 0,0.6104 -0.482106,1.0938 -1.091797,1.0938 -1.912204,0 -3.588594,0
-5.4375,0.039 0.05943,-0.3848 0.11914,-0.7768 0.11914,-1.1328 0,-2.6196 -2.243138,-4.8633 -4.863281,-4.8633
-2.6201421,0 -4.8632812,2.2437 -4.8632812,4.8633 -10e-8,2.6188 2.2314231,4.87 4.8515622,4.8809 h 0.002 c
0.373294,0 0.75335,-10e-4 1.144532,-0.012 -0.01962,1.7659 -0.06479,3.5356 -0.04297,5.3144 0,0.6104
-0.481083,1.0899 -1.091797,1.0899 -0.610714,0 -1.085384,-0.4788 -1.091797,-1.0938 l -0.03516,-3.4023 h
-0.02344 l -0.304687,-0.061 c -2.7362294,-0.544 -4.88559
,-2.5886
-5.2753908,-5.2988 l -0.044922,-0.3125 H 4.9082031 c 0.01258,0 -0.08264,-0 -0.1601562,-0.01 -0.077517,-0
-0.1379401,-0.01 -0.1992188,-0.01 H 1.8183594 c -0.6107139,0 -1.0917969,-0.4795 -1.0917969,-1.0899 0,-0.6104
0.481083,-1.0918 1.0917969,-1.0918 h 2.9082031 c -0.084396,0 -0.044903,0.029 0.1425781,0.029 h 0.2988282 l
0.058594,-0.2929 c 0.5416175,-2.7226 2.7539762,-4.8742 5.3769535,-5.377 l 0.324218,-0.062 -0.03125,-0.3301 c
0.0064,0.065 0.01172,-0.019 0.01172,-0.1465 v -2.9082 c 0,-0.6104 0.481053,-1.0918 1.091797,-1.0918 z"
+ d="m 11.636719,1028.3633 v 0.1504 c -0.80405,0.1873 -1.455078,0.8085 -1.455078,1.6679 v 2.834 c
-2.6810077,0.6334 -4.8688027,2.7709 -5.5527348,5.5274 H 1.8183594 C 0.81743742,1038.543 0,1039.3605
0,1040.3613 c 0,1.0008 0.81743742,1.8184 1.8183594,1.8184 h 2.7304687 c -0.00637,0 0.054139,0 0.095703,0
0.5371901,2.7838 2.7300456,4.8659 5.5078129,5.5176 l 0.0293,2.8476 c 0.01039,0.9962 0.817437,1.8145
1.818359,1.8145 1.000922,0 1.818359,-0.8176 1.818359,-1.8184 v 0 0 c -0.02322,-1.8845 0.02793,-3.7758
0.04492,-5.6738 l 0.0039,-0.3984 -0.398438,0.033 c -0.507823,0.043 -0.94584,0.014 -1.476562,0.014
-2.1997891,-0.01 -4.1289068,-1.954 -4.1289069,-4.1543 0,-2.1991 1.9369237,-4.1347 4.1367189,-4.1347
2.199795,0 4.136719,1.9356 4.136719,4.1347 0,0.5243 0.0043,1.0059 -0.128907,1.377 l -0.177734,0.498
0.527344,-0.012 c 2.008193,-0.043 3.770285,-0.043 5.824219,-0.043 1.001944,0 1.818359,-0.8195
1.818359,-1.8203 0,-1.0008 -0.81846,-1.8144 -1.818359,-1.8144 h -2.855469 c -0.632827
,-2.5654
-2.750364,-4.8779 -5.507813,-5.5821 v -2.7851 c 0,-1.0009 -0.817498,-1.8164 -1.818359,-1.8164 z M
12,1029.0898 c 0.610773,0 1.091797,0.4794 1.091797,1.0899 v 2.8672 c -0.02137,0.045 -0.03832,0.024
-0.04687,0.1093 l -0.0332,0.3282 0.324219,0.064 c 2.709138,0.5388 4.877951,2.9362 5.378906,5.418 l
0.05859,0.293 h 0.298828 c -0.01258,0 0.02447,0 0.0625,0.01 0.03803,0 0.07739,0.01 0.138672,0.01 h 2.908203 c
0.611736,0 1.091797,0.4775 1.091797,1.0879 0,0.6104 -0.482106,1.0938 -1.091797,1.0938 -1.912204,0 -3.588594,0
-5.4375,0.039 0.05943,-0.3848 0.11914,-0.7768 0.11914,-1.1328 0,-2.6196 -2.243138,-4.8633 -4.863281,-4.8633
-2.6201421,0 -4.8632812,2.2437 -4.8632812,4.8633 -1e-7,2.6188 2.2314231,4.87 4.8515622,4.8809 h 0.002 c
0.373294,0 0.75335,-10e-4 1.144532,-0.012 -0.01962,1.7659 -0.06479,3.5356 -0.04297,5.3144 0,0.6104
-0.481083,1.0899 -1.091797,1.0899 -0.610714,0 -1.085384,-0.4788 -1.091797,-1.0938 l -0.03516,-3.4023 h
-0.02344 l -0.304687,-0.061 c -2.7362294,-0.544 -4.88559,-
2.5886 -
5.2753908,-5.2988 l -0.044922,-0.3125 H 4.9082031 c 0.01258,0 -0.08264,0 -0.1601562,-0.01 -0.077517,0
-0.1379401,-0.01 -0.1992188,-0.01 H 1.8183594 c -0.6107139,0 -1.0917969,-0.4795 -1.0917969,-1.0899 0,-0.6104
0.481083,-1.0918 1.0917969,-1.0918 h 2.9082031 c -0.084396,0 -0.044903,0.029 0.1425781,0.029 h 0.2988282 l
0.058594,-0.2929 c 0.5416175,-2.7226 2.7539762,-4.8742 5.3769532,-5.377 l 0.324218,-0.062 -0.03125,-0.3301 c
0.0064,0.065 0.01172,-0.019 0.01172,-0.1465 v -2.9082 c 0,-0.6104 0.481053,-1.0918 1.091797,-1.0918 z"
id="path82809"
inkscape:connector-curvature="0" />
<path
@@ -55911,6 +55932,102 @@
</g>
</g>
</g>
+ <g
+ transform="matrix(3.7795275,0,0,3.7795275,72.1977,-977.90225)"
+ style="display:inline"
+ id="gimp-marker">
+ <g
+ id="group-3">
+ <path
+
style="display:inline;fill:none;fill-rule:evenodd;stroke:#c1c1ff;stroke-width:0.5291667;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 0.26458333,296.7354 0.79374997,-0.79375 v -2.91042 h 2.6458332 v 1.5875 H 1.5875 v 1.32292 l
0.79375,0.79375 z"
+ id="path1551"
+ inkscape:connector-curvature="0" />
+ <g
+ id="g8601">
+ <g
+ id="g8587">
+ <path
+
style="fill:#202020;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0.26454594,296.7354 H 2.3812127 l -1.0583334,-1.05833 z"
+ id="path1431"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccc" />
+ <rect
+
style="fill:#202020;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ id="rect1433"
+ width="0.5291667"
+ height="3.175"
+ x="1.058296"
+ y="293.03122" />
+ </g>
+ <g
+ id="g8583">
+ <rect
+
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ id="rect1437"
+ width="2.1166668"
+ height="1.5875138"
+ x="1.5874625"
+ y="293.03122" />
+ <g
+ id="g1511"
+ style="fill:#2020ff;fill-opacity:1"
+ transform="translate(-0.26462073)">
+ <rect
+ y="293.03122"
+ x="1.8520833"
+ height="0.52916664"
+ width="0.52916664"
+ id="rect1439"
+
style="fill:#2020ff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
/>
+ <rect
+ y="293.03122"
+ x="2.9104166"
+ height="0.52916664"
+ width="0.52916664"
+ id="rect1439-3"
+
style="fill:#2020ff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
/>
+ <rect
+ y="293.56039"
+ x="2.3812499"
+ height="0.52916664"
+ width="0.52916664"
+ id="rect1439-6"
+
style="fill:#2020ff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
/>
+ <rect
+ y="293.56039"
+ x="3.4395833"
+ height="0.52916664"
+ width="0.52916664"
+ id="rect1439-3-7"
+
style="fill:#2020ff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
/>
+ <rect
+ y="294.08957"
+ x="1.8520833"
+ height="0.52916664"
+ width="0.52916664"
+ id="rect1439-5"
+
style="fill:#2020ff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
/>
+ <rect
+ y="294.08957"
+ x="2.9104166"
+ height="0.52916664"
+ width="0.52916664"
+ id="rect1439-3-3"
+
style="fill:#2020ff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
/>
+ </g>
+ </g>
+ </g>
+ </g>
+ <rect
+ y="292.76666"
+ x="0"
+ height="4.2333331"
+ width="4.2333331"
+ id="rect18113"
+
style="fill:none;fill-rule:evenodd;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
/>
+ </g>
</g>
<g
inkscape:groupmode="layer"
@@ -56277,7 +56394,8 @@
<path
style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#babdb6;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.37281564;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
d="m 10.432595,1050.9752 c 0.716995,0.058 3.385084,-1.1072 3.581677,-2.5024 -1.479809,0.1704
-1.727259,0.05 -3.371997,0.105 0,0 0.115565,2.2238 -0.20968,2.3974 z"
- id="path2210-25" />
+ id="path2210-25"
+ inkscape:connector-curvature="0" />
<path
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#868a84;fill-opacity:1;fill-rule:evenodd;stroke:none;str
oke-widt
h:0.37281564;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
d="m 14.232422,1048.2598 -0.240234,0.027 c -1.46755,0.169 -1.701025,0.048 -3.355469,0.1035 l
-0.191407,0.01 0.01172,0.1895 c 0,0 0.02721,0.5501 0.01563,1.1191 -0.0058,0.2845 -0.02195,0.5746
-0.05469,0.793 -0.01637,0.1092 -0.03755,0.2015 -0.05859,0.2598 -0.02104,0.058 -0.04796,0.069 -0.01367,0.051 l
-0.5605468,0.2989 0.6328128,0.051 c 0.02659,0 0.07332,-0.02 0.101562,-0.02 0.225123,-5e-4 0.482829,-0.047
0.808594,-0.1601 0.366638,-0.1273 0.78372,-0.315 1.185547,-0.5508 0.803654,-0.4716 1.571994,-1.1258
1.685547,-1.9317 z m -0.527344,0.4082 c -0.192881,0.521 -0.716761,1.0497 -1.380859,1.4394 -0.379394,0.2227
-0.777713,0.403 -1.119141,0.5215 -0.205832,0.071 -0.312569,0.072 -0.457031,0.096 0.01297,-0.056
0.02952,-0.1063 0.03906,-0.1699 0.03707,-0.2474 0.05262,-0.5467 0.05859,-0.8399 0.01,-0.4894 -0.0092,-0.8145
-0.01563,-0.957 1.269143,-0.032 1.791218,0.011 2.875,-0.09 z"
@@ -56300,7 +56418,7 @@
style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.34893051;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
/>
<path
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#888a85;fill-opacity:1;fill-rule:nonzero;stroke:none;str
oke-widt
h:0.34893051;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
- d="m 14.550781,30.978516 a 0.1744827,0.1744827 0 0 0 -0.152343,0.08594 c -1.795275,2.96343
-3.557956,5.953777 -5.320313,8.9375 a 0.1744827,0.1744827 0 0 0 0.091797,0.251953 c 0.5478485,0.196338
1.1352301,0.282121 1.7089841,0.267578 0.272605,-0.0064 0.54615,-0.03661 0.816406,-0.08984 a
0.1744827,0.1744827 0 0 0 0.115235,-0.08203 c 1.32511,-2.244089 2.64996,-4.499195 3.984375,-6.724609 a
0.1744827,0.1744827 0 0 0 0.0059,-0.0098 c 0.120452,-0.229478 0.131481,-0.472566 0.07813,-0.695312
-0.05335,-0.222747 -0.163669,-0.429197 -0.289062,-0.628906 -0.250786,-0.399418 -0.558933,-0.783111
-0.65625,-1.111328 a 0.1744827,0.1744827 0 0 0 -0.109375,-0.115235 c -0.07033,-0.02477 -0.144075,-0.05077
-0.222657,-0.07617 a 0.1744827,0.1744827 0 0 0 -0.05078,-0.0098 z m 0.07422,0.386718 c 0.0098,0.0035
0.0194,0.0062 0.0293,0.0098 0.147663,0.395913 0.424611,0.760635 0.638672,1.101562 0.116378,0.185352
0.207462,0.364112 0.246093,0.525391 0.03847,0.160588 0.03207,0.297745 -0.04687,0.449
219 -3.4
e-4,6.51e-4 3.42e-4,0.0013 0,0.002 -1.319336,2.200365 -2.630593,4.427723 -3.939454,6.644531
-0.226019,0.04049 -0.453114,0.06883 -0.68164,0.07422 -0.458331,0.01162 -0.9193479,-0.08032
-1.3613284,-0.210937 C 11.205145,37.090409 12.900271,34.214287 14.625,31.365234 Z"
+ d="m 14.550781,30.978516 a 0.1744827,0.1744827 0 0 0 -0.152343,0.08594 c -1.795275,2.96343
-3.557956,5.953777 -5.320313,8.9375 a 0.1744827,0.1744827 0 0 0 0.091797,0.251953 c 0.5478485,0.196338
1.13523,0.282121 1.708984,0.267578 0.272605,-0.0064 0.54615,-0.03661 0.816406,-0.08984 a 0.1744827,0.1744827
0 0 0 0.115235,-0.08203 c 1.32511,-2.244089 2.64996,-4.499195 3.984375,-6.724609 a 0.1744827,0.1744827 0 0 0
0.0059,-0.0098 c 0.120452,-0.229478 0.131481,-0.472566 0.07813,-0.695312 -0.05335,-0.222747
-0.163669,-0.429197 -0.289062,-0.628906 -0.250786,-0.399418 -0.558933,-0.783111 -0.65625,-1.111328 a
0.1744827,0.1744827 0 0 0 -0.109375,-0.115235 c -0.07033,-0.02477 -0.144075,-0.05077 -0.222657,-0.07617 a
0.1744827,0.1744827 0 0 0 -0.05078,-0.0098 z m 0.07422,0.386718 c 0.0098,0.0035 0.0194,0.0062 0.0293,0.0098
0.147663,0.395913 0.424611,0.760635 0.638672,1.101562 0.116378,0.185352 0.207462,0.364112 0.246093,0.525391
0.03847,0.160588 0.03207,0.297745 -0.04687,0.449219
-3.4e-4
,6.51e-4 3.42e-4,0.0013 0,0.002 -1.319336,2.200365 -2.630593,4.427723 -3.939454,6.644531 -0.226019,0.04049
-0.453114,0.06883 -0.68164,0.07422 C 10.412771,40.183577 9.9517541,40.091637 9.5097736,39.96102
11.205145,37.090409 12.900271,34.214287 14.625,31.365234 Z"
id="path16717"
inkscape:connector-curvature="0" />
<path
@@ -56326,7 +56444,7 @@
style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.34893051;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
/>
<path
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#888a85;fill-opacity:1;fill-rule:nonzero;stroke:none;str
oke-widt
h:0.34893051;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
- d="m 7.1347656,30.980469 a 0.1744827,0.1744827 0 0 0 -0.042969,0.0078 c -0.077303,0.02545
-0.1497433,0.05337 -0.21875,0.07813 a 0.1744827,0.1744827 0 0 0 -0.109375,0.115235 c -0.095785,0.328974
-0.3982879,0.711952 -0.6445313,1.111328 -0.1231217,0.199687 -0.2309182,0.404672 -0.2832031,0.626953
-0.052285,0.222281 -0.041981,0.466087 0.076172,0.695312 a 0.1744827,0.1744827 0 0 0 0.00586,0.0078 c
1.3103866,2.225417 2.6108627,4.480521 3.9121093,6.724609 a 0.1744827,0.1744827 0 0 0 0.1171875,0.08398 c
0.2657334,0.05331 0.5327364,0.08341 0.8007814,0.08984 0.564155,0.01456 1.142984,-0.07099 1.681641,-0.267578 a
0.1744827,0.1744827 0 0 0 0.0918,-0.251953 C 10.790865,37.01823 9.0578635,34.027879 7.2949219,31.064453 a
0.1744827,0.1744827 0 0 0 -0.1601563,-0.08398 z m -0.066406,0.386719 c 1.6933857,2.848635 3.3588486,5.72367
5.0234376,8.59375 -0.433286,0.130336 -0.8847,0.222533 -1.333985,0.210937 a 0.1744827,0.1744827 0 0 0 -0.002,0
c -0.224236,-0.0054 -0.446196,-0.03374 -0.66
7968,-0.
07422 C 8.8031205,37.881737 7.5177046,35.654547 6.2226562,33.455078 v -0.002 C 6.1449958,33.301386
6.1378973,33.161058 6.1757812,33 6.2138268,32.838256 6.3036736,32.659982 6.4179688,32.474609
6.6282477,32.133564 6.9001194,31.77048 7.0449219,31.375 c 0.00783,-0.0028 0.015679,-0.005 0.023437,-0.0078 z"
+ d="m 7.1347656,30.980469 a 0.1744827,0.1744827 0 0 0 -0.042969,0.0078 c -0.077303,0.02545
-0.1497433,0.05337 -0.21875,0.07813 a 0.1744827,0.1744827 0 0 0 -0.109375,0.115235 c -0.095785,0.328974
-0.3982879,0.711952 -0.6445313,1.111328 -0.1231217,0.199687 -0.2309182,0.404672 -0.2832031,0.626953
-0.052285,0.222281 -0.041981,0.466087 0.076172,0.695312 a 0.1744827,0.1744827 0 0 0 0.00586,0.0078 c
1.3103866,2.225417 2.6108627,4.480521 3.9121093,6.724609 a 0.1744827,0.1744827 0 0 0 0.1171875,0.08398 c
0.265733,0.05331 0.532736,0.08341 0.800781,0.08984 0.564155,0.01456 1.142984,-0.07099 1.681641,-0.267578 a
0.1744827,0.1744827 0 0 0 0.0918,-0.251953 C 10.790865,37.01823 9.0578635,34.027879 7.2949219,31.064453 a
0.1744827,0.1744827 0 0 0 -0.1601563,-0.08398 z m -0.066406,0.386719 c 1.6933857,2.848635 3.3588484,5.72367
5.0234374,8.59375 -0.433286,0.130336 -0.8847,0.222533 -1.333985,0.210937 a 0.1744827,0.1744827 0 0 0 -0.002,0
c -0.224236,-0.0054 -0.446196,-0.03374 -0.66796
8,-0.074
22 C 8.8031205,37.881737 7.5177046,35.654547 6.2226562,33.455078 v -0.002 C 6.1449958,33.301386
6.1378973,33.161058 6.1757812,33 6.2138268,32.838256 6.3036736,32.659982 6.4179688,32.474609
6.6282477,32.133564 6.9001194,31.77048 7.0449219,31.375 c 0.00783,-0.0028 0.015679,-0.005 0.023437,-0.0078 z"
id="polygon45097"
inkscape:connector-curvature="0" />
<path
@@ -56341,7 +56459,7 @@
inkscape:connector-curvature="0" />
<path
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#a40000;fill-opacity:1;fill-rule:nonzero;stroke:none;str
oke-widt
h:0.34893051;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
- d="m 7.8574219,40.771484 c -0.3634916,0.0081 -0.7421996,0.09702 -1.1113281,0.251954
-0.7382572,0.309869 -1.4511527,0.888194 -1.9785157,1.666015 -0.5276384,0.777823 -0.7733392,1.612584
-0.734375,2.347656 0.038964,0.735072 0.3748273,1.378454 0.9980469,1.710938 h 0.00195 c 0.6233177,0.331076
1.3965265,0.290244 2.1347657,-0.01953 0.7382391,-0.309775 1.4509113,-0.88973 1.9785156,-1.667969
0.5276554,-0.777848 0.7734064,-1.612388 0.734375,-2.347656 C 9.8418279,41.977623 9.5058022,41.334467
8.8828125,41.001953 L 8.8808594,41 C 8.569187,40.834943 8.2209134,40.763338 7.8574219,40.771484 Z m
0.859375,0.53711 c 0.5058043,0.269967 0.7803164,0.778813 0.8144531,1.421875 0.034137,0.643061
-0.1833423,1.411711 -0.6738281,2.134765 -0.4905258,0.723547 -1.1575593,1.260457 -1.8261719,1.541016
-0.6686126,0.280559 -1.3299527,0.303911 -1.8359375,0.03516 -0.5060934,-0.269997 -0.778426,-0.779059
-0.8125,-1.421875 -0.034074,-0.642816 0.1833259,-1.411687 0.6738281,-2.134765 0.4902482,-0.72308
1.15549
44,-1.258378 1.8242188,-1.539063 0.668014,-0.280387 1.3301868,-0.304155 1.8359375,-0.03711 z M
8.234375,41.957031 c -0.3324687,-0.176734 -0.773007,-0.102307 -1.21875,0.119141 -0.445743,0.221448
-0.9050095,0.606931 -1.2636719,1.136719 -0.3593723,0.529746 -0.5311405,1.072228 -0.5429687,1.535156
-0.011828,0.462928 0.1380252,0.868444 0.4707031,1.044922 0.3322315,0.176861 0.7735275,0.104123
1.21875,-0.117188 0.4459294,-0.221662 0.9050128,-0.606936 1.2636719,-1.136719 0.359618,-0.529744
0.5312668,-1.074231 0.5429687,-1.537109 C 8.71678,42.539075 8.5670056,42.133855 8.234375,41.957031 Z m
-0.1640625,0.308594 c 0.168607,0.08963 0.2948294,0.343933 0.2851563,0.726563 -0.00967,0.382629
-0.1566491,0.871674 -0.4824219,1.351562 C 7.548192,44.8236 7.128571,45.171218 6.7421875,45.363281
6.355804,45.555344 6.0121028,45.574494 5.84375,45.484375 h -0.00195 c -0.1680977,-0.08917
-0.2929835,-0.343783 -0.2832031,-0.726563 0.00978,-0.382779 0.156875,-0.869724 0.4824218,-1.349609
0.3248518,-0.47984
5 0.7426
877,-0.827655 1.1289063,-1.019531 0.3862186,-0.191876 0.7316126,-0.212766 0.9003906,-0.123047 z"
+ d="m 7.8574219,40.771484 c -0.3634916,0.0081 -0.7421996,0.09702 -1.1113281,0.251954
-0.7382572,0.309869 -1.4511527,0.888194 -1.9785157,1.666015 -0.5276384,0.777823 -0.7733392,1.612584
-0.734375,2.347656 0.038964,0.735072 0.3748273,1.378454 0.9980469,1.710938 H 5.0332 c 0.6233177,0.331076
1.3965265,0.290244 2.1347657,-0.01953 C 7.9062048,46.418742 8.618877,45.838787 9.1464813,45.060548
9.6741367,44.2827 9.9198877,43.44816 9.8808563,42.712892 9.8418279,41.977623 9.5058022,41.334467
8.8828125,41.001953 L 8.8808594,41 C 8.569187,40.834943 8.2209134,40.763338 7.8574219,40.771484 Z m
0.859375,0.53711 C 9.2226012,41.578561 9.4971133,42.087407 9.53125,42.730469 9.565387,43.37353
9.3479077,44.14218 8.8574219,44.865234 8.3668961,45.588781 7.6998626,46.125691 7.03125,46.40625
6.3626374,46.686809 5.7012973,46.710161 5.1953125,46.44141 4.6892191,46.171413 4.4168865,45.662351
4.3828125,45.019535 4.3487385,44.376719 4.5661384,43.607848 5.0566406,42.88477 5.5468888,42.16169 6.212
135,41.6
26392 6.8808594,41.345707 7.5488734,41.06532 8.2110462,41.041552 8.7167969,41.308597 Z M 8.234375,41.957031
c -0.3324687,-0.176734 -0.773007,-0.102307 -1.21875,0.119141 -0.445743,0.221448 -0.9050095,0.606931
-1.2636719,1.136719 -0.3593723,0.529746 -0.5311405,1.072228 -0.5429687,1.535156 -0.011828,0.462928
0.1380252,0.868444 0.4707031,1.044922 0.3322315,0.176861 0.7735275,0.104123 1.21875,-0.117188
0.4459294,-0.221662 0.9050128,-0.606936 1.2636719,-1.136719 0.359618,-0.529744 0.5312668,-1.074231
0.5429687,-1.537109 C 8.71678,42.539075 8.5670056,42.133855 8.234375,41.957031 Z m -0.1640625,0.308594 c
0.168607,0.08963 0.2948294,0.343933 0.2851563,0.726563 -0.00967,0.382629 -0.1566491,0.871674
-0.4824219,1.351562 C 7.548192,44.8236 7.128571,45.171218 6.7421875,45.363281 6.355804,45.555344
6.0121028,45.574494 5.84375,45.484375 H 5.8418 c -0.1680977,-0.08917 -0.2929835,-0.343783
-0.2832031,-0.726563 0.00978,-0.382779 0.156875,-0.869724 0.4824218,-1.349609 0.3248518,-0.479845 0.7426
877,-0.8
27655 1.1289063,-1.019531 0.3862186,-0.191876 0.7316126,-0.212766 0.9003906,-0.123047 z"
id="path82220"
inkscape:connector-curvature="0" />
<path
@@ -58241,7 +58359,7 @@
inkscape:connector-curvature="0" />
<path
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:url(#linearGradient4260);fill-opacity:1;fill-rule:evenod
d;stroke
:none;stroke-width:0.32678422;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
- d="m -50.115234,1018.1797 c -0.247037,0 -0.453619,0.1459 -0.550782,0.3613 a 0.16340845,0.16340845
0 0 0 -0.0039,0.01 l -2.095703,5.4219 a 0.16340845,0.16340845 0 0 0 -0.002,0 c 0,0 -0.08789,0.2435
-0.08789,0.6171 v 3.0352 c 0,0.2392 0.03782,0.4278 0.171875,0.5527 0.134052,0.1249 0.310855,0.1426
0.511719,0.1426 h 12.316406 c 0.114607,0 0.210457,-0.01 0.300781,-0.029 0.09032,-0.023 0.178072,-0.07
0.238282,-0.1445 0.120418,-0.1486 0.125,-0.3337 0.125,-0.5899 v -3.0351 l -0.002,0.021 c 0,0 0.04952,-0.257
-0.03711,-0.4922 a 0.16340845,0.16340845 0 0 0 -0.002,-0 l -2.152344,-5.4883 c -0.07482,-0.2075
-0.253694,-0.3753 -0.482422,-0.3808 a 0.16340845,0.16340845 0 0 0 -0.0039,0 z m 0,0.3262 H -41.875 c
0.07838,0 0.142317,0.052 0.183594,0.166 a 0.16340845,0.16340845 0 0 0 0,0 l 2.154297,5.4883 c 0.03901,0.1059
0.02148,0.3339 0.02148,0.3339 a 0.16340845,0.16340845 0 0 0 -0.002,0.024 v 3.0351 c 0,0.241 -0.03055,0.3574
-0.05273,0.3848 -0.01109,0.014 -0.02219,0.022 -0.06641,0.0
33 -0.04
422,0.012 -0.117168,0.019 -0.21875,0.019 h -12.316406 c -0.175077,0 -0.256573,-0.026 -0.289063,-0.057
-0.03249,-0.03 -0.06836,-0.109 -0.06836,-0.3125 v -3.0352 c 0,-0.3233 0.06784,-0.5006 0.06836,-0.5019 v -0 l
2.091797,-5.4101 c 0.06014,-0.1334 0.107697,-0.1699 0.253907,-0.1699 z"
+ d="m -50.115234,1018.1797 c -0.247037,0 -0.453619,0.1459 -0.550782,0.3613 a 0.16340845,0.16340845
0 0 0 -0.0039,0.01 l -2.095703,5.4219 a 0.16340845,0.16340845 0 0 0 -0.002,0 c 0,0 -0.08789,0.2435
-0.08789,0.6171 v 3.0352 c 0,0.2392 0.03782,0.4278 0.171875,0.5527 0.134052,0.1249 0.310855,0.1426
0.511719,0.1426 h 12.316406 c 0.114607,0 0.210457,-0.01 0.300781,-0.029 0.09032,-0.023 0.178072,-0.07
0.238282,-0.1445 0.120418,-0.1486 0.125,-0.3337 0.125,-0.5899 v -3.0351 l -0.002,0.021 c 0,0 0.04952,-0.257
-0.03711,-0.4922 a 0.16340845,0.16340845 0 0 0 -0.002,0 l -2.152344,-5.4883 c -0.07482,-0.2075
-0.253694,-0.3753 -0.482422,-0.3808 a 0.16340845,0.16340845 0 0 0 -0.0039,0 z m 0,0.3262 H -41.875 c
0.07838,0 0.142317,0.052 0.183594,0.166 l 2.154297,5.4883 c 0.03901,0.1059 0.02148,0.3339 0.02148,0.3339 a
0.16340845,0.16340845 0 0 0 -0.002,0.024 v 3.0351 c 0,0.241 -0.03055,0.3574 -0.05273,0.3848 -0.01109,0.014
-0.02219,0.022 -0.06641,0.033 -0.04422,0.012 -0.117168,0.019 -
0.21875,
0.019 h -12.316406 c -0.175077,0 -0.256573,-0.026 -0.289063,-0.057 -0.03249,-0.03 -0.06836,-0.109
-0.06836,-0.3125 v -3.0352 c 0,-0.3233 0.06784,-0.5006 0.06836,-0.5019 v 0 l 2.091797,-5.4101 c
0.06014,-0.1334 0.107697,-0.1699 0.253907,-0.1699 z"
id="path4252-9"
inkscape:connector-curvature="0" />
</g>
@@ -58288,7 +58406,7 @@
sodipodi:nodetypes="cccccccc" />
<path
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:url(#linearGradient4260-3);fill-opacity:1;fill-rule:ev
enodd;st
roke:none;stroke-width:0.32678422;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
- d="m -50.115234,1018.1797 c -0.247037,0 -0.453619,0.1459 -0.550782,0.3613 a
0.16340845,0.16340845 0 0 0 -0.0039,0.01 l -2.095703,5.4219 a 0.16340845,0.16340845 0 0 0 -0.002,0 c 0,0
-0.08789,0.2435 -0.08789,0.6171 v 3.0352 c 0,0.2392 0.03782,0.4278 0.171875,0.5527 0.134052,0.1249
0.310855,0.1426 0.511719,0.1426 h 12.316406 c 0.114607,0 0.210457,-0.01 0.300781,-0.029 0.09032,-0.023
0.178072,-0.07 0.238282,-0.1445 0.120418,-0.1486 0.125,-0.3337 0.125,-0.5899 v -3.0351 l -0.002,0.021 c 0,0
0.04952,-0.257 -0.03711,-0.4922 a 0.16340845,0.16340845 0 0 0 -0.002,-0 l -2.152344,-5.4883 c
-0.07482,-0.2075 -0.253694,-0.3753 -0.482422,-0.3808 a 0.16340845,0.16340845 0 0 0 -0.0039,0 z m 0,0.3262 H
-41.875 c 0.07838,0 0.142317,0.052 0.183594,0.166 a 0.16340845,0.16340845 0 0 0 0,0 l 2.154297,5.4883 c
0.03901,0.1059 0.02148,0.3339 0.02148,0.3339 a 0.16340845,0.16340845 0 0 0 -0.002,0.024 v 3.0351 c 0,0.241
-0.03055,0.3574 -0.05273,0.3848 -0.01109,0.014 -0.02219,0.022 -0.06641,0
.033 -0.
04422,0.012 -0.117168,0.019 -0.21875,0.019 h -12.316406 c -0.175077,0 -0.256573,-0.026 -0.289063,-0.057
-0.03249,-0.03 -0.06836,-0.109 -0.06836,-0.3125 v -3.0352 c 0,-0.3233 0.06784,-0.5006 0.06836,-0.5019 v -0 l
2.091797,-5.4101 c 0.06014,-0.1334 0.107697,-0.1699 0.253907,-0.1699 z"
+ d="m -50.115234,1018.1797 c -0.247037,0 -0.453619,0.1459 -0.550782,0.3613 a
0.16340845,0.16340845 0 0 0 -0.0039,0.01 l -2.095703,5.4219 a 0.16340845,0.16340845 0 0 0 -0.002,0 c 0,0
-0.08789,0.2435 -0.08789,0.6171 v 3.0352 c 0,0.2392 0.03782,0.4278 0.171875,0.5527 0.134052,0.1249
0.310855,0.1426 0.511719,0.1426 h 12.316406 c 0.114607,0 0.210457,-0.01 0.300781,-0.029 0.09032,-0.023
0.178072,-0.07 0.238282,-0.1445 0.120418,-0.1486 0.125,-0.3337 0.125,-0.5899 v -3.0351 l -0.002,0.021 c 0,0
0.04952,-0.257 -0.03711,-0.4922 a 0.16340845,0.16340845 0 0 0 -0.002,0 l -2.152344,-5.4883 c -0.07482,-0.2075
-0.253694,-0.3753 -0.482422,-0.3808 a 0.16340845,0.16340845 0 0 0 -0.0039,0 z m 0,0.3262 H -41.875 c
0.07838,0 0.142317,0.052 0.183594,0.166 l 2.154297,5.4883 c 0.03901,0.1059 0.02148,0.3339 0.02148,0.3339 a
0.16340845,0.16340845 0 0 0 -0.002,0.024 v 3.0351 c 0,0.241 -0.03055,0.3574 -0.05273,0.3848 -0.01109,0.014
-0.02219,0.022 -0.06641,0.033 -0.04422,0.012 -0.117168,0.019
-0.2187
5,0.019 h -12.316406 c -0.175077,0 -0.256573,-0.026 -0.289063,-0.057 -0.03249,-0.03 -0.06836,-0.109
-0.06836,-0.3125 v -3.0352 c 0,-0.3233 0.06784,-0.5006 0.06836,-0.5019 v 0 l 2.091797,-5.4101 c
0.06014,-0.1334 0.107697,-0.1699 0.253907,-0.1699 z"
id="path4252-0"
inkscape:connector-curvature="0" />
</g>
@@ -58316,6 +58434,33 @@
sodipodi:nodetypes="ccccccccc" />
</g>
</g>
+ <g
+ style="display:inline"
+ transform="matrix(3.7795275,0,0,3.7795275,182.235,-267.39425)"
+ id="media-record">
+ <g
+ id="group">
+ <circle
+
style="opacity:0.98999999;fill:#7e1a1a;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.52916664;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.62288136;paint-order:normal"
+ id="path836"
+ cx="2.1166666"
+ cy="294.88333"
+ r="1.8520833" />
+ <circle
+
style="opacity:0.98999999;fill:url(#linearGradient848);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.52916664;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.62288136;paint-order:normal"
+ id="path840"
+ cx="2.1166666"
+ cy="294.88333"
+ r="1.5875" />
+ </g>
+ <rect
+ y="292.76666"
+ x="0"
+ height="4.2333331"
+ width="4.2333331"
+ id="rect18027"
+
style="fill:none;fill-rule:evenodd;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
/>
+ </g>
</g>
<g
inkscape:groupmode="layer"
diff --git a/icons/Color/scalable/gimp-marker.svg b/icons/Color/scalable/gimp-marker.svg
new file mode 100644
index 0000000000..1ddb367cd5
--- /dev/null
+++ b/icons/Color/scalable/gimp-marker.svg
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ width="16"
+ height="16"
+ viewBox="0 0 4.2333332 4.2333335"
+ version="1.1"
+ id="svg8"
+ inkscape:version="0.92.3 (2405546, 2018-03-11)"
+ sodipodi:docname="gimp-marker.svg">
+ <title
+ id="title8619">GIMP Marker</title>
+ <defs
+ id="defs2" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="44.25"
+ inkscape:cx="8"
+ inkscape:cy="8"
+ inkscape:document-units="pc"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ units="px"
+ inkscape:window-width="1535"
+ inkscape:window-height="876"
+ inkscape:window-x="65"
+ inkscape:window-y="24"
+ inkscape:window-maximized="1">
+ <inkscape:grid
+ type="xygrid"
+ id="grid815"
+ empspacing="4" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata5">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+ <dc:title>GIMP Marker</dc:title>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Ell</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/"; />
+ </cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/";>
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction"; />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution"; />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice"; />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution"; />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks"; />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike"; />
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(0,-292.76665)"
+ style="display:inline">
+ <g
+ id="gimp-marker">
+ <path
+ inkscape:connector-curvature="0"
+ id="path1551"
+ d="m 0.26458333,296.7354 0.79374997,-0.79375 v -2.91042 h 2.6458332 v 1.5875 H 1.5875 v 1.32292 l
0.79375,0.79375 z"
+
style="display:inline;fill:none;fill-rule:evenodd;stroke:#c1c1ff;stroke-width:0.5291667;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
/>
+ <g
+ id="g8601">
+ <g
+ id="g8587">
+ <path
+ sodipodi:nodetypes="cccc"
+ inkscape:connector-curvature="0"
+ id="path1431"
+ d="M 0.26454594,296.7354 H 2.3812127 l -1.0583334,-1.05833 z"
+
style="fill:#202020;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
/>
+ <rect
+ y="293.03122"
+ x="1.058296"
+ height="3.175"
+ width="0.5291667"
+ id="rect1433"
+
style="fill:#202020;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
/>
+ </g>
+ <g
+ id="g8583">
+ <rect
+ y="293.03122"
+ x="1.5874625"
+ height="1.5875138"
+ width="2.1166668"
+ id="rect1437"
+
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
/>
+ <g
+ transform="translate(-0.26462073)"
+ style="fill:#2020ff;fill-opacity:1"
+ id="g1511">
+ <rect
+
style="fill:#2020ff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ id="rect1439"
+ width="0.52916664"
+ height="0.52916664"
+ x="1.8520833"
+ y="293.03122" />
+ <rect
+
style="fill:#2020ff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ id="rect1439-3"
+ width="0.52916664"
+ height="0.52916664"
+ x="2.9104166"
+ y="293.03122" />
+ <rect
+
style="fill:#2020ff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ id="rect1439-6"
+ width="0.52916664"
+ height="0.52916664"
+ x="2.3812499"
+ y="293.56039" />
+ <rect
+
style="fill:#2020ff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ id="rect1439-3-7"
+ width="0.52916664"
+ height="0.52916664"
+ x="3.4395833"
+ y="293.56039" />
+ <rect
+
style="fill:#2020ff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ id="rect1439-5"
+ width="0.52916664"
+ height="0.52916664"
+ x="1.8520833"
+ y="294.08957" />
+ <rect
+
style="fill:#2020ff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ id="rect1439-3-3"
+ width="0.52916664"
+ height="0.52916664"
+ x="2.9104166"
+ y="294.08957" />
+ </g>
+ </g>
+ </g>
+ </g>
+ </g>
+</svg>
diff --git a/icons/Color/scalable/media-record.svg b/icons/Color/scalable/media-record.svg
new file mode 100644
index 0000000000..3d0acfd7c9
--- /dev/null
+++ b/icons/Color/scalable/media-record.svg
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:xlink="http://www.w3.org/1999/xlink";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ width="16"
+ height="16"
+ viewBox="0 0 4.2333332 4.2333335"
+ version="1.1"
+ id="svg8"
+ inkscape:version="0.92.3 (2405546, 2018-03-11)"
+ sodipodi:docname="media-record.svg">
+ <title
+ id="title7906">Media Record</title>
+ <defs
+ id="defs2">
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient846">
+ <stop
+ style="stop-color:#f95757;stop-opacity:1"
+ offset="0"
+ id="stop842" />
+ <stop
+ style="stop-color:#d91919;stop-opacity:1"
+ offset="1"
+ id="stop844" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient846"
+ id="linearGradient848"
+ x1="2.1166668"
+ y1="293.29581"
+ x2="2.1166668"
+ y2="296.47083"
+ gradientUnits="userSpaceOnUse" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="44.25"
+ inkscape:cx="1.2768362"
+ inkscape:cy="8"
+ inkscape:document-units="pc"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ units="px"
+ inkscape:window-width="1535"
+ inkscape:window-height="876"
+ inkscape:window-x="65"
+ inkscape:window-y="24"
+ inkscape:window-maximized="1">
+ <inkscape:grid
+ type="xygrid"
+ id="grid815"
+ empspacing="4" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata5">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+ <dc:title>Media Record</dc:title>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Ell</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/"; />
+ </cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/";>
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction"; />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution"; />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice"; />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution"; />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks"; />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike"; />
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(0,-292.76665)">
+ <g
+ id="media-record">
+ <circle
+ r="1.8520833"
+ cy="294.88333"
+ cx="2.1166666"
+ id="path836"
+
style="opacity:0.98999999;fill:#7e1a1a;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.52916664;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.62288136;paint-order:normal"
/>
+ <circle
+ r="1.5875"
+ cy="294.88333"
+ cx="2.1166666"
+ id="path840"
+
style="opacity:0.98999999;fill:url(#linearGradient848);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.52916664;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.62288136;paint-order:normal"
/>
+ </g>
+ </g>
+</svg>
diff --git a/icons/Symbolic/16/gimp-marker.png b/icons/Symbolic/16/gimp-marker.png
new file mode 100644
index 0000000000..f6de788c6b
Binary files /dev/null and b/icons/Symbolic/16/gimp-marker.png differ
diff --git a/icons/Symbolic/16/media-record.png b/icons/Symbolic/16/media-record.png
new file mode 100644
index 0000000000..e1e651668a
Binary files /dev/null and b/icons/Symbolic/16/media-record.png differ
diff --git a/icons/Symbolic/scalable/gimp-marker.svg b/icons/Symbolic/scalable/gimp-marker.svg
new file mode 100644
index 0000000000..23bd675488
--- /dev/null
+++ b/icons/Symbolic/scalable/gimp-marker.svg
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ width="16"
+ height="16"
+ viewBox="0 0 4.2333332 4.2333335"
+ version="1.1"
+ id="svg8"
+ inkscape:version="0.92.3 (2405546, 2018-03-11)"
+ sodipodi:docname="gimp-marker.svg">
+ <title
+ id="title10373">GIMP Marker</title>
+ <defs
+ id="defs2" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="44.25"
+ inkscape:cx="8"
+ inkscape:cy="8"
+ inkscape:document-units="pc"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ units="px"
+ inkscape:window-width="1535"
+ inkscape:window-height="876"
+ inkscape:window-x="65"
+ inkscape:window-y="24"
+ inkscape:window-maximized="1">
+ <inkscape:grid
+ type="xygrid"
+ id="grid815"
+ empspacing="4" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata5">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+ <dc:title>GIMP Marker</dc:title>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Ell</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/"; />
+ </cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/";>
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction"; />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution"; />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice"; />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution"; />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks"; />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike"; />
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(0,-292.76665)"
+ style="display:inline">
+ <g
+ id="gimp-marker">
+ <g
+ id="g10359">
+ <path
+
style="fill:#bebebe;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0.26454594,296.7354 H 2.3812127 l -1.0583334,-1.05833 z"
+ id="path1431"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccc" />
+ <rect
+
style="fill:#bebebe;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ id="rect1433"
+ width="0.5291667"
+ height="3.175"
+ x="1.058296"
+ y="293.03122" />
+ </g>
+ <g
+ style="fill:#bebebe;fill-opacity:1"
+ id="g1511">
+ <rect
+
style="fill:#bebebe;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ id="rect1439"
+ width="0.52916664"
+ height="0.52916664"
+ x="1.8520833"
+ y="293.03122" />
+ <rect
+
style="fill:#bebebe;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ id="rect1439-3"
+ width="0.52916664"
+ height="0.52916664"
+ x="2.9104166"
+ y="293.03122" />
+ <rect
+
style="fill:#bebebe;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ id="rect1439-6"
+ width="0.52916664"
+ height="0.52916664"
+ x="2.3812499"
+ y="293.56039" />
+ <rect
+
style="fill:#bebebe;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ id="rect1439-3-7"
+ width="0.52916664"
+ height="0.52916664"
+ x="3.4395833"
+ y="293.56039" />
+ <rect
+
style="fill:#bebebe;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ id="rect1439-5"
+ width="0.52916664"
+ height="0.52916664"
+ x="1.8520833"
+ y="294.08957" />
+ <rect
+
style="fill:#bebebe;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ id="rect1439-3-3"
+ width="0.52916664"
+ height="0.52916664"
+ x="2.9104166"
+ y="294.08957" />
+ </g>
+ </g>
+ </g>
+</svg>
diff --git a/icons/Symbolic/scalable/media-record.svg b/icons/Symbolic/scalable/media-record.svg
new file mode 100644
index 0000000000..1965434d5f
--- /dev/null
+++ b/icons/Symbolic/scalable/media-record.svg
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ width="16"
+ height="16"
+ viewBox="0 0 4.2333332 4.2333335"
+ version="1.1"
+ id="svg8"
+ inkscape:version="0.92.3 (2405546, 2018-03-11)"
+ sodipodi:docname="media-record.svg">
+ <title
+ id="title6773">Media Record</title>
+ <defs
+ id="defs2" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="44.4375"
+ inkscape:cx="8"
+ inkscape:cy="8"
+ inkscape:document-units="pc"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ units="px"
+ inkscape:window-width="1535"
+ inkscape:window-height="876"
+ inkscape:window-x="65"
+ inkscape:window-y="24"
+ inkscape:window-maximized="1">
+ <inkscape:grid
+ type="xygrid"
+ id="grid815"
+ empspacing="4" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata5">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+ <dc:title>Media Record</dc:title>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Ell</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/"; />
+ </cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/";>
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction"; />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution"; />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice"; />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution"; />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks"; />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike"; />
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(0,-292.76665)">
+ <circle
+
style="opacity:0.98999999;fill:#bebebe;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.52916664;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.62288136;paint-order:normal"
+ id="media-record"
+ cx="2.1166666"
+ cy="294.88333"
+ r="1.5875" />
+ </g>
+</svg>
diff --git a/icons/Symbolic/symbolic-scalable.svg b/icons/Symbolic/symbolic-scalable.svg
index 882cd36c02..4f16603840 100644
--- a/icons/Symbolic/symbolic-scalable.svg
+++ b/icons/Symbolic/symbolic-scalable.svg
@@ -15,7 +15,7 @@
width="1322.0306"
height="388.46494"
id="svg7384"
- inkscape:version="0.92.2 2405546, 2018-03-11"
+ inkscape:version="0.92.3 (2405546, 2018-03-11)"
sodipodi:docname="symbolic-scalable.svg"
viewBox="0 0 1322.0306 388.46493">
<metadata
@@ -45,15 +45,15 @@
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:window-width="1366"
- inkscape:window-height="741"
+ inkscape:window-width="1535"
+ inkscape:window-height="876"
id="namedview88"
showgrid="true"
- inkscape:zoom="8"
- inkscape:cx="633.94844"
- inkscape:cy="49.874466"
- inkscape:window-x="0"
- inkscape:window-y="27"
+ inkscape:zoom="1"
+ inkscape:cx="768.7005"
+ inkscape:cy="62.315404"
+ inkscape:window-x="65"
+ inkscape:window-y="24"
inkscape:window-maximized="1"
inkscape:current-layer="stock"
showborder="false"
@@ -26186,7 +26186,7 @@
inkscape:transform-center-y="78.48885" />
<rect
transform="matrix(1.0008752,0,0,1,-55.7377,111.68811)"
- style="display:inline;color:#000000;fill:url(#linearGradient19282-4);stroke-width:0.40591383"
+ style="color:#000000;display:inline;fill:url(#linearGradient19282-4);stroke-width:0.40591383"
id="rect18772"
width="39.965023"
height="40"
@@ -26194,7 +26194,7 @@
y="-160.08525" />
<text
xml:space="preserve"
-
style="display:inline;font-style:normal;font-weight:normal;font-size:33.49792862px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.83744824px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+
style="font-style:normal;font-weight:normal;font-size:33.49792862px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.83744824px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
x="-560.16498"
y="-148.34918"
id="text6813"
@@ -26797,7 +26797,7 @@
inkscape:connector-curvature="0" />
<rect
transform="matrix(0,1,1,0,0,0)"
-
style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:1;marker:none;enable-background:new;opacity:0"
+
style="color:#bebebe;display:inline;overflow:visible;visibility:visible;opacity:0;fill:none;stroke:none;stroke-width:1;marker:none;enable-background:new"
id="rect10837-5-8-4-4-4-1"
y="160"
x="538"
@@ -28071,6 +28071,24 @@
id="rect11749-5-0-1-8-7" />
</g>
</g>
+ <g
+ transform="matrix(3.7795275,0,0,3.7795275,139.207,-456.58472)"
+ id="media-record"
+ inkscape:label="#media-record">
+ <circle
+ r="1.5875"
+ cy="294.88333"
+ cx="2.1166666"
+ id="circ"
+
style="opacity:0.98999999;fill:#bebebe;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.52916664;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.62288136;paint-order:normal"
/>
+ <rect
+ y="292.76666"
+ x="0"
+ height="4.2333331"
+ width="4.2333331"
+ id="rect22240"
+
style="fill:none;fill-rule:evenodd;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
/>
+ </g>
</g>
<g
inkscape:groupmode="layer"
@@ -30831,7 +30849,7 @@
d="m 10,1046.3622 v 8 h 8 v -8 z m 1,1 h 6 v 6 h -6 z"
style="fill:url(#linearGradient7875);fill-opacity:1;stroke:none;stroke-width:1.33517039" />
<rect
- style="display:inline;opacity:1;fill:#000000 !important;fill-opacity:1;stroke:none;stroke-width:1.5"
+ style="display:inline;opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.5"
id="rect13014-5-5"
width="6"
height="6"
@@ -30875,7 +30893,7 @@
d="m 10,1046.3622 v 8 h 8 v -8 z m 1,1 h 6 v 6 h -6 z"
style="fill:url(#linearGradient7855);fill-opacity:1;stroke:none;stroke-width:1.33517039" />
<rect
- style="display:inline;opacity:1;fill:#ffffff !important;fill-opacity:1;stroke:none;stroke-width:1.5"
+ style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.5"
id="rect13014-5"
width="6"
height="6"
@@ -30919,7 +30937,7 @@
d="m 10,1046.3622 v 8 h 8 v -8 z m 1,1 h 6 v 6 h -6 z"
style="fill:url(#linearGradient7837);fill-opacity:1;stroke:none;stroke-width:1.33517039" />
<rect
- style="display:inline;opacity:1;fill:#7f7f7f !important;fill-opacity:1;stroke:none;stroke-width:1.5"
+ style="display:inline;opacity:1;fill:#7f7f7f;fill-opacity:1;stroke:none;stroke-width:1.5"
id="rect13014-5-9"
width="6"
height="6"
@@ -31859,7 +31877,7 @@
<path
id="rect6791-3"
transform="matrix(0,0.6666668,-0.6666668,0,77.000215,619.33333)"
- d="m 7.0000055,3.0000253 c -1.6619997,0 -3,1.3380001 -3,2.9999998 V 9.000025 l 3,0 0,-1.9999999 c
0,-0.8309998 0.4683279,-1 1.2993277,-1 H 14.645982 C 15.476982,6.0000251 16,6.6690002 16,7.5 l 5e-6,1.500025
3,0 L 19,6 c -3e-6,-1.6619997 -1.337995,-2.9999747 -2.999995,-2.9999747 z m -3,11.9999997 0,3 c 0,1.662
1.3380003,3 3,3 H 16.000005 C 17.662005,21.000025 19,19.662 19,18 l 5e-6,-2.999975 -3,0 L 16,16.5 c
-3e-6,0.831 -0.669,1.500025 -1.5,1.500025 h -6 c -0.8309998,0 -1.4999945,-0.169 -1.4999945,-1 v -2 z"
+ d="m 7.0000055,3.0000253 c -1.6619997,0 -3,1.3380001 -3,2.9999998 V 9.000025 h 3 V 7.0000251 c
0,-0.8309998 0.4683279,-1 1.2993277,-1 H 14.645982 C 15.476982,6.0000251 16,6.6690002 16,7.5 l 5e-6,1.500025
h 3 L 19,6 c -3e-6,-1.6619997 -1.337995,-2.9999747 -2.999995,-2.9999747 z m -3,11.9999997 v 3 c 0,1.662
1.3380003,3 3,3 H 16.000005 C 17.662005,21.000025 19,19.662 19,18 l 5e-6,-2.999975 h -3 L 16,16.5 c
-3e-6,0.831 -0.669,1.500025 -1.5,1.500025 h -6 c -0.8309998,0 -1.4999945,-0.169 -1.4999945,-1 v -2 z"
style="fill:url(#linearGradient9926);fill-opacity:1;stroke:none;stroke-width:1.49999964"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ssccssssccssscssssccsssscc" />
@@ -31909,7 +31927,7 @@
inkscape:connector-curvature="0"
id="rect6791-5"
transform="matrix(0,0.6666668,-0.6666668,0,77.000215,619.33333)"
- d="M 7,3 C 5.3380003,3 4,4.3380003 4,6 l -0.00351,2.9999947 2.9973747,0 L 7,7.5 C
7.0033989,6.6690072 7.6690002,6 8.5,6 h 6 C 15.331,6 16,6.6690002 16,7.5 l -0.014,1.4999947 2.997377,0 L 19,6
C 19.009212,4.3380259 17.662,3 16,3 Z M 3.996488,14.999995 4,18 c 0.00195,1.661999 1.3380003,3 3,3 h 9 c
1.662,0 3,-1.338 3,-3 l -0.01663,-3.000005 -2.997377,0 L 16,16.5 c 0.0078,0.830964 -0.669,1.5 -1.5,1.5 h -6 C
7.6690002,18 7,17.331 7,16.5 L 6.99386,14.999995 Z"
+ d="M 7,3 C 5.3380003,3 4,4.3380003 4,6 L 3.99649,8.9999947 H 6.9938647 L 7,7.5 C
7.0033989,6.6690072 7.6690002,6 8.5,6 h 6 C 15.331,6 16,6.6690002 16,7.5 l -0.014,1.4999947 h 2.997377 L 19,6
C 19.009212,4.3380259 17.662,3 16,3 Z M 3.996488,14.999995 4,18 c 0.00195,1.661999 1.3380003,3 3,3 h 9 c
1.662,0 3,-1.338 3,-3 L 18.98337,14.999995 H 15.985993 L 16,16.5 c 0.0078,0.830964 -0.669,1.5 -1.5,1.5 h -6 C
7.6690002,18 7,17.331 7,16.5 L 6.99386,14.999995 Z"
style="fill:url(#linearGradient9944);fill-opacity:1;stroke:none;stroke-width:1.49999964"
sodipodi:nodetypes="ssccssssccssscssssccsssscc" />
</g>
@@ -32214,7 +32232,7 @@
height="5"
width="5"
id="rect9128-9"
- style="opacity:1;fill:#ffffff
!important;fill-opacity:1;stroke:none;stroke-width:0.30977488;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke
fill markers"
+
style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.30977488;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke
fill markers"
inkscape:label="color-important" />
<rect
y="1040.3622"
@@ -32229,7 +32247,7 @@
height="5"
width="5"
id="rect9128-9-4"
- style="opacity:1;fill:#000000
!important;fill-opacity:1;stroke:none;stroke-width:0.30977488;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke
fill markers"
+
style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.30977488;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke
fill markers"
inkscape:label="color-important" />
</g>
<rect
@@ -34561,12 +34579,12 @@
</g>
<path
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:url(#linearGradient7489-6);fill-opacity:1;fill-rule:nonzer
o;stroke
:none;stroke-width:2.09907413;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
- d="m 15.666016,9 -4.300782,0.066406 0.0332,2.0976558 4.171874,-0.0625 c 0.227279,0.02287
0.349166,0.0882 0.378907,0.115235 0.03113,0.0283 0.05078,0.01462 0.05078,0.195312 l 0.002,-0.01563
-0.0078,0.585938 h -3.324219 l 0.08008,0.0039 c -0.765504,-0.0581 -1.499847,0.242508 -1.957031,0.728516
-0.457184,0.486008 -0.669874,1.099973 -0.691407,1.707031 -0.02153,0.607058 0.148276,1.242076
0.587891,1.757813 0.439615,0.515736 1.171677,0.841752 1.947266,0.818359 L 12.605469,17 h 5.416015 l
0.07813,-5.580078 v -0.0078 c 0,-0.662025 -0.270215,-1.324567 -0.738281,-1.7499996 C 16.893262,9.236677
16.302557,9.0497107 15.714844,9.0039062 Z m -3.074219,5.078125 0.03906,0.0039 h 3.332032 l -0.01172,0.81836 h
-3.361328 -0.01563 c -0.237268,0.0072 -0.245712,-0.03347 -0.28711,-0.08203 -0.0414,-0.04856
-0.09315,-0.173919 -0.08789,-0.322265 0.0053,-0.148346 0.06771,-0.285051 0.121093,-0.341797 0.05338,-0.05675
0.06669,-0.09172 0.271485,-0.07617 z"
+ d="m 15.666016,9 -4.300782,0.066406 0.0332,2.097656 4.171874,-0.0625 c 0.227279,0.02287
0.349166,0.0882 0.378907,0.115235 0.03113,0.0283 0.05078,0.01462 0.05078,0.195312 l 0.002,-0.01563
-0.0078,0.585938 h -3.324219 l 0.08008,0.0039 c -0.765504,-0.0581 -1.499847,0.242508 -1.957031,0.728516
-0.457184,0.486008 -0.669874,1.099973 -0.691407,1.707031 -0.02153,0.607058 0.148276,1.242076
0.587891,1.757813 0.439615,0.515736 1.171677,0.841752 1.947266,0.818359 L 12.605469,17 h 5.416015 l
0.07813,-5.580078 v -0.0078 c 0,-0.662025 -0.270215,-1.324567 -0.738281,-1.7499996 C 16.893262,9.236677
16.302557,9.0497107 15.714844,9.0039062 Z m -3.074219,5.078125 0.03906,0.0039 h 3.332032 l -0.01172,0.81836 h
-3.361328 -0.01563 c -0.237268,0.0072 -0.245712,-0.03347 -0.28711,-0.08203 -0.0414,-0.04856
-0.09315,-0.173919 -0.08789,-0.322265 0.0053,-0.148346 0.06771,-0.285051 0.121093,-0.341797 0.05338,-0.05675
0.06669,-0.09172 0.271485,-0.07617 z"
id="path11643-7-7"
inkscape:connector-curvature="0" />
<path
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:url(#linearGradient7495-3);fill-opacity:1;fill-rule:nonzer
o;stroke
:none;stroke-width:2.17593384;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
- d="M 16.605469,4.2324219 12,5.9628906 12.765625,8 17,6.4082031 h -0.04883 V 4.2324219 Z"
+ d="M 16.605469,4.2324219 12,5.9628906 12.765625,8 17,6.4082031 H 16.95117 V 4.2324219 Z"
id="path11645-5-2"
inkscape:connector-curvature="0" />
</g>
@@ -34841,7 +34859,7 @@
style="display:inline"
transform="translate(-132.8914,-347.20086)">
<rect
- style="fill:none;stroke:none;opacity:0"
+ style="opacity:0;fill:none;stroke:none"
id="rect11834-8"
width="16"
height="16"
@@ -34873,7 +34891,8 @@
transform="matrix(1.3333333,0,0,1.3333312,264.33353,149.66712)"
style="fill:url(#linearGradient7666-2);fill-opacity:1;stroke:none"
d="m -70,206.5 a 1.5,1.5 0 0 1 -1.5,1.5 1.5,1.5 0 0 1 -1.5,-1.5 1.5,1.5 0 0 1 1.5,-1.5 1.5,1.5 0
0 1 1.5,1.5 z"
- id="path11855-6" />
+ id="path11855-6"
+ inkscape:connector-curvature="0" />
<path
style="fill:url(#linearGradient7676-9);fill-opacity:1;stroke:none"
d="m -65,216 c 0,-3.31371 -3.13401,-6 -7,-6 -3.86599,0 -7,2.68629 -7,6 h 2.015625 c
0.287851,-2.25391 2.407621,-4 4.984375,-4 2.576754,0 4.696524,1.74609 4.984375,4 z"
@@ -35018,7 +35037,7 @@
height="16"
width="16"
id="rect12154"
- style="fill:none;stroke:none;opacity:0" />
+ style="opacity:0;fill:none;stroke:none" />
<g
id="g4934"
transform="matrix(0.99459226,0,0,0.99777268,-20.317163,140.89093)">
@@ -35607,7 +35626,7 @@
<g
id="gimp-file-manager"
inkscape:label="gimp-file-manager"
- transform="translate(-137.05794,50.878229)">
+ transform="translate(-138.05756,50.878229)">
<rect
inkscape:transform-center-y="52.3259"
inkscape:transform-center-x="-94.752306"
@@ -35756,7 +35775,8 @@
<path
style="color:#000000;fill:#bebebe;fill-opacity:1;stroke-width:0.24945228"
d="m 265,795.36218 a 2,2 0 0 1 -2,2 2,2 0 0 1 -2,-2 2,2 0 0 1 2,-2 2,2 0 0 1 2,2 z"
- id="path5911" />
+ id="path5911"
+ inkscape:connector-curvature="0" />
</g>
</g>
<path
@@ -36060,7 +36080,7 @@
style="fill:url(#linearGradient6872);fill-opacity:1;stroke:none" />
</g>
<g
- transform="translate(-80.436437,67.045679)"
+ transform="translate(-77.437735,67.045679)"
style="display:inline"
id="gimp-grid"
inkscape:label="gimp-grid">
@@ -36290,7 +36310,7 @@
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccc" />
<rect
-
style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:2;marker:none;opacity:0"
+
style="color:#bebebe;display:inline;overflow:visible;visibility:visible;opacity:0;fill:none;stroke:none;stroke-width:2;marker:none"
id="rect35735-0-1"
width="16"
height="16"
@@ -36352,7 +36372,8 @@
transform="matrix(1.3333333,0,0,1.3333312,264.33353,149.66712)"
style="fill:url(#linearGradient7666);fill-opacity:1;stroke:none"
d="m -70,206.5 a 1.5,1.5 0 0 1 -1.5,1.5 1.5,1.5 0 0 1 -1.5,-1.5 1.5,1.5 0 0 1 1.5,-1.5 1.5,1.5 0 0
1 1.5,1.5 z"
- id="path11855" />
+ id="path11855"
+ inkscape:connector-curvature="0" />
<path
sodipodi:nodetypes="csccscc"
inkscape:connector-curvature="0"
@@ -38653,7 +38674,7 @@
</g>
<g
style="display:inline"
- transform="translate(17.583491,-590.3165)"
+ transform="translate(19.582641,-590.3165)"
id="gimp-list">
<rect
rx="0"
@@ -39063,7 +39084,8 @@
<path
style="fill:url(#linearGradient7308);fill-opacity:1;stroke:none;stroke-width:1.24986601"
d="m 7,1049.8628 a 2.5,2.4994643 0 0 1 -2.5,2.4995 2.5,2.4994643 0 0 1 -2.5,-2.4995 2.5,2.4994643 0
0 1 2.5,-2.4995 2.5,2.4994643 0 0 1 2.5,2.4995 z"
- id="path30125-2-6" />
+ id="path30125-2-6"
+ inkscape:connector-curvature="0" />
<path
sodipodi:nodetypes="cccc"
inkscape:connector-curvature="0"
@@ -39142,11 +39164,13 @@
<path
style="opacity:1;fill:url(#linearGradient7650);fill-opacity:1;stroke:none;stroke-width:0.25801733;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 6.8709913,1050.8622 A 1.3709913,1.3709913 0 0 1 5.5,1052.2332 1.3709913,1.3709913 0 0 1
4.1290087,1050.8622 1.3709913,1.3709913 0 0 1 5.5,1049.4912 a 1.3709913,1.3709913 0 0 1 1.3709913,1.371 z"
- id="path3938-37" />
+ id="path3938-37"
+ inkscape:connector-curvature="0" />
<path
style="opacity:1;fill:url(#linearGradient7654);fill-opacity:1;stroke:none;stroke-width:0.25801733;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 15.870991,1040.8622 a 1.3709913,1.3709913 0 0 1 -1.370991,1.371 1.3709913,1.3709913 0 0 1
-1.370991,-1.371 1.3709913,1.3709913 0 0 1 1.370991,-1.371 1.3709913,1.3709913 0 0 1 1.370991,1.371 z"
- id="path3938-7" />
+ id="path3938-7"
+ inkscape:connector-curvature="0" />
<g
transform="matrix(1.0025472,0,0,0.99379595,17.651162,4.8495423)"
id="g3996-3">
@@ -39256,11 +39280,13 @@
<path
style="opacity:1;fill:url(#linearGradient8226);fill-opacity:1;stroke:none;stroke-width:0.25801733;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 2.8707784,1050.8619 a 1.3709913,1.3709913 0 0 1 -1.3709913,1.371 1.3709913,1.3709913 0 0 1
-1.37099136,-1.371 1.3709913,1.3709913 0 0 1 1.37099136,-1.371 1.3709913,1.3709913 0 0 1 1.3709913,1.371 z"
- id="path3938-9" />
+ id="path3938-9"
+ inkscape:connector-curvature="0" />
<path
style="opacity:1;fill:url(#linearGradient8224);fill-opacity:1;stroke:none;stroke-width:0.25801733;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 15.870991,1037.8622 a 1.3709913,1.3709913 0 0 1 -1.370991,1.371 1.3709913,1.3709913 0 0 1
-1.370991,-1.371 1.3709913,1.3709913 0 0 1 1.370991,-1.371 1.3709913,1.3709913 0 0 1 1.370991,1.371 z"
- id="path3938-7-5" />
+ id="path3938-7-5"
+ inkscape:connector-curvature="0" />
<g
transform="matrix(1,0,0,0.99994375,-121.0002,577.38892)"
style="display:inline"
@@ -39279,7 +39305,7 @@
x="43.000198"
y="222" />
<rect
- style="fill:none;stroke:none;opacity:0"
+ style="opacity:0;fill:none;stroke:none"
id="rect74851-6-0"
width="16"
height="16"
@@ -40407,7 +40433,7 @@
</g>
<g
style="display:inline"
- transform="translate(-52.353091,-562.06928)"
+ transform="translate(-52.354403,-562.06928)"
id="gimp-user-manual">
<rect
y="1036.3622"
@@ -40493,12 +40519,12 @@
</g>
<path
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:url(#linearGradient10071);fill-opacity:1;fill-rule:nonze
ro;strok
e:none;stroke-width:0.49840832;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke
fill
markers;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
- d="m 15,1050.3613 0.01367,1 0.248047,-0 C 15.667905,1051.3541 16,1051.0176 16,1050.6113 v -0.25 h
-0.25 z"
+ d="m 15,1050.3613 0.01367,1 h 0.248047 C 15.667905,1051.3541 16,1051.0176 16,1050.6113 v -0.25 h
-0.25 z"
id="path4376-4"
inkscape:connector-curvature="0" />
<path
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:url(#linearGradient10052);fill-opacity:1;fill-rule:nonze
ro;strok
e:none;stroke-width:0.49840832;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke
fill
markers;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
- d="m 15,1038.3613 0.01367,-1 0.248047,0 c 0.406186,0.01 0.738281,0.3419 0.738281,0.7481 v 0.248 h
-0.25 z"
+ d="m 15,1038.3613 0.01367,-1 h 0.248047 c 0.406186,0.01 0.738281,0.3419 0.738281,0.7481 v 0.248 h
-0.25 z"
id="path4376-8-4"
inkscape:connector-curvature="0" />
</g>
@@ -40598,7 +40624,7 @@
</g>
</g>
<g
- transform="matrix(0.99912557,0,0,1,-5.3959265,-590.31657)"
+ transform="matrix(0.99912557,0,0,1,-4.3963723,-590.31657)"
id="gimp-shred"
inkscape:label="gimp-shred">
<g
@@ -41318,6 +41344,83 @@
inkscape:transform-center-y="0.89981157"
transform="matrix(0.9327539,0.37141239,-0.42883275,0.80785894,458.6562,187.60832)" />
</g>
+ <g
+ transform="matrix(3.7762226,0,0,3.7795275,-4.3963723,-632.22659)"
+ style="display:inline"
+ id="gimp-marker">
+ <g
+ id="group">
+ <g
+ id="g10359">
+ <path
+ sodipodi:nodetypes="cccc"
+ inkscape:connector-curvature="0"
+ id="path1431"
+ d="M 0.26454594,296.7354 H 2.3812127 l -1.0583334,-1.05833 z"
+
style="fill:#bebebe;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
/>
+ <rect
+ y="293.03122"
+ x="1.058296"
+ height="3.175"
+ width="0.5291667"
+ id="rect1433"
+
style="fill:#bebebe;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
/>
+ </g>
+ <g
+ id="g1511"
+ style="fill:#bebebe;fill-opacity:1">
+ <rect
+ y="293.03122"
+ x="1.8520833"
+ height="0.52916664"
+ width="0.52916664"
+ id="rect1439"
+
style="fill:#bebebe;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
/>
+ <rect
+ y="293.03122"
+ x="2.9104166"
+ height="0.52916664"
+ width="0.52916664"
+ id="rect1439-3"
+
style="fill:#bebebe;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
/>
+ <rect
+ y="293.56039"
+ x="2.3812499"
+ height="0.52916664"
+ width="0.52916664"
+ id="rect1439-6"
+
style="fill:#bebebe;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
/>
+ <rect
+ y="293.56039"
+ x="3.4395833"
+ height="0.52916664"
+ width="0.52916664"
+ id="rect1439-3-7"
+
style="fill:#bebebe;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
/>
+ <rect
+ y="294.08957"
+ x="1.8520833"
+ height="0.52916664"
+ width="0.52916664"
+ id="rect1439-5"
+
style="fill:#bebebe;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
/>
+ <rect
+ y="294.08957"
+ x="2.9104166"
+ height="0.52916664"
+ width="0.52916664"
+ id="rect1439-3-3"
+
style="fill:#bebebe;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
/>
+ </g>
+ </g>
+ <rect
+ y="292.76666"
+ x="0"
+ height="4.2333331"
+ width="4.2333331"
+ id="rect22283"
+
style="fill:none;fill-rule:evenodd;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
/>
+ </g>
</g>
<text
xml:space="preserve"
diff --git a/icons/icon-list.mk b/icons/icon-list.mk
index 6b32ed4383..6aa882ae39 100644
--- a/icons/icon-list.mk
+++ b/icons/icon-list.mk
@@ -37,6 +37,7 @@ scalable_images = \
scalable/media-optical.svg \
scalable/media-playback-pause.svg \
scalable/media-playback-start.svg \
+ scalable/media-record.svg \
scalable/media-seek-backward.svg \
scalable/media-skip-backward.svg \
scalable/media-skip-forward.svg \
@@ -168,6 +169,7 @@ scalable_images = \
scalable/gimp-line-spacing.svg \
scalable/gimp-linked.svg \
scalable/gimp-list.svg \
+ scalable/gimp-marker.svg \
scalable/gimp-menu-left.svg \
scalable/gimp-menu-right.svg \
scalable/gimp-merge-down.svg \
@@ -548,6 +550,7 @@ icons16_images = \
16/media-optical.png \
16/media-playback-pause.png \
16/media-playback-start.png \
+ 16/media-record.png \
16/media-seek-backward.png \
16/media-skip-backward.png \
16/media-skip-forward.png \
@@ -658,6 +661,7 @@ icons16_images = \
16/gimp-layer.png \
16/gimp-layers.png \
16/gimp-list.png \
+ 16/gimp-marker.png \
16/gimp-merge-down.png \
16/gimp-move-to-screen.png \
16/gimp-navigation.png \
diff --git a/libgimpwidgets/gimpicons.h b/libgimpwidgets/gimpicons.h
index 7a7b3a694a..dee950ac1d 100644
--- a/libgimpwidgets/gimpicons.h
+++ b/libgimpwidgets/gimpicons.h
@@ -36,6 +36,7 @@ G_BEGIN_DECLS
#define GIMP_ICON_ATTACH "gimp-attach"
#define GIMP_ICON_DETACH "gimp-detach"
#define GIMP_ICON_INVERT "gimp-invert"
+#define GIMP_ICON_RECORD "media-record"
#define GIMP_ICON_RESET "gimp-reset"
#define GIMP_ICON_SHRED "gimp-shred"
@@ -48,6 +49,7 @@ G_BEGIN_DECLS
#define GIMP_ICON_DISPLAY "gimp-display"
#define GIMP_ICON_GEGL "gimp-gegl"
#define GIMP_ICON_LINKED "gimp-linked"
+#define GIMP_ICON_MARKER "gimp-marker"
#define GIMP_ICON_SMARTPHONE "gimp-smartphone"
#define GIMP_ICON_TRANSPARENCY "gimp-transparency"
#define GIMP_ICON_VIDEO "gimp-video"
diff --git a/menus/dashboard-menu.xml b/menus/dashboard-menu.xml
index 21064ef7ff..bb85292c32 100644
--- a/menus/dashboard-menu.xml
+++ b/menus/dashboard-menu.xml
@@ -20,6 +20,11 @@
<menuitem action="dashboard-history-duration-120-sec" />
<menuitem action="dashboard-history-duration-240-sec" />
</menu>
+ <separator />
+ <menuitem action="dashboard-log-record" />
+ <menuitem action="dashboard-log-add-marker" />
+ <menuitem action="dashboard-log-add-empty-marker" />
+ <separator />
<menuitem action="dashboard-reset" />
<separator />
<menuitem action="dashboard-low-swap-space-warning" />
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
