From 62fe897821ff080f57ecb688ea6deb22d7fee1f2 Mon Sep 17 00:00:00 2001 From: Olivier Langella <olivier.langella@u-psud.fr> Date: Fri, 22 Dec 2017 08:48:57 +0100 Subject: [PATCH] cleaning ui file --- .../peptide_detail_view.ui | 89 ++++++++----------- src/gui/peptide_detail_view/peptidewindow.cpp | 12 +-- 2 files changed, 43 insertions(+), 58 deletions(-) diff --git a/src/gui/peptide_detail_view/peptide_detail_view.ui b/src/gui/peptide_detail_view/peptide_detail_view.ui index 14e90e9e7..cb0574de8 100644 --- a/src/gui/peptide_detail_view/peptide_detail_view.ui +++ b/src/gui/peptide_detail_view/peptide_detail_view.ui @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>826</width> - <height>404</height> + <height>430</height> </rect> </property> <property name="windowTitle"> @@ -24,7 +24,7 @@ <item> <widget class="QLabel" name="label_2"> <property name="text"> - <string>sequence</string> + <string>se&quence</string> </property> </widget> </item> @@ -104,7 +104,7 @@ <item> <widget class="QLabel" name="scan_label"> <property name="text"> - <string>TextLabel</string> + <string>TextLa&bel</string> </property> <property name="textInteractionFlags"> <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set> @@ -127,41 +127,42 @@ <item> <layout class="QVBoxLayout" name="verticalLayout_9"> <item> - <widget class="QWidget" name="file_not_found"> - <layout class="QFormLayout" name="file_not_found_layout"> - <item row="0" column="0"> - <widget class="QLabel" name="mz_data_dir_label"> - <property name="text"> - <string>TextLabel</string> - </property> - </widget> - </item> - <item row="0" column="1"> - <widget class="QPushButton" name="select_dir"> - <property name="text"> - <string>set mz data directory</string> - </property> - </widget> - </item> - </layout> - </widget> + <widget class="QWidget" name="file_not_found_widget" native="true"> + <layout class="QFormLayout" name="file_not_found_layout"> + <item row="0" column="0"> + <widget class="QLabel" name="mz_data_dir_label"> + <property name="text"> + <string>TextLabel</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QPushButton" name="select_dir"> + <property name="text"> + <string>set mz data directory</string> + </property> + </widget> + </item> + </layout> + </widget> </item> <item> <layout class="QHBoxLayout" name="horizontalLayout_2"> <item> <layout class="QHBoxLayout" name="horizontalLayout_4"> <item> - <widget class="QSpectrumWidget" name="spectrumWidget" native="true"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - </widget> - </item> - <item> - <layout class="QVBoxLayout" name="verticalLayout_8"/> + <layout class="QVBoxLayout" name="verticalLayout_8"> + <item> + <widget class="QSpectrumWidget" name="spectrumWidget" native="true"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + </widget> + </item> + </layout> </item> </layout> </item> @@ -190,7 +191,7 @@ <item row="1" column="0"> <widget class="QLabel" name="hyperscore_title_label"> <property name="text"> - <string>hyperscore</string> + <string>h&yperscore</string> </property> </widget> </item> @@ -218,7 +219,7 @@ <item row="3" column="0"> <widget class="QLabel" name="z_title_label"> <property name="text"> - <string>charge</string> + <string>cha&rge</string> </property> </widget> </item> @@ -232,7 +233,7 @@ <item row="4" column="0"> <widget class="QLabel" name="mz_title_label"> <property name="text"> - <string>mz</string> + <string>m&z</string> </property> </widget> </item> @@ -340,7 +341,7 @@ <x>0</x> <y>0</y> <width>826</width> - <height>23</height> + <height>25</height> </rect> </property> </widget> @@ -355,22 +356,6 @@ </customwidgets> <resources/> <connections> - <connection> - <sender>select_dir</sender> - <signal>clicked()</signal> - <receiver>PeptideDetailView</receiver> - <slot>chooseDefaultMzDataDir()</slot> - <hints> - <hint type="sourcelabel"> - <x>371</x> - <y>101</y> - </hint> - <hint type="destinationlabel"> - <x>838</x> - <y>384</y> - </hint> - </hints> - </connection> <connection> <sender>pushButton</sender> <signal>clicked()</signal> diff --git a/src/gui/peptide_detail_view/peptidewindow.cpp b/src/gui/peptide_detail_view/peptidewindow.cpp index c500a83d4..ddbd7606d 100644 --- a/src/gui/peptide_detail_view/peptidewindow.cpp +++ b/src/gui/peptide_detail_view/peptidewindow.cpp @@ -90,7 +90,7 @@ PeptideWindow::PeptideWindow(ProjectWindow *parent): _p_precision = Precision::getPpmInstance(precision); } - ui->file_not_found->setVisible(false); + ui->file_not_found_widget->setVisible(false); qRegisterMetaType<pappso::SpectrumSp>("pappso::SpectrumSp"); #if QT_VERSION >= 0x050000 @@ -177,7 +177,7 @@ void PeptideWindow::chooseDefaultMzDataDir() { qDebug() << "PeptideWindow::chooseDefaultMzDataDir begin"; _p_spectrum_overlay->displayLoadingMessage(); - ui->file_not_found->setVisible(false); + ui->file_not_found_widget->setVisible(false); ui->spectrumWidget->setVisible(true); emit loadSpectrumSp(_p_peptide_evidence); ui->statusbar->showMessage(tr("loading spectrum")); @@ -205,7 +205,7 @@ void PeptideWindow::doSpectrumSpReady(SpectrumSp spectrum_sp, QString error, QSt spectrum_copy.setOriginalSpectrumSp(spectrum_sp); ui->spectrumWidget->setQualifiedSpectrum(spectrum_copy); - ui->file_not_found->setVisible(false); + ui->file_not_found_widget->setVisible(false); ui->spectrumWidget->setVisible(true); _spectrum_is_ready = true; } @@ -218,7 +218,7 @@ void PeptideWindow::doSpectrumSpReady(SpectrumSp spectrum_sp, QString error, QSt ui->mz_data_dir_label->setText(path); - ui->file_not_found->setVisible(true); + ui->file_not_found_widget->setVisible(true); ui->spectrumWidget->setVisible(false); _spectrum_is_ready = false; } @@ -233,7 +233,7 @@ void PeptideWindow::doSpectrumSpReady(SpectrumSp spectrum_sp, QString error, QSt ui->mz_data_dir_label->setText(path); - ui->file_not_found->setVisible(true); + ui->file_not_found_widget->setVisible(true); ui->spectrumWidget->setVisible(false); _spectrum_is_ready = false; } @@ -250,7 +250,7 @@ void PeptideWindow::setPeptideEvidence(PeptideEvidence * p_peptide_evidence) { emit loadSpectrumSp(_p_peptide_evidence); _p_spectrum_overlay->displayLoadingMessage(); - ui->file_not_found->setVisible(false); + ui->file_not_found_widget->setVisible(false); ui->spectrumWidget->setVisible(true); ui->statusbar->showMessage(tr("loading spectrum")); -- GitLab