added Id property. Changed acceleration keys for fitting menu. Added version info form the command line

This commit is contained in:
nemu 2009-02-27 11:52:00 +00:00
parent 6e35fd0292
commit 78ca65648f
2 changed files with 20 additions and 6 deletions

View File

@ -206,27 +206,27 @@ void PTextEdit::setupMusrActions()
menuBar()->insertItem( tr( "&MusrFit" ), menu );
QAction *a;
a = new QAction( QPixmap::fromMimeSource( "musrasym.xpm" ), tr( "&Asymetry Default" ), CTRL + SHIFT + Key_A, this, "musrGetAsymetryDefault" );
a = new QAction( QPixmap::fromMimeSource( "musrasym.xpm" ), tr( "&Asymetry Default" ), ALT + Key_A, this, "musrGetAsymetryDefault" );
connect( a, SIGNAL( activated() ), this, SLOT( musrGetAsymetryDefault() ) );
a->addTo( tb );
a->addTo( menu );
a = new QAction( QPixmap::fromMimeSource( "musrsinglehisto.xpm" ), tr( "Single &Histo Default" ), CTRL + SHIFT + Key_H, this, "musrGetSinglHistoDefault" );
a = new QAction( QPixmap::fromMimeSource( "musrsinglehisto.xpm" ), tr( "Single &Histo Default" ), ALT + Key_H, this, "musrGetSinglHistoDefault" );
connect( a, SIGNAL( activated() ), this, SLOT( musrGetSingleHistoDefault() ) );
a->addTo( tb );
a->addTo( menu );
a = new QAction( QPixmap::fromMimeSource( "musrcalcchisq.xpm" ), tr( "Calc Chisq" ), CTRL + SHIFT + Key_C, this, "cacluates for the given parameters chiSq/maxLH" );
a = new QAction( QPixmap::fromMimeSource( "musrcalcchisq.xpm" ), tr( "Calc Chisq" ), ALT + Key_C, this, "cacluates for the given parameters chiSq/maxLH" );
connect( a, SIGNAL( activated() ), this, SLOT( musrCalcChisq() ) );
a->addTo( tb );
a->addTo( menu );
a = new QAction( QPixmap::fromMimeSource( "musrfit.xpm" ), tr( "&Fit" ), CTRL + SHIFT + Key_F, this, "musrFit" );
a = new QAction( QPixmap::fromMimeSource( "musrfit.xpm" ), tr( "&Fit" ), ALT + Key_F, this, "musrFit" );
connect( a, SIGNAL( activated() ), this, SLOT( musrFit() ) );
a->addTo( tb );
a->addTo( menu );
a = new QAction( QPixmap::fromMimeSource( "musrview.xpm" ), tr( "&View" ), CTRL + SHIFT + Key_V, this, "musrView" );
a = new QAction( QPixmap::fromMimeSource( "musrview.xpm" ), tr( "&View" ), ALT + Key_V, this, "musrView" );
connect( a, SIGNAL( activated() ), this, SLOT( musrView() ) );
a->addTo( tb );
a->addTo( menu );

View File

@ -29,14 +29,28 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
#include <iostream>
using namespace std;
#include <qapplication.h>
#include "PTextEdit.h"
#include "PFitOutputHandler.h"
int main( int argc, char ** argv )
{
if (argc == 2) {
if (!strcmp(argv[1], "--help") || !strcmp(argv[1], "-h")) {
cout << endl << "usage: musrgui [<msr-files>] | -h, --help | -v, --version";
cout << endl << endl;
return 0;
} else if (!strcmp(argv[1], "--version") || !strcmp(argv[1], "-v")) {
cout << endl << "musrgui version: $Id$";
cout << endl << endl;
return 0;
}
}
QApplication a( argc, argv );
PTextEdit * mw = new PTextEdit();