kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-19 06:20:53 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Minor improvement

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@3528 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
blacksun
2014-12-03 10:45:16 +00:00
parent 8e6a796ba8
commit 257cc7e91f
2 changed files with 33 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
sources/ui/elementselectorwidget.cpp
View File

@@ -34,8 +34,9 @@ ElementSelectorWidget::ElementSelectorWidget(QList <Element *> elmt_list, QWidge
QWidget(parent), QWidget(parent),
ui(new Ui::ElementSelectorWidget), ui(new Ui::ElementSelectorWidget),
elements_list(elmt_list), elements_list(elmt_list),
selected_element(0), selected_element (nullptr),
showed_element(0) showed_element (nullptr),
m_button_group (nullptr)
{ {
qSort(elements_list.begin(), elements_list.end(), comparPos); qSort(elements_list.begin(), elements_list.end(), comparPos);
ui->setupUi(this); ui->setupUi(this);
@@ -79,6 +80,7 @@ void ElementSelectorWidget::clear() {
content_list.clear(); content_list.clear();
delete sm_; delete sm_;
delete sm_show_; delete sm_show_;
delete m_button_group;
} }
/** /**
@@ -100,11 +102,15 @@ void ElementSelectorWidget::setList(QList<Element *> elmt_list) {
void ElementSelectorWidget::buildInterface() { void ElementSelectorWidget::buildInterface() {
//Setup the signal mapper //Setup the signal mapper
int map_id = 0; //this int is used to map the signal int map_id = 0; //this int is used to map the signal
sm_ = new QSignalMapper(this); sm_ = new QSignalMapper(this);
connect(sm_, SIGNAL(mapped(int)), this, SLOT(setSelectedElement(int))); connect(sm_, SIGNAL(mapped(int)), this, SLOT(setSelectedElement(int)));
sm_show_ = new QSignalMapper(this); sm_show_ = new QSignalMapper(this);
connect(sm_show_, SIGNAL(mapped(int)), this, SLOT(showElementFromList(int))); connect(sm_show_, SIGNAL(mapped(int)), this, SLOT(showElementFromList(int)));
m_button_group = new QButtonGroup(this);
//Build the list //Build the list
foreach (Element *elmt, elements_list) { foreach (Element *elmt, elements_list) {
//label for the button //label for the button
@@ -127,22 +133,29 @@ void ElementSelectorWidget::buildInterface() {
QString title = elmt->diagram()->title(); QString title = elmt->diagram()->title();
if (title.isEmpty()) title = tr("Sans titre"); if (title.isEmpty()) title = tr("Sans titre");
button_text += QString(tr("Folio\240 %1 (%2), position %3.")).arg(elmt->diagram()->folioIndex() + 1) button_text += QString("Folio %1 (%2), position %3.").arg(elmt->diagram()->folioIndex() + 1)
.arg(title) .arg(title)
.arg(elmt->diagram() -> convertPosition(elmt -> scenePos()).toString()); .arg(elmt->diagram() -> convertPosition(elmt -> scenePos()).toString());
//add the button himself //Widget that contain the buttons
QWidget *widget = new QWidget(this); QWidget *widget = new QWidget(this);
QHBoxLayout *hl = new QHBoxLayout(widget); content_list << widget;
hl->setContentsMargins(0,0,0,0);
//Radio button for select element
QRadioButton *rb = new QRadioButton(button_text , widget); QRadioButton *rb = new QRadioButton(button_text , widget);
m_button_group -> addButton(rb);
//Push button to highlight element
QPushButton *pb = new QPushButton(QET::Icons::ZoomDraw,"", widget); QPushButton *pb = new QPushButton(QET::Icons::ZoomDraw,"", widget);
pb -> setToolTip(tr("Voir l'\351l\351ment")); pb -> setToolTip(tr("Voir l'\351l\351ment"));
QHBoxLayout *hl = new QHBoxLayout(widget);
hl -> setContentsMargins(0,0,0,0);
hl -> addWidget(rb); hl -> addWidget(rb);
hl -> addStretch(); hl -> addStretch();
hl -> addWidget(pb); hl -> addWidget(pb);
ui -> scroll_layout_ -> insertWidget(map_id, widget); ui -> scroll_layout_ -> insertWidget(map_id, widget);
content_list << widget;
//Add the string for filter this widget //Add the string for filter this widget
QString filter; QString filter;
foreach(QString str, elmt->elementInformations().keys()){ foreach(QString str, elmt->elementInformations().keys()){

2
sources/ui/elementselectorwidget.h
View File

@@ -21,6 +21,7 @@
#include <QWidget> #include <QWidget>
class Element; class Element;
class QSignalMapper; class QSignalMapper;
class QButtonGroup;
namespace Ui { namespace Ui {
class ElementSelectorWidget; class ElementSelectorWidget;
@@ -64,6 +65,7 @@ class ElementSelectorWidget : public QWidget
Element *selected_element, *showed_element; Element *selected_element, *showed_element;
QList <QWidget *> content_list; QList <QWidget *> content_list;
QStringList string_filter; QStringList string_filter;
QButtonGroup *m_button_group;
}; };
#endif // ELEMENTSELECTORWIDGET_H #endif // ELEMENTSELECTORWIDGET_H