From d16278bdc38bebbba1c2be1fda528286571f95b5 Mon Sep 17 00:00:00 2001 From: Zaher Salman Date: Tue, 25 Aug 2009 14:35:06 +0000 Subject: [PATCH] Added possibility to change working directory --- src/external/MuSRFitGUI/MuSRFit.pl | 23 ++++++++++++++++++++++- src/external/MuSRFitGUI/MuSRFit.ui | 22 ++++++++++++++++++++++ src/external/MuSRFitGUI/MuSRFit.ui.h | 13 +++++++++++++ 3 files changed, 57 insertions(+), 1 deletion(-) diff --git a/src/external/MuSRFitGUI/MuSRFit.pl b/src/external/MuSRFitGUI/MuSRFit.pl index 7f005af6..fb79bb7b 100755 --- a/src/external/MuSRFitGUI/MuSRFit.pl +++ b/src/external/MuSRFitGUI/MuSRFit.pl @@ -1,6 +1,6 @@ # Form implementation generated from reading ui file 'MuSRFit.ui' # -# Created: Tue Aug 25 15:21:53 2009 +# Created: Tue Aug 25 16:34:16 2009 # by: The PerlQt User Interface Compiler (puic) # # WARNING! All changes made in this file will be lost! @@ -17,6 +17,7 @@ use Qt::slots fileNew => [], fileOpen => [], fileSave => [], + fileChangeDir => [], filePrint => [], fileExit => [], editUndo => [], @@ -127,6 +128,7 @@ use Qt::attributes qw( separatorAction FileExistCheck MaualFile + fileChangeDirAction ); @@ -857,6 +859,7 @@ sub NEW FileExistCheck->setOn( 1 ); MaualFile= Qt::Action(this, "MaualFile"); MaualFile->setToggleAction( 1 ); + fileChangeDirAction= Qt::Action(this, "fileChangeDirAction"); toolBar = Qt::ToolBar("", this, &DockTop); @@ -876,6 +879,7 @@ sub NEW fileMenu = Qt::PopupMenu( this ); fileOpenAction->addTo( fileMenu ); fileSaveAction->addTo( fileMenu ); + fileChangeDirAction->addTo( fileMenu ); fileMenu->insertSeparator(); filePrintAction->addTo( fileMenu ); fileMenu->insertSeparator(); @@ -927,6 +931,7 @@ sub NEW Qt::Object::connect(fileNewAction, SIGNAL "activated()", this, SLOT "fileNew()"); Qt::Object::connect(go, SIGNAL "clicked()", this, SLOT "GoFit()"); Qt::Object::connect(InitParamTable, SIGNAL "valueChanged(int,int)", this, SLOT "UpdeateTable()"); + Qt::Object::connect(fileChangeDirAction, SIGNAL "activated()", this, SLOT "fileChangeDir()"); setTabOrder(musrfit_tabs, TITLE); setTabOrder(TITLE, FILENAME); @@ -1108,6 +1113,7 @@ sub languageChange fileOpenAction->setAccel( Qt::KeySequence( trUtf8("Ctrl+O") ) ); fileSaveAction->setText( trUtf8("&Save MSR") ); fileSaveAction->setMenuText( trUtf8("&Save MSR") ); + fileSaveAction->setStatusTip( trUtf8("&Save MSRave") ); fileSaveAction->setAccel( Qt::KeySequence( trUtf8("Ctrl+S") ) ); fileSaveAsAction->setText( trUtf8("Save MSR &As...") ); fileSaveAsAction->setMenuText( trUtf8("Save MSR &As...") ); @@ -1154,6 +1160,8 @@ sub languageChange FileExistCheck->setWhatsThis( trUtf8("Enable/Disable checking for MSR files.") ); MaualFile->setText( trUtf8("Maual file selection") ); MaualFile->setMenuText( trUtf8("Maual file selection") ); + fileChangeDirAction->setText( trUtf8("Change dir") ); + fileChangeDirAction->setMenuText( trUtf8("Change dir") ); toolBar->setLabel( trUtf8("Tools") ); MenuBar->findItem( 3 )->setText( trUtf8("&File") ); MenuBar->findItem( 4 )->setText( trUtf8("&Edit") ); @@ -1209,6 +1217,19 @@ sub fileSave } +sub fileChangeDir +{ + + my $newdir=Qt::FileDialog::getExistingDirectory( + "", + this, + "get existing directory", + "Choose a directory", + 1); + chdir ("$newdir"); + +} + sub filePrint { print "MuSRFitform->filePrint(): Not implemented yet.\n"; diff --git a/src/external/MuSRFitGUI/MuSRFit.ui b/src/external/MuSRFitGUI/MuSRFit.ui index 0a83fec7..a7c78a51 100755 --- a/src/external/MuSRFitGUI/MuSRFit.ui +++ b/src/external/MuSRFitGUI/MuSRFit.ui @@ -1465,6 +1465,7 @@ + @@ -1556,6 +1557,9 @@ &Save MSR + + &Save MSRave + Ctrl+S @@ -1829,6 +1833,17 @@ Maual file selection + + + fileChangeDirAction + + + Change dir + + + Change dir + + @@ -1962,6 +1977,12 @@ MuSRFitform UpdeateTable() + + fileChangeDirAction + activated() + MuSRFitform + fileChangeDir() + musrfit_tabs @@ -2003,6 +2024,7 @@ fileNew() fileOpen() fileSave() + fileChangeDir() filePrint() fileExit() editUndo() diff --git a/src/external/MuSRFitGUI/MuSRFit.ui.h b/src/external/MuSRFitGUI/MuSRFit.ui.h index 118cccc6..6a6e0ef8 100755 --- a/src/external/MuSRFitGUI/MuSRFit.ui.h +++ b/src/external/MuSRFitGUI/MuSRFit.ui.h @@ -71,6 +71,17 @@ void Form1::fileSave() } } +void MuSRFitform::fileChangeDir() +{ + my $newdir=Qt::FileDialog::getExistingDirectory( + "", + this, + "get existing directory", + "Choose a directory", + 1); + chdir ("$newdir"); +} + void Form1::filePrint() { @@ -618,3 +629,5 @@ void MuSRFitform::UpdeateTable() { } + +