[X2go-Commits] x2goclient.git - master (branch) updated: 3.99.1.1-8-gd21f730

X2Go dev team git-admin at x2go.org
Fri Mar 9 11:17:52 CET 2012


The branch, master has been updated
       via  d21f730472d689a71323a2a1345379649896351d (commit)
       via  bdecf63922e7f24ceb9e69fe48369f010ab80cf1 (commit)
      from  8dd4fca284fbaa90680879a86015c4c82e98b51e (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 d21f730472d689a71323a2a1345379649896351d
Author: Oleksandr Shneyder <oleksandr.shneyder at treuchtlingen.de>
Date:   Fri Mar 9 11:16:38 2012 +0100

    Fixed bug "light font colour on light background" by dark colour schema.

commit bdecf63922e7f24ceb9e69fe48369f010ab80cf1
Author: Oleksandr Shneyder <oleksandr.shneyder at treuchtlingen.de>
Date:   Fri Mar 9 11:14:09 2012 +0100

    changelog fix

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

Summary of changes:
 debian/changelog       |    4 ++-
 onmainwindow_part4.cpp |   24 +++++++++++++--
 sessionbutton.cpp      |   21 ++++++++++--
 userbutton.cpp         |   79 +++++++++++++++++++++++++----------------------
 4 files changed, 83 insertions(+), 45 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index a0fef9a..49714f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,12 @@
 x2goclient (3.99.2.0-0~x2go1) UNRELEASED; urgency=low
 
-  * New upstream version (3.99.1.2):
+  [ Oleksandr Shneyder ]
+  * New upstream version (3.99.2.0):
     - Support for "published applications".
       Sponsored by Stefan Baur (http://www.baur-itcs.de).
     - Command line argument "--session-conf=<file>": path to alternative
       session config.
+    - Fixed bug "light font colour on light background" by dark colour schema.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 07 Mar 2012 21:02:15 +0100
 
diff --git a/onmainwindow_part4.cpp b/onmainwindow_part4.cpp
index db1b860..65dd520 100644
--- a/onmainwindow_part4.cpp
+++ b/onmainwindow_part4.cpp
@@ -1640,12 +1640,19 @@ void ONMainWindow::initPassDlg()
         passForm->setFixedSize ( 310,180 );
     QPalette pal=passForm->palette();
     pal.setBrush ( QPalette::Window, QColor ( 255,255,255,0 ) );
+    pal.setColor ( QPalette::Active, QPalette::WindowText, QPalette::Mid );
+    pal.setColor ( QPalette::Active, QPalette::ButtonText, QPalette::Mid );
+    pal.setColor ( QPalette::Active, QPalette::Text, QPalette::Mid );
+    pal.setColor ( QPalette::Inactive, QPalette::WindowText, QPalette::Mid );
+    pal.setColor ( QPalette::Inactive, QPalette::ButtonText, QPalette::Mid );
+    pal.setColor ( QPalette::Inactive, QPalette::Text, QPalette::Mid );
     passForm->setPalette ( pal );
 
     pal.setColor ( QPalette::Button, QColor ( 255,255,255,0 ) );
     pal.setColor ( QPalette::Window, QColor ( 255,255,255,255 ) );
     pal.setColor ( QPalette::Base, QColor ( 255,255,255,255 ) );
 
+
     QFont fnt=passForm->font();
     if ( miniMode )
 #ifdef Q_WS_HILDON
@@ -1713,9 +1720,6 @@ void ONMainWindow::initPassDlg()
 
 
 
-    pal.setColor ( QPalette::Button, QColor ( 255,255,255,0 ) );
-    pal.setColor ( QPalette::Window, QColor ( 255,255,255,255 ) );
-    pal.setColor ( QPalette::Base, QColor ( 255,255,255,255 ) );
     cbLayout->setPalette ( pal );
     ok->setPalette ( pal );
     cancel->setPalette ( pal );
@@ -1833,6 +1837,13 @@ void ONMainWindow::initStatusDlg()
     username->addWidget ( sessionStatusDlg );
     QPalette pal=sessionStatusDlg->palette();
     pal.setBrush ( QPalette::Window, QColor ( 0,0,0,0 ) );
+    pal.setColor ( QPalette::Active, QPalette::WindowText, QPalette::Mid );
+    pal.setColor ( QPalette::Active, QPalette::ButtonText, QPalette::Mid );
+    pal.setColor ( QPalette::Active, QPalette::Text, QPalette::Mid );
+    pal.setColor ( QPalette::Inactive, QPalette::WindowText, QPalette::Mid );
+    pal.setColor ( QPalette::Inactive, QPalette::ButtonText, QPalette::Mid );
+    pal.setColor ( QPalette::Inactive, QPalette::Text, QPalette::Mid );
+
     sessionStatusDlg->setPalette ( pal );
 
     slName=new QLabel ( sessionStatusDlg );
@@ -1990,6 +2001,13 @@ void ONMainWindow::initSelectSessDlg()
         selectSessionDlg->setFixedSize ( 310,180 );
     QPalette pal=selectSessionDlg->palette();
     pal.setBrush ( QPalette::Window, QColor ( 255,255,255,0 ) );
+    pal.setColor ( QPalette::Active, QPalette::WindowText, QPalette::Mid );
+    pal.setColor ( QPalette::Active, QPalette::ButtonText, QPalette::Mid );
+    pal.setColor ( QPalette::Active, QPalette::Text, QPalette::Mid );
+    pal.setColor ( QPalette::Inactive, QPalette::WindowText, QPalette::Mid );
+    pal.setColor ( QPalette::Inactive, QPalette::ButtonText, QPalette::Mid );
+    pal.setColor ( QPalette::Inactive, QPalette::Text, QPalette::Mid );
+
     selectSessionDlg->setPalette ( pal );
 
     pal.setColor ( QPalette::Button, QColor ( 255,255,255,0 ) );
diff --git a/sessionbutton.cpp b/sessionbutton.cpp
index be840aa..63be020 100644
--- a/sessionbutton.cpp
+++ b/sessionbutton.cpp
@@ -33,6 +33,19 @@ SessionButton::SessionButton ( ONMainWindow* mw,QWidget *parent, QString id )
 {
     editable=mw->sessionEditEnabled();
 
+
+    QPalette pal=palette();
+    pal.setColor ( QPalette::Active, QPalette::WindowText, QPalette::Mid );
+    pal.setColor ( QPalette::Active, QPalette::ButtonText, QPalette::Mid );
+    pal.setColor ( QPalette::Active, QPalette::Text, QPalette::Mid );
+    pal.setColor ( QPalette::Inactive, QPalette::WindowText, QPalette::Mid );
+    pal.setColor ( QPalette::Inactive, QPalette::ButtonText, QPalette::Mid );
+    pal.setColor ( QPalette::Inactive, QPalette::Text, QPalette::Mid );
+
+    setPalette(pal);
+
+
+
     QFont fnt=font();
     if ( mw->retMiniMode() )
 #ifdef Q_WS_HILDON
@@ -57,8 +70,8 @@ SessionButton::SessionButton ( ONMainWindow* mw,QWidget *parent, QString id )
     cmdBox=new QComboBox ( this );
     cmdBox->setMouseTracking ( true );
     cmdBox->setFrame ( false );
-// 	cmdBox->setEditable ( true );
     QPalette cpal=cmdBox->palette();
+
     cpal.setColor ( QPalette::Button,QColor ( 255,255,255 ) );
     cpal.setColor ( QPalette::Base,QColor ( 255,255,255 ) );
     cpal.setColor ( QPalette::Window,QColor ( 255,255,255 ) );
@@ -656,10 +669,10 @@ void SessionButton::slot_cmd_change ( const QString& command )
         cmd="LXDE";
         newRootless=false;
     }
-    if(command== tr("Published applications"))
+    if (command== tr("Published applications"))
     {
-      published=true;
-      cmd="PUBLISHED";
+        published=true;
+        cmd="PUBLISHED";
     }
     bool found=false;
     cmd=par->internAppName ( cmd,&found );
diff --git a/userbutton.cpp b/userbutton.cpp
index 21787ca..270ea93 100644
--- a/userbutton.cpp
+++ b/userbutton.cpp
@@ -26,44 +26,49 @@
 UserButton::UserButton ( ONMainWindow* wnd, QWidget *par, QString name,
                          QString fullName, QPixmap& foto, QPalette& bgpal,
                          int width,int height )
-		: QPushButton ( par )
+        : QPushButton ( par )
 {
-	user=name;
-	fname=fullName;
-	image=foto;
-	setFocusPolicy ( Qt::NoFocus );
-	setAutoFillBackground ( true );
-	setFlat ( true );
-	setPalette ( bgpal );
+    user=name;
+    fname=fullName;
+    image=foto;
+    setFocusPolicy ( Qt::NoFocus );
+    setAutoFillBackground ( true );
+    setFlat ( true );
+    bgpal.setColor ( QPalette::Active, QPalette::WindowText, QPalette::Mid );
+    bgpal.setColor ( QPalette::Active, QPalette::ButtonText, QPalette::Mid );
+    bgpal.setColor ( QPalette::Inactive, QPalette::WindowText, QPalette::Mid );
+    bgpal.setColor ( QPalette::Inactive, QPalette::ButtonText, QPalette::Mid );
 
-	bool miniMode=wnd->retMiniMode();
-	if ( width==0 || height==0 )
-	{
-		if ( !miniMode )
-		{
-			setFixedSize ( 340,100 );
-		}
-		else
-			setFixedSize ( 250,100 );
-	}
-	else
-	{
-		setFixedSize ( width,height );
-	}
-	QLabel* f=new QLabel ( this );
-	QString text=name+"\n("+fullName+")";
-	QLabel* n=new QLabel ( text,this );
-	if ( !miniMode )
-		n->move ( 110,25 );
-	else
-		n->move ( 90,25 );
-	f->setPixmap ( foto );
-	f->setMaximumSize ( 80,80 );
-	if ( !miniMode )
-		f->move ( 10,10 );
-	else
-		f->move ( 5,10 );
-	connect ( this,SIGNAL ( clicked() ),this,SLOT ( slotClicked() ) );
+    setPalette ( bgpal );
+
+    bool miniMode=wnd->retMiniMode();
+    if ( width==0 || height==0 )
+    {
+        if ( !miniMode )
+        {
+            setFixedSize ( 340,100 );
+        }
+        else
+            setFixedSize ( 250,100 );
+    }
+    else
+    {
+        setFixedSize ( width,height );
+    }
+    QLabel* f=new QLabel ( this );
+    QString text=name+"\n("+fullName+")";
+    QLabel* n=new QLabel ( text,this );
+    if ( !miniMode )
+        n->move ( 110,25 );
+    else
+        n->move ( 90,25 );
+    f->setPixmap ( foto );
+    f->setMaximumSize ( 80,80 );
+    if ( !miniMode )
+        f->move ( 10,10 );
+    else
+        f->move ( 5,10 );
+    connect ( this,SIGNAL ( clicked() ),this,SLOT ( slotClicked() ) );
 }
 
 UserButton::~UserButton()
@@ -71,5 +76,5 @@ UserButton::~UserButton()
 
 void UserButton::slotClicked()
 {
-	emit userSelected ( this );
+    emit userSelected ( this );
 }


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).




More information about the x2go-commits mailing list