From ecfe244f32df285be1df4bf2c26f18151dbbdcb8 Mon Sep 17 00:00:00 2001 From: Diane Trout Date: Fri, 3 Aug 2007 01:35:01 +0000 Subject: [PATCH] minor updates to mussa setup widget I was trying to get mussa to build against qt 4.3.0 which and this component had some display issues (which I wasn't able to resolve on OS X) these updates remove the trailing blank space that was needed for qt 4.2.2 on windows (at least I think it was that version) and wrapped most of the display strings in the tr() so we could localize mussa if we wanted to. --- qui/mussa_setup_dialog/MussaSetupWidget.cpp | 4 +- qui/mussa_setup_dialog/SequenceSetupFrame.cpp | 2 +- .../SequenceSetupWidget.cpp | 61 ++++++++++--------- 3 files changed, 34 insertions(+), 33 deletions(-) diff --git a/qui/mussa_setup_dialog/MussaSetupWidget.cpp b/qui/mussa_setup_dialog/MussaSetupWidget.cpp index c116a9a..85ad1cb 100644 --- a/qui/mussa_setup_dialog/MussaSetupWidget.cpp +++ b/qui/mussa_setup_dialog/MussaSetupWidget.cpp @@ -70,7 +70,7 @@ MussaSetupWidget::MussaSetupWidget(QWidget *parent) numOfSequencesSpinBox->setWhatsThis("Number of sequences to include in analysis. "); //Sequence setup frame - seqSetupFrame = new SequenceSetupFrame; + seqSetupFrame = new SequenceSetupFrame(this); connect(numOfSequencesSpinBox, SIGNAL(valueChanged(int)), seqSetupFrame, SLOT(changeSequenceCount(int))); @@ -81,7 +81,7 @@ MussaSetupWidget::MussaSetupWidget(QWidget *parent) connect(createPushButton, SIGNAL(pressed()), this, SLOT(mussaCreatePushed())); - // Cancle Button + // Cancel Button connect(cancelPushButton, SIGNAL(pressed()), this, SLOT(mussaCancelPushed())); diff --git a/qui/mussa_setup_dialog/SequenceSetupFrame.cpp b/qui/mussa_setup_dialog/SequenceSetupFrame.cpp index 15c34f1..4e1fb07 100644 --- a/qui/mussa_setup_dialog/SequenceSetupFrame.cpp +++ b/qui/mussa_setup_dialog/SequenceSetupFrame.cpp @@ -108,7 +108,7 @@ void SequenceSetupFrame::setupSequences(int newSeqCount) } } - + updateGeometry(); } std::list SequenceSetupFrame::getSetupInfo() diff --git a/qui/mussa_setup_dialog/SequenceSetupWidget.cpp b/qui/mussa_setup_dialog/SequenceSetupWidget.cpp index 7128c4f..d1464dd 100644 --- a/qui/mussa_setup_dialog/SequenceSetupWidget.cpp +++ b/qui/mussa_setup_dialog/SequenceSetupWidget.cpp @@ -24,73 +24,74 @@ SequenceSetupWidget::SequenceSetupWidget(SequenceSetupFrame *setupFrame_, // we really need the setupFrame, so lets declair that requirement assert(setupFrame != 0); - sequenceNameEdit = new QLineEdit; - sequenceNameEdit->setWhatsThis("Name of input sequence "); - QLabel *sequenceNameLabel = new QLabel(tr("Sequence name:")); + // Name line + sequenceNameEdit = new QLineEdit(this); + sequenceNameEdit->setWhatsThis(tr("Name of input sequence")); + QLabel *sequenceNameLabel = new QLabel(tr("Sequence name:"), this); sequenceNameLabel->setBuddy(sequenceNameEdit); - sequenceNameLabel->setWhatsThis("Name of input sequence "); + sequenceNameLabel->setWhatsThis(tr("Name of input sequence")); - // Sequence row - sequenceLineEdit = new QLineEdit; - sequenceLineEdit->setWhatsThis("File path to input sequence "); + // Sequence file location line + sequenceLineEdit = new QLineEdit(this); + sequenceLineEdit->setWhatsThis(tr("File path to input sequence")); //const IsFileValidator *fileValidator = new IsFileValidator(this); //sequenceLineEdit->setValidator(fileValidator); - QLabel *sequenceLabel = new QLabel("Sequence Filename:"); + QLabel *sequenceLabel = new QLabel("Sequence Filename:", this); sequenceLabel->setBuddy(sequenceLineEdit); - sequenceLabel->setWhatsThis("File path to input sequence "); + sequenceLabel->setWhatsThis(tr("File path to input sequence")); - QPushButton *sequenceButton = new QPushButton("Browse..."); - sequenceButton->setWhatsThis("Browse for input sequence "); + QPushButton *sequenceButton = new QPushButton(tr("Browse..."), this); + sequenceButton->setWhatsThis(tr("Browse for input sequence")); connect(sequenceButton, SIGNAL(clicked()), this, SLOT(promptForFastaFile())); // Annotation row - annotLineEdit = new QLineEdit; - annotLineEdit->setWhatsThis("Annotation file path for above input sequence "); + annotLineEdit = new QLineEdit(this); + annotLineEdit->setWhatsThis(tr("Annotation file path for above input sequence")); //const IsFileValidator *fileValidator2 = new IsFileValidator(this); //annotLineEdit->setValidator(fileValidator2); - QLabel *annotLabel = new QLabel("Annotation Filename:"); + QLabel *annotLabel = new QLabel(tr("Annotation Filename:"), this); annotLabel->setBuddy(annotLineEdit); - annotLabel->setWhatsThis("Annotation file path for above input sequence "); + annotLabel->setWhatsThis(tr("Annotation file path for above input sequence")); - QPushButton *annotButton = new QPushButton("Browse..."); - annotButton->setWhatsThis("Browse for annotation file for above input sequence "); + QPushButton *annotButton = new QPushButton(tr("Browse..."), this); + annotButton->setWhatsThis(tr("Browse for annotation file for above input sequence")); connect(annotButton, SIGNAL(clicked()), this, SLOT(promptForAnnotFile())); // Index row - fastaIndexLineEdit = new QLineEdit; - fastaIndexLineEdit->setWhatsThis("When a FASTA file contains more then one FASTA record, provide a 1 based index (first record is index 1) to select which one to use. "); + fastaIndexLineEdit = new QLineEdit(this); + fastaIndexLineEdit->setWhatsThis(tr("When a FASTA file contains more then one FASTA record, provide a 1 based index (first record is index 1) to select which one to use.")); //fastaIndexLineEdit->setMaximumWidth(100); - QLabel *fastaIndexLabel = new QLabel("Fasta Index:"); + QLabel *fastaIndexLabel = new QLabel(tr("Fasta Index:"), this); fastaIndexLabel->setBuddy(fastaIndexLineEdit); - fastaIndexLabel->setWhatsThis("When a FASTA file contains more then one FASTA record, provide a 1 based index (first record is index 1) to select which one to use. "); + fastaIndexLabel->setWhatsThis(tr("When a FASTA file contains more then one FASTA record, provide a 1 based index (first record is index 1) to select which one to use.")); - seqStartLineEdit = new QLineEdit; - seqStartLineEdit->setWhatsThis("Start base pair in input sequence (0 based: 1st base pair is 0) "); + seqStartLineEdit = new QLineEdit(this); + seqStartLineEdit->setWhatsThis(tr("Start base pair in input sequence (0 based: 1st base pair is 0)")); //seqStartLineEdit->setMinimumWidth(60); //seqStartLineEdit->setMaximumWidth(80); - QLabel *seqStartLabel = new QLabel("Sequence Start:"); - seqStartLabel->setWhatsThis("Start base pair in input sequence (0 based: 1st base pair is 0) "); + QLabel *seqStartLabel = new QLabel(tr("Sequence Start:"), this); + seqStartLabel->setWhatsThis(tr("Start base pair in input sequence (0 based: 1st base pair is 0)")); seqStartLabel->setBuddy(seqStartLineEdit); - seqStopLineEdit = new QLineEdit; - seqStopLineEdit->setWhatsThis("Stop base pair in input sequence (0 based: 1st base pair is 0) 0 means all of remaining sequence. "); + seqStopLineEdit = new QLineEdit(this); + seqStopLineEdit->setWhatsThis(tr("Stop base pair in input sequence (0 based: 1st base pair is 0) 0 means all of remaining sequence.")); //seqStopLineEdit->setMinimumWidth(40); //seqStopLineEdit->setMaximumWidth(60); - QLabel *seqStopLabel = new QLabel("Sequence Stop:"); - seqStopLabel->setWhatsThis("Stop base pair in input sequence (0 based: 1st base pair is 0) 0 means all of remaining sequence. "); + QLabel *seqStopLabel = new QLabel(tr("Sequence Stop:")); + seqStopLabel->setWhatsThis(tr("Stop base pair in input sequence (0 based: 1st base pair is 0) 0 means all of remaining sequence.")); seqStopLabel->setBuddy(seqStopLineEdit); // Layout + QVBoxLayout *mainLayout = new QVBoxLayout; QHBoxLayout *sequenceNameLayout = new QHBoxLayout; QHBoxLayout *sequenceRowLayout = new QHBoxLayout; QHBoxLayout *annotRowLayout = new QHBoxLayout; QHBoxLayout *indexRowLayout = new QHBoxLayout; - QVBoxLayout *mainLayout = new QVBoxLayout; sequenceNameLayout->addWidget(sequenceNameLabel); sequenceNameLayout->addWidget(sequenceNameEdit); -- 2.30.2