mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2026-02-14 05:19:58 +01:00
Improve the way how an element is updated in the new element panel.
Now Qet only use the new embbeded collection (XmlElementCollection). No need to reload the old element panel for add a new element created by the new element panel Elements are always imported to the embbeded collection of a project git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4468 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
blacksun
53
sources/ui/importelementdialog.cpp
Normal file
53
sources/ui/importelementdialog.cpp
Normal file
@@ -0,0 +1,53 @@
|
||||
/*
|
||||
Copyright 2006-2016 The QElectroTech Team
|
||||
This file is part of QElectroTech.
|
||||
|
||||
QElectroTech is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
QElectroTech is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
#include "importelementdialog.h"
|
||||
#include "ui_importelementdialog.h"
|
||||
|
||||
ImportElementDialog::ImportElementDialog(QWidget *parent) :
|
||||
QDialog(parent),
|
||||
ui(new Ui::ImportElementDialog)
|
||||
{
|
||||
ui->setupUi(this);
|
||||
setUpWidget();
|
||||
}
|
||||
|
||||
ImportElementDialog::~ImportElementDialog()
|
||||
{
|
||||
delete ui;
|
||||
}
|
||||
|
||||
QET::Action ImportElementDialog::action() const
|
||||
{
|
||||
if (ui->m_use_actual_rd->isChecked()) { return QET::Ignore; }
|
||||
else if (ui->m_erase_actual_rb->isChecked()) { return QET::Erase; }
|
||||
else if (ui->m_use_both_rb->isChecked()) { return QET::Rename; }
|
||||
else return QET::Abort;
|
||||
}
|
||||
|
||||
void ImportElementDialog::setUpWidget()
|
||||
{
|
||||
QButtonGroup *button_group = new QButtonGroup(this);
|
||||
button_group->addButton(ui->m_use_actual_rd);
|
||||
button_group->addButton(ui->m_use_drop_rb);
|
||||
QButtonGroup *button_group_drop = new QButtonGroup(this);
|
||||
button_group_drop->addButton(ui->m_erase_actual_rb);
|
||||
button_group_drop->addButton(ui->m_use_both_rb);
|
||||
|
||||
ui->m_use_drop_rb->setChecked(true);
|
||||
ui->m_use_both_rb->setChecked(true);
|
||||
}
|
||||
46
sources/ui/importelementdialog.h
Normal file
46
sources/ui/importelementdialog.h
Normal file
@@ -0,0 +1,46 @@
|
||||
/*
|
||||
Copyright 2006-2016 The QElectroTech Team
|
||||
This file is part of QElectroTech.
|
||||
|
||||
QElectroTech is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
QElectroTech is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
#ifndef IMPORTELEMENTDIALOG_H
|
||||
#define IMPORTELEMENTDIALOG_H
|
||||
|
||||
#include <QDialog>
|
||||
#include "qet.h"
|
||||
|
||||
namespace Ui {
|
||||
class ImportElementDialog;
|
||||
}
|
||||
|
||||
class ImportElementDialog : public QDialog
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit ImportElementDialog(QWidget *parent = 0);
|
||||
~ImportElementDialog();
|
||||
|
||||
QET::Action action() const;
|
||||
|
||||
private:
|
||||
void setUpWidget();
|
||||
void setUpConnection();
|
||||
|
||||
private:
|
||||
Ui::ImportElementDialog *ui;
|
||||
};
|
||||
|
||||
#endif // IMPORTELEMENTDIALOG_H
|
||||
147
sources/ui/importelementdialog.ui
Normal file
147
sources/ui/importelementdialog.ui
Normal file
@@ -0,0 +1,147 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<ui version="4.0">
|
||||
<class>ImportElementDialog</class>
|
||||
<widget class="QDialog" name="ImportElementDialog">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>754</width>
|
||||
<height>176</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
<string>Intégration d'un élément</string>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout">
|
||||
<item>
|
||||
<widget class="QLabel" name="label">
|
||||
<property name="text">
|
||||
<string>L'élément a déjà été intégré dans le projet. Toutefois, la version que vous tentez de poser semble différente. Que souhaitez-vous faire ?</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QRadioButton" name="m_use_actual_rd">
|
||||
<property name="text">
|
||||
<string>Utiliser l'élément déjà integré</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QRadioButton" name="m_use_drop_rb">
|
||||
<property name="text">
|
||||
<string>Intégrer l'élément déposé</string>
|
||||
</property>
|
||||
<property name="checkable">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="checked">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_2">
|
||||
<property name="leftMargin">
|
||||
<number>15</number>
|
||||
</property>
|
||||
<item>
|
||||
<widget class="QRadioButton" name="m_erase_actual_rb">
|
||||
<property name="text">
|
||||
<string>Écraser l'élément déjà intégé</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QRadioButton" name="m_use_both_rb">
|
||||
<property name="text">
|
||||
<string>Faire cohabiter les deux éléments</string>
|
||||
</property>
|
||||
<property name="checked">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</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>
|
||||
<resources/>
|
||||
<connections>
|
||||
<connection>
|
||||
<sender>buttonBox</sender>
|
||||
<signal>accepted()</signal>
|
||||
<receiver>ImportElementDialog</receiver>
|
||||
<slot>accept()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>248</x>
|
||||
<y>254</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>157</x>
|
||||
<y>274</y>
|
||||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
<connection>
|
||||
<sender>buttonBox</sender>
|
||||
<signal>rejected()</signal>
|
||||
<receiver>ImportElementDialog</receiver>
|
||||
<slot>reject()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>316</x>
|
||||
<y>260</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>286</x>
|
||||
<y>274</y>
|
||||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
<connection>
|
||||
<sender>m_use_drop_rb</sender>
|
||||
<signal>toggled(bool)</signal>
|
||||
<receiver>m_erase_actual_rb</receiver>
|
||||
<slot>setEnabled(bool)</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>375</x>
|
||||
<y>162</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>375</x>
|
||||
<y>188</y>
|
||||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
<connection>
|
||||
<sender>m_use_drop_rb</sender>
|
||||
<signal>toggled(bool)</signal>
|
||||
<receiver>m_use_both_rb</receiver>
|
||||
<slot>setEnabled(bool)</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>375</x>
|
||||
<y>162</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>375</x>
|
||||
<y>214</y>
|
||||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
</connections>
|
||||
</ui>
|
||||
Reference in New Issue
Block a user