[X2go-Commits] x2goclient.git - master (branch) updated: 3.99.3.0-22-gd1cb960
X2Go dev team
git-admin at x2go.org
Fri Dec 14 14:43:19 CET 2012
The branch, master has been updated
via d1cb960e424ea576ea99f0e036264712670ffba7 (commit)
via 8418860c23c6079f9a49b2bcb1ba7d3712c6d1d9 (commit)
from dffc0d788cfc8098b6118a657e4d8b2810936690 (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 d1cb960e424ea576ea99f0e036264712670ffba7
Author: Oleksandr Shneyder <o.shneyder at phoca-gmbh.de>
Date: Fri Dec 14 14:41:04 2012 +0100
Add "author" entry in UI files
commit 8418860c23c6079f9a49b2bcb1ba7d3712c6d1d9
Author: Oleksandr Shneyder <o.shneyder at phoca-gmbh.de>
Date: Fri Dec 14 14:30:20 2012 +0100
Update license headers
-----------------------------------------------------------------------
Summary of changes:
LDAPSession.cpp | 17 +++++
LDAPSession.h | 29 ++++----
LICENSE | 18 +++--
SVGFrame.cpp | 17 +++++
SVGFrame.h | 17 +++++
appdialog.cpp | 7 +-
appdialog.h | 35 +++++----
appdialog.ui | 4 +-
brokerpassdialog.ui | 3 +-
brokerpassdlg.cpp | 34 +++++----
brokerpassdlg.h | 34 +++++----
clicklineedit.cpp | 28 +++++---
clicklineedit.h | 28 +++++---
configdialog.cpp | 28 +++++---
configdialog.h | 28 +++++---
configwidget.cpp | 28 +++++---
configwidget.h | 28 +++++---
connectionwidget.cpp | 28 +++++---
connectionwidget.h | 28 +++++---
contest.cpp | 34 +++++----
contest.h | 34 +++++----
contest.ui | 5 +-
cupsprint.cpp | 28 +++++---
cupsprint.h | 28 +++++---
cupsprintersettingsdialog.cpp | 28 +++++---
cupsprintersettingsdialog.h | 28 +++++---
cupsprintsettingsdialog.ui | 156 +++++++++++++++++++++--------------------
cupsprintwidget.cpp | 28 +++++---
cupsprintwidget.h | 28 +++++---
cupsprintwidget.ui | 96 ++++++++++++-------------
debian/changelog | 2 +
editconnectiondialog.cpp | 28 +++++---
editconnectiondialog.h | 27 ++++---
exportdialog.cpp | 28 +++++---
exportdialog.h | 28 +++++---
httpbrokerclient.cpp | 28 +++++---
httpbrokerclient.h | 28 +++++---
imgframe.cpp | 28 +++++---
imgframe.h | 28 +++++---
ongetpass.cpp | 36 +++++-----
ongetpass.h | 27 ++++---
onmainwindow.cpp | 7 +-
onmainwindow.h | 35 +++++----
onmainwindow_privat.h | 36 +++++-----
printdialog.cpp | 28 +++++---
printdialog.h | 28 +++++---
printdialog.ui | 30 ++++----
printercmddialog.cpp | 28 +++++---
printercmddialog.h | 28 +++++---
printercmddialog.ui | 88 +++++++++++------------
printprocess.cpp | 28 +++++---
printprocess.h | 28 +++++---
printwidget.cpp | 28 +++++---
printwidget.h | 28 +++++---
printwidget.ui | 148 +++++++++++++++++++-------------------
sessionbutton.cpp | 28 +++++---
sessionbutton.h | 28 +++++---
sessionmanagedialog.cpp | 28 +++++---
sessionmanagedialog.h | 28 +++++---
sessionwidget.cpp | 28 +++++---
sessionwidget.h | 28 +++++---
settingswidget.cpp | 28 +++++---
settingswidget.h | 28 +++++---
sharewidget.cpp | 28 +++++---
sharewidget.h | 28 +++++---
sshmasterconnection.cpp | 37 +++++-----
sshmasterconnection.h | 36 +++++-----
sshprocess.cpp | 36 +++++-----
sshprocess.h | 36 +++++-----
userbutton.cpp | 36 +++++-----
userbutton.h | 36 +++++-----
version.h | 17 +++++
wapi.cpp | 17 +++++
wapi.h | 17 +++++
x2goclient.cpp | 36 +++++-----
x2goclientconfig.h | 17 +++++
x2gologdebug.cpp | 28 +++++---
x2gologdebug.h | 28 +++++---
x2gosettings.cpp | 28 +++++---
x2gosettings.h | 28 ++++----
xsettingsui.ui | 3 +-
xsettingswidget.cpp | 34 +++++----
xsettingswidget.h | 34 +++++----
83 files changed, 1460 insertions(+), 1112 deletions(-)
The diff of changes is:
diff --git a/LDAPSession.cpp b/LDAPSession.cpp
index 30972c9..83ceba3 100644
--- a/LDAPSession.cpp
+++ b/LDAPSession.cpp
@@ -1,3 +1,20 @@
+/**************************************************************************
+* 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, see <http://www.gnu.org/licenses/>. *
+***************************************************************************/
+
#include "LDAPSession.h"
#include "x2goclientconfig.h"
#ifdef USELDAP
diff --git a/LDAPSession.h b/LDAPSession.h
index 82c4152..765bae0 100644
--- a/LDAPSession.h
+++ b/LDAPSession.h
@@ -1,15 +1,20 @@
-//
-//
-// C++ Interface: $MODULE$
-//
-// Description:
-//
-//
-// Author: Oleksandr Shneyder AKA nCryer <oleksandr.shneyder at obviously-nice.de>, (C) 2006-2010
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
+/**************************************************************************
+* 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, see <http://www.gnu.org/licenses/>. *
+***************************************************************************/
+
#ifndef LDAPSESSION_H
#define LDAPSESSION_H
#define LDAP_DEPRECATED 1
diff --git a/LICENSE b/LICENSE
index 0479009..f6026f7 100644
--- a/LICENSE
+++ b/LICENSE
@@ -5,18 +5,16 @@ 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.
+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, see <http://www.gnu.org/licenses/>.
Copyright (C) 2005-2012 Oleksandr Shneyder
-oleksandr.shneyder at obviously-nice.de
+o.shneyder at phoca-gmbh.de
Copyright (C) 2005-2012 Heinz-Markus Graesing
heinz-m.graesing at obviously-nice.de
diff --git a/SVGFrame.cpp b/SVGFrame.cpp
index f559adb..dc427ac 100644
--- a/SVGFrame.cpp
+++ b/SVGFrame.cpp
@@ -1,3 +1,20 @@
+/**************************************************************************
+* 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, see <http://www.gnu.org/licenses/>. *
+***************************************************************************/
+
#include "SVGFrame.h"
#include "x2goclientconfig.h"
diff --git a/SVGFrame.h b/SVGFrame.h
index 07f345e..7bfcf2a 100644
--- a/SVGFrame.h
+++ b/SVGFrame.h
@@ -1,3 +1,20 @@
+/**************************************************************************
+* 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, see <http://www.gnu.org/licenses/>. *
+***************************************************************************/
+
#ifndef SVGFRAME_H
#define SVGFRAME_H
#include "x2goclientconfig.h"
diff --git a/appdialog.cpp b/appdialog.cpp
index ebab99d..db17457 100644
--- a/appdialog.cpp
+++ b/appdialog.cpp
@@ -1,21 +1,18 @@
/**************************************************************************
* Copyright (C) 2005-2012 by Oleksandr Shneyder *
-* oleksandr.shneyder at obviously-nice.de *
+* 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. *
+* along with this program. If not, see <http://www.gnu.org/licenses/>. *
***************************************************************************/
#include "appdialog.h"
#include "onmainwindow.h"
diff --git a/appdialog.h b/appdialog.h
index 9fb7bd6..663a846 100644
--- a/appdialog.h
+++ b/appdialog.h
@@ -1,22 +1,19 @@
-/***************************************************************************
- * Copyright (C) 2005-2012 by Oleksandr Shneyder *
- * oleksandr.shneyder at obviously-nice.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. *
- ***************************************************************************/
+/**************************************************************************
+* 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, see <http://www.gnu.org/licenses/>. *
+***************************************************************************/
#ifndef APPDIALOG_H
#define APPDIALOG_H
diff --git a/appdialog.ui b/appdialog.ui
index 703c9f4..ba78952 100644
--- a/appdialog.ui
+++ b/appdialog.ui
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
+ <author>Oleksandr Shneyder(o.shneyder at phoca-gmbh.de)</author>
<class>AppDialog</class>
<widget class="QDialog" name="AppDialog">
<property name="geometry">
@@ -42,9 +43,6 @@
<attribute name="headerVisible">
<bool>false</bool>
</attribute>
- <attribute name="headerVisible">
- <bool>false</bool>
- </attribute>
<column>
<property name="text">
<string notr="true">1</string>
diff --git a/brokerpassdialog.ui b/brokerpassdialog.ui
index 333a577..e7c2449 100644
--- a/brokerpassdialog.ui
+++ b/brokerpassdialog.ui
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
+ <author>Oleksandr Shneyder(o.shneyder at phoca-gmbh.de)</author>
<class>BrokerPassDialogUi</class>
<widget class="QDialog" name="BrokerPassDialogUi">
<property name="geometry">
@@ -7,7 +8,7 @@
<x>0</x>
<y>0</y>
<width>311</width>
- <height>160</height>
+ <height>176</height>
</rect>
</property>
<property name="windowTitle">
diff --git a/brokerpassdlg.cpp b/brokerpassdlg.cpp
index 7d7432b..152e2cb 100644
--- a/brokerpassdlg.cpp
+++ b/brokerpassdlg.cpp
@@ -1,21 +1,19 @@
-/*
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) 2005-2012 Oleksandr Shneyder
-
- 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 3 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, see <http://www.gnu.org/licenses/>.
-
-*/
+/**************************************************************************
+* 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, see <http://www.gnu.org/licenses/>. *
+***************************************************************************/
#include "brokerpassdlg.h"
#include <QPushButton>
diff --git a/brokerpassdlg.h b/brokerpassdlg.h
index 6123171..08e5066 100644
--- a/brokerpassdlg.h
+++ b/brokerpassdlg.h
@@ -1,21 +1,19 @@
-/*
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) 2005-2012 Oleksandr Shneyder
-
- 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 3 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, see <http://www.gnu.org/licenses/>.
-
-*/
+/**************************************************************************
+* 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, see <http://www.gnu.org/licenses/>. *
+***************************************************************************/
#ifndef BROKERPASSDLG_H
#define BROKERPASSDLG_H
diff --git a/clicklineedit.cpp b/clicklineedit.cpp
index 4b7f412..84c94d9 100644
--- a/clicklineedit.cpp
+++ b/clicklineedit.cpp
@@ -1,14 +1,20 @@
-//
-// C++ Implementation: clicklineedit
-//
-// Description:
-//
-//
-// Author: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>, (C) 2009
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
+/**************************************************************************
+* 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, see <http://www.gnu.org/licenses/>. *
+***************************************************************************/
+
#include "clicklineedit.h"
#include "x2gologdebug.h"
diff --git a/clicklineedit.h b/clicklineedit.h
index 968f38f..758bb82 100644
--- a/clicklineedit.h
+++ b/clicklineedit.h
@@ -1,14 +1,20 @@
-//
-// C++ Interface: clicklineedit
-//
-// Description:
-//
-//
-// Author: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>, (C) 2009
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
+/**************************************************************************
+* 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, see <http://www.gnu.org/licenses/>. *
+***************************************************************************/
+
#ifndef CLICKLINEEDIT_H
#define CLICKLINEEDIT_H
diff --git a/configdialog.cpp b/configdialog.cpp
index e8e2a43..1bdaf78 100644
--- a/configdialog.cpp
+++ b/configdialog.cpp
@@ -1,14 +1,20 @@
-//
-// C++ Implementation: configdialog
-//
-// Description:
-//
-//
-// Author: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>, (C) 2006-2012
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
+/**************************************************************************
+* 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, see <http://www.gnu.org/licenses/>. *
+***************************************************************************/
+
#include <QLineEdit>
#include <QCheckBox>
#include <QSpinBox>
diff --git a/configdialog.h b/configdialog.h
index 092001c..33177bc 100644
--- a/configdialog.h
+++ b/configdialog.h
@@ -1,14 +1,20 @@
-//
-// C++ Interface: configdialog
-//
-// Description:
-//
-//
-// Author: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>, (C) 2006
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
+/**************************************************************************
+* 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, see <http://www.gnu.org/licenses/>. *
+***************************************************************************/
+
#ifndef CONFIGDIALOG_H
#define CONFIGDIALOG_H
#include "x2goclientconfig.h"
diff --git a/configwidget.cpp b/configwidget.cpp
index 3223397..8b2842c 100644
--- a/configwidget.cpp
+++ b/configwidget.cpp
@@ -1,14 +1,20 @@
-//
-// C++ Implementation: configwidget
-//
-// Description:
-//
-//
-// Author: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>, (C) 2009
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
+/**************************************************************************
+* 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, see <http://www.gnu.org/licenses/>. *
+***************************************************************************/
+
#include "configwidget.h"
#include "onmainwindow.h"
diff --git a/configwidget.h b/configwidget.h
index 152e886..e2a5d9f 100644
--- a/configwidget.h
+++ b/configwidget.h
@@ -1,14 +1,20 @@
-//
-// C++ Interface: configwidget
-//
-// Description:
-//
-//
-// Author: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>, (C) 2009
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
+/**************************************************************************
+* 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, see <http://www.gnu.org/licenses/>. *
+***************************************************************************/
+
#ifndef CONFIGWIDGET_H
#define CONFIGWIDGET_H
diff --git a/connectionwidget.cpp b/connectionwidget.cpp
index 787a933..91eb1b6 100644
--- a/connectionwidget.cpp
+++ b/connectionwidget.cpp
@@ -1,14 +1,20 @@
-//
-// C++ Implementation: connectionwidget
-//
-// Description:
-//
-//
-// Author: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>, (C) 2009
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
+/**************************************************************************
+* 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, see <http://www.gnu.org/licenses/>. *
+***************************************************************************/
+
#include "connectionwidget.h"
#include <QPushButton>
diff --git a/connectionwidget.h b/connectionwidget.h
index 7fee66e..c112fe6 100644
--- a/connectionwidget.h
+++ b/connectionwidget.h
@@ -1,14 +1,20 @@
-//
-// C++ Interface: connectionwidget
-//
-// Description:
-//
-//
-// Author: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>, (C) 2009
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
+/**************************************************************************
+* 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, see <http://www.gnu.org/licenses/>. *
+***************************************************************************/
+
#ifndef CONNECTIONWIDGET_H
#define CONNECTIONWIDGET_H
diff --git a/contest.cpp b/contest.cpp
index cefab6b..ececd35 100644
--- a/contest.cpp
+++ b/contest.cpp
@@ -1,21 +1,19 @@
-/*
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) 2005-2012 Oleksandr Shneyder
-
- 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 3 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, see <http://www.gnu.org/licenses/>.
-
-*/
+/**************************************************************************
+* 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, see <http://www.gnu.org/licenses/>. *
+***************************************************************************/
#include "contest.h"
#include "x2gologdebug.h"
diff --git a/contest.h b/contest.h
index e345148..7c76a90 100644
--- a/contest.h
+++ b/contest.h
@@ -1,21 +1,19 @@
-/*
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) 2005-2012 Oleksandr Shneyder
-
- 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 3 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, see <http://www.gnu.org/licenses/>.
-
-*/
+/**************************************************************************
+* 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, see <http://www.gnu.org/licenses/>. *
+***************************************************************************/
#ifndef CONTEST_H
#define CONTEST_H
diff --git a/contest.ui b/contest.ui
index 70d0cd1..9ffaf1c 100644
--- a/contest.ui
+++ b/contest.ui
@@ -1,13 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
+ <author>Oleksandr Shneyder(o.shneyder at phoca-gmbh.de)</author>
<class>ConTest</class>
<widget class="QDialog" name="ConTest">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
- <width>291</width>
- <height>147</height>
+ <width>336</width>
+ <height>161</height>
</rect>
</property>
<property name="windowTitle">
diff --git a/cupsprint.cpp b/cupsprint.cpp
index 31ad462..2acae68 100644
--- a/cupsprint.cpp
+++ b/cupsprint.cpp
@@ -1,14 +1,20 @@
-//
-// C++ Implementation: cupsprint
-//
-// Description:
-//
-//
-// Author: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>, (C) 2009
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
+/**************************************************************************
+* 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, see <http://www.gnu.org/licenses/>. *
+***************************************************************************/
+
#include "cupsprint.h"
#ifndef Q_OS_WIN
#include "x2gologdebug.h"
diff --git a/cupsprint.h b/cupsprint.h
index 85eb2b4..21fabe5 100644
--- a/cupsprint.h
+++ b/cupsprint.h
@@ -1,14 +1,20 @@
-//
-// C++ Interface: cupsprint
-//
-// Description:
-//
-//
-// Author: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>, (C) 2009
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
+/**************************************************************************
+* 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, see <http://www.gnu.org/licenses/>. *
+***************************************************************************/
+
#ifndef CUPSPRINT_H
#define CUPSPRINT_H
#include "x2goclientconfig.h"
diff --git a/cupsprintersettingsdialog.cpp b/cupsprintersettingsdialog.cpp
index 0ccebe1..8edaa67 100644
--- a/cupsprintersettingsdialog.cpp
+++ b/cupsprintersettingsdialog.cpp
@@ -1,14 +1,20 @@
-//
-// C++ Implementation: cupsprintersettingsdialog
-//
-// Description:
-//
-//
-// Author: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>, (C) 2009
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
+/**************************************************************************
+* 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, see <http://www.gnu.org/licenses/>. *
+***************************************************************************/
+
#include "cupsprintersettingsdialog.h"
#include "cupsprint.h"
#ifndef Q_OS_WIN
diff --git a/cupsprintersettingsdialog.h b/cupsprintersettingsdialog.h
index a9e767f..f052b7c 100644
--- a/cupsprintersettingsdialog.h
+++ b/cupsprintersettingsdialog.h
@@ -1,14 +1,20 @@
-//
-// C++ Interface: cupsprintersettingsdialog
-//
-// Description:
-//
-//
-// Author: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>, (C) 2009
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
+/**************************************************************************
+* 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, see <http://www.gnu.org/licenses/>. *
+***************************************************************************/
+
#ifndef CUPSPRINTERSETTINGSDIALOG_H
#define CUPSPRINTERSETTINGSDIALOG_H
#include "x2goclientconfig.h"
diff --git a/cupsprintsettingsdialog.ui b/cupsprintsettingsdialog.ui
index 56ba452..98598e1 100644
--- a/cupsprintsettingsdialog.ui
+++ b/cupsprintsettingsdialog.ui
@@ -1,89 +1,91 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <author>Oleksandr Shneyder(o.shneyder at phoca-gmbh.de)</author>
<class>CupsPrinterSettingsDialog</class>
- <widget class="QDialog" name="CupsPrinterSettingsDialog" >
- <property name="geometry" >
+ <widget class="QDialog" name="CupsPrinterSettingsDialog">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
- <width>408</width>
- <height>532</height>
+ <width>503</width>
+ <height>551</height>
</rect>
</property>
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Minimum" hsizetype="Preferred" >
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="windowTitle" >
+ <property name="windowTitle">
<string>Dialog</string>
</property>
- <layout class="QVBoxLayout" name="verticalLayout_2" >
+ <layout class="QVBoxLayout" name="verticalLayout_2">
<item>
- <widget class="QTabWidget" name="tabWidget" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Minimum" hsizetype="Expanding" >
+ <widget class="QTabWidget" name="tabWidget">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="currentIndex" >
+ <property name="currentIndex">
<number>0</number>
</property>
- <widget class="QWidget" name="tabGeneral" >
- <attribute name="title" >
+ <widget class="QWidget" name="tabGeneral">
+ <attribute name="title">
<string>General</string>
</attribute>
- <layout class="QVBoxLayout" name="verticalLayout" >
+ <layout class="QVBoxLayout" name="verticalLayout">
<item>
- <layout class="QHBoxLayout" name="horizontalLayout_2" >
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
- <layout class="QGridLayout" name="gridLayout" >
- <item row="0" column="0" >
- <widget class="QLabel" name="label" >
- <property name="text" >
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0">
+ <widget class="QLabel" name="label">
+ <property name="text">
<string>Page size:</string>
</property>
</widget>
</item>
- <item row="0" column="1" >
- <widget class="QComboBox" name="cbPageSize" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+ <item row="0" column="1">
+ <widget class="QComboBox" name="cbPageSize">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
- <item row="1" column="0" >
- <widget class="QLabel" name="label_2" >
- <property name="text" >
+ <item row="1" column="0">
+ <widget class="QLabel" name="label_2">
+ <property name="text">
<string>Paper type:</string>
</property>
</widget>
</item>
- <item row="1" column="1" >
- <widget class="QComboBox" name="cbMediaType" />
+ <item row="1" column="1">
+ <widget class="QComboBox" name="cbMediaType"/>
</item>
- <item row="2" column="0" >
- <widget class="QLabel" name="label_3" >
- <property name="text" >
+ <item row="2" column="0">
+ <widget class="QLabel" name="label_3">
+ <property name="text">
<string>Paper source:</string>
</property>
</widget>
</item>
- <item row="2" column="1" >
- <widget class="QComboBox" name="cbInputSlot" />
+ <item row="2" column="1">
+ <widget class="QComboBox" name="cbInputSlot"/>
</item>
</layout>
</item>
<item>
- <spacer name="horizontalSpacer_2" >
- <property name="orientation" >
+ <spacer name="horizontalSpacer_2">
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
@@ -94,28 +96,28 @@
</layout>
</item>
<item>
- <widget class="QGroupBox" name="gbDuplex" >
- <property name="title" >
+ <widget class="QGroupBox" name="gbDuplex">
+ <property name="title">
<string>Duplex Printing</string>
</property>
- <layout class="QVBoxLayout" name="verticalLayout_3" >
+ <layout class="QVBoxLayout" name="verticalLayout_3">
<item>
- <widget class="QRadioButton" name="rbNone" >
- <property name="text" >
+ <widget class="QRadioButton" name="rbNone">
+ <property name="text">
<string>None</string>
</property>
</widget>
</item>
<item>
- <widget class="QRadioButton" name="rbLong" >
- <property name="text" >
+ <widget class="QRadioButton" name="rbLong">
+ <property name="text">
<string>Long side</string>
</property>
</widget>
</item>
<item>
- <widget class="QRadioButton" name="rbShort" >
- <property name="text" >
+ <widget class="QRadioButton" name="rbShort">
+ <property name="text">
<string>Short side</string>
</property>
</widget>
@@ -124,11 +126,11 @@
</widget>
</item>
<item>
- <spacer name="verticalSpacer" >
- <property name="orientation" >
+ <spacer name="verticalSpacer">
+ <property name="orientation">
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>211</height>
@@ -138,70 +140,70 @@
</item>
</layout>
</widget>
- <widget class="QWidget" name="tabDriver" >
- <attribute name="title" >
+ <widget class="QWidget" name="tabDriver">
+ <attribute name="title">
<string>Driver settings</string>
</attribute>
- <layout class="QVBoxLayout" name="verticalLayout_5" >
+ <layout class="QVBoxLayout" name="verticalLayout_5">
<item>
- <widget class="QSplitter" name="splitter" >
- <property name="enabled" >
+ <widget class="QSplitter" name="splitter">
+ <property name="enabled">
<bool>true</bool>
</property>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Vertical</enum>
</property>
- <property name="childrenCollapsible" >
+ <property name="childrenCollapsible">
<bool>false</bool>
</property>
- <widget class="QTreeWidget" name="ppdTree" >
- <property name="rootIsDecorated" >
+ <widget class="QTreeWidget" name="ppdTree">
+ <property name="rootIsDecorated">
<bool>false</bool>
</property>
- <property name="animated" >
+ <property name="animated">
<bool>true</bool>
</property>
- <property name="allColumnsShowFocus" >
+ <property name="allColumnsShowFocus">
<bool>true</bool>
</property>
- <property name="headerHidden" >
+ <property name="headerHidden">
<bool>true</bool>
</property>
- <property name="expandsOnDoubleClick" >
+ <property name="expandsOnDoubleClick">
<bool>false</bool>
</property>
<column>
- <property name="text" >
+ <property name="text">
<string>Option</string>
</property>
</column>
<column>
- <property name="text" >
+ <property name="text">
<string>Value</string>
</property>
</column>
</widget>
- <widget class="QGroupBox" name="gbOptions" >
- <property name="title" >
+ <widget class="QGroupBox" name="gbOptions">
+ <property name="title">
<string>No option selected</string>
</property>
- <layout class="QVBoxLayout" name="verticalLayout_4" >
+ <layout class="QVBoxLayout" name="verticalLayout_4">
<item>
- <widget class="QTreeWidget" name="optionsTree" >
- <property name="rootIsDecorated" >
+ <widget class="QTreeWidget" name="optionsTree">
+ <property name="rootIsDecorated">
<bool>false</bool>
</property>
- <property name="itemsExpandable" >
+ <property name="itemsExpandable">
<bool>false</bool>
</property>
- <property name="headerHidden" >
+ <property name="headerHidden">
<bool>true</bool>
</property>
- <property name="expandsOnDoubleClick" >
+ <property name="expandsOnDoubleClick">
<bool>false</bool>
</property>
<column>
- <property name="text" >
+ <property name="text">
<string>text</string>
</property>
</column>
@@ -216,11 +218,11 @@
</widget>
</item>
<item>
- <widget class="QDialogButtonBox" name="buttonBox" >
- <property name="standardButtons" >
+ <widget class="QDialogButtonBox" name="buttonBox">
+ <property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::RestoreDefaults|QDialogButtonBox::Save</set>
</property>
- <property name="centerButtons" >
+ <property name="centerButtons">
<bool>false</bool>
</property>
</widget>
diff --git a/cupsprintwidget.cpp b/cupsprintwidget.cpp
index c39d0ec..dd91a19 100644
--- a/cupsprintwidget.cpp
+++ b/cupsprintwidget.cpp
@@ -1,14 +1,20 @@
-//
-// C++ Implementation: cupsprintwidget
-//
-// Description:
-//
-//
-// Author: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>, (C) 2009
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
+/**************************************************************************
+* 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, see <http://www.gnu.org/licenses/>. *
+***************************************************************************/
+
#include "cupsprint.h"
#include "cupsprintwidget.h"
#ifndef Q_OS_WIN
diff --git a/cupsprintwidget.h b/cupsprintwidget.h
index 2ec3049..415e1b2 100644
--- a/cupsprintwidget.h
+++ b/cupsprintwidget.h
@@ -1,14 +1,20 @@
-//
-// C++ Interface: cupsprintwidget
-//
-// Description:
-//
-//
-// Author: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>, (C) 2009
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
+/**************************************************************************
+* 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, see <http://www.gnu.org/licenses/>. *
+***************************************************************************/
+
#ifndef CUPSPRINTWIDGET_H
#define CUPSPRINTWIDGET_H
diff --git a/cupsprintwidget.ui b/cupsprintwidget.ui
index 226738e..fc23981 100644
--- a/cupsprintwidget.ui
+++ b/cupsprintwidget.ui
@@ -1,7 +1,9 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <author>Oleksandr Shneyder(o.shneyder at phoca-gmbh.de)</author>
<class>CUPSPrintWidget</class>
- <widget class="QWidget" name="CUPSPrintWidget" >
- <property name="geometry" >
+ <widget class="QWidget" name="CUPSPrintWidget">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -9,106 +11,106 @@
<height>292</height>
</rect>
</property>
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Preferred" hsizetype="Maximum" >
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="windowTitle" >
+ <property name="windowTitle">
<string>Form</string>
</property>
- <layout class="QGridLayout" name="gridLayout" >
- <item row="0" column="0" >
- <widget class="QLabel" name="label" >
- <property name="text" >
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0">
+ <widget class="QLabel" name="label">
+ <property name="text">
<string>Name:</string>
</property>
</widget>
</item>
- <item row="0" column="1" >
- <widget class="QComboBox" name="cbPrinters" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
+ <item row="0" column="1">
+ <widget class="QComboBox" name="cbPrinters">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
- <item row="0" column="2" >
- <widget class="QPushButton" name="pbProps" >
- <property name="text" >
+ <item row="0" column="2">
+ <widget class="QPushButton" name="pbProps">
+ <property name="text">
<string>Properties</string>
</property>
</widget>
</item>
- <item row="1" column="0" >
- <widget class="QLabel" name="label_2" >
- <property name="text" >
+ <item row="1" column="0">
+ <widget class="QLabel" name="label_2">
+ <property name="text">
<string>State:</string>
</property>
</widget>
</item>
- <item row="1" column="1" colspan="2" >
- <widget class="QLabel" name="lState" >
- <property name="text" >
+ <item row="1" column="1" colspan="2">
+ <widget class="QLabel" name="lState">
+ <property name="text">
<string/>
</property>
</widget>
</item>
- <item row="2" column="0" >
- <widget class="QLabel" name="label_3" >
- <property name="text" >
+ <item row="2" column="0">
+ <widget class="QLabel" name="label_3">
+ <property name="text">
<string>Accepting jobs:</string>
</property>
</widget>
</item>
- <item row="2" column="1" colspan="2" >
- <widget class="QLabel" name="lJAccept" >
- <property name="text" >
+ <item row="2" column="1" colspan="2">
+ <widget class="QLabel" name="lJAccept">
+ <property name="text">
<string/>
</property>
</widget>
</item>
- <item row="3" column="0" >
- <widget class="QLabel" name="label_4" >
- <property name="text" >
+ <item row="3" column="0">
+ <widget class="QLabel" name="label_4">
+ <property name="text">
<string>Type:</string>
</property>
</widget>
</item>
- <item row="3" column="1" colspan="2" >
- <widget class="QLabel" name="lType" >
- <property name="text" >
+ <item row="3" column="1" colspan="2">
+ <widget class="QLabel" name="lType">
+ <property name="text">
<string/>
</property>
</widget>
</item>
- <item row="4" column="0" >
- <widget class="QLabel" name="label_5" >
- <property name="text" >
+ <item row="4" column="0">
+ <widget class="QLabel" name="label_5">
+ <property name="text">
<string>Location:</string>
</property>
</widget>
</item>
- <item row="4" column="1" colspan="2" >
- <widget class="QLabel" name="lLocation" >
- <property name="text" >
+ <item row="4" column="1" colspan="2">
+ <widget class="QLabel" name="lLocation">
+ <property name="text">
<string/>
</property>
</widget>
</item>
- <item row="5" column="0" >
- <widget class="QLabel" name="label_6" >
- <property name="text" >
+ <item row="5" column="0">
+ <widget class="QLabel" name="label_6">
+ <property name="text">
<string>Comment:</string>
</property>
</widget>
</item>
- <item row="5" column="1" colspan="2" >
- <widget class="QLabel" name="lComment" >
- <property name="text" >
+ <item row="5" column="1" colspan="2">
+ <widget class="QLabel" name="lComment">
+ <property name="text">
<string/>
</property>
</widget>
diff --git a/debian/changelog b/debian/changelog
index a68e3db..520c235 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,6 +31,8 @@ x2goclient (3.99.3.1-0~x2go1) UNRELEASED; urgency=low
- Make sure x2goclient closes if broker has no sessions. Fixes
appearing session profile dialog if client is configured to
minimize to systray. (Closes upstream issue #73).
+ - Update license headers
+ - Add "author" entry in UI files
[ Ricardo Diaz ]
* New upstream version (3.99.3.1):
diff --git a/editconnectiondialog.cpp b/editconnectiondialog.cpp
index 66ae84a..bf10491 100644
--- a/editconnectiondialog.cpp
+++ b/editconnectiondialog.cpp
@@ -1,14 +1,20 @@
-//
-// C++ Implementation: editconnectiondialog
-//
-// Description:
-//
-//
-// Author: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>, (C) 2006
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
+/**************************************************************************
+* 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, see <http://www.gnu.org/licenses/>. *
+***************************************************************************/
+
#include "editconnectiondialog.h"
#include "x2goclientconfig.h"
#include "x2gologdebug.h"
diff --git a/editconnectiondialog.h b/editconnectiondialog.h
index c90730f..146b9f7 100644
--- a/editconnectiondialog.h
+++ b/editconnectiondialog.h
@@ -1,14 +1,19 @@
-//
-// C++ Interface: editconnectiondialog
-//
-// Description:
-//
-//
-// Author: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>, (C) 2006
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
+/**************************************************************************
+* 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, see <http://www.gnu.org/licenses/>. *
+***************************************************************************/
#ifndef EDITCONNECTIONDIALOG_H
#define EDITCONNECTIONDIALOG_H
diff --git a/exportdialog.cpp b/exportdialog.cpp
index 5932a4e..53329f0 100644
--- a/exportdialog.cpp
+++ b/exportdialog.cpp
@@ -1,14 +1,20 @@
-//
-// C++ Implementation: exportdialog
-//
-// Description:
-//
-//
-// Author: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>, (C) 2006
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
+/**************************************************************************
+* 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, see <http://www.gnu.org/licenses/>. *
+***************************************************************************/
+
#include "x2goclientconfig.h"
#include "exportdialog.h"
#include "editconnectiondialog.h"
diff --git a/exportdialog.h b/exportdialog.h
index d5e531e..018fdb3 100644
--- a/exportdialog.h
+++ b/exportdialog.h
@@ -1,14 +1,20 @@
-//
-// C++ Interface: exportdialog
-//
-// Description:
-//
-//
-// Author: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>, (C) 2006
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
+/**************************************************************************
+* 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, see <http://www.gnu.org/licenses/>. *
+***************************************************************************/
+
#ifndef EXPORTDIALOG_H
#define EXPORTDIALOG_H
diff --git a/httpbrokerclient.cpp b/httpbrokerclient.cpp
index f994891..f473a96 100644
--- a/httpbrokerclient.cpp
+++ b/httpbrokerclient.cpp
@@ -1,14 +1,20 @@
-//
-// C++ Implementation: httpbrokerclient
-//
-// Description:
-//
-//
-// Author: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>, (C) 2010
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
+/**************************************************************************
+* 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, see <http://www.gnu.org/licenses/>. *
+***************************************************************************/
+
#include "httpbrokerclient.h"
#include <QUrl>
#include <QHttp>
diff --git a/httpbrokerclient.h b/httpbrokerclient.h
index 725989b..78218dc 100644
--- a/httpbrokerclient.h
+++ b/httpbrokerclient.h
@@ -1,14 +1,20 @@
-//
-// C++ Interface: httpbrokerclient
-//
-// Description:
-//
-//
-// Author: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>, (C) 2010
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
+/**************************************************************************
+* 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, see <http://www.gnu.org/licenses/>. *
+***************************************************************************/
+
#ifndef HTTPBROKERCLIENT_H
#define HTTPBROKERCLIENT_H
#include "x2goclientconfig.h"
diff --git a/imgframe.cpp b/imgframe.cpp
index c2632bc..594ab9a 100644
--- a/imgframe.cpp
+++ b/imgframe.cpp
@@ -1,14 +1,20 @@
-//
-// C++ Implementation: imgframe
-//
-// Description:
-//
-//
-// Author: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>, (C) 2007
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
+/**************************************************************************
+* 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, see <http://www.gnu.org/licenses/>. *
+***************************************************************************/
+
#include "imgframe.h"
#include "x2goclientconfig.h"
diff --git a/imgframe.h b/imgframe.h
index 81f3651..d83fc6b 100644
--- a/imgframe.h
+++ b/imgframe.h
@@ -1,14 +1,20 @@
-//
-// C++ Interface: imgframe
-//
-// Description:
-//
-//
-// Author: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>, (C) 2007
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
+/**************************************************************************
+* 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, see <http://www.gnu.org/licenses/>. *
+***************************************************************************/
+
#ifndef IMGFRAME_H
#define IMGFRAME_H
diff --git a/ongetpass.cpp b/ongetpass.cpp
index ef548d6..11a7307 100644
--- a/ongetpass.cpp
+++ b/ongetpass.cpp
@@ -1,23 +1,19 @@
-/***************************************************************************
- * Copyright (C) 2005-2012 by Oleksandr Shneyder *
- * oleksandr.shneyder at obviously-nice.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. *
- ***************************************************************************/
-
+/**************************************************************************
+* 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, see <http://www.gnu.org/licenses/>. *
+***************************************************************************/
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/ongetpass.h b/ongetpass.h
index ad68a21..3d0b9d8 100644
--- a/ongetpass.h
+++ b/ongetpass.h
@@ -1,14 +1,19 @@
-//
-// C++ Header File
-//
-// Description:
-//
-//
-// Author: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>, (C) 2010
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
+/**************************************************************************
+* 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, see <http://www.gnu.org/licenses/>. *
+***************************************************************************/
#ifndef ONGETPASS_H
#define ONGETPASS_H
diff --git a/onmainwindow.cpp b/onmainwindow.cpp
index 842afc5..db72c4a 100644
--- a/onmainwindow.cpp
+++ b/onmainwindow.cpp
@@ -1,21 +1,18 @@
/**************************************************************************
* Copyright (C) 2005-2012 by Oleksandr Shneyder *
-* oleksandr.shneyder at obviously-nice.de *
+* 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. *
+* along with this program. If not, see <http://www.gnu.org/licenses/>. *
***************************************************************************/
#include "onmainwindow_privat.h"
diff --git a/onmainwindow.h b/onmainwindow.h
index 550aa12..c275445 100644
--- a/onmainwindow.h
+++ b/onmainwindow.h
@@ -1,23 +1,20 @@
+/**************************************************************************
+* 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, see <http://www.gnu.org/licenses/>. *
+***************************************************************************/
-/***************************************************************************
- * Copyright (C) 2005-2012 by Oleksandr Shneyder *
- * oleksandr.shneyder at obviously-nice.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 ONMAINWINDOW_H
#define ONMAINWINDOW_H
diff --git a/onmainwindow_privat.h b/onmainwindow_privat.h
index f1a7e4d..e98b062 100644
--- a/onmainwindow_privat.h
+++ b/onmainwindow_privat.h
@@ -1,22 +1,20 @@
-/***************************************************************************
- * Copyright (C) 2005-2012 by Oleksandr Shneyder *
- * oleksandr.shneyder at obviously-nice.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. *
- ***************************************************************************/
+/**************************************************************************
+* 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, see <http://www.gnu.org/licenses/>. *
+***************************************************************************/
+
#ifndef ONMAINWINDOWPRIVAT_H
#define ONMAINWINDOWPRIVAT_H
diff --git a/printdialog.cpp b/printdialog.cpp
index a16036b..0bebc72 100644
--- a/printdialog.cpp
+++ b/printdialog.cpp
@@ -1,14 +1,20 @@
-//
-// C++ Implementation: printdialog
-//
-// Description:
-//
-//
-// Author: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>, (C) 2009
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
+/**************************************************************************
+* 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, see <http://www.gnu.org/licenses/>. *
+***************************************************************************/
+
#include "printdialog.h"
#include <QPushButton>
#include "printwidget.h"
diff --git a/printdialog.h b/printdialog.h
index d1dbc04..022a085 100644
--- a/printdialog.h
+++ b/printdialog.h
@@ -1,14 +1,20 @@
-//
-// C++ Interface: printdialog
-//
-// Description:
-//
-//
-// Author: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>, (C) 2009
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
+/**************************************************************************
+* 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, see <http://www.gnu.org/licenses/>. *
+***************************************************************************/
+
#ifndef PRINTDIALOG_H
#define PRINTDIALOG_H
diff --git a/printdialog.ui b/printdialog.ui
index 284d2dd..4f52e41 100644
--- a/printdialog.ui
+++ b/printdialog.ui
@@ -1,10 +1,12 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <author>Oleksandr Shneyder(o.shneyder at phoca-gmbh.de)</author>
<class>PrintDialog</class>
- <widget class="QDialog" name="PrintDialog" >
- <property name="windowModality" >
+ <widget class="QDialog" name="PrintDialog">
+ <property name="windowModality">
<enum>Qt::NonModal</enum>
</property>
- <property name="geometry" >
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -12,20 +14,20 @@
<height>300</height>
</rect>
</property>
- <property name="windowTitle" >
+ <property name="windowTitle">
<string>Print - X2Go client</string>
</property>
- <layout class="QVBoxLayout" name="verticalLayout" >
+ <layout class="QVBoxLayout" name="verticalLayout">
<item>
- <widget class="Line" name="line" >
- <property name="orientation" >
+ <widget class="Line" name="line">
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
- <widget class="QDialogButtonBox" name="buttonBox" >
- <property name="standardButtons" >
+ <widget class="QDialogButtonBox" name="buttonBox">
+ <property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
@@ -40,11 +42,11 @@
<receiver>PrintDialog</receiver>
<slot>accept()</slot>
<hints>
- <hint type="sourcelabel" >
+ <hint type="sourcelabel">
<x>199</x>
<y>277</y>
</hint>
- <hint type="destinationlabel" >
+ <hint type="destinationlabel">
<x>199</x>
<y>149</y>
</hint>
@@ -56,11 +58,11 @@
<receiver>PrintDialog</receiver>
<slot>reject()</slot>
<hints>
- <hint type="sourcelabel" >
+ <hint type="sourcelabel">
<x>199</x>
<y>277</y>
</hint>
- <hint type="destinationlabel" >
+ <hint type="destinationlabel">
<x>199</x>
<y>149</y>
</hint>
diff --git a/printercmddialog.cpp b/printercmddialog.cpp
index c29f90e..036209e 100644
--- a/printercmddialog.cpp
+++ b/printercmddialog.cpp
@@ -1,14 +1,20 @@
-//
-// C++ Implementation: printercmddialog
-//
-// Description:
-//
-//
-// Author: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>, (C) 2009
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
+/**************************************************************************
+* 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, see <http://www.gnu.org/licenses/>. *
+***************************************************************************/
+
#include "printercmddialog.h"
#include "x2goclientconfig.h"
#ifdef Q_OS_WIN
diff --git a/printercmddialog.h b/printercmddialog.h
index 399fd3d..319ba72 100644
--- a/printercmddialog.h
+++ b/printercmddialog.h
@@ -1,14 +1,20 @@
-//
-// C++ Interface: printercmddialog
-//
-// Description:
-//
-//
-// Author: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>, (C) 2009
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
+/**************************************************************************
+* 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, see <http://www.gnu.org/licenses/>. *
+***************************************************************************/
+
#ifndef PRINTERCMDDIALOG_H
#define PRINTERCMDDIALOG_H
diff --git a/printercmddialog.ui b/printercmddialog.ui
index b1cf24b..6a7df66 100644
--- a/printercmddialog.ui
+++ b/printercmddialog.ui
@@ -1,7 +1,9 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <author>Oleksandr Shneyder(o.shneyder at phoca-gmbh.de)</author>
<class>PrinterCmdDialog</class>
- <widget class="QDialog" name="PrinterCmdDialog" >
- <property name="geometry" >
+ <widget class="QDialog" name="PrinterCmdDialog">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -9,67 +11,67 @@
<height>542</height>
</rect>
</property>
- <property name="windowTitle" >
+ <property name="windowTitle">
<string>Printer command</string>
</property>
- <layout class="QVBoxLayout" name="verticalLayout_4" >
+ <layout class="QVBoxLayout" name="verticalLayout_4">
<item>
- <widget class="QGroupBox" name="groupBox_2" >
- <property name="title" >
+ <widget class="QGroupBox" name="groupBox_2">
+ <property name="title">
<string>Command</string>
</property>
- <layout class="QVBoxLayout" name="verticalLayout_2" >
+ <layout class="QVBoxLayout" name="verticalLayout_2">
<item>
- <widget class="QLabel" name="label" >
- <property name="text" >
+ <widget class="QLabel" name="label">
+ <property name="text">
<string>Please enter your customized or individual printing command.
Examples:
kprinter
lpr -P hp_laserjet</string>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item>
- <widget class="QLineEdit" name="leCmd" />
+ <widget class="QLineEdit" name="leCmd"/>
</item>
</layout>
</widget>
</item>
<item>
- <widget class="QGroupBox" name="groupBox" >
- <property name="title" >
+ <widget class="QGroupBox" name="groupBox">
+ <property name="title">
<string>Output format</string>
</property>
- <layout class="QVBoxLayout" name="verticalLayout" >
+ <layout class="QVBoxLayout" name="verticalLayout">
<item>
- <widget class="QLabel" name="label_2" >
- <property name="text" >
+ <widget class="QLabel" name="label_2">
+ <property name="text">
<string>Please choose the printing file format (regarding to your printing environment - if you use CUPS you may use PDF)</string>
</property>
- <property name="textFormat" >
+ <property name="textFormat">
<enum>Qt::PlainText</enum>
</property>
- <property name="scaledContents" >
+ <property name="scaledContents">
<bool>false</bool>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item>
- <widget class="QRadioButton" name="rbPDF" >
- <property name="text" >
+ <widget class="QRadioButton" name="rbPDF">
+ <property name="text">
<string>PDF</string>
</property>
</widget>
</item>
<item>
- <widget class="QRadioButton" name="rbPS" >
- <property name="text" >
+ <widget class="QRadioButton" name="rbPS">
+ <property name="text">
<string>PS</string>
</property>
</widget>
@@ -81,37 +83,37 @@ lpr -P hp_laserjet</string>
</widget>
</item>
<item>
- <widget class="QGroupBox" name="groupBox_3" >
- <property name="title" >
+ <widget class="QGroupBox" name="groupBox_3">
+ <property name="title">
<string>Data structure</string>
</property>
- <layout class="QVBoxLayout" name="verticalLayout_3" >
+ <layout class="QVBoxLayout" name="verticalLayout_3">
<item>
- <widget class="QLabel" name="label_3" >
- <property name="text" >
+ <widget class="QLabel" name="label_3">
+ <property name="text">
<string>Please choose the method of printing file input (some commands accepting printing files as program options, some are awaiting data on standard input):</string>
</property>
- <property name="textFormat" >
+ <property name="textFormat">
<enum>Qt::PlainText</enum>
</property>
- <property name="scaledContents" >
+ <property name="scaledContents">
<bool>false</bool>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item>
- <widget class="QRadioButton" name="rbStdIn" >
- <property name="text" >
+ <widget class="QRadioButton" name="rbStdIn">
+ <property name="text">
<string>standard input (STDIN)</string>
</property>
</widget>
</item>
<item>
- <widget class="QRadioButton" name="rbParam" >
- <property name="text" >
+ <widget class="QRadioButton" name="rbParam">
+ <property name="text">
<string>Specify path as program parameter</string>
</property>
</widget>
@@ -120,11 +122,11 @@ lpr -P hp_laserjet</string>
</widget>
</item>
<item>
- <spacer name="verticalSpacer" >
- <property name="orientation" >
+ <spacer name="verticalSpacer">
+ <property name="orientation">
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>37</height>
@@ -133,8 +135,8 @@ lpr -P hp_laserjet</string>
</spacer>
</item>
<item>
- <widget class="QDialogButtonBox" name="buttonBox" >
- <property name="standardButtons" >
+ <widget class="QDialogButtonBox" name="buttonBox">
+ <property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
@@ -149,11 +151,11 @@ lpr -P hp_laserjet</string>
<receiver>PrinterCmdDialog</receiver>
<slot>reject()</slot>
<hints>
- <hint type="sourcelabel" >
+ <hint type="sourcelabel">
<x>230</x>
<y>519</y>
</hint>
- <hint type="destinationlabel" >
+ <hint type="destinationlabel">
<x>230</x>
<y>270</y>
</hint>
diff --git a/printprocess.cpp b/printprocess.cpp
index 910a1e5..ab88356 100644
--- a/printprocess.cpp
+++ b/printprocess.cpp
@@ -1,14 +1,20 @@
-//
-// C++ Implementation: printprocess
-//
-// Description:
-//
-//
-// Author: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>, (C) 2009
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
+/**************************************************************************
+* 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, see <http://www.gnu.org/licenses/>. *
+***************************************************************************/
+
#include "x2goclientconfig.h"
#include "printprocess.h"
#include "x2gologdebug.h"
diff --git a/printprocess.h b/printprocess.h
index 290f9d2..d6803be 100644
--- a/printprocess.h
+++ b/printprocess.h
@@ -1,14 +1,20 @@
-//
-// C++ Interface: printprocess
-//
-// Description:
-//
-//
-// Author: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>, (C) 2009
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
+/**************************************************************************
+* 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, see <http://www.gnu.org/licenses/>. *
+***************************************************************************/
+
#ifndef PRINTPROCESS_H
#define PRINTPROCESS_H
diff --git a/printwidget.cpp b/printwidget.cpp
index 75ea92a..471d6de 100644
--- a/printwidget.cpp
+++ b/printwidget.cpp
@@ -1,14 +1,20 @@
-//
-// C++ Implementation: printwidget
-//
-// Description:
-//
-//
-// Author: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>, (C) 2009
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
+/**************************************************************************
+* 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, see <http://www.gnu.org/licenses/>. *
+***************************************************************************/
+
#include "printwidget.h"
#if (!defined Q_OS_WIN) && (!defined Q_WS_HILDON)
#include "cupsprintwidget.h"
diff --git a/printwidget.h b/printwidget.h
index 449bd40..fc50b6f 100644
--- a/printwidget.h
+++ b/printwidget.h
@@ -1,14 +1,20 @@
-//
-// C++ Interface: printwidget
-//
-// Description:
-//
-//
-// Author: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>, (C) 2009
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
+/**************************************************************************
+* 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, see <http://www.gnu.org/licenses/>. *
+***************************************************************************/
+
#ifndef PRINTWIDGET_H
#define PRINTWIDGET_H
diff --git a/printwidget.ui b/printwidget.ui
index cf37453..eac5c7e 100644
--- a/printwidget.ui
+++ b/printwidget.ui
@@ -1,7 +1,9 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <author>Oleksandr Shneyder(o.shneyder at phoca-gmbh.de)</author>
<class>PrintWidget</class>
- <widget class="QWidget" name="PrintWidget" >
- <property name="geometry" >
+ <widget class="QWidget" name="PrintWidget">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -9,37 +11,37 @@
<height>497</height>
</rect>
</property>
- <property name="windowTitle" >
+ <property name="windowTitle">
<string>Form</string>
</property>
- <layout class="QVBoxLayout" name="verticalLayout_5" >
+ <layout class="QVBoxLayout" name="verticalLayout_5">
<item>
- <layout class="QHBoxLayout" name="horizontalLayout" >
+ <layout class="QHBoxLayout" name="horizontalLayout">
<item>
- <layout class="QVBoxLayout" name="verticalLayout" >
+ <layout class="QVBoxLayout" name="verticalLayout">
<item>
- <widget class="QRadioButton" name="rbPrint" >
- <property name="text" >
+ <widget class="QRadioButton" name="rbPrint">
+ <property name="text">
<string>Print</string>
</property>
- <property name="checked" >
+ <property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
- <widget class="QRadioButton" name="rbView" >
- <property name="text" >
+ <widget class="QRadioButton" name="rbView">
+ <property name="text">
<string>View as PDF</string>
</property>
</widget>
</item>
<item>
- <spacer name="verticalSpacer" >
- <property name="orientation" >
+ <spacer name="verticalSpacer">
+ <property name="orientation">
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
@@ -50,69 +52,69 @@
</layout>
</item>
<item>
- <layout class="QVBoxLayout" name="verticalLayout_4" >
+ <layout class="QVBoxLayout" name="verticalLayout_4">
<item>
- <widget class="QGroupBox" name="gbPrint" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
+ <widget class="QGroupBox" name="gbPrint">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="title" >
+ <property name="title">
<string>Print settings</string>
</property>
- <layout class="QVBoxLayout" name="verticalLayout_3" >
+ <layout class="QVBoxLayout" name="verticalLayout_3">
<item>
- <widget class="QLabel" name="lWinPrinter" >
- <property name="text" >
+ <widget class="QLabel" name="lWinPrinter">
+ <property name="text">
<string>Printer:</string>
</property>
</widget>
</item>
<item>
- <widget class="QComboBox" name="cbWinPrinter" />
+ <widget class="QComboBox" name="cbWinPrinter"/>
</item>
<item>
- <widget class="QLabel" name="lWinInfo" >
- <property name="text" >
+ <widget class="QLabel" name="lWinInfo">
+ <property name="text">
<string>Print using default Windows PDF Viewer
(Viewer application needs to be installed)</string>
</property>
</widget>
</item>
<item>
- <widget class="Line" name="line" >
- <property name="orientation" >
+ <widget class="Line" name="line">
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
- <widget class="QCheckBox" name="cbPrintCmd" >
- <property name="text" >
+ <widget class="QCheckBox" name="cbPrintCmd">
+ <property name="text">
<string>Printer command:</string>
</property>
</widget>
</item>
<item>
- <layout class="QHBoxLayout" name="horizontalLayout_3" >
+ <layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
- <widget class="QLineEdit" name="lePrintCmd" >
- <property name="enabled" >
+ <widget class="QLineEdit" name="lePrintCmd">
+ <property name="enabled">
<bool>false</bool>
</property>
- <property name="readOnly" >
+ <property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item>
- <widget class="QPushButton" name="pbPrintCmd" >
- <property name="enabled" >
+ <widget class="QPushButton" name="pbPrintCmd">
+ <property name="enabled">
<bool>false</bool>
</property>
- <property name="text" >
+ <property name="text">
<string>...</string>
</property>
</widget>
@@ -120,11 +122,11 @@
</layout>
</item>
<item>
- <spacer name="verticalSpacer_3" >
- <property name="orientation" >
+ <spacer name="verticalSpacer_3">
+ <property name="orientation">
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>325</width>
<height>2</height>
@@ -136,57 +138,57 @@
</widget>
</item>
<item>
- <widget class="QGroupBox" name="gbView" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
+ <widget class="QGroupBox" name="gbView">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="title" >
+ <property name="title">
<string>Viewer settings</string>
</property>
- <layout class="QVBoxLayout" name="verticalLayout_2" >
+ <layout class="QVBoxLayout" name="verticalLayout_2">
<item>
- <widget class="QRadioButton" name="rbOpen" >
- <property name="text" >
+ <widget class="QRadioButton" name="rbOpen">
+ <property name="text">
<string>Open in viewer application</string>
</property>
- <property name="checked" >
+ <property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
- <layout class="QHBoxLayout" name="horizontalLayout_2" >
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
- <widget class="QLabel" name="label" >
- <property name="text" >
+ <widget class="QLabel" name="label">
+ <property name="text">
<string>Command:</string>
</property>
</widget>
</item>
<item>
- <widget class="QLineEdit" name="leOpenCmd" />
+ <widget class="QLineEdit" name="leOpenCmd"/>
</item>
</layout>
</item>
<item>
- <widget class="QRadioButton" name="rbSave" >
- <property name="text" >
+ <widget class="QRadioButton" name="rbSave">
+ <property name="text">
<string>Save to disk</string>
</property>
- <property name="checked" >
+ <property name="checked">
<bool>false</bool>
</property>
</widget>
</item>
<item>
- <spacer name="verticalSpacer_2" >
- <property name="orientation" >
+ <spacer name="verticalSpacer_2">
+ <property name="orientation">
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>18</height>
@@ -202,11 +204,11 @@
</layout>
</item>
<item>
- <widget class="QCheckBox" name="cbShowDialog" >
- <property name="text" >
+ <widget class="QCheckBox" name="cbShowDialog">
+ <property name="text">
<string>Show this dialog before start printing</string>
</property>
- <property name="checked" >
+ <property name="checked">
<bool>true</bool>
</property>
</widget>
@@ -221,11 +223,11 @@
<receiver>label</receiver>
<slot>setEnabled(bool)</slot>
<hints>
- <hint type="sourcelabel" >
+ <hint type="sourcelabel">
<x>249</x>
<y>120</y>
</hint>
- <hint type="destinationlabel" >
+ <hint type="destinationlabel">
<x>165</x>
<y>150</y>
</hint>
@@ -237,11 +239,11 @@
<receiver>leOpenCmd</receiver>
<slot>setEnabled(bool)</slot>
<hints>
- <hint type="sourcelabel" >
+ <hint type="sourcelabel">
<x>249</x>
<y>120</y>
</hint>
- <hint type="destinationlabel" >
+ <hint type="destinationlabel">
<x>284</x>
<y>150</y>
</hint>
@@ -253,11 +255,11 @@
<receiver>lePrintCmd</receiver>
<slot>setEnabled(bool)</slot>
<hints>
- <hint type="sourcelabel" >
+ <hint type="sourcelabel">
<x>248</x>
<y>56</y>
</hint>
- <hint type="destinationlabel" >
+ <hint type="destinationlabel">
<x>206</x>
<y>88</y>
</hint>
@@ -269,11 +271,11 @@
<receiver>pbPrintCmd</receiver>
<slot>setEnabled(bool)</slot>
<hints>
- <hint type="sourcelabel" >
+ <hint type="sourcelabel">
<x>248</x>
<y>56</y>
</hint>
- <hint type="destinationlabel" >
+ <hint type="destinationlabel">
<x>327</x>
<y>88</y>
</hint>
@@ -285,11 +287,11 @@
<receiver>gbPrint</receiver>
<slot>setVisible(bool)</slot>
<hints>
- <hint type="sourcelabel" >
+ <hint type="sourcelabel">
<x>62</x>
<y>22</y>
</hint>
- <hint type="destinationlabel" >
+ <hint type="destinationlabel">
<x>296</x>
<y>64</y>
</hint>
@@ -301,11 +303,11 @@
<receiver>gbView</receiver>
<slot>setVisible(bool)</slot>
<hints>
- <hint type="sourcelabel" >
+ <hint type="sourcelabel">
<x>62</x>
<y>46</y>
</hint>
- <hint type="destinationlabel" >
+ <hint type="destinationlabel">
<x>296</x>
<y>188</y>
</hint>
diff --git a/sessionbutton.cpp b/sessionbutton.cpp
index c5ed6b0..576d491 100644
--- a/sessionbutton.cpp
+++ b/sessionbutton.cpp
@@ -1,14 +1,20 @@
-//
-// C++ Implementation: sessionbutton
-//
-// Description:
-//
-//
-// Author: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>, (C) 2006
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
+/**************************************************************************
+* 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, see <http://www.gnu.org/licenses/>. *
+***************************************************************************/
+
#include "sessionbutton.h"
#include "x2goclientconfig.h"
diff --git a/sessionbutton.h b/sessionbutton.h
index fe294d6..bef550b 100644
--- a/sessionbutton.h
+++ b/sessionbutton.h
@@ -1,14 +1,20 @@
-//
-// C++ Interface: sessionbutton
-//
-// Description:
-//
-//
-// Author: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>, (C) 2006
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
+/**************************************************************************
+* 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, see <http://www.gnu.org/licenses/>. *
+***************************************************************************/
+
#ifndef SESSIONBUTTON_H
#define SESSIONBUTTON_H
diff --git a/sessionmanagedialog.cpp b/sessionmanagedialog.cpp
index f4a9026..2459276 100644
--- a/sessionmanagedialog.cpp
+++ b/sessionmanagedialog.cpp
@@ -1,14 +1,20 @@
-//
-// C++ Implementation: sessionmanagedialog
-//
-// Description:
-//
-//
-// Author: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>, (C) 2006
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
+/**************************************************************************
+* 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, see <http://www.gnu.org/licenses/>. *
+***************************************************************************/
+
#include "x2goclientconfig.h"
#include "sessionmanagedialog.h"
#include "onmainwindow.h"
diff --git a/sessionmanagedialog.h b/sessionmanagedialog.h
index 4bbe34f..931226e 100644
--- a/sessionmanagedialog.h
+++ b/sessionmanagedialog.h
@@ -1,14 +1,20 @@
-//
-// C++ Interface: sessionmanagedialog
-//
-// Description:
-//
-//
-// Author: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>, (C) 2006
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
+/**************************************************************************
+* 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, see <http://www.gnu.org/licenses/>. *
+***************************************************************************/
+
#ifndef SESSIONMANAGEDIALOG_H
#define SESSIONMANAGEDIALOG_H
#include "x2goclientconfig.h"
diff --git a/sessionwidget.cpp b/sessionwidget.cpp
index 715c332..c78eb0c 100644
--- a/sessionwidget.cpp
+++ b/sessionwidget.cpp
@@ -1,14 +1,20 @@
-//
-// C++ Implementation: sessionwidget
-//
-// Description:
-//
-//
-// Author: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>, (C) 2009
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
+/**************************************************************************
+* 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, see <http://www.gnu.org/licenses/>. *
+***************************************************************************/
+
#include "sessionwidget.h"
#include <QBoxLayout>
#include <QLineEdit>
diff --git a/sessionwidget.h b/sessionwidget.h
index e289a30..fe2240a 100644
--- a/sessionwidget.h
+++ b/sessionwidget.h
@@ -1,14 +1,20 @@
-//
-// C++ Interface: sessionwidget
-//
-// Description:
-//
-//
-// Author: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>, (C) 2009
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
+/**************************************************************************
+* 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, see <http://www.gnu.org/licenses/>. *
+***************************************************************************/
+
#ifndef SESSIONWIDGET_H
#define SESSIONWIDGET_H
diff --git a/settingswidget.cpp b/settingswidget.cpp
index 12ac5f1..98cb9b0 100644
--- a/settingswidget.cpp
+++ b/settingswidget.cpp
@@ -1,14 +1,20 @@
-//
-// C++ Implementation: settingswidget
-//
-// Description:
-//
-//
-// Author: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>, (C) 2009
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
+/**************************************************************************
+* 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, see <http://www.gnu.org/licenses/>. *
+***************************************************************************/
+
#include "settingswidget.h"
#include "onmainwindow.h"
#include <QBoxLayout>
diff --git a/settingswidget.h b/settingswidget.h
index eeed255..590e728 100644
--- a/settingswidget.h
+++ b/settingswidget.h
@@ -1,14 +1,20 @@
-//
-// C++ Interface: settingswidget
-//
-// Description:
-//
-//
-// Author: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>, (C) 2009
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
+/**************************************************************************
+* 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, see <http://www.gnu.org/licenses/>. *
+***************************************************************************/
+
#ifndef SETTINGSWIDGET_H
#define SETTINGSWIDGET_H
diff --git a/sharewidget.cpp b/sharewidget.cpp
index dcece1d..22b9380 100644
--- a/sharewidget.cpp
+++ b/sharewidget.cpp
@@ -1,14 +1,20 @@
-//
-// C++ Implementation: sharewidget
-//
-// Description:
-//
-//
-// Author: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>, (C) 2009
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
+/**************************************************************************
+* 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, see <http://www.gnu.org/licenses/>. *
+***************************************************************************/
+
#include "sharewidget.h"
#include "onmainwindow.h"
diff --git a/sharewidget.h b/sharewidget.h
index ffcf1bd..edf0707 100644
--- a/sharewidget.h
+++ b/sharewidget.h
@@ -1,14 +1,20 @@
-//
-// C++ Interface: sharewidget
-//
-// Description:
-//
-//
-// Author: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>, (C) 2009
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
+/**************************************************************************
+* 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, see <http://www.gnu.org/licenses/>. *
+***************************************************************************/
+
#ifndef SHAREWIDGET_H
#define SHAREWIDGET_H
diff --git a/sshmasterconnection.cpp b/sshmasterconnection.cpp
index 5a23989..317be46 100644
--- a/sshmasterconnection.cpp
+++ b/sshmasterconnection.cpp
@@ -1,24 +1,19 @@
-
-/***************************************************************************
- * Copyright (C) 2005-2012 by Oleksandr Shneyder *
- * oleksandr.shneyder at obviously-nice.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. *
- ***************************************************************************/
-
+/**************************************************************************
+* 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, see <http://www.gnu.org/licenses/>. *
+***************************************************************************/
#include "x2goclientconfig.h"
#include "x2gologdebug.h"
diff --git a/sshmasterconnection.h b/sshmasterconnection.h
index fa9af03..bbefe0f 100644
--- a/sshmasterconnection.h
+++ b/sshmasterconnection.h
@@ -1,23 +1,19 @@
-
-/***************************************************************************
- * Copyright (C) 2005-2012 by Oleksandr Shneyder *
- * oleksandr.shneyder at obviously-nice.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. *
- ***************************************************************************/
+/**************************************************************************
+* 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, see <http://www.gnu.org/licenses/>. *
+***************************************************************************/
#ifndef SSHMASTERCONNECTION_H
#define SSHMASTERCONNECTION_H
diff --git a/sshprocess.cpp b/sshprocess.cpp
index c997002..1347e21 100644
--- a/sshprocess.cpp
+++ b/sshprocess.cpp
@@ -1,23 +1,19 @@
-
-/***************************************************************************
- * Copyright (C) 2005-2012 by Oleksandr Shneyder *
- * oleksandr.shneyder at obviously-nice.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. *
- ***************************************************************************/
+/**************************************************************************
+* 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, see <http://www.gnu.org/licenses/>. *
+***************************************************************************/
#include "x2goclientconfig.h"
#include "x2gologdebug.h"
diff --git a/sshprocess.h b/sshprocess.h
index 9bd8b92..d446e22 100644
--- a/sshprocess.h
+++ b/sshprocess.h
@@ -1,23 +1,19 @@
-
-/***************************************************************************
- * Copyright (C) 2005-2012 by Oleksandr Shneyder *
- * oleksandr.shneyder at obviously-nice.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. *
- ***************************************************************************/
+/**************************************************************************
+* 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, see <http://www.gnu.org/licenses/>. *
+***************************************************************************/
#ifndef SSHPROCESS_H
#define SSHPROCESS_H
diff --git a/userbutton.cpp b/userbutton.cpp
index 270ea93..241fb14 100644
--- a/userbutton.cpp
+++ b/userbutton.cpp
@@ -1,22 +1,20 @@
-/***************************************************************************
- * Copyright (C) 2005-2012 by Oleksandr Shneyder *
- * oleksandr.shneyder at obviously-nice.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. *
- ***************************************************************************/
+/**************************************************************************
+* 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, see <http://www.gnu.org/licenses/>. *
+***************************************************************************/
+
#include "x2goclientconfig.h"
#include "userbutton.h"
#include <QFont>
diff --git a/userbutton.h b/userbutton.h
index 7606d97..0e1159c 100644
--- a/userbutton.h
+++ b/userbutton.h
@@ -1,22 +1,20 @@
-/***************************************************************************
- * Copyright (C) 2005-2012 by Oleksandr Shneyder *
- * oleksandr.shneyder at obviously-nice.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. *
- ***************************************************************************/
+/**************************************************************************
+* 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, see <http://www.gnu.org/licenses/>. *
+***************************************************************************/
+
#ifndef USERBUTTON_H
#define USERBUTTON_H
diff --git a/version.h b/version.h
index e442bfd..e0497dc 100644
--- a/version.h
+++ b/version.h
@@ -1,2 +1,19 @@
+/**************************************************************************
+* 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, see <http://www.gnu.org/licenses/>. *
+***************************************************************************/
+
#define VERSION "3.99.3.1"
diff --git a/wapi.cpp b/wapi.cpp
index 9af6085..affdbc4 100644
--- a/wapi.cpp
+++ b/wapi.cpp
@@ -1,3 +1,20 @@
+/**************************************************************************
+* 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, see <http://www.gnu.org/licenses/>. *
+***************************************************************************/
+
#ifndef _WIN32_WINDOWS
#define _WIN32_WINDOWS 0x0500
#define _WIN32_WINNT 0x0500
diff --git a/wapi.h b/wapi.h
index e7ec667..0ba6457 100644
--- a/wapi.h
+++ b/wapi.h
@@ -1,3 +1,20 @@
+/**************************************************************************
+* 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, see <http://www.gnu.org/licenses/>. *
+***************************************************************************/
+
#ifndef _WAPI_H
#define _WAPI_H
#include "x2goclientconfig.h"
diff --git a/x2goclient.cpp b/x2goclient.cpp
index d2d0b94..4fdd905 100644
--- a/x2goclient.cpp
+++ b/x2goclient.cpp
@@ -1,22 +1,20 @@
-/***************************************************************************
- * Copyright (C) 2005-2012 by Oleksandr Shneyder *
- * oleksandr.shneyder at obviously-nice.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. *
- ***************************************************************************/
+/**************************************************************************
+* 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, see <http://www.gnu.org/licenses/>. *
+***************************************************************************/
+
#include "ongetpass.h"
int main(int argc, char *argv[])
diff --git a/x2goclientconfig.h b/x2goclientconfig.h
index 48a8992..341c1f7 100644
--- a/x2goclientconfig.h
+++ b/x2goclientconfig.h
@@ -1,3 +1,20 @@
+/**************************************************************************
+* 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, see <http://www.gnu.org/licenses/>. *
+***************************************************************************/
+
#if !defined(_X2GOCLIENT_CONFIG_H_)
#define _X2GOCLIENT_CONFIG_H_
diff --git a/x2gologdebug.cpp b/x2gologdebug.cpp
index 894a25c..c21c1c3 100644
--- a/x2gologdebug.cpp
+++ b/x2gologdebug.cpp
@@ -1,14 +1,20 @@
-//
-// C++ Implementation: x2gologdebug
-//
-// Description:
-//
-//
-// Author: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>, (C) 2007
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
+/**************************************************************************
+* 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, see <http://www.gnu.org/licenses/>. *
+***************************************************************************/
+
#include "x2gologdebug.h"
#include "x2goclientconfig.h"
#ifdef LOGFILE
diff --git a/x2gologdebug.h b/x2gologdebug.h
index 05e996d..b35f783 100644
--- a/x2gologdebug.h
+++ b/x2gologdebug.h
@@ -1,14 +1,20 @@
-//
-// C++ Interface: x2gologdebug
-//
-// Description:
-//
-//
-// Author: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>, (C) 2007
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
+/**************************************************************************
+* 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, see <http://www.gnu.org/licenses/>. *
+***************************************************************************/
+
#ifndef X2GOLOGDEBUG_H
#define X2GOLOGDEBUG_H
#include <QTextStream>
diff --git a/x2gosettings.cpp b/x2gosettings.cpp
index 79077fb..97d3f7e 100644
--- a/x2gosettings.cpp
+++ b/x2gosettings.cpp
@@ -1,14 +1,20 @@
-//
-// C++ Implementation: x2gosettings
-//
-// Description:
-//
-//
-// Author: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>, (C) 2010
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
+/**************************************************************************
+* 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, see <http://www.gnu.org/licenses/>. *
+***************************************************************************/
+
#include "x2gosettings.h"
#include "x2goclientconfig.h"
#include "x2gologdebug.h"
diff --git a/x2gosettings.h b/x2gosettings.h
index fffd350..985820a 100644
--- a/x2gosettings.h
+++ b/x2gosettings.h
@@ -1,15 +1,19 @@
-//
-// C++ Interface: x2gosettings
-//
-// Description:
-//
-//
-// Author: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>, (C) 2010
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
-
+/**************************************************************************
+* 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, see <http://www.gnu.org/licenses/>. *
+***************************************************************************/
#ifndef X2GOSETTINGS_H
#define X2GOSETTINGS_H
diff --git a/xsettingsui.ui b/xsettingsui.ui
index 2f85125..2a89846 100644
--- a/xsettingsui.ui
+++ b/xsettingsui.ui
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
+ <author>Oleksandr Shneyder(o.shneyder at phoca-gmbh.de)</author>
<class>XSettingsWidgetUI</class>
<widget class="QWidget" name="XSettingsWidgetUI">
<property name="geometry">
@@ -7,7 +8,7 @@
<x>0</x>
<y>0</y>
<width>521</width>
- <height>380</height>
+ <height>386</height>
</rect>
</property>
<property name="windowTitle">
diff --git a/xsettingswidget.cpp b/xsettingswidget.cpp
index a76fa61..424c047 100644
--- a/xsettingswidget.cpp
+++ b/xsettingswidget.cpp
@@ -1,21 +1,19 @@
-/*
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) 2005-2012 Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.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 3 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, see <http://www.gnu.org/licenses/>.
-
-*/
+/**************************************************************************
+* 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, see <http://www.gnu.org/licenses/>. *
+***************************************************************************/
#include "xsettingswidget.h"
#include "x2gosettings.h"
diff --git a/xsettingswidget.h b/xsettingswidget.h
index 0627350..a2ca9e5 100644
--- a/xsettingswidget.h
+++ b/xsettingswidget.h
@@ -1,21 +1,19 @@
-/*
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) 2005-2012 Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.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 3 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, see <http://www.gnu.org/licenses/>.
-
-*/
+/**************************************************************************
+* 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, see <http://www.gnu.org/licenses/>. *
+***************************************************************************/
#ifndef XSETTINGSWIDGET_H
#define XSETTINGSWIDGET_H
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