From 06a55051627220cd5aef24915d12a16ef9deded2 Mon Sep 17 00:00:00 2001 From: blacksun Date: Sun, 25 Aug 2013 21:48:12 +0000 Subject: [PATCH] dialog autonum: when open the dialog the showed autonum is the current diagram git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2462 bfdf4180-ca20-0410-9c96-a3a8aa849046 --- sources/ui/dialogautonum.cpp | 2 +- sources/ui/selectautonumw.cpp | 3 ++- sources/ui/selectautonumw.h | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/sources/ui/dialogautonum.cpp b/sources/ui/dialogautonum.cpp index e843c7293..b6063af48 100644 --- a/sources/ui/dialogautonum.cpp +++ b/sources/ui/dialogautonum.cpp @@ -34,7 +34,7 @@ DialogAutoNum::DialogAutoNum(Diagram *dg, QWidget *parent) : { ui -> setupUi(this); - ui -> configuration_layout -> addWidget (new SelectAutonumW(dg_ -> project() -> diagrams(), ui -> configuration_tab)); + ui -> configuration_layout -> addWidget (new SelectAutonumW(dg_ -> project() -> diagrams(), dg, ui -> configuration_tab)); dgselect_ = new diagramselection( dg_ -> project(), ui -> annotation_tab); ui -> verticalLayout_Selection -> addWidget(dgselect_); diff --git a/sources/ui/selectautonumw.cpp b/sources/ui/selectautonumw.cpp index 7311471f9..58a731cd1 100644 --- a/sources/ui/selectautonumw.cpp +++ b/sources/ui/selectautonumw.cpp @@ -5,7 +5,7 @@ /** * Constructor */ -SelectAutonumW::SelectAutonumW(const QList &diagrams, QWidget *parent) : +SelectAutonumW::SelectAutonumW(const QList &diagrams, Diagram *current_diagram ,QWidget *parent) : QWidget(parent), ui(new Ui::SelectAutonumW), diagram_list(diagrams) @@ -13,6 +13,7 @@ SelectAutonumW::SelectAutonumW(const QList &diagrams, QWidget *paren ui->setupUi(this); initDiagramChooser(); + if (current_diagram) ui -> diagram_chooser -> setCurrentIndex (diagram_list.indexOf(current_diagram)); setCurrentContext(); } diff --git a/sources/ui/selectautonumw.h b/sources/ui/selectautonumw.h index 670546fa1..2a76da461 100644 --- a/sources/ui/selectautonumw.h +++ b/sources/ui/selectautonumw.h @@ -15,7 +15,7 @@ class SelectAutonumW : public QWidget //METHODS public: - explicit SelectAutonumW(const QList &, QWidget *parent = 0); + explicit SelectAutonumW(const QList &, Diagram * = 0, QWidget *parent = 0); ~SelectAutonumW(); private: