[rkward-cvs] SF.net SVN: rkward: [2224] branches/KDE4_port/rkward/plugin
tfry at users.sourceforge.net
tfry at users.sourceforge.net
Wed Nov 14 23:51:13 UTC 2007
Revision: 2224
http://rkward.svn.sourceforge.net/rkward/?rev=2224&view=rev
Author: tfry
Date: 2007-11-14 15:51:13 -0800 (Wed, 14 Nov 2007)
Log Message:
-----------
Continuing to remove Qt3 support code
Modified Paths:
--------------
branches/KDE4_port/rkward/plugin/rkcheckbox.cpp
branches/KDE4_port/rkward/plugin/rkinput.cpp
branches/KDE4_port/rkward/plugin/rkinput.h
branches/KDE4_port/rkward/plugin/rkpluginbrowser.cpp
branches/KDE4_port/rkward/plugin/rkpluginsaveobject.cpp
branches/KDE4_port/rkward/plugin/rkradio.cpp
branches/KDE4_port/rkward/plugin/rkradio.h
branches/KDE4_port/rkward/plugin/rktext.cpp
Modified: branches/KDE4_port/rkward/plugin/rkcheckbox.cpp
===================================================================
--- branches/KDE4_port/rkward/plugin/rkcheckbox.cpp 2007-11-14 22:29:12 UTC (rev 2223)
+++ branches/KDE4_port/rkward/plugin/rkcheckbox.cpp 2007-11-14 23:51:13 UTC (rev 2224)
@@ -16,10 +16,8 @@
***************************************************************************/
#include "rkcheckbox.h"
-#include <qlayout.h>
#include <qcheckbox.h>
-//Added by qt3to4:
-#include <Q3VBoxLayout>
+#include <QVBoxLayout>
#include "../rkglobals.h"
#include "../misc/xmlhelper.h"
@@ -36,7 +34,8 @@
connect (state, SIGNAL (valueChanged (RKComponentPropertyBase *)), this, SLOT (changedState (RKComponentPropertyBase *)));
// create checkbox
- Q3VBoxLayout *vbox = new Q3VBoxLayout (this, RKGlobals::spacingHint ());
+ QVBoxLayout *vbox = new QVBoxLayout (this);
+ vbox->setContentsMargins (0, 0, 0, 0);
checkbox = new QCheckBox (xml->getStringAttribute (element, "label", QString::null, DL_WARNING), this);
vbox->addWidget (checkbox);
checkbox->setChecked (xml->getBoolAttribute (element, "checked", false, DL_INFO));
Modified: branches/KDE4_port/rkward/plugin/rkinput.cpp
===================================================================
--- branches/KDE4_port/rkward/plugin/rkinput.cpp 2007-11-14 22:29:12 UTC (rev 2223)
+++ branches/KDE4_port/rkward/plugin/rkinput.cpp 2007-11-14 23:51:13 UTC (rev 2224)
@@ -17,12 +17,10 @@
#include "rkinput.h"
-#include <qlayout.h>
-#include <q3textedit.h>
+#include <QTextEdit>
#include <qlineedit.h>
#include <qlabel.h>
-//Added by qt3to4:
-#include <Q3VBoxLayout>
+#include <QVBoxLayout>
#include <klocale.h>
@@ -47,15 +45,17 @@
connect (requirednessProperty (), SIGNAL (valueChanged (RKComponentPropertyBase*)), this, SLOT (requirednessChanged (RKComponentPropertyBase*)));
// do all the layouting
- Q3VBoxLayout *vbox = new Q3VBoxLayout (this, RKGlobals::spacingHint ());
+ QVBoxLayout *vbox = new QVBoxLayout (this);
+ vbox->setContentsMargins (0, 0, 0, 0);
QLabel *label = new QLabel (xml->getStringAttribute (element, "label", i18n ("Enter text"), DL_INFO), this);
vbox->addWidget (label);
int size = xml->getMultiChoiceAttribute (element, "size", "small;medium;large", 1, DL_INFO);
if (size == 2) {
- textedit = new Q3TextEdit (this);
- int lheight = textedit->fontMetrics ().lineSpacing ();
- int margin = textedit->height () - textedit->visibleHeight () + textedit->fontMetrics ().descent () + 2;
+ textedit = new QTextEdit (this);
+ QFontMetrics fm = QFontMetrics (textedit->currentFont ());
+ int lheight = fm.lineSpacing ();
+ int margin = fm.descent () + 2;
textedit->setMinimumSize (250, lheight * 4 + margin);
vbox->addWidget (textedit);
Modified: branches/KDE4_port/rkward/plugin/rkinput.h
===================================================================
--- branches/KDE4_port/rkward/plugin/rkinput.h 2007-11-14 22:29:12 UTC (rev 2223)
+++ branches/KDE4_port/rkward/plugin/rkinput.h 2007-11-14 23:51:13 UTC (rev 2224)
@@ -22,14 +22,12 @@
#include "rkcomponentproperties.h"
-class Q3TextEdit;
+class QTextEdit;
class QLineEdit;
class QDomElement;
/** A component to enter plain text
-TODO: Use separate internal widgets for single line and multi line input
-
@author Adrien d'Hardemare
*/
class RKInput : public RKComponent {
@@ -53,7 +51,7 @@
private:
void updateColor ();
bool updating;
- Q3TextEdit *textedit;
+ QTextEdit *textedit;
QLineEdit *lineedit;
};
Modified: branches/KDE4_port/rkward/plugin/rkpluginbrowser.cpp
===================================================================
--- branches/KDE4_port/rkward/plugin/rkpluginbrowser.cpp 2007-11-14 22:29:12 UTC (rev 2223)
+++ branches/KDE4_port/rkward/plugin/rkpluginbrowser.cpp 2007-11-14 23:51:13 UTC (rev 2224)
@@ -17,9 +17,7 @@
#include "rkpluginbrowser.h"
-#include <qlayout.h>
-//Added by qt3to4:
-#include <Q3VBoxLayout>
+#include <QVBoxLayout>
#include <klocale.h>
@@ -41,7 +39,8 @@
setRequired (xml->getBoolAttribute (element, "required", true, DL_INFO));
connect (requirednessProperty (), SIGNAL (valueChanged(RKComponentPropertyBase*)), this, SLOT (requirednessChanged(RKComponentPropertyBase*)));
- Q3VBoxLayout *vbox = new Q3VBoxLayout (this, RKGlobals::spacingHint ());
+ QVBoxLayout *vbox = new QVBoxLayout (this);
+ vbox->setContentsMargins (0, 0, 0, 0);
int intmode = xml->getMultiChoiceAttribute (element, "type", "file;dir;savefile", 0, DL_INFO);
GetFileNameWidget::FileType mode;
Modified: branches/KDE4_port/rkward/plugin/rkpluginsaveobject.cpp
===================================================================
--- branches/KDE4_port/rkward/plugin/rkpluginsaveobject.cpp 2007-11-14 22:29:12 UTC (rev 2223)
+++ branches/KDE4_port/rkward/plugin/rkpluginsaveobject.cpp 2007-11-14 23:51:13 UTC (rev 2224)
@@ -17,9 +17,7 @@
#include "rkpluginsaveobject.h"
-#include <qlayout.h>
-//Added by qt3to4:
-#include <Q3VBoxLayout>
+#include <QVBoxLayout>
#include <klocale.h>
@@ -38,7 +36,8 @@
addChild ("selection", selection = new RKComponentPropertyBase (this, xml->getBoolAttribute (element, "required", true, DL_INFO)));
connect (selection, SIGNAL (valueChanged (RKComponentPropertyBase *)), this, SLOT (selectionChanged (RKComponentPropertyBase *)));
- Q3VBoxLayout *vbox = new Q3VBoxLayout (this, RKGlobals::spacingHint ());
+ QVBoxLayout *vbox = new QVBoxLayout (this);
+ vbox->setContentsMargins (0, 0, 0, 0);
selector = new RKSaveObjectChooser (this, xml->getStringAttribute (element, "initial", i18n ("my.data"), DL_INFO), xml->getStringAttribute (element, "label", i18n ("Save to:"), DL_INFO));
connect (selector, SIGNAL (changed ()), SLOT (selectionChanged ()));
Modified: branches/KDE4_port/rkward/plugin/rkradio.cpp
===================================================================
--- branches/KDE4_port/rkward/plugin/rkradio.cpp 2007-11-14 22:29:12 UTC (rev 2223)
+++ branches/KDE4_port/rkward/plugin/rkradio.cpp 2007-11-14 23:51:13 UTC (rev 2224)
@@ -19,11 +19,10 @@
#include <qdom.h>
#include <qlabel.h>
-#include <qlayout.h>
-#include <Q3VButtonGroup>
+#include <QButtonGroup>
+#include <QGroupBox>
#include <qradiobutton.h>
-//Added by qt3to4:
-#include <Q3VBoxLayout>
+#include <QVBoxLayout>
#include <klocale.h>
@@ -38,20 +37,18 @@
XMLHelper *xml = XMLHelper::getStaticHelper ();
// create layout
- Q3VBoxLayout *vbox = new Q3VBoxLayout (this, RKGlobals::spacingHint ());
+ QVBoxLayout *vbox = new QVBoxLayout (this);
+ vbox->setContentsMargins (0, 0, 0, 0);
// create ButtonGroup
- group = new Q3VButtonGroup (xml->getStringAttribute (element, "label", i18n ("Select one:"), DL_INFO), this);
+ group = new QButtonGroup (this);
+ group_box = new QGroupBox (xml->getStringAttribute (element, "label", i18n ("Select one:"), DL_INFO), this);
+ new QVBoxLayout (group_box);
- // adjust internal layout for the buttons in the ButtonGroup
- RK_ASSERT (group->layout ());
- group->layout()->setSpacing (RKGlobals::spacingHint ());
- group->layout()->setMargin (RKGlobals::marginHint ());
-
addOptionsAndInit (element);
- vbox->addWidget (group);
- connect (group, SIGNAL (clicked (int)), this, SLOT (itemSelected (int)));
+ vbox->addWidget (group_box);
+ connect (group, SIGNAL (buttonClicked (int)), this, SLOT (itemSelected (int)));
}
RKRadio::~RKRadio(){
@@ -61,20 +58,22 @@
void RKRadio::setItemInGUI (int id) {
RK_TRACE (PLUGIN);
- group->setButton (id);
+ QAbstractButton *button = group->button (id);
+ if (button) button->setChecked (true);
}
void RKRadio::addOptionToGUI (const QString &label, int id) {
RK_TRACE (PLUGIN);
- QRadioButton *button = new QRadioButton (label, group);
- group->insert (button, id);
+ QRadioButton *button = new QRadioButton (label, group_box);
+ group->addButton (button, id);
+ group_box->layout ()->addWidget (button);
}
void RKRadio::setItemEnabledInGUI (int id, bool enabled) {
RK_TRACE (PLUGIN);
- QAbstractButton *button = group->find (id);
+ QAbstractButton *button = group->button (id);
RK_ASSERT (button);
button->setEnabled (enabled);
}
Modified: branches/KDE4_port/rkward/plugin/rkradio.h
===================================================================
--- branches/KDE4_port/rkward/plugin/rkradio.h 2007-11-14 22:29:12 UTC (rev 2223)
+++ branches/KDE4_port/rkward/plugin/rkradio.h 2007-11-14 23:51:13 UTC (rev 2224)
@@ -2,7 +2,7 @@
rkradio.h - description
-------------------
begin : Thu Nov 7 2002
- copyright : (C) 2002, 2006 by Thomas Friedrichsmeier
+ copyright : (C) 2002, 2006, 2007 by Thomas Friedrichsmeier
email : tfry at users.sourceforge.net
***************************************************************************/
@@ -20,7 +20,8 @@
#include "rkabstractoptionselector.h"
-class Q3ButtonGroup;
+class QButtonGroup;
+class QGroupBox;
/** This RKPluginWidget provides a group of radio-buttons for use in plugins.
@author Thomas Friedrichsmeier
@@ -36,7 +37,8 @@
void addOptionToGUI (const QString &label, int id);
void setItemEnabledInGUI (int id, bool enabled);
private:
- Q3ButtonGroup *group;
+ QButtonGroup* group;
+ QGroupBox* group_box;
};
#endif
Modified: branches/KDE4_port/rkward/plugin/rktext.cpp
===================================================================
--- branches/KDE4_port/rkward/plugin/rktext.cpp 2007-11-14 22:29:12 UTC (rev 2223)
+++ branches/KDE4_port/rkward/plugin/rktext.cpp 2007-11-14 23:51:13 UTC (rev 2224)
@@ -19,11 +19,9 @@
#include <qstring.h>
#include <qstringlist.h>
-#include <qlayout.h>
#include <qlabel.h>
#include <qdom.h>
-//Added by qt3to4:
-#include <Q3VBoxLayout>
+#include <QVBoxLayout>
#include "../rkglobals.h"
#include "../misc/xmlhelper.h"
@@ -36,7 +34,8 @@
XMLHelper *xml = XMLHelper::getStaticHelper ();
// create layout and label
- Q3VBoxLayout *vbox = new Q3VBoxLayout (this, RKGlobals::spacingHint ());
+ QVBoxLayout *vbox = new QVBoxLayout (this);
+ vbox->setContentsMargins (0, 0, 0, 0);
label = new QLabel (QString (), this);
label->setWordWrap (true);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the rkward-tracker
mailing list