The branch, master has been updated via 4ccfeaffa19e3ccc20084f3683ccd4512926b5f9 (commit) from adefcb0cd27987107424e251a4d172b930390a14 (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 ----------------------------------------------------------------- commit 4ccfeaffa19e3ccc20084f3683ccd4512926b5f9 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Jun 6 23:57:18 2012 +0200 Add Ubuntu-2d (Unity) support to X2Go Client. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++++ icons/128x128/unity.png | Bin 0 -> 17622 bytes icons/16x16/unity.png | Bin 0 -> 1410 bytes icons/32x32/unity.png | Bin 0 -> 2984 bytes icons/64x64/unity.png | Bin 0 -> 7241 bytes onmainwindow.cpp | 4 ++++ resources.rcc | 1 + sessionbutton.cpp | 16 ++++++++++++++++ sessionbutton.h | 2 +- sessionwidget.cpp | 6 ++++++ sessionwidget.h | 2 +- svg/unity.svg | 8 ++++++++ 12 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 icons/128x128/unity.png create mode 100644 icons/16x16/unity.png create mode 100644 icons/32x32/unity.png create mode 100644 icons/64x64/unity.png create mode 100644 svg/unity.svg The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 126827b..2392946 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,10 @@ x2goclient (3.99.2.1-0~x2go1) UNRELEASED; urgency=low * New upstream version (3.99.2.1): - German i18n update for published applications. + [ Mike Gabriel ] + * New upstream version (3.99.2.1): + - Add Ubuntu-2d (Unity) support to X2Go Client. + -- Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> Mon, 16 Apr 2012 13:15:47 +0200 x2goclient (3.99.2.0-0~x2go1) unstable; urgency=low diff --git a/icons/128x128/unity.png b/icons/128x128/unity.png new file mode 100644 index 0000000..e953c76 Binary files /dev/null and b/icons/128x128/unity.png differ diff --git a/icons/16x16/unity.png b/icons/16x16/unity.png new file mode 100644 index 0000000..f6fc88d Binary files /dev/null and b/icons/16x16/unity.png differ diff --git a/icons/32x32/unity.png b/icons/32x32/unity.png new file mode 100644 index 0000000..c13cf9a Binary files /dev/null and b/icons/32x32/unity.png differ diff --git a/icons/64x64/unity.png b/icons/64x64/unity.png new file mode 100644 index 0000000..3062e96 Binary files /dev/null and b/icons/64x64/unity.png differ diff --git a/onmainwindow.cpp b/onmainwindow.cpp index 7bda2ed..6cbd6b4 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -5470,6 +5470,10 @@ void ONMainWindow::runCommand() { command="gnome-session"; } + else if ( command=="UNITY" ) + { + command="unity"; + } else if ( command=="LXDE" ) { command="startlxde"; diff --git a/resources.rcc b/resources.rcc index 4263b23..3953a75 100644 --- a/resources.rcc +++ b/resources.rcc @@ -54,6 +54,7 @@ <file>icons/16x16/delete.png</file> <file>icons/16x16/edit.png</file> <file>icons/16x16/gnome.png</file> + <file>icons/16x16/unity.png</file> <file>icons/16x16/kde.png</file> <file>icons/16x16/new_file.png</file> <file>icons/16x16/resolution.png</file> diff --git a/sessionbutton.cpp b/sessionbutton.cpp index 63be020..f53d82a 100644 --- a/sessionbutton.cpp +++ b/sessionbutton.cpp @@ -337,6 +337,7 @@ void SessionButton::redraw() cmdBox->addItem ( "KDE" ); cmdBox->addItem ( "GNOME" ); cmdBox->addItem ( "LXDE" ); + cmdBox->addItem ( "UNITY" ); cmdBox->addItem ( tr ( "RDP connection" ) ); cmdBox->addItem ( tr ( "XDMCP" ) ); cmdBox->addItem ( tr ( "Connection to local desktop" ) ); @@ -355,6 +356,11 @@ void SessionButton::redraw() cmdpix.load ( par->iconsPath ( "/16x16/gnome.png" ) ); cmdBox->setCurrentIndex ( GNOME ); } + else if ( command =="UNITY" ) + { + cmdpix.load ( par->iconsPath ( "/16x16/unity.png" ) ); + cmdBox->setCurrentIndex ( UNITY ); + } else if ( command =="LXDE" ) { cmdpix.load ( par->iconsPath ( "/16x16/lxde.png" ) ); @@ -631,6 +637,11 @@ void SessionButton::slot_cmd_change ( const QString& command ) newRootless=false; pix.load ( par->iconsPath ( "/16x16/lxde.png" ) ); } + else if ( command =="UNITY" ) + { + newRootless=false; + pix.load ( par->iconsPath ( "/16x16/unity.png" ) ); + } else if ( command ==tr ( "Connection to local desktop" ) ) { newRootless=false; @@ -669,6 +680,11 @@ void SessionButton::slot_cmd_change ( const QString& command ) cmd="LXDE"; newRootless=false; } + if ( command=="unity" ) + { + cmd="UNITY"; + newRootless=false; + } if (command== tr("Published applications")) { published=true; diff --git a/sessionbutton.h b/sessionbutton.h index a12aaf6..c5eea1e 100644 --- a/sessionbutton.h +++ b/sessionbutton.h @@ -26,7 +26,7 @@ class SessionButton : public SVGFrame { Q_OBJECT public: - enum {KDE,GNOME,LXDE,RDP,XDMCP,SHADOW,PUBLISHED,OTHER,APPLICATION}; + enum {KDE,GNOME,UNITY,LXDE,RDP,XDMCP,SHADOW,PUBLISHED,OTHER,APPLICATION}; SessionButton ( ONMainWindow* mw, QWidget* parent,QString id ); ~SessionButton(); QString id() { diff --git a/sessionwidget.cpp b/sessionwidget.cpp index 6e12843..2f66aa2 100644 --- a/sessionwidget.cpp +++ b/sessionwidget.cpp @@ -124,6 +124,7 @@ SessionWidget::SessionWidget ( QString id, ONMainWindow * mw, sessBox->addItem ( "KDE" ); sessBox->addItem ( "GNOME" ); sessBox->addItem ( "LXDE" ); + sessBox->addItem ( "UNITY" ); sessBox->addItem ( tr ( "Connect to Windows terminal server" ) ); sessBox->addItem ( tr ( "XDMCP" ) ); sessBox->addItem ( tr ( "Connect to local desktop" ) ); @@ -391,6 +392,11 @@ void SessionWidget::readConfig() sessBox->setCurrentIndex ( LXDE ); cmd->setEnabled ( false ); } + else if ( command=="UNITY" ) + { + sessBox->setCurrentIndex ( UNITY ); + cmd->setEnabled ( false ); + } else if ( command=="SHADOW" ) { sessBox->setCurrentIndex ( SHADOW ); diff --git a/sessionwidget.h b/sessionwidget.h index 5dd0bd4..869d9bb 100644 --- a/sessionwidget.h +++ b/sessionwidget.h @@ -40,7 +40,7 @@ private slots: void slot_rdpOptions(); private: - enum {KDE,GNOME,LXDE,RDP,XDMCP,SHADOW,OTHER,APPLICATION,PUBLISHED}; + enum {KDE,GNOME,LXDE,UNITY,RDP,XDMCP,SHADOW,OTHER,APPLICATION,PUBLISHED}; QLineEdit* sessName; QLineEdit* uname; QLineEdit* server; diff --git a/svg/unity.svg b/svg/unity.svg new file mode 100644 index 0000000..5c1f9cf --- /dev/null +++ b/svg/unity.svg @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> +<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" version="1.1" width="60.513618" height="60.513618" id="svg3036" style="display:inline"> + <g transform="translate(-1.7431908,-1.4941635)" id="layer1" style="display:inline"> + <path d="M 30.25,0 C 13.539626,0 0,13.539626 0,30.25 0,46.960374 13.539626,60.5 30.25,60.5 46.960374,60.5 60.5,46.960374 60.5,30.25 c 0,-2.078212 -0.194675,-4.102133 -0.59375,-6.0625 -0.304345,1.200557 -0.637476,2.348209 -1,3.46875 -0.410672,1.260002 -0.836505,2.461168 -1.3125,3.5625 -0.186671,0.419999 -0.388421,0.763832 -0.59375,1.0625 -0.196003,0.307998 -0.413587,0.553998 -0.65625,0.75 -0.242669,0.195998 -0.535753,0.344164 -0.84375,0.4375 -0.298669,0.09333 -0.617335,0.156247 -1,0.15625 -0.102668,-3e-6 -0.231751,-0.01259 -0.34375,-0.03125 -0.112001,-0.0093 -0.200501,-0.0345 -0.3125,-0.0625 -0.102667,-0.01867 -0.219167,-0.0345 -0.3125,-0.0625 -0.084,-0.028 -0.150167,-0.04384 -0.1875,-0.0625 l 0.25,-1.0625 c 0.102666,0.04666 0.247583,0.08767 0.40625,0.125 0.167999,0.04666 0.310082,0.0625 0.46875,0.0625 0.513332,-2e-6 0.929415,-0.110418 1.21875,-0.34375 0.289331,-0.224001 0.547914,-0.580417 0.78125,-1.09375 -0.588003,-1.119999 -1.142919,-2.311831 -1.65625,-3.5625 -0.504001,- 1.259995 -0.914001,-2.524494 -1.25,-3.8125 l 1.375,0 c 0.102665,0.420007 0.234998,0.858423 0.375,1.34375 0.149331,0.485339 0.322664,0.986672 0.5,1.5 0.177331,0.513337 0.357164,1.01792 0.5625,1.53125 0.20533,0.513336 0.432246,1.024002 0.65625,1.5 0.354663,-0.979998 0.644912,-1.944913 0.90625,-2.90625 0.261328,-0.961328 0.516662,-1.95141 0.75,-2.96875 l 1.125,0 C 56.82527,10.149634 44.716711,0 30.25,0 z m 29.5625,23.71875 c 0.03198,0.145258 0.06387,0.291467 0.09375,0.4375 0.03784,-0.149571 0.08807,-0.286689 0.125,-0.4375 l -0.21875,0 z M 45.78125,20.6875 c 0.233331,10e-6 0.435081,0.06009 0.59375,0.21875 0.167997,0.149343 0.249997,0.363676 0.25,0.625 -3e-6,0.261343 -0.082,0.466342 -0.25,0.625 -0.158669,0.149342 -0.360419,0.218759 -0.59375,0.21875 -0.233335,9e-6 -0.425751,-0.06941 -0.59375,-0.21875 -0.158668,-0.158658 -0.218751,-0.363657 -0.21875,-0.625 -10e-7,-0.261324 0.06008,-0.475657 0.21875,-0.625 0.167999,-0.158656 0.360415,-0.21874 0.59375,-0.21875 z m 4.1875,0.75 0,2.281 25 2.78125,0 0,1.09375 -2.78125,0 0,3.34375 c -2e-6,0.364002 0.03775,0.663585 0.09375,0.90625 0.056,0.233335 0.137997,0.422501 0.25,0.5625 0.111997,0.130668 0.269497,0.225251 0.4375,0.28125 0.167997,0.056 0.338497,0.09375 0.5625,0.09375 0.391996,1e-6 0.704162,-0.041 0.9375,-0.125 0.242662,-0.09333 0.406662,-0.181415 0.5,-0.21875 L 53.03125,30.75 c -0.130672,0.06533 -0.360838,0.156667 -0.6875,0.25 -0.326671,0.102667 -0.705004,0.125 -1.125,0.125 -0.49467,0 -0.923336,-0.03492 -1.25,-0.15625 C 49.651415,30.838083 49.414748,30.627 49.21875,30.375 49.022749,30.123001 48.865249,29.832751 48.78125,29.46875 48.70658,29.095419 48.6875,28.672836 48.6875,28.1875 l 0,-6.5 1.28125,-0.25 z m -38.9375,1.90625 5.1875,0 0,15.25 c -9e-6,3.546677 0.56749,6.063091 1.6875,7.59375 1.119988,1.530671 3.005569,2.312504 5.65625,2.3125 0.559983,4e-6 1.152649,-0.02516 1.75,-0.0625 0.597314,-0.03733 1.164814,-0.08766 1.6875,-0.125 0.522646,-0.07466 0.964312,-0.118912 1.375,-0.15625 0.447978,-0.07466 0.78 2061,-0.144079 0.96875,-0.21875 l 0,-24.59375 5.1875,0 0,28.28125 c -1.194693,0.298667 -2.771358,0.63275 -4.75,0.96875 -1.941354,0.336 -4.205269,0.499999 -6.78125,0.5 -2.240014,-10e-7 -4.125595,-0.334084 -5.65625,-0.96875 -1.530676,-0.671999 -2.754174,-1.586581 -3.6875,-2.78125 -0.933339,-1.194662 -1.589339,-2.613411 -2,-4.21875 -0.410671,-1.642658 -0.625004,-3.458823 -0.625,-5.4375 l 0,-16.34375 z m 28.9375,0.21875 c 0.578662,7e-6 1.054828,0.08201 1.4375,0.25 0.382661,0.158674 0.682244,0.38884 0.90625,0.6875 0.233327,0.28934 0.40666,0.620589 0.5,1.03125 0.09333,0.410672 0.124993,0.880338 0.125,1.375 l 0,4.09375 -1.3125,0 0,-3.8125 c -6e-6,-0.447996 -0.02842,-0.838912 -0.09375,-1.15625 C 41.475244,25.713922 41.389995,25.446006 41.25,25.25 c -0.140005,-0.195994 -0.329172,-0.322244 -0.5625,-0.40625 -0.233338,-0.09333 -0.529671,-0.156244 -0.875,-0.15625 -0.140004,6e-6 -0.28817,0.02192 -0.4375,0.03125 -0.149337,0.0093 -0.297503,0.01259 -0.4375,0.03125 -0.13067,0.0093 -0.231753,0 .04384 -0.34375,0.0625 -0.102669,0.01867 -0.172086,0.02192 -0.21875,0.03125 l 0,6.15625 -1.3125,0 0,-7.09375 c 0.298665,-0.07466 0.692831,-0.134743 1.1875,-0.21875 0.494664,-0.08399 1.074747,-0.124993 1.71875,-0.125 z m 5.1875,0.15625 1.3125,0 0,7.28125 -1.3125,0 0,-7.28125 z" transform="translate(1.7431908,1.4941635)" id="path3047" style="fill:#982e6f;fill-opacity:1;stroke:none" /> + </g> +</svg> hooks/post-receive -- x2goclient.git (X2Go Client) 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 "x2goclient.git" (X2Go Client).