From 6e7bfa8a063a798efd4ea0eaa750885be892e224 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mathias=20Panzenb=C3=B6ck?= Date: Sun, 31 Dec 2017 18:35:08 +0100 Subject: [PATCH] group initialization code a bit more nicely --- src/layout_edit.cpp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/layout_edit.cpp b/src/layout_edit.cpp index 7fe10dd..af6ba2f 100644 --- a/src/layout_edit.cpp +++ b/src/layout_edit.cpp @@ -32,8 +32,6 @@ LayoutEdit::LayoutEdit( LayoutManager* l ) cmbLayouts = new QComboBox(frame); connect(cmbLayouts, SIGNAL(activated(int)), this, SLOT(load(int))); - QHBoxLayout *layoutLayout = new QHBoxLayout(); - //most of these buttons can link directly into slots in the LayoutManager btnAdd = new QPushButton(frame); btnAdd->setIcon(QIcon::fromTheme("list-add")); @@ -58,6 +56,7 @@ LayoutEdit::LayoutEdit( LayoutManager* l ) btnRename->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); connect(btnRename, SIGNAL(clicked()), lm, SLOT(rename())); + QHBoxLayout *layoutLayout = new QHBoxLayout(); layoutLayout->addWidget(cmbLayouts); layoutLayout->addWidget(btnAdd); layoutLayout->addWidget(btnRem); @@ -118,18 +117,22 @@ LayoutEdit::LayoutEdit( LayoutManager* l ) updateLayoutList(); //add the buttons at the bottom. + QPushButton* close = new QPushButton(QIcon::fromTheme("window-close"), tr("&Close Dialog"), this ); + connect(close, SIGNAL(clicked()), this, SLOT(close())); + + QPushButton* quit = new QPushButton(QIcon::fromTheme("application-exit"), tr("&Quit"), this ); + connect( quit, SIGNAL( clicked() ), qApp, SLOT(quit())); + QHBoxLayout* h = new QHBoxLayout(); h->setMargin(0); h->setSpacing(5); - QPushButton* close = new QPushButton(QIcon::fromTheme("window-close"), tr("&Close Dialog"), this ); - connect(close, SIGNAL(clicked()), this, SLOT(close())); h->addWidget(close); - QPushButton* quit = new QPushButton(QIcon::fromTheme("application-exit"), tr("&Quit"), this ); - connect( quit, SIGNAL( clicked() ), qApp, SLOT(quit())); h->addWidget(quit); mainLayout->addLayout(h); + connect(qApp, SIGNAL(focusChanged ( QWidget * , QWidget * ) ), this, SLOT(appFocusChanged(QWidget *, QWidget *))); + this->show(); }