[X2Go-Commits] x2goclient.git - build-baikal (branch) updated: 4.0.1.0-10-g56c9d3a
X2Go dev team
git-admin at x2go.org
Wed Sep 11 12:08:00 CEST 2013
The branch, build-baikal has been updated
via 56c9d3ab2021549fc2fede7f5bceac0af342fc73 (commit)
from 627cd24cb270a0c167bef64867e78e772925640e (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:
debian/changelog | 5 +++++
onmainwindow.cpp | 14 +++++++++++---
2 files changed, 16 insertions(+), 3 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 9be4d80..94d57e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,11 @@ x2goclient (4.0.1.1-0~x2go1) UNRELEASED; urgency=low
Let's consider a given SSH private key that fails to log the user
in as an overall login failure. (Fixes: 141).
+ [ Orion Poplawski ]
+ * New upstream version (4.0.1.0):
+ - Instead of using a hard-code DPI of 96, use local DPI settings for new
+ sessions if not explicitly set in session profile (Fixes: #164).
+
-- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Fri, 22 Mar 2013 23:21:11 +0100
x2goclient (4.0.1.0-0~x2go1) unstable; urgency=low
diff --git a/onmainwindow.cpp b/onmainwindow.cpp
index 31dbc17..5f37cc1 100644
--- a/onmainwindow.cpp
+++ b/onmainwindow.cpp
@@ -61,8 +61,6 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent )
showHaltBtn=false;
defaultUseSound=true;
defaultSetKbd=true;
- defaultSetDPI=false;
- defaultDPI=96;
extStarted=false;
cmdAutologin=false;
defaultLink=2;
@@ -107,6 +105,16 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent )
cmdAutologin=false;
+// Try to determine the native DPI and use it for the default
+ int dpix = QApplication::desktop()->physicalDpiX();
+ int dpiy = QApplication::desktop()->physicalDpiY();
+ if ( dpix >0 && dpiy >0) {
+ defaultSetDPI=true;
+ defaultDPI=(dpix+dpiy)/2;
+ } else {
+ defaultSetDPI=false;
+ defaultDPI=96;
+ }
#ifdef Q_OS_WIN
clientSshPort="7022";
@@ -6661,7 +6669,7 @@ void ONMainWindow::showHelp()
"--user=<username>\t\t select user 'username'\n"
"--geomerty=<W>x<H>|fullscreen\t set default geometry, default "
"value '800x600'\n"
- "--dpi=<dpi>\t\t\t set dpi of x2goagent to dpi, default not set\n"
+ "--dpi=<dpi>\t\t\t set dpi of x2goagent to dpi, default set to same as local display\n"
"--link=<modem|isdn|adsl|wan|lan> set default link type, "
"default 'adsl'\n"
"--pack=<packmethod>\t\t set default pack method, default "
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