[X2go-Commits] x2gothinclient.git - build-main (branch) updated: 1.0.1.6
X2Go dev team
git-admin at x2go.org
Wed Mar 7 20:48:05 CET 2012
The branch, build-main has been updated
via d64d625129a79804040ea6fe6059675135034ee3 (commit)
via be299f72e904310704fb6385128637226a1adbcb (commit)
via 7108aa320b81f2328d4d334e0a52f144500c21fd (commit)
via 85609f9567c20e2d654f2030586dc27416ac35bb (commit)
via 37e3cdf2cf596f7956a0da19979c29c086d3753e (commit)
via f951027eb109ef40124555e0ed70053d863945e7 (commit)
via 4eca45ff7d4625b038405a5bad7e4d09ff9fe272 (commit)
via 7d5e1990195c50c3df475157ebfa641eb32d3465 (commit)
via cbd84540554db2861d2fd431d12e1ca7754c9fe2 (commit)
via 696eb25fbf77be21c7ea533f5558e65d56987d65 (commit)
via 4eecd1c05c8383bcbe42627aedf1221f8d319fcc (commit)
via 60ae7466f84477e3459fa12ef195f3b14005a3e4 (commit)
via e050d7bd54f124e913d0ecf1658ec1a96d0f9fcb (commit)
via 79675568402ebb0f7e908698a876adb955e34522 (commit)
via d219b0c2ad609b13c204ad8fe5ebc436f9f9fab3 (commit)
via 80cc30a96a18f076d23eb6dc8a185ca34db80653 (commit)
via b3183e568be6d346452c6727b4798812e6646f4a (commit)
via 8c924cc190db585497aeb8bd22cdc1a880f32f12 (commit)
from d1df454db152fbcea7e1340b43ae4c9aa2c9ef9c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
VERSION | 2 +-
debian/changelog | 23 +++
debian/control | 36 +----
debian/rules | 3 -
debian/x2gothinclientmanagement.install | 1 +
debian/x2gothinshutdown.install | 1 -
debian/x2gothinshutdown.manpages | 1 -
x2gothinclient/sbin/x2gothinclientd | 42 ++----
.../sbin/x2gothinclient_create | 1 +
.../sbin/x2gothinclient_update | 23 ++-
.../share/tftpboot/default.cfg | 26 +++-
.../{x2go-splash.png => x2go-simple-splash.png} | Bin 4314 -> 4314 bytes
.../share/tftpboot/x2go-splash.png | Bin 4314 -> 18746 bytes
.../share/x2goclient-background.svg | 158 ++++++++++++++++++++
.../share/x2gothinclient_start | 5 +
x2gothinshutdown/man/thinshutdown.1 | 25 ---
x2gothinshutdown/thinshutdown/mb.cpp | 18 ---
x2gothinshutdown/thinshutdown/mb.h | 13 --
x2gothinshutdown/thinshutdown/power-button.png | Bin 742 -> 0 bytes
x2gothinshutdown/thinshutdown/resources.rcc | 5 -
x2gothinshutdown/thinshutdown/thinshutdown.cpp | 46 ------
x2gothinshutdown/thinshutdown/thinshutdown.pro | 13 --
22 files changed, 251 insertions(+), 191 deletions(-)
delete mode 100644 debian/x2gothinshutdown.install
delete mode 100644 debian/x2gothinshutdown.manpages
copy x2gothinclientmanagement/share/tftpboot/{x2go-splash.png => x2go-simple-splash.png} (100%)
create mode 100644 x2gothinclientmanagement/share/x2goclient-background.svg
delete mode 100644 x2gothinshutdown/man/thinshutdown.1
delete mode 100644 x2gothinshutdown/thinshutdown/mb.cpp
delete mode 100644 x2gothinshutdown/thinshutdown/mb.h
delete mode 100644 x2gothinshutdown/thinshutdown/power-button.png
delete mode 100644 x2gothinshutdown/thinshutdown/resources.rcc
delete mode 100644 x2gothinshutdown/thinshutdown/thinshutdown.cpp
delete mode 100644 x2gothinshutdown/thinshutdown/thinshutdown.pro
The diff of changes is:
diff --git a/VERSION b/VERSION
index ef63c57..cd263f0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.0.1.5
+1.0.1.6
diff --git a/debian/changelog b/debian/changelog
index ebeb447..2ca6b3c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,26 @@
+x2gothinclient (1.0.1.6-0~x2go1) unstable; urgency=low
+
+ [ Mike Gabriel ]
+ * New upstream version (1.0.1.6):
+ - Add background image support.
+ - Add new boot splash background image.
+ - New look'n'feel for boot splash menu.
+ * Let x2gothinclient break and replace x2gothinshutdown.
+ * Depend on x2goclient (>= 3.99.1.1).
+
+ [ Oleksandr Shneyder ]
+ * New upstream version (1.0.1.6):
+ - x2gothinshutdown is removed.
+ - Options --thinclient and --haltbt added to x2gothinclient_sessions.
+ - x2gothinclientd is modified to use x2goclient shutdown button
+ instead of x2gothinshutdown.
+ - gnupg-agent, pinentry-x2go and gpgsm added to "Recommends" section
+ for package x2gothinclient.
+ - Changes in x2gothinclientd, pulseaudio parameter "--exit-idle-time=65535",
+ breaking pulseaudio start command into in to several lines.
+
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Wed, 07 Mar 2012 20:47:20 +0100
+
x2gothinclient (1.0.1.5-0~x2go1) unstable; urgency=low
* New upstream version (1.0.1.5):
diff --git a/debian/control b/debian/control
index 4348bf8..f3b9c59 100644
--- a/debian/control
+++ b/debian/control
@@ -47,20 +47,25 @@ Architecture: all
Depends:
${misc:Depends},
psmisc,
- x2goclient,
- x2gothinshutdown,
+ x2goclient (>= 3.99.1.1),
xauth,
xinit,
locales
Recommends:
x2gocdmanager,
- x2gothinshutdown,
x2gousbmount,
x2gosmartcardrules,
+ gnupg-agent,
+ pinentry-x2go,
+ gpgsm,
vim,
mc,
acpid,
memtest86+
+Breaks:
+ x2gothinshutdown
+Replaces:
+ x2gothinshutdown
Description: login daemon starting x2goclient in displaymanager mode
X2Go is a server based computing environment with
- session resuming
@@ -130,31 +135,6 @@ Description: clientside daemon enabling automatic CD-Rom mounting
This package adds a client-side daemon to your X2Go thin client that enables
automatic CD-ROM mounting within thin client X2Go sessions.
-Package: x2gothinshutdown
-Architecture: any
-Depends:
- ${shlibs:Depends},
- ${misc:Depends},
- libqt4-gui,
-Conflicts:
- x2gocdmanager (<= 1.0.1.2-0~)
-Description: shutdown button for X2Go thin client
- X2Go is a server based computing environment with
- - session resuming
- - low bandwith support
- - LDAP support
- - client side mass storage mounting support
- - audio support
- - authentication by smartcard and USB stick
- .
- x2gothinshutdown:
- --------------
- IMPORTANT: Use this Package only for the x2go THIN CLIENT ENVIRONMENT
- (This package is meant to be installed in a CHROOT environment!!!)
- .
- This package provides an on-screen power-off button (Qt4) for shutting
- down your X2Go thin client.
-
Package: x2gosmartcardrules
Architecture: all
Depends:
diff --git a/debian/rules b/debian/rules
index d10f2e9..d2fdbb4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,6 @@ configure: configure-stamp
configure-stamp:
dh_testdir
cd x2gocdmanager/powerej && qmake-qt4 powerej.pro
- cd x2gothinshutdown/thinshutdown && qmake-qt4 thinshutdown.pro
touch $@
build: build-stamp
@@ -20,14 +19,12 @@ build-stamp: configure-stamp
dh_testdir
dh_prep
$(MAKE) -C x2gocdmanager/powerej
- $(MAKE) -C x2gothinshutdown/thinshutdown
touch $@
clean:
dh_testdir
dh_testroot
[ ! -f x2gocdmanager/powerej/Makefile ] || $(MAKE) -C x2gocdmanager/powerej distclean
- [ ! -f x2gothinshutdown/thinshutdown/Makefile ] || $(MAKE) -C x2gothinshutdown/thinshutdown distclean
dh_clean build-stamp configure-stamp
binary-indep: build
diff --git a/debian/x2gothinclientmanagement.install b/debian/x2gothinclientmanagement.install
index 8b44295..98eca2a 100644
--- a/debian/x2gothinclientmanagement.install
+++ b/debian/x2gothinclientmanagement.install
@@ -1,4 +1,5 @@
x2gothinclientmanagement/sbin/x2gothinclient_* usr/sbin/
x2gothinclientmanagement/etc/x2gothinclient_* etc/x2go/
x2gothinclientmanagement/share/x2gothinclient_* usr/share/x2go/tce/
+x2gothinclientmanagement/share/x2goclient-background.svg usr/share/x2go/tce/
x2gothinclientmanagement/share/tftpboot usr/share/x2go/tce/
diff --git a/debian/x2gothinshutdown.install b/debian/x2gothinshutdown.install
deleted file mode 100644
index 225868f..0000000
--- a/debian/x2gothinshutdown.install
+++ /dev/null
@@ -1 +0,0 @@
-x2gothinshutdown/thinshutdown/thinshutdown usr/sbin
diff --git a/debian/x2gothinshutdown.manpages b/debian/x2gothinshutdown.manpages
deleted file mode 100644
index dca66a8..0000000
--- a/debian/x2gothinshutdown.manpages
+++ /dev/null
@@ -1 +0,0 @@
-x2gothinshutdown/man/thinshutdown.1
\ No newline at end of file
diff --git a/x2gothinclient/sbin/x2gothinclientd b/x2gothinclient/sbin/x2gothinclientd
index a7f4af0..49e04a9 100755
--- a/x2gothinclient/sbin/x2gothinclientd
+++ b/x2gothinclient/sbin/x2gothinclientd
@@ -89,21 +89,24 @@ elsif ($pid == 0 )
while(sleep 1)
{
-
- my $thinshutdown_delay = 4;
-
+ # test if shutdown button on X2Go Client was clicked
+ if ( -e "/home/x2goclient/.halt")
+ {
+ system("shutdown -h now");
+ }
# test if XServer is running, if not launch it...
if ( check_x() ==0 )
{
system("/usr/bin/Xorg -br &");
- # delay appearance of thinshutdown button a little longer on X server (re)start
- $thinshutdown_delay = 10;
}
# test if pulseaudio is running, if not launch it...
if ( !check_pulse() )
{
- system("su - x2goclient -c \"DISPLAY=:0 pulseaudio -D -n -L 'module-native-protocol-tcp port=4713' -L 'module-esound-protocol-tcp port=16001' -L 'module-udev-detect'\"");
+ system("su - x2goclient -c \"DISPLAY=:0 pulseaudio -D -n \\
+ -L 'module-native-protocol-tcp port=4713' \\
+ -L 'module-esound-protocol-tcp port=16001' \\
+ -L 'module-udev-detect' --exit-idle-time=65535\"");
}
# test if x2goclient is running, if not launch it...
@@ -114,26 +117,13 @@ elsif ($pid == 0 )
$x2goclient_pid = eval {
open3( \*IN, \*OUT, \*ERR, "su - x2goclient -c 'DISPLAY=:0 bash -c \"/etc/x2go/x2gothinclient_start &\"'");
};
- }
-
- # handle availability of the thinshutdown button GUI...
- my $outp=`ps ax`;
- my $CLIENT=($outp =~ m/x2goclient/);
- my $PROXY=($outp =~ m/nxproxy/);
- my $SHUTD=($outp =~ m/thinshutdown/);
- if ( $SHUTD && $PROXY )
- {
- system("killall thinshutdown");
- }
- if ( !$SHUTD && !$PROXY && $CLIENT)
- {
- system("sleep $thinshutdown_delay; DISPLAY=:0 thinshutdown &");
- }
-
- ## wait for x2goclient to finish
- if ( check_client() )
- {
- waitpid( $x2goclient_pid, 0 );
+ ## give X2Go Client some time to start
+ sleep(3);
+ ## wait for x2goclient to finish
+ if ( check_client() )
+ {
+ waitpid( $x2goclient_pid, 0 );
+ }
}
}
}
diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create
index e0da318..a14ae17 100755
--- a/x2gothinclientmanagement/sbin/x2gothinclient_create
+++ b/x2gothinclientmanagement/sbin/x2gothinclient_create
@@ -63,6 +63,7 @@ mkdir -p $TC_CONFIG
test -f $TC_CONFIG/x2gothinclient_init || cp $SHAREDIR/x2gothinclient_init $TC_CONFIG
test -f $TC_CONFIG/x2gothinclient_start || cp $SHAREDIR/x2gothinclient_start $TC_CONFIG
test -f $TC_CONFIG/x2gothinclient_sessions || cp $SHAREDIR/x2gothinclient_sessions $TC_CONFIG
+test -f $TC_CONFIG/x2goclient-background.svg || cp $SHAREDIR/x2goclient-background.svg $TC_CONFIG
apt-get install debootstrap
mkdir -p $TC_CHROOT
diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_update b/x2gothinclientmanagement/sbin/x2gothinclient_update
index 4a83145..4df9ff3 100755
--- a/x2gothinclientmanagement/sbin/x2gothinclient_update
+++ b/x2gothinclientmanagement/sbin/x2gothinclient_update
@@ -57,14 +57,25 @@ mkdir -p "$TC_CHROOT/etc/x2go"
echo "Installing X2Go TCE configuration into chroot environment..."
echo "------------------------------------------------------------"
-cp -v "$TC_CONFIG/x2gothinclient_init" "$TC_CHROOT/etc/x2go/x2gothinclient_init"
-chmod a+rx $TC_CHROOT/etc/x2go/x2gothinclient_init
+if test -f $TC_CONFIG/x2gothinclient_init; then
+ cp -v "$TC_CONFIG/x2gothinclient_init" "$TC_CHROOT/etc/x2go/x2gothinclient_init"
+ chmod a+rx $TC_CHROOT/etc/x2go/x2gothinclient_init
+fi
-cp -v "$TC_CONFIG/x2gothinclient_start" "$TC_CHROOT/etc/x2go/x2gothinclient_start"
-chmod a+rx "$TC_CHROOT/etc/x2go/x2gothinclient_start"
+if test -f $TC_CONFIG/x2gothinclient_start; then
+ cp -v "$TC_CONFIG/x2gothinclient_start" "$TC_CHROOT/etc/x2go/x2gothinclient_start"
+ chmod a+rx "$TC_CHROOT/etc/x2go/x2gothinclient_start"
+fi
-cp -v "$TC_CONFIG/x2gothinclient_sessions" "$TC_CHROOT/etc/x2go/x2gothinclient_sessions"
-chmod a+rx "$TC_CHROOT/etc/x2go/x2gothinclient_sessions"
+if test -f $TC_CONFIG/x2gothinclient_sessions; then
+ cp -v "$TC_CONFIG/x2gothinclient_sessions" "$TC_CHROOT/etc/x2go/x2gothinclient_sessions"
+ chmod a+rx "$TC_CHROOT/etc/x2go/x2gothinclient_sessions"
+fi
+
+if test -f $TC_CONFIG/x2goclient-background.svg; then
+ cp -v "$TC_CONFIG/x2goclient-background.svg" "$TC_CHROOT/etc/x2go/x2goclient-background.svg"
+ chmod a+rx $TC_CHROOT/etc/x2go/x2goclient-background.svg
+fi
echo
diff --git a/x2gothinclientmanagement/share/tftpboot/default.cfg b/x2gothinclientmanagement/share/tftpboot/default.cfg
index 33bac2b..49a25de 100644
--- a/x2gothinclientmanagement/share/tftpboot/default.cfg
+++ b/x2gothinclientmanagement/share/tftpboot/default.cfg
@@ -13,18 +13,34 @@ MENU SEPARATOR
include memtest.cfg
# menu settings
-MENU VSHIFT 12
-MENU WIDTH 80
+MENU VSHIFT 3
+MENU HSHIFT 18
+MENU WIDTH 60
MENU MARGIN 10
MENU ROWS 12
MENU TABMSGROW 13
-MENU CMDLINEROW 14
+MENU CMDLINEROW 23
MENU ENDROW 12
-MENU TIMEOUTROW 15
+MENU TIMEOUTROW 18
+
+MENU COLOR border 30;44 #40ffffff #a0000000 std
+MENU COLOR title 1;36;44 #9033ccff #a0000000 std
+MENU COLOR sel 7;37;40 #e0000000 #20ffffff all
+MENU COLOR unsel 37;44 #50ffffff #a0000000 std
+MENU COLOR help 37;40 #c0ffffff #a0000000 std
+MENU COLOR timeout_msg 37;40 #80ffffff #00000000 std
+MENU COLOR timeout 1;37;40 #c0ffffff #00000000 std
+MENU COLOR msg07 37;40 #90ffffff #a0000000 std
+MENU COLOR tabmsg 37;40 #e0ffffff #a0000000 std
+MENU COLOR disabled 37;44 #50ffffff #a0000000 std
+MENU COLOR hotkey 1;30;47 #ffff0000 #a0000000 std
+MENU COLOR hotsel 1;7;30;47 #ffff0000 #20ffffff all
+MENU COLOR scrollbar 30;47 #ffff0000 #00000000 std
+MENU COLOR cmdmark 1;36;47 #e0ff0000 #00000000 std
+MENU COLOR cmdline 30;47 #ff000000 #00000000 none
# possible boot profiles for ONTIMEOUT:
# localboot, x2go-tce-686, x2go-tce-486
# (... or any other profile you defined in your customized menu)
ONTIMEOUT localboot
TIMEOUT 100
-
diff --git a/x2gothinclientmanagement/share/tftpboot/x2go-splash.png b/x2gothinclientmanagement/share/tftpboot/x2go-splash.png
index 0886917..159ecff 100644
Binary files a/x2gothinclientmanagement/share/tftpboot/x2go-splash.png and b/x2gothinclientmanagement/share/tftpboot/x2go-splash.png differ
diff --git a/x2gothinclientmanagement/share/x2goclient-background.svg b/x2gothinclientmanagement/share/x2goclient-background.svg
new file mode 100644
index 0000000..e3c6580
--- /dev/null
+++ b/x2gothinclientmanagement/share/x2goclient-background.svg
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ version="1.0"
+ width="361.04999"
+ height="271.92001"
+ viewBox="0 0 361.244 270.933"
+ id="svg2"
+ xml:space="preserve"
+ inkscape:version="0.47 r22583"
+ sodipodi:docname="bg-anim.svg"><metadata
+ id="metadata30"><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><sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1598"
+ inkscape:window-height="879"
+ id="namedview28"
+ showgrid="false"
+ inkscape:zoom="2"
+ inkscape:cx="132.20018"
+ inkscape:cy="132.38275"
+ inkscape:window-x="0"
+ inkscape:window-y="19"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="svg2" />
+ <defs
+ id="defs4"><inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 135.96001 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="361.04999 : 135.96001 : 1"
+ inkscape:persp3d-origin="180.52499 : 90.640004 : 1"
+ id="perspective32" /><linearGradient
+ id="linearGradient2802"><stop
+ style="stop-color:#ffffff;stop-opacity:1"
+ offset="0"
+ id="stop2804" /><stop
+ style="stop-color:#ffffff;stop-opacity:0"
+ offset="1"
+ id="stop2806" /></linearGradient><linearGradient
+ id="linearGradient2852"><stop
+ style="stop-color:#ffffff;stop-opacity:1"
+ offset="0"
+ id="stop2854" /><stop
+ style="stop-color:#6699ff;stop-opacity:0"
+ offset="1"
+ id="stop2856" /></linearGradient><linearGradient
+ id="linearGradient2844"><stop
+ style="stop-color:#deeaed;stop-opacity:1"
+ offset="0"
+ id="stop2846" /><stop
+ style="stop-color:#ffffff;stop-opacity:1"
+ offset="1"
+ id="stop2848" /></linearGradient><linearGradient
+ id="linearGradient1948"><stop
+ style="stop-color:#b2856b;stop-opacity:0.4235808;"
+ offset="0"
+ id="stop1950" /><stop
+ style="stop-color:#6699ff;stop-opacity:0"
+ offset="1"
+ id="stop1952" /></linearGradient>
+ <style
+ type="text/css"
+ id="style6" />
+ <linearGradient
+ x1="202.494"
+ y1="135.464"
+ x2="207.00999"
+ y2="135.464"
+ id="id0"
+ gradientUnits="userSpaceOnUse">
+ <stop
+ style="stop-color:#000000;stop-opacity:1"
+ offset="0"
+ id="stop9" />
+ <stop
+ style="stop-color:#6e707f;stop-opacity:1"
+ offset="1"
+ id="stop11" />
+ </linearGradient>
+
+
+
+
+
+
+
+
+
+ <linearGradient
+ x1="202.494"
+ y1="135.464"
+ x2="207.00999"
+ y2="135.464"
+ id="linearGradient1942"
+ xlink:href="#id0"
+ gradientUnits="userSpaceOnUse" /><linearGradient
+ x1="107.24445"
+ y1="268.11078"
+ x2="107.64762"
+ y2="207.717"
+ id="linearGradient1954"
+ xlink:href="#linearGradient1948"
+ gradientUnits="userSpaceOnUse" /><linearGradient
+ x1="278.59366"
+ y1="-49.590809"
+ x2="133.85397"
+ y2="120.54888"
+ id="linearGradient2808"
+ xlink:href="#linearGradient2802"
+ gradientUnits="userSpaceOnUse" /></defs>
+
+
+ <rect
+ style="fill:#800000;fill-opacity:1"
+ id="hintergrund"
+ height="270.92899"
+ width="361.23801"
+ y="0.00456294"
+ x="-361.23801"
+ class="fil0"
+ transform="scale(-1,1)">
+ <animateColor
+ attributeName="fill"
+ attributeType="XML"
+ from="#000000"
+ to="#246ed8"
+ begin="0s"
+ dur="4s"
+ fill="freeze"
+ id="animateColor24" />
+ </rect>
+
+
+ <path
+ d="M 162.557,0.0045 L 0,0.0045 L 0,57.8027 C 0,146.6071 334.145,182.1287 334.145,270.9327 L 334.145,270.9327 C 334.145,182.1283 162.557,88.8087 162.557,0.0037 L 162.557,0.0045 z "
+ style="fill:url(#linearGradient2808);fill-opacity:1"
+ id="path19" />
+
+
+</svg>
\ No newline at end of file
diff --git a/x2gothinclientmanagement/share/x2gothinclient_start b/x2gothinclientmanagement/share/x2gothinclient_start
index d006485..b603c00 100755
--- a/x2gothinclientmanagement/share/x2gothinclient_start
+++ b/x2gothinclientmanagement/share/x2gothinclient_start
@@ -27,7 +27,10 @@
--kbd-type=pc105/de \
--set-kbd=1 \
--geometry=fullscreen \
+ --thinclient \
+ --haltbt \
--read-exports-from=/home/x2goclient/export \
+ --background=/etc/x2go/x2goclient-background.svg \
--no-session-edit \
--session=X2Go.Example \
--add-to-known-hosts &
@@ -38,6 +41,8 @@
# --no-menu \
# --maximize \
# --link=lan \
+# --thinclient \
+# --haltbt \
# --kbd-layout=de \
# --kbd-type=pc105/de \
# --set-kbd=1 \
diff --git a/x2gothinshutdown/man/thinshutdown.1 b/x2gothinshutdown/man/thinshutdown.1
deleted file mode 100644
index ead3d4a..0000000
--- a/x2gothinshutdown/man/thinshutdown.1
+++ /dev/null
@@ -1,25 +0,0 @@
-'\" -*- coding: utf-8 -*-
-.if \n(.g .ds T< \\FC
-.if \n(.g .ds T> \\F[\n[.fam]]
-.de URL
-\\$2 \(la\\$1\(ra\\$3
-..
-.if \n(.g .mso www.tmac
-.TH thinshutdown 8 "02 May 2011" "Version 1.0.1.x" "X2go Thin Client Environment"
-.SH NAME
-thinshutdown \- Shutdown tool for X2Go Thin Clients.
-.SH SYNOPSIS
-'nh
-.fi
-.ad l
-\fBthinshutdown\fR
-
-.SH DESCRIPTION
-\fBthinshutdown\fR is a tool that allows session-controlled shutdown of X2Go thin clients.
-.PP
-.SH OPTIONS
-\fBthinshutdown\fR has no known options.
-.PP
-.SH AUTHOR
-This manual has been written by Mike Gabriel <mike.gabriel at das-netzwerkteam.de> for the X2Go project
-(http://www.x2go.org).
diff --git a/x2gothinshutdown/thinshutdown/mb.cpp b/x2gothinshutdown/thinshutdown/mb.cpp
deleted file mode 100644
index 7d81e04..0000000
--- a/x2gothinshutdown/thinshutdown/mb.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-#include "mb.h"
-#include <QProcess>
-#include <QFile>
-#include <QTextStream>
-#include <QDebug>
-
-MPushButton::MPushButton():QPushButton("",0)
-{
- QPixmap p(":/power-button.png");
- setIcon(p);
- setFlat(true);
- connect(this,SIGNAL(clicked()),this,SLOT(slot_cl()));
-}
-
-void MPushButton::slot_cl()
-{
- QProcess::startDetached("halt");
-}
diff --git a/x2gothinshutdown/thinshutdown/mb.h b/x2gothinshutdown/thinshutdown/mb.h
deleted file mode 100644
index 7fc94ea..0000000
--- a/x2gothinshutdown/thinshutdown/mb.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef _______MB_H_
-#define _______MB_H_
-
-#include <QPushButton>
-class MPushButton: public QPushButton
-{
-Q_OBJECT
- public:
- MPushButton();
- private slots:
- void slot_cl();
-};
-#endif
diff --git a/x2gothinshutdown/thinshutdown/power-button.png b/x2gothinshutdown/thinshutdown/power-button.png
deleted file mode 100644
index 03b1d1b..0000000
Binary files a/x2gothinshutdown/thinshutdown/power-button.png and /dev/null differ
diff --git a/x2gothinshutdown/thinshutdown/resources.rcc b/x2gothinshutdown/thinshutdown/resources.rcc
deleted file mode 100644
index fa02634..0000000
--- a/x2gothinshutdown/thinshutdown/resources.rcc
+++ /dev/null
@@ -1,5 +0,0 @@
-<RCC>
- <qresource>
- <file>power-button.png</file>
- </qresource>
-</RCC>
diff --git a/x2gothinshutdown/thinshutdown/thinshutdown.cpp b/x2gothinshutdown/thinshutdown/thinshutdown.cpp
deleted file mode 100644
index 796adad..0000000
--- a/x2gothinshutdown/thinshutdown/thinshutdown.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-/***************************************************************************
- * Copyright (C) 2005-2012 by Oleksandr Shneyder *
- * oleksandr.shneyder at obviously-nice.de *
- * *
- * This program 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. *
- * *
- * This program 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 this program; if not, write to the *
- * Free Software Foundation, Inc., *
- * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
- ***************************************************************************/
-
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <QApplication>
-#include <QTranslator>
-#include <QLocale>
-#include <QFrame>
-#include <mb.h>
-#include <QPlastiqueStyle>
-#include <QDesktopWidget>
-
-using namespace std;
-int main(int argc, char *argv[])
-{
- QApplication app(argc,argv);
- app.setStyle(new QPlastiqueStyle());
-
-// QFrame*fr =new QFrame(0,Qt::WindowStaysOnTopHint|Qt::X11BypassWindowManagerHint);
- MPushButton*fr =new MPushButton();
- fr->setFixedSize(24,24);
- fr->move(6,6);
- fr->show();
- return app.exec();
-}
diff --git a/x2gothinshutdown/thinshutdown/thinshutdown.pro b/x2gothinshutdown/thinshutdown/thinshutdown.pro
deleted file mode 100644
index 344c8e9..0000000
--- a/x2gothinshutdown/thinshutdown/thinshutdown.pro
+++ /dev/null
@@ -1,13 +0,0 @@
-######################################################################
-# Automatically generated by qmake (2.01a) Fr Jun 1 09:19:29 2007
-######################################################################
-
-TEMPLATE = app
-TARGET =
-DEPENDPATH += .
-INCLUDEPATH += .
-
-# Input
-HEADERS += mb.h
-SOURCES += thinshutdown.cpp mb.cpp
-RESOURCES += resources.rcc
hooks/post-receive
--
x2gothinclient.git (X2Go Thin Client Environment)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2gothinclient.git" (X2Go Thin Client Environment).
More information about the x2go-commits
mailing list