diff --git a/src/view/ASubWindow.py b/src/view/ASubWindow.py
index 45ec51753455db5a931eeb82cf627605122ba7d2..002b6fee42dcccb33df838a2cddab7100e7239c5 100644
--- a/src/view/ASubWindow.py
+++ b/src/view/ASubWindow.py
@@ -30,7 +30,7 @@ class ASubWindow(QDialog):
def fixed_size(self):
width = self.frameGeometry().width()
height = self.frameGeometry().height()
- self.setFixedSize(width, height)
+ # self.setFixedSize(width, height)
def closeEvent(self, event):
if not self.parent is None:
diff --git a/src/view/ui/ConfigureAddSolverDialog.ui b/src/view/ui/ConfigureAddSolverDialog.ui
index 08efab7272a05aaa067c96977a9d99e3558d46ff..7851401352cc43630adf2bf1b1a21efaaaec2466 100644
--- a/src/view/ui/ConfigureAddSolverDialog.ui
+++ b/src/view/ui/ConfigureAddSolverDialog.ui
@@ -13,168 +13,162 @@
<property name="windowTitle">
<string>Dialog</string>
</property>
- <widget class="QWidget" name="">
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>10</y>
- <width>721</width>
- <height>271</height>
- </rect>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout">
- <item>
- <layout class="QGridLayout" name="gridLayout_2">
- <item row="1" column="0">
- <widget class="QLabel" name="label_2">
- <property name="text">
- <string>Name</string>
- </property>
- </widget>
- </item>
- <item row="0" column="0">
- <widget class="QLabel" name="label">
- <property name="text">
- <string>Type</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1" colspan="2">
- <layout class="QHBoxLayout" name="horizontalLayout_5">
- <item>
- <widget class="QComboBox" name="comboBox_solver"/>
- </item>
- </layout>
- </item>
- <item row="2" column="0" colspan="2">
- <widget class="QLabel" name="label_3">
- <property name="text">
- <string>Description</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1" colspan="2">
- <widget class="QLineEdit" name="lineEdit_name"/>
- </item>
- <item row="2" column="2">
- <widget class="QLineEdit" name="lineEdit_description"/>
- </item>
- </layout>
- </item>
- <item>
- <layout class="QGridLayout" name="gridLayout">
- <item row="5" column="0">
- <widget class="QLabel" name="label_5">
- <property name="text">
- <string>Solver</string>
- </property>
- </widget>
- </item>
- <item row="5" column="1">
- <layout class="QHBoxLayout" name="horizontalLayout_2">
- <item>
- <widget class="QLineEdit" name="lineEdit_solver"/>
- </item>
- <item>
- <widget class="QPushButton" name="pushButton_solver">
- <property name="text">
- <string/>
- </property>
- <property name="icon">
- <iconset>
- <normaloff>ressources/open.png</normaloff>ressources/open.png</iconset>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item row="5" column="2">
- <widget class="QLineEdit" name="lineEdit_solver_cmd"/>
- </item>
- <item row="0" column="1">
- <widget class="QLabel" name="label_7">
- <property name="text">
- <string>Path</string>
- </property>
- </widget>
- </item>
- <item row="6" column="0">
- <widget class="QLabel" name="label_6">
- <property name="text">
- <string>Output formater</string>
- </property>
- </widget>
- </item>
- <item row="6" column="2">
- <widget class="QLineEdit" name="lineEdit_output_cmd"/>
- </item>
- <item row="0" column="2">
- <widget class="QLabel" name="label_8">
- <property name="text">
- <string>Command line</string>
- </property>
- </widget>
- </item>
- <item row="2" column="2">
- <widget class="QLineEdit" name="lineEdit_input_cmd"/>
- </item>
- <item row="2" column="0">
- <widget class="QLabel" name="label_4">
- <property name="text">
- <string>Input formater</string>
- </property>
- </widget>
- </item>
- <item row="2" column="1">
- <layout class="QHBoxLayout" name="horizontalLayout">
- <item>
- <widget class="QLineEdit" name="lineEdit_input"/>
- </item>
- <item>
- <widget class="QPushButton" name="pushButton_input">
- <property name="text">
- <string/>
- </property>
- <property name="icon">
- <iconset>
- <normaloff>ressources/open.png</normaloff>ressources/open.png</iconset>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item row="6" column="1">
- <layout class="QHBoxLayout" name="horizontalLayout_3">
- <item>
- <widget class="QLineEdit" name="lineEdit_output"/>
- </item>
- <item>
- <widget class="QPushButton" name="pushButton_output">
- <property name="text">
- <string/>
- </property>
- <property name="icon">
- <iconset>
- <normaloff>ressources/open.png</normaloff>ressources/open.png</iconset>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- </layout>
- </item>
- <item>
- <widget class="QDialogButtonBox" name="buttonBox">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="standardButtons">
- <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
+ <layout class="QGridLayout" name="gridLayout_3">
+ <item row="0" column="0">
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <layout class="QGridLayout" name="gridLayout_2">
+ <item row="1" column="0">
+ <widget class="QLabel" name="label_2">
+ <property name="text">
+ <string>Name</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="0">
+ <widget class="QLabel" name="label">
+ <property name="text">
+ <string>Type</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1" colspan="2">
+ <layout class="QHBoxLayout" name="horizontalLayout_5">
+ <item>
+ <widget class="QComboBox" name="comboBox_solver"/>
+ </item>
+ </layout>
+ </item>
+ <item row="2" column="0" colspan="2">
+ <widget class="QLabel" name="label_3">
+ <property name="text">
+ <string>Description</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1" colspan="2">
+ <widget class="QLineEdit" name="lineEdit_name"/>
+ </item>
+ <item row="2" column="2">
+ <widget class="QLineEdit" name="lineEdit_description"/>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="5" column="0">
+ <widget class="QLabel" name="label_5">
+ <property name="text">
+ <string>Solver</string>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="1">
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <widget class="QLineEdit" name="lineEdit_solver"/>
+ </item>
+ <item>
+ <widget class="QPushButton" name="pushButton_solver">
+ <property name="text">
+ <string/>
+ </property>
+ <property name="icon">
+ <iconset>
+ <normaloff>ressources/open.png</normaloff>ressources/open.png</iconset>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item row="5" column="2">
+ <widget class="QLineEdit" name="lineEdit_solver_cmd"/>
+ </item>
+ <item row="0" column="1">
+ <widget class="QLabel" name="label_7">
+ <property name="text">
+ <string>Path</string>
+ </property>
+ </widget>
+ </item>
+ <item row="6" column="0">
+ <widget class="QLabel" name="label_6">
+ <property name="text">
+ <string>Output formater</string>
+ </property>
+ </widget>
+ </item>
+ <item row="6" column="2">
+ <widget class="QLineEdit" name="lineEdit_output_cmd"/>
+ </item>
+ <item row="0" column="2">
+ <widget class="QLabel" name="label_8">
+ <property name="text">
+ <string>Command line</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="2">
+ <widget class="QLineEdit" name="lineEdit_input_cmd"/>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="label_4">
+ <property name="text">
+ <string>Input formater</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QLineEdit" name="lineEdit_input"/>
+ </item>
+ <item>
+ <widget class="QPushButton" name="pushButton_input">
+ <property name="text">
+ <string/>
+ </property>
+ <property name="icon">
+ <iconset>
+ <normaloff>ressources/open.png</normaloff>ressources/open.png</iconset>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item row="6" column="1">
+ <layout class="QHBoxLayout" name="horizontalLayout_3">
+ <item>
+ <widget class="QLineEdit" name="lineEdit_output"/>
+ </item>
+ <item>
+ <widget class="QPushButton" name="pushButton_output">
+ <property name="text">
+ <string/>
+ </property>
+ <property name="icon">
+ <iconset>
+ <normaloff>ressources/open.png</normaloff>ressources/open.png</iconset>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="QDialogButtonBox" name="buttonBox">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="standardButtons">
+ <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
</widget>
<resources/>
<connections>
diff --git a/src/view/ui/ConfigureDialog.ui b/src/view/ui/ConfigureDialog.ui
index ecaf8c0203082d8e192b69ac85858313a247ae08..cc461673f1ca7efb053ed0c7ec267deaca4391ee 100644
--- a/src/view/ui/ConfigureDialog.ui
+++ b/src/view/ui/ConfigureDialog.ui
@@ -13,308 +13,90 @@
<property name="windowTitle">
<string>Dialog</string>
</property>
- <widget class="QWidget" name="">
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>10</y>
- <width>641</width>
- <height>361</height>
- </rect>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout">
- <item>
- <widget class="QTabWidget" name="tabWidget">
- <property name="currentIndex">
- <number>0</number>
- </property>
- <property name="documentMode">
- <bool>false</bool>
- </property>
- <property name="tabsClosable">
- <bool>false</bool>
- </property>
- <property name="movable">
- <bool>false</bool>
- </property>
- <property name="tabBarAutoHide">
- <bool>false</bool>
- </property>
- <widget class="QWidget" name="tab_solvers">
- <attribute name="title">
- <string>Solvers</string>
- </attribute>
- <widget class="QWidget" name="layoutWidget">
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>10</y>
- <width>611</width>
- <height>271</height>
- </rect>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout_2">
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0">
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <widget class="QTabWidget" name="tabWidget">
+ <property name="currentIndex">
+ <number>0</number>
+ </property>
+ <property name="documentMode">
+ <bool>false</bool>
+ </property>
+ <property name="tabsClosable">
+ <bool>false</bool>
+ </property>
+ <property name="movable">
+ <bool>false</bool>
+ </property>
+ <property name="tabBarAutoHide">
+ <bool>false</bool>
+ </property>
+ <widget class="QWidget" name="tab_solvers">
+ <attribute name="title">
+ <string>Solvers</string>
+ </attribute>
+ <layout class="QGridLayout" name="gridLayout_2">
+ <item row="0" column="0">
+ <layout class="QVBoxLayout" name="verticalLayout_2">
<item>
- <widget class="QPushButton" name="pushButton_solver_add">
- <property name="text">
- <string/>
- </property>
- <property name="icon">
- <iconset>
- <normaloff>ressources/gtk_add.png</normaloff>ressources/gtk_add.png</iconset>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="pushButton_solver_del">
- <property name="text">
- <string/>
- </property>
- <property name="icon">
- <iconset>
- <normaloff>ressources/gtk-remove.png</normaloff>ressources/gtk-remove.png</iconset>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="pushButton_solver_edit">
- <property name="text">
- <string/>
- </property>
- <property name="icon">
- <iconset>
- <normaloff>ressources/edit.png</normaloff>ressources/edit.png</iconset>
- </property>
- </widget>
- </item>
- <item>
- <spacer name="horizontalSpacer">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </item>
- <item>
- <widget class="QTableView" name="tableView_solver">
- <property name="minimumSize">
- <size>
- <width>0</width>
- <height>156</height>
- </size>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </widget>
- <widget class="QWidget" name="tab_mailleur">
- <attribute name="title">
- <string>Mailleur</string>
- </attribute>
- <widget class="QWidget" name="">
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>10</y>
- <width>621</width>
- <height>30</height>
- </rect>
- </property>
- <layout class="QHBoxLayout" name="horizontalLayout_5">
- <item>
- <widget class="QLabel" name="label">
- <property name="text">
- <string>Mailleur path</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLineEdit" name="lineEdit_mailleur"/>
- </item>
- <item>
- <widget class="QPushButton" name="pushButton_mailleur">
- <property name="text">
- <string/>
- </property>
- <property name="icon">
- <iconset>
- <normaloff>ressources/open.png</normaloff>ressources/open.png</iconset>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </widget>
- <widget class="QWidget" name="tab_constant">
- <attribute name="title">
- <string>Constants</string>
- </attribute>
- <widget class="QWidget" name="layoutWidget_2">
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>10</y>
- <width>621</width>
- <height>93</height>
- </rect>
- </property>
- <layout class="QHBoxLayout" name="horizontalLayout">
- <item>
- <layout class="QVBoxLayout" name="verticalLayout_3">
- <item>
- <widget class="QLabel" name="label_2">
- <property name="text">
- <string>Nombre de segment</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="label_3">
- <property name="text">
- <string>Taille max. du listing</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <layout class="QVBoxLayout" name="verticalLayout_4">
- <item>
- <widget class="QLineEdit" name="lineEdit_segment">
- <property name="text">
- <string>1000</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLineEdit" name="lineEdit_max_listing">
- <property name="text">
- <string>500000</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- </layout>
- </widget>
- </widget>
- <widget class="QWidget" name="tab">
- <attribute name="title">
- <string>Backup</string>
- </attribute>
- <widget class="QWidget" name="layoutWidget_3">
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>10</y>
- <width>611</width>
- <height>125</height>
- </rect>
- </property>
- <layout class="QHBoxLayout" name="horizontalLayout_4">
- <item>
- <layout class="QVBoxLayout" name="verticalLayout_7">
- <item>
- <widget class="QLabel" name="label_7">
- <property name="text">
- <string>Sauvegarde automatique</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="label_8">
- <property name="text">
- <string>Chemin</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="label_9">
- <property name="text">
- <string>Frequence</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="label_10">
- <property name="text">
- <string>Max. archives</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <layout class="QVBoxLayout" name="verticalLayout_6">
- <item>
- <widget class="QCheckBox" name="checkBox_backup">
- <property name="text">
- <string>Activé</string>
- </property>
- <property name="tristate">
- <bool>false</bool>
- </property>
- </widget>
- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_3">
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <widget class="QPushButton" name="pushButton_solver_add">
+ <property name="text">
+ <string/>
+ </property>
+ <property name="icon">
+ <iconset>
+ <normaloff>ressources/gtk_add.png</normaloff>ressources/gtk_add.png</iconset>
+ </property>
+ </widget>
+ </item>
<item>
- <widget class="QLineEdit" name="lineEdit_backup_path"/>
+ <widget class="QPushButton" name="pushButton_solver_del">
+ <property name="text">
+ <string/>
+ </property>
+ <property name="icon">
+ <iconset>
+ <normaloff>ressources/gtk-remove.png</normaloff>ressources/gtk-remove.png</iconset>
+ </property>
+ </widget>
</item>
<item>
- <widget class="QPushButton" name="pushButton_backup_path">
+ <widget class="QPushButton" name="pushButton_solver_edit">
<property name="text">
<string/>
</property>
<property name="icon">
<iconset>
- <normaloff>ressources/open.png</normaloff>ressources/open.png</iconset>
+ <normaloff>ressources/edit.png</normaloff>ressources/edit.png</iconset>
</property>
</widget>
</item>
+ <item>
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
</layout>
</item>
<item>
- <widget class="QTimeEdit" name="timeEdit_backup_frequence">
- <property name="minimumTime">
- <time>
- <hour>0</hour>
- <minute>1</minute>
- <second>0</second>
- </time>
- </property>
- <property name="displayFormat">
- <string>HH:mm:ss</string>
- </property>
- <property name="timeSpec">
- <enum>Qt::LocalTime</enum>
- </property>
- <property name="time">
- <time>
- <hour>0</hour>
- <minute>5</minute>
- <second>0</second>
- </time>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QSpinBox" name="spinBox_backup_max">
- <property name="minimum">
- <number>1</number>
- </property>
- <property name="value">
- <number>10</number>
+ <widget class="QTableView" name="tableView_solver">
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>156</height>
+ </size>
</property>
</widget>
</item>
@@ -322,21 +104,227 @@
</item>
</layout>
</widget>
+ <widget class="QWidget" name="tab_mailleur">
+ <attribute name="title">
+ <string>Mailleur</string>
+ </attribute>
+ <widget class="QWidget" name="layoutWidget">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>10</y>
+ <width>621</width>
+ <height>30</height>
+ </rect>
+ </property>
+ <layout class="QHBoxLayout" name="horizontalLayout_5">
+ <item>
+ <widget class="QLabel" name="label">
+ <property name="text">
+ <string>Mailleur path</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLineEdit" name="lineEdit_mailleur"/>
+ </item>
+ <item>
+ <widget class="QPushButton" name="pushButton_mailleur">
+ <property name="text">
+ <string/>
+ </property>
+ <property name="icon">
+ <iconset>
+ <normaloff>ressources/open.png</normaloff>ressources/open.png</iconset>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </widget>
+ <widget class="QWidget" name="tab_constant">
+ <attribute name="title">
+ <string>Constants</string>
+ </attribute>
+ <widget class="QWidget" name="layoutWidget_2">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>10</y>
+ <width>621</width>
+ <height>93</height>
+ </rect>
+ </property>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <layout class="QVBoxLayout" name="verticalLayout_3">
+ <item>
+ <widget class="QLabel" name="label_2">
+ <property name="text">
+ <string>Nombre de segment</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="label_3">
+ <property name="text">
+ <string>Taille max. du listing</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QVBoxLayout" name="verticalLayout_4">
+ <item>
+ <widget class="QLineEdit" name="lineEdit_segment">
+ <property name="text">
+ <string>1000</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLineEdit" name="lineEdit_max_listing">
+ <property name="text">
+ <string>500000</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ </widget>
+ <widget class="QWidget" name="tab">
+ <attribute name="title">
+ <string>Backup</string>
+ </attribute>
+ <widget class="QWidget" name="layoutWidget_3">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>10</y>
+ <width>611</width>
+ <height>125</height>
+ </rect>
+ </property>
+ <layout class="QHBoxLayout" name="horizontalLayout_4">
+ <item>
+ <layout class="QVBoxLayout" name="verticalLayout_7">
+ <item>
+ <widget class="QLabel" name="label_7">
+ <property name="text">
+ <string>Sauvegarde automatique</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="label_8">
+ <property name="text">
+ <string>Chemin</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="label_9">
+ <property name="text">
+ <string>Frequence</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="label_10">
+ <property name="text">
+ <string>Max. archives</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QVBoxLayout" name="verticalLayout_6">
+ <item>
+ <widget class="QCheckBox" name="checkBox_backup">
+ <property name="text">
+ <string>Activé</string>
+ </property>
+ <property name="tristate">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_3">
+ <item>
+ <widget class="QLineEdit" name="lineEdit_backup_path"/>
+ </item>
+ <item>
+ <widget class="QPushButton" name="pushButton_backup_path">
+ <property name="text">
+ <string/>
+ </property>
+ <property name="icon">
+ <iconset>
+ <normaloff>ressources/open.png</normaloff>ressources/open.png</iconset>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="QTimeEdit" name="timeEdit_backup_frequence">
+ <property name="minimumTime">
+ <time>
+ <hour>0</hour>
+ <minute>1</minute>
+ <second>0</second>
+ </time>
+ </property>
+ <property name="displayFormat">
+ <string>HH:mm:ss</string>
+ </property>
+ <property name="timeSpec">
+ <enum>Qt::LocalTime</enum>
+ </property>
+ <property name="time">
+ <time>
+ <hour>0</hour>
+ <minute>5</minute>
+ <second>0</second>
+ </time>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSpinBox" name="spinBox_backup_max">
+ <property name="minimum">
+ <number>1</number>
+ </property>
+ <property name="value">
+ <number>10</number>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ </widget>
+ </widget>
+ </item>
+ <item>
+ <widget class="QDialogButtonBox" name="buttonBox">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="standardButtons">
+ <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+ </property>
</widget>
- </widget>
- </item>
- <item>
- <widget class="QDialogButtonBox" name="buttonBox">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="standardButtons">
- <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
</widget>
<resources/>
<connections>
diff --git a/src/view/ui/Network.ui b/src/view/ui/Network.ui
index e1cb5be80c51dc9f1153df94d31ac7c64e70fbdc..b78a009e8e39c31410a256c0fc9422eff795c8d9 100644
--- a/src/view/ui/Network.ui
+++ b/src/view/ui/Network.ui
@@ -13,190 +13,195 @@
<property name="windowTitle">
<string>Dialog</string>
</property>
- <widget class="QWidget" name="layoutWidget">
- <property name="geometry">
- <rect>
- <x>690</x>
- <y>450</y>
- <width>291</width>
- <height>230</height>
- </rect>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout_4">
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_4">
- <item>
- <widget class="QPushButton" name="pushButton_11">
- <property name="text">
- <string/>
- </property>
- <property name="icon">
- <iconset>
- <normaloff>ressources/gtk-sort-descending.png</normaloff>ressources/gtk-sort-descending.png</iconset>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="pushButton_12">
- <property name="text">
- <string/>
- </property>
- <property name="icon">
- <iconset>
- <normaloff>ressources/go-up2.png</normaloff>ressources/go-up2.png</iconset>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="pushButton_13">
- <property name="text">
- <string/>
- </property>
- <property name="icon">
- <iconset>
- <normaloff>ressources/go-down1.png</normaloff>ressources/go-down1.png</iconset>
- </property>
- </widget>
- </item>
- <item>
- <spacer name="horizontalSpacer_4">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </item>
- <item>
- <widget class="QTableView" name="tableView_3"/>
- </item>
- </layout>
- </widget>
- <widget class="QWidget" name="layoutWidget_2">
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>450</y>
- <width>671</width>
- <height>230</height>
- </rect>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout_5">
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_5">
- <item>
- <widget class="QPushButton" name="pushButton_14">
- <property name="text">
- <string/>
- </property>
- <property name="icon">
- <iconset>
- <normaloff>ressources/gtk-sort-descending.png</normaloff>ressources/gtk-sort-descending.png</iconset>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="pushButton_15">
- <property name="text">
- <string/>
- </property>
- <property name="icon">
- <iconset>
- <normaloff>ressources/go-up2.png</normaloff>ressources/go-up2.png</iconset>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="pushButton_16">
- <property name="text">
- <string/>
- </property>
- <property name="icon">
- <iconset>
- <normaloff>ressources/go-down1.png</normaloff>ressources/go-down1.png</iconset>
- </property>
- </widget>
- </item>
- <item>
- <spacer name="horizontalSpacer_5">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </item>
- <item>
- <widget class="QTableView" name="tableView_4"/>
- </item>
- </layout>
- </widget>
- <widget class="QWidget" name="layoutWidget_3">
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>10</y>
- <width>971</width>
- <height>431</height>
- </rect>
+ <property name="sizeGripEnabled">
+ <bool>false</bool>
+ </property>
+ <layout class="QGridLayout" name="gridLayout">
+ <property name="sizeConstraint">
+ <enum>QLayout::SetDefaultConstraint</enum>
</property>
- <layout class="QVBoxLayout" name="verticalLayout_6">
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_6">
- <item>
- <widget class="QPushButton" name="pushButton_19">
- <property name="text">
- <string/>
- </property>
- <property name="icon">
- <iconset>
- <normaloff>ressources/gtk_add.png</normaloff>ressources/gtk_add.png</iconset>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="pushButton_20">
- <property name="text">
- <string/>
- </property>
- <property name="icon">
- <iconset>
- <normaloff>ressources/gtk-remove.png</normaloff>ressources/gtk-remove.png</iconset>
- </property>
- </widget>
- </item>
- <item>
- <spacer name="horizontalSpacer_6">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </item>
- <item>
- <widget class="QGraphicsView" name="graphicsView_2"/>
- </item>
- </layout>
- </widget>
+ <item row="0" column="0" colspan="2">
+ <layout class="QVBoxLayout" name="verticalLayout_6">
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_6">
+ <item>
+ <widget class="QPushButton" name="pushButton_19">
+ <property name="text">
+ <string/>
+ </property>
+ <property name="icon">
+ <iconset>
+ <normaloff>ressources/gtk_add.png</normaloff>ressources/gtk_add.png</iconset>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="pushButton_20">
+ <property name="text">
+ <string/>
+ </property>
+ <property name="icon">
+ <iconset>
+ <normaloff>ressources/gtk-remove.png</normaloff>ressources/gtk-remove.png</iconset>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_6">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <widget class="QGraphicsView" name="graphicsView_3">
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>400</height>
+ </size>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSlider" name="verticalSlider_2">
+ <property name="value">
+ <number>50</number>
+ </property>
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </item>
+ <item row="1" column="0">
+ <layout class="QVBoxLayout" name="verticalLayout_5">
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_5">
+ <item>
+ <widget class="QPushButton" name="pushButton_14">
+ <property name="text">
+ <string/>
+ </property>
+ <property name="icon">
+ <iconset>
+ <normaloff>ressources/gtk-sort-descending.png</normaloff>ressources/gtk-sort-descending.png</iconset>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="pushButton_15">
+ <property name="text">
+ <string/>
+ </property>
+ <property name="icon">
+ <iconset>
+ <normaloff>ressources/go-up2.png</normaloff>ressources/go-up2.png</iconset>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="pushButton_16">
+ <property name="text">
+ <string/>
+ </property>
+ <property name="icon">
+ <iconset>
+ <normaloff>ressources/go-down1.png</normaloff>ressources/go-down1.png</iconset>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_5">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="QTableView" name="tableView_reachs"/>
+ </item>
+ </layout>
+ </item>
+ <item row="1" column="1">
+ <layout class="QVBoxLayout" name="verticalLayout_4">
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_4">
+ <item>
+ <widget class="QPushButton" name="pushButton_11">
+ <property name="text">
+ <string/>
+ </property>
+ <property name="icon">
+ <iconset>
+ <normaloff>ressources/gtk-sort-descending.png</normaloff>ressources/gtk-sort-descending.png</iconset>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="pushButton_12">
+ <property name="text">
+ <string/>
+ </property>
+ <property name="icon">
+ <iconset>
+ <normaloff>ressources/go-up2.png</normaloff>ressources/go-up2.png</iconset>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="pushButton_13">
+ <property name="text">
+ <string/>
+ </property>
+ <property name="icon">
+ <iconset>
+ <normaloff>ressources/go-down1.png</normaloff>ressources/go-down1.png</iconset>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_4">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="QTableView" name="tableView_nodes"/>
+ </item>
+ </layout>
+ </item>
+ </layout>
</widget>
<resources/>
<connections/>
diff --git a/src/view/ui/NewStudy.ui b/src/view/ui/NewStudy.ui
index f8047cecd8e22b8e4c634d653d97ef19fee64655..1805c10eda84fab293b4e6245ac96cc6ff8c6540 100644
--- a/src/view/ui/NewStudy.ui
+++ b/src/view/ui/NewStudy.ui
@@ -13,67 +13,61 @@
<property name="windowTitle">
<string>Dialog</string>
</property>
- <widget class="QWidget" name="layoutWidget">
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>10</y>
- <width>541</width>
- <height>331</height>
- </rect>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout_3">
- <item>
- <layout class="QVBoxLayout" name="verticalLayout_2">
- <item>
- <layout class="QGridLayout" name="gridLayout">
- <item row="0" column="0">
- <widget class="QLabel" name="label">
- <property name="text">
- <string>Name</string>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="label_2">
- <property name="text">
- <string>Description</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QLineEdit" name="lineEdit_name">
- <property name="text">
- <string>MyNewStudy</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QTextEdit" name="textEdit_description">
- <property name="autoFillBackground">
- <bool>false</bool>
- </property>
- <property name="tabChangesFocus">
- <bool>false</bool>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- </layout>
- </item>
- <item>
- <widget class="QDialogButtonBox" name="buttonBox">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="standardButtons">
- <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
+ <layout class="QGridLayout" name="gridLayout_2">
+ <item row="0" column="0">
+ <layout class="QVBoxLayout" name="verticalLayout_3">
+ <item>
+ <layout class="QVBoxLayout" name="verticalLayout_2">
+ <item>
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0">
+ <widget class="QLabel" name="label">
+ <property name="text">
+ <string>Name</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="label_2">
+ <property name="text">
+ <string>Description</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QLineEdit" name="lineEdit_name">
+ <property name="text">
+ <string>MyNewStudy</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QTextEdit" name="textEdit_description">
+ <property name="autoFillBackground">
+ <bool>false</bool>
+ </property>
+ <property name="tabChangesFocus">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="QDialogButtonBox" name="buttonBox">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="standardButtons">
+ <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
</widget>
<resources/>
<connections>
diff --git a/src/view/ui/about.ui b/src/view/ui/about.ui
index 8447a904346b1bd58949bbd50a57cb48bbc59008..6b4f695782947c63f3a0e29ecc762a93cf61f19e 100644
--- a/src/view/ui/about.ui
+++ b/src/view/ui/about.ui
@@ -13,56 +13,50 @@
<property name="windowTitle">
<string>Form</string>
</property>
- <widget class="QWidget" name="">
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>10</y>
- <width>341</width>
- <height>81</height>
- </rect>
- </property>
- <layout class="QHBoxLayout" name="horizontalLayout">
- <item>
- <widget class="QLabel" name="label">
- <property name="text">
- <string/>
- </property>
- <property name="pixmap">
- <pixmap>ressources/logoCemagref.gif</pixmap>
- </property>
- <property name="scaledContents">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <layout class="QVBoxLayout" name="verticalLayout">
- <item>
- <widget class="QLabel" name="label_2">
- <property name="font">
- <font>
- <pointsize>16</pointsize>
- <weight>75</weight>
- <bold>true</bold>
- </font>
- </property>
- <property name="text">
- <string>PamHyr</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="label_3">
- <property name="text">
- <string>Version en developpement:</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- </layout>
- </widget>
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0">
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QLabel" name="label">
+ <property name="text">
+ <string/>
+ </property>
+ <property name="pixmap">
+ <pixmap>ressources/logoCemagref.gif</pixmap>
+ </property>
+ <property name="scaledContents">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <widget class="QLabel" name="label_2">
+ <property name="font">
+ <font>
+ <pointsize>16</pointsize>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
+ </property>
+ <property name="text">
+ <string>PamHyr</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="label_3">
+ <property name="text">
+ <string>Version en developpement:</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </item>
+ </layout>
</widget>
<resources/>
<connections/>