some more steps toward musredit

This commit is contained in:
suter_a 2010-01-30 11:05:11 +00:00
parent 6adf757ec0
commit f7caf65251
28 changed files with 133 additions and 26 deletions

View File

@ -5,7 +5,7 @@
Author: Andreas Suter
e-mail: andreas.suter@psi.ch
$Id: PFindDialog.cpp 3917 2009-05-13 07:49:49Z nemu $
$Id$
*****************************************************************************/

View File

@ -5,7 +5,7 @@
Author: Andreas Suter
e-mail: andreas.suter@psi.ch
$Id: PFitOutputHandler.cpp 4148 2009-09-11 12:37:01Z nemu $
$Id$
*****************************************************************************/

View File

@ -5,7 +5,7 @@
Author: Andreas Suter
e-mail: andreas.suter@psi.ch
$Id: PGetAsymmetryRunBlockDialog.cpp 3800 2009-03-22 16:19:08Z nemu $
$Id$
*****************************************************************************/

View File

@ -5,7 +5,7 @@
Author: Andreas Suter
e-mail: andreas.suter@psi.ch
$Id: PGetAsymmetryRunBlockDialog.h 3788 2009-03-19 07:58:16Z nemu $
$Id$
*****************************************************************************/

View File

@ -5,7 +5,7 @@
Author: Andreas Suter
e-mail: andreas.suter@psi.ch
$Id: PGetDefaultDialog.cpp 3807 2009-03-25 09:49:32Z nemu $
$Id$
*****************************************************************************/

View File

@ -5,7 +5,7 @@
Author: Andreas Suter
e-mail: andreas.suter@psi.ch
$Id: PGetFourierBlockDialog.cpp 3978 2009-06-09 11:16:39Z nemu $
$Id$
*****************************************************************************/

View File

@ -5,7 +5,7 @@
Author: Andreas Suter
e-mail: andreas.suter@psi.ch
$Id: PGetFourierBlockDialog.h 3978 2009-06-09 11:16:39Z nemu $
$Id$
*****************************************************************************/

View File

@ -5,7 +5,7 @@
Author: Andreas Suter
e-mail: andreas.suter@psi.ch
$Id: PGetFunctionsBlockDialog.cpp 3865 2009-04-20 07:46:50Z nemu $
$Id$
*****************************************************************************/

View File

@ -5,7 +5,7 @@
Author: Andreas Suter
e-mail: andreas.suter@psi.ch
$Id: PGetFunctionsBlockDialog.h 3794 2009-03-20 18:07:52Z nemu $
$Id$
*****************************************************************************/

View File

@ -5,7 +5,7 @@
Author: Andreas Suter
e-mail: andreas.suter@psi.ch
$Id: PGetNonMusrRunBlockDialog.cpp 3790 2009-03-19 15:29:21Z nemu $
$Id$
*****************************************************************************/

View File

@ -5,7 +5,7 @@
Author: Andreas Suter
e-mail: andreas.suter@psi.ch
$Id: PGetNonMusrRunBlockDialog.h 3790 2009-03-19 15:29:21Z nemu $
$Id$
*****************************************************************************/

View File

@ -5,7 +5,7 @@
Author: Andreas Suter
e-mail: andreas.suter@psi.ch
$Id: PGetParameterBlockDialog.cpp 3864 2009-04-20 06:50:06Z nemu $
$Id$
*****************************************************************************/

View File

@ -5,7 +5,7 @@
Author: Andreas Suter
e-mail: andreas.suter@psi.ch
$Id: PGetParameterBlockDialog.h 3864 2009-04-20 06:50:06Z nemu $
$Id$
*****************************************************************************/

View File

@ -5,7 +5,7 @@
Author: Andreas Suter
e-mail: andreas.suter@psi.ch
$Id: PGetPlotBlockDialog.cpp 3930 2009-05-20 12:51:17Z nemu $
$Id$
*****************************************************************************/

View File

@ -5,7 +5,7 @@
Author: Andreas Suter
e-mail: andreas.suter@psi.ch
$Id: PGetSingleHistoRunBlockDialog.cpp 3788 2009-03-19 07:58:16Z nemu $
$Id$
*****************************************************************************/

View File

@ -5,7 +5,7 @@
Author: Andreas Suter
e-mail: andreas.suter@psi.ch
$Id: PGetSingleHistoRunBlockDialog.h 3788 2009-03-19 07:58:16Z nemu $
$Id$
*****************************************************************************/

View File

@ -5,7 +5,7 @@
Author: Andreas Suter
e-mail: andreas.suter@psi.ch
$Id: PGetTheoryBlockDialog.cpp 3802 2009-03-23 08:29:57Z nemu $
$Id$
*****************************************************************************/

View File

@ -5,7 +5,7 @@
Author: Andreas Suter
e-mail: andreas.suter@psi.ch
$Id: PGetTheoryBlockDialog.h 3799 2009-03-22 15:52:11Z nemu $
$Id$
*****************************************************************************/

View File

@ -32,6 +32,7 @@
#include <QMessageBox>
#include "PGetTitleBlockDialog.h"
#include "PHelp.h"
//---------------------------------------------------------------------------
/**
@ -50,7 +51,8 @@ PGetTitleBlockDialog::PGetTitleBlockDialog(QWidget *parent, Qt::WindowFlags f) :
*/
void PGetTitleBlockDialog::helpContent()
{
QMessageBox::information(this, "**INFO**", "Will eventually show a help window");
PHelp *help = new PHelp("http://lmu.web.psi.ch/musrfit/title.html");
help->show();
}
//---------------------------------------------------------------------------

56
src/musredit/PHelp.cpp Normal file
View File

@ -0,0 +1,56 @@
/****************************************************************************
PHelp.cpp
Author: Andreas Suter
e-mail: andreas.suter@psi.ch
$Id$
*****************************************************************************/
/***************************************************************************
* Copyright (C) 2010 by Andreas Suter *
* andreas.suter@psi.ch *
* *
* 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. *
***************************************************************************/
#include <QMessageBox>
#include "PHelp.h"
//---------------------------------------------------------------------------
/**
* <p>
*/
PHelp::PHelp(const QString &url)
{
QString str = "Will eventually show the url:\n" + url;
QMessageBox::information(this, "**HELP**", str);
}
//---------------------------------------------------------------------------
/**
* <p>
*/
PHelp::~PHelp()
{
}
//---------------------------------------------------------------------------
// end
//---------------------------------------------------------------------------

47
src/musredit/PHelp.h Normal file
View File

@ -0,0 +1,47 @@
/****************************************************************************
PHelp.h
Author: Andreas Suter
e-mail: andreas.suter@psi.ch
$Id$
*****************************************************************************/
/***************************************************************************
* Copyright (C) 2010 by Andreas Suter *
* andreas.suter@psi.ch *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
#ifndef _PHELP_H_
#define _PHELP_H_
#include <QDialog>
#include <QString>
class PHelp : public QDialog
{
Q_OBJECT
public:
PHelp(const QString &url);
virtual ~PHelp();
};
#endif // _PHELP_H_

View File

@ -5,7 +5,7 @@
Author: Andreas Suter
e-mail: andreas.suter@psi.ch
$Id: PMsr2DataDialog.cpp 4328 2010-01-06 06:27:10Z nemu $
$Id$
*****************************************************************************/

View File

@ -5,7 +5,7 @@
Author: Andreas Suter
e-mail: andreas.suter@psi.ch
$Id: PPrefsDialog.cpp 4032 2009-06-26 05:31:33Z nemu $
$Id$
*****************************************************************************/

View File

@ -5,7 +5,7 @@
Author: Andreas Suter
e-mail: andreas.suter@psi.ch
$Id: PReplaceDialog.cpp 3918 2009-05-14 19:26:30Z nemu $
$Id$
*****************************************************************************/

View File

@ -5,7 +5,7 @@
Author: Andreas Suter
e-mail: andreas.suter@psi.ch
$Id: PSubTextEdit.cpp 3936 2009-05-22 11:38:21Z nemu $
$Id$
*****************************************************************************/

View File

@ -5,7 +5,7 @@
Author: Andreas Suter
e-mail: andreas.suter@psi.ch
$Id: PSubTextEdit.h 3936 2009-05-22 11:38:21Z nemu $
$Id$
*****************************************************************************/

View File

@ -47,7 +47,7 @@ int main( int argc, char ** argv )
cout << endl << endl;
return 0;
} else if (!strcmp(argv[1], "--version") || !strcmp(argv[1], "-v")) {
cout << endl << "musrgui version: $Id: main.cpp 3728 2009-02-27 11:52:00Z nemu $";
cout << endl << "musrgui version: $Id$";
cout << endl << endl;
return 0;
}

View File

@ -26,6 +26,7 @@ CONFIG += qt \
QT += xml
HEADERS = musredit.h \
PHelp.h \
PTextEdit.h \
PSubTextEdit.h \
PAdmin.h \
@ -47,7 +48,8 @@ HEADERS = musredit.h \
PMsr2DataDialog.h \
PMusrEditAbout.h
SOURCES = PTextEdit.cpp \
SOURCES = PHelp.cpp \
PTextEdit.cpp \
PSubTextEdit.cpp \
PAdmin.cpp \
PFindDialog.cpp \