[X2Go-Commits] [x2goclient] 01/02: Add several info/error/debug log message while hunting down #702.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goclient.

commit adb03c67eb27995c7998bb3c853e9b94032d3d40
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Jan 7 10:28:55 2015 +0100

    Add several info/error/debug log message while hunting down #702.
---
 debian/changelog |    1 +
 onmainwindow.cpp |   25 ++++++++++++++++++-------
 printdialog.cpp  |    3 ++-
 printprocess.cpp |   10 ++++++++++
 4 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1a2701d..a754d04 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium
   [ Mike Gabriel ]
   * New upstream release (4.0.3.2):
     - Provide empty Turkish translation file.
+    - Add several info/error/debug log message while hunting down #702.
 
   [ Jason Alavaliant ]
   * New upstream verson (4.0.3.2):
diff --git a/onmainwindow.cpp b/onmainwindow.cpp
index 1358cf8..71d51bf 100644
--- a/onmainwindow.cpp
+++ b/onmainwindow.cpp
@@ -1471,7 +1471,7 @@ void ONMainWindow::closeClient()
 
 void ONMainWindow::closeEvent ( QCloseEvent* event )
 {
-    x2goDebug<<"Close event received.";
+    x2goDebug<<"Close event received."<<endl;
 
     if (trayNoclose && !brokerMode)
     {
@@ -1487,18 +1487,16 @@ void ONMainWindow::closeEvent ( QCloseEvent* event )
 
 void ONMainWindow::hideEvent(QHideEvent* event)
 {
-
-
     QMainWindow::hideEvent(event);
     if (event->spontaneous() && trayMinToTray)
         hide();
 
 }
 
-
-
 void ONMainWindow::trayQuit()
 {
+    x2goDebug<<"Quitting tray icon and closing application."<<endl;
+
     closeClient();
     qApp->quit();
 
@@ -1691,6 +1689,7 @@ void ONMainWindow::slotClosePass()
     if (brokerMode)
     {
         if (!config.brokerAuthenticated)
+            x2goErrorf(15)<<tr("Broker authenication failed!");
             close();
     }
     passForm->hide();
@@ -5589,8 +5588,14 @@ void ONMainWindow::slotProxyFinished ( int,QProcess::ExitStatus )
         delete sshConnection;
         x2goDebug<<"Deleted  SSH connection instance." ;
         sshConnection=0;
-        if ( startHidden || closeDisconnect)
+        if (startHidden)
         {
+            x2goInfof(9) << tr("Closing X2Go Client (because it was started in hidden mode).");
+            close();
+        }
+        else if (closeDisconnect)
+        {
+            x2goInfof(10) << tr("Closing X2Go Client (because --close-disconnect was used on the cmdline).");
             close();
         }
     }
@@ -8960,8 +8965,14 @@ void ONMainWindow::slotCmdMessage ( bool result,QString output,
     if(sshConnection)
         delete sshConnection;
     sshConnection=0;
-    if ( startHidden  || closeDisconnect)
+    if (startHidden)
+    {
+        x2goInfof(11) << tr("Closing X2Go Client (because it was started in hidden mode).");
+        close();
+    }
+    else if (closeDisconnect)
     {
+        x2goInfof(12) << tr("Closing X2Go Client (because --close-disconnect was used on the cmdline).");
         close();
     }
 }
diff --git a/printdialog.cpp b/printdialog.cpp
index 783d573..0562863 100644
--- a/printdialog.cpp
+++ b/printdialog.cpp
@@ -25,7 +25,7 @@
 PrintDialog::PrintDialog ( QWidget* parent, Qt::WindowFlags f )
 		: QDialog ( parent,f )
 {
-	x2goDebug<<"starting print dialog"<<endl;
+	x2goDebug<<"Starting print dialog."<<endl;
 	ui.setupUi ( this );
 	ui.buttonBox->button ( QDialogButtonBox::Ok )->setText (
 	    tr ( "Print" ) );
@@ -44,6 +44,7 @@ PrintDialog::PrintDialog ( QWidget* parent, Qt::WindowFlags f )
 
 PrintDialog::~PrintDialog()
 {
+	x2goDebug<<"Closing print dialog."<<endl;
 }
 
 
diff --git a/printprocess.cpp b/printprocess.cpp
index adca4e4..518f1de 100644
--- a/printprocess.cpp
+++ b/printprocess.cpp
@@ -38,6 +38,7 @@
 PrintProcess::PrintProcess ( QString pdf, QString title, QObject *parent ) :
 		QObject ( parent )
 {
+	x2goDebug<<"Starting print process."<<endl;
 	pdfFile=pdf;
 	pdfTitle=title;
 	parentWidg= ( QWidget* ) parent;
@@ -47,14 +48,21 @@ PrintProcess::PrintProcess ( QString pdf, QString title, QObject *parent ) :
 		return;
 	}
 	if ( viewPdf )
+	{
+		x2goDebug<<"Opening PDF file: "<<pdfFile<<" ("<<pdfTitle<<")"<<endl;
 		QTimer::singleShot ( 100, this, SLOT ( openPdf() ) );
+	}
 	else
+	{
+		x2goDebug<<"Printing PDF file: "<<pdfFile<<" ("<<pdfTitle<<")"<<endl;
 		QTimer::singleShot ( 100, this, SLOT ( print() ) );
+	}
 }
 
 
 PrintProcess::~PrintProcess()
 {
+	x2goDebug<<"Closing print process."<<endl;
 }
 
 
@@ -130,6 +138,7 @@ bool PrintProcess::loadSettings()
 
 void PrintProcess::openPdf()
 {
+	x2goDebug<<"opening/saving PDF..."<<endl;
 	if ( pdfOpen )
 	{
 #ifndef Q_OS_WIN
@@ -138,6 +147,7 @@ void PrintProcess::openPdf()
 #else
 		QString cmd=pdfOpenCmd+"\""+pdfFile+"\"";
 #endif
+		x2goDebug<<"Using PDF viewer command: "<<cmd<<endl;
 		x2goDebug<<cmd;
 		if ( ! QProcess::startDetached ( cmd ) )
 			slot_error ( QProcess::FailedToStart );

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git