Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit 52d88fed authored by Laurent Montel's avatar Laurent Montel 😁 Committed by Pali Rohár

Fix install ui.rc. Port some KVBox

parent 4e81fa1a
......@@ -28,7 +28,7 @@
#include <kmessagebox.h>
#include <kmessagebox_queued.h>
#include <kplugininfo.h>
#include <kvbox.h>
#include <QVBoxLayout>
#include <KDialog>
#include "editaccountwidget.h"
......@@ -53,7 +53,7 @@ public:
QMap<QTreeWidgetItem *, KPluginInfo> protocolItems;
KopeteEditAccountWidget *accountPage;
KVBox *accountPageWidget;
QWidget *accountPageWidget;
QWidget *selectService;
QWidget *finish;
Ui::AddAccountWizardPage1 uiSelectService;
......@@ -82,7 +82,9 @@ AddAccountWizard::AddAccountWizard(QWidget *parent, bool firstRun)
d->selectServiceItem = addPage(d->selectService, d->selectService->windowTitle());
setValid(d->selectServiceItem, false);
d->accountPageWidget = new KVBox(this);
d->accountPageWidget = new QWidget(this);
QVBoxLayout *accountPageWidgetVBoxLayout = new QVBoxLayout(d->accountPageWidget);
accountPageWidgetVBoxLayout->setMargin(0);
addPage(d->accountPageWidget, i18n("Step Two: Account Information"));
// setup the final page
......
......@@ -23,7 +23,7 @@
#include "TokenDropTarget.h"
#include <QAction>
#include <KHBox>
#include <QHBoxLayout>
#include <KLocalizedString>
#include <QActionGroup>
......@@ -105,11 +105,14 @@ void TokenWithLayout::fillMenu(QMenu *menu)
int orgHeight = menu->height();
KHBox *sliderBox = new KHBox(menu);
QWidget *sliderBox = new QWidget(menu);
QHBoxLayout *sliderBoxHBoxLayout = new QHBoxLayout(sliderBox);
sliderBoxHBoxLayout->setMargin(0);
sliderBox->setFixedWidth(menu->width() - 4);
sliderBox->move(sliderBox->pos().x() + 2, orgHeight);
QSlider *slider = new QSlider(Qt::Horizontal, sliderBox);
sliderBoxHBoxLayout->addWidget(slider);
slider->setMaximum(100);
slider->setMinimum(0);
......@@ -137,6 +140,7 @@ void TokenWithLayout::fillMenu(QMenu *menu)
slider->setValue(m_width * 100.0);
QLCDNumber *sizeLabel = new QLCDNumber(3, sliderBox);
sliderBoxHBoxLayout->addWidget(sizeLabel);
sizeLabel->display(m_width * 100.0);
connect(slider, SIGNAL(valueChanged(int)), sizeLabel, SLOT(display(int)));
......
......@@ -21,7 +21,7 @@
#include <QTextEdit>
#include <KLocalizedString>
#include <kvbox.h>
#include <QVBoxLayout>
#include "kopetemetacontact.h"
......@@ -37,11 +37,15 @@ ContactNotesEdit::ContactNotesEdit(Kopete::MetaContact *m, ContactNotesPlugin *p
m_plugin = p;
m_metaContact = m;
KVBox *w = new KVBox(this);
w->setSpacing(KDialog::spacingHint());
QWidget *w = new QWidget(this);
QVBoxLayout *wVBoxLayout = new QVBoxLayout(w);
wVBoxLayout->setMargin(0);
wVBoxLayout->setSpacing(KDialog::spacingHint());
m_label = new QLabel(i18n("Notes about %1:", m->displayName()), w);
wVBoxLayout->addWidget(m_label);
m_label->setObjectName(QStringLiteral("m_label"));
m_linesEdit = new QTextEdit(w);
wVBoxLayout->addWidget(m_linesEdit);
m_linesEdit->setText(p->notes(m));
......
......@@ -32,6 +32,6 @@ install(TARGETS kcm_kopete_privacy DESTINATION ${KDE_INSTALL_PLUGINDIR})
########### install files ###############
install( FILES privacyui.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/kopete)
install( FILES privacyui.rc privacychatui.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/kopete)
install( FILES kopete_privacy.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
install( FILES kopete_privacy_config.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}/kconfiguredialog)
......@@ -35,7 +35,7 @@ JabberGroupChatManager::JabberGroupChatManager ( JabberProtocol *protocol, const
: Kopete::ChatSession ( user, others, protocol )
{
qCDebug(JABBER_PROTOCOL_LOG) << "New message manager for " << user->contactId ();
setComponentName(QStringLiteral("kopete"), i18n("Kopete"));
setComponentName(QStringLiteral("jabber_protocol"), i18n("Kopete"));
mRoomJid = roomJid;
......
......@@ -36,7 +36,7 @@ ICQReadAway::ICQReadAway(ICQContact *c, QWidget *parent, const char* name)
mContact = c;
setCaption(i18n("'%2' Message for %1", c->displayName(), c->onlineStatus().description()));
KVBox *mMainWidget = makeVBoxMainWidget();
QWidget *mMainWidget = makeVBoxMainWidget();
awayMessageBrowser = new KTextBrowser(mMainWidget);
awayMessageBrowser->setObjectName("userInfoView");
......
......@@ -20,12 +20,12 @@
#include <kdebug.h>
#include <kdialog.h>
#include <kvbox.h>
#include <QVBoxLayout>
class ICQAccount;
class ICQContact;
class KTextBrowser;
class KVBox;
class ICQReadAway : public KDialog
{
......@@ -47,7 +47,7 @@ class ICQReadAway : public KDialog
private:
ICQAccount *mAccount;
ICQContact *mContact;
KVBox *mMainWidget;
QWidget *mMainWidget;
KTextBrowser *awayMessageBrowser;
};
#endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment