HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/QLop Commit - r15:b90d69939be9

Better proxy support Wip....

jeandet -

r15:b90d69939be9 default

parent child

Context file:

r15:b90d69939be9

resources/Gnome-emblem-downloads.svg created 644 +73 0

@@ -0,0 +1,73
	1	<?xml version="1.0" encoding="UTF-8" standalone="no"?>
	2	<!-- Created with Inkscape (http://www.inkscape.org/) -->
	3	<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://web.resource.org/cc/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="48" height="48" id="svg7854" sodipodi:version="0.32" inkscape:version="0.45" version="1.0" sodipodi:docbase="/home/dobey/Projects/gnome-icon-theme/scalable/emblems" sodipodi:docname="emblem-downloads.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" inkscape:export-filename="/home/lapo/Desktop/emblem-downloads.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90">
	4	<defs id="defs7856">
	5	<linearGradient inkscape:collect="always" id="linearGradient6975">
	6	<stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop6977"/>
	7	<stop style="stop-color:#ffffff;stop-opacity:0;" offset="1" id="stop6979"/>
	8	</linearGradient>
	9	<linearGradient inkscape:collect="always" id="linearGradient6964">
	10	<stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop6967"/>
	11	<stop style="stop-color:#ffffff;stop-opacity:0;" offset="1" id="stop6969"/>
	12	</linearGradient>
	13	<linearGradient inkscape:collect="always" id="linearGradient6970">
	14	<stop style="stop-color:#eeeeec;stop-opacity:1" offset="0" id="stop6972"/>
	15	<stop style="stop-color:#eeeeec;stop-opacity:0" offset="1" id="stop6974"/>
	16	</linearGradient>
	17	<linearGradient inkscape:collect="always" id="linearGradient6962">
	18	<stop style="stop-color:#babdb6;stop-opacity:1" offset="0" id="stop6964"/>
	19	<stop style="stop-color:#babdb6;stop-opacity:0" offset="1" id="stop6966"/>
	20	</linearGradient>
	21	<linearGradient inkscape:collect="always" id="linearGradient7129">
	22	<stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop7131"/>
	23	<stop style="stop-color:#000000;stop-opacity:0;" offset="1" id="stop7133"/>
	24	</linearGradient>
	25	<radialGradient inkscape:collect="always" xlink:href="#linearGradient7129" id="radialGradient5955" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.4320988,0,10.586385)" cx="11.313708" cy="18.641243" fx="11.313708" fy="18.641243" r="7.1594563"/>
	26	<linearGradient inkscape:collect="always" xlink:href="#linearGradient6970" id="linearGradient6996" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.8421053,0,0,1.9998392,2.8157881,0.503458)" x1="10.5625" y1="11.850357" x2="10.5625" y2="7.0549741"/>
	27	<linearGradient inkscape:collect="always" xlink:href="#linearGradient6962" id="linearGradient6998" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.8421053,0,0,1.9998392,2.8157881,0.503458)" x1="8.4375" y1="11" x2="8.4375" y2="7.0917883"/>
	28	<linearGradient inkscape:collect="always" xlink:href="#linearGradient6964" id="linearGradient7000" gradientUnits="userSpaceOnUse" x1="19.75" y1="22.500912" x2="19.75" y2="13.937252"/>
	29	<linearGradient inkscape:collect="always" xlink:href="#linearGradient6975" id="linearGradient7002" gradientUnits="userSpaceOnUse" x1="22.539028" y1="41.65625" x2="23.246136" y2="31.736544"/>
	30	</defs>
	31	<sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#494949" borderopacity="1" gridtolerance="10000" guidetolerance="10" objecttolerance="10" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="1" inkscape:cx="36.776007" inkscape:cy="31.76253" inkscape:document-units="px" inkscape:current-layer="layer1" width="48px" height="48px" inkscape:showpageshadow="false" inkscape:window-width="1063" inkscape:window-height="894" inkscape:window-x="128" inkscape:window-y="114" showgrid="false" gridspacingx="0.5px" gridspacingy="0.5px" gridempspacing="2" showborder="false" showguides="true" inkscape:guide-bbox="false" borderlayer="false" inkscape:grid-bbox="false" inkscape:grid-points="true"/>
	32	<metadata id="metadata7859">
	33	<rdf:RDF>
	34	<cc:Work rdf:about="">
	35	<dc:format>image/svg+xml</dc:format>
	36	<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
	37	<dc:creator>
	38	<cc:Agent>
	39	<dc:title>Lapo Calamandrei</dc:title>
	40	</cc:Agent>
	41	</dc:creator>
	42	<dc:source/>
	43	<cc:license rdf:resource="http://creativecommons.org/licenses/GPL/2.0/"/>
	44	<dc:title>Download</dc:title>
	45	<dc:subject>
	46	<rdf:Bag/>
	47	</dc:subject>
	48	</cc:Work>
	49	<cc:License rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
	50	<cc:permits rdf:resource="http://web.resource.org/cc/Reproduction"/>
	51	<cc:permits rdf:resource="http://web.resource.org/cc/Distribution"/>
	52	<cc:requires rdf:resource="http://web.resource.org/cc/Notice"/>
	53	<cc:permits rdf:resource="http://web.resource.org/cc/DerivativeWorks"/>
	54	<cc:requires rdf:resource="http://web.resource.org/cc/ShareAlike"/>
	55	<cc:requires rdf:resource="http://web.resource.org/cc/SourceCode"/>
	56	</cc:License>
	57	</rdf:RDF>
	58	</metadata>
	59	<g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1">
	60	<path sodipodi:type="arc" style="opacity:0.15;fill:url(#radialGradient5955);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="path5975" sodipodi:cx="11.313708" sodipodi:cy="18.641243" sodipodi:rx="7.1594563" sodipodi:ry="3.0935922" d="M 18.473165 18.641243 A 7.1594563 3.0935922 0 1 1 4.1542521,18.641243 A 7.1594563 3.0935922 0 1 1 18.473165 18.641243 z" transform="matrix(2.5432565,0,0,1.5691033,-4.7736618,11.749965)"/>
	61	<g id="g7012" transform="translate(0,-2)">
	62	<rect ry="4.4840183" rx="4.4840183" y="6.5206337" x="4.5084929" height="19.962349" width="38.987251" id="rect5987" style="fill:#d3d7cf;fill-opacity:1;fill-rule:evenodd;stroke:#888a85;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/>
	63	<rect ry="2.0382936" rx="2.0382936" y="12.5" x="9.5" height="8" width="29" id="rect6983" style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#babdb6;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/>
	64	<rect ry="3.5065231" rx="3.5065231" y="7.5" x="5.5042353" height="18.003614" width="36.995766" id="rect6959" style="opacity:0.55;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/>
	65	<rect ry="0.53477186" rx="0.53477186" y="14" x="11" height="5" width="15" id="rect5981" style="fill:#729fcf;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/>
	66	</g>
	67	<g id="g6991">
	68	<path sodipodi:nodetypes="cccccccc" id="path5977" d="M 18.506578,13.5 L 18.5,29.5 L 11.499998,29.501126 L 23.999999,43.5 L 36.499999,29.501126 L 29.520162,29.501126 L 29.520162,13.5 L 18.506578,13.5 z " style="color:#000000;fill:url(#linearGradient6996);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient6998);stroke-width:0.99999982;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"/>
	69	<path sodipodi:nodetypes="cccccccccc" id="path6962" d="M 19.5,12.5 L 19.5,28.5 C 19.499945,29.052262 19.052262,29.499945 18.5,29.5 L 13.71875,29.5 L 24,41 L 34.28125,29.5 L 29.53125,29.5 C 28.978988,29.499945 28.531305,29.052262 28.53125,28.5 L 28.53125,12.5 L 19.5,12.5 z " style="color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient7000);stroke-width:0.99999982;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" transform="translate(0,1)"/>
	70	<path transform="translate(0,1)" sodipodi:nodetypes="cscccccscc" id="path6973" d="M 19.0625,28.5 C 19.06368,28.649543 19.004796,28.793303 18.89905,28.89905 C 18.793303,29.004796 18.649543,29.06368 18.5,29.0625 L 12.75,29.0625 L 24,41.65625 L 35.25,29.0625 L 29.53125,29.0625 C 29.381707,29.06368 29.237947,29.004796 29.1322,28.89905 C 29.026454,28.793303 28.96757,28.649543 28.96875,28.5 L 19.0625,28.5 z " style="opacity:0.27238805;color:#000000;fill:url(#linearGradient7002);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999982;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"/>
	71	</g>
	72	</g>
	73	</svg> No newline at end of file

resources/cassini.gif created 644 binary 0 0

NO CONTENT: new file 100644, binary diff hidden

src/Cassini/cassinitoolssettingsgui.cpp created 644 +26 0

@@ -0,0 +1,26
	1	#include "cassinitoolssettingsgui.h"
	2	#include "ui_cassinitoolssettingsgui.h"
	3
	4	CassiniToolsSettingsGUI::CassiniToolsSettingsGUI(QWidget *parent) :
	5	QWidget(parent),
	6	ui(new Ui::CassiniToolsSettingsGUI)
	7	{
	8	ui->setupUi(this);
	9	}
	10
	11	CassiniToolsSettingsGUI::~CassiniToolsSettingsGUI()
	12	{
	13	delete ui;
	14	}
	15
	16	void CassiniToolsSettingsGUI::changeEvent(QEvent *e)
	17	{
	18	QWidget::changeEvent(e);
	19	switch (e->type()) {
	20	case QEvent::LanguageChange:
	21	ui->retranslateUi(this);
	22	break;
	23	default:
	24	break;
	25	}
	26	}

src/Cassini/cassinitoolssettingsgui.h created 644 +25 0

@@ -0,0 +1,25
	1	#ifndef CASSINITOOLSSETTINGSGUI_H
	2	#define CASSINITOOLSSETTINGSGUI_H
	3
	4	#include <QWidget>
	5
	6	namespace Ui {
	7	class CassiniToolsSettingsGUI;
	8	}
	9
	10	class CassiniToolsSettingsGUI : public QWidget
	11	{
	12	Q_OBJECT
	13
	14	public:
	15	explicit CassiniToolsSettingsGUI(QWidget *parent = 0);
	16	~CassiniToolsSettingsGUI();
	17
	18	protected:
	19	void changeEvent(QEvent *e);
	20
	21	private:
	22	Ui::CassiniToolsSettingsGUI *ui;
	23	};
	24
	25	#endif // CASSINITOOLSSETTINGSGUI_H

src/Cassini/cassinitoolssettingsgui.ui created 644 +21 0

@@ -0,0 +1,21
	1	<ui version="4.0">
	2	<author/>
	3	<comment/>
	4	<exportmacro/>
	5	<class>CassiniToolsSettingsGUI</class>
	6	<widget name="CassiniToolsSettingsGUI" class="QWidget">
	7	<property name="geometry">
	8	<rect>
	9	<x>0</x>
	10	<y>0</y>
	11	<width>400</width>
	12	<height>300</height>
	13	</rect>
	14	</property>
	15	<property name="windowTitle">
	16	<string>Form</string>
	17	</property>
	18	</widget>
	19	<pixmapfunction/>
	20	<connections/>
	21	</ui>

src/Core/Widgets/filedowloadersettingsgui.cpp created 644 +61 0

@@ -0,0 +1,61
	1	/*------------------------------------------------------------------------------
	2	-- This file is a part of the QLop Software
	3	-- Copyright (C) 2015, Plasma Physics Laboratory - CNRS
	4	--
	5	-- This program is free software; you can redistribute it and/or modify
	6	-- it under the terms of the GNU General Public License as published by
	7	-- the Free Software Foundation; either version 2 of the License, or
	8	-- (at your option) any later version.
	9	--
	10	-- This program is distributed in the hope that it will be useful,
	11	-- but WITHOUT ANY WARRANTY; without even the implied warranty of
	12	-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	13	-- GNU General Public License for more details.
	14	--
	15	-- You should have received a copy of the GNU General Public License
	16	-- along with this program; if not, write to the Free Software
	17	-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
	18	-------------------------------------------------------------------------------*/
	19	/*-- Author : Alexis Jeandet
	20	-- Mail : alexis.jeandet@member.fsf.org
	21	----------------------------------------------------------------------------*/
	22	#include "filedowloadersettingsgui.h"
	23	#include "ui_filedowloadersettingsgui.h"
	24
	25	FileDowloaderSettingsGUI::FileDowloaderSettingsGUI(QWidget *parent) :
	26	QWidget(parent),
	27	ui(new Ui::FileDowloaderSettingsGUI)
	28	{
	29	ui->setupUi(this);
	30	this->manualProxyCFG_GUI = new ManualProxyCFG_GUI();
	31	lastWidget = NULL;
	32	connect(this->ui->comboBox,SIGNAL(currentIndexChanged(QString)),this,SLOT(proxyMethodChanged(QString)));
	33	}
	34
	35	FileDowloaderSettingsGUI::~FileDowloaderSettingsGUI()
	36	{
	37	delete ui;
	38	}
	39
	40	void FileDowloaderSettingsGUI::changeEvent(QEvent *e)
	41	{
	42	QWidget::changeEvent(e);
	43	switch (e->type()) {
	44	case QEvent::LanguageChange:
	45	ui->retranslateUi(this);
	46	break;
	47	default:
	48	break;
	49	}
	50	}
	51
	52	void FileDowloaderSettingsGUI::proxyMethodChanged(const QString &text)
	53	{
	54	this->ui->gridLayout->removeWidget(this->lastWidget);
	55	if(text=="manual")
	56	{
	57	this->ui->gridLayout->addWidget(this->manualProxyCFG_GUI,1,0,1,-1);
	58	this->lastWidget = this->manualProxyCFG_GUI;
	59	return;
	60	}
	61	}

src/Core/Widgets/filedowloadersettingsgui.h created 644 +51 0

@@ -0,0 +1,51
	1	/*------------------------------------------------------------------------------
	2	-- This file is a part of the QLop Software
	3	-- Copyright (C) 2015, Plasma Physics Laboratory - CNRS
	4	--
	5	-- This program is free software; you can redistribute it and/or modify
	6	-- it under the terms of the GNU General Public License as published by
	7	-- the Free Software Foundation; either version 2 of the License, or
	8	-- (at your option) any later version.
	9	--
	10	-- This program is distributed in the hope that it will be useful,
	11	-- but WITHOUT ANY WARRANTY; without even the implied warranty of
	12	-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	13	-- GNU General Public License for more details.
	14	--
	15	-- You should have received a copy of the GNU General Public License
	16	-- along with this program; if not, write to the Free Software
	17	-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
	18	-------------------------------------------------------------------------------*/
	19	/*-- Author : Alexis Jeandet
	20	-- Mail : alexis.jeandet@member.fsf.org
	21	----------------------------------------------------------------------------*/
	22	#ifndef FILEDOWLOADERSETTINGSGUI_H
	23	#define FILEDOWLOADERSETTINGSGUI_H
	24
	25	#include <QWidget>
	26	#include "manualproxycfg_gui.h"
	27
	28	namespace Ui {
	29	class FileDowloaderSettingsGUI;
	30	}
	31
	32	class FileDowloaderSettingsGUI : public QWidget
	33	{
	34	Q_OBJECT
	35
	36	public:
	37	explicit FileDowloaderSettingsGUI(QWidget *parent = 0);
	38	~FileDowloaderSettingsGUI();
	39
	40	protected:
	41	void changeEvent(QEvent *e);
	42
	43	private slots:
	44	void proxyMethodChanged(const QString & text);
	45	private:
	46	ManualProxyCFG_GUI* manualProxyCFG_GUI;
	47	Ui::FileDowloaderSettingsGUI *ui;
	48	QWidget* lastWidget;
	49	};
	50
	51	#endif // FILEDOWLOADERSETTINGSGUI_H

src/Core/Widgets/filedowloadersettingsgui.ui created 644 +74 0

@@ -0,0 +1,74
	1	<?xml version="1.0" encoding="UTF-8"?>
	2	<ui version="4.0">
	3	<class>FileDowloaderSettingsGUI</class>
	4	<widget class="QWidget" name="FileDowloaderSettingsGUI">
	5	<property name="geometry">
	6	<rect>
	7	<x>0</x>
	8	<y>0</y>
	9	<width>318</width>
	10	<height>128</height>
	11	</rect>
	12	</property>
	13	<property name="windowTitle">
	14	<string>Form</string>
	15	</property>
	16	<layout class="QFormLayout" name="formLayout">
	17	<item row="0" column="0">
	18	<widget class="QLabel" name="label">
	19	<property name="text">
	20	<string>Default destination path</string>
	21	</property>
	22	</widget>
	23	</item>
	24	<item row="0" column="1">
	25	<widget class="QLineEdit" name="lineEdit"/>
	26	</item>
	27	<item row="1" column="0" colspan="2">
	28	<widget class="QGroupBox" name="groupBox">
	29	<property name="title">
	30	<string>Proxy server</string>
	31	</property>
	32	<layout class="QGridLayout" name="gridLayout">
	33	<item row="0" column="0">
	34	<widget class="QLabel" name="label_2">
	35	<property name="text">
	36	<string>Method</string>
	37	</property>
	38	<property name="alignment">
	39	<set>Qt::AlignCenter</set>
	40	</property>
	41	</widget>
	42	</item>
	43	<item row="0" column="1">
	44	<widget class="QComboBox" name="comboBox">
	45	<item>
	46	<property name="text">
	47	<string>none</string>
	48	</property>
	49	</item>
	50	<item>
	51	<property name="text">
	52	<string>system</string>
	53	</property>
	54	</item>
	55	<item>
	56	<property name="text">
	57	<string>manual</string>
	58	</property>
	59	</item>
	60	<item>
	61	<property name="text">
	62	<string>automatic</string>
	63	</property>
	64	</item>
	65	</widget>
	66	</item>
	67	</layout>
	68	</widget>
	69	</item>
	70	</layout>
	71	</widget>
	72	<resources/>
	73	<connections/>
	74	</ui>

src/Core/Widgets/manualproxycfg_gui.cpp created 644 +47 0

@@ -0,0 +1,47
	1	/*------------------------------------------------------------------------------
	2	-- This file is a part of the QLop Software
	3	-- Copyright (C) 2015, Plasma Physics Laboratory - CNRS
	4	--
	5	-- This program is free software; you can redistribute it and/or modify
	6	-- it under the terms of the GNU General Public License as published by
	7	-- the Free Software Foundation; either version 2 of the License, or
	8	-- (at your option) any later version.
	9	--
	10	-- This program is distributed in the hope that it will be useful,
	11	-- but WITHOUT ANY WARRANTY; without even the implied warranty of
	12	-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	13	-- GNU General Public License for more details.
	14	--
	15	-- You should have received a copy of the GNU General Public License
	16	-- along with this program; if not, write to the Free Software
	17	-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
	18	-------------------------------------------------------------------------------*/
	19	/*-- Author : Alexis Jeandet
	20	-- Mail : alexis.jeandet@member.fsf.org
	21	----------------------------------------------------------------------------*/
	22	#include "manualproxycfg_gui.h"
	23	#include "ui_manualproxycfg_gui.h"
	24
	25	ManualProxyCFG_GUI::ManualProxyCFG_GUI(QWidget *parent) :
	26	QWidget(parent),
	27	ui(new Ui::ManualProxyCFG_GUI)
	28	{
	29	ui->setupUi(this);
	30	}
	31
	32	ManualProxyCFG_GUI::~ManualProxyCFG_GUI()
	33	{
	34	delete ui;
	35	}
	36
	37	void ManualProxyCFG_GUI::changeEvent(QEvent *e)
	38	{
	39	QWidget::changeEvent(e);
	40	switch (e->type()) {
	41	case QEvent::LanguageChange:
	42	ui->retranslateUi(this);
	43	break;
	44	default:
	45	break;
	46	}
	47	}

src/Core/Widgets/manualproxycfg_gui.h created 644 +46 0

@@ -0,0 +1,46
	1	/*------------------------------------------------------------------------------
	2	-- This file is a part of the QLop Software
	3	-- Copyright (C) 2015, Plasma Physics Laboratory - CNRS
	4	--
	5	-- This program is free software; you can redistribute it and/or modify
	6	-- it under the terms of the GNU General Public License as published by
	7	-- the Free Software Foundation; either version 2 of the License, or
	8	-- (at your option) any later version.
	9	--
	10	-- This program is distributed in the hope that it will be useful,
	11	-- but WITHOUT ANY WARRANTY; without even the implied warranty of
	12	-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	13	-- GNU General Public License for more details.
	14	--
	15	-- You should have received a copy of the GNU General Public License
	16	-- along with this program; if not, write to the Free Software
	17	-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
	18	-------------------------------------------------------------------------------*/
	19	/*-- Author : Alexis Jeandet
	20	-- Mail : alexis.jeandet@member.fsf.org
	21	----------------------------------------------------------------------------*/
	22	#ifndef MANUALPROXYCFG_GUI_H
	23	#define MANUALPROXYCFG_GUI_H
	24
	25	#include <QWidget>
	26
	27	namespace Ui {
	28	class ManualProxyCFG_GUI;
	29	}
	30
	31	class ManualProxyCFG_GUI : public QWidget
	32	{
	33	Q_OBJECT
	34
	35	public:
	36	explicit ManualProxyCFG_GUI(QWidget *parent = 0);
	37	~ManualProxyCFG_GUI();
	38
	39	protected:
	40	void changeEvent(QEvent *e);
	41
	42	private:
	43	Ui::ManualProxyCFG_GUI *ui;
	44	};
	45
	46	#endif // MANUALPROXYCFG_GUI_H

src/Core/Widgets/manualproxycfg_gui.ui created 644 +109 0

@@ -0,0 +1,109
	1	<?xml version="1.0" encoding="UTF-8"?>
	2	<ui version="4.0">
	3	<class>ManualProxyCFG_GUI</class>
	4	<widget class="QWidget" name="ManualProxyCFG_GUI">
	5	<property name="geometry">
	6	<rect>
	7	<x>0</x>
	8	<y>0</y>
	9	<width>423</width>
	10	<height>207</height>
	11	</rect>
	12	</property>
	13	<property name="windowTitle">
	14	<string>Form</string>
	15	</property>
	16	<layout class="QGridLayout" name="gridLayout">
	17	<item row="0" column="0">
	18	<widget class="QLabel" name="label">
	19	<property name="text">
	20	<string>HTTP proxy</string>
	21	</property>
	22	</widget>
	23	</item>
	24	<item row="0" column="1">
	25	<widget class="QLineEdit" name="httpHost"/>
	26	</item>
	27	<item row="1" column="0">
	28	<widget class="QLabel" name="label_2">
	29	<property name="text">
	30	<string>HTTPS proxy</string>
	31	</property>
	32	</widget>
	33	</item>
	34	<item row="1" column="1">
	35	<widget class="QLineEdit" name="httpsHost"/>
	36	</item>
	37	<item row="2" column="0">
	38	<widget class="QLabel" name="label_3">
	39	<property name="text">
	40	<string>FTP proxy</string>
	41	</property>
	42	</widget>
	43	</item>
	44	<item row="2" column="1">
	45	<widget class="QLineEdit" name="ftpHost"/>
	46	</item>
	47	<item row="3" column="0">
	48	<widget class="QLabel" name="label_4">
	49	<property name="text">
	50	<string>SOCKS proxy</string>
	51	</property>
	52	</widget>
	53	</item>
	54	<item row="3" column="1">
	55	<widget class="QLineEdit" name="socksHost"/>
	56	</item>
	57	<item row="4" column="0">
	58	<widget class="QLabel" name="label_5">
	59	<property name="text">
	60	<string>Ignore hosts</string>
	61	</property>
	62	</widget>
	63	</item>
	64	<item row="0" column="2">
	65	<widget class="QLineEdit" name="httpPort">
	66	<property name="sizePolicy">
	67	<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
	68	<horstretch>0</horstretch>
	69	<verstretch>0</verstretch>
	70	</sizepolicy>
	71	</property>
	72	<property name="inputMask">
	73	<string>000000</string>
	74	</property>
	75	</widget>
	76	</item>
	77	<item row="1" column="2">
	78	<widget class="QLineEdit" name="httpsPort">
	79	<property name="inputMask">
	80	<string>000000</string>
	81	</property>
	82	</widget>
	83	</item>
	84	<item row="2" column="2">
	85	<widget class="QLineEdit" name="ftpPort">
	86	<property name="inputMask">
	87	<string>000000</string>
	88	</property>
	89	</widget>
	90	</item>
	91	<item row="3" column="2">
	92	<widget class="QLineEdit" name="socksPort">
	93	<property name="inputMask">
	94	<string>000000</string>
	95	</property>
	96	</widget>
	97	</item>
	98	<item row="4" column="1" colspan="2">
	99	<widget class="QLineEdit" name="IgnoreHosts">
	100	<property name="text">
	101	<string>localhost, 127.0.0.0/8, ::1</string>
	102	</property>
	103	</widget>
	104	</item>
	105	</layout>
	106	</widget>
	107	<resources/>
	108	<connections/>
	109	</ui>

src/Core/Widgets/qlopsettingsdialog.cpp created 644 +70 0

@@ -0,0 +1,70
	1	#include "qlopsettingsdialog.h"
	2	#include "ui_qlopsettingsdialog.h"
	3
	4	QLopSettingsDialog::QLopSettingsDialog(QWidget *parent) :
	5	QDialog(parent),
	6	ui(new Ui::QLopSettingsDialog)
	7	{
	8	ui->setupUi(this);
	9	connect(ui->contentsWidget, SIGNAL(currentItemChanged(QListWidgetItem,QListWidgetItem)),this, SLOT(changePage(QListWidgetItem,QListWidgetItem)));
	10	ui->contentsWidget->setViewMode(QListView::IconMode);
	11	ui->contentsWidget->setIconSize(QSize(96, 84));
	12	ui->contentsWidget->setMovement(QListView::Static);
	13	ui->contentsWidget->setSpacing(12);
	14	}
	15
	16	QLopSettingsDialog::~QLopSettingsDialog()
	17	{
	18	delete ui;
	19	}
	20
	21	void QLopSettingsDialog::changeEvent(QEvent *e)
	22	{
	23	QDialog::changeEvent(e);
	24	switch (e->type()) {
	25	case QEvent::LanguageChange:
	26	ui->retranslateUi(this);
	27	break;
	28	default:
	29	break;
	30	}
	31	}
	32
	33
	34	void QLopSettingsDialog::changePage(QListWidgetItem current, QListWidgetItem previous)
	35	{
	36	if (!current)
	37	current = previous;
	38
	39	ui->pagesWidget->setCurrentIndex(ui->contentsWidget->row(current));
	40	}
	41
	42	bool QLopSettingsDialog::registerConfigEntry(QWidget *configEntry, QIcon icon, QString text)
	43	{
	44	if(configEntry!=NULL)
	45	{
	46	ui->pagesWidget->addWidget(configEntry);
	47	QListWidgetItem *configButton = new QListWidgetItem(ui->contentsWidget);
	48	configButton->setIcon(icon);
	49	configButton->setText(text);
	50	configButton->setTextAlignment(Qt::AlignHCenter);
	51	configButton->setFlags(Qt::ItemIsSelectable \| Qt::ItemIsEnabled);
	52	return true;
	53	}
	54	return false;
	55	}
	56
	57	void QLopSettingsDialog::popConfigDialog(QWidget *selectedConfigEntry)
	58	{
	59	if(selectedConfigEntry!=NULL)
	60	{
	61	for(int i=0;i<ui->pagesWidget->count();i++)
	62	{
	63	if(ui->pagesWidget->widget(i)==selectedConfigEntry)
	64	{
	65	ui->pagesWidget->setCurrentIndex(i);
	66	}
	67	}
	68	}
	69	this->show();
	70	}

src/Core/Widgets/qlopsettingsdialog.h created 644 +30 0

@@ -0,0 +1,30
	1	#ifndef QLOPSETTINGSDIALOG_H
	2	#define QLOPSETTINGSDIALOG_H
	3
	4	#include <QDialog>
	5
	6	namespace Ui {
	7	class QLopSettingsDialog;
	8	}
	9	#include <QListWidgetItem>
	10
	11	class QLopSettingsDialog : public QDialog
	12	{
	13	Q_OBJECT
	14
	15	public:
	16	explicit QLopSettingsDialog(QWidget *parent = 0);
	17	~QLopSettingsDialog();
	18
	19	public slots:
	20	void changePage(QListWidgetItem current, QListWidgetItem previous);
	21	bool registerConfigEntry(QWidget* configEntry, QIcon icon, QString text);
	22	void popConfigDialog(QWidget* selectedConfigEntry=0);
	23	protected:
	24	void changeEvent(QEvent *e);
	25
	26	private:
	27	Ui::QLopSettingsDialog *ui;
	28	};
	29
	30	#endif // QLOPSETTINGSDIALOG_H

src/Core/Widgets/qlopsettingsdialog.ui created 644 +102 0

@@ -0,0 +1,102
	1	<?xml version="1.0" encoding="UTF-8"?>
	2	<ui version="4.0">
	3	<class>QLopSettingsDialog</class>
	4	<widget class="QDialog" name="QLopSettingsDialog">
	5	<property name="geometry">
	6	<rect>
	7	<x>0</x>
	8	<y>0</y>
	9	<width>534</width>
	10	<height>379</height>
	11	</rect>
	12	</property>
	13	<property name="windowTitle">
	14	<string>Dialog</string>
	15	</property>
	16	<layout class="QGridLayout" name="gridLayout">
	17	<item row="0" column="0">
	18	<widget class="QListWidget" name="contentsWidget">
	19	<property name="sizePolicy">
	20	<sizepolicy hsizetype="Maximum" vsizetype="Expanding">
	21	<horstretch>0</horstretch>
	22	<verstretch>0</verstretch>
	23	</sizepolicy>
	24	</property>
	25	<property name="minimumSize">
	26	<size>
	27	<width>100</width>
	28	<height>0</height>
	29	</size>
	30	</property>
	31	<property name="maximumSize">
	32	<size>
	33	<width>16777215</width>
	34	<height>16777215</height>
	35	</size>
	36	</property>
	37	</widget>
	38	</item>
	39	<item row="0" column="1">
	40	<widget class="QStackedWidget" name="pagesWidget">
	41	<property name="sizePolicy">
	42	<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
	43	<horstretch>0</horstretch>
	44	<verstretch>0</verstretch>
	45	</sizepolicy>
	46	</property>
	47	<property name="minimumSize">
	48	<size>
	49	<width>100</width>
	50	<height>0</height>
	51	</size>
	52	</property>
	53	</widget>
	54	</item>
	55	<item row="1" column="0" colspan="2">
	56	<widget class="QDialogButtonBox" name="buttonBox">
	57	<property name="orientation">
	58	<enum>Qt::Horizontal</enum>
	59	</property>
	60	<property name="standardButtons">
	61	<set>QDialogButtonBox::Cancel\|QDialogButtonBox::Ok</set>
	62	</property>
	63	</widget>
	64	</item>
	65	</layout>
	66	</widget>
	67	<resources/>
	68	<connections>
	69	<connection>
	70	<sender>buttonBox</sender>
	71	<signal>accepted()</signal>
	72	<receiver>QLopSettingsDialog</receiver>
	73	<slot>accept()</slot>
	74	<hints>
	75	<hint type="sourcelabel">
	76	<x>227</x>
	77	<y>431</y>
	78	</hint>
	79	<hint type="destinationlabel">
	80	<x>157</x>
	81	<y>274</y>
	82	</hint>
	83	</hints>
	84	</connection>
	85	<connection>
	86	<sender>buttonBox</sender>
	87	<signal>rejected()</signal>
	88	<receiver>QLopSettingsDialog</receiver>
	89	<slot>reject()</slot>
	90	<hints>
	91	<hint type="sourcelabel">
	92	<x>295</x>
	93	<y>431</y>
	94	</hint>
	95	<hint type="destinationlabel">
	96	<x>286</x>
	97	<y>274</y>
	98	</hint>
	99	</hints>
	100	</connection>
	101	</connections>
	102	</ui>

src/Core/qlopgui.cpp created 644 +110 0

@@ -0,0 +1,110
	1	/*------------------------------------------------------------------------------
	2	-- This file is a part of the QLop Software
	3	-- Copyright (C) 2015, Plasma Physics Laboratory - CNRS
	4	--
	5	-- This program is free software; you can redistribute it and/or modify
	6	-- it under the terms of the GNU General Public License as published by
	7	-- the Free Software Foundation; either version 2 of the License, or
	8	-- (at your option) any later version.
	9	--
	10	-- This program is distributed in the hope that it will be useful,
	11	-- but WITHOUT ANY WARRANTY; without even the implied warranty of
	12	-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	13	-- GNU General Public License for more details.
	14	--
	15	-- You should have received a copy of the GNU General Public License
	16	-- along with this program; if not, write to the Free Software
	17	-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
	18	-------------------------------------------------------------------------------*/
	19	/*-- Author : Alexis Jeandet
	20	-- Mail : alexis.jeandet@member.fsf.org
	21	----------------------------------------------------------------------------*/
	22	#include "qlopgui.h"
	23	QLopGUI* QLopGUI::_self=NULL;
	24	QDockWidget* QLopGUI::m_gui=NULL;
	25	QMenuBar* QLopGUI::m_mainMenuBar=NULL;
	26	QMenu* QLopGUI::m_fileMenu=NULL;
	27	QMenu* QLopGUI::m_SettingsMenu=NULL;
	28
	29	#define INIT() \
	30	if(Q_UNLIKELY(_self==NULL))\
	31	{\
	32	init();\
	33	}
	34
	35	QLopGUI::QLopGUI(bool noGUI,QObject *parent)
	36	{
	37	m_serviceName="QLopGUI";
	38	m_noGui=noGUI;
	39	}
	40
	41	QLopGUI::~QLopGUI()
	42	{
	43
	44	}
	45
	46	QDockWidget *QLopGUI::getGUI()
	47	{
	48	return m_gui;
	49	}
	50
	51	void QLopGUI::init(bool noGUI, QObject *parent)
	52	{
	53	_self=new QLopGUI(noGUI,parent);
	54	}
	55
	56	const QString &QLopGUI::serviceName()
	57	{
	58	INIT();
	59	return m_serviceName;
	60	}
	61
	62	QLopGUI *QLopGUI::self()
	63	{
	64	INIT();
	65	return _self;
	66	}
	67
	68	void QLopGUI::registerMenuBar(QMenuBar *menuBar)
	69	{
	70	INIT();
	71	m_mainMenuBar = menuBar;
	72	if(m_mainMenuBar)
	73	{
	74	m_fileMenu = m_mainMenuBar->addMenu(tr("File"));
	75	m_SettingsMenu = m_mainMenuBar->addMenu(tr("Settings"));
	76	}
	77	}
	78
	79	QMenu *QLopGUI::addMenu(const QString &title)
	80	{
	81	INIT();
	82	if(m_mainMenuBar)
	83	{
	84	return m_mainMenuBar->addMenu(title);
	85	}
	86	return NULL;
	87	}
	88
	89	bool QLopGUI::addFileAction(QAction *action)
	90	{
	91	INIT();
	92	if(m_fileMenu)
	93	{
	94	m_fileMenu->addAction(action);
	95	return true;
	96	}
	97	return false;
	98	}
	99
	100	bool QLopGUI::addSettingsAction(QAction *action)
	101	{
	102	INIT();
	103	if(m_SettingsMenu)
	104	{
	105	m_SettingsMenu->addAction(action);
	106	return true;
	107	}
	108	return false;
	109	}
	110

src/Core/qlopgui.h created 644 +52 0

@@ -0,0 +1,52
	1	/*------------------------------------------------------------------------------
	2	-- This file is a part of the QLop Software
	3	-- Copyright (C) 2015, Plasma Physics Laboratory - CNRS
	4	--
	5	-- This program is free software; you can redistribute it and/or modify
	6	-- it under the terms of the GNU General Public License as published by
	7	-- the Free Software Foundation; either version 2 of the License, or
	8	-- (at your option) any later version.
	9	--
	10	-- This program is distributed in the hope that it will be useful,
	11	-- but WITHOUT ANY WARRANTY; without even the implied warranty of
	12	-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	13	-- GNU General Public License for more details.
	14	--
	15	-- You should have received a copy of the GNU General Public License
	16	-- along with this program; if not, write to the Free Software
	17	-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
	18	-------------------------------------------------------------------------------*/
	19	/*-- Author : Alexis Jeandet
	20	-- Mail : alexis.jeandet@member.fsf.org
	21	----------------------------------------------------------------------------*/
	22	#ifndef QLOPGUI_H
	23	#define QLOPGUI_H
	24
	25	#include <QObject>
	26	#include <qlopservice.h>
	27	#include <QMenu>
	28	#include <QMenuBar>
	29	#include <QAction>
	30
	31	class QLopGUI : public QLopService
	32	{
	33	Q_OBJECT
	34	static QDockWidget* m_gui;
	35	QLopGUI(bool noGUI=false,QObject *parent = 0);
	36	~QLopGUI();
	37	static QLopGUI* _self;
	38	static QMenuBar* m_mainMenuBar;
	39	static QMenu* m_fileMenu;
	40	static QMenu* m_SettingsMenu;
	41	public:
	42	QDockWidget* getGUI();
	43	static void init(bool noGUI=false,QObject *parent = 0);
	44	const QString& serviceName();
	45	static QLopGUI* self();
	46	static void registerMenuBar(QMenuBar* menuBar);
	47	static QMenu* addMenu(const QString & title);
	48	static bool addFileAction(QAction * action);
	49	static bool addSettingsAction(QAction * action);
	50	};
	51
	52	#endif // QLOPGUI_H

src/Core/qlopsettings.cpp created 644 +98 0

@@ -0,0 +1,98
	1	/*------------------------------------------------------------------------------
	2	-- This file is a part of the QLop Software
	3	-- Copyright (C) 2015, Plasma Physics Laboratory - CNRS
	4	--
	5	-- This program is free software; you can redistribute it and/or modify
	6	-- it under the terms of the GNU General Public License as published by
	7	-- the Free Software Foundation; either version 2 of the License, or
	8	-- (at your option) any later version.
	9	--
	10	-- This program is distributed in the hope that it will be useful,
	11	-- but WITHOUT ANY WARRANTY; without even the implied warranty of
	12	-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	13	-- GNU General Public License for more details.
	14	--
	15	-- You should have received a copy of the GNU General Public License
	16	-- along with this program; if not, write to the Free Software
	17	-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
	18	-------------------------------------------------------------------------------*/
	19	/*-- Author : Alexis Jeandet
	20	-- Mail : alexis.jeandet@member.fsf.org
	21	----------------------------------------------------------------------------*/
	22	#include "qlopsettings.h"
	23	#include <QtWidgets>
	24	#include <QAction>
	25	#include <qlopgui.h>
	26
	27	QLopSettings* QLopSettings::_self=NULL;
	28	QDockWidget* QLopSettings::m_gui=NULL;
	29	QSettings* QLopSettings::m_settings=NULL;
	30	QLopSettingsDialog* QLopSettings::m_configDialog=NULL;
	31
	32	#define INIT() \
	33	if(Q_UNLIKELY(_self==NULL))\
	34	{\
	35	init();\
	36	}
	37
	38	QLopSettings::QLopSettings(bool noGUI,QObject *parent) : QLopService(parent)
	39	{
	40	m_serviceName="QLopSettings";
	41	m_settings = new QSettings();
	42	m_noGui=noGUI;
	43	m_configDialog = new QLopSettingsDialog();
	44	QAction* trigerGUI = new QAction(tr("Settings"),this);
	45	connect(trigerGUI,SIGNAL(triggered()),this,SLOT(popConfigDialog()));
	46	QLopGUI::addSettingsAction(trigerGUI);
	47	}
	48
	49	QLopSettings::~QLopSettings()
	50	{
	51	delete m_configDialog;
	52	delete m_settings;
	53	}
	54
	55	QDockWidget *QLopSettings::getGUI()
	56	{
	57	if(!m_noGui && (m_gui==NULL))
	58	{
	59	// m_gui=new QLopDataBaseViewer();
	60	// m_gui->setFeatures(QDockWidget::DockWidgetMovable\|QDockWidget::DockWidgetFloatable);
	61	}
	62	return m_gui;
	63	}
	64
	65	void QLopSettings::init(bool noGUI, QObject *parent)
	66	{
	67	_self=new QLopSettings(noGUI,parent);
	68	}
	69
	70	const QString &QLopSettings::serviceName()
	71	{
	72	INIT();
	73	return m_serviceName;
	74	}
	75
	76	QLopSettings *QLopSettings::self()
	77	{
	78	INIT();
	79	return _self;
	80	}
	81
	82	void QLopSettings::popConfigDialog(QWidget *selectedConfigEntry)
	83	{
	84	INIT();
	85	m_configDialog->popConfigDialog(selectedConfigEntry);
	86	}
	87
	88	void QLopSettings::popConfigDialog()
	89	{
	90	m_configDialog->popConfigDialog(NULL);
	91	}
	92
	93	bool QLopSettings::registerConfigEntry(QWidget *configEntry, QIcon icon, QString text)
	94	{
	95	INIT();
	96	return m_configDialog->registerConfigEntry(configEntry, icon, text);
	97	}
	98

src/Core/qlopsettings.h created 644 +53 0

@@ -0,0 +1,53
	1	/*------------------------------------------------------------------------------
	2	-- This file is a part of the QLop Software
	3	-- Copyright (C) 2015, Plasma Physics Laboratory - CNRS
	4	--
	5	-- This program is free software; you can redistribute it and/or modify
	6	-- it under the terms of the GNU General Public License as published by
	7	-- the Free Software Foundation; either version 2 of the License, or
	8	-- (at your option) any later version.
	9	--
	10	-- This program is distributed in the hope that it will be useful,
	11	-- but WITHOUT ANY WARRANTY; without even the implied warranty of
	12	-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	13	-- GNU General Public License for more details.
	14	--
	15	-- You should have received a copy of the GNU General Public License
	16	-- along with this program; if not, write to the Free Software
	17	-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
	18	-------------------------------------------------------------------------------*/
	19	/*-- Author : Alexis Jeandet
	20	-- Mail : alexis.jeandet@member.fsf.org
	21	----------------------------------------------------------------------------*/
	22	#ifndef QLOPSETTINGS_H
	23	#define QLOPSETTINGS_H
	24
	25	#include <QObject>
	26	#include <qlopservice.h>
	27	#include <QSettings>
	28	#include <QDialog>
	29	#include <QIcon>
	30	#include <qlopsettingsdialog.h>
	31
	32
	33	class QLopSettings : public QLopService
	34	{
	35	Q_OBJECT
	36	static QDockWidget* m_gui;
	37	QLopSettings(bool noGUI=false,QObject *parent = 0);
	38	~QLopSettings();
	39	static QLopSettings* _self;
	40	static QSettings* m_settings;
	41	static QLopSettingsDialog* m_configDialog;
	42	public:
	43	QDockWidget* getGUI();
	44	static void init(bool noGUI=false,QObject *parent = 0);
	45	const QString& serviceName();
	46	static QLopSettings* self();
	47	static void popConfigDialog(QWidget* selectedConfigEntry);
	48	static bool registerConfigEntry(QWidget* configEntry,QIcon icon, QString text);
	49	public slots:
	50	void popConfigDialog();
	51	};
	52
	53	#endif // QLOPSETTINGS_H

QLop.pro +28 -7

             #-------------------------------------------------
             #
             # Project created by QtCreator 2015-01-07T02:41:29
             #
             #-------------------------------------------------
             QT       += core gui network xml svg
             CONFIG   += pythonqt
             greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport
             MOC_DIR = moc
             UI_DIR = ui
             OBJECTS_DIR = obj
             DESTDIR =./bin
             TARGET = QLop
             TEMPLATE = app
             LIBS+=-lfftw3_threads -lfftw3
             INCLUDEPATH += src/QCustomPlot \
                             src src/Cassini \
                             src/Core src/Core/Widgets \
                             src/Core/Widgets/PyWdgt
-            QMAKE_CXXFLAGS += -O5 -fopenmp
+            defined(QLOP_DEBUG,var){
-            QMAKE_LFLAGS += -O5 -fopenmp
+                QMAKE_CXXFLAGS += -O0 -fopenmp
-            #QMAKE_CXXFLAGS += -O0 -fopenmp
+                QMAKE_LFLAGS += -O0 -fopenmp
-            #QMAKE_LFLAGS += -O0 -fopenmp
+            !defined(QLOP_DEBUG,var){
+                QMAKE_CXXFLAGS += -O5 -fopenmp
+                QMAKE_LFLAGS += -O5 -fopenmp
+            }
             SOURCES += src/main.cpp\
                     src/mainwindow.cpp \
                 src/SocExplorerPlot.cpp \
                 src/QCustomPlot/qcustomplot.cpp \
                 src/toolbarcontainer.cpp \
                 src/Core/abstractfileloader.cpp \
                 src/Core/filedownloader.cpp \
                 src/Core/filedownloadertask.cpp \
                 src/Core/Widgets/downloadhistory.cpp \
                 src/Core/Widgets/downloadhistoryelement.cpp \
                 src/Core/qlopservice.cpp \
                 src/Cassini/expxmldownloader.cpp \
                 src/Cassini/cassinidatadownloader.cpp \
                 src/Cassini/cassinidatafile.cpp \
                 src/Cassini/cassiniindexfile.cpp \
                 src/Cassini/cassiniindexfileviewer.cpp \
                 src/Cassini/cassinitools.cpp \
                 src/Cassini/cassinitoolsgui.cpp \
                 src/Core/Widgets/qlopplots.cpp \
                 src/Core/qlopdata.cpp \
                 src/Core/Widgets/PyWdgt/pythonconsole.cpp \
                 src/Core/Widgets/PyWdgt/pythonqtscriptingconsoledandd.cpp \
                 src/QCustomPlot/qcpdocumentobject.cpp \
                 src/Core/Widgets/filebrowser.cpp \
                 src/Core/Widgets/filesystemmodel.cpp \
                 src/Core/Widgets/qcustomplotvect.cpp \
                 src/Core/qlopdatabase.cpp \
                 src/Core/Widgets/qlopdatabaseviewer.cpp \
                 src/Core/Widgets/qlopdatabaseviewermodel.cpp \
-                src/Cassini/exptimetabledownloader.cpp
+                src/Cassini/exptimetabledownloader.cpp \
+                src/Core/qlopsettings.cpp \
+                src/Core/Widgets/filedowloadersettingsgui.cpp \
+                src/Core/qlopgui.cpp \
+                src/Core/Widgets/manualproxycfg_gui.cpp \
+                src/Core/Widgets/qlopsettingsdialog.cpp \
+                src/Cassini/cassinitoolssettingsgui.cpp
             HEADERS  += src/mainwindow.h \
                 src/SocExplorerPlot.h \
                 src/QCustomPlot/qcustomplot.h \
                 src/toolbarcontainer.h \
                 src/Core/abstractfileloader.h \
                 src/Core/filedownloader.h \
                 src/Core/filedownloadertask.h \
                 src/Core/Widgets/downloadhistory.h \
                 src/Core/Widgets/downloadhistoryelement.h \
                 src/Core/qlopservice.h \
                 src/Cassini/expxmldownloader.h \
                 src/Cassini/cassinidatadownloader.h \
                 src/Cassini/cassinidatafile.h \
                 src/Cassini/cassiniindexfile.h \
                 src/Cassini/cassiniindexfileviewer.h \
                 src/Cassini/cassinitools.h \
                 src/Cassini/cassinitoolsgui.h \
                 src/Core/Widgets/qlopplots.h \
                 src/Core/qlopdata.h \
                 src/Core/Widgets/PyWdgt/pythonconsole.h \
                 src/Core/Widgets/PyWdgt/pythonqtscriptingconsoledandd.h \
                 src/Core/qlop.h \
                 src/Core/pyqlop.h \
                 src/QCustomPlot/qcpdocumentobject.h \
                 src/Core/Widgets/filebrowser.h \
                 src/Core/Widgets/filesystemmodel.h \
                 src/Core/Widgets/qcustomplotvect.h \
                 src/Core/qlopdatabase.h \
                 src/Core/Widgets/qlopdatabaseviewer.h \
                 src/Core/Widgets/qlopdatabaseviewermodel.h \
-                src/Cassini/exptimetabledownloader.h
+                src/Cassini/exptimetabledownloader.h \
+                src/Core/qlopsettings.h \
+                src/Core/Widgets/filedowloadersettingsgui.h \
+                src/Core/qlopgui.h \
+                src/Core/Widgets/manualproxycfg_gui.h \
+                src/Core/Widgets/qlopsettingsdialog.h \
+                src/Cassini/cassinitoolssettingsgui.h
             FORMS    += src/mainwindow.ui \
                 src/Core/Widgets/downloadhistory.ui \
                 src/Core/Widgets/downloadhistoryelement.ui \
                 src/Cassini/cassinidatadownloader.ui \
                 src/Cassini/cassiniindexfileviewer.ui \
                 src/Cassini/cassinitoolsgui.ui \
                 src/Core/Widgets/filebrowser.ui \
-                src/Core/Widgets/qlopdatabaseviewer.ui
+                src/Core/Widgets/qlopdatabaseviewer.ui \
+                src/Core/Widgets/filedowloadersettingsgui.ui \
+                src/Core/Widgets/manualproxycfg_gui.ui \
+                src/Core/Widgets/qlopsettingsdialog.ui \
+                src/Cassini/cassinitoolssettingsgui.ui
             RESOURCES += \
                 resources/qlop.qrc
             include(src/Core/Widgets/NicePyConsole/NicePyConsole.pri)
             include(src/Core/pythonQtOut/generated_cpp/PyQLop/PyQLop.pri)
             win32 {
                 DEFINES += WIN32
             }
             unix {
                 DEFINES += UNIX
             }
             unix{
                 target.path    = /usr/bin
                 INSTALLS += target
             }
             unix{
                 QLopLauncher.path = /usr/share/applications/
                 QLopLauncher.files = linux/QLop.desktop
                 QLopAppData.path = /usr/share/appdata/
                 QLopAppData.files = linux/QLop.appdata.xml
                 share.path = /usr/share/QLop
                 share.files = resources/QLop.svg \
                             resources/QLop.png
                 INSTALLS+= QLopLauncher share QLopAppData
             }
             DISTFILES += \
                 src/Core/pythongenerator.sh \
                 src/Core/pythonQtgeneratorCfg.txt \
                 linux/QLop.spec \
                 linux/QLop.desktop \
                 linux/QLop.appdata.xml

resources/qlop.qrc +2 0

             <RCC>
                 <qresource prefix="/img">
                     <file>Gnome-view-refresh.svg</file>
                     <file>Gnome-list-add.svg</file>
                     <file>ListView.svg</file>
                     <file>TreeView.svg</file>
                     <file>Gnome-go-up.svg</file>
                     <file>QLop.svg</file>
+                    <file>Gnome-emblem-downloads.svg</file>
+                    <file>cassini.gif</file>
                 </qresource>
                 <qresource prefix="/">
                     <file>QLop.png</file>
                 </qresource>
             </RCC>

src/Cassini/cassinidatadownloader.ui +1 -1

             <?xml version="1.0" encoding="UTF-8"?>
             <ui version="4.0">
              <class>CassiniDataDownloader</class>
              <widget class="QWidget" name="CassiniDataDownloader">
               <property name="geometry">
                <rect>
                 <x>0</x>
                 <y>0</y>
                 <width>1032</width>
                 <height>648</height>
                </rect>
               </property>
               <property name="windowTitle">
                <string>Form</string>
               </property>
               <layout class="QGridLayout" name="gridLayout_2">
                <item row="0" column="0">
                 <layout class="QGridLayout" name="gridLayout_3">
                  <item row="0" column="0">
                   <widget class="QCalendarWidget" name="calendar">
                    <property name="acceptDrops">
                     <bool>true</bool>
                    </property>
                    <property name="gridVisible">
                     <bool>false</bool>
                    </property>
                   </widget>
                  </item>
                  <item row="0" column="1">
                   <widget class="QScrollArea" name="DownloadList">
                    <property name="widgetResizable">
                     <bool>true</bool>
                    </property>
                    <widget class="QWidget" name="Content">
                     <property name="geometry">
                      <rect>
                       <x>0</x>
                       <y>0</y>
                       <width>501</width>
                       <height>626</height>
                      </rect>
                     </property>
                     <layout class="QGridLayout" name="gridLayout">
                      <item row="0" column="0">
                       <widget class="QPushButton" name="LoadXmlFileQpb">
                        <property name="sizePolicy">
                         <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
                          <horstretch>0</horstretch>
                          <verstretch>0</verstretch>
                         </sizepolicy>
                        </property>
                        <property name="text">
                         <string>Load Xml File</string>
                        </property>
                       </widget>
                      </item>
                      <item row="2" column="0">
-                      <widget class="QGroupBox" name="groupBox">
+                      <widget class="QGroupBox" name="DownLoadList">
                        <property name="styleSheet">
                         <string notr="true">QGroupBox {
                 border: 1px solid gray;
                 border-radius: 9px;
                 margin-top: 0.5em;
             }
             QGroupBox::title {
                 subcontrol-origin: margin;
                 left: 10px;
                 padding: 0 3px 0 3px;
             }
             </string>
                        </property>
                        <property name="title">
                         <string>Download list</string>
                        </property>
                        <layout class="QVBoxLayout" name="verticalLayout"/>
                       </widget>
                      </item>
                      <item row="3" column="0">
                       <widget class="QPushButton" name="startDownloadQpb">
                        <property name="text">
                         <string>Start Download</string>
                        </property>
                       </widget>
                      </item>
                      <item row="1" column="0">
                       <widget class="QPushButton" name="LoadTimeTableQpb">
                        <property name="text">
                         <string>Load a Time Table</string>
                        </property>
                       </widget>
                      </item>
                     </layout>
                    </widget>
                   </widget>
                  </item>
                 </layout>
                </item>
               </layout>
              </widget>
              <resources/>
              <connections/>
             </ui>

src/Cassini/cassinitools.cpp +4 0

             /*------------------------------------------------------------------------------
             -- This file is a part of the QLop Software
             -- Copyright (C) 2015, Plasma Physics Laboratory - CNRS
             --
             -- 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
             -------------------------------------------------------------------------------*/
             /*-- Author : Alexis Jeandet
             -- Mail : alexis.jeandet@member.fsf.org
             ----------------------------------------------------------------------------*/
             #include "cassinitools.h"
             #include <qlopplots.h>
             #include <QPen>
             #include <QAction>
             #include <fftw3.h>
             #include <omp.h>
             #include <qlopdatabase.h>
+            #include <qlopsettings.h>
             CassiniTools* CassiniTools::_self=NULL;
             QDockWidget* CassiniTools::m_gui=NULL;
             CassiniToolsGUI* CassiniTools::m_CassiniToolsGUI=NULL;
+            CassiniToolsSettingsGUI* CassiniTools::m_SettingsGui=NULL;
             CassiniDataFile* CassiniTools::m_dataFile=NULL;
             int CassiniTools::m_defaultPlot=-1;
             int CassiniTools::m_fftPlot=-1;
             SocExplorerPlotActions* CassiniTools::ExportAction=NULL;
             Qt::GlobalColor QLopColours[]= {Qt::black,
                                             Qt::red,
                                             Qt::blue,
                                             Qt::green,
                                             Qt::darkGreen,
                                             Qt::cyan,
                                             Qt::darkRed,
                                             Qt::gray,
                                             Qt::yellow,
                                             Qt::darkBlue,
                                             Qt::darkCyan,
                                             Qt::magenta,
                                             Qt::darkMagenta,
                                             Qt::darkYellow,
                                             Qt::darkGray,
                                             Qt::lightGray};
             int QLopColoursCount=16;
             #define _INIT() if(Q_UNLIKELY(_self==NULL)){init();}
             CassiniTools::CassiniTools(bool noGUI,QObject *parent) : QLopService(parent)
             {
                 m_dataFile = new CassiniDataFile();
                 connect(m_dataFile,SIGNAL(dataReady(QLopDataList)),this,SLOT(dataReady(QLopDataList)));
                 connect(m_dataFile,SIGNAL(fileWritten()),this,SLOT(fileWritten()));
                 m_serviceName="CassiniTools";
                 m_noGui=noGUI;
                 fftw_init_threads();
             }
             CassiniTools::~CassiniTools()
             {
                 delete m_dataFile;
                 delete m_CassiniToolsGUI;
                 delete m_gui;
             }
             void CassiniTools::makePlot()
             {
                 m_defaultPlot = QLopPlots::addPlot();
                 m_fftPlot = QLopPlots::addPlot();
                 SocExplorerPlot* plot=QLopPlots::getPlot(m_defaultPlot);
                 if(plot)
                 {
                     plot->setTitle(_self->m_serviceName + " plot");
                     plot->setXaxisTickLabelType(QCPAxis::ltDateTime);
                     plot->setXaxisDateTimeFormat("hh:mm:ss.zzz");
                     plot->setContextMenuPolicy(Qt::ActionsContextMenu);
                     SocExplorerPlotActions* action=new SocExplorerPlotActions("export view",plot->PID(),_self);
                     plot->addAction(action);
                     QObject::connect(action,SIGNAL(triggered(int)),_self,SLOT(export_view(int)));
                     QString fileName = QString(plot->title()).replace(".TAB","");
                     fileName = generateFileName(fileName,".TAB");
                     ExportAction=new SocExplorerPlotActions("export view to "+fileName,plot->PID(),_self);
                     plot->addAction(ExportAction);
                     QObject::connect(ExportAction,SIGNAL(triggered(int)),_self,SLOT(export_view_Predefined_FileName(int)));
                     action=new SocExplorerPlotActions("FFT of the current view",plot->PID(),_self);
                     plot->addAction(action);
                     QObject::connect(action,SIGNAL(triggered(int)),_self,SLOT(compute_fft_on_view(int)));
                 }
             }
             void CassiniTools::init(bool noGUI, QObject *parent)
             {
                 if(Q_UNLIKELY(_self==NULL))
                 {
                     _self=new CassiniTools(noGUI,parent);
                 }
             }
             CassiniTools *CassiniTools::self()
             {
                 _INIT();
                 return _self;
             }
             void CassiniTools::decodeFGMData(const QString &file)
             {
                 _INIT();
                 m_dataFile->parseFile(file);
             }
             void CassiniTools::plotFile(const QString &File)
             {
                 if(!m_dataFile->isRunning())
                 {
                     m_dataFile->parseFile(File);
                     // TODO fixme
                     SocExplorerPlot* plot = QLopPlots::getPlot(m_defaultPlot);
                     if(plot==NULL)
                     {
                         makePlot();
                         plot = QLopPlots::getPlot(m_defaultPlot);
                     }
                     if(plot)
                     {
                         plot->setTitle(File);
                         QString fileName = QString(File).replace(".TAB","-part");
                         fileName = generateFileName(fileName,".TAB");
                         ExportAction->setText("export view to "+fileName);
                     }
                 }
             }
             void CassiniTools::plot_TAB_File(const QString &fileName)
             {
                 //TODO fix: accent not accepted
                 plotFile(fileName);
             }
             void CassiniTools::export_view(int PID)
             {
                 SocExplorerPlot* plot = QLopPlots::getPlot(PID);
                 if(plot==NULL)
                     return;
                 {
                     QString fileName = plot->title();
                     fileName = QFileDialog::getSaveFileName(0,tr("Set filename"),fileName.replace(".TAB","-part.TAB"));
                     if(fileName!="")
                     {
                         QLopDataList vectors;
                         for(int i=0;i<plot->graphCount();i++)
                         {
                             QLopQCPDataVector* vect = new QLopQCPDataVector();
                             vect->data = plot->getVisibleData(i);
                             vectors.append(vect);
                         }
                         m_dataFile->saveFile(fileName,vectors);
                     }
                 }
             }
             void CassiniTools::export_view_Predefined_FileName(int PID)
             {
                 SocExplorerPlot* plot = QLopPlots::getPlot(PID);
                 if(plot==NULL)
                     return;
                 {
                     QString fileName = QString(plot->title()).replace(".TAB","-part");
                     fileName = generateFileName(fileName,".TAB");
                     if(fileName!="")
                     {
                         QLopDataList vectors;
                         for(int i=0;i<plot->graphCount();i++)
                         {
                             QLopQCPDataVector* vect = new QLopQCPDataVector();
                             vect->data = plot->getVisibleData(i);
                             vectors.append(vect);
                         }
                         m_dataFile->saveFile(fileName,vectors);
                     }
                 }
             }
             void CassiniTools::compute_fft_on_view(int PID)
             {
                 QElapsedTimer timr;
                 SocExplorerPlot* plot = QLopPlots::getPlot(PID);
                 if(plot==NULL)
                     return;
                 {
                     timr.start();
                     QLopDataList vectors;
                     for(int i=0;i<plot->graphCount();i++)
                     {
                         QLopQCPDataVector* vect = new QLopQCPDataVector();
                         vect->data = plot->getVisibleData(i);
                         vectors.append(vect);
                     }
                     if(vectors.count()==3)
                     {
                         QLopQCPDataVector* ch1V=(QLopQCPDataVector*)vectors.at(0);
                         QLopQCPDataVector* ch2V=(QLopQCPDataVector*)vectors.at(1);
                         QLopQCPDataVector* ch3V=(QLopQCPDataVector*)vectors.at(2);
                         QLopQCPDataVector* FFTout=new QLopQCPDataVector();
                         if(ch1V->data->count()==ch2V->data->count() && ch1V->data->count()==ch3V->data->count())
                         {
                             double* in;
                             fftw_complex *out;
                             fftw_plan p;
                             FFTout->data = new QVector<QCPData>(ch1V->data->count()/2);
                             in = (double*) fftw_malloc(sizeof(double) * ch1V->data->count());
                             out = (fftw_complex*) fftw_malloc(sizeof(fftw_complex) * ch1V->data->count());
                             double av=0;
                             for(int i=0;i<ch1V->data->count();i++)
                             {
                                 in[i]=sqrt((ch1V->data->at(i).value*ch1V->data->at(i).value) + (ch2V->data->at(i).value*ch2V->data->at(i).value) + (ch3V->data->at(i).value*ch3V->data->at(i).value));
                                 av = av+in[i];
                             }
                             av/=ch1V->data->count();
                             for(int i=0;i<ch1V->data->count();i++)
                             {
                                 in[i]=in[i]-av;
                             }
                             fftw_plan_with_nthreads(4);
                             p = fftw_plan_dft_r2c_1d(ch1V->data->count(),in, out,FFTW_ESTIMATE);
                             fftw_execute(p); /* repeat as needed */
                             fftw_destroy_plan(p);
                             fftw_free(in);
                             for(int i=0;i<ch1V->data->count()/2;i++)
                             {
                                 //                    (*FFTout->data)[i].value=sqrt((out[i][0] * out[i][0]) + (out[i][1] * out[i][1]))/ch1V->data->count();
                                 (*FFTout->data)[i].value=((out[i][0] * out[i][0]) + (out[i][1] * out[i][1]))/(ch1V->data->count());
                                 (*FFTout->data)[i].key = i;
                             }
                             fftw_free(out);
                             SocExplorerPlot* plot = QLopPlots::getPlot(m_fftPlot);
                             if(plot==NULL)
                                 return;
                             plot->removeAllGraphs();
                             plot->addGraph();
                             plot->setXaxisLog();
                             plot->setYaxisLog();
                             plot->setAdaptativeSampling(0,true);
                             QPen pen = plot->getGraphPen(0);
                             pen.setColor(QLopColours[0%QLopColoursCount]);
                             plot->setGraphPen(0,pen);
                             plot->setGraphData(0,FFTout->data,false);
                             plot->rescaleAxis();
                             plot->replot();
                             qDebug()<< ch1V->data->count() <<" Points loaded in "<< timr.elapsed()<<"ms";
                         }
                     }
                 }
             }
             QString CassiniTools::generateFileName(const QString &baseName, const QString &extension)
             {
                 QString fileName = baseName+extension;
                 int i=0;
                 while(QFile::exists(fileName))
                 {
                     fileName = baseName+QString::number(i++)+extension;
                 }
                 return fileName;
             }
             QDockWidget *CassiniTools::getGUI()
             {
                 if(!m_noGui && (m_gui==NULL))
                 {
                     m_gui=new QDockWidget("Cassini Tools");
                     m_CassiniToolsGUI = new CassiniToolsGUI();
                     m_gui->setWidget(m_CassiniToolsGUI);
                     m_gui->setFeatures(QDockWidget::DockWidgetMovable|QDockWidget::DockWidgetFloatable);
+                    m_SettingsGui = new CassiniToolsSettingsGUI();
+                    QLopSettings::registerConfigEntry(this->m_SettingsGui,QIcon(":/img/cassini.gif"),"Cassini Tools");
                 }
                 return m_gui;
             }
             const QString &CassiniTools::serviceName()
             {
                 _INIT();
                 return m_serviceName;
             }
             void CassiniTools::dataReady(QLopDataList data)
             {
                 static QLopDataList prevData=QLopDataList();
                 SocExplorerPlot* plot = QLopPlots::getPlot(m_defaultPlot);
                 if(plot==NULL)
                 {
                     makePlot();
                     plot = QLopPlots::getPlot(m_defaultPlot);
                 }
                 if(plot)
                 {
                     QLopDataBase::removeData(prevData);
                     plot->removeAllGraphs();
                     //        QLopDataBase::re
                     for(int i=0;i<data.count();i++)
                     {
                         plot->addGraph();
                         plot->setAdaptativeSampling(i,true);
                         plot->setUseFastVector(i,true);
                         QPen pen = plot->getGraphPen(i);
                         pen.setColor(QLopColours[i%QLopColoursCount]);
                         plot->setGraphPen(i,pen);
                         plot->setGraphName(i,data.at(i)->name+"("+data.at(i)->unit+")");
                         plot->setGraphData(i,((QLopQCPDataVector*)data.at(i))->data,false);
                     }
                     plot->rescaleAxis();
                     plot->replot();
                     prevData = data;
                     QLopDataBase::addData(data);
                 }
             }
             void CassiniTools::fileWritten()
             {
                 SocExplorerPlot* plot = QLopPlots::getPlot(m_defaultPlot);
                 if(plot==NULL)
                 {
                     makePlot();
                     plot = QLopPlots::getPlot(m_defaultPlot);
                 }
                 if(plot)
                 {
                     QString fileName = QString(plot->title()).replace(".TAB","-part");
                     fileName = generateFileName(fileName,".TAB");
                     ExportAction->setText("export view to "+fileName);
                 }
             }

src/Cassini/cassinitools.h +2 0

             /*------------------------------------------------------------------------------
             -- This file is a part of the QLop Software
             -- Copyright (C) 2015, Plasma Physics Laboratory - CNRS
             --
             -- 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
             -------------------------------------------------------------------------------*/
             /*-- Author : Alexis Jeandet
             -- Mail : alexis.jeandet@member.fsf.org
             ----------------------------------------------------------------------------*/
             #ifndef CASSINITOOLS_H
             #define CASSINITOOLS_H
             #include <QObject>
             #include <QWidget>
             #include <qlopservice.h>
             #include <cassinitoolsgui.h>
             #include <cassinidatafile.h>
             #include <qlopdata.h>
             #include <SocExplorerPlot.h>
+            #include <cassinitoolssettingsgui.h>
             class CassiniTools: public QLopService
             {
                 Q_OBJECT
             private:
                 static CassiniTools* _self;
                 static QDockWidget* m_gui;
                 static CassiniToolsGUI* m_CassiniToolsGUI;
+                static CassiniToolsSettingsGUI* m_SettingsGui;
                 static CassiniDataFile* m_dataFile;
                 static int m_defaultPlot,m_fftPlot;
                 static SocExplorerPlotActions* ExportAction;
                 CassiniTools(bool noGUI=false, QObject *parent=0);
                 ~CassiniTools();
                 static void makePlot();
             public:
                 static void init(bool noGUI=false,QObject *parent = 0);
                 static CassiniTools *self();
                 static void decodeFGMData(const QString& file);
                 // QLopService methodes
                 QDockWidget* getGUI();
                 const QString& serviceName();
                 static void plotFile(const QString &File);
             public slots:
                 void plot_TAB_File(const QString& fileName);
                 void export_view(int PID);
                 void export_view_Predefined_FileName(int PID);
                 void compute_fft_on_view(int PID);
             private slots:
                 static QString generateFileName(const QString& baseName,const QString& extension);
                 void dataReady(QLopDataList data);
                 void fileWritten();
             };
             #endif // CASSINITOOLS_H

src/Core/Widgets/qlopdatabaseviewer.cpp +21 0

+            /*------------------------------------------------------------------------------
+            -- This file is a part of the QLop Software
+            -- Copyright (C) 2015, Plasma Physics Laboratory - CNRS
+            --
+            -- 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
+            -------------------------------------------------------------------------------*/
+            /*-- Author : Alexis Jeandet
+            -- Mail : alexis.jeandet@member.fsf.org
+            ----------------------------------------------------------------------------*/
             #include "qlopdatabaseviewer.h"
             #include "ui_qlopdatabaseviewer.h"
             QLopDataBaseViewer::QLopDataBaseViewer(QWidget *parent) :
                 QDockWidget(parent),
                 ui(new Ui::QLopDataBaseViewer)
             {
                 ui->setupUi(this);
                 this->model = new QLopDataBaseViewerModel();
                 this->ui->dataBaseTbleView->setModel(model);
                 connect(QLopDataBase::self(),SIGNAL(DBChanged()),this->model,SLOT(DBChanged()));
             }
             QLopDataBaseViewer::~QLopDataBaseViewer()
             {
                 delete ui;
                 delete model;
             }
             void QLopDataBaseViewer::changeEvent(QEvent *e)
             {
                 QDockWidget::changeEvent(e);
                 switch (e->type()) {
                 case QEvent::LanguageChange:
                     ui->retranslateUi(this);
                     break;
                 default:
                     break;
                 }
             }

src/Core/Widgets/qlopdatabaseviewer.h +21 0

+            /*------------------------------------------------------------------------------
+            -- This file is a part of the QLop Software
+            -- Copyright (C) 2015, Plasma Physics Laboratory - CNRS
+            --
+            -- 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
+            -------------------------------------------------------------------------------*/
+            /*-- Author : Alexis Jeandet
+            -- Mail : alexis.jeandet@member.fsf.org
+            ----------------------------------------------------------------------------*/
             #ifndef QLOPDATABASEVIEWER_H
             #define QLOPDATABASEVIEWER_H
             #include <QDockWidget>
             #include <qlopdatabaseviewermodel.h>
             namespace Ui {
             class QLopDataBaseViewer;
             }
             class QLopDataBaseViewer : public QDockWidget
             {
                 Q_OBJECT
             public:
                 explicit QLopDataBaseViewer(QWidget *parent = 0);
                 ~QLopDataBaseViewer();
             protected:
                 void changeEvent(QEvent *e);
             private:
                 Ui::QLopDataBaseViewer *ui;
                 QLopDataBaseViewerModel* model;
             };
             #endif // QLOPDATABASEVIEWER_H

src/Core/Widgets/qlopdatabaseviewer.ui +1 -1

             <?xml version="1.0" encoding="UTF-8"?>
             <ui version="4.0">
              <class>QLopDataBaseViewer</class>
              <widget class="QDockWidget" name="QLopDataBaseViewer">
               <property name="geometry">
                <rect>
                 <x>0</x>
                 <y>0</y>
                 <width>825</width>
                 <height>427</height>
                </rect>
               </property>
               <property name="windowTitle">
-               <string>DockWidget</string>
+               <string>Database Explorer</string>
               </property>
               <widget class="QWidget" name="dockWidgetContents">
                <layout class="QGridLayout" name="gridLayout">
                 <item row="0" column="0">
                  <widget class="QTableView" name="dataBaseTbleView">
                   <attribute name="horizontalHeaderShowSortIndicator" stdset="0">
                    <bool>false</bool>
                   </attribute>
                  </widget>
                 </item>
                </layout>
               </widget>
              </widget>
              <resources/>
              <connections/>
             </ui>

src/Core/Widgets/qlopdatabaseviewermodel.cpp +21 0

+            /*------------------------------------------------------------------------------
+            -- This file is a part of the QLop Software
+            -- Copyright (C) 2015, Plasma Physics Laboratory - CNRS
+            --
+            -- 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
+            -------------------------------------------------------------------------------*/
+            /*-- Author : Alexis Jeandet
+            -- Mail : alexis.jeandet@member.fsf.org
+            ----------------------------------------------------------------------------*/
             #include "qlopdatabaseviewermodel.h"
             QLopDataBaseViewerModel::QLopDataBaseViewerModel(QObject *parent)
                 : QAbstractTableModel(parent)
             {
                 beginResetModel();
                 endResetModel();
             }
             QLopDataBaseViewerModel::~QLopDataBaseViewerModel()
             {
             }
             int QLopDataBaseViewerModel::rowCount(const QModelIndex &parent) const
             {
                 return QLopDataBase::count();
             }
             int QLopDataBaseViewerModel::columnCount(const QModelIndex &parent) const
             {
                 return 5;
             }
             QVariant QLopDataBaseViewerModel::data(const QModelIndex &index, int role) const
             {
                 if (!index.isValid() || role != Qt::DisplayRole)
                     return QVariant();
                 QLopData* data=QLopDataBase::self()->getDataFromIdex(index.row());
                 if(data)
                 {
                     switch (index.column()) {
                     case 0:
                         return data->name;
                         break;
                     case 1:
                         return data->source;
                         break;
                     case 2:
                         return data->typeStr();
                         break;
                     case 3:
                         return data->unit;
                         break;
                     case 4:
                         return data->size();
                         break;
                     default:
                         return data->name;
                         break;
                     }
                 }
                 else QVariant();
             }
             QVariant QLopDataBaseViewerModel::headerData(int section, Qt::Orientation orientation, int role) const
             {
                 //if (role == Qt::SizeHintRole)
                 //    return QSize(1, 1);
                 if(orientation==Qt::Horizontal && role==Qt::DisplayRole)
                 {
                     switch (section) {
                     case 0:
                         return QVariant("Name");
                         break;
                     case 1:
                         return QVariant("Source");
                         break;
                     case 2:
                         return QVariant("Type");
                         break;
                     case 3:
                         return QVariant("Unit");
                         break;
                     case 4:
                         return QVariant("Size");
                         break;
                     default:
                         break;
                     }
                 }
                 return QVariant();
             }
             void QLopDataBaseViewerModel::DBChanged()
             {
                 beginResetModel();
                 endResetModel();
             }

src/Core/Widgets/qlopdatabaseviewermodel.h +21 0

+            /*------------------------------------------------------------------------------
+            -- This file is a part of the QLop Software
+            -- Copyright (C) 2015, Plasma Physics Laboratory - CNRS
+            --
+            -- 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
+            -------------------------------------------------------------------------------*/
+            /*-- Author : Alexis Jeandet
+            -- Mail : alexis.jeandet@member.fsf.org
+            ----------------------------------------------------------------------------*/
             #ifndef QLOPDATABASEVIEWERMODEL_H
             #define QLOPDATABASEVIEWERMODEL_H
             #include <QObject>
             #include <QAbstractTableModel>
             #include <qlopdatabase.h>
             class QLopDataBaseViewerModel : public QAbstractTableModel
             {
                 Q_OBJECT
             public:
                 QLopDataBaseViewerModel(QObject *parent=0);
                 ~QLopDataBaseViewerModel();
                 int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
                 int columnCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
                 QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
                 QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
             public slots:
                 void DBChanged();
             private:
             };
             #endif // QLOPDATABASEVIEWERMODEL_H

src/Core/filedownloader.cpp +23 -5

             /*------------------------------------------------------------------------------
             -- This file is a part of the QLop Software
             -- Copyright (C) 2015, Plasma Physics Laboratory - CNRS
             --
             -- 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
             -------------------------------------------------------------------------------*/
             /*-- Author : Alexis Jeandet
             -- Mail : alexis.jeandet@member.fsf.org
             ----------------------------------------------------------------------------*/
             #include "filedownloader.h"
             #include <QFile>
+            #include <QIcon>
             FileDownloader* FileDownloader::_self=NULL;
             QNetworkAccessManager* FileDownloader::m_WebCtrl=NULL;
             QList<FileDownloaderTask*>* FileDownloader::m_pendingTasks=NULL;
             QDockWidget* FileDownloader::m_gui=NULL;
             DownLoadHistory* FileDownloader::m_DownLoadHistory=NULL;
+            FileDowloaderSettingsGUI* FileDownloader::m_SettingsGui=NULL;
             #define _INIT \
                 if(Q_UNLIKELY(_self==NULL))\
                 {\
                     init();\
                 }\
             int FileDownloader::downloadFile(QUrl fileUrl, const QString &name)
             {
                 _INIT
                 if(QFile::exists(name)|| QFile::exists(name+".part"))
                 {
                     return -1;
                 }
                 FileDownloaderTask* task=NULL;
                 int ID=_self->getTaskId();
                 if(ID!=-1)
                 {
                     QNetworkRequest request(fileUrl);
                     QNetworkReply* reply = m_WebCtrl->get(request);
                     if(reply && (reply->error()==QNetworkReply::NoError))
                     {
                         task=new FileDownloaderTask(reply,ID,name,_self);
                         m_pendingTasks->append(task);
                         if(!_self->m_noGui)
                         {
                             m_DownLoadHistory->addElement(new DownloadHistoryElement(task));
                         }
                     }
                     else
                     {
                         return -1;
                     }
                 }
                 return ID;
             }
             int FileDownloader::downloadFile(QString fileUrl, const QString &name)
             {
                 return downloadFile(QUrl(fileUrl),name);
             }
             QDockWidget *FileDownloader::getGUI()
             {
                 if(!_self->m_noGui && (m_gui==NULL))
                 {
                     m_DownLoadHistory=new DownLoadHistory();
                     m_gui=new QDockWidget("Download History");
                     m_gui->setWidget(m_DownLoadHistory);
                     m_gui->setFeatures(QDockWidget::DockWidgetMovable|QDockWidget::DockWidgetFloatable);
+                    m_SettingsGui = new FileDowloaderSettingsGUI();
+                    QLopSettings::registerConfigEntry(this->m_SettingsGui,QIcon(":/img/Gnome-emblem-downloads.svg"),"Qlop Downloader");
                 }
                 return (QDockWidget*) m_gui;
             }
             const QString &FileDownloader::serviceName()
             {
                 return m_serviceName;
             }
             int FileDownloader::download_file(QUrl fileUrl, const QString &name)
             {
                 return downloadFile(fileUrl,name);
             }
             int FileDownloader::download_file(QString fileUrl, const QString &name)
             {
                 return downloadFile(fileUrl,name);
             }
             FileDownloaderTask* FileDownloader::getDownloadTask(int ID)
             {
                 _INIT
                 for(int i=0;i<m_pendingTasks->count();i++)
                 {
                     if(m_pendingTasks->at(i)->ID()==ID)
                         return m_pendingTasks->at(i);
                 }
                 return NULL;
             }
             bool FileDownloader::taskIsCompleted(int ID)
             {
                 return getDownloadTask(ID)->downloadComplete();
             }
             FileDownloader *FileDownloader::self()
             {
                 _INIT
                 return _self;
             }
             int FileDownloader::getTaskId()
             {
                 for(unsigned int i=0;i<INT_MAX;i++)
                 {
                     bool idValid=true;
                     for(int j=0;j<m_pendingTasks->count();j++)
                     {
                         if(m_pendingTasks->at(j)->ID()==(int)i)
                             idValid=false;
                     }
                     if(idValid)
                         return (int)i;
                 }
                 return -1;
             }
+            void FileDownloader::proxyConfig()
+            {
+            }
             void FileDownloader::init(bool noGUI, QObject *parent)
             {
                 if(Q_UNLIKELY(_self==NULL))
                 {
                     _self=new FileDownloader(noGUI,parent);
                 }
             }
+            /*for gnome:
+             *
+             * gsettings list-recursively org.gnome.system.proxy
+             * gsettings get org.gnome.system.proxy.http host
+             *
+             * To detect desktop $XDG_CURRENT_DESKTOP
+             */
             FileDownloader::FileDownloader(bool noGUI,QObject *parent) : QLopService(parent)
             {
-                QNetworkProxyQuery q(QUrl("http://www.google.com"));
+                QNetworkProxyQuery q(QUrl(QLatin1String("http://www.google.com")));
-                q.setQueryType(QNetworkProxyQuery::UrlRequest);
+                //q.setQueryType(QNetworkProxyQuery::UrlRequest);
-                q.setProtocolTag("http");
+                //q.setProtocolTag("http");
                 QList<QNetworkProxy> proxies = QNetworkProxyFactory::systemProxyForQuery(q);
+                foreach ( QNetworkProxy loopItem, proxies ) {
+                    qDebug() << "proxyUsed:" << loopItem.hostName();
+                }
                 if( proxies.size() > 0 && proxies[0].type() != QNetworkProxy::NoProxy )
                   QNetworkProxy::setApplicationProxy(proxies[0]);
                 else
                  qDebug("No proxy server selected");
                 m_WebCtrl = new QNetworkAccessManager(this);
                 m_pendingTasks = new QList<FileDownloaderTask*>();
                 m_noGui=noGUI;
                 m_serviceName="FileDownloader";
             }
             FileDownloader::~FileDownloader()
             {
                 if(!m_noGui)
                     delete m_gui;
                 while (m_pendingTasks->count())
                 {
                     FileDownloaderTask* task=m_pendingTasks->last();
                     m_pendingTasks->removeLast();
                     delete task;
                 }
                 delete m_WebCtrl;
             }

src/Core/filedownloader.h +4 0

             /*------------------------------------------------------------------------------
             -- This file is a part of the QLop Software
             -- Copyright (C) 2015, Plasma Physics Laboratory - CNRS
             --
             -- 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
             -------------------------------------------------------------------------------*/
             /*-- Author : Alexis Jeandet
             -- Mail : alexis.jeandet@member.fsf.org
             ----------------------------------------------------------------------------*/
             #ifndef FILEDOWNLOADER_H
             #define FILEDOWNLOADER_H
             #include <QObject>
             #include <QNetworkAccessManager>
             #include <QNetworkReply>
             #include <QNetworkProxy>
             #include <QList>
             #include <QHash>
             #include <filedownloadertask.h>
             #include <downloadhistory.h>
             #include <qlopservice.h>
             #include <QDockWidget>
+            #include <filedowloadersettingsgui.h>
+            #include <qlopsettings.h>
             class FileDownloader : public QLopService
             {
                 Q_OBJECT
             private:
                 static FileDownloader* _self;
                 static QNetworkAccessManager* m_WebCtrl;
                 static QList<FileDownloaderTask*>* m_pendingTasks;
                 static DownLoadHistory* m_DownLoadHistory;
                 static QDockWidget* m_gui;
+                static FileDowloaderSettingsGUI* m_SettingsGui;
                 FileDownloader(bool noGUI=false,QObject *parent = 0);
                ~FileDownloader();
             public:
                 static void init(bool noGUI=false,QObject *parent = 0);
                 static int downloadFile(QUrl fileUrl,const QString& name);
                 static int downloadFile(QString fileUrl,const QString& name);
                 static FileDownloaderTask *getDownloadTask(int ID);
                 static bool taskIsCompleted(int ID);
                 static FileDownloader *self();
                 // QLopService methodes
                 QDockWidget* getGUI();
                 const QString& serviceName();
             signals:
             public slots:
                 int download_file(QUrl fileUrl,const QString& name);
                 int download_file(QString fileUrl,const QString& name);
             private:
                 int getTaskId();
+                void proxyConfig();
             };
             #endif // FILEDOWNLOADER_H

src/Core/qlopdatabase.cpp +22 -1

+            /*------------------------------------------------------------------------------
+            -- This file is a part of the QLop Software
+            -- Copyright (C) 2015, Plasma Physics Laboratory - CNRS
+            --
+            -- 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
+            -------------------------------------------------------------------------------*/
+            /*-- Author : Alexis Jeandet
+            -- Mail : alexis.jeandet@member.fsf.org
+            ----------------------------------------------------------------------------*/
             #include "qlopdatabase.h"
             #include <qlopdatabaseviewer.h>
             QList<QLopData*>* QLopDataBase::m_dataBase=NULL;
             QLopDataBase* QLopDataBase::_self=NULL;
             QDockWidget* QLopDataBase::m_gui=NULL;
             #define INIT() \
                 if(Q_UNLIKELY(_self==NULL))\
                 {\
                     init();\
                 }
             QLopDataBase::QLopDataBase(bool noGUI,QObject *parent) : QLopService(parent)
             {
                 this->m_dataBase = new QList<QLopData*>();
                 m_serviceName="QLopDataBase";
                 m_noGui=noGUI;
             }
             QLopDataBase::~QLopDataBase()
             {
             }
             QDockWidget *QLopDataBase::getGUI()
             {
                 if(!m_noGui && (m_gui==NULL))
                 {
                     m_gui=new QLopDataBaseViewer();
                     m_gui->setFeatures(QDockWidget::DockWidgetMovable|QDockWidget::DockWidgetFloatable);
                 }
                 return m_gui;
             }
             void QLopDataBase::init(bool noGUI, QObject *parent)
             {
-                _self=new QLopDataBase();
+                _self=new QLopDataBase(noGUI,parent);
             }
             const QString &QLopDataBase::serviceName()
             {
                 INIT();
                 return m_serviceName;
             }
             int QLopDataBase::addData(QLopData *data)
             {
                 INIT();
                 if(!m_dataBase->contains(data))
                 {
                     m_dataBase->append(data);
                     emit QLopDataBase::self()->DBChanged();
                     return 1;
                 }
                 return 0;
             }
             int QLopDataBase::addData(const QLopDataList& data)
             {
                 INIT();
                 int addedData=0;
                 for (int i = 0; i < data.count(); i++)
                 {
                     addedData += addData(data.at(i));
                 }
                 emit QLopDataBase::self()->DBChanged();
                 return addedData;
             }
             int QLopDataBase::removeData(QLopData *data)
             {
                 INIT();
                 if(m_dataBase->contains(data))
                 {
                     m_dataBase->removeAll(data);
                     emit QLopDataBase::self()->DBChanged();
                     return 1;
                 }
                 return 0;
             }
             int QLopDataBase::removeData(const QLopDataList &data)
             {
                 INIT();
                 int removedData=0;
                 for (int i = 0; i < data.count(); i++)
                 {
                     removedData += removeData(data.at(i));
                 }
                 emit QLopDataBase::self()->DBChanged();
                 return removedData;
             }
             QLopDataBase *QLopDataBase::self()
             {
                 INIT();
                 return _self;
             }
             int QLopDataBase::count()
             {
                 INIT();
                 return m_dataBase->count();
             }
             QLopData *QLopDataBase::getData(const QString &name)
             {
                 INIT();
                 for (int i = 0; i < m_dataBase->count(); i++)
                 {
                     if(Q_UNLIKELY(m_dataBase->at(i)->name==name))
                     {
                         return m_dataBase->at(i);
                     }
                 }
                 return NULL;
             }
             QLopData *QLopDataBase::getData(int ID)
             {
                 INIT();
                 for (int i = 0; i < m_dataBase->count(); i++)
                 {
                     if(Q_UNLIKELY(m_dataBase->at(i)->ID==ID))
                     {
                         return m_dataBase->at(i);
                     }
                 }
                 return NULL;
             }
             QLopData *QLopDataBase::getDataFromIdex(int index)
             {
                 if((index>=0)&&(index<m_dataBase->count()))
                     return m_dataBase->at(index);
                 else
                     return NULL;
             }

src/Core/qlopdatabase.h +21 0

+            /*------------------------------------------------------------------------------
+            -- This file is a part of the QLop Software
+            -- Copyright (C) 2015, Plasma Physics Laboratory - CNRS
+            --
+            -- 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
+            -------------------------------------------------------------------------------*/
+            /*-- Author : Alexis Jeandet
+            -- Mail : alexis.jeandet@member.fsf.org
+            ----------------------------------------------------------------------------*/
             #ifndef QLOPDATABASE_H
             #define QLOPDATABASE_H
             #include <QObject>
             #include <qlopdata.h>
             #include <QList>
             #include <qlopservice.h>
             class QLopDataBaseViewer;
             class QLopDataBase : public QLopService
             {
                 Q_OBJECT
                 static QDockWidget* m_gui;
                 QLopDataBase(bool noGUI=false,QObject *parent = 0);
                 ~QLopDataBase();
                 static QLopDataBase* _self;
             public:
                 QDockWidget* getGUI();
                 static void init(bool noGUI=false,QObject *parent = 0);
                 const QString& serviceName();
                 static int addData(QLopData* data);
                 static int addData(const QLopDataList &data);
                 static int removeData(QLopData* data);
                 static int removeData(const QLopDataList &data);
                 static QLopDataBase* self();
                 static int count();
                 static QLopData* getData(const QString& name);
                 static QLopData* getData(int ID);
                 QLopData* getDataFromIdex(int index);
             signals:
                 void DBChanged();
             public slots:
             private:
                 static QList<QLopData*>* m_dataBase;
             };
             #endif // QLOPDATABASE_H

src/main.cpp +3 0

             /*------------------------------------------------------------------------------
             -- This file is a part of the QLop Software
             -- Copyright (C) 2015, Plasma Physics Laboratory - CNRS
             --
             -- 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
             -------------------------------------------------------------------------------*/
             /*-- Author : Alexis Jeandet
             -- Mail : alexis.jeandet@member.fsf.org
             ----------------------------------------------------------------------------*/
             #include "mainwindow.h"
             #include <QApplication>
             #include <omp.h>
             #include <QProcessEnvironment>
             #include <qglobal.h>
             #include <QThread>
             #include "abstractfileloader.h"
             #include <qlopdata.h>
             int main(int argc, char *argv[])
             {
               QApplication a(argc, argv);
               QByteArray OMP_NUM_THREADS = qgetenv("OMP_NUM_THREADS");
               int OMP_THREADS;
               if (0==OMP_NUM_THREADS.count())
                 {
                   omp_set_num_threads(QThread::idealThreadCount());
             //      omp_set_num_threads(2);
                   OMP_THREADS = QThread::idealThreadCount();
                 }
               else
                 {
                   OMP_THREADS = QString(OMP_NUM_THREADS).toInt();
                 }
               qRegisterMetaType<QListOfDataVector>("QListOfDataVector");
               qRegisterMetaType<QLopDataList>("QLopDataList");
+              QApplication::setOrganizationName("LPP");
+              QApplication::setOrganizationDomain("lpp.fr");
+              QApplication::setApplicationName("QLop");
               MainWindow w(OMP_THREADS);
               w.show();
               return a.exec();
             }

src/mainwindow.cpp +4 -29

             /*------------------------------------------------------------------------------
             -- This file is a part of the QLop Software
             -- Copyright (C) 2015, Plasma Physics Laboratory - CNRS
             --
             -- 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
             -------------------------------------------------------------------------------*/
             /*-- Author : Alexis Jeandet
             -- Mail : alexis.jeandet@member.fsf.org
             ----------------------------------------------------------------------------*/
             #include "mainwindow.h"
             #include "ui_mainwindow.h"
             #include <QFileDialog>
             #include <QDir>
             #include "qcustomplot.h"
             #include <omp.h>
             #include <QAction>
             #include <downloadhistory.h>
             #include <QDateTime>
             #include <QDate>
             #include <filedownloader.h>
             #include <cassinitools.h>
             #include <qlopplots.h>
             #include <qlopdatabase.h>
+            #include <qlopsettings.h>
+            #include <qlopgui.h>
             const QList<QLopService*>ServicesToLoad=QList<QLopService*>()
                     <<QLopDataBase::self()
                     <<FileDownloader::self()
                    <<CassiniTools::self()
                   << QLopPlots::self();
             MainWindow::MainWindow(int OMP_THREADS, QWidget *parent) :
               QMainWindow(parent),
               ui(new Ui::MainWindow)
             {
               this->OMP_THREADS = OMP_THREADS;
               ui->setupUi(this);
+              QLopGUI::registerMenuBar(menuBar());
               this->setWindowIcon(QIcon(":img/QLop.svg"));
-            //  QLopPlots::getPlot()->setXaxisTickLabelType(QCPAxis::ltDateTime);
-            //  QLopPlots::getPlot()->setXaxisDateTimeFormat("hh:mm:ss.zzz");
               this->progressWidget = new QWidget();
               this->progressLayout = new QVBoxLayout(this->progressWidget);
               this->progressWidget->setLayout(this->progressLayout);
               this->progressWidget->setWindowModality(Qt::WindowModal);
               progressThreadIds = (int*) malloc(OMP_THREADS*sizeof(int));
               for(int i=0;i<OMP_THREADS;i++)
                 {
                   this->progress.append(new QProgressBar(this->progressWidget));
                   this->progress.last()->setMinimum(0);
                   this->progress.last()->setMaximum(100);
                   this->progressLayout->addWidget(this->progress.last());
                   this->progressWidget->hide();
                   this->progressThreadIds[i] = -1;
                 }
               this->progressWidget->setWindowTitle("Loading File");
               for(int i=0;i<ServicesToLoad.count();i++)
               {
                   qDebug()<<ServicesToLoad.at(i)->serviceName();
                   QDockWidget* wdgt=ServicesToLoad.at(i)->getGUI();
                   wdgt->setAllowedAreas(Qt::AllDockWidgetAreas);
                   this->addDockWidget(Qt::TopDockWidgetArea,wdgt);
                   PythonQt::self()->getMainModule().addObject(ServicesToLoad.at(i)->serviceName(),(QObject*)ServicesToLoad.at(i));
               }
             }
             MainWindow::~MainWindow()
             {
               delete ui;
             }
-            //QString MainWindow::getFilePath(const QString &name)
-            //{
-            ////  for(int i=0;i<this->folderViews.count();i++)
-            ////    {
-            ////      if(folderViews.at(i)->isDraging(name))
-            ////        return folderViews.at(i)->currentFolder();
-            ////    }
-            //  return "";
-            //}
             void MainWindow::updateProgress(int threadId, int percentProgress)
             {
               bool updated=false;
               for(int i=0;i<OMP_THREADS;i++)
                 {
                   if(progressThreadIds[i]==threadId)
                     {
                       if(threadId<this->progress.count())
                       {
                           this->progress.at(i)->setValue(percentProgress);
                           updated=true;
                         }
                     }
                 }
               if(Q_UNLIKELY(updated==false))
                 {
                   for(int i=0;i<OMP_THREADS;i++)
                     {
                       if(progressThreadIds[i]==-1)
                         {
                           progressThreadIds[i] = threadId;
                           updateProgress(threadId,percentProgress);
                           return;
                         }
                     }
                 }
             }
-            void MainWindow::askGlobalRescan()
-            //  for(int i=0;i<this->folderViews.count();i++)
-            //    {
-            //      this->folderViews.at(i)->refreshFolder();
-            //  }
-            void MainWindow::showThemisIndexViewer()
             void MainWindow::changeEvent(QEvent *e)
             {
               QMainWindow::changeEvent(e);
               switch (e->type()) {
                 case QEvent::LanguageChange:
                   ui->retranslateUi(this);
                   break;
                 default:
                   break;
                 }
             }

src/mainwindow.h +2 -3

             /*------------------------------------------------------------------------------
             -- This file is a part of the QLop Software
             -- Copyright (C) 2015, Plasma Physics Laboratory - CNRS
             --
             -- 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
             -------------------------------------------------------------------------------*/
             /*-- Author : Alexis Jeandet
             -- Mail : alexis.jeandet@member.fsf.org
             ----------------------------------------------------------------------------*/
             #ifndef MAINWINDOW_H
             #define MAINWINDOW_H
             #include <QMainWindow>
             #include <QThread>
             #include "cassinidatafile.h"
             #include <QProgressDialog>
             #include <QProgressBar>
             #include <QListWidgetItem>
             #include <QVBoxLayout>
             #include <QWidget>
             #include "abstractfileloader.h"
             #include "cassiniindexfileviewer.h"
             #include <downloadhistory.h>
             #include <qlopservice.h>
+            #include <qlopgui.h>
             namespace Ui {
               class MainWindow;
             }
             class MainWindow : public QMainWindow
             {
               Q_OBJECT
             public:
               explicit MainWindow(int OMP_THREADS,QWidget *parent = 0);
               ~MainWindow();
-              QString getFilePath(const QString& name);
             public slots:
               void updateProgress(int threadId,int percentProgress);
-              void askGlobalRescan();
-              void showThemisIndexViewer();
             protected:
               void changeEvent(QEvent *e);
             private:
               Ui::MainWindow *ui;
               QList<QProgressBar*> progress;
               int* progressThreadIds;
               QWidget* progressWidget;
               QVBoxLayout*progressLayout;
               QList<QLopService*> qlopServices;
               int OMP_THREADS;
             };
             #endif // MAINWINDOW_H

src/mainwindow.ui 0 -13

             <?xml version="1.0" encoding="UTF-8"?>
             <ui version="4.0">
              <class>MainWindow</class>
              <widget class="QMainWindow" name="MainWindow">
               <property name="geometry">
                <rect>
                 <x>0</x>
                 <y>0</y>
                 <width>800</width>
                 <height>600</height>
                </rect>
               </property>
               <property name="windowTitle">
                <string>QLop</string>
               </property>
               <property name="dockNestingEnabled">
                <bool>true</bool>
               </property>
               <widget class="PythonConsole" name="centralWidget">
                <property name="enabled">
                 <bool>true</bool>
                </property>
                <property name="sizePolicy">
                 <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
                  <horstretch>0</horstretch>
                  <verstretch>0</verstretch>
                 </sizepolicy>
                </property>
                <property name="maximumSize">
                 <size>
                  <width>16777215</width>
                  <height>16777215</height>
                 </size>
                </property>
               </widget>
               <widget class="QMenuBar" name="menuBar">
                <property name="geometry">
                 <rect>
                  <x>0</x>
                  <y>0</y>
                  <width>800</width>
                  <height>27</height>
                 </rect>
                </property>
-               <widget class="QMenu" name="menuTools">
-                <property name="title">
-                 <string>tools</string>
-                </property>
-                <widget class="QMenu" name="menuThemis">
-                 <property name="title">
-                  <string>Themis</string>
-                 </property>
-                 <addaction name="actionIndex_Viewer"/>
-                </widget>
-                <addaction name="menuThemis"/>
-               </widget>
-               <addaction name="menuTools"/>
               </widget>
               <widget class="QStatusBar" name="statusBar"/>
               <action name="actionIndex_Viewer">
                <property name="text">
                 <string>Index Viewer</string>
                </property>
               </action>
              </widget>
              <layoutdefault spacing="6" margin="11"/>
              <customwidgets>
               <customwidget>
                <class>PythonConsole</class>
                <extends>QWidget</extends>
                <header location="global">pythonconsole.h</header>
                <container>1</container>
               </customwidget>
              </customwidgets>
              <resources/>
              <connections/>
             </ui>

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages