From 7643b0a9179464d1ee337bb1b2bda00e3a3dd99e Mon Sep 17 00:00:00 2001
From: Björn Hagemeister
Date: Fri, 16 May 2014 16:03:53 +0200
Subject: Changing some icons plus adding Button "help" without implementing
its function. The button broadcast is just set to invisible, not deleted!
---
gui/server_normal/mainwindow.ui | 33 +-
icons/help.svg | 212 ++++++
icons/keyboard_key.svg | 152 ++++
icons/space.svg | 62 ++
icons/student2all.svg | 1051 ++++++++++++---------------
icons/student2tutor.svg | 842 ++++++++--------------
icons/tutor2all.svg | 1501 ++++++++++++++++++++++++++++++++++++---
icons/tutor2student.svg | 496 +++++--------
pvsclient.qrc | 3 +
pvsmgr.qrc | 75 +-
10 files changed, 2831 insertions(+), 1596 deletions(-)
create mode 100644 icons/help.svg
create mode 100644 icons/keyboard_key.svg
create mode 100644 icons/space.svg
diff --git a/gui/server_normal/mainwindow.ui b/gui/server_normal/mainwindow.ui
index 22e1b45..135544d 100644
--- a/gui/server_normal/mainwindow.ui
+++ b/gui/server_normal/mainwindow.ui
@@ -88,15 +88,17 @@
-
-
-
+
+
+
+
+
@@ -143,6 +145,9 @@
Student's Screen to Everyone
+
+ false
+
@@ -156,7 +161,7 @@
- :/student2tutor:/student2tutor
+ :/student2tutorextension:/student2tutorextension
Student's Screen to Tutor, others blanked
@@ -182,8 +187,8 @@
-
- :/stopprojection:/stopprojection
+
+ :/reset:/reset
Stop Projection on every Client
@@ -201,9 +206,25 @@
Set current Frame as Tutor
+
+
+
+ :/helpme:/helpme
+
+
+ Help
+
+
+ Help
+
+
+ true
+
+
+
diff --git a/icons/help.svg b/icons/help.svg
new file mode 100644
index 0000000..2e97f37
--- /dev/null
+++ b/icons/help.svg
@@ -0,0 +1,212 @@
+
+
+
diff --git a/icons/keyboard_key.svg b/icons/keyboard_key.svg
new file mode 100644
index 0000000..c6cc88e
--- /dev/null
+++ b/icons/keyboard_key.svg
@@ -0,0 +1,152 @@
+
+
+
+
\ No newline at end of file
diff --git a/icons/space.svg b/icons/space.svg
new file mode 100644
index 0000000..797cbc8
--- /dev/null
+++ b/icons/space.svg
@@ -0,0 +1,62 @@
+
+
+
+
diff --git a/icons/student2all.svg b/icons/student2all.svg
index ef3d7b2..5971d45 100644
--- a/icons/student2all.svg
+++ b/icons/student2all.svg
@@ -15,8 +15,8 @@
height="114.30188"
id="svg2"
xml:space="preserve"
- inkscape:version="0.48.3.1 r9886"
- sodipodi:docname="student2all.svg">image/svg+xml
\ No newline at end of file
+ d="M 90.175096,1.196328 72.482443,32.873987 67.889509,20.468664 57.250599,14.616559 90.175096,1.196328 z"
+ id="path1336-6-1"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.56416857;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
\ No newline at end of file
diff --git a/icons/student2tutor.svg b/icons/student2tutor.svg
index 7338347..94a3ff4 100644
--- a/icons/student2tutor.svg
+++ b/icons/student2tutor.svg
@@ -15,7 +15,7 @@
height="114.30188"
id="svg2"
xml:space="preserve"
- inkscape:version="0.48.3.1 r9886"
+ inkscape:version="0.48.4 r9939"
sodipodi:docname="student2tutor.svg">image/svg+xml
\ No newline at end of file
+ d="m 9.766,43.027 c 6.789,0 29.074,0 29.074,0"
+ id="path248"
+ style="fill:none;stroke:#ffffff;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
\ No newline at end of file
diff --git a/icons/tutor2all.svg b/icons/tutor2all.svg
index e7c9682..0a22c2f 100644
--- a/icons/tutor2all.svg
+++ b/icons/tutor2all.svg
@@ -29,13 +29,13 @@
inkscape:window-height="1000"
id="namedview10864"
showgrid="true"
- inkscape:zoom="5.839876"
+ inkscape:zoom="7.4626944"
inkscape:cx="57.193577"
- inkscape:cy="53.591741"
+ inkscape:cy="56.24384"
inkscape:window-x="0"
inkscape:window-y="24"
inkscape:window-maximized="1"
- inkscape:current-layer="g10">
\ No newline at end of file
+ y2="43.82579" />
\ No newline at end of file
diff --git a/icons/tutor2student.svg b/icons/tutor2student.svg
index 52942c6..58fb373 100644
--- a/icons/tutor2student.svg
+++ b/icons/tutor2student.svg
@@ -15,7 +15,7 @@
height="114.30188"
id="svg2"
xml:space="preserve"
- inkscape:version="0.48.3.1 r9886"
+ inkscape:version="0.48.4 r9939"
sodipodi:docname="tutor2student.svg">image/svg+xml
\ No newline at end of file
+ style="opacity:0.65;fill:url(#linearGradient3811);fill-opacity:1;fill-rule:evenodd;stroke:none"
+ inkscape:connector-curvature="0" />
\ No newline at end of file
diff --git a/pvsclient.qrc b/pvsclient.qrc
index f4cf621..3432a62 100644
--- a/pvsclient.qrc
+++ b/pvsclient.qrc
@@ -9,6 +9,9 @@
icons/cam_on32.svg
icons/cam_off32.svg
icons/chat_msg16.svg
+ icons/keyboard_key.svg
+ icons/space.svg
+ icons/help.svg
AUTHORS
TRANSLATION
diff --git a/pvsmgr.qrc b/pvsmgr.qrc
index 7d0c27f..007512a 100644
--- a/pvsmgr.qrc
+++ b/pvsmgr.qrc
@@ -1,48 +1,31 @@
-
- icons/exit.svg
- icons/terminal.svg
- icons/photo.svg
- icons/lock.svg
- icons/dozent.svg
- icons/eye.svg
- icons/cam32.svg
- icons/student2all.svg
- icons/tutor2all.svg
- icons/student2tutor.svg
- icons/tutor2student.svg
- icons/stopprojection.svg
- AUTHORS
- TRANSLATION
-
-
- build/pvsmgr_de_DE.qm
-
-
- build/pvsmgr_de_DE.qm
-
-
- build/pvsmgr_fr_FR.qm
-
-
- build/pvsmgr_fr_FR.qm
-
-
- build/pvsmgr_es_MX.qm
-
-
- build/pvsmgr_es_MX.qm
-
-
- build/pvsmgr_ar_JO.qm
-
-
- build/pvsmgr_ar_JO.qm
-
-
- build/pvsmgr_pl_PL.qm
-
-
- build/pvsmgr_pl_PL.qm
-
+
+ icons/exit.svg
+ icons/terminal.svg
+ icons/photo.svg
+ icons/lock.svg
+ icons/dozent.svg
+ icons/eye.svg
+ icons/cam32.svg
+ icons/student2all.svg
+ icons/tutor2all.svg
+ icons/student2tutor.svg
+ icons/tutor2student.svg
+ icons/stopprojection.svg
+ icons/keyboard_key.svg
+ icons/student2tutor_extension.svg
+ icons/help.svg
+ AUTHORS
+ TRANSLATION
+ build/pvsmgr_de_DE.qm
+ build/pvsmgr_de_DE.qm
+ build/pvsmgr_fr_FR.qm
+ build/pvsmgr_fr_FR.qm
+ build/pvsmgr_es_MX.qm
+ build/pvsmgr_es_MX.qm
+ build/pvsmgr_ar_JO.qm
+ build/pvsmgr_ar_JO.qm
+ build/pvsmgr_pl_PL.qm
+ build/pvsmgr_pl_PL.qm
+
--
cgit v1.2.3-55-g7522