[X2go-Commits] x2goclient2.git - master (branch) updated: 7168e499fc8164dfe3c3acdb71eb18f6a33b3be2

X2Go dev team git-admin at x2go.org
Tue Nov 13 14:54:46 CET 2012


The branch, master has been updated
       via  7168e499fc8164dfe3c3acdb71eb18f6a33b3be2 (commit)
      from  8ba7c540ae8492624a753c3f32b1e49b658d4018 (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 7168e499fc8164dfe3c3acdb71eb18f6a33b3be2
Author: Oleksandr Shneyder <o.shneyder at phoca-gmbh.de>
Date:   Tue Nov 13 14:53:38 2012 +0100

    remove class SVGFrame. Some optical improvements.

-----------------------------------------------------------------------

Summary of changes:
 configuratorprofile.cpp       |    2 +-
 configuratorprofile.ui        |    8 +-
 mainwindow.cpp                |    1 -
 png/profileselected.png       |  Bin 1155 -> 1059 bytes
 profile.cpp                   |    7 +-
 profile.ui                    |    8 +-
 profileform.cpp               |    4 +-
 profileform.h                 |    4 +-
 profileform.ui                |   12 ++-
 resources.qrc                 |    2 -
 searchbar.cpp                 |    3 +-
 searchbar.h                   |    4 +-
 searchbar.ui                  |    4 +-
 sessionform.cpp               |    4 +-
 sessionform.h                 |    4 +-
 sessionform.ui                |   17 +++-
 svg/profileformbackground.svg |  173 +++++++++++++++++++++++++++++++++--------
 svg/profileselected.svg       |   30 +++++--
 svgframe.cpp                  |   79 -------------------
 svgframe.h                    |   46 -----------
 toolbar.cpp                   |    2 +-
 workarea.cpp                  |    4 +-
 x2goapplication.cpp           |    5 +-
 x2goclient2.pro               |    2 -
 24 files changed, 216 insertions(+), 209 deletions(-)
 delete mode 100644 svgframe.cpp
 delete mode 100644 svgframe.h

The diff of changes is:
diff --git a/configuratorprofile.cpp b/configuratorprofile.cpp
index b1cdb0e..bf8670d 100644
--- a/configuratorprofile.cpp
+++ b/configuratorprofile.cpp
@@ -45,7 +45,7 @@ void ConfiguratorProfile::init()
 
 void ConfiguratorProfile::apply()
 {
-    profile->set_picture(pbIcon->icon().pixmap(60,60));
+    profile->set_picture(pbIcon->icon().pixmap(50,50));
     profile->set_profileName(leName->text());
     ProfileDetailConfigurator::apply();
 }
diff --git a/configuratorprofile.ui b/configuratorprofile.ui
index 91ef88f..d441738 100644
--- a/configuratorprofile.ui
+++ b/configuratorprofile.ui
@@ -40,14 +40,14 @@
       <widget class="QPushButton" name="pbIcon">
        <property name="minimumSize">
         <size>
-         <width>60</width>
-         <height>60</height>
+         <width>50</width>
+         <height>50</height>
         </size>
        </property>
        <property name="maximumSize">
         <size>
-         <width>60</width>
-         <height>60</height>
+         <width>50</width>
+         <height>50</height>
         </size>
        </property>
        <property name="focusPolicy">
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 1590319..a2bbe84 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -28,7 +28,6 @@
 #include <QResizeEvent>
 #include <QDebug>
 #include "workarea.h"
-#include "svgframe.h"
 #include "x2goapplication.h"
 
 MainWindow::MainWindow(QWidget* parent, Qt::WindowFlags flags): QMainWindow(parent, flags)
diff --git a/png/profileselected.png b/png/profileselected.png
index 54ce469..d6c7498 100644
Binary files a/png/profileselected.png and b/png/profileselected.png differ
diff --git a/profile.cpp b/profile.cpp
index 199bb29..bc49225 100644
--- a/profile.cpp
+++ b/profile.cpp
@@ -260,7 +260,7 @@ void Profile::updateProfileDetails()
     lProfileName->setText(profileName);
     lSessionInfo->setText(infoText);
     lSessionStatus->setText(statusText);
-    lPicture->setPixmap(QPixmap(picture).scaled(58,58,Qt::KeepAspectRatio, Qt::SmoothTransformation));
+    lPicture->setPixmap(QPixmap(picture).scaled(50,50,Qt::KeepAspectRatio, Qt::SmoothTransformation));
 }
 
 void Profile::setupRegularWidget()
@@ -352,10 +352,10 @@ void Profile::loadProfile()
     {
         QString iconFile=settings->value("icon", QString()).toString();
         if(QFile::exists(iconFile))
-            picture=QPixmap(iconFile).scaled(60,60,Qt::KeepAspectRatio,Qt::SmoothTransformation);
+            picture=QPixmap(iconFile).scaled(50,50,Qt::KeepAspectRatio,Qt::SmoothTransformation);
     }
     if(picture.isNull())
-        picture=QPixmap(":icons/128x128/x2gosession.png").scaled(60,60,Qt::KeepAspectRatio,Qt::SmoothTransformation);
+        picture=QPixmap(":icons/128x128/x2gosession.png").scaled(50,50,Qt::KeepAspectRatio,Qt::SmoothTransformation);
 
     QString confProxyType="SSH";
 
@@ -498,3 +498,4 @@ void Profile::saveProfile()
     settings->sync();
     settings->endGroup();
 }
+
diff --git a/profile.ui b/profile.ui
index 14049e8..a5d89f7 100644
--- a/profile.ui
+++ b/profile.ui
@@ -54,14 +54,14 @@
     <widget class="QLabel" name="lPicture">
      <property name="minimumSize">
       <size>
-       <width>58</width>
-       <height>58</height>
+       <width>50</width>
+       <height>50</height>
       </size>
      </property>
      <property name="maximumSize">
       <size>
-       <width>58</width>
-       <height>58</height>
+       <width>50</width>
+       <height>50</height>
       </size>
      </property>
      <property name="styleSheet">
diff --git a/profileform.cpp b/profileform.cpp
index c8a3d2e..c3c9af5 100644
--- a/profileform.cpp
+++ b/profileform.cpp
@@ -34,7 +34,7 @@
 
 #include "mainwindow.h"
 
-ProfileForm::ProfileForm(QWidget* parent, Qt::WindowFlags f):SVGFrame(":svg/profileformbackground.svg",parent, f)
+ProfileForm::ProfileForm(QWidget* parent, Qt::WindowFlags f):QFrame(parent, f)
 {
     setupUi(this);
     toolBar=new ToolBar(this);
@@ -86,7 +86,7 @@ QLineEdit* ProfileForm::getSearchField()
 
 void ProfileForm::resizeEvent(QResizeEvent* event)
 {
-    SVGFrame::resizeEvent(event);
+    QFrame::resizeEvent(event);
     emit signalViewPortResized();
 }
 
diff --git a/profileform.h b/profileform.h
index 02f6573..adb44d0 100644
--- a/profileform.h
+++ b/profileform.h
@@ -21,15 +21,13 @@
 #ifndef PROFILEFORM_H
 #define PROFILEFORM_H
 
-#include "svgframe.h"
 #include "ui_profileform.h"
 
 class QScrollBar;
-class SVGFrame;
 class ToolBar;
 class SearchBar;
 
-class ProfileForm : public SVGFrame, public Ui_ProfileForm
+class ProfileForm : public QFrame, public Ui_ProfileForm
 {
     Q_OBJECT
 public:
diff --git a/profileform.ui b/profileform.ui
index 6627207..bd6b788 100644
--- a/profileform.ui
+++ b/profileform.ui
@@ -13,6 +13,9 @@
   <property name="windowTitle">
    <string>Form</string>
   </property>
+  <property name="styleSheet">
+   <string notr="true">border-image: url(:svg/profileformbackground.svg)</string>
+  </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <property name="spacing">
     <number>0</number>
@@ -53,7 +56,7 @@
         <enum>Qt::NoFocus</enum>
        </property>
        <property name="styleSheet">
-        <string notr="true">border:transparent</string>
+        <string notr="true">border-image: url(:svg/transparent.svg); border-left: 0px transparent</string>
        </property>
        <property name="text">
         <string/>
@@ -91,7 +94,7 @@
       <enum>Qt::NoFocus</enum>
      </property>
      <property name="styleSheet">
-      <string notr="true">background:transparent</string>
+      <string notr="true">border-image: url(:svg/transparent.svg); border-left: 0px transparent</string>
      </property>
      <property name="frameShape">
       <enum>QFrame::NoFrame</enum>
@@ -114,6 +117,9 @@
         <height>252</height>
        </rect>
       </property>
+      <property name="styleSheet">
+       <string notr="true">border-left: 0px transparent</string>
+      </property>
      </widget>
     </widget>
    </item>
@@ -150,7 +156,7 @@
         <enum>Qt::NoFocus</enum>
        </property>
        <property name="styleSheet">
-        <string notr="true">border:transparent</string>
+        <string notr="true">border-image: url(:svg/transparent.svg); border-left: 0px transparent</string>
        </property>
        <property name="text">
         <string/>
diff --git a/resources.qrc b/resources.qrc
index b804dfa..8e60907 100644
--- a/resources.qrc
+++ b/resources.qrc
@@ -4,8 +4,6 @@
        <file>svg/toolbar.svg</file>
        <file>svg/searchbar.svg</file>
        <file>svg/toolbaricon.svg</file>
-       <file>svg/profileselected.svg</file>
-       <file>svg/profile.svg</file>
        <file>svg/settingsleftbar.svg</file>
        <file>svg/transparent.svg</file>
        <file>svg/messagebox.svg</file>
diff --git a/searchbar.cpp b/searchbar.cpp
index 10246e7..e3bb525 100644
--- a/searchbar.cpp
+++ b/searchbar.cpp
@@ -21,10 +21,9 @@
 
 #include "searchbar.h"
 
-SearchBar::SearchBar(QWidget* parent, Qt::WindowFlags f): SVGFrame(":/svg/searchbar.svg", parent, f)
+SearchBar::SearchBar(QWidget* parent, Qt::WindowFlags f): QFrame( parent, f)
 {
     setupUi(this);
-    setRender(true);
     lineEdit->setFocus();
 }
 
diff --git a/searchbar.h b/searchbar.h
index 725e341..d859cc7 100644
--- a/searchbar.h
+++ b/searchbar.h
@@ -21,10 +21,10 @@
 #ifndef SEARCHBAR_H
 #define SEARCHBAR_H
 
-#include "svgframe.h"
+#include <QFrame>
 #include "ui_searchbar.h"
 
-class SearchBar : public SVGFrame, public Ui_searchBar
+class SearchBar : public QFrame, public Ui_searchBar
 {
     Q_OBJECT
 public:
diff --git a/searchbar.ui b/searchbar.ui
index 2a43785..a819e7b 100644
--- a/searchbar.ui
+++ b/searchbar.ui
@@ -29,7 +29,7 @@
    <bool>false</bool>
   </property>
   <property name="styleSheet">
-   <string notr="true">background-image:url(:/svg/searchbar.svg)</string>
+   <string notr="true">border-image:url(:/svg/searchbar.svg)</string>
   </property>
   <widget class="QLineEdit" name="lineEdit">
    <property name="geometry">
@@ -44,7 +44,7 @@
     <enum>Qt::ClickFocus</enum>
    </property>
    <property name="styleSheet">
-    <string notr="true">background:qcolor()</string>
+    <string notr="true">border-image:qcolor()</string>
    </property>
    <property name="frame">
     <bool>false</bool>
diff --git a/sessionform.cpp b/sessionform.cpp
index 2ab653d..5e2b672 100644
--- a/sessionform.cpp
+++ b/sessionform.cpp
@@ -21,10 +21,10 @@
 
 #include "sessionform.h"
 
-SessionForm::SessionForm(QWidget* parent, Qt::WindowFlags f): QWidget(parent, f)
+SessionForm::SessionForm(QWidget* parent, Qt::WindowFlags f): QFrame(parent, f)
 {
     setupUi(this);
-    setFixedSize(1024,768);
+//     setFixedSize(1024,768);
 }
 
 SessionForm::~SessionForm()
diff --git a/sessionform.h b/sessionform.h
index e585053..44eb369 100644
--- a/sessionform.h
+++ b/sessionform.h
@@ -20,9 +20,9 @@
 
 #ifndef SESSIONFORM_H
 #define SESSIONFORM_H
-#include <QWidget>
+#include <QFrame>
 #include "ui_sessionform.h"
-class SessionForm: public QWidget, public Ui_SessionForm
+class SessionForm: public QFrame, public Ui_SessionForm
 {
     Q_OBJECT
 public:
diff --git a/sessionform.ui b/sessionform.ui
index 53a397b..80a59d8 100644
--- a/sessionform.ui
+++ b/sessionform.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>SessionForm</class>
- <widget class="QWidget" name="SessionForm">
+ <widget class="QFrame" name="SessionForm">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -11,9 +11,20 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string>Frame</string>
+  </property>
+  <property name="styleSheet">
+   <string notr="true">border-image: url(:svg/profileformbackground.svg)</string>
+  </property>
+  <property name="frameShape">
+   <enum>QFrame::StyledPanel</enum>
+  </property>
+  <property name="frameShadow">
+   <enum>QFrame::Raised</enum>
   </property>
  </widget>
- <resources/>
+ <resources>
+  <include location="resources.qrc"/>
+ </resources>
  <connections/>
 </ui>
diff --git a/svg/profileformbackground.svg b/svg/profileformbackground.svg
index ce08c57..5cddd2e 100644
--- a/svg/profileformbackground.svg
+++ b/svg/profileformbackground.svg
@@ -10,8 +10,8 @@
    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"
-   width="800.34015"
-   height="560.00452"
+   width="798.41937"
+   height="560.00012"
    id="svg3978"
    version="1.1"
    inkscape:version="0.48.3.1 r9886"
@@ -339,7 +339,7 @@
        xlink:href="#linearGradient2925-4"
        id="linearGradient9022"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.3327097,0,0,0.99999991,799.64421,-119.96923)"
+       gradientTransform="matrix(-1.3327097,0,0,0.99999991,799.64421,-119.96482)"
        x1="420.00003"
        y1="40.000004"
        x2="420.00003"
@@ -349,7 +349,7 @@
        xlink:href="#linearGradient2901-2"
        id="linearGradient9026"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.3319941,0,0,0.99946294,0.018326,-39.734)"
+       gradientTransform="matrix(1.3319941,0,0,0.99946294,0.018326,-39.72959)"
        x1="340.18271"
        y1="39.786118"
        x2="340.18271"
@@ -359,7 +359,7 @@
        xlink:href="#linearGradient2909-4"
        id="linearGradient9029"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.3319941,0,0,0.99946294,0.018326,-39.734)"
+       gradientTransform="matrix(1.3319941,0,0,0.99946294,0.018326,-39.72959)"
        x1="160.08598"
        y1="19.775372"
        x2="160.08598"
@@ -369,7 +369,7 @@
        xlink:href="#linearGradient2925-4"
        id="linearGradient9032"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.3327098,0,0,1,0.018326,-39.9692)"
+       gradientTransform="matrix(1.3327098,0,0,1,0.018326,-39.96479)"
        x1="420.00003"
        y1="40.000004"
        x2="420.00003"
@@ -383,7 +383,117 @@
        y1="268.11078"
        x2="107.64762"
        y2="207.717"
-       gradientTransform="scale(0.99889586,1)" />
+       gradientTransform="matrix(1.0003252,0,0,1,-0.12104616,0.00232314)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2925-4"
+       id="linearGradient4001"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.334183,0,0,1,0.018326,-39.96479)"
+       x1="420.00003"
+       y1="40.000004"
+       x2="420.00003"
+       y2="360.00003" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2909-4"
+       id="linearGradient4003"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.3334665,0,0,0.99946294,0.018326,-39.72959)"
+       x1="160.08598"
+       y1="19.775372"
+       x2="160.08598"
+       y2="460.01181" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2901-2"
+       id="linearGradient4005"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.3334665,0,0,0.99946294,0.018326,-39.72959)"
+       x1="340.18271"
+       y1="39.786118"
+       x2="340.18271"
+       y2="600.08704" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1948-8"
+       id="linearGradient4007"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0014309,0,0,1,-0.12104615,0.00232315)"
+       x1="107.24445"
+       y1="268.11078"
+       x2="107.64762"
+       y2="207.717" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2925-4"
+       id="linearGradient4009"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.3341829,0,0,0.99999991,800.52809,-119.96482)"
+       x1="420.00003"
+       y1="40.000004"
+       x2="420.00003"
+       y2="360.00003" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2925-4"
+       id="linearGradient4012"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.3327097,0,0,0.99999991,799.64417,-119.96482)"
+       x1="420.00003"
+       y1="40.000004"
+       x2="420.00003"
+       y2="360.00003" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2901-2"
+       id="linearGradient4016"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.3319941,0,0,0.99946294,0.34978231,-39.72959)"
+       x1="340.18271"
+       y1="39.786118"
+       x2="340.18271"
+       y2="600.08704" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2909-4"
+       id="linearGradient4019"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.3319941,0,0,0.99946294,0.34978231,-39.72959)"
+       x1="160.08598"
+       y1="19.775372"
+       x2="160.08598"
+       y2="460.01181" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2925-4"
+       id="linearGradient4022"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.3327098,0,0,1,0.34978231,-39.96479)"
+       x1="420.00003"
+       y1="40.000004"
+       x2="420.00003"
+       y2="360.00003" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2925-4"
+       id="linearGradient4025"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.3327097,0,0,0.99999991,799.97563,-119.96482)"
+       x1="420.00003"
+       y1="40.000004"
+       x2="420.00003"
+       y2="360.00003" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1948-8"
+       id="linearGradient4027"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0015149,0,0,0.99981402,-0.00138869,0.05271063)"
+       x1="107.24445"
+       y1="268.11078"
+       x2="107.64762"
+       y2="207.717" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -392,9 +502,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="7.9195959"
-     inkscape:cx="741.3182"
-     inkscape:cy="32.939758"
+     inkscape:zoom="63.356767"
+     inkscape:cx="9.0748858"
+     inkscape:cy="559.49393"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
@@ -403,10 +513,12 @@
      fit-margin-right="0"
      fit-margin-bottom="0"
      inkscape:window-width="1920"
-     inkscape:window-height="1060"
-     inkscape:window-x="-3"
+     inkscape:window-height="1025"
+     inkscape:window-x="1917"
      inkscape:window-y="-3"
-     inkscape:window-maximized="1" />
+     inkscape:window-maximized="1"
+     showborder="true"
+     inkscape:showpageshadow="true" />
   <metadata
      id="metadata3983">
     <rdf:RDF>
@@ -423,50 +535,43 @@
      inkscape:label="Ebene 1"
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(-0.018326,-0.02626705)">
+     transform="translate(-0.34978231,-0.03067684)">
     <rect
        style="fill:#246ed8;fill-opacity:1;stroke:none"
        id="rect3825"
-       width="800"
+       width="798.40717"
        height="560"
-       x="0.3585"
+       x="0.35812438"
        y="0.030676842" />
     <path
        inkscape:connector-curvature="0"
-       style="fill:url(#linearGradient9032);fill-opacity:1;fill-rule:evenodd;stroke:none"
-       d="m 0.018326,280.0308 c 106.616784,40 239.887764,40 371.708224,0 134.7215,-40 294.64668,-40 427.91766,0 l 0,280 -799.625884,0 0,-280 z"
+       style="fill:url(#linearGradient4022);fill-opacity:1;fill-rule:evenodd;stroke:none"
+       d="m 0.34978231,280.0308 c 106.45485769,40 239.52344769,40 371.14370769,0 134.51689,-40 294.19919,-40 427.26777,0 l 0,280 -798.41147769,0 0,-280 z"
        id="rect2894"
        sodipodi:nodetypes="cccccc" />
     <path
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="cccccc"
        id="path2897"
-       d="m 799.64421,360.0308 c -106.61679,40 -239.88777,40 -371.70823,0 -134.7215,-40 -294.6467,-40 -427.917654,0 l 0,200 799.625884,0 0,-200 z"
-       style="fill:url(#linearGradient9029);fill-opacity:1;fill-rule:evenodd;stroke:none" />
+       d="m 798.76126,360.00335 c -106.45276,40.00549 -239.51871,40.00549 -371.13637,0 -134.51424,-40.00549 -294.1934,-40.00549 -427.25932406,0 l 0,200.02745 798.39569406,0 0,-200.02745 z"
+       style="fill:url(#linearGradient4019);fill-opacity:1;fill-rule:evenodd;stroke:none" />
     <path
        inkscape:connector-curvature="0"
-       style="fill:url(#linearGradient9026);fill-opacity:1;fill-rule:evenodd;stroke:none"
-       d="m 0.018326,440.0307 c 106.616774,40.0001 239.887764,40.0001 371.708224,0 134.7215,-39.9999 294.64668,-39.9999 427.91766,0 l 0,120.0001 -799.625884,0 0,-120.0001 z"
+       style="fill:url(#linearGradient4016);fill-opacity:1;fill-rule:evenodd;stroke:none"
+       d="m 0.34978231,440.04333 c 106.45484769,39.99589 239.52344769,39.99589 371.14370769,0 134.51689,-39.99569 294.19919,-39.99569 427.26777,0 l 0,119.98747 -798.41147769,0 0,-119.98747 z"
        id="path2899"
        sodipodi:nodetypes="cccccc" />
     <polygon
-       style="fill:url(#linearGradient9034);fill-opacity:1;fill-rule:evenodd"
+       style="fill:url(#linearGradient4027);fill-opacity:1;fill-rule:evenodd"
        id="polygon17"
-       points="361.238,207.717 361.238,270.933 0,270.933 0,207.717 0,207.717 "
+       points="0,207.717 361.238,207.717 361.238,270.933 0,270.933 0,207.717 "
        class="fil1"
-       transform="matrix(2.2160176,0,0,1.898234,0.01835265,45.7353)" />
+       transform="matrix(2.2102223,0,0,1.8985871,0.35287828,45.639634)" />
     <path
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="cccccc"
        id="path2933"
-       d="m 800.52809,200.01858 c -106.73464,39.98371 -240.15293,39.98371 -372.1191,0 -134.87042,-39.98371 -294.9724,-39.98371 -428.390664,0 l 0,279.88585 800.509764,0 0,-279.88585 z"
-       style="fill:url(#linearGradient9022);fill-opacity:1;fill-rule:evenodd;stroke:none" />
-    <rect
-       y="0.026267052"
-       x="0.35402918"
-       height="560"
-       width="10"
-       id="rect10511"
-       style="fill:url(#linearGradient8984);fill-opacity:1;stroke:none" />
+       d="m 798.76029,200.01858 c -106.4543,39.98371 -239.52215,39.98371 -371.1417,0 -134.51617,-39.98371 -294.19761,-39.98371 -427.26544257,0 l 0,279.88585 798.40714257,0 0,-279.88585 z"
+       style="fill:url(#linearGradient4025);fill-opacity:1;fill-rule:evenodd;stroke:none" />
   </g>
 </svg>
diff --git a/svg/profileselected.svg b/svg/profileselected.svg
index ec79274..8f1ff97 100644
--- a/svg/profileselected.svg
+++ b/svg/profileselected.svg
@@ -33,7 +33,7 @@
     </rdf:RDF>
   </metadata>
   <sodipodi:namedview
-     inkscape:window-height="1060"
+     inkscape:window-height="1025"
      inkscape:window-width="1920"
      inkscape:pageshadow="2"
      inkscape:pageopacity="0.0"
@@ -41,10 +41,10 @@
      bordercolor="#666666"
      pagecolor="#ffffff"
      id="base"
-     inkscape:zoom="6.5798147"
-     inkscape:cx="85.342274"
-     inkscape:cy="44.910478"
-     inkscape:window-x="-3"
+     inkscape:zoom="3.2899074"
+     inkscape:cx="241.38923"
+     inkscape:cy="15.870296"
+     inkscape:window-x="1917"
      inkscape:window-y="-3"
      inkscape:current-layer="svg2251"
      showgrid="true"
@@ -69,9 +69,25 @@
     <linearGradient
        id="linearGradient10227">
       <stop
-         style="stop-color:#aaccff;stop-opacity:1;"
+         id="stop4615"
          offset="0"
-         id="stop10229" />
+         style="stop-color:#b4d2ff;stop-opacity:0;" />
+      <stop
+         style="stop-color:#b5d2ff;stop-opacity:0.03921569;"
+         offset="0.046875"
+         id="stop4621" />
+      <stop
+         style="stop-color:#b9d5ff;stop-opacity:0.60784316;"
+         offset="0.1875"
+         id="stop4617" />
+      <stop
+         id="stop4613"
+         offset="0.25"
+         style="stop-color:#bfd8ff;stop-opacity:1;" />
+      <stop
+         style="stop-color:#dfebff;stop-opacity:1;"
+         offset="0.625"
+         id="stop4623" />
       <stop
          style="stop-color:#ffffff;stop-opacity:1;"
          offset="1"
diff --git a/svgframe.cpp b/svgframe.cpp
deleted file mode 100644
index 71db116..0000000
--- a/svgframe.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-/**************************************************************************
-*   Copyright (C) 2005-2012 by Oleksandr Shneyder                         *
-*   o.shneyder at phoca-gmbh.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.,                                       *
-*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
-***************************************************************************/
-
-#include "svgframe.h"
-#include <QPainter>
-#include <QTimer>
-#include <QResizeEvent>
-SVGFrame::SVGFrame ( QString fname, QWidget* parent,
-                     Qt::WFlags f ) :QFrame ( parent,f )
-{
-    renderer=new QSvgRenderer ( this );
-    setAutoFillBackground ( true );
-    render=false;
-    background=fname;
-    backgroundLoaded=false;
-}
-
-void SVGFrame::setRender(bool value)
-{
-    if(value &&!render)
-        renderBackground();
-    render=value;
-}
-
-void SVGFrame::renderBackground()
-{
-    if(!backgroundLoaded)
-    {
-        renderer->load ( background );
-        backgroundLoaded=true;
-    }
-    QPalette pal=palette();
-    QImage img ( size(),QImage::Format_ARGB32_Premultiplied );
-    QPainter p ( &img );
-    if ( p.isActive() )
-        renderer->render ( &p );
-    pal.setBrush ( QPalette::Window,QBrush ( img ) );
-    setPalette ( pal );
-}
-
-
-void SVGFrame::resizeEvent ( QResizeEvent* event )
-{
-    QFrame::resizeEvent ( event );
-    if(!render)
-        return;
-    emit resized ( event->size() );
-    if(!render)
-        return;
-    if ( event->size().width() >0 && event->size().height() >0 )
-    {
-        renderBackground();
-    }
-}
-
-QSize SVGFrame::sizeHint() const
-{
-    if(backgroundLoaded)
-        return renderer->defaultSize();
-    else
-        return QFrame::sizeHint();
-}
diff --git a/svgframe.h b/svgframe.h
deleted file mode 100644
index b91c547..0000000
--- a/svgframe.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/**************************************************************************
-*   Copyright (C) 2005-2012 by Oleksandr Shneyder                         *
-*   o.shneyder at phoca-gmbh.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.,                                       *
-*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
-***************************************************************************/
-
-#ifndef SVGFRAME_H
-#define SVGFRAME_H
-
-#include <QFrame>
-#include <QtSvg/QSvgRenderer>
-
-class SVGFrame: public QFrame
-{
-    Q_OBJECT
-public:
-    SVGFrame ( QString fname, QWidget* parent=0, Qt::WFlags f=0 );
-    virtual QSize sizeHint() const;
-    void setRender(bool value);
-private:
-    QSvgRenderer* renderer;
-    bool render;
-    QString background;
-    bool backgroundLoaded;
-private:
-    void renderBackground();
-protected:
-    virtual void resizeEvent ( QResizeEvent* event );
-signals:
-    void resized ( const QSize );
-};
-#endif
diff --git a/toolbar.cpp b/toolbar.cpp
index d23ea0b..a54fb37 100644
--- a/toolbar.cpp
+++ b/toolbar.cpp
@@ -25,7 +25,7 @@
 ToolBar::ToolBar(QWidget* parent): QToolBar(parent)
 {
     setFixedHeight(40);
-    setStyleSheet("border-image: url(:svg/toolbar.svg)");
+    setStyleSheet("border-image: url(:svg/toolbar.svg); border-left: 0px transparent");
     layout()->setContentsMargins(20,0,0,0);
     setFloatable(false);
     setMovable(false);
diff --git a/workarea.cpp b/workarea.cpp
index dc619b7..d232006 100644
--- a/workarea.cpp
+++ b/workarea.cpp
@@ -61,7 +61,7 @@ WorkArea::WorkArea(QWidget* parent, Qt::WindowFlags f): QWidget( parent, f)
 
     QTimer::singleShot(100, this, SLOT(slotResizeChildForms()));
     formToScroll=profileForm;
-    sessionForm->hide();
+    profileSettingsForm->hide();
 }
 
 WorkArea::~WorkArea()
@@ -140,7 +140,7 @@ void WorkArea::slotScrollChildForms()
         scrollArea->horizontalScrollBar()->setValue(scrollArea->horizontalScrollBar()->value()+inc);
         QTimer::singleShot(10, this, SLOT(slotScrollChildForms()));
     }
-    profileForm->setRender(true);
+//     profileForm->setRender(true);
 }
 
 void WorkArea::resizeEvent(QResizeEvent* event)
diff --git a/x2goapplication.cpp b/x2goapplication.cpp
index 7ff0050..bece575 100644
--- a/x2goapplication.cpp
+++ b/x2goapplication.cpp
@@ -35,6 +35,7 @@
 #include "x2gobroker.h"
 #include "profilesettingsform.h"
 #include "sshconnection.h"
+#include "sessionform.h"
 
 X2GoApplication::X2GoApplication(int& argc, char** argv, int flags): QApplication(argc, argv, flags)
 {
@@ -111,9 +112,9 @@ void X2GoApplication::slotInitApplication()
         connect(broker, SIGNAL(signalSessionsLoaded()), this, SLOT(slotBrokerSessionsConfig()));
         broker->slotGetUserSessions();
     }
-    if(clientConfig->get_disallowSessionEdit().get_value().toBool())
+    if(!clientConfig->get_disallowSessionEdit().get_value().toBool())
     {
-        profileSettingsForm->hide();
+        profileSettingsForm->show();
     }
 }
 
diff --git a/x2goclient2.pro b/x2goclient2.pro
index 6962eac..0863374 100755
--- a/x2goclient2.pro
+++ b/x2goclient2.pro
@@ -33,7 +33,6 @@ SOURCES += main.cpp \
            mainwindow.cpp \
            workarea.cpp \
            profileform.cpp \
-           svgframe.cpp \
            sessionform.cpp \
            profilesettingsform.cpp \
            toolbar.cpp \
@@ -64,7 +63,6 @@ SOURCES += main.cpp \
 HEADERS += mainwindow.h \
            workarea.h \
            profileform.h \
-           svgframe.h \
            sessionform.h \
            profilesettingsform.h \
            toolbar.h \


hooks/post-receive
-- 
x2goclient2.git (X2Go Client 2 (rewrite of x2goclient.git))

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 "x2goclient2.git" (X2Go Client 2 (rewrite of x2goclient.git)).




More information about the x2go-commits mailing list