[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdebase/runtime/kcontrol
From: Laurent Montel <montel () kde ! org>
Date: 2007-10-16 10:39:01
Message-ID: 1192531141.063033.10578.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 725844 by mlaurent:
Reactivate ioslaveinfo
M +1 -0 CMakeLists.txt
M +6 -6 infocenter/ioslaveinfo/kcmioslaveinfo.cpp
M +1 -3 infocenter/ioslaveinfo/kcmioslaveinfo.h
--- trunk/KDE/kdebase/runtime/kcontrol/CMakeLists.txt #725843:725844
@@ -9,6 +9,7 @@
add_subdirectory( componentchooser )
add_subdirectory( menus )
add_subdirectory( dnssd )
+add_subdirectory(infocenter)
if(NOT WIN32)
add_subdirectory( samba )
endif(NOT WIN32)
--- trunk/KDE/kdebase/runtime/kcontrol/infocenter/ioslaveinfo/kcmioslaveinfo.cpp \
#725843:725844 @@ -66,7 +66,7 @@
m_ioslavesLb=new KListWidget(hbox);
m_ioslavesLb->setMinimumSize(fontMetrics().width("blahfaselwhatever----"),10);
hboxLayout1->addWidget( m_ioslavesLb );
- connect( m_ioslavesLb, SIGNAL( selectionChanged( QListWidgetItem * ) ), SLOT( \
showInfo( QListWidgetItem * ) ) ); + connect( m_ioslavesLb, \
SIGNAL(itemSelectionChanged() ), SLOT( showInfo() ) ); //TODO make something useful \
after 2.1 is released m_info=new KTextBrowser(hbox);
hboxLayout1->setSpacing(KDialog::spacingHint());
@@ -81,11 +81,10 @@
for (QStringList::Iterator it=protocols.begin(); it!=protocols.end(); ++it)
{
QString proto = *it;
- m_ioslavesLb->insertItem( SmallIcon( KProtocolInfo::icon( proto )),
- proto );
+ m_ioslavesLb->addItem( new QListWidgetItem ( SmallIcon( KProtocolInfo::icon( \
proto )), proto, m_ioslavesLb)); };
- m_ioslavesLb->sort();
- m_ioslavesLb->setSelected(0, true);
+ //m_ioslavesLb->sort();
+ //m_ioslavesLb->setSelected(0, true);
setButtons(KCModule::Help);
@@ -144,8 +143,9 @@
m_info->setPlainText(i18n("Some info about protocol %1:/ ...", protocol));
}
-void KCMIOSlaveInfo::showInfo(QListWidgetItem *item)
+void KCMIOSlaveInfo::showInfo()
{
+ QListWidgetItem *item = m_ioslavesLb->currentItem();
if (item==0)
return;
showInfo( item->text() );
--- trunk/KDE/kdebase/runtime/kcontrol/infocenter/ioslaveinfo/kcmioslaveinfo.h \
#725843:725844 @@ -24,8 +24,6 @@
#ifndef kcmioslaveinfo_h_included
#define kcmioslaveinfo_h_included
-#include <Qt3Support/Q3ListBox>
-
//Added by qt3to4:
#include <QByteArray>
@@ -51,7 +49,7 @@
protected Q_SLOTS:
void showInfo(const QString& protocol);
- void showInfo(QListWidgetItem *item);
+ void showInfo();
void slaveHelp( KIO::Job *, const QByteArray &data);
void slotResult( KJob * );
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic