From cc1679144c6e5387f863060e8d581f6de0eb8456 Mon Sep 17 00:00:00 2001 From: Andreas Suter Date: Wed, 22 Feb 2017 08:03:12 +0100 Subject: [PATCH] added musrStep dummy menu. First step towards a full integration of musrStep into musredit. --- src/musredit_qt5/PTextEdit.cpp | 21 +++- src/musredit_qt5/PTextEdit.h | 1 + src/musredit_qt5/icons/musrStep-32x32.svg | 140 ++++++++++++++++++++++ src/musredit_qt5/musredit.qrc | 1 + 4 files changed, 162 insertions(+), 1 deletion(-) create mode 100644 src/musredit_qt5/icons/musrStep-32x32.svg diff --git a/src/musredit_qt5/PTextEdit.cpp b/src/musredit_qt5/PTextEdit.cpp index f10a699b..2dff05f1 100644 --- a/src/musredit_qt5/PTextEdit.cpp +++ b/src/musredit_qt5/PTextEdit.cpp @@ -501,7 +501,7 @@ void PTextEdit::setupMusrActions() menu->addSeparator(); tb->addSeparator(); - a = new QAction( QIcon( QPixmap( ":/icons/musrchisq-plain.svg" ) ), tr( "Calculate Chisq" ), this ); + a = new QAction( QIcon( QPixmap( ":/icons/musrchisq-plain.svg" ) ), tr( "Calculate &Chisq" ), this ); a->setShortcut( tr("Alt+C") ); a->setStatusTip( tr("Calculate Chi Square (Log Max Likelihood)") ); connect( a, SIGNAL( triggered() ), this, SLOT( musrCalcChisq() ) ); @@ -522,6 +522,13 @@ void PTextEdit::setupMusrActions() tb->addAction(a); menu->addAction(a); + a = new QAction( QIcon( QPixmap( ":/icons/musrStep-32x32.svg" ) ), tr( "Set Ste&ps" ), this ); + a->setShortcut( tr("Alt+P") ); + a->setStatusTip( tr("Set Steps") ); + connect( a, SIGNAL( triggered() ), this, SLOT( musrSetSteps() ) ); + tb->addAction(a); + menu->addAction(a); + a = new QAction( QIcon( QPixmap( ":/icons/msr2data-plain.svg" ) ), tr( "&Msr2Data" ), this ); a->setShortcut( tr("Alt+M") ); a->setStatusTip( tr("Start msr2data interface") ); @@ -1594,6 +1601,9 @@ void PTextEdit::textSize( const QString &p ) */ void PTextEdit::musrWiz() { + if ( !currentEditor() ) + return; + QMessageBox::information(this, "**INFO**", "Will eventually call musrWiz"); } @@ -2251,6 +2261,15 @@ void PTextEdit::musrPrefs() dlg = 0; } +//---------------------------------------------------------------------------------------------------- +void PTextEdit::musrSetSteps() +{ + if ( !currentEditor() ) + return; + + QMessageBox::information(this, "**INFO**", "Eventually this will allow to set the\nstep values of the current msr-file."); +} + //---------------------------------------------------------------------------------------------------- /** *

Swaps the currently open msr-file with its mlog-file (if present) and updates musredit accordingly. diff --git a/src/musredit_qt5/PTextEdit.h b/src/musredit_qt5/PTextEdit.h index 3611f24b..7235cbd7 100644 --- a/src/musredit_qt5/PTextEdit.h +++ b/src/musredit_qt5/PTextEdit.h @@ -134,6 +134,7 @@ private slots: void musrFT(); void musrPrefs(); void musrSwapMsrMlog(); + void musrSetSteps(); void musrDump(); void helpContents(); diff --git a/src/musredit_qt5/icons/musrStep-32x32.svg b/src/musredit_qt5/icons/musrStep-32x32.svg new file mode 100644 index 00000000..a0c6dbe1 --- /dev/null +++ b/src/musredit_qt5/icons/musrStep-32x32.svg @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/src/musredit_qt5/musredit.qrc b/src/musredit_qt5/musredit.qrc index 49350ec9..e17b7e6e 100644 --- a/src/musredit_qt5/musredit.qrc +++ b/src/musredit_qt5/musredit.qrc @@ -19,6 +19,7 @@ icons/msr2data-plain.svg icons/musrprefs-plain.svg icons/musrswap-plain.svg + icons/musrStep-32x32.svg icons/musrt0-plain.svg icons/musrview-plain.svg icons/musrFT-plain.svg