diff options
| -rw-r--r-- | src/kvilib/tal/kvi_tal_tabdialog.cpp | 35 | ||||
| -rw-r--r-- | src/kvilib/tal/kvi_tal_tabdialog.h | 12 | ||||
| -rw-r--r-- | src/modules/about/aboutdialog.cpp | 2 |
3 files changed, 28 insertions, 21 deletions
diff --git a/src/kvilib/tal/kvi_tal_tabdialog.cpp b/src/kvilib/tal/kvi_tal_tabdialog.cpp index cd69ff367..33962bc79 100644 --- a/src/kvilib/tal/kvi_tal_tabdialog.cpp +++ b/src/kvilib/tal/kvi_tal_tabdialog.cpp @@ -25,12 +25,10 @@ #define __KVILIB__ #include "kvi_tal_tabdialog.h" -#include "kvi_tal_hbox.h" #include <QDialog> #include <QTabWidget> -#include <QVBoxLayout> -#include <QHBoxLayout> +#include <QGridLayout> #include <QTabWidget> #include <QPushButton> @@ -40,15 +38,11 @@ KviTalTabDialog::KviTalTabDialog(QWidget * pParent,const char * name,bool bModal setObjectName(name); setModal(bModal); - m_pLayout = new QVBoxLayout(this); + m_pLayout = new QGridLayout(this); setLayout(m_pLayout); m_pTabWidget = new QTabWidget(this); - m_pLayout->addWidget(m_pTabWidget); - - m_pButtons = new KviTalHBox(this); - m_pButtons->setAlignment(Qt::AlignRight); - m_pLayout->addWidget(m_pButtons); + m_pLayout->addWidget(m_pTabWidget,0,0,0,2); } KviTalTabDialog::~KviTalTabDialog() @@ -62,19 +56,28 @@ void KviTalTabDialog::addTab(QWidget * name, const QString & label) void KviTalTabDialog::setOkButton(const QString & text) { - QPushButton * pBtnOk = new QPushButton(text,(QWidget *)m_pButtons); - pBtnOk->setFixedSize(100,30); - connect(pBtnOk,SIGNAL(released()),this,SLOT(accept())); + QPushButton * pBtnOk = new QPushButton(text,this); + m_pLayout->addWidget(pBtnOk,1,1); + connect(pBtnOk,SIGNAL(pressed()),this,SLOT(okPressed())); } void KviTalTabDialog::setCancelButton(const QString & text) { - QPushButton * pBtnCancel = new QPushButton(text,(QWidget *)m_pButtons); - pBtnCancel->setFixedSize(100,30); - connect(pBtnCancel,SIGNAL(released()),this,SLOT(reject())); + QPushButton * pBtnCancel = new QPushButton(text,this); + m_pLayout->addWidget(pBtnCancel,1,2); + connect(pBtnCancel,SIGNAL(pressed()),this,SLOT(cancelPressed())); +} + +void KviTalTabDialog::okPressed() +{ + emit applyButtonPressed(); +} + +void KviTalTabDialog::cancelPressed() +{ + emit cancelButtonPressed(); } #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES #include "kvi_tal_tabdialog.moc" #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES - diff --git a/src/kvilib/tal/kvi_tal_tabdialog.h b/src/kvilib/tal/kvi_tal_tabdialog.h index 828114443..392b377a7 100644 --- a/src/kvilib/tal/kvi_tal_tabdialog.h +++ b/src/kvilib/tal/kvi_tal_tabdialog.h @@ -30,9 +30,8 @@ #include <QDialog> -class QVBoxLayout; +class QGridLayout; class QTabWidget; -class KviTalHBox; class KVILIB_API KviTalTabDialog : public QDialog { @@ -44,10 +43,15 @@ protected: void setOkButton(const QString &); void setCancelButton(const QString &); void addTab(QWidget *,const QString &); +protected slots: + void okPressed(); + void cancelPressed(); private: - QVBoxLayout * m_pLayout; + QGridLayout * m_pLayout; QTabWidget * m_pTabWidget; - KviTalHBox * m_pButtons; +signals: + void applyButtonPressed(); + void cancelButtonPressed(); }; #endif // _KVI_TAL_TABDIALOG_H_ diff --git a/src/modules/about/aboutdialog.cpp b/src/modules/about/aboutdialog.cpp index 2897a7463..69aeaba2d 100644 --- a/src/modules/about/aboutdialog.cpp +++ b/src/modules/about/aboutdialog.cpp @@ -221,7 +221,7 @@ KviAboutDialog::KviAboutDialog() addTab(w,__tr2qs_ctx("License","about")); - //connect(this,SIGNAL(applyButtonPressed()),this,SLOT(closeButtonPressed())); + connect(this,SIGNAL(applyButtonPressed()),this,SLOT(closeButtonPressed())); } KviAboutDialog::~KviAboutDialog() |