summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordeva <deva>2006-05-04 14:19:37 +0000
committerdeva <deva>2006-05-04 14:19:37 +0000
commit60c43b0a065175a49ae0aa2b10280e893479889b (patch)
treeed007e88dbc34d03b016f19a164bc0126af6f76a
parentd5da69b6ed984df4c60c3a7abfa8119db34eab2b (diff)
*** empty log message ***
-rw-r--r--client/Makefile.am2
-rw-r--r--client/control.cc29
-rw-r--r--client/control.h5
-rw-r--r--client/decoder.cc2
-rw-r--r--client/icons.cc147
-rw-r--r--client/icons.h48
-rw-r--r--client/mainwindow.cc140
-rw-r--r--client/mainwindow.h30
-rw-r--r--client/yuv_draw.cc29
-rw-r--r--pixmaps/freeze.svg28
-rw-r--r--pixmaps/record.svg26
-rw-r--r--pixmaps/snapshot.svg22
-rw-r--r--pixmaps/stop.svg122
-rw-r--r--pixmaps/unfreeze.svg22
14 files changed, 412 insertions, 240 deletions
diff --git a/client/Makefile.am b/client/Makefile.am
index b7d3a74..4a49d35 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -15,6 +15,7 @@ miav_client_SOURCES = $(shell ../tools/MocList cc ) \
decoder.cc \
dv1394.cc \
dvfile.cc \
+ icons.cc \
networksender.cc \
historyframe.cc \
historywidget.cc \
@@ -37,6 +38,7 @@ EXTRA_DIST = \
decoder.h \
dv1394.h \
dvfile.h \
+ icons.h \
networksender.h \
historyframe.h \
historywidget.h \
diff --git a/client/control.cc b/client/control.cc
index 6dd4b4b..b6495d2 100644
--- a/client/control.cc
+++ b/client/control.cc
@@ -31,6 +31,7 @@ Control::Control()
// Initialize control state
frozen = false;
recording = false;
+ muted = false;
cpr = "";
}
@@ -86,14 +87,21 @@ void Control::stop()
recording = false;
mutex.unlock();
}
-/*
-void Control::takeScreenshot()
+
+void Control::mute()
{
mutex.lock();
- screenshot = true;
+ muted = true;
mutex.unlock();
}
-*/
+
+void Control::unmute()
+{
+ mutex.lock();
+ muted = false;
+ mutex.unlock();
+}
+
bool Control::isFrozen()
{
bool isfrozen;
@@ -111,17 +119,16 @@ bool Control::isRecording()
mutex.unlock();
return isrecording;
}
-/*
-bool Control::isScreenshot()
+
+bool Control::isMuted()
{
- bool isscreenshot;
+ bool ismuted;
mutex.lock();
- isscreenshot = screenshot;
- screenshot = false;
+ ismuted = muted;
mutex.unlock();
- return isscreenshot;
+ return ismuted;
}
-*/
+
// Global control object
Control MIaV::control;
diff --git a/client/control.h b/client/control.h
index 1563f3d..f6b4599 100644
--- a/client/control.h
+++ b/client/control.h
@@ -48,8 +48,12 @@ public:
void record();
void stop();
+ void mute();
+ void unmute();
+
bool isFrozen();
bool isRecording();
+ bool isMuted();
// bool isScreenshot();
// void takeScreenshot();
@@ -57,6 +61,7 @@ public:
private:
bool frozen;
bool recording;
+ bool muted;
// bool screenshot;
QMutex mutex;
diff --git a/client/decoder.cc b/client/decoder.cc
index 1a85db7..5421e16 100644
--- a/client/decoder.cc
+++ b/client/decoder.cc
@@ -28,7 +28,7 @@
#include "info.h"
-//#define READ_DV_FROM_FILE
+#define READ_DV_FROM_FILE
#include "dv.h"
#ifdef READ_DV_FROM_FILE
diff --git a/client/icons.cc b/client/icons.cc
new file mode 100644
index 0000000..8d6f804
--- /dev/null
+++ b/client/icons.cc
@@ -0,0 +1,147 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/***************************************************************************
+ * icons.cc
+ *
+ * Thu May 4 15:47:51 CEST 2006
+ * Copyright 2006 Bent Bisballe Nyeng
+ * deva@aasimon.org
+ ****************************************************************************/
+
+/*
+ * This file is part of MIaV.
+ *
+ * MIaV is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MIaV is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with MIaV; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+#include "icons.h"
+
+/**
+ * The image files
+ */
+#define PIXMAP_MUTE PIXMAPS"/mute"
+#define PIXMAP_UNMUTE PIXMAPS"/unmute"
+
+#define PIXMAP_RECORD PIXMAPS"/record"
+#define PIXMAP_STOP PIXMAPS"/stop"
+
+#define PIXMAP_FREEZE PIXMAPS"/freeze"
+#define PIXMAP_UNFREEZE PIXMAPS"/unfreeze"
+
+#define PIXMAP_CPR PIXMAPS"/cpr"
+#define PIXMAP_CLEAR PIXMAPS"/clear"
+
+#define PIXMAP_SNAPSHOT PIXMAPS"/snapshot"
+#define PIXMAP_DUMMY PIXMAPS"/dummy"
+#define PIXMAP_LOGO_SMALL PIXMAPS"/miav-logo"
+
+//#define QT_SVG
+#define CAIRO_SVG
+
+#ifdef QT_SVG
+#include <QSvgRenderer>
+#include <QPainter>
+#endif /*QT_SVG*/
+
+#ifdef CAIRO_SVG
+#include "svgloader.h"
+#endif /*CAIRO_SVG*/
+
+#include <QApplication>
+#include <QDesktopWidget>
+#include <QX11Info>
+
+QPixmap *loadIcon(char* fname)
+{
+ QPixmap *pixmap;
+
+ int dpix = qApp->desktop()->x11Info().appDpiX();
+ int dpiy = qApp->desktop()->x11Info().appDpiY();
+
+ printf("DpiX: %d DpiY: %d\n", dpix, dpiy);
+
+#ifdef CAIRO_SVG
+ SVGLoader svg;
+ QString filename = fname;
+ filename.append(".svg");
+ double dpi = (double)(dpix + dpiy) / 2.0;
+ pixmap = new QPixmap(QPixmap::fromImage(svg.load(filename, 0, 0, 14.0 / dpi, 14.0 / dpi)));
+#endif/*CAIRO_SVG*/
+
+#ifdef QT_SVG
+ QSvgRenderer svgrenderer;
+ QPainter painter;
+
+ pixmap = new QPixmap(w, h);
+ painter.begin(pixmap);
+ QString filename = fname;
+ svgrenderer.load(filename . ".svg");
+ svgrenderer.render(&painter);
+ painter.end();
+#endif/*QT_SVG*/
+
+#ifndef QT_SVG
+#ifndef CAIRO_SVG
+ // Load as png
+ QString filename = fname;
+ filename.append(".png");
+ pixmap = new QPixmap(filename);
+ Qt::AspectRatioMode aspect = pixmap.width()<pixmap.height()?
+ Qt::KeepAspectRatio:Qt::KeepAspectRatioByExpanding;
+ double dpi = (double)(dpix + dpiy) / 2.0;
+ *pixmap = pixmap->scaled((int)(dpi / 1.5),(int)(dpi / 1.5), aspect, Qt::SmoothTransformation);
+#endif/*CAIRO_SVG*/
+#endif/*QT_SVG*/
+
+ return pixmap;
+}
+
+
+bool Icons::loadIcons()
+{
+ cpr = loadIcon(PIXMAP_CPR);
+ record = loadIcon(PIXMAP_RECORD);
+ stop = loadIcon(PIXMAP_STOP);
+ snapshot = loadIcon(PIXMAP_SNAPSHOT);
+ freeze = loadIcon(PIXMAP_FREEZE);
+ unfreeze = loadIcon(PIXMAP_UNFREEZE);
+ mute = loadIcon(PIXMAP_MUTE);
+ unmute = loadIcon(PIXMAP_UNMUTE);
+ clear = loadIcon(PIXMAP_CLEAR);
+ return true;
+}
+
+bool Icons::unloadIcons()
+{
+ delete cpr;
+ delete record;
+ delete stop;
+ delete snapshot;
+ delete freeze;
+ delete unfreeze;
+ delete mute;
+ delete unmute;
+ delete clear;
+ return true;
+}
+
+// The pixmaps
+QPixmap *Icons::cpr;
+QPixmap *Icons::record;
+QPixmap *Icons::stop;
+QPixmap *Icons::snapshot;
+QPixmap *Icons::freeze;
+QPixmap *Icons::unfreeze;
+QPixmap *Icons::mute;
+QPixmap *Icons::unmute;
+QPixmap *Icons::clear;
diff --git a/client/icons.h b/client/icons.h
new file mode 100644
index 0000000..33bc5ef
--- /dev/null
+++ b/client/icons.h
@@ -0,0 +1,48 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/***************************************************************************
+ * icons.h
+ *
+ * Thu May 4 15:47:51 CEST 2006
+ * Copyright 2006 Bent Bisballe Nyeng
+ * deva@aasimon.org
+ ****************************************************************************/
+
+/*
+ * This file is part of MIaV.
+ *
+ * MIaV is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MIaV is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with MIaV; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+#ifndef __MIAV_ICONS_H__
+#define __MIAV_ICONS_H__
+
+#include <QPixmap>
+
+namespace Icons {
+ bool loadIcons();
+ bool unloadIcons();
+
+ // Pixmaps
+ extern QPixmap *cpr;
+ extern QPixmap *record;
+ extern QPixmap *stop;
+ extern QPixmap *snapshot;
+ extern QPixmap *freeze;
+ extern QPixmap *unfreeze;
+ extern QPixmap *mute;
+ extern QPixmap *unmute;
+ extern QPixmap *clear;
+};
+
+#endif/*__MIAV_ICONS_H__*/
diff --git a/client/mainwindow.cc b/client/mainwindow.cc
index 645fef4..3680afc 100644
--- a/client/mainwindow.cc
+++ b/client/mainwindow.cc
@@ -34,69 +34,23 @@
#include "historywidget.h"
-#include <QX11Info>
-#include <QMoveEvent>
+#include <QStatusBar>
#include "control.h"
-#include <QSvgRenderer>
-#include <QPainter>
-#include "svgloader.h"
+#include "icons.h"
-//#define CAIRO_SVG
-
-QPixmap MainWindow::loadIcon(char* fname)
+QPushButton *MainWindow::createButton(QPixmap *pixmap)
{
- QSvgRenderer svgrenderer;
- QPainter painter;
-
- int dpix = x11Info().appDpiX();
- int dpiy = x11Info().appDpiY();
-
- printf("DpiX: %d DpiY: %d\n", dpix, dpiy);
-
-#ifdef CAIRO_SVG
- QPixmap pixmap;
- SVGLoader svg;
- QString filename = fname;
- filename.append(".svg");
- double dpi = (double)(dpix + dpiy) / 2.0;
- pixmap = QPixmap::fromImage(svg.load(filename, 0, 0, 12.0 / dpi, 12.0 / dpi));
- return pixmap;
-#else/*CAIRO_SVG*/
-#ifdef QT_SVG
- QPixmap pixmap(w, h);
- painter.begin(&pixmap);
- QString filename = fname;
- svgrenderer.load(filename . ".svg");
- svgrenderer.render(&painter);
- painter.end();
- return pixmap;
-#else/*QT_SVG*/
- // Load as png
- QString filename = fname;
- filename.append(".png");
- QPixmap pixmap(filename);
- Qt::AspectRatioMode aspect = pixmap.width()<pixmap.height()?
- Qt::KeepAspectRatio:Qt::KeepAspectRatioByExpanding;
- pixmap = pixmap.scaled((int)((double)dpix / 1.5),(int)((double)dpix / 1.5), aspect, Qt::SmoothTransformation);
- return pixmap;
-#endif/*QT_SVG*/
-#endif/*CAIRO_SVG*/
-}
-
-QPushButton *MainWindow::createButton(char* icon)
-{
- QPixmap p = loadIcon(icon);
+ // QPixmap p = loadIcon(icon);
QPushButton *btn = new QPushButton();
- btn->setIconSize(QSize(p.width(), p.height()));
- btn->setIcon(p);
+ btn->setIconSize(QSize(pixmap->width(), pixmap->height()));
+ btn->setIcon(*pixmap);
return btn;
}
-#include <QApplication>
-MainWindow::MainWindow(Decoder *d): QWidget()
+MainWindow::MainWindow(Decoder *d)
{
decoder = d;
MIaV::info->log("Starting MIaV v. %s.", VERSION);
@@ -112,48 +66,57 @@ MainWindow::MainWindow(Decoder *d): QWidget()
*/
// Create layout
- QGridLayout *layout = new QGridLayout(this);
- setLayout(layout);
+ QGridLayout *outerlayout = new QGridLayout(this);
+ outerlayout->setMargin(0);
+ setLayout(outerlayout);
+ QGridLayout *layout = new QGridLayout();
+ outerlayout->addLayout(layout, 0,0,1,1);
+ outerlayout->setRowStretch(0, 100);
+ outerlayout->setRowStretch(1, 1);
// Create the videoarea
video = new VideoWidget();
layout->addWidget(video, 0,0, 1,4);
- // Create the control buttons
- QPushButton *button;
+ // Load the icons
+ Icons::loadIcons();
- button = createButton(PIXMAP_CPR);
- layout->addWidget(button, 1,3, 1,1);
- connect(button, SIGNAL(clicked()), this, SLOT(cpr_clicked()));
+ // Create the control buttons
+ btn_cpr = createButton(Icons::cpr);
+ layout->addWidget(btn_cpr, 1,3, 1,1);
+ connect(btn_cpr, SIGNAL(clicked()), this, SLOT(cpr_clicked()));
- button = createButton(PIXMAP_RECORD);
- layout->addWidget(button, 2,0, 1,1);
- connect(button, SIGNAL(clicked()), this, SLOT(record_clicked()));
+ btn_record = createButton(Icons::record);
+ layout->addWidget(btn_record, 2,0, 1,1);
+ connect(btn_record, SIGNAL(clicked()), this, SLOT(record_clicked()));
- button = createButton(PIXMAP_SNAPSHOT);
- layout->addWidget(button, 2,1, 1,1);
- connect(button, SIGNAL(clicked()), this, SLOT(snapshot_clicked()));
+ btn_snapshot = createButton(Icons::snapshot);
+ layout->addWidget(btn_snapshot, 2,1, 1,1);
+ connect(btn_snapshot, SIGNAL(clicked()), this, SLOT(snapshot_clicked()));
- button = createButton(PIXMAP_FREEZE);
- layout->addWidget(button, 2,2, 1,1);
- connect(button, SIGNAL(clicked()), this, SLOT(freeze_clicked()));
+ btn_freeze = createButton(Icons::freeze);
+ layout->addWidget(btn_freeze, 2,2, 1,1);
+ connect(btn_freeze, SIGNAL(clicked()), this, SLOT(freeze_clicked()));
- button = createButton(PIXMAP_MUTE);
- layout->addWidget(button, 2,3, 1,1);
- connect(button, SIGNAL(clicked()), this, SLOT(mute_clicked()));
+ btn_mute = createButton(Icons::mute);
+ layout->addWidget(btn_mute, 2,3, 1,1);
+ connect(btn_mute, SIGNAL(clicked()), this, SLOT(mute_clicked()));
- button = createButton(PIXMAP_CLEAR);
- layout->addWidget(button, 2,4, 1,1);
- connect(button, SIGNAL(clicked()), this, SLOT(clear_clicked()));
+ btn_clear = createButton(Icons::clear);
+ layout->addWidget(btn_clear, 2,4, 1,1);
+ connect(btn_clear, SIGNAL(clicked()), this, SLOT(clear_clicked()));
// Create history bar
history = new HistoryFrame();
layout->addWidget(history, 0,4, 2,1);
// Create statusbar
-
+ QStatusBar *statusbar = new QStatusBar(this);
+ outerlayout->addWidget(statusbar, 1,0, 1,1);
+ statusbar->showMessage("Ready!");
+
show();
- // setWindowState(Qt::WindowFullScreen);
+ // setWindowState(Qt::WindowFullScreen);
resize(800, 600);
MIaV::info->log("MIaV is ready.");
@@ -163,6 +126,8 @@ MainWindow::~MainWindow()
{
MIaV::info->log("MIaV is shutting down.");
+ Icons::unloadIcons();
+
MIaV::info->log("MIaV is shut down.");
}
@@ -183,10 +148,22 @@ void MainWindow::cpr_clicked()
void MainWindow::record_clicked()
{
+ if(MIaV::control.isRecording()) {
+ MIaV::control.stop();
+ btn_record->setIcon(*Icons::record);
+ } else {
+ MIaV::control.record();
+ btn_record->setIcon(*Icons::stop);
+ }
+
}
void MainWindow::snapshot_clicked()
{
+ if(MIaV::control.isFrozen()) {
+ btn_freeze->setIcon(*Icons::freeze);
+ }
+
MIaV::control.shoot();
QImage screenshot(720, 576, QImage::Format_RGB32);
@@ -202,12 +179,21 @@ void MainWindow::freeze_clicked()
{
if(MIaV::control.isFrozen()) {
MIaV::control.unfreeze();
+ btn_freeze->setIcon(*Icons::freeze);
} else {
MIaV::control.freeze();
+ btn_freeze->setIcon(*Icons::unfreeze);
}
}
void MainWindow::mute_clicked()
{
+ if(MIaV::control.isMuted()) {
+ MIaV::control.unmute();
+ btn_mute->setIcon(*Icons::mute);
+ } else {
+ MIaV::control.mute();
+ btn_mute->setIcon(*Icons::unmute);
+ }
}
diff --git a/client/mainwindow.h b/client/mainwindow.h
index 762b7f3..742351d 100644
--- a/client/mainwindow.h
+++ b/client/mainwindow.h
@@ -35,25 +35,6 @@
#include "decoder.h"
-/**
- * Images
- */
-#define PIXMAP_MUTE PIXMAPS"/mute"
-#define PIXMAP_UNMUTE PIXMAPS"/unmute"
-
-#define PIXMAP_RECORD PIXMAPS"/record"
-#define PIXMAP_STOP PIXMAPS"/stop"
-
-#define PIXMAP_FREEZE PIXMAPS"/freeze"
-#define PIXMAP_UNFREEZE PIXMAPS"/unfreeze"
-
-#define PIXMAP_CPR PIXMAPS"/cpr"
-#define PIXMAP_CLEAR PIXMAPS"/clear"
-
-#define PIXMAP_SNAPSHOT PIXMAPS"/snapshot"
-#define PIXMAP_DUMMY PIXMAPS"/dummy"
-#define PIXMAP_LOGO_SMALL PIXMAPS"/miav-logo"
-
class MainWindow : public QWidget
{
Q_OBJECT
@@ -78,8 +59,15 @@ private:
HistoryFrame *history;
VideoWidget *video;
- QPushButton *createButton(char* icon);
- QPixmap loadIcon(char* fname);
+ QPushButton *createButton(QPixmap *pixmap);
+
+ // Buttons
+ QPushButton *btn_cpr;
+ QPushButton *btn_record;
+ QPushButton *btn_snapshot;
+ QPushButton *btn_freeze;
+ QPushButton *btn_mute;
+ QPushButton *btn_clear;
};
#endif/*__MIAV_MAINWINDOW_H__*/
diff --git a/client/yuv_draw.cc b/client/yuv_draw.cc
index 7cc2f4c..a4ffc60 100644
--- a/client/yuv_draw.cc
+++ b/client/yuv_draw.cc
@@ -27,29 +27,9 @@
#include "yuv_draw.h"
#include <string.h>
-
+#include "icons.h"
#define TEXT_MARGIN 10
-#include "mainwindow.h"
-static QImage *loadIcon( char *name, int height )
-{
- QImage scaled;
- QImage *img;
-
- img = new QImage();
- img->load( name );
-
- int h = height;
- int w = (int)((float)img->width() / (float)(img->height() / (float)h));
-
- scaled = img->scaled(w, h, Qt::KeepAspectRatio, Qt::SmoothTransformation);
- delete img;
- img = new QImage(scaled);
-
- return img;
-}
-
-
YUVDraw::YUVDraw()
{
overlay = NULL;
@@ -70,12 +50,15 @@ YUVDraw::YUVDraw()
}
}
- img_muted = loadIcon(PIXMAP_MUTE, ICON_HEIGHT);
- img_unmuted = loadIcon(PIXMAP_UNMUTE, ICON_HEIGHT);
+ img_muted = new QImage(Icons::mute->toImage());
+ img_unmuted = new QImage(Icons::unmute->toImage());
}
YUVDraw::~YUVDraw()
{
+ delete img_muted;
+ delete img_unmuted;
+
delete top_pixmap;
delete bottom_pixmap;
}
diff --git a/pixmaps/freeze.svg b/pixmaps/freeze.svg
index 9c5a854..79990c1 100644
--- a/pixmaps/freeze.svg
+++ b/pixmaps/freeze.svg
@@ -11,7 +11,7 @@
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
inkscape:version="0.43"
sodipodi:docname="freeze.svg"
- sodipodi:docbase="/home/deva/docs/c/miav/pixmaps"
+ sodipodi:docbase="/home/deva/docs/miav/pixmaps"
xml:space="preserve"
height="400pt"
width="400pt"
@@ -437,7 +437,7 @@
cx="241.86195"
id="radialGradient617"
xlink:href="#linearGradient3280"
- gradientTransform="matrix(1.223982,0,0,0.817005,-50.6875,-149.6426)"
+ gradientTransform="matrix(1.223982,0,0,0.817005,-50.6875,-119.6426)"
gradientUnits="userSpaceOnUse" />
@@ -780,7 +780,7 @@
x2="369.22589"
y1="348.19913"
x1="114.63815"
- gradientTransform="matrix(1.264328,0,0,0.790934,-51.04607,-149.6426)"
+ gradientTransform="matrix(1.264328,0,0,0.790934,-51.04607,-119.6426)"
id="linearGradient2518"
xlink:href="#linearGradient2512"
inkscape:collect="always" />
@@ -860,7 +860,7 @@
<rect
ry="8.75"
- y="90.219528"
+ y="120.21941"
x="64.3125"
height="17.5"
width="37.5"
@@ -871,7 +871,7 @@
<rect
ry="20"
- y="97.719559"
+ y="127.71944"
x="26.8125"
height="297.5"
width="447.5"
@@ -883,7 +883,7 @@
<rect
rx="16.638657"
ry="16.638657"
- y="122.71953"
+ y="152.71939"
x="51.453979"
height="247.5"
width="397.50003"
@@ -894,7 +894,7 @@
<rect
rx="7.5"
ry="7.5"
- y="135.7029"
+ y="165.70276"
x="382.7644"
height="32.500061"
width="50.000031"
@@ -904,24 +904,24 @@
<path
id="path633"
- d="M 421.99406,142.33878 L 421.99406,161.92618"
+ d="M 421.99406,172.33866 L 421.99406,191.92606"
style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#d9d9ff;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
<path
id="path634"
- d="M 412.20036,142.33878 L 412.20036,161.92618"
+ d="M 412.20036,172.33866 L 412.20036,191.92606"
style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#d9d9ff;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
<path
id="path632"
- d="M 401.31846,142.33878 L 401.31846,161.92618"
+ d="M 401.31846,172.33866 L 401.31846,191.92606"
style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#d9d9ff;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
<g
- transform="matrix(1.436363,0,0,1.436363,-92.45767,-334.8317)"
+ transform="matrix(1.436363,0,0,1.436363,-92.45767,-304.8317)"
id="g684">
<path
transform="translate(10,-10.00003)"
@@ -1016,7 +1016,7 @@
<g
- transform="matrix(1.3045,0,0,1.304498,-127.0911,-242.4719)"
+ transform="matrix(1.3045,0,0,1.304498,-127.0911,-212.4719)"
id="g707">
<rect
rx="7.5786743"
@@ -1070,7 +1070,7 @@
<g
- transform="translate(-50.82428,-149.6426)"
+ transform="translate(-50.82428,-119.6426)"
id="g1699">
<g
transform="matrix(1.236818,0,0,1,-351.6389,-121.8335)"
@@ -1227,6 +1227,6 @@
<path
id="path1902"
- d="M 391.4663,142.33878 L 391.4663,161.92618"
+ d="M 391.4663,172.33866 L 391.4663,191.92606"
style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#d9d9ff;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
</svg> \ No newline at end of file
diff --git a/pixmaps/record.svg b/pixmaps/record.svg
index 0498f99..7cb26bc 100644
--- a/pixmaps/record.svg
+++ b/pixmaps/record.svg
@@ -14,7 +14,7 @@
width="400pt"
height="400pt"
xml:space="preserve"
- sodipodi:docbase="/home/deva/docs/c/miav/pixmaps"
+ sodipodi:docbase="/home/deva/docs/miav/pixmaps"
sodipodi:docname="record.svg"
inkscape:version="0.43"
version="1.0"><metadata
@@ -73,7 +73,7 @@
r="314.01352"
fx="616.75238"
fy="306.11658"
- gradientTransform="matrix(0.631124,0,0,1.584476,-126.8023,-227.3986)"
+ gradientTransform="matrix(0.508363,0,0,1.279261,-54.49948,-129.922)"
gradientUnits="userSpaceOnUse" /><linearGradient
xlink:href="#linearGradient660"
id="linearGradient658"
@@ -86,11 +86,11 @@
id="base"
inkscape:zoom="1.5254743"
inkscape:cx="264.31608"
- inkscape:cy="245.30387"
+ inkscape:cy="248.71178"
inkscape:window-width="1272"
inkscape:window-height="972"
inkscape:window-x="0"
- inkscape:window-y="30"
+ inkscape:window-y="27"
inkscape:current-layer="svg602" /><path
sodipodi:type="arc"
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2.75;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
@@ -100,7 +100,7 @@
sodipodi:cy="477.36218"
sodipodi:rx="187.5"
sodipodi:ry="187.5"
- transform="matrix(1.315602,0,0,1.311203,-244.7227,-375.9552)" /><path
+ transform="matrix(1.0597,0,0,1.058628,-149.4829,-249.8624)" /><path
sodipodi:type="arc"
style="font-size:12px;fill:url(#radialGradient621);stroke-width:2.75"
id="path614"
@@ -109,7 +109,7 @@
sodipodi:cy="477.36218"
sodipodi:rx="187.5"
sodipodi:ry="187.5"
- transform="matrix(1.306666,0,0,1.306666,-242.1857,-373.7897)"
+ transform="matrix(1.052502,0,0,1.054965,-147.4393,-248.1141)"
sodipodi:start="0.85477765"
sodipodi:end="5.4121637" /><path
sodipodi:type="arc"
@@ -120,15 +120,15 @@
sodipodi:cy="477.36218"
sodipodi:rx="187.5"
sodipodi:ry="187.5"
- transform="matrix(1.306666,0,0,1.306666,-242.1858,-373.7897)"
+ transform="matrix(1.052502,0,0,1.054965,-147.4394,-248.1141)"
sodipodi:start="0.85174273"
sodipodi:end="5.4121637" /><path
- style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.22900002"
- d="M 306.83526,10.701398 C 330.81416,16.367998 355.84846,26.366398 371.53036,35.704198 C 423.84086,65.306798 446.95586,99.923398 463.77126,125.5775 C 489.30926,172.9202 496.29086,212.8167 497.21996,244.2516 C 496.38126,291.3942 490.26776,324.1309 464.40516,372.637 C 436.63906,422.0701 396.82356,450.7244 369.80806,465.4752 C 355.27266,473.624 331.28866,483.427 306.46496,489.6038 L 369.88496,391.9715 L 369.98496,106.2155 L 306.83526,10.701398 z "
+ style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:0.806429pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.22900002"
+ d="M 294.78999,62.313345 C 314.10468,66.888411 334.26949,74.960836 346.90105,82.499917 C 389.03649,106.40023 407.65531,134.34871 421.19991,155.06112 C 441.77043,193.2843 447.39403,225.49562 448.14241,250.87529 C 447.46684,288.93692 442.54249,315.36761 421.7105,354.53009 C 399.34528,394.44099 367.27441,417.57568 345.51377,429.48507 C 333.80569,436.06418 314.48688,443.97885 294.49171,448.96583 L 345.5757,370.14023 L 345.65625,139.42877 L 294.78999,62.313345 z "
id="path648"
sodipodi:nodetypes="cccccccccc" /><path
style="fill:url(#radialGradient630);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 306.83526,10.701398 C 330.81416,16.367998 355.84846,26.366398 371.53036,35.704198 C 423.84086,65.306798 446.95586,99.923398 463.77126,125.5775 C 489.30926,172.9202 496.29086,212.8167 497.21996,244.2516 C 496.38126,291.3942 490.26776,324.1309 464.40516,372.637 C 436.63906,422.0701 396.82356,450.7244 369.80806,465.4752 C 355.27266,473.624 331.28866,483.427 306.46496,489.6038 L 369.88496,391.9715 L 369.98496,106.2155 L 306.83526,10.701398 z "
+ d="M 294.78999,62.313345 C 314.10468,66.888411 334.26949,74.960836 346.90105,82.499917 C 389.03649,106.40023 407.65531,134.34871 421.19991,155.06112 C 441.77043,193.2843 447.39403,225.49562 448.14241,250.87529 C 447.46684,288.93692 442.54249,315.36761 421.7105,354.53009 C 399.34528,394.44099 367.27441,417.57568 345.51377,429.48507 C 333.80569,436.06418 314.48688,443.97885 294.49171,448.96583 L 345.5757,370.14023 L 345.65625,139.42877 L 294.78999,62.313345 z "
id="path651"
sodipodi:nodetypes="cccccccccc" /><path
sodipodi:type="arc"
@@ -139,7 +139,7 @@
sodipodi:cy="477.36218"
sodipodi:rx="187.5"
sodipodi:ry="187.5"
- transform="translate(-126.8023,-227.3986)" /><path
+ transform="matrix(0.805488,0,0,0.807372,-54.49948,-129.922)" /><path
sodipodi:type="arc"
style="fill:url(#linearGradient610);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2.75;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
id="path659"
@@ -148,7 +148,7 @@
sodipodi:cy="477.36218"
sodipodi:rx="187.5"
sodipodi:ry="187.5"
- transform="translate(-126.8023,-227.3986)" /><path
+ transform="matrix(0.805488,0,0,0.807372,-54.49948,-129.922)" /><path
sodipodi:type="arc"
style="fill:#cf635e;fill-opacity:0;fill-rule:evenodd;stroke:#000000;stroke-width:2.75;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
id="path634"
@@ -157,4 +157,4 @@
sodipodi:cy="477.36218"
sodipodi:rx="187.5"
sodipodi:ry="187.5"
- transform="matrix(1.315602,0,0,1.311203,-244.7227,-375.9552)" /></svg> \ No newline at end of file
+ transform="matrix(1.0597,0,0,1.058628,-149.4829,-249.8624)" /></svg> \ No newline at end of file
diff --git a/pixmaps/snapshot.svg b/pixmaps/snapshot.svg
index 2b751d6..6773caa 100644
--- a/pixmaps/snapshot.svg
+++ b/pixmaps/snapshot.svg
@@ -17,7 +17,7 @@
width="400pt"
height="400pt"
xml:space="preserve"
- sodipodi:docbase="/home/deva/docs/c/miav/pixmaps"
+ sodipodi:docbase="/home/deva/docs/miav/pixmaps"
sodipodi:docname="snapshot.svg"
inkscape:version="0.43"
version="1.0">
@@ -254,7 +254,7 @@
r="255.9723"
fx="245.05766"
fy="492.77755"
- gradientTransform="matrix(1.223982,0,0,0.817005,-50.6875,-141.6747)"
+ gradientTransform="matrix(1.223982,0,0,0.817005,-50.6875,-126.6747)"
gradientUnits="userSpaceOnUse" />
<radialGradient
@@ -351,7 +351,7 @@
inkscape:collect="always"
xlink:href="#linearGradient3215"
id="linearGradient3213"
- gradientTransform="matrix(1.264328,0,0,0.790934,-50.6875,-141.6747)"
+ gradientTransform="matrix(1.264328,0,0,0.790934,-50.6875,-126.6747)"
x1="96.322487"
y1="351.10611"
x2="383.87842"
@@ -366,7 +366,7 @@
inkscape:guide-bbox="true"
inkscape:zoom="1.567054"
inkscape:cx="249.57826"
- inkscape:cy="249.96282"
+ inkscape:cy="255.09286"
inkscape:window-width="1272"
inkscape:window-height="948"
inkscape:window-x="0"
@@ -420,7 +420,7 @@
width="37.5"
height="17.5"
x="64.3125"
- y="98.187469"
+ y="113.18747"
ry="8.75"
rx="8.75" />
@@ -430,7 +430,7 @@
width="447.5"
height="297.5"
x="26.8125"
- y="105.6875"
+ y="120.6875"
ry="20"
rx="20" />
@@ -440,13 +440,13 @@
width="397.50003"
height="247.5"
x="51.812508"
- y="130.68747"
+ y="145.68747"
ry="16.638657"
rx="16.638657" />
<g
id="g5503"
- transform="translate(-231.0247,-336.4489)">
+ transform="translate(-231.0247,-321.4489)">
<rect
style="font-size:12px;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#d9d9ff;stroke-width:2.125;stroke-opacity:1"
id="rect630"
@@ -481,7 +481,7 @@
<g
id="g684"
- transform="matrix(1.436363,0,0,1.436363,-93.42323,-327.5481)">
+ transform="matrix(1.436363,0,0,1.436363,-93.42323,-312.5481)">
<path
sodipodi:type="arc"
style="fill:#1b1b27;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3.875;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
@@ -568,7 +568,7 @@
<g
id="g707"
- transform="matrix(1.3045,0,0,1.304498,-127.1808,-233.2587)">
+ transform="matrix(1.3045,0,0,1.304498,-127.1808,-218.2587)">
<rect
style="font-size:12px;fill:#1b1b1b;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-opacity:1"
id="rect683"
@@ -616,7 +616,7 @@
<g
id="g714"
- transform="matrix(1.200678,0,0,1.200677,-103.3567,158.5649)">
+ transform="matrix(1.200678,0,0,1.200677,-103.3567,173.5649)">
<path
style="font-size:12px;fill:url(#radialGradient681);fill-opacity:0.62599996;fill-rule:evenodd;stroke:#ffffb3;stroke-width:1.14038897;stroke-opacity:0.64119999"
d="M 449.6407,124.5097 C 440.6828,94.60234 427.8845,57.32514 422.767,62.42604 C 418.4796,58.36854 403.6312,73.65754 398.3836,94.47414 C 400.2618,70.83604 400.2197,51.80424 392.4971,53.96184 C 388.4778,51.11574 357.576,63.93114 340.1154,78.58924 C 354.906,62.27554 381.2177,30.30024 375.8463,24.12044 C 373.2305,15.43064 347.5725,14.11084 319.0342,11.86984 C 353.2845,5.588838 375.0536,2.992738 372.8204,-4.209562 C 375.2745,-9.216262 350.8461,-34.49076 328.3379,-49.63136 C 356.7136,-38.85726 387.9694,-28.08306 393.3028,-33.89166 C 400.881,-36.98126 398.8583,-70.47266 395.8756,-90.14496 C 411.5541,-64.53706 430.1129,-41.69296 434.2703,-43.72306 C 439.8378,-42.12236 453.0861,-70.00196 459.6137,-85.90516 C 456.7754,-65.95226 452.0169,-29.41636 456.8594,-26.04636 C 458.6385,-19.82216 496.901,-44.92126 514.0415,-65.41396 C 498.2908,-44.18666 485.4204,-22.03846 486.9515,-10.02376 C 492.1275,-0.105562 498.2636,0.600238 514.0008,8.675638 C 497.0321,13.42134 476.2231,18.16674 474.6159,25.67624 C 476.6422,33.13964 483.4689,47.97314 500.8566,70.17674 C 480.4817,54.18214 459.1468,46.47884 454.1334,49.83064 C 445.9152,51.69204 445.3777,92.24634 449.6407,124.5097 z "
diff --git a/pixmaps/stop.svg b/pixmaps/stop.svg
index 9393ff1..0fbde54 100644
--- a/pixmaps/stop.svg
+++ b/pixmaps/stop.svg
@@ -11,12 +11,13 @@
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
id="svg602"
sodipodi:version="0.32"
- width="210mm"
- height="297mm"
+ width="400pt"
+ height="400pt"
xml:space="preserve"
- sodipodi:docbase="/home/tine/docs/Grafik/svg/MiaV-knapper"
- sodipodi:docname="StopRecord2.svg"
- inkscape:version="0.42.2"><metadata
+ sodipodi:docbase="/home/deva/docs/miav/pixmaps"
+ sodipodi:docname="stop.svg"
+ inkscape:version="0.43"
+ version="1.0"><metadata
id="metadata1514"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
@@ -165,7 +166,7 @@
id="linearGradient610"
x1="-0.37500072"
y1="0.51562363"
- x2="1.73437548"
+ x2="1.7343755"
y2="0.49999985" /><radialGradient
xlink:href="#linearGradient622"
id="radialGradient621"
@@ -180,14 +181,14 @@
id="radialGradient627"
cx="-0.93589729"
cy="0.515625"
- r="5.46153784"
+ r="5.4615378"
fx="-0.93589729"
fy="0.515625" /><radialGradient
xlink:href="#linearGradient631"
id="radialGradient630"
cx="-0.23076862"
cy="0.51562536"
- r="1.03893137"
+ r="1.0389314"
fx="-0.23076862"
fy="0.51562536" /><linearGradient
xlink:href="#linearGradient660"
@@ -212,68 +213,68 @@
id="linearGradient700"
x1="0.93999994"
y1="0.29308793"
- x2="2.79999971e-2"
+ x2="0.027999997"
y2="0.6034475" /><linearGradient
xlink:href="#linearGradient703"
id="linearGradient702"
- x1="-9.84830111e-2"
+ x1="-0.098483011"
y1="0.734375"
x2="0.6439395"
- y2="6.24999925e-2" /><linearGradient
+ y2="0.062499993" /><linearGradient
xlink:href="#linearGradient707"
id="linearGradient710"
x1="0.81999993"
y1="-0.15506883"
x2="0.18000007"
- y2="5.1725477e-2" /><linearGradient
+ y2="0.051725477" /><linearGradient
xlink:href="#linearGradient717"
id="linearGradient715"
x1="0.99599993"
y1="-0.56934309"
- x2="-1.63599992"
+ x2="-1.6359999"
y2="2.3275857" /><linearGradient
xlink:href="#linearGradient717"
id="linearGradient721"
- x1="1.11627901"
- y1="4.68749553e-2"
- x2="-3.48837338e-2"
+ x1="1.116279"
+ y1="0.046874955"
+ x2="-0.034883734"
y2="0.8046875" /><linearGradient
xlink:href="#linearGradient794"
id="linearGradient793"
x1="2126.3125"
- y1="216.76410"
+ y1="216.7641"
x2="1543.0366"
- y2="810.44789"
+ y2="810.44788"
gradientTransform="scale(1.008433,0.991638)"
gradientUnits="userSpaceOnUse" /><linearGradient
xlink:href="#linearGradient716"
id="linearGradient722"
x1="442.70984"
- y1="778.72875"
+ y1="778.72876"
x2="375.92123"
- y2="802.48202"
+ y2="802.48199"
gradientTransform="scale(2.072347,0.482545)"
gradientUnits="userSpaceOnUse" /><linearGradient
xlink:href="#linearGradient723"
id="linearGradient726"
x1="1183.5841"
y1="1159.2882"
- x2="1006.7490"
+ x2="1006.749"
y2="1224.5554"
- gradientTransform="scale(1.800030,0.555546)"
+ gradientTransform="scale(1.80003,0.555546)"
gradientUnits="userSpaceOnUse" /><linearGradient
xlink:href="#linearGradient727"
id="linearGradient730"
x1="458.71106"
- y1="812.53319"
- x2="388.85817"
- y2="836.30459"
+ y1="812.5332"
+ x2="388.85818"
+ y2="836.30457"
gradientTransform="scale(2.072341,0.482546)"
gradientUnits="userSpaceOnUse" /><linearGradient
xlink:href="#linearGradient731"
id="linearGradient734"
x1="1897.8429"
- y1="317.02976"
+ y1="317.02975"
x2="1709.8169"
y2="503.17862"
gradientTransform="scale(1.011641,0.988493)"
@@ -285,7 +286,8 @@
y1="585.65698"
x2="595.81787"
y2="711.65698"
- gradientUnits="userSpaceOnUse" /><linearGradient
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.693764,0,0,0.700967,-23.01798,-164.6139)" /><linearGradient
inkscape:collect="always"
xlink:href="#linearGradient10359"
id="linearGradient11099"
@@ -293,7 +295,8 @@
y1="615.75739"
x2="655.36652"
y2="619.75745"
- gradientUnits="userSpaceOnUse" /><linearGradient
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.693764,0,0,0.700967,-23.01798,-164.6139)" /><linearGradient
inkscape:collect="always"
xlink:href="#linearGradient10359"
id="linearGradient11833"
@@ -301,15 +304,17 @@
y1="461.75742"
x2="440.88123"
y2="295.75742"
- gradientUnits="userSpaceOnUse" /><linearGradient
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.693764,0,0,0.700967,-23.01798,-164.6139)" /><linearGradient
inkscape:collect="always"
xlink:href="#linearGradient10359"
id="linearGradient12567"
x1="682.99213"
y1="843.13507"
x2="-9.1187744"
- y2="758.70520"
- gradientUnits="userSpaceOnUse" /><linearGradient
+ y2="758.7052"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.693764,0,0,0.700967,-23.01798,-164.6139)" /><linearGradient
inkscape:collect="always"
xlink:href="#linearGradient10359"
id="linearGradient13301"
@@ -317,47 +322,48 @@
y1="595.75739"
x2="165.36649"
y2="595.75739"
- gradientUnits="userSpaceOnUse" /></defs><sodipodi:namedview
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.693764,0,0,0.700967,-23.01798,-164.6139)" /></defs><sodipodi:namedview
id="base"
- inkscape:zoom="1.00000000"
+ inkscape:zoom="1"
inkscape:cx="334.28567"
- inkscape:cy="409.63159"
+ inkscape:cy="193.44382"
inkscape:window-width="1272"
inkscape:window-height="947"
inkscape:window-x="0"
- inkscape:window-y="0"
+ inkscape:window-y="28"
inkscape:current-layer="svg602" /><rect
- style="opacity:1.0000000;color:#000000;fill:#232323;fill-opacity:1.0000000;fill-rule:nonzero;stroke:#000000;stroke-width:7.1920000;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
+ style="opacity:1;color:#000000;fill:#232323;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.01538324;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
id="rect1629"
- width="496.68835"
- height="493.73892"
- x="145.66154"
- y="348.78754" /><rect
- y="411.94406"
- x="209.19537"
- height="367.42581"
- width="369.62070"
+ width="344.58429"
+ height="346.09457"
+ x="78.036697"
+ y="79.874451" /><rect
+ y="124.14508"
+ x="122.11414"
+ height="257.55328"
+ width="256.42938"
id="rect3083"
- style="opacity:1.0000000;color:#000000;fill:#000000;fill-opacity:1.0000000;fill-rule:nonzero;stroke:#000000;stroke-width:2.0036278;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible" /><path
- style="color:#000000;fill:url(#linearGradient13301);fill-opacity:1.0;fill-rule:nonzero;stroke:#000000;stroke-width:11.381881;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible"
- d="M 150.19777,353.50381 L 207.67555,411.69605 L 207.67555,778.26699 L 150.19777,838.01102 L 150.19777,353.50381 z "
+ style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.39724159;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" /><path
+ style="color:#000000;fill:url(#linearGradient13301);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:7.93722057;stroke-linecap:round;stroke-linejoin:bevel;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+ d="M 81.183749,83.1804 L 121.05975,123.97122 L 121.05975,380.92528 L 81.183749,422.80385 L 81.183749,83.1804 z "
id="rect5263"
sodipodi:nodetypes="ccccc" /><path
sodipodi:nodetypes="ccccc"
id="path7447"
- d="M 639.67555,353.50381 L 582.19777,411.69605 L 582.19777,778.26699 L 639.67555,838.01102 L 639.67555,353.50381 z "
- style="color:#000000;fill:url(#linearGradient11099);fill-opacity:1.0;fill-rule:nonzero;stroke:#000000;stroke-width:11.381881;stroke-linecap:round;stroke-linejoin:bevel;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible" /><path
- style="color:#000000;fill:url(#linearGradient11833);fill-opacity:1.0;fill-rule:nonzero;stroke:#000000;stroke-width:11.381881;stroke-linecap:round;stroke-linejoin:bevel;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
- d="M 152.68306,351.01853 L 210.87530,408.49631 L 577.44624,408.49631 L 637.19027,351.01853 L 152.68306,351.01853 z "
+ d="M 420.76559,83.1804 L 380.8896,123.97122 L 380.8896,380.92528 L 420.76559,422.80385 L 420.76559,83.1804 z "
+ style="color:#000000;fill:url(#linearGradient11099);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:7.93722057;stroke-linecap:round;stroke-linejoin:bevel;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" /><path
+ style="color:#000000;fill:url(#linearGradient11833);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:7.93722057;stroke-linecap:round;stroke-linejoin:bevel;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+ d="M 82.907959,81.43831 L 123.27961,121.72832 L 377.59317,121.72832 L 419.04139,81.43831 L 82.907959,81.43831 z "
id="path7449"
sodipodi:nodetypes="ccccc" /><path
sodipodi:nodetypes="ccccc"
id="path7451"
- d="M 152.68306,837.44410 L 210.87530,779.96632 L 577.44624,779.96632 L 637.19027,837.44410 L 152.68306,837.44410 z "
- style="color:#000000;fill:url(#linearGradient12567);fill-opacity:1.0;fill-rule:nonzero;stroke:#000000;stroke-width:11.382000;stroke-linecap:round;stroke-linejoin:bevel;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible;stroke-dasharray:none" /><rect
- style="opacity:0.90874525;color:#000000;fill:url(#linearGradient10365);fill-opacity:1.0;fill-rule:nonzero;stroke:#000000;stroke-width:2.0040000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
+ d="M 82.907959,422.40646 L 123.27961,382.11645 L 377.59317,382.11645 L 419.04139,422.40646 L 82.907959,422.40646 z "
+ style="color:#000000;fill:url(#linearGradient12567);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:7.93730497;stroke-linecap:round;stroke-linejoin:bevel;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" /><rect
+ style="opacity:0.9087452;color:#000000;fill:url(#linearGradient10365);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.39750111;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
id="rect9631"
- width="369.62070"
- height="367.42581"
- x="209.19537"
- y="411.94406" /></svg> \ No newline at end of file
+ width="256.42938"
+ height="257.55328"
+ x="122.11414"
+ y="124.14508" /></svg> \ No newline at end of file
diff --git a/pixmaps/unfreeze.svg b/pixmaps/unfreeze.svg
index 37d02d9..9aa71e5 100644
--- a/pixmaps/unfreeze.svg
+++ b/pixmaps/unfreeze.svg
@@ -11,7 +11,7 @@
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
inkscape:version="0.43"
sodipodi:docname="unfreeze.svg"
- sodipodi:docbase="/home/deva/docs/c/miav/pixmaps"
+ sodipodi:docbase="/home/deva/docs/miav/pixmaps"
xml:space="preserve"
height="400pt"
width="400pt"
@@ -454,7 +454,7 @@
cx="240.79671"
id="radialGradient617"
xlink:href="#linearGradient618"
- gradientTransform="matrix(1.223982,0,0,0.817005,-50.6875,-143.5183)"
+ gradientTransform="matrix(1.223982,0,0,0.817005,-50.6875,-113.5183)"
gradientUnits="userSpaceOnUse" />
@@ -638,7 +638,7 @@
x2="391.20468"
y1="342.38516"
x1="87.164658"
- gradientTransform="matrix(1.264328,0,0,0.790934,-50.6875,-143.5183)"
+ gradientTransform="matrix(1.264328,0,0,0.790934,-50.6875,-113.5183)"
id="linearGradient3948"
xlink:href="#linearGradient3950"
inkscape:collect="always" />
@@ -649,7 +649,7 @@
<sodipodi:namedview
inkscape:current-layer="svg602"
- inkscape:window-y="0"
+ inkscape:window-y="28"
inkscape:window-x="0"
inkscape:window-height="948"
inkscape:window-width="1272"
@@ -706,7 +706,7 @@
<rect
ry="8.75"
- y="96.343803"
+ y="126.3438"
x="64.3125"
height="17.5"
width="37.5"
@@ -717,7 +717,7 @@
<rect
ry="20"
- y="103.84383"
+ y="133.84383"
x="26.8125"
height="297.5"
width="447.5"
@@ -728,7 +728,7 @@
<rect
ry="16.638657"
- y="128.84381"
+ y="158.84381"
x="51.8125"
height="247.5"
width="397.50003"
@@ -738,7 +738,7 @@
<g
- transform="translate(-176.2738,-173.948)"
+ transform="translate(-176.2738,-143.948)"
id="g6243">
<rect
rx="7.5"
@@ -779,7 +779,7 @@
<g
- transform="matrix(1.436363,0,0,1.436363,-92.4577,-329.3917)"
+ transform="matrix(1.436363,0,0,1.436363,-92.4577,-299.3917)"
id="g684">
<path
transform="translate(10,-10.00003)"
@@ -874,7 +874,7 @@
<g
- transform="matrix(1.3045,0,0,1.304498,-127.091,-235.1024)"
+ transform="matrix(1.3045,0,0,1.304498,-127.091,-205.1024)"
id="g707">
<rect
rx="7.5786743"
@@ -928,7 +928,7 @@
<g
- transform="translate(-273.2957,-186.0188)"
+ transform="translate(-273.2957,-156.0188)"
id="g1119">
<g
id="g1109">