Attachment #393824 for bug #531356

View | Details | Raw Unified | Return to bug 531356
Collapse All | Expand All

Lines 72-78 Link Here

(-)qtiplot/src/core/ApplicationWindow.h.old (-2 / +2 lines)
72	class QShortcut;	72	class QShortcut;
73	class QMenu;	73	class QMenu;
74	class QToolBar;	74	class QToolBar;
75	class QAssistantClient;	75	//class QAssistantClient;
76	class QLocale;	76	class QLocale;
77	class QMdiArea;	77	class QMdiArea;
78	class QUndoView;	78	class QUndoView;
Lines 1451-1457 Link Here
1451	Graph *lastCopiedLayer;	1451	Graph *lastCopiedLayer;
1452	QSplitter *explorerSplitter;	1452	QSplitter *explorerSplitter;
1453		1453
1454	QAssistantClient *assistant;	1454	// QAssistantClient *assistant;
1455	ScriptWindow *scriptWindow;	1455	ScriptWindow *scriptWindow;
1456	QTranslator appTranslator, qtTranslator;	1456	QTranslator appTranslator, qtTranslator;
1457	QDockWidget explorerWindow, undoStackWindow;	1457	QDockWidget explorerWindow, undoStackWindow;




#include <QVarLengthArray>
#include <QList>
#include <QUrl>
//#include <QAssistantClient>
#include <QFontComboBox>
#include <QSpinBox>
#include <QMdiArea>

	insertTranslatedStrings();
	disableToolbars();

//	assistant = new QAssistantClient( QString(), this );

	connect(tablesDepend, SIGNAL(activated(int)), this, SLOT(showTable(int)));


	if (!QFile(profilePath).exists())
	{
		QMessageBox::critical(0, tr("QtiPlot - Help Profile Not Found!"),
//				tr("The assistant could not start because the file <b>%1</b> was not found in the help file directory!").arg("qtiplot.adp")+"<br>"+
				tr("This file is provided with the QtiPlot manual which can be downloaded from the following internet address:")+
				"<p><a href = http://soft.proindependent.com/manuals.html>http://soft.proindependent.com/manuals.html</a></p>");
		exit(0);
	}

	QStringList cmdLst = QStringList() << "-profile" << profilePath;
//	QAssistantClient *assist = new QAssistantClient( QString(), 0);
//	assist->setArguments( cmdLst );
//	assist->showPage(helpPath);
//	connect(assist, SIGNAL(assistantClosed()), qApp, SLOT(quit()) );
}

void ApplicationWindow::showHelp()

	if (!QFile(profilePath).exists())
	{
		QMessageBox::critical(this,tr("QtiPlot - Help Profile Not Found!"),
//				tr("The assistant could not start because the file <b>%1</b> was not found in the help file directory!").arg("qtiplot.adp")+"<br>"+
				tr("This file is provided with the QtiPlot manual which can be downloaded from the following internet address:")+
				"<p><a href = http://soft.proindependent.com/manuals.html>http://soft.proindependent.com/manuals.html</a></p>");
		return;
	}

	QStringList cmdLst = QStringList() << "-profile" << profilePath;
//	assistant->setArguments( cmdLst );
//	assistant->showPage(helpFilePath);
}

void ApplicationWindow::showPlotWizard()

Return to bug 531356

Lines 174-180 Link Here

(-)qtiplot/src/core/ApplicationWindow.cpp.old (-10 / +10 lines)
174	#include <QVarLengthArray>	174	#include <QVarLengthArray>
175	#include <QList>	175	#include <QList>
176	#include <QUrl>	176	#include <QUrl>
177	#include <QAssistantClient>	177	//#include <QAssistantClient>
178	#include <QFontComboBox>	178	#include <QFontComboBox>
179	#include <QSpinBox>	179	#include <QSpinBox>
180	#include <QMdiArea>	180	#include <QMdiArea>
Lines 349-355 Link Here
349	insertTranslatedStrings();	349	insertTranslatedStrings();
350	disableToolbars();	350	disableToolbars();
351		351
352	assistant = new QAssistantClient( QString(), this );	352	// assistant = new QAssistantClient( QString(), this );
353		353
354	connect(tablesDepend, SIGNAL(activated(int)), this, SLOT(showTable(int)));	354	connect(tablesDepend, SIGNAL(activated(int)), this, SLOT(showTable(int)));
355		355
Lines 11327-11343 Link Here
11327	if (!QFile(profilePath).exists())	11327	if (!QFile(profilePath).exists())
11328	{	11328	{
11329	QMessageBox::critical(0, tr("QtiPlot - Help Profile Not Found!"),	11329	QMessageBox::critical(0, tr("QtiPlot - Help Profile Not Found!"),
11330	tr("The assistant could not start because the file <b>%1</b> was not found in the help file directory!").arg("qtiplot.adp")+"<br>"+	11330	// tr("The assistant could not start because the file <b>%1</b> was not found in the help file directory!").arg("qtiplot.adp")+"<br>"+
11331	tr("This file is provided with the QtiPlot manual which can be downloaded from the following internet address:")+	11331	tr("This file is provided with the QtiPlot manual which can be downloaded from the following internet address:")+
11332	"<p><a href = http://soft.proindependent.com/manuals.html>http://soft.proindependent.com/manuals.html</a></p>");	11332	"<p><a href = http://soft.proindependent.com/manuals.html>http://soft.proindependent.com/manuals.html</a></p>");
11333	exit(0);	11333	exit(0);
11334	}	11334	}
11335		11335
11336	QStringList cmdLst = QStringList() << "-profile" << profilePath;	11336	QStringList cmdLst = QStringList() << "-profile" << profilePath;
11337	QAssistantClient *assist = new QAssistantClient( QString(), 0);	11337	// QAssistantClient *assist = new QAssistantClient( QString(), 0);
11338	assist->setArguments( cmdLst );	11338	// assist->setArguments( cmdLst );
11339	assist->showPage(helpPath);	11339	// assist->showPage(helpPath);
11340	connect(assist, SIGNAL(assistantClosed()), qApp, SLOT(quit()) );	11340	// connect(assist, SIGNAL(assistantClosed()), qApp, SLOT(quit()) );
11341	}	11341	}
11342		11342
11343	void ApplicationWindow::showHelp()	11343	void ApplicationWindow::showHelp()
Lines 11361-11375 Link Here
11361	if (!QFile(profilePath).exists())	11361	if (!QFile(profilePath).exists())
11362	{	11362	{
11363	QMessageBox::critical(this,tr("QtiPlot - Help Profile Not Found!"),	11363	QMessageBox::critical(this,tr("QtiPlot - Help Profile Not Found!"),
11364	tr("The assistant could not start because the file <b>%1</b> was not found in the help file directory!").arg("qtiplot.adp")+"<br>"+	11364	// tr("The assistant could not start because the file <b>%1</b> was not found in the help file directory!").arg("qtiplot.adp")+"<br>"+
11365	tr("This file is provided with the QtiPlot manual which can be downloaded from the following internet address:")+	11365	tr("This file is provided with the QtiPlot manual which can be downloaded from the following internet address:")+
11366	"<p><a href = http://soft.proindependent.com/manuals.html>http://soft.proindependent.com/manuals.html</a></p>");	11366	"<p><a href = http://soft.proindependent.com/manuals.html>http://soft.proindependent.com/manuals.html</a></p>");
11367	return;	11367	return;
11368	}	11368	}
11369		11369
11370	QStringList cmdLst = QStringList() << "-profile" << profilePath;	11370	QStringList cmdLst = QStringList() << "-profile" << profilePath;
11371	assistant->setArguments( cmdLst );	11371	// assistant->setArguments( cmdLst );
11372	assistant->showPage(helpFilePath);	11372	// assistant->showPage(helpFilePath);
11373	}	11373	}
11374		11374
11375	void ApplicationWindow::showPlotWizard()	11375	void ApplicationWindow::showPlotWizard()