diff --git a/ground/openpilotgcs/share/openpilotgcs/default_configurations/OpenPilotGCS.xml b/ground/openpilotgcs/share/openpilotgcs/default_configurations/OpenPilotGCS.xml index c9878fe5d..33bac006d 100644 --- a/ground/openpilotgcs/share/openpilotgcs/default_configurations/OpenPilotGCS.xml +++ b/ground/openpilotgcs/share/openpilotgcs/default_configurations/OpenPilotGCS.xml @@ -2830,15 +2830,15 @@ false :/core/images/ah.png - :/core/images/openpilot_logo_64.png + :/core/images/librepilot_logo_64.png :/core/images/config.png :/core/images/cog.png :/core/images/scopes.png :/core/images/joystick.png :/core/images/cpu.png - :/core/images/openpilot_logo_64.png - :/core/images/openpilot_logo_64.png - :/core/images/openpilot_logo_64.png + :/core/images/librepilot_logo_64.png + :/core/images/librepilot_logo_64.png + :/core/images/librepilot_logo_64.png 6 1 Flight data diff --git a/ground/openpilotgcs/src/app/appresources.qrc b/ground/openpilotgcs/src/app/appresources.qrc index 2108b63fd..7d9985263 100644 --- a/ground/openpilotgcs/src/app/appresources.qrc +++ b/ground/openpilotgcs/src/app/appresources.qrc @@ -1,5 +1,5 @@ - splash.png + librepilot_splash.png diff --git a/ground/openpilotgcs/src/app/gcssplashscreen.cpp b/ground/openpilotgcs/src/app/gcssplashscreen.cpp index d68bc9d76..4cf7aaed8 100644 --- a/ground/openpilotgcs/src/app/gcssplashscreen.cpp +++ b/ground/openpilotgcs/src/app/gcssplashscreen.cpp @@ -35,7 +35,7 @@ GCSSplashScreen::GCSSplashScreen() : QSplashScreen(), m_pixmap(0), m_painter(0) { setWindowFlags(windowFlags()); - m_pixmap = new QPixmap(":/app/splash.png"); + m_pixmap = new QPixmap(":/app/librepilot_splash.png"); m_painter = new QPainter(m_pixmap); m_painter->setPen(Qt::lightGray); @@ -43,7 +43,7 @@ GCSSplashScreen::GCSSplashScreen() : m_painter->setFont(font); m_painter->drawText(405, 170, QString(CopyrightSymbol) + QString(" 2010-") + VersionInfo::year() + - QString(tr(" The OpenPilot Project - All Rights Reserved"))); + QString(tr(" The LibrePilot Project - All Rights Reserved"))); m_painter->drawText(406, 173, 310, 100, Qt::TextWordWrap | Qt::AlignTop | Qt::AlignLeft, QString(tr("GCS Revision - ")) + VersionInfo::revision()); diff --git a/ground/openpilotgcs/src/app/librepilot_splash.png b/ground/openpilotgcs/src/app/librepilot_splash.png new file mode 100644 index 000000000..a5bc30a6c Binary files /dev/null and b/ground/openpilotgcs/src/app/librepilot_splash.png differ diff --git a/ground/openpilotgcs/src/app/librepilotgcs.ico b/ground/openpilotgcs/src/app/librepilotgcs.ico new file mode 100644 index 000000000..48baf22c2 Binary files /dev/null and b/ground/openpilotgcs/src/app/librepilotgcs.ico differ diff --git a/ground/openpilotgcs/src/app/librepilotgcs.rc b/ground/openpilotgcs/src/app/librepilotgcs.rc new file mode 100644 index 000000000..cdf6c3adc --- /dev/null +++ b/ground/openpilotgcs/src/app/librepilotgcs.rc @@ -0,0 +1 @@ + IDI_ICON1 ICON DISCARDABLE "librepilotgcs.ico" diff --git a/ground/openpilotgcs/src/app/openpilotgcs.ico b/ground/openpilotgcs/src/app/openpilotgcs.ico deleted file mode 100644 index ac11e83f2..000000000 Binary files a/ground/openpilotgcs/src/app/openpilotgcs.ico and /dev/null differ diff --git a/ground/openpilotgcs/src/app/openpilotgcs.rc b/ground/openpilotgcs/src/app/openpilotgcs.rc deleted file mode 100644 index 8c954c48d..000000000 --- a/ground/openpilotgcs/src/app/openpilotgcs.rc +++ /dev/null @@ -1 +0,0 @@ - IDI_ICON1 ICON DISCARDABLE "openpilotgcs.ico" diff --git a/ground/openpilotgcs/src/app/splash.png b/ground/openpilotgcs/src/app/splash.png deleted file mode 100644 index 61496e749..000000000 Binary files a/ground/openpilotgcs/src/app/splash.png and /dev/null differ diff --git a/ground/openpilotgcs/src/plugins/config/images/TX2.svg b/ground/openpilotgcs/src/plugins/config/images/TX2.svg index a6c8a533a..9ddc628ba 100644 --- a/ground/openpilotgcs/src/plugins/config/images/TX2.svg +++ b/ground/openpilotgcs/src/plugins/config/images/TX2.svg @@ -19,2834 +19,2720 @@ enable-background="new 0 0 864 864" xml:space="preserve" id="svg2" - inkscape:version="0.48.1 " + inkscape:version="0.91 r13725" sodipodi:docname="TX2.svg">image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + style="fill:#010101" /> \ No newline at end of file diff --git a/ground/openpilotgcs/src/plugins/config/images/ground-shapes.svg b/ground/openpilotgcs/src/plugins/config/images/ground-shapes.svg index fbe5553f2..730da9a62 100644 --- a/ground/openpilotgcs/src/plugins/config/images/ground-shapes.svg +++ b/ground/openpilotgcs/src/plugins/config/images/ground-shapes.svg @@ -19,7 +19,7 @@ viewBox="0 0 665.06097 2346.0632" enable-background="new 0 0 792 1008" xml:space="preserve" - inkscape:version="0.48.5 r10040" + inkscape:version="0.91 r13725" sodipodi:docname="ground-shapes.svg" inkscape:export-filename="/home/laurent/Images/car.png" inkscape:export-xdpi="70.479134" @@ -2010,13 +2010,13 @@ inkscape:window-height="928" id="namedview4099" showgrid="false" - inkscape:zoom="1.5985931" - inkscape:cx="394.8011" - inkscape:cy="2094.4581" + inkscape:zoom="0.81734882" + inkscape:cx="366.25206" + inkscape:cy="2093.207" inkscape:window-x="0" inkscape:window-y="27" inkscape:window-maximized="1" - inkscape:current-layer="g7059" + inkscape:current-layer="tank" showborder="true" inkscape:showpageshadow="false" showguides="true" @@ -2174,7 +2174,7 @@ id="motorbike" transform="matrix(-1,0,0,1,732.12761,0)"> \ No newline at end of file + sodipodi:nodetypes="ccccc" /> \ No newline at end of file diff --git a/ground/openpilotgcs/src/plugins/config/images/multirotor-shapes.svg b/ground/openpilotgcs/src/plugins/config/images/multirotor-shapes.svg index 23df6e045..f59eb0311 100644 --- a/ground/openpilotgcs/src/plugins/config/images/multirotor-shapes.svg +++ b/ground/openpilotgcs/src/plugins/config/images/multirotor-shapes.svg @@ -15,7 +15,7 @@ height="3560.019" id="svg4183" xml:space="preserve" - inkscape:version="0.48.5 r10040" + inkscape:version="0.91 r13725" sodipodi:docname="multirotor-shapes.svg">image/svg+xml" "Based on Qt %6 (%7 bit)
" "
" - "© %8, 2010-%9. All rights reserved.
" + "© %8, %9. All rights reserved.
" ).arg( VersionInfo::revision().left(60), // %1 VersionInfo::uavoHash().left(8), // %2 diff --git a/ground/openpilotgcs/src/plugins/coreplugin/core.qrc b/ground/openpilotgcs/src/plugins/coreplugin/core.qrc index 2a0fe8591..ba20a4433 100644 --- a/ground/openpilotgcs/src/plugins/coreplugin/core.qrc +++ b/ground/openpilotgcs/src/plugins/coreplugin/core.qrc @@ -1,10 +1,10 @@ - images/openpilot_logo_500.png - images/openpilot_logo_256.png - images/openpilot_logo_128.png - images/openpilot_logo_64.png - images/openpilot_logo_32.png + images/librepilot_logo_500.png + images/librepilot_logo_256.png + images/librepilot_logo_128.png + images/librepilot_logo_64.png + images/librepilot_logo_32.png images/clean_pane_small.png images/clear.png images/closebutton.png @@ -50,7 +50,7 @@ images/exiticon.png images/optionsicon.png images/helpicon.png - images/openpiloticon.png + images/librepiloticon.png images/ah.png images/config.png images/flight.png diff --git a/ground/openpilotgcs/src/plugins/coreplugin/coreconstants.h b/ground/openpilotgcs/src/plugins/coreplugin/coreconstants.h index 66fe018c6..dd974bb13 100644 --- a/ground/openpilotgcs/src/plugins/coreplugin/coreconstants.h +++ b/ground/openpilotgcs/src/plugins/coreplugin/coreconstants.h @@ -44,7 +44,7 @@ namespace Constants { "." STRINGIFY(GCS_VERSION_RELEASE) const char *const GCS_VERSION_LONG = GCS_VERSION; -const char *const GCS_AUTHOR = "The OpenPilot Project"; +const char *const GCS_AUTHOR = "The LibrePilot Project"; const char *const GCS_HELP = "http://wiki.openpilot.org"; #undef GCS_VERSION @@ -129,7 +129,7 @@ const char *const GO_FORWARD = "GCS.GoForward"; const char *const GOTOPREVIOUSGROUP = "GCS.GotoPreviousTabGroup"; const char *const GOTONEXTGROUP = "GCS.GotoNextTabGroup"; const char *const WINDOWSLIST = "GCS.WindowsList"; -const char *const ABOUT_OPENPILOTGCS = "GCS.AboutOpenPilotGCS"; +const char *const ABOUT_LIBREPILOTGCS = "GCS.AboutLibrePilotGCS"; const char *const ABOUT_PLUGINS = "GCS.AboutPlugins"; const char *const ABOUT_AUTHORS = "GCS.AboutAuthors"; const char *const ABOUT_QT = "GCS.AboutQt"; @@ -212,7 +212,7 @@ const char *const ICON_PLUGIN = ":/core/images/pluginicon.png"; const char *const ICON_EXIT = ":/core/images/exiticon.png"; const char *const ICON_OPTIONS = ":/core/images/optionsicon.png"; const char *const ICON_HELP = ":/core/images/helpicon.png"; -const char *const ICON_OPENPILOT = ":/core/images/openpiloticon.png"; +const char *const ICON_LIBREPILOT = ":/core/images/librepiloticon.png"; // wizard kind diff --git a/ground/openpilotgcs/src/plugins/coreplugin/coreplugin.pro b/ground/openpilotgcs/src/plugins/coreplugin/coreplugin.pro index d329bdbf8..014bfdb57 100644 --- a/ground/openpilotgcs/src/plugins/coreplugin/coreplugin.pro +++ b/ground/openpilotgcs/src/plugins/coreplugin/coreplugin.pro @@ -142,7 +142,7 @@ RESOURCES += core.qrc \ fancyactionbar.qrc unix:!macx { - images.files = images/openpilot_logo_*.png + images.files = images/librepilot_logo_*.png images.path = /share/pixmaps INSTALLS += images } diff --git a/ground/openpilotgcs/src/plugins/coreplugin/images/librepilot_logo_128.png b/ground/openpilotgcs/src/plugins/coreplugin/images/librepilot_logo_128.png new file mode 100644 index 000000000..ba5f8e7d3 Binary files /dev/null and b/ground/openpilotgcs/src/plugins/coreplugin/images/librepilot_logo_128.png differ diff --git a/ground/openpilotgcs/src/plugins/coreplugin/images/librepilot_logo_256.png b/ground/openpilotgcs/src/plugins/coreplugin/images/librepilot_logo_256.png new file mode 100644 index 000000000..6fa0603fc Binary files /dev/null and b/ground/openpilotgcs/src/plugins/coreplugin/images/librepilot_logo_256.png differ diff --git a/ground/openpilotgcs/src/plugins/coreplugin/images/librepilot_logo_32.png b/ground/openpilotgcs/src/plugins/coreplugin/images/librepilot_logo_32.png new file mode 100644 index 000000000..4af6fbfc3 Binary files /dev/null and b/ground/openpilotgcs/src/plugins/coreplugin/images/librepilot_logo_32.png differ diff --git a/ground/openpilotgcs/src/plugins/coreplugin/images/librepilot_logo_500.png b/ground/openpilotgcs/src/plugins/coreplugin/images/librepilot_logo_500.png new file mode 100644 index 000000000..3ce6a7e15 Binary files /dev/null and b/ground/openpilotgcs/src/plugins/coreplugin/images/librepilot_logo_500.png differ diff --git a/ground/openpilotgcs/src/plugins/coreplugin/images/librepilot_logo_64.png b/ground/openpilotgcs/src/plugins/coreplugin/images/librepilot_logo_64.png new file mode 100644 index 000000000..779c271db Binary files /dev/null and b/ground/openpilotgcs/src/plugins/coreplugin/images/librepilot_logo_64.png differ diff --git a/ground/openpilotgcs/src/plugins/coreplugin/images/librepiloticon.png b/ground/openpilotgcs/src/plugins/coreplugin/images/librepiloticon.png new file mode 100644 index 000000000..442b06172 Binary files /dev/null and b/ground/openpilotgcs/src/plugins/coreplugin/images/librepiloticon.png differ diff --git a/ground/openpilotgcs/src/plugins/coreplugin/images/openpilot_logo_128.png b/ground/openpilotgcs/src/plugins/coreplugin/images/openpilot_logo_128.png deleted file mode 100644 index 1d9fa31f5..000000000 Binary files a/ground/openpilotgcs/src/plugins/coreplugin/images/openpilot_logo_128.png and /dev/null differ diff --git a/ground/openpilotgcs/src/plugins/coreplugin/images/openpilot_logo_256.png b/ground/openpilotgcs/src/plugins/coreplugin/images/openpilot_logo_256.png deleted file mode 100644 index 9875d1994..000000000 Binary files a/ground/openpilotgcs/src/plugins/coreplugin/images/openpilot_logo_256.png and /dev/null differ diff --git a/ground/openpilotgcs/src/plugins/coreplugin/images/openpilot_logo_32.png b/ground/openpilotgcs/src/plugins/coreplugin/images/openpilot_logo_32.png deleted file mode 100644 index 4aca4ac27..000000000 Binary files a/ground/openpilotgcs/src/plugins/coreplugin/images/openpilot_logo_32.png and /dev/null differ diff --git a/ground/openpilotgcs/src/plugins/coreplugin/images/openpilot_logo_500.png b/ground/openpilotgcs/src/plugins/coreplugin/images/openpilot_logo_500.png deleted file mode 100644 index 2e44c1696..000000000 Binary files a/ground/openpilotgcs/src/plugins/coreplugin/images/openpilot_logo_500.png and /dev/null differ diff --git a/ground/openpilotgcs/src/plugins/coreplugin/images/openpilot_logo_64.png b/ground/openpilotgcs/src/plugins/coreplugin/images/openpilot_logo_64.png deleted file mode 100644 index 3db27973d..000000000 Binary files a/ground/openpilotgcs/src/plugins/coreplugin/images/openpilot_logo_64.png and /dev/null differ diff --git a/ground/openpilotgcs/src/plugins/coreplugin/images/openpiloticon.png b/ground/openpilotgcs/src/plugins/coreplugin/images/openpiloticon.png deleted file mode 100644 index 44e57839a..000000000 Binary files a/ground/openpilotgcs/src/plugins/coreplugin/images/openpiloticon.png and /dev/null differ diff --git a/ground/openpilotgcs/src/plugins/coreplugin/mainwindow.cpp b/ground/openpilotgcs/src/plugins/coreplugin/mainwindow.cpp index 3710fadaf..c1b684ce9 100644 --- a/ground/openpilotgcs/src/plugins/coreplugin/mainwindow.cpp +++ b/ground/openpilotgcs/src/plugins/coreplugin/mainwindow.cpp @@ -134,9 +134,9 @@ MainWindow::MainWindow() : #endif m_toggleFullScreenAction(0) { - setWindowTitle(tr("OpenPilot GCS ") + VersionInfo::label()); + setWindowTitle(tr("LibrePilot GCS ") + VersionInfo::label()); #ifndef Q_WS_MAC - qApp->setWindowIcon(QIcon(":/core/images/openpilot_logo_128.png")); + qApp->setWindowIcon(QIcon(":/core/images/librepilot_logo_128.png")); #endif QCoreApplication::setApplicationName(QLatin1String("OpenPilotGCS")); QCoreApplication::setApplicationVersion(QLatin1String(Core::Constants::GCS_VERSION_LONG)); diff --git a/ground/openpilotgcs/src/plugins/coreplugin/qml/AboutDialog.qml b/ground/openpilotgcs/src/plugins/coreplugin/qml/AboutDialog.qml index 292cba7ba..96505f789 100644 --- a/ground/openpilotgcs/src/plugins/coreplugin/qml/AboutDialog.qml +++ b/ground/openpilotgcs/src/plugins/coreplugin/qml/AboutDialog.qml @@ -44,7 +44,7 @@ Rectangle { anchors.leftMargin: 10 anchors.top: parent.top anchors.topMargin: 10 - source: "../images/openpilot_logo_128.png" + source: "../images/librepilot_logo_128.png" z: 100 fillMode: Image.PreserveAspectFit MouseArea { @@ -53,7 +53,7 @@ Rectangle { hoverEnabled: true cursorShape: Qt.PointingHandCursor onClicked: { - dialog.openUrl("http://www.openpilot.org") + dialog.openUrl("http://www.librepilot.org") } } } @@ -83,7 +83,7 @@ Rectangle { anchors.fill: parent Text { id: headerLabel - text: qsTr("OpenPilot Ground Control Station") + text: qsTr("LibrePilot Ground Control Station") Layout.fillWidth: true font.pixelSize: 14 font.bold: true diff --git a/ground/openpilotgcs/src/plugins/coreplugin/workspacesettings.cpp b/ground/openpilotgcs/src/plugins/coreplugin/workspacesettings.cpp index 6ffaa4a0b..61ea40808 100644 --- a/ground/openpilotgcs/src/plugins/coreplugin/workspacesettings.cpp +++ b/ground/openpilotgcs/src/plugins/coreplugin/workspacesettings.cpp @@ -114,7 +114,7 @@ void WorkspaceSettings::readSettings(QSettings *qs) QString defaultName = "Workspace" + numberString; QString defaultIconName = "Icon" + numberString; QString name = qs->value(defaultName, defaultName).toString(); - QString iconName = qs->value(defaultIconName, ":/core/images/openpilot_logo_64.png").toString(); + QString iconName = qs->value(defaultIconName, ":/core/images/librepilot_logo_64.png").toString(); m_names.append(name); m_iconNames.append(iconName); m_modeNames.append(QString("Mode") + QString::number(i)); diff --git a/ground/openpilotgcs/src/plugins/flightlog/flightlogplugin.cpp b/ground/openpilotgcs/src/plugins/flightlog/flightlogplugin.cpp index 68b043d86..6233d6e38 100644 --- a/ground/openpilotgcs/src/plugins/flightlog/flightlogplugin.cpp +++ b/ground/openpilotgcs/src/plugins/flightlog/flightlogplugin.cpp @@ -77,7 +77,7 @@ void FlightLogPlugin::ShowLogManagementDialog() qmlRegisterType("org.openpilot", 1, 0, "UAVOLogSettingsWrapper"); FlightLogManager *flightLogManager = new FlightLogManager(); m_logDialog = new QQuickView(); - m_logDialog->setIcon(QIcon(":/core/images/openpilot_logo_32.png")); + m_logDialog->setIcon(QIcon(":/core/images/librepilot_logo_32.png")); m_logDialog->setTitle(tr("Manage flight side logs")); m_logDialog->rootContext()->setContextProperty("logStatus", flightLogManager->flightLogStatus()); m_logDialog->rootContext()->setContextProperty("logControl", flightLogManager->flightLogControl()); diff --git a/ground/openpilotgcs/src/plugins/opmap/opmap_edit_waypoint_dialog.ui b/ground/openpilotgcs/src/plugins/opmap/opmap_edit_waypoint_dialog.ui index 39dd3fc4b..c70b2967f 100644 --- a/ground/openpilotgcs/src/plugins/opmap/opmap_edit_waypoint_dialog.ui +++ b/ground/openpilotgcs/src/plugins/opmap/opmap_edit_waypoint_dialog.ui @@ -23,11 +23,11 @@ - OpenPilot GCS Edit Waypoint + LibrePilot GCS Edit Waypoint - :/core/images/openpilot_logo_128.png:/core/images/openpilot_logo_128.png + :/core/images/librepilot_logo_128.png:/core/images/librepilot_logo_128.png diff --git a/ground/openpilotgcs/src/plugins/opmap/pathplanner.ui b/ground/openpilotgcs/src/plugins/opmap/pathplanner.ui index fbb59a4e3..c74acabbd 100644 --- a/ground/openpilotgcs/src/plugins/opmap/pathplanner.ui +++ b/ground/openpilotgcs/src/plugins/opmap/pathplanner.ui @@ -15,7 +15,7 @@ - :/core/images/openpilot_logo_64.png:/core/images/openpilot_logo_64.png + :/core/images/librepilot_logo_64.png:/core/images/librepilot_logo_64.png diff --git a/ground/openpilotgcs/src/plugins/pathactioneditor/pathactioneditortreemodel.cpp b/ground/openpilotgcs/src/plugins/pathactioneditor/pathactioneditortreemodel.cpp index 476a1ab27..4596fbf04 100644 --- a/ground/openpilotgcs/src/plugins/pathactioneditor/pathactioneditortreemodel.cpp +++ b/ground/openpilotgcs/src/plugins/pathactioneditor/pathactioneditortreemodel.cpp @@ -289,7 +289,7 @@ QVariant PathActionEditorTreeModel::data(const QModelIndex &index, int role) con return item->data(index.column()); } // if (role == Qt::DecorationRole) -// return QIcon(":/core/images/openpilot_logo_128.png"); +// return QIcon(":/core/images/librepilot_logo_128.png"); if (role == Qt::ToolTipRole) { TreeItem *item = static_cast(index.internalPointer()); diff --git a/ground/openpilotgcs/src/plugins/setupwizard/resources/bttn-txwizard-off.png b/ground/openpilotgcs/src/plugins/setupwizard/resources/bttn-txwizard-off.png index eac9b6704..61570522e 100644 Binary files a/ground/openpilotgcs/src/plugins/setupwizard/resources/bttn-txwizard-off.png and b/ground/openpilotgcs/src/plugins/setupwizard/resources/bttn-txwizard-off.png differ diff --git a/ground/openpilotgcs/src/plugins/setupwizard/resources/bttn-txwizard-on.png b/ground/openpilotgcs/src/plugins/setupwizard/resources/bttn-txwizard-on.png index 7d97bb063..2e8806e0e 100644 Binary files a/ground/openpilotgcs/src/plugins/setupwizard/resources/bttn-txwizard-on.png and b/ground/openpilotgcs/src/plugins/setupwizard/resources/bttn-txwizard-on.png differ diff --git a/ground/openpilotgcs/src/plugins/setupwizard/resources/connection-diagrams.svg b/ground/openpilotgcs/src/plugins/setupwizard/resources/connection-diagrams.svg index 85dd8b724..7d190a5ca 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/resources/connection-diagrams.svg +++ b/ground/openpilotgcs/src/plugins/setupwizard/resources/connection-diagrams.svg @@ -30,13 +30,13 @@ inkscape:window-height="928" id="namedview4616" showgrid="false" - inkscape:zoom="1.0702079" - inkscape:cx="547.53816" - inkscape:cy="386.12041" + inkscape:zoom="1.1114784" + inkscape:cx="996.21691" + inkscape:cy="488.50335" inkscape:window-x="0" inkscape:window-y="27" inkscape:window-maximized="1" - inkscape:current-layer="layer16" + inkscape:current-layer="1234" fit-margin-top="15" fit-margin-left="15" fit-margin-right="15" @@ -48,8 +48,9 @@ inkscape:snap-bbox="true" inkscape:object-paths="true" inkscape:snap-bbox-midpoints="true" - inkscape:snap-bbox-edge-midpoints="true" - inkscape:object-nodes="true"> + inkscape:snap-bbox-edge-midpoints="false" + inkscape:object-nodes="true" + inkscape:snap-nodes="true"> + transform="translate(-32.46875,315.85439)"> @@ -33963,7 +33963,7 @@ id="g10129"> @@ -33976,7 +33976,7 @@ id="g10143"> @@ -33991,7 +33991,7 @@ transform="translate(587.4541,1567.4229)"> @@ -34013,7 +34013,7 @@ id="g10205"> @@ -34038,7 +34038,7 @@ id="g10237"> @@ -34049,32 +34049,17 @@ - - - @@ -34110,7 +34095,7 @@ id="g10309"> @@ -34135,7 +34120,7 @@ id="g10341"> @@ -34146,22 +34131,22 @@ @@ -34204,10 +34189,6 @@ cy="45.400002" ry="44.900002" stroke-miterlimit="4" - sodipodi:cx="183" - sodipodi:cy="45.400002" - sodipodi:rx="70.099998" - sodipodi:ry="44.900002" style="fill:#ff0000;fill-rule:evenodd;stroke:#000000;stroke-width:0.99199998px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none" /> @@ -34259,90 +34232,90 @@ style="fill:none;stroke:#000000;stroke-width:0.99212599px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none" /> @@ -34352,46 +34325,204 @@ rx="15.1" cy="45.400002" ry="9" - sodipodi:cx="183" - sodipodi:cy="45.400002" - sodipodi:rx="15.1" - sodipodi:ry="9" style="fill:#4d4d4d;fill-rule:nonzero" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -34408,41 +34539,188 @@ + d="m 1237.6152,301.80531 c 3.018,3e-5 5.4616,-2.09563 5.4616,-4.68391 c 0,-2.58533 -2.4453,-4.68243 -5.4616,-4.6839 l -270.99659,0.002 c -3.01799,0 -5.46165,2.09566 -5.46165,4.68392 c 0,2.58536 2.44533,4.68245 5.46179,4.68392 l 270.99645,-0.002 z" /> - - - + d="m 1061.0892,39.3142 l 77.826,0 c 2.1514,0 8.1259,5.310859 8.1259,11.864953 l 0,249.964797 c 0,6.56213 -5.9745,11.8891 -8.1259,11.8891 l -71.487,0 c -2.1539,0 -10.2309,-5.32697 -10.2309,-11.8891 l 0,-249.964797 c 0,-6.554094 8.077,-11.864953 10.2309,-11.864953" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -34460,7 +34738,7 @@ inkscape:connector-curvature="0" style="fill:#b1c7eb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path5075-0" - d="M 0,0 C 33.172,-33.223 33.172,-87.071 -0.049,-120.245 C -33.264,-153.465 -87.109,-153.465 -120.289,-120.245 C -153.502,-87.071 -153.502,-33.224 -120.281,-0.008 C -87.066,33.214 -33.221,33.215 0,0" /> + d="m 0,0 c 33.172,-33.223 33.172,-87.071 -0.049,-120.245 c -33.215,-33.22 -87.06,-33.22 -120.24,0 c -33.213,33.174 -33.213,87.021 0.008,120.237 C -87.066,33.214 -33.221,33.215 0,0" /> @@ -34488,7 +34766,7 @@ inkscape:connector-curvature="0" style="fill:url(#radialGradient39816-2);fill-opacity:1;stroke:none" id="path5353-4" - d="M 939.441,1484.164 C 936.432,1474.388 927.334,1467.292 916.576,1467.289 C 904.404,1467.289 894.371,1476.396 892.877,1488.166 L 904.891,1488.166 L 869.287,1523.767 L 833.688,1488.166 L 844.971,1488.166 C 846.611,1457.06 872.352,1432.345 903.859,1432.355 C 927.488,1432.345 947.863,1446.25 957.285,1466.318 L 939.441,1484.164 z" /> + d="m 939.441,1484.164 c -3.009,-9.776 -12.107,-16.872 -22.865,-16.875 c -12.172,0 -22.205,9.107 -23.699,20.877 l 12.014,0 l -35.604,35.601 l -35.599,-35.601 l 11.283,0 c 1.64,-31.106 27.381,-55.821 58.888,-55.811 c 23.629,-0.01 44.004,13.895 53.426,33.963 l -17.844,17.846 z" /> @@ -34514,7 +34792,7 @@ inkscape:connector-curvature="0" style="fill:url(#radialGradient39814-0);fill-opacity:1;stroke:none" id="path5385-8" - d="M 989.162,1494.462 C 987.867,1525.897 961.984,1551.003 930.232,1550.99 C 906.393,1550.99 885.869,1536.846 876.566,1516.488 L 894.01,1499.046 C 897.252,1508.397 906.119,1515.114 916.582,1515.112 C 928.674,1515.122 938.648,1506.123 940.244,1494.462 L 929.141,1494.462 L 939.441,1484.162 L 957.285,1466.316 L 964.742,1458.859 L 1000.344,1494.46 L 989.162,1494.46 z" /> + d="m 989.162,1494.462 c -1.295,31.435 -27.178,56.541 -58.93,56.528 c -23.839,0 -44.363,-14.144 -53.666,-34.502 l 17.444,-17.442 c 3.242,9.351 12.109,16.068 22.572,16.066 c 12.092,0.01 22.066,-8.989 23.662,-20.65 l -11.103,0 l 10.3,-10.3 l 17.844,-17.846 l 7.457,-7.457 l 35.602,35.601 l -11.182,0 z" /> @@ -34525,12 +34803,12 @@ inkscape:connector-curvature="0" style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path5389-0" - d="M 969.4838,35.32925 C 981.2388,47.0955 981.2388,66.16675 969.4738,77.9255 C 957.71633,89.688 938.64383,89.688 926.87883,77.9255 C 915.12383,66.16675 915.12383,47.098 926.88883,35.33925 C 938.64633,23.57425 957.71883,23.573 969.48379,35.32675" /> + d="m 969.4838,35.32925 c 11.755,11.76625 11.755,30.8375 -0.01,42.59625 c -11.75747,11.7625 -30.82997,11.7625 -42.59497,0 c -11.755,-11.75875 -11.755,-30.8275 0.01,-42.58625 c 11.7575,-11.765 30.83,-11.76625 42.59496,-0.0125" /> + d="m 946.85808,66.63225 l 0,-13.6475 l -3.46374,2.6775 l -2.28501,-3.12375 l 6.115,-4.4875 l 4.04251,0 l 0,18.58125 l -4.40876,0 z" /> @@ -34548,7 +34826,7 @@ inkscape:connector-curvature="0" style="fill:#b1c7eb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path5059-7" - d="M 0,0 C 33.174,-33.223 33.174,-87.071 -0.049,-120.245 C -33.266,-153.465 -87.113,-153.465 -120.295,-120.245 C -153.51,-87.071 -153.51,-33.224 -120.287,-0.008 C -87.07,33.214 -33.223,33.215 0,0" /> + d="m 0,0 c 33.174,-33.223 33.174,-87.071 -0.049,-120.245 c -33.217,-33.22 -87.064,-33.22 -120.246,0 c -33.215,33.174 -33.215,87.021 0.008,120.237 C -87.07,33.214 -33.223,33.215 0,0" /> @@ -34571,7 +34849,7 @@ inkscape:connector-curvature="0" style="fill:url(#radialGradient39820-6);fill-opacity:1;stroke:none" id="path5161-8" - d="M 1086.99,1484.162 C 1089.998,1474.388 1099.098,1467.292 1109.854,1467.289 C 1122.027,1467.289 1132.061,1476.398 1133.555,1488.167 L 1121.541,1488.166 L 1157.145,1523.77 L 1192.746,1488.167 L 1181.461,1488.167 C 1179.82,1457.062 1154.08,1432.345 1122.572,1432.353 C 1098.943,1432.343 1078.566,1446.25 1069.145,1466.318 L 1086.99,1484.162 z" /> + d="m 1086.99,1484.162 c 3.008,-9.774 12.108,-16.87 22.864,-16.873 c 12.173,0 22.207,9.109 23.701,20.878 l -12.014,-10e-4 l 35.604,35.604 l 35.601,-35.603 l -11.285,0 c -1.641,-31.105 -27.381,-55.822 -58.889,-55.814 c -23.629,-0.01 -44.006,13.897 -53.427,33.965 l 17.845,17.844 z" /> @@ -34597,7 +34875,7 @@ inkscape:connector-curvature="0" style="fill:url(#radialGradient39818-1);fill-opacity:1;stroke:none" id="path5193-7" - d="M 1037.268,1494.462 C 1038.563,1525.897 1064.447,1551.004 1096.201,1550.991 C 1120.041,1551.001 1140.564,1536.848 1149.867,1516.49 L 1132.424,1499.046 C 1129.18,1508.399 1120.313,1515.116 1109.85,1515.113 C 1097.758,1515.123 1087.783,1506.123 1086.186,1494.462 L 1097.291,1494.462 L 1086.99,1484.16 L 1069.145,1466.316 L 1061.688,1458.859 L 1026.086,1494.46 L 1037.268,1494.46 z" /> + d="m 1037.268,1494.462 c 1.295,31.435 27.179,56.542 58.933,56.529 c 23.84,0.01 44.363,-14.143 53.666,-34.501 l -17.443,-17.444 c -3.244,9.353 -12.111,16.07 -22.574,16.067 c -12.092,0.01 -22.067,-8.99 -23.664,-20.651 l 11.105,0 l -10.301,-10.302 l -17.845,-17.844 l -7.457,-7.457 l -35.602,35.601 l 11.182,0 z" /> @@ -34608,12 +34886,12 @@ inkscape:connector-curvature="0" style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path5397-5" - d="M 1276.7533,35.32925 C 1288.5083,47.0955 1288.5083,66.16675 1276.7403,77.9255 C 1264.9828,89.688 1245.9103,89.688 1234.1428,77.9255 C 1222.3878,66.16675 1222.3878,47.098 1234.1558,35.33925 C 1245.9133,23.57425 1264.9858,23.573 1276.7533,35.32675" /> + d="m 1276.7533,35.32925 c 11.755,11.76625 11.755,30.8375 -0.013,42.59625 c -11.7575,11.7625 -30.83,11.7625 -42.5975,0 c -11.755,-11.75875 -11.755,-30.8275 0.013,-42.58625 c 11.7575,-11.765 30.83,-11.76625 42.5975,-0.0125" /> + d="m 1247.4308,65.38175 l 0,-3.67375 l 7.2438,-6.56125 c 0.9175,-0.86625 1.5225,-1.7325 1.5225,-2.86125 c 0,-1.3125 -0.92,-2.23125 -2.31,-2.23125 c -1.47,0 -2.44,1.155 -2.625,2.80875 l -4.2238,-0.5775 c 0.4188,-3.7525 3.4638,-5.98375 7.085,-5.98375 c 3.4125,0 6.7188,1.81125 6.7188,5.695 c 0,2.65125 -1.5488,4.19875 -3.255,5.72125 l -4.3038,3.8325 l 7.585,0 l 0,3.83125 l -13.4375,0 z" /> @@ -34631,7 +34909,7 @@ inkscape:connector-curvature="0" style="fill:#b1c7eb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path5107-4" - d="M 0,0 C 33.172,-33.223 33.172,-87.07 -0.049,-120.244 C -33.264,-153.465 -87.109,-153.465 -120.289,-120.244 C -153.502,-87.07 -153.502,-33.225 -120.281,-0.008 C -87.066,33.213 -33.221,33.215 0,0" /> + d="m 0,0 c 33.172,-33.223 33.172,-87.07 -0.049,-120.244 c -33.215,-33.221 -87.06,-33.221 -120.24,0 c -33.213,33.174 -33.213,87.019 0.008,120.236 C -87.066,33.213 -33.221,33.215 0,0" /> @@ -34654,7 +34932,7 @@ inkscape:connector-curvature="0" style="fill:url(#radialGradient39826-1);fill-opacity:1;stroke:none" id="path5225-1" - d="M 894.977,1292.144 C 897.986,1282.37 907.084,1275.274 917.842,1275.271 C 930.014,1275.271 940.047,1284.378 941.541,1296.147 L 929.527,1296.146 L 965.131,1331.749 L 1000.732,1296.147 L 989.447,1296.147 C 987.807,1265.042 962.066,1240.327 930.559,1240.335 C 906.932,1240.325 886.555,1254.231 877.133,1274.3 L 894.977,1292.144 z" /> + d="m 894.977,1292.144 c 3.009,-9.774 12.107,-16.87 22.865,-16.873 c 12.172,0 22.205,9.107 23.699,20.876 l -12.014,-10e-4 l 35.604,35.603 l 35.601,-35.602 l -11.285,0 c -1.64,-31.105 -27.381,-55.82 -58.888,-55.812 c -23.627,-0.01 -44.004,13.896 -53.426,33.965 l 17.844,17.844 z" /> @@ -34680,7 +34958,7 @@ inkscape:connector-curvature="0" style="fill:url(#radialGradient39828-6);fill-opacity:1;stroke:none" id="path5257-5" - d="M 845.256,1302.444 C 846.551,1333.88 872.434,1358.985 904.186,1358.972 C 928.025,1358.972 948.549,1344.827 957.852,1324.47 L 940.408,1307.026 C 937.166,1316.38 928.299,1323.097 917.836,1323.095 C 905.744,1323.105 895.771,1314.104 894.174,1302.444 L 905.279,1302.444 L 894.977,1292.142 L 877.133,1274.298 L 869.676,1266.841 L 834.074,1302.442 L 845.256,1302.442 z" /> + d="m 845.256,1302.444 c 1.295,31.436 27.178,56.541 58.93,56.528 c 23.839,0 44.363,-14.145 53.666,-34.502 l -17.444,-17.444 c -3.242,9.354 -12.109,16.071 -22.572,16.069 c -12.092,0.01 -22.065,-8.991 -23.662,-20.651 l 11.105,0 l -10.302,-10.302 l -17.844,-17.844 l -7.457,-7.457 l -35.602,35.601 l 11.182,0 z" /> @@ -34691,12 +34969,12 @@ inkscape:connector-curvature="0" style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path5405-2" - d="M 969.4838,275.35487 C 981.2388,287.11987 981.2388,306.18988 969.4738,317.94737 C 957.71633,329.71238 938.64383,329.71238 926.88133,317.94737 C 915.12383,306.18988 915.12383,287.11987 926.88933,275.36238 C 938.64683,263.59738 957.71933,263.59738 969.48429,275.34988" /> + d="m 969.4838,275.35487 c 11.755,11.765 11.755,30.83501 -0.01,42.5925 c -11.75747,11.76501 -30.82997,11.76501 -42.59247,0 c -11.7575,-11.75749 -11.7575,-30.8275 0.008,-42.58499 c 11.7575,-11.765 30.83,-11.765 42.59496,-0.0125" /> + d="m 948.85271,291.73913 l -0.0788,0 l -4.41,6.8775 l 4.48875,0 l 0,-6.8775 z m 4.09375,10.44625 l 0,3.62124 l -4.12,0 l 0,-3.62124 l -8.74125,0 l 0,-3.70126 l 7.55875,-11.25875 l 5.27625,0 l 0,11.39126 l 2.5725,0 l 0,3.56875 l -2.54625,0 z" /> @@ -34714,7 +34992,7 @@ inkscape:connector-curvature="0" style="fill:#b1c7eb;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path5091-5" - d="M 0,0 C 33.174,-33.223 33.174,-87.07 -0.049,-120.244 C -33.266,-153.465 -87.113,-153.465 -120.295,-120.244 C -153.51,-87.07 -153.51,-33.225 -120.287,-0.008 C -87.07,33.213 -33.223,33.215 0,0" /> + d="m 0,0 c 33.174,-33.223 33.174,-87.07 -0.049,-120.244 c -33.217,-33.221 -87.064,-33.221 -120.246,0 c -33.215,33.174 -33.215,87.019 0.008,120.236 C -87.07,33.213 -33.223,33.215 0,0" /> @@ -34737,7 +35015,7 @@ inkscape:connector-curvature="0" style="fill:url(#radialGradient39824-5);fill-opacity:1;stroke:none" id="path5289-5" - d="M 1131.455,1292.144 C 1128.447,1282.368 1119.348,1275.272 1108.59,1275.269 C 1096.418,1275.269 1086.385,1284.378 1084.889,1296.147 L 1096.904,1296.146 L 1061.299,1331.749 L 1025.699,1296.149 L 1036.982,1296.149 C 1038.623,1265.042 1064.365,1240.327 1095.873,1240.335 C 1119.502,1240.323 1139.879,1254.229 1149.301,1274.298 L 1131.455,1292.144 z" /> + d="m 1131.455,1292.144 c -3.008,-9.776 -12.107,-16.872 -22.865,-16.875 c -12.172,0 -22.205,9.109 -23.701,20.878 l 12.015,-10e-4 l -35.605,35.603 l -35.6,-35.6 l 11.283,0 c 1.641,-31.107 27.383,-55.822 58.891,-55.814 c 23.629,-0.012 44.006,13.894 53.428,33.963 l -17.846,17.846 z" /> @@ -34763,7 +35041,7 @@ inkscape:connector-curvature="0" style="fill:url(#radialGradient39822-2);fill-opacity:1;stroke:none" id="path5321-5" - d="M 1181.178,1302.442 C 1179.883,1333.878 1153.996,1358.985 1122.244,1358.972 C 1098.404,1358.982 1077.881,1344.829 1068.578,1324.472 L 1086.021,1307.026 C 1089.266,1316.38 1098.133,1323.097 1108.596,1323.095 C 1120.688,1323.105 1130.66,1314.104 1132.26,1302.444 L 1121.154,1302.444 L 1131.455,1292.144 L 1149.301,1274.298 L 1156.758,1266.841 L 1192.359,1302.442 L 1181.178,1302.442 z" /> + d="m 1181.178,1302.442 c -1.295,31.436 -27.182,56.543 -58.934,56.53 c -23.84,0.01 -44.363,-14.143 -53.666,-34.5 l 17.443,-17.446 c 3.245,9.354 12.112,16.071 22.575,16.069 c 12.092,0.01 22.064,-8.991 23.664,-20.651 l -11.106,0 l 10.301,-10.3 l 17.846,-17.846 l 7.457,-7.457 l 35.601,35.601 l -11.181,0 z" /> @@ -34774,41 +35052,41 @@ inkscape:connector-curvature="0" style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path5413-7" - d="M 1275.5033,275.35237 C 1287.2583,287.11738 1287.2583,306.18988 1275.4903,317.94737 C 1263.7328,329.71238 1244.6603,329.71238 1232.8928,317.94737 C 1221.1378,306.18988 1221.1378,287.11987 1232.9058,275.36238 C 1244.6633,263.59738 1263.7358,263.59738 1275.5033,275.34988" /> + d="m 1275.5033,275.35237 c 11.755,11.76501 11.755,30.83751 -0.013,42.595 c -11.7575,11.76501 -30.83,11.76501 -42.5975,0 c -11.755,-11.75749 -11.755,-30.8275 0.013,-42.58499 c 11.7575,-11.765 30.83,-11.765 42.5975,-0.0125" /> + d="m 1253.9396,306.30575 c -3.3863,0 -6.4563,-1.47 -7.4538,-4.93375 l 4.0938,-1.07625 c 0.3425,1.23375 1.47,2.31 3.15,2.31 c 1.26,0 2.7025,-0.63 2.7025,-2.36375 c 0,-1.88875 -1.9413,-2.44 -3.7788,-2.44 l -1.1812,0 l 0,-3.22875 l 1.2862,0 c 1.6538,0 3.2538,-0.42 3.2538,-2.20375 c 0,-1.33875 -1.1275,-2.04625 -2.335,-2.04625 c -1.26,0 -2.2575,0.8125 -2.545,2.0725 l -4.0938,-0.945 c 0.89,-3.1225 3.83,-4.72375 6.9275,-4.72375 c 3.2813,0 6.535,1.68 6.535,5.24875 c 0,2.0475 -1.3125,3.57 -3.1237,4.0425 l 0,0.0787 c 2.1,0.4975 3.5687,2.23 3.5687,4.30375 c 0,4.0675 -3.595,5.905 -7.0062,5.905" /> + style="display:inline;opacity:0.6;fill:none;stroke:#ff0000;stroke-width:3.23766375;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#DotS);marker-end:url(#Arrow2Send)" /> + style="display:inline;opacity:0.6;fill:none;stroke:#ff0000;stroke-width:3.23766375;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#DotS);marker-end:url(#Arrow2Send)" /> + style="display:inline;opacity:0.6;fill:none;stroke:#ff0000;stroke-width:3.23766375;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#DotS);marker-end:url(#Arrow2Send)" /> @@ -34867,7 +35145,7 @@ transform="translate(1170.2617,1551.2617)"> @@ -34885,7 +35163,7 @@ transform="translate(977.2441,1551.2617)"> @@ -34913,7 +35191,7 @@ style="fill:url(#linearGradient10058-2)"> @@ -34934,7 +35212,7 @@ transform="translate(1170.2617,1361.2432)"> @@ -34952,7 +35230,7 @@ transform="translate(977.2441,1361.2432)"> @@ -34975,7 +35253,7 @@ id="g5159"> @@ -35001,7 +35279,7 @@ id="g5191"> @@ -35027,7 +35305,7 @@ id="g5223"> @@ -35053,7 +35331,7 @@ id="g5255"> @@ -35079,7 +35357,7 @@ id="g5287"> @@ -35105,7 +35383,7 @@ id="g5319"> @@ -35131,7 +35409,7 @@ id="g5383"> @@ -35142,93 +35420,240 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + style="opacity:0.6;fill:none;stroke:#ff0000;stroke-width:7.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#DotS);marker-end:url(#Arrow2Send)" /> + style="opacity:0.6;fill:none;stroke:#ff0000;stroke-width:7.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#DotS);marker-end:url(#Arrow2Send)" /> + style="opacity:0.6;fill:none;stroke:#ff0000;stroke-width:7.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#DotS);marker-end:url(#Arrow2Send)" /> @@ -35285,7 +35710,7 @@ transform="translate(1823.7813,1443.3135)"> @@ -35302,7 +35727,7 @@ transform="translate(1687.2949,1579.7949)"> @@ -35319,7 +35744,7 @@ transform="translate(1689.418,1308.9482)"> @@ -35336,7 +35761,7 @@ transform="translate(1552.9316,1445.4316)"> @@ -35358,7 +35783,7 @@ id="g5577"> @@ -35384,7 +35809,7 @@ id="g5609"> @@ -35409,7 +35834,7 @@ id="g5641"> @@ -35435,7 +35860,7 @@ id="g5673"> @@ -35460,7 +35885,7 @@ id="g5705"> @@ -35485,7 +35910,7 @@ id="g5737"> @@ -35510,7 +35935,7 @@ id="g5769"> @@ -35535,7 +35960,7 @@ id="g5801"> @@ -35546,92 +35971,239 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + style="opacity:0.6;fill:none;stroke:#ff0000;stroke-width:7.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#DotS);marker-end:url(#Arrow2Send)" /> @@ -35650,34 +36222,34 @@ transform="matrix(2.2885593,0,0,-2.2885593,-2570.2465,4224.2902)"> @@ -35686,7 +36258,7 @@ id="g4307"> @@ -35702,7 +36274,7 @@ transform="translate(2515.9893,1514.8203)"> @@ -35719,7 +36291,7 @@ transform="translate(2355.4863,1607.2334)"> @@ -35736,7 +36308,7 @@ transform="translate(2516.0371,1330.8896)"> @@ -35753,7 +36325,7 @@ transform="translate(2354.9951,1235.6455)"> @@ -35776,7 +36348,7 @@ id="g5929"> @@ -35802,7 +36374,7 @@ id="g5961"> @@ -35828,7 +36400,7 @@ id="g5993"> @@ -35854,7 +36426,7 @@ id="g6025"> @@ -35880,7 +36452,7 @@ id="g6057"> @@ -35906,7 +36478,7 @@ id="g6089"> @@ -35932,7 +36504,7 @@ id="g6121"> @@ -35958,7 +36530,7 @@ id="g6153"> @@ -35969,12 +36541,12 @@ @@ -36011,7 +36583,7 @@ id="g6209"> @@ -36037,7 +36609,7 @@ id="g6241"> @@ -36048,32 +36620,32 @@ @@ -36109,7 +36681,7 @@ id="g6313"> @@ -36135,7 +36707,7 @@ id="g6345"> @@ -36146,81 +36718,228 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + style="opacity:0.6;fill:none;stroke:#ff0000;stroke-width:7.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#DotS);marker-end:url(#Arrow2Send)" /> @@ -36256,29 +36975,29 @@ id="g7099"> @@ -36293,7 +37012,7 @@ transform="translate(2538.3311,837.6123)"> @@ -36315,7 +37034,7 @@ id="g7199"> @@ -36340,7 +37059,7 @@ id="g7231"> @@ -36360,7 +37079,7 @@ transform="translate(2538.3311,657.5947)"> @@ -36382,7 +37101,7 @@ id="g7279"> @@ -36407,7 +37126,7 @@ id="g7311"> @@ -36427,7 +37146,7 @@ transform="translate(2538.3252,1017.5234)"> @@ -36449,7 +37168,7 @@ id="g7391"> @@ -36474,7 +37193,7 @@ id="g7359"> @@ -36485,32 +37204,32 @@ @@ -36548,7 +37267,7 @@ id="g7463"> @@ -36574,7 +37293,7 @@ id="g7495"> @@ -36595,7 +37314,7 @@ transform="translate(2056.7451,657.5947)"> @@ -36618,7 +37337,7 @@ id="g7543"> @@ -36643,7 +37362,7 @@ id="g7575"> @@ -36663,7 +37382,7 @@ transform="translate(2056.7471,1017.5234)"> @@ -36686,7 +37405,7 @@ id="g7623"> @@ -36712,7 +37431,7 @@ id="g7655"> @@ -36723,96 +37442,243 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + style="opacity:0.6;fill:none;stroke:#ff0000;stroke-width:7.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#DotS);marker-end:url(#Arrow2Send)" /> + style="opacity:0.6;fill:none;stroke:#ff0000;stroke-width:7.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#DotS);marker-end:url(#Arrow2Send)" /> @@ -36840,7 +37706,7 @@ transform="translate(284.2432,1018.4248)"> @@ -36862,7 +37728,7 @@ id="g4369"> @@ -36887,7 +37753,7 @@ id="g4401"> @@ -36898,39 +37764,39 @@ @@ -36945,7 +37811,7 @@ transform="translate(429.3359,762.3701)"> @@ -36967,7 +37833,7 @@ id="g4477"> @@ -36992,7 +37858,7 @@ id="g4509"> @@ -37003,7 +37869,7 @@ @@ -37039,7 +37905,7 @@ id="g4965"> @@ -37064,7 +37930,7 @@ id="g4997"> @@ -37077,7 +37943,7 @@ id="g7881"> @@ -37092,7 +37958,7 @@ transform="translate(406.8271,782.3682)"> @@ -37114,7 +37980,7 @@ id="g7943"> @@ -37139,7 +38005,7 @@ id="g7975"> @@ -37150,36 +38016,21 @@ - - - @@ -37189,23 +38040,23 @@ style="fill-rule:nonzero"> @@ -37243,7 +38094,7 @@ id="g5162"> @@ -37269,7 +38120,7 @@ id="g5176"> @@ -37280,7 +38131,7 @@ @@ -37318,7 +38169,7 @@ id="g5200"> @@ -37344,7 +38195,7 @@ id="g5214"> @@ -37361,63 +38212,225 @@ style="fill-rule:nonzero"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -37432,8 +38445,8 @@ transform="matrix(0.4,0,0,0.4,495.2018,97.747949)" id="hexa-x"> @@ -37512,7 +38525,7 @@ @@ -37530,7 +38543,7 @@ @@ -37548,7 +38561,7 @@ @@ -37571,7 +38584,7 @@ @@ -37597,7 +38610,7 @@ @@ -37623,7 +38636,7 @@ @@ -37649,7 +38662,7 @@ @@ -37675,7 +38688,7 @@ @@ -37701,7 +38714,7 @@ @@ -37727,7 +38740,7 @@ @@ -37753,7 +38766,7 @@ @@ -37764,12 +38777,12 @@ @@ -37807,7 +38820,7 @@ @@ -37833,7 +38846,7 @@ @@ -37844,32 +38857,32 @@ @@ -37907,7 +38920,7 @@ @@ -37933,7 +38946,7 @@ @@ -37944,83 +38957,230 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -38029,14 +39189,14 @@ inkscape:groupmode="layer" id="layer14" inkscape:label="fixed-wing-frames" - style="display:none" + style="display:inline" transform="translate(-32.46875,315.85439)" sodipodi:insensitive="true"> @@ -38072,30 +39232,168 @@ sodipodi:nodetypes="ccccccccccscsccccccscsccccccccccccc" inkscape:connector-curvature="0" id="path4853" - d="M 377.05917,2623.2856 L 376.09042,2660.7232 L 375.27792,2698.7855 L 373.30917,2701.9419 L 89.340421,2714.1605 L 89.996671,2748.6919 L 373.37167,2768.4106 L 375.80917,2773.0044 L 381.46542,2963.3794 L 381.46542,2967.4419 C 381.46542,2967.4419 382.54193,2969.4803 374.71542,2971.5044 C 366.88891,2973.5285 326.18417,2979.1919 326.18417,2979.1919 C 326.18417,2979.1919 324.72536,2979.733 324.59042,2982.5669 C 324.45548,2985.4005 324.59042,3008.0669 324.59042,3008.0669 L 381.34042,3015.3482 C 384.49007,3020.2044 384.39605,3025.176 386.59042,3030.7232 L 388.68412,3030.7232 C 390.86665,3025.5309 390.8639,3020.1286 393.99662,3015.3482 L 450.74662,3008.0669 C 450.74662,3008.0669 450.88156,2985.4006 450.74662,2982.5669 C 450.61168,2979.7331 449.15287,2979.1919 449.15287,2979.1919 C 449.15287,2979.1919 408.41688,2973.5285 400.59037,2971.5044 C 392.76386,2969.4802 393.87162,2967.4419 393.87162,2967.4419 L 393.87162,2963.4106 L 399.52787,2773.0044 L 401.96537,2768.4105 L 685.34037,2748.6919 L 685.99662,2714.1605 L 402.02792,2701.9419 L 400.05917,2698.7856 L 399.24667,2660.7232 L 398.27792,2623.2856 C 398.27792,2623.2857 396.16126,2586.4203 394.23394,2585.6845 L 381.03982,2585.6845 C 379.09724,2586.505 377.05917,2623.2856 377.05917,2623.2856 z" + d="m 377.05917,2623.2856 l -0.96875,37.4376 l -0.8125,38.0623 l -1.96875,3.1564 l -283.968749,12.2186 l 0.65625,34.5314 l 283.374999,19.7187 l 2.4375,4.5938 l 5.65625,190.375 l 0,4.0625 c 0,0 1.07651,2.0384 -6.75,4.0625 c -7.82651,2.0241 -48.53125,7.6875 -48.53125,7.6875 c 0,0 -1.45881,0.5411 -1.59375,3.375 c -0.13494,2.8336 0,25.5 0,25.5 l 56.75,7.2813 c 3.14965,4.8562 3.05563,9.8278 5.25,15.375 l 2.0937,0 c 2.18253,-5.1923 2.17978,-10.5946 5.3125,-15.375 l 56.75,-7.2813 c 0,0 0.13494,-22.6663 0,-25.5 c -0.13494,-2.8338 -1.59375,-3.375 -1.59375,-3.375 c 0,0 -40.73599,-5.6634 -48.5625,-7.6875 c -7.82651,-2.0242 -6.71875,-4.0625 -6.71875,-4.0625 l 0,-4.0313 l 5.65625,-190.4062 l 2.4375,-4.5939 l 283.375,-19.7186 l 0.65625,-34.5314 l -283.9687,-12.2186 l -1.96875,-3.1563 l -0.8125,-38.0624 l -0.96875,-37.4376 c 0,10e-5 -2.11666,-36.8653 -4.04398,-37.6011 l -13.19412,0 c -1.94258,0.8205 -3.98065,37.6011 -3.98065,37.6011 z" style="fill:#3c3c3c;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + transform="matrix(0.23958974,0,0,0.23958974,317.33099,1519.1918)" + style="display:inline;fill:#767575;fill-opacity:1;stroke:none" + id="g4334-3"> + sodipodi:nodetypes="ccccc" + style="fill:#767575;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="M 403.66024,282.97714 L 350.98876,230.30666 C 305.52073,201.13204 216.95499,216.43139 216.95499,216.43139 l 133.85525,118.52175 z" + id="path4336-8" + inkscape:connector-curvature="0" /> + style="fill:#767575;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 308.8794,376.0474 l 0,-67.981 l 36.075,31.905 z" + id="path4338-0" + inkscape:connector-curvature="0" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - @@ -38479,12 +39773,12 @@ + d="m 136.118,661.657 l 0,-21.22" /> + d="m 140.689,661.657 l 0,-21.22" /> + d="m 145.233,661.657 l 0,-21.22" /> + d="m 149.804,661.657 l 0,-21.22" /> + d="m 154.348,661.657 l 0,-21.22" /> + d="m 158.892,661.657 l 0,-21.22" /> + d="m 163.463,661.657 l 0,-21.22" /> + d="m 168.006,661.657 l 0,-21.22" /> + d="m 172.578,661.657 l 0,-21.22" /> + d="m 177.12,661.657 l 0,-21.22" /> + d="m 181.664,661.657 l 0,-21.22" /> + d="m 186.235,661.657 l 0,-21.22" /> + d="m 190.779,661.657 l 0,-21.22" /> + d="m 195.35,661.657 l 0,-21.22" /> + d="m 199.894,661.657 l 0,-21.22" /> + d="m 204.438,661.657 l 0,-21.22" /> + d="m 209.009,661.657 l 0,-21.22" /> + d="m 213.552,661.657 l 0,-21.22" /> + d="m 218.124,661.657 l 0,-21.22" /> + d="m 222.666,661.657 l 0,-21.22" /> + d="m 227.211,661.657 l 0,-21.22" /> + d="m 236.325,661.657 l 0,-20.416" /> + d="m 240.896,661.657 l 0,-20.416" /> + d="m 245.439,661.657 l 0,-20.416" /> + d="m 250.012,661.657 l 0,-20.416" /> + d="m 254.555,661.657 l 0,-20.416" /> + d="m 259.098,661.657 l 0,-20.416" /> + d="m 263.67,661.657 l 0,-20.416" /> + d="m 268.213,661.657 l 0,-20.416" /> + d="m 272.784,661.657 l 0,-20.416" /> + d="m 277.328,661.657 l 0,-20.416" /> + d="m 281.871,661.657 l 0,-20.416" /> + d="m 286.442,661.657 l 0,-20.416" /> + d="m 290.986,661.657 l 0,-20.416" /> + d="m 295.558,661.657 l 0,-20.416" /> + d="m 300.101,661.657 l 0,-20.416" /> + d="m 304.645,661.657 l 0,-20.416" /> + d="m 309.216,661.657 l 0,-20.416" /> + d="m 313.76,661.657 l 0,-20.416" /> + d="m 318.33,661.657 l 0,-20.416" /> + d="m 322.874,661.657 l 0,-20.416" /> + d="m 327.417,661.657 l 0,-20.416" /> + d="m 331.989,661.657 l 0,-20.416" /> + d="m 336.532,661.657 l 0,-20.416" /> + d="m 341.104,661.657 l 0,-20.416" /> + d="m 345.646,661.657 l 0,-20.416" /> + d="m 350.19,661.657 l 0,-20.416" /> + d="m 354.762,661.657 l 0,-20.416" /> + d="m 359.306,661.657 l 0,-20.416" /> + d="m 231.089,661.657 l 0,-25.298" /> @@ -39119,12 +40409,12 @@ @@ -39487,12 +40773,12 @@ @@ -39630,7 +40912,7 @@ transform="matrix(1.2253368,0,0,1.2253368,630.54136,-87.099306)"> + d="m 107.091,651.979 l -3.908,-20.854" /> + d="m 116.049,650.299 l -3.907,-20.854" /> + d="m 120.516,649.463 l -3.908,-20.854" /> + d="m 124.981,648.626 l -3.907,-20.854" /> + d="m 129.475,647.785 l -3.908,-20.857" /> + d="m 133.94,646.948 l -3.907,-20.856" /> + d="m 142.898,645.269 l -3.907,-20.854" /> + d="m 147.366,644.433 l -3.908,-20.854" /> + d="m 160.817,641.912 l -3.76,-20.068" /> + d="m 165.282,641.076 l -3.76,-20.067" /> + d="m 169.776,640.232 l -3.759,-20.066" /> + d="m 174.242,639.396 l -3.76,-20.066" /> + d="m 178.707,638.56 l -3.76,-20.064" /> + d="m 183.201,637.718 l -3.76,-20.064" /> + d="m 187.666,636.882 l -3.76,-20.065" /> + d="m 192.159,636.039 l -3.76,-20.065" /> + d="m 196.625,635.203 l -3.76,-20.066" /> + d="m 201.091,634.366 l -3.76,-20.067" /> + d="m 205.583,633.524 l -3.76,-20.067" /> + d="m 210.05,632.688 l -3.76,-20.065" /> + d="m 214.543,631.846 l -3.76,-20.064" /> + d="m 219.009,631.009 l -3.76,-20.065" /> + d="m 223.475,630.172 l -3.76,-20.064" /> + d="m 227.968,629.33 l -3.759,-20.066" /> + d="m 232.434,628.494 l -3.76,-20.066" /> + d="m 236.926,627.652 l -3.76,-20.068" /> + d="m 241.392,626.815 l -3.759,-20.067" /> + d="m 245.858,625.979 l -3.76,-20.066" /> + d="m 250.352,625.136 l -3.76,-20.063" /> + d="m 254.817,624.3 l -3.759,-20.065" /> + d="m 259.31,623.458 l -3.76,-20.066" /> + d="m 263.775,622.622 l -3.76,-20.067" /> + d="m 268.241,621.784 l -3.759,-20.066" /> + d="m 272.735,620.943 l -3.76,-20.067" /> + d="m 277.201,620.106 l -3.76,-20.068" /> + d="m 151.177,643.718 l -4.659,-24.864" /> - - - - - - - + d="m 107.091,651.979 l -3.908,-20.854" /> + d="m 116.049,650.299 l -3.907,-20.854" /> + d="m 120.516,649.463 l -3.908,-20.854" /> + d="m 124.981,648.626 l -3.907,-20.854" /> + d="m 129.475,647.785 l -3.908,-20.857" /> + d="m 133.94,646.948 l -3.907,-20.856" /> + d="m 142.898,645.269 l -3.907,-20.854" /> + d="m 147.366,644.433 l -3.908,-20.854" /> + d="m 160.817,641.912 l -3.76,-20.068" /> + d="m 165.282,641.076 l -3.76,-20.067" /> + d="m 169.776,640.232 l -3.759,-20.066" /> + d="m 174.242,639.396 l -3.76,-20.066" /> + d="m 178.707,638.56 l -3.76,-20.064" /> + d="m 183.201,637.718 l -3.76,-20.064" /> + d="m 187.666,636.882 l -3.76,-20.065" /> + d="m 192.159,636.039 l -3.76,-20.065" /> + d="m 196.625,635.203 l -3.76,-20.066" /> + d="m 201.091,634.366 l -3.76,-20.067" /> + d="m 205.583,633.524 l -3.76,-20.067" /> + d="m 210.05,632.688 l -3.76,-20.065" /> + d="m 214.543,631.846 l -3.76,-20.064" /> + d="m 219.009,631.009 l -3.76,-20.065" /> + d="m 223.475,630.172 l -3.76,-20.064" /> + d="m 227.968,629.33 l -3.759,-20.066" /> + d="m 232.434,628.494 l -3.76,-20.066" /> + d="m 236.926,627.652 l -3.76,-20.068" /> + d="m 241.392,626.815 l -3.759,-20.067" /> + d="m 245.858,625.979 l -3.76,-20.066" /> + d="m 250.352,625.136 l -3.76,-20.063" /> + d="m 254.817,624.3 l -3.759,-20.065" /> + d="m 259.31,623.458 l -3.76,-20.066" /> + d="m 263.775,622.622 l -3.76,-20.067" /> + d="m 268.241,621.784 l -3.759,-20.066" /> + d="m 272.735,620.943 l -3.76,-20.067" /> + d="m 277.201,620.106 l -3.76,-20.068" /> + d="m 151.177,643.718 l -4.659,-24.864" /> @@ -40305,12 +41560,12 @@ @@ -40403,38 +41654,200 @@ id="g3577-1-6-2"> + d="m 388.375,1470.057 l 20.694,0 c 0,0 -5.188,-15.258 -10.36,-15.375 c -5.176,-0.117 -10.334,15.375 -10.334,15.375 z" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + d="m 388.375,1470.057 l 20.694,0 c 0,0 -5.188,-15.258 -10.36,-15.375 c -5.176,-0.117 -10.334,15.375 -10.334,15.375 z" /> + style="display:inline" + transform="matrix(1.0176518,0,0,0.97458892,-3.8568996,17.861645)" + id="vtail-logotype-8-7"> + transform="matrix(0.23958974,0,0,0.23958974,317.33099,1519.1918)" + style="display:inline;fill:#767575;fill-opacity:1;stroke:none" + id="g4334-3-2-9"> + sodipodi:nodetypes="ccccc" + style="fill:#767575;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="M 403.66024,282.97714 L 350.98876,230.30666 C 305.52073,201.13204 216.95499,216.43139 216.95499,216.43139 l 133.85525,118.52175 z" + id="path4336-8-9-5" + inkscape:connector-curvature="0" /> + style="fill:#767575;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 308.8794,376.0474 l 0,-67.981 l 36.075,31.905 z" + id="path4338-0-3-6" + inkscape:connector-curvature="0" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + d="m 317.151,880.135 l 0,-13.947" /> + d="m 320.473,880.135 l 0,-13.947" /> + d="m 323.776,880.135 l 0,-13.947" /> + d="m 327.098,880.135 l 0,-13.947" /> + d="m 330.401,880.135 l 0,-13.947" /> + d="m 333.703,880.135 l 0,-13.947" /> + d="m 337.026,880.135 l 0,-13.947" /> + d="m 340.328,880.135 l 0,-13.947" /> + d="m 343.651,880.135 l 0,-13.947" /> + d="m 346.953,880.135 l 0,-13.947" /> + d="m 350.255,880.135 l 0,-13.947" /> + d="m 353.578,880.135 l 0,-13.947" /> + d="m 356.881,880.135 l 0,-13.947" /> + d="m 360.203,880.135 l 0,-13.947" /> + d="m 363.505,880.135 l 0,-13.947" /> + d="m 366.808,880.135 l 0,-13.947" /> + d="m 370.13,880.135 l 0,-13.947" /> + d="m 373.432,880.135 l 0,-13.947" /> + d="m 376.755,880.135 l 0,-13.947" /> + d="m 380.057,880.135 l 0,-13.947" /> + d="m 383.36,880.135 l 0,-13.947" /> + d="m 389.985,880.135 l 0,-13.421" /> + d="m 393.308,880.135 l 0,-13.421" /> + d="m 396.609,880.135 l 0,-13.421" /> + d="m 399.934,880.135 l 0,-13.421" /> + d="m 403.235,880.135 l 0,-13.421" /> + d="m 406.536,880.135 l 0,-13.421" /> + d="m 409.86,880.135 l 0,-13.421" /> + d="m 413.161,880.135 l 0,-13.421" /> + d="m 416.485,880.135 l 0,-13.421" /> + d="m 419.786,880.135 l 0,-13.421" /> + d="m 423.089,880.135 l 0,-13.421" /> + d="m 426.411,880.135 l 0,-13.421" /> + d="m 429.714,880.135 l 0,-13.421" /> + d="m 433.036,880.135 l 0,-13.421" /> + d="m 436.339,880.135 l 0,-13.421" /> + d="m 439.642,880.135 l 0,-13.421" /> + d="m 442.964,880.135 l 0,-13.421" /> + d="m 446.267,880.135 l 0,-13.421" /> + d="m 449.589,880.135 l 0,-13.421" /> + d="m 452.892,880.135 l 0,-13.421" /> + d="m 456.194,880.135 l 0,-13.421" /> + d="m 459.517,880.135 l 0,-13.421" /> + d="m 462.817,880.135 l 0,-13.421" /> + d="m 466.142,880.135 l 0,-13.421" /> + d="m 469.444,880.135 l 0,-13.421" /> + d="m 472.745,880.135 l 0,-13.421" /> + d="m 476.067,880.135 l 0,-13.421" /> + d="m 479.372,880.135 l 0,-13.421" /> + d="m 386.179,880.135 l 0,-16.629" /> + d="m 661.634,640.438 l 0,21.222" /> + d="m 657.063,640.438 l 0,21.222" /> + d="m 652.519,640.438 l 0,21.222" /> + d="m 647.948,640.438 l 0,21.222" /> + d="m 643.405,640.438 l 0,21.222" /> + d="m 638.86,640.438 l 0,21.222" /> + d="m 634.29,640.438 l 0,21.222" /> + d="m 629.747,640.438 l 0,21.222" /> + d="m 625.175,640.438 l 0,21.222" /> + d="m 620.632,640.438 l 0,21.222" /> + d="m 616.089,640.438 l 0,21.222" /> + d="m 611.517,640.438 l 0,21.222" /> + d="m 606.974,640.438 l 0,21.222" /> + d="m 602.403,640.438 l 0,21.222" /> + d="m 597.858,640.438 l 0,21.222" /> + d="m 593.315,640.438 l 0,21.222" /> + d="m 588.743,640.438 l 0,21.222" /> + d="m 584.2,640.438 l 0,21.222" /> + d="m 579.628,640.438 l 0,21.222" /> + d="m 575.087,640.438 l 0,21.222" /> + d="m 570.542,640.438 l 0,21.222" /> + d="m 561.427,641.241 l 0,20.416" /> + d="m 556.856,641.241 l 0,20.416" /> + d="m 552.313,641.241 l 0,20.416" /> + d="m 547.741,641.241 l 0,20.416" /> + d="m 543.198,641.241 l 0,20.416" /> + d="m 538.655,641.241 l 0,20.416" /> + d="m 534.083,641.241 l 0,20.416" /> + d="m 529.54,641.241 l 0,20.416" /> + d="m 524.968,641.241 l 0,20.416" /> + d="m 520.425,641.241 l 0,20.416" /> + d="m 515.882,641.241 l 0,20.416" /> + d="m 511.31,641.241 l 0,20.416" /> + d="m 506.767,641.241 l 0,20.416" /> + d="m 502.194,641.241 l 0,20.416" /> + d="m 497.651,641.241 l 0,20.416" /> + d="m 493.108,641.241 l 0,20.416" /> + d="m 488.536,641.241 l 0,20.416" /> + d="m 483.993,641.241 l 0,20.416" /> + d="m 479.423,641.241 l 0,20.416" /> + d="m 474.878,641.241 l 0,20.416" /> + d="m 470.335,641.241 l 0,20.416" /> + d="m 465.763,641.241 l 0,20.416" /> + d="m 461.22,641.241 l 0,20.416" /> + d="m 456.649,641.241 l 0,20.416" /> + d="m 452.106,641.241 l 0,20.416" /> + d="m 447.563,641.241 l 0,20.416" /> + d="m 442.991,641.241 l 0,20.416" /> + d="m 438.446,641.241 l 0,20.416" /> + d="m 566.663,636.359 l 0,25.298" /> + d="m 136.118,661.657 l 0,-21.22" /> + d="m 140.689,661.657 l 0,-21.22" /> + d="m 145.233,661.657 l 0,-21.22" /> + d="m 149.804,661.657 l 0,-21.22" /> + d="m 154.348,661.657 l 0,-21.22" /> + d="m 158.892,661.657 l 0,-21.22" /> + d="m 163.463,661.657 l 0,-21.22" /> + d="m 168.006,661.657 l 0,-21.22" /> + d="m 172.578,661.657 l 0,-21.22" /> + d="m 177.12,661.657 l 0,-21.22" /> + d="m 181.664,661.657 l 0,-21.22" /> + d="m 186.235,661.657 l 0,-21.22" /> + d="m 190.779,661.657 l 0,-21.22" /> + d="m 195.35,661.657 l 0,-21.22" /> + d="m 199.894,661.657 l 0,-21.22" /> + d="m 204.438,661.657 l 0,-21.22" /> + d="m 209.009,661.657 l 0,-21.22" /> + d="m 213.552,661.657 l 0,-21.22" /> + d="m 218.124,661.657 l 0,-21.22" /> + d="m 222.666,661.657 l 0,-21.22" /> + d="m 227.211,661.657 l 0,-21.22" /> + d="m 236.325,661.657 l 0,-20.416" /> + d="m 240.896,661.657 l 0,-20.416" /> + d="m 245.439,661.657 l 0,-20.416" /> + d="m 250.012,661.657 l 0,-20.416" /> + d="m 254.555,661.657 l 0,-20.416" /> + d="m 259.098,661.657 l 0,-20.416" /> + d="m 263.67,661.657 l 0,-20.416" /> + d="m 268.213,661.657 l 0,-20.416" /> + d="m 272.784,661.657 l 0,-20.416" /> + d="m 277.328,661.657 l 0,-20.416" /> + d="m 281.871,661.657 l 0,-20.416" /> + d="m 286.442,661.657 l 0,-20.416" /> + d="m 290.986,661.657 l 0,-20.416" /> + d="m 295.558,661.657 l 0,-20.416" /> + d="m 300.101,661.657 l 0,-20.416" /> + d="m 304.645,661.657 l 0,-20.416" /> + d="m 309.216,661.657 l 0,-20.416" /> + d="m 313.76,661.657 l 0,-20.416" /> + d="m 318.33,661.657 l 0,-20.416" /> + d="m 322.874,661.657 l 0,-20.416" /> + d="m 327.417,661.657 l 0,-20.416" /> + d="m 331.989,661.657 l 0,-20.416" /> + d="m 336.532,661.657 l 0,-20.416" /> + d="m 341.104,661.657 l 0,-20.416" /> + d="m 345.646,661.657 l 0,-20.416" /> + d="m 350.19,661.657 l 0,-20.416" /> + d="m 354.762,661.657 l 0,-20.416" /> + d="m 359.306,661.657 l 0,-20.416" /> + d="m 231.089,661.657 l 0,-25.298" /> @@ -41400,12 +42953,12 @@ id="g3869-7"> + cx="383.69699" /> @@ -41465,12 +43014,12 @@ id="g3895-2"> + cx="408.685" /> @@ -41587,12 +43132,12 @@ transform="translate(40.63173,1364.5466)"> + cx="214.054" /> @@ -41697,26 +43238,26 @@ @@ -41765,29 +43306,169 @@ + style="display:inline" + transform="matrix(1.0186954,0,0,0.9755884,-5.5401423,51.443761)" + id="vtail-logotype-8-7-6"> + transform="matrix(0.23958974,0,0,0.23958974,317.33099,1519.1918)" + style="display:inline;fill:#767575;fill-opacity:1;stroke:none" + id="g4334-3-2-9-9"> + sodipodi:nodetypes="ccccc" + style="fill:#767575;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="M 403.66024,282.97714 L 350.98876,230.30666 C 305.52073,201.13204 216.95499,216.43139 216.95499,216.43139 l 133.85525,118.52175 z" + id="path4336-8-9-5-7" + inkscape:connector-curvature="0" /> + style="fill:#767575;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 308.8794,376.0474 l 0,-67.981 l 36.075,31.905 z" + id="path4338-0-3-6-3" + inkscape:connector-curvature="0" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - @@ -41832,252 +43513,252 @@ transform="translate(0,1008)" id="aileron-elevator-raster"> @@ -42093,252 +43774,252 @@ transform="translate(0,1008)" id="aileron-right-raster"> @@ -42354,252 +44035,252 @@ transform="translate(0,1008)" id="aileron-left-raster"> @@ -42612,12 +44293,12 @@ id="g3831"> + cx="214.054" /> @@ -42708,12 +44385,12 @@ id="g3786"> + cx="583.698" /> @@ -42870,12 +44543,12 @@ id="g3869-2"> + cx="383.69699" /> @@ -42935,12 +44604,12 @@ id="g3895"> + cx="408.685" /> @@ -43058,47 +44723,178 @@ sodipodi:nodetypes="zsccsccccssscccccz" inkscape:connector-curvature="0" id="path5603" - d="M 144.02118,1656.0501 C 147.79532,1647.702 249.42112,1694.0938 312.15886,1694.0938 C 421.82554,1694.0938 492.34636,1662.875 492.34636,1662.875 L 510.09636,1704.5 C 510.09636,1704.5 471.43604,1748.1771 464.19011,1770.7188 C 456.89659,1793.4084 455.57219,1806.5522 453.45349,1832.1766 L 441.98699,1839.875 L 367.00261,1839.875 C 367.00261,1833.2977 367.89331,1825.359 368.22136,1817.3125 C 370.29231,1812.9144 371.47136,1807.9958 371.47136,1802.8125 C 371.47136,1783.9996 356.22173,1768.75 337.40886,1768.75 C 318.59599,1768.75 303.34636,1783.9996 303.34636,1802.8125 C 303.34636,1811.5603 306.64536,1819.5302 312.06511,1825.5625 C 308.19576,1827.9607 296.59325,1818.3486 285.72136,1818.5938 C 276.19483,1818.6358 270.4866,1813.4048 270.40886,1805 C 270.40886,1800.4768 272.62433,1796.4654 276.00261,1793.9688 C 276.31721,1780.871 274.75866,1764.2571 261.06511,1748.2812 C 222.86596,1711.7257 140.24704,1664.3982 144.02118,1656.0501 z" - style="fill:url(#linearGradient11601);fill-opacity:1;stroke:none;display:inline" /> + d="m 144.02118,1656.0501 c 3.77414,-8.3481 105.39994,38.0437 168.13768,38.0437 c 109.66668,0 180.1875,-31.2188 180.1875,-31.2188 l 17.75,41.625 c 0,0 -38.66032,43.6771 -45.90625,66.2188 c -7.29352,22.6896 -8.61792,35.8334 -10.73662,61.4578 l -11.4665,7.6984 l -74.98438,0 c 0,-6.5773 0.8907,-14.516 1.21875,-22.5625 c 2.07095,-4.3981 3.25,-9.3167 3.25,-14.5 c 0,-18.8129 -15.24963,-34.0625 -34.0625,-34.0625 c -18.81287,0 -34.0625,15.2496 -34.0625,34.0625 c 0,8.7478 3.299,16.7177 8.71875,22.75 c -3.86935,2.3982 -15.47186,-7.2139 -26.34375,-6.9687 c -9.52653,0.042 -15.23476,-5.189 -15.3125,-13.5938 c 0,-4.5232 2.21547,-8.5346 5.59375,-11.0312 c 0.3146,-13.0978 -1.24395,-29.7117 -14.9375,-45.6876 c -38.19915,-36.5555 -120.81807,-83.883 -117.04393,-92.2311 z" + style="display:inline;fill:url(#linearGradient11601);fill-opacity:1;stroke:none" /> + + + + + + + + + + + + - - - - + transform="matrix(0.21172341,0,0,0.21172341,242.39069,1670.4513)" + id="g4506-1"> + d="m 664.54607,745.48685 l -21.68,0 q -3.12,0 -3.12,-2.64 l 0,-43.52 q 0,-0.8 -0.8,-0.8 l -10,0 q -0.8,0 -0.8,0.8 l 0,42.56 q 0,6.72 2.8,10.08 q 2.8,3.28 9.44,3.84 q 0.4,0.08 0.96,0.08 q 0.56,0 1.2,0 l 22,0 q 0.8,0 0.8,-0.8 l 0,-8.8 q 0,-0.8 -0.8,-0.8 z" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:Prototype;-inkscape-font-specification:Prototype;letter-spacing:0px;word-spacing:0px;fill:#767575;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + id="path4356-5" /> + + + + + + + + + + + + + + + + + + + - + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.3872181;fill:url(#radialGradient4455-7);fill-opacity:1;stroke:none;stroke-width:24.10000038;marker:none;enable-background:accumulate" + cx="95.658928" + cy="1225.9447" + rx="95.658928" + ry="20.138721" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#8f8e8c;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.46359491;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#8f8e8c;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> - + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#44484a;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" + cx="309.67877" + cy="2090.5566" + rx="4.9847689" + ry="4.5971303" /> - + transform="matrix(-0.81878721,0,0,0.81878721,565.51334,1690.0415)" + cx="146.50272" + cy="-54.65202" + r="7.9385705" /> @@ -43305,16 +45092,14 @@ id="motorbike-motor" style="display:inline" transform="translate(-1.0465068e-7,-4.4182544e-5)"> - + transform="matrix(-1,0,0,1,243.77091,708.1928)" + cx="95.658928" + cy="1225.9447" + rx="95.658928" + ry="20.138721" /> - + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#a7a6a4;fill-opacity:1;fill-rule:nonzero;stroke:#4e4b4e;stroke-width:1.16210043;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1.16210042, 2.32420084;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" + cx="451.74469" + cy="1875.9762" + r="12.461923" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient11594-3-5);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;enable-background:accumulate" /> - - + + transform="matrix(1.1409811,0,0,1.1409811,-62.070587,-272.21865)" + cx="400.33926" + cy="1876.2877" + r="27.727777" /> + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:12px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial Bold';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"> @@ -43436,11 +45212,11 @@ sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" id="path19631-2-8-5" - d="M -15.116465,1673.5434 L 76.106156,1673.4393 L 127.68293,1608.3437 L 388.96825,1608.2396 L 452.39712,1721.4868" - style="opacity:0.6;fill:none;stroke:#ff0000;stroke-width:2.99576831;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:url(#DotS);marker-end:url(#Arrow2Send);display:inline" /> + d="m -15.116465,1673.5434 l 91.222621,-0.1041 l 51.576774,-65.0956 l 261.28532,-0.1041 l 63.42887,113.2472" + style="display:inline;opacity:0.6;fill:none;stroke:#ff0000;stroke-width:2.99576831;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#DotS);marker-end:url(#Arrow2Send)" /> @@ -43467,13 +45243,13 @@ height="69.869705" width="477.68121" id="rect5244" - style="color:#000000;fill:#4e93f6;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.31877217;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#4e93f6;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.31877217;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#232323;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.33588263;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> + d="m 1299.737,403.01952 l 0,269.65651 c -16.1863,-8.1142 -31.9866,-10.8475 -31.9866,-33.7071 l 0,-16.8535 l 0,-16.8535 l 0,-16.8536 c 0,0 -74,-2.8089 -74,-4.2133 c 0,-1.4045 0,-2.809 0,-4.2134 c 0,-1.4045 0,-2.8089 0,-4.2134 c 0,-1.4045 74,-4.2134 74,-4.2134 l 0,-16.8535 l 0,-16.8536 l 0,-16.8535 l 0,-16.8535 l -75,-4.2134 l 0,-4.2134 l 0,-4.2134 l 75,-4.2133 l 0,-16.85358 l 0,-16.85354 l 0,-16.85353 c 0,-21.70778 13.9549,-24.20629 31.9866,-33.70706 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient37524-0);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.34351587;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> - - - - - - - @@ -43931,15 +45683,176 @@ sodipodi:nodetypes="cccc" inkscape:connector-curvature="0" id="path37299-4" - d="M 650.86221,478.82431 L 676.24415,478.82431 L 676.15731,627.51201 L 765.37996,627.40791" - style="opacity:0.6;fill:none;stroke:#ff0000;stroke-width:2.99576831;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:url(#DotS);marker-end:url(#Arrow2Send);display:inline" /> + d="m 650.86221,478.82431 l 25.38194,0 l -0.0868,148.6877 l 89.22265,-0.1041" + style="display:inline;opacity:0.6;fill:none;stroke:#ff0000;stroke-width:2.99576831;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#DotS);marker-end:url(#Arrow2Send)" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -43954,20 +45867,20 @@ sodipodi:nodetypes="ccscccccscccscccccccsccc" inkscape:connector-curvature="0" id="path7927-1" - d="M 111.54988,2583.5313 C 107.01221,2583.6682 103.95742,2585.7421 101.89363,2589.5313 C 101.89363,2589.5312 86.75061,2626.6363 73.33113,2640.9063 C 70.78898,2643.6096 67.66694,2646.9063 63.95613,2646.9063 C 63.95613,2646.9062 -126.41887,2647.2704 -126.41887,2652.0625 L -127.41887,2688.2187 L -126.41887,2724.3437 C -126.41887,2729.1359 63.95613,2729.5313 63.95613,2729.5313 C 67.66694,2729.5313 70.78898,2732.828 73.33113,2735.5313 C 86.75061,2749.8012 101.89363,2786.875 101.89363,2786.875 C 104.09501,2790.9168 107.43521,2793.0052 112.48738,2792.875 L 346.39363,2792.875 C 352.21277,2793.1652 353.64553,2788.5406 355.08113,2784.875 C 364.49802,2760.83 371.98738,2730.3438 371.98738,2730.3437 C 373.34224,2723.3735 377.69947,2722.4282 381.20613,2722.3437 L 544.42488,2722.3437 L 544.42488,2688.2187 L 544.42488,2654.0937 L 381.20613,2654.0937 C 377.69947,2654.0093 373.34224,2653.0641 371.98738,2646.0937 C 371.98738,2646.0938 364.49802,2615.5763 355.08113,2591.5313 C 353.64553,2587.8657 352.21277,2583.2411 346.39363,2583.5313 L 112.48738,2583.5313 C 112.17162,2583.5231 111.85239,2583.5221 111.54988,2583.5313 z" - style="fill:url(#linearGradient19821);fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline" /> + d="m 111.54988,2583.5313 c -4.53767,0.1369 -7.59246,2.2108 -9.65625,6 c 0,-1e-4 -15.14302,37.105 -28.5625,51.375 c -2.54215,2.7033 -5.66419,6 -9.375,6 c 0,-1e-4 -190.375,0.3641 -190.375,5.1562 l -1,36.1562 l 1,36.125 c 0,4.7922 190.375,5.1876 190.375,5.1876 c 3.71081,0 6.83285,3.2967 9.375,6 c 13.41948,14.2699 28.5625,51.3437 28.5625,51.3437 c 2.20138,4.0418 5.54158,6.1302 10.59375,6 l 233.90625,0 c 5.81914,0.2902 7.2519,-4.3344 8.6875,-8 c 9.41689,-24.045 16.90625,-54.5312 16.90625,-54.5313 c 1.35486,-6.9702 5.71209,-7.9155 9.21875,-8 l 163.21875,0 l 0,-34.125 l 0,-34.125 l -163.21875,0 c -3.50666,-0.084 -7.86389,-1.0296 -9.21875,-8 c 0,1e-4 -7.48936,-30.5174 -16.90625,-54.5624 c -1.4356,-3.6656 -2.86836,-8.2902 -8.6875,-8 l -233.90625,0 c -0.31576,-0.01 -0.63499,-0.01 -0.9375,0 z" + style="display:inline;fill:url(#linearGradient19821);fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + d="m 409.48013,2543.8914 l 37.55717,0 l 20,143.8166 l -20,143.8165 l -37.55717,0 l -8,-143.8165 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#535353;stroke-width:20.98078156;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> + d="m -6.519875,2543.8914 l 33.557165,0 l 30,143.8166 l -32,143.8165 l -31.557165,0 l -24,-143.8165 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#535353;stroke-width:20.98078156;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient19823);fill-opacity:1;fill-rule:nonzero;stroke:#464444;stroke-width:1.64551973;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#c3c3c5;fill-opacity:1;fill-rule:nonzero;stroke:#535353;stroke-width:1.93844509;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient19773-4-1);fill-opacity:1;fill-rule:nonzero;stroke:#131715;stroke-width:0.35727045;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> @@ -44045,10 +45958,10 @@ height="103.46555" width="35.300011" id="rect7934-7" - style="color:#000000;fill:#292928;fill-opacity:1;fill-rule:nonzero;stroke:#131715;stroke-width:0.40000001;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#292928;fill-opacity:1;fill-rule:nonzero;stroke:#131715;stroke-width:0.40000001;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" transform="matrix(0.89317612,0,0,0.89317612,198.72946,-32.417744)" /> @@ -44102,7 +46015,7 @@ transform="translate(1.3643129e-6,-3.1114464e-6)" id="car-steering"> @@ -44240,30 +46149,27 @@ y2="650.90002" id="line9568-8" /> - + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient19837-0-7);fill-opacity:1;fill-rule:nonzero;stroke:#1d1d1c;stroke-width:0.48154795;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" + cx="47.975471" + cy="1901.3416" + r="0.92891532" /> + transform="matrix(-0.37468448,0,0,-0.3511279,630.21749,574.57501)" + style="fill:#767575;fill-opacity:1;stroke:none" + id="g4334"> + sodipodi:nodetypes="ccccc" + style="fill:#767575;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="M 403.66024,282.97714 L 350.98876,230.30666 C 305.52073,201.13204 216.95499,216.43139 216.95499,216.43139 l 133.85525,118.52175 z" + id="path4336" + inkscape:connector-curvature="0" /> + style="fill:#767575;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 308.8794,376.0474 l 0,-67.981 l 36.075,31.905 z" + id="path4338" + inkscape:connector-curvature="0" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + d="m 650.86221,463.39425 l 364.89049,-0.4164" + style="display:inline;opacity:0.6;fill:none;stroke:#ff0000;stroke-width:2.99576831;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#DotS);marker-end:url(#Arrow2Send)" /> diff --git a/ground/openpilotgcs/src/plugins/setupwizard/resources/fixedwing-shapes-wizard-no-numbers.svg b/ground/openpilotgcs/src/plugins/setupwizard/resources/fixedwing-shapes-wizard-no-numbers.svg index 18656681f..fcd6d956e 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/resources/fixedwing-shapes-wizard-no-numbers.svg +++ b/ground/openpilotgcs/src/plugins/setupwizard/resources/fixedwing-shapes-wizard-no-numbers.svg @@ -19,7 +19,7 @@ viewBox="0 0 653.61542 2094.717" enable-background="new 0 0 792 1008" xml:space="preserve" - inkscape:version="0.48.5 r10040" + inkscape:version="0.91 r13725" sodipodi:docname="fixedwing-shapes-wizard-no-numbers.svg">image/svg+xmlimage/svg+xmlimage/svg+xmlimage/svg+xml \ No newline at end of file + d="m 2454.6582,1261.0439 c -2.708,0 -5.165,1.176 -5.963,3.947 l 3.275,0.862 c 0.273,-0.988 1.176,-1.848 2.52,-1.848 c 1.008,0 2.163,0.504 2.163,1.889 c 0,1.511 -1.555,1.953 -3.023,1.953 l -0.946,0 l 0,2.582 l 1.03,0 c 1.322,0 2.603,0.336 2.603,1.763 c 0,1.072 -0.903,1.639 -1.869,1.639 c -1.008,0 -1.806,-0.651 -2.037,-1.659 l -3.275,0.756 c 0.714,2.499 3.066,3.779 5.543,3.779 c 2.625,0 5.228,-1.344 5.228,-4.199 c 0,-1.638 -1.05,-2.856 -2.498,-3.234 l 0,-0.062 c 1.68,-0.399 2.855,-1.785 2.855,-3.443 c 0,-3.255 -2.877,-4.725 -5.606,-4.725" /> \ No newline at end of file diff --git a/ground/openpilotgcs/src/plugins/setupwizard/resources/sensor-shapes.svg b/ground/openpilotgcs/src/plugins/setupwizard/resources/sensor-shapes.svg index 56b254b81..6754e0cd2 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/resources/sensor-shapes.svg +++ b/ground/openpilotgcs/src/plugins/setupwizard/resources/sensor-shapes.svg @@ -14,7 +14,7 @@ height="1201.2025" id="svg2" version="1.1" - inkscape:version="0.48.5 r10040" + inkscape:version="0.91 r13725" sodipodi:docname="sensor-shapes.svg" inkscape:export-filename="/home/laurent/Images/sensors_all.png" inkscape:export-xdpi="113.10629" @@ -51,7 +51,7 @@ inkscape:collect="always" id="linearGradient5763"> - - - - - - - - - @@ -2763,6 +2703,136 @@ id="path2248" inkscape:connector-curvature="0" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id="flowPara4504" /> value("photo").toString().toLatin1()); photo.loadFromData(imageData, "PNG"); } else { - photo.load(":/core/images/openpilot_logo_500.png"); + photo.load(":/core/images/librepilot_logo_500.png"); } m_photoItem = ui->templateImage->scene()->addPixmap(photo); ui->templateImage->setSceneRect(ui->templateImage->scene()->itemsBoundingRect()); diff --git a/ground/openpilotgcs/src/plugins/welcome/qml/SitesPanel.qml b/ground/openpilotgcs/src/plugins/welcome/qml/SitesPanel.qml index 747959be9..67230b3bd 100644 --- a/ground/openpilotgcs/src/plugins/welcome/qml/SitesPanel.qml +++ b/ground/openpilotgcs/src/plugins/welcome/qml/SitesPanel.qml @@ -21,12 +21,12 @@ Item { ListModel { id: sitesModel - ListElement { link: "http://www.openpilot.org" } + ListElement { link: "http://www.librepilot.org" } ListElement { link: "http://wiki.openpilot.org" } ListElement { link: "http://www.openpilot.org/hardware/get-hardware/" } - ListElement { link: "http://forums.openpilot.org" } - ListElement { link: "http://git.openpilot.org" } - ListElement { link: "http://progress.openpilot.org" } + ListElement { link: "http://forum.librepilot.org" } + ListElement { link: "http://github.com/librepilot" } + ListElement { link: "http://github.com/librepilot/LibrePilot/issues" } function title(index){ if (title["text"] === undefined) { title.text = [ diff --git a/ground/openpilotgcs/src/plugins/welcome/qml/images/bttn-export-template-off.png b/ground/openpilotgcs/src/plugins/welcome/qml/images/bttn-export-template-off.png new file mode 100644 index 000000000..72b6ba971 Binary files /dev/null and b/ground/openpilotgcs/src/plugins/welcome/qml/images/bttn-export-template-off.png differ diff --git a/ground/openpilotgcs/src/plugins/welcome/qml/images/bttn-export-template-on.png b/ground/openpilotgcs/src/plugins/welcome/qml/images/bttn-export-template-on.png new file mode 100644 index 000000000..f2f3f0051 Binary files /dev/null and b/ground/openpilotgcs/src/plugins/welcome/qml/images/bttn-export-template-on.png differ diff --git a/ground/openpilotgcs/src/plugins/welcome/qml/images/bttn-txwizard-off.png b/ground/openpilotgcs/src/plugins/welcome/qml/images/bttn-txwizard-off.png index bb0aab304..61570522e 100644 Binary files a/ground/openpilotgcs/src/plugins/welcome/qml/images/bttn-txwizard-off.png and b/ground/openpilotgcs/src/plugins/welcome/qml/images/bttn-txwizard-off.png differ diff --git a/ground/openpilotgcs/src/plugins/welcome/qml/images/bttn-txwizard-on.png b/ground/openpilotgcs/src/plugins/welcome/qml/images/bttn-txwizard-on.png index 98eecd4ef..2e8806e0e 100644 Binary files a/ground/openpilotgcs/src/plugins/welcome/qml/images/bttn-txwizard-on.png and b/ground/openpilotgcs/src/plugins/welcome/qml/images/bttn-txwizard-on.png differ diff --git a/ground/openpilotgcs/src/plugins/welcome/qml/images/bttn-vehwizard-off.png b/ground/openpilotgcs/src/plugins/welcome/qml/images/bttn-vehwizard-off.png index 247c0b9a2..a97119848 100644 Binary files a/ground/openpilotgcs/src/plugins/welcome/qml/images/bttn-vehwizard-off.png and b/ground/openpilotgcs/src/plugins/welcome/qml/images/bttn-vehwizard-off.png differ diff --git a/ground/openpilotgcs/src/plugins/welcome/qml/images/bttn-vehwizard-on.png b/ground/openpilotgcs/src/plugins/welcome/qml/images/bttn-vehwizard-on.png index 720e4348d..8967c2630 100644 Binary files a/ground/openpilotgcs/src/plugins/welcome/qml/images/bttn-vehwizard-on.png and b/ground/openpilotgcs/src/plugins/welcome/qml/images/bttn-vehwizard-on.png differ diff --git a/ground/openpilotgcs/src/plugins/welcome/qml/images/welcome-bg.png b/ground/openpilotgcs/src/plugins/welcome/qml/images/welcome-bg.png deleted file mode 100644 index c3eb66107..000000000 Binary files a/ground/openpilotgcs/src/plugins/welcome/qml/images/welcome-bg.png and /dev/null differ diff --git a/ground/openpilotgcs/src/plugins/welcome/qml/images/welcome-lp-bg.png b/ground/openpilotgcs/src/plugins/welcome/qml/images/welcome-lp-bg.png new file mode 100644 index 000000000..83110bde7 Binary files /dev/null and b/ground/openpilotgcs/src/plugins/welcome/qml/images/welcome-lp-bg.png differ diff --git a/ground/openpilotgcs/src/plugins/welcome/qml/images/welcome-lp-logo.png b/ground/openpilotgcs/src/plugins/welcome/qml/images/welcome-lp-logo.png new file mode 100644 index 000000000..768c8c5a7 Binary files /dev/null and b/ground/openpilotgcs/src/plugins/welcome/qml/images/welcome-lp-logo.png differ diff --git a/ground/openpilotgcs/src/plugins/welcome/qml/images/welcome-op-bg.png b/ground/openpilotgcs/src/plugins/welcome/qml/images/welcome-op-bg.png deleted file mode 100644 index 3c010a7fa..000000000 Binary files a/ground/openpilotgcs/src/plugins/welcome/qml/images/welcome-op-bg.png and /dev/null differ diff --git a/ground/openpilotgcs/src/plugins/welcome/qml/images/welcome-op-logo.png b/ground/openpilotgcs/src/plugins/welcome/qml/images/welcome-op-logo.png deleted file mode 100644 index 18181746c..000000000 Binary files a/ground/openpilotgcs/src/plugins/welcome/qml/images/welcome-op-logo.png and /dev/null differ diff --git a/ground/openpilotgcs/src/plugins/welcome/qml/images/wizard-off.png b/ground/openpilotgcs/src/plugins/welcome/qml/images/wizard-off.png index 6e00e1526..7c199a767 100644 Binary files a/ground/openpilotgcs/src/plugins/welcome/qml/images/wizard-off.png and b/ground/openpilotgcs/src/plugins/welcome/qml/images/wizard-off.png differ diff --git a/ground/openpilotgcs/src/plugins/welcome/qml/images/wizard-on.png b/ground/openpilotgcs/src/plugins/welcome/qml/images/wizard-on.png index 0f85087b3..d8798469a 100644 Binary files a/ground/openpilotgcs/src/plugins/welcome/qml/images/wizard-on.png and b/ground/openpilotgcs/src/plugins/welcome/qml/images/wizard-on.png differ diff --git a/ground/openpilotgcs/src/plugins/welcome/qml/main.qml b/ground/openpilotgcs/src/plugins/welcome/qml/main.qml index 7c4d64093..55a363766 100644 --- a/ground/openpilotgcs/src/plugins/welcome/qml/main.qml +++ b/ground/openpilotgcs/src/plugins/welcome/qml/main.qml @@ -5,11 +5,11 @@ Rectangle { width: 1024 height: 768 - color: "#272727" + color: "#fefefe" Image { id: bg - source: "images/welcome-op-bg.png" + source: "images/welcome-lp-bg.png" anchors.bottom: parent.bottom anchors.right: parent.right @@ -43,7 +43,7 @@ Rectangle { spacing: 16 Image { - source: "images/welcome-op-logo.png" + source: "images/welcome-lp-logo.png" anchors.verticalCenter: parent.verticalCenter anchors.verticalCenterOffset: -2 //it looks better aligned to icons grid @@ -128,7 +128,7 @@ Rectangle { } Text { id: textOpVersionAvailable - color: "#5fcf07" + color: "#feb103" text: welcomePlugin.newVersionText font.bold: true font.underline: true diff --git a/ground/openpilotgcs/src/plugins/welcome/welcome.qrc b/ground/openpilotgcs/src/plugins/welcome/welcome.qrc index 6ed782f47..de0111391 100644 --- a/ground/openpilotgcs/src/plugins/welcome/welcome.qrc +++ b/ground/openpilotgcs/src/plugins/welcome/welcome.qrc @@ -7,11 +7,10 @@ qml/NewsPanel.qml qml/ScrollDecorator.qml qml/images/welcome-news-bg.png - qml/images/welcome-op-logo.png + qml/images/welcome-lp-logo.png qml/images/button-label.png qml/images/button-label-bottom.png - qml/images/welcome-op-bg.png - qml/images/welcome-bg.png + qml/images/welcome-lp-bg.png qml/images/flightdata-on.png qml/images/flightdata-off.png qml/images/config-on.png diff --git a/ground/openpilotgcs/src/plugins/welcome/welcomemode.cpp b/ground/openpilotgcs/src/plugins/welcome/welcomemode.cpp index 5fab6684e..336b69aa8 100644 --- a/ground/openpilotgcs/src/plugins/welcome/welcomemode.cpp +++ b/ground/openpilotgcs/src/plugins/welcome/welcomemode.cpp @@ -89,7 +89,7 @@ WelcomeMode::WelcomeMode() : // This will delete the network access manager instance when we're done connect(networkAccessManager, SIGNAL(finished(QNetworkReply *)), networkAccessManager, SLOT(deleteLater())); - networkAccessManager->get(QNetworkRequest(QUrl("http://www.openpilot.org/opver"))); + networkAccessManager->get(QNetworkRequest(QUrl("http://www.librepilot.org/opver"))); } else { // No network, can delete this now as we don't need it. delete networkAccessManager; @@ -109,7 +109,7 @@ QString WelcomeMode::name() const QIcon WelcomeMode::icon() const { - return QIcon(QLatin1String(":/core/images/openpiloticon.png")); + return QIcon(QLatin1String(":/core/images/librepiloticon.png")); } int WelcomeMode::priority() const diff --git a/ground/openpilotgcs/src/plugins/welcome/welcomemode.h b/ground/openpilotgcs/src/plugins/welcome/welcomemode.h index 3f483f449..a77ad8415 100644 --- a/ground/openpilotgcs/src/plugins/welcome/welcomemode.h +++ b/ground/openpilotgcs/src/plugins/welcome/welcomemode.h @@ -62,7 +62,7 @@ public: void activated(); QString contextHelpId() const { - return QLatin1String("OpenPilot GCS"); + return QLatin1String("LibrePilot GCS"); } void setPriority(int priority) { @@ -70,7 +70,7 @@ public: } QString versionString() const { - return tr("OpenPilot GCS Version: %1 ").arg(VersionInfo::tagOrHash8()); + return tr("LibrePilot GCS Version: %1 ").arg(VersionInfo::tagOrHash8()); } QString newVersionText() const {