From b589d3d3fb95c56e052c19d95ee087d32aa03523 Mon Sep 17 00:00:00 2001
From: Olivier Langella <olivier.langella@u-psud.fr>
Date: Thu, 26 Oct 2017 12:03:14 +0200
Subject: [PATCH] xtp starts with push buttons in the main widget
---
src/gui/main.ui | 78 +++++++++++++++++++++++++++++++++++++++++-
src/gui/mainwindow.cpp | 7 +++-
2 files changed, 83 insertions(+), 2 deletions(-)
diff --git a/src/gui/main.ui b/src/gui/main.ui
index 9af840c71..0fd652b61 100644
--- a/src/gui/main.ui
+++ b/src/gui/main.ui
@@ -18,7 +18,35 @@
<normaloff>:/xtpcpp_icon/resources/xtandempipeline_icon.svg</normaloff>:/xtpcpp_icon/resources/xtandempipeline_icon.svg</iconset>
</property>
<widget class="QWidget" name="centralwidget">
- <layout class="QGridLayout" name="gridLayout"/>
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0">
+ <widget class="QWidget" name="default_display_widget" native="true">
+ <layout class="QVBoxLayout" name="verticalLayout_2">
+ <item>
+ <widget class="QPushButton" name="pushButton">
+ <property name="text">
+ <string>run X!Tandem identifications</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="pushButton_2">
+ <property name="text">
+ <string>Load identification results (mzIdentML, pepxml, tandem...)</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="pushButton_3">
+ <property name="text">
+ <string>Load an X!TandemPipeline project</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ </layout>
</widget>
<widget class="QMenuBar" name="menubar">
<property name="geometry">
@@ -329,6 +357,54 @@
</hint>
</hints>
</connection>
+ <connection>
+ <sender>pushButton</sender>
+ <signal>clicked()</signal>
+ <receiver>Main</receiver>
+ <slot>doActionTandemRun()</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>355</x>
+ <y>106</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>805</x>
+ <y>133</y>
+ </hint>
+ </hints>
+ </connection>
+ <connection>
+ <sender>pushButton_2</sender>
+ <signal>clicked()</signal>
+ <receiver>Main</receiver>
+ <slot>loadResults()</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>362</x>
+ <y>192</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>694</x>
+ <y>216</y>
+ </hint>
+ </hints>
+ </connection>
+ <connection>
+ <sender>pushButton_3</sender>
+ <signal>clicked()</signal>
+ <receiver>Main</receiver>
+ <slot>selectXpipFile()</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>364</x>
+ <y>276</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>805</x>
+ <y>299</y>
+ </hint>
+ </hints>
+ </connection>
</connections>
<slots>
<slot>selectXpipFile()</slot>
diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
index 24b029bac..73698b608 100644
--- a/src/gui/mainwindow.cpp
+++ b/src/gui/mainwindow.cpp
@@ -70,7 +70,8 @@ MainWindow::MainWindow(QWidget *parent):
ui->menu_export_files->setDisabled(true);
ui->centralwidget->layout()->addWidget(_project_window);
- _project_window->show();
+ _project_window->hide();
+ ui->default_display_widget->show();
//_protein_list_window = new ProteinListWindow(this);
//QDockWidget *dock = new QDockWidget(tr("Protein List"), this);
//dock->setWidget(_protein_list_window);
@@ -236,6 +237,10 @@ void MainWindow::doProjectReady(ProjectSp project_sp) {
ui->menu_export_files->setDisabled(false);
ui->menu_edit->setDisabled(false);
+
+
+ _project_window->show();
+ ui->default_display_widget->hide();
qDebug() << "MainWindow::doProjectReady end";
}
--
GitLab