This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goclient. from 5290218 release 4.0.3.1 new 0536522 Reformat onmainwindow.cpp new cd1ae31 Fix placement of session folders in session card column. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 2 ++ onmainwindow.cpp | 19 ++++++++++++++++--- onmainwindow_privat.h | 1 + 3 files changed, 19 insertions(+), 3 deletions(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 05365223d5620215181b8380160f90bcd1912180 Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> Date: Thu Nov 27 11:35:16 2014 +0100 Reformat onmainwindow.cpp --- debian/changelog | 1 + onmainwindow.cpp | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0d79e8a..c4ae8a9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,7 @@ x2goclient (4.0.3.1-0x2go1) unstable; urgency=medium * New upstream release (4.0.3.1): - Split Sessions config widget into Input/output and Media widgets. (Fixes: #643). + - Reformat onmainwindow.cpp -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 27 Nov 2014 11:00:17 +0100 diff --git a/onmainwindow.cpp b/onmainwindow.cpp index 70b5984..0c3bce8 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -4770,7 +4770,7 @@ void ONMainWindow::slotRetResumeSess ( bool result, st= new X2goSettings(config.iniFile,QSettings::IniFormat); sound=st->setting()->value ( sid+"/sound", - ( QVariant ) true ).toBool(); + ( QVariant ) true ).toBool(); QString sndsys=st->setting()->value ( sid+"/soundsystem", ( QVariant ) "pulse" ).toString(); @@ -4793,7 +4793,7 @@ void ONMainWindow::slotRetResumeSess ( bool result, #ifndef Q_OS_WIN bool defPort=st->setting()->value ( sid+ - "/defsndport",true ).toBool(); + "/defsndport",true ).toBool(); if ( defPort ) { switch ( sndSystem ) @@ -4808,7 +4808,7 @@ void ONMainWindow::slotRetResumeSess ( bool result, } #endif sshSndTunnel=st->setting()->value ( sid+"/soundtunnel", - true ).toBool(); + true ).toBool(); #ifdef Q_OS_WIN switch ( sndSystem ) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit cd1ae314378c6cd7c0dc80b6accc31828965e2bd Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> Date: Thu Nov 27 11:37:28 2014 +0100 Fix placement of session folders in session card column. --- debian/changelog | 1 + onmainwindow.cpp | 13 +++++++++++++ onmainwindow_privat.h | 1 + 3 files changed, 15 insertions(+) diff --git a/debian/changelog b/debian/changelog index c4ae8a9..cb576b8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,7 @@ x2goclient (4.0.3.1-0x2go1) unstable; urgency=medium - Split Sessions config widget into Input/output and Media widgets. (Fixes: #643). - Reformat onmainwindow.cpp + - Fix placement of session folders in session card column. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 27 Nov 2014 11:00:17 +0100 diff --git a/onmainwindow.cpp b/onmainwindow.cpp index 0c3bce8..fa6c8f1 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -1272,6 +1272,19 @@ void ONMainWindow::slotResize ( const QSize sz ) } else { + QList<FolderButton*>::iterator fit; + QList<FolderButton*>::iterator fend=sessionExplorer->getFoldersList()->end(); + for ( fit=sessionExplorer->getFoldersList()->begin(); fit!=fend; fit++ ) + { + if ( !miniMode ) + ( *fit )->move ( + ( usize-360 ) /2, + ( *fit )->pos().y() ); + else + ( *fit )->move ( + ( usize-250 ) /2, + ( *fit )->pos().y() ); + } QList<SessionButton*>::iterator it; QList<SessionButton*>::iterator end=sessionExplorer->getSessionsList()->end(); for ( it=sessionExplorer->getSessionsList()->begin(); it!=end; it++ ) diff --git a/onmainwindow_privat.h b/onmainwindow_privat.h index 037483f..d04de8a 100644 --- a/onmainwindow_privat.h +++ b/onmainwindow_privat.h @@ -137,6 +137,7 @@ #include "configdialog.h" #include "editconnectiondialog.h" #include "sessionbutton.h" +#include "folderbutton.h" #include "sessionexplorer.h" #include "sessionmanagedialog.h" #include "x2gologdebug.h" -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
-
git-admin＠x2go.org