[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: extragear/utils/kpager
From: Pino Toscano <pino () kde ! org>
Date: 2010-12-31 22:04:58
Message-ID: 20101231220458.30615AC8AE () svn ! kde ! org
[Download RAW message or body]
SVN commit 1210515 by pino:
Q3ButtonGroup -> QButtonGroup
M +34 -25 config.cpp
M +3 -3 config.h
--- trunk/extragear/utils/kpager/config.cpp #1210514:1210515
@@ -23,13 +23,13 @@
#include <QCheckBox>
#include <QRadioButton>
-#include <Qt3Support/Q3ButtonGroup>
#include <QWidget>
#include <kvbox.h>
#include <khbox.h>
#include <QLayout>
-//Added by qt3to4:
#include <QVBoxLayout>
+#include <QGroupBox>
+#include <QButtonGroup>
#include <klocale.h>
#include <kconfig.h>
@@ -51,6 +51,10 @@
setModal( true );
showButtonSeparator( true );
+ QGroupBox *grp = 0;
+ QRadioButton *radio = 0;
+ QVBoxLayout *vbox = 0;
+
KVBox *box = new KVBox( this );
m_chkWindowDragging=new QCheckBox(i18n("Enable window dragging"),box);
(void ) new KSeparator( box );
@@ -69,32 +73,37 @@
m_chkShowWindows=new QCheckBox(i18n("Show windows"),lpage);
connect(m_chkShowWindows, SIGNAL(toggled(bool)), this, SLOT(setShowWindows(bool)));
- m_grpWindowDrawMode=new Q3ButtonGroup(i18n("Type of Window"),page);
+ grp = new QGroupBox(i18n("Type of Window"), page);
+ m_grpWindowDrawMode = new QButtonGroup(grp);
m_grpWindowDrawMode->setExclusive(true);
- QVBoxLayout *vbox = new QVBoxLayout(m_grpWindowDrawMode);
- vbox->setMargin(KDialog::marginHint());
- vbox->setSpacing(KDialog::spacingHint());
- vbox->addSpacing(fontMetrics().lineSpacing());
- vbox->addWidget(new QRadioButton(i18n("Plain"),m_grpWindowDrawMode));
- vbox->addWidget(new QRadioButton(i18n("Icon"),m_grpWindowDrawMode));
+ vbox = new QVBoxLayout(grp);
+ radio = new QRadioButton(i18n("Plain"), grp);
+ m_grpWindowDrawMode->addButton(radio, 0);
+ vbox->addWidget(radio);
+ radio = new QRadioButton(i18n("Icon"), grp);
+ m_grpWindowDrawMode->addButton(radio, 1);
+ vbox->addWidget(radio);
+ radio = new QRadioButton(i18n("Pixmap"), grp);
+ m_grpWindowDrawMode->addButton(radio, 2);
+ vbox->addWidget(radio);
- QRadioButton *rbpix = new QRadioButton(i18n("Pixmap"),m_grpWindowDrawMode);
-// rbpix->setEnabled(false);
- vbox->addWidget(rbpix);
+ connect(m_grpWindowDrawMode, SIGNAL(buttonClicked(int)), this, SLOT(setWindowDrawMode(int)));
- connect(m_grpWindowDrawMode, SIGNAL(clicked(int)), this, SLOT(setWindowDrawMode(int)));
-
- m_grpLayoutType=new Q3ButtonGroup(i18n("Layout"),page);
+ grp = new QGroupBox(i18n("Type of Window"), page);
+ m_grpLayoutType = new QButtonGroup(grp);
m_grpLayoutType->setExclusive(true);
- vbox = new QVBoxLayout(m_grpLayoutType);
- vbox->setMargin(KDialog::marginHint());
- vbox->setSpacing(KDialog::spacingHint());
- vbox->addSpacing(fontMetrics().lineSpacing());
- vbox->addWidget(new QRadioButton(i18n("Classical"),m_grpLayoutType));
- vbox->addWidget(new QRadioButton(i18n("Horizontal"),m_grpLayoutType));
- vbox->addWidget(new QRadioButton(i18n("Vertical"),m_grpLayoutType));
+ vbox = new QVBoxLayout(grp);
+ radio = new QRadioButton(i18n("Classical"), grp);
+ m_grpLayoutType->addButton(radio, 0);
+ vbox->addWidget(radio);
+ radio = new QRadioButton(i18n("Horizontal"), grp);
+ m_grpLayoutType->addButton(radio, 1);
+ vbox->addWidget(radio);
+ radio = new QRadioButton(i18n("Vertical"), grp);
+ m_grpLayoutType->addButton(radio, 2);
+ vbox->addWidget(radio);
- connect(m_grpLayoutType, SIGNAL(clicked(int)), this, SLOT(setLayout(int)));
+ connect(m_grpLayoutType, SIGNAL(buttonClicked(int)), this, SLOT(setLayout(int)));
connect(this,SIGNAL(okClicked()),this,SLOT(slotOk()));
loadConfiguration();
setMinimumSize(360, 160);
@@ -141,8 +150,8 @@
m_chkShowNumber->setChecked(m_showNumber);
m_chkShowBackground->setChecked(m_showBackground);
m_chkShowWindows->setChecked(m_showWindows);
- m_grpWindowDrawMode->setButton(m_windowDrawMode);
- m_grpLayoutType->setButton(m_layoutType);
+ m_grpWindowDrawMode->button(m_windowDrawMode)->setChecked(true);
+ m_grpLayoutType->button(m_layoutType)->setChecked(true);
m_chkWindowDragging->setChecked( m_windowDragging );
m_tmpShowName=m_showName;
m_tmpShowNumber=m_showNumber;
--- trunk/extragear/utils/kpager/config.h #1210514:1210515
@@ -24,8 +24,8 @@
#define __KPCONFIG_H
#include <kdialog.h>
-#include <Q3ButtonGroup>
+class QButtonGroup;
class QCheckBox;
class KPagerConfigDialog : public KDialog
@@ -63,8 +63,8 @@
QCheckBox *m_chkShowNumber;
QCheckBox *m_chkShowBackground;
QCheckBox *m_chkShowWindows;
- Q3ButtonGroup *m_grpWindowDrawMode;
- Q3ButtonGroup *m_grpLayoutType;
+ QButtonGroup *m_grpWindowDrawMode;
+ QButtonGroup *m_grpLayoutType;
QCheckBox* m_chkWindowDragging;
bool m_tmpShowName;
bool m_tmpShowNumber;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic