TDE
/
tdebase
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase
0
0
Fork 0
Code Issues Releases Wiki Activity

* Allow Konqueror to compile with new libs-provided networkstatusindicator

Browse Source 
* KDM fixes


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1172005 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 14 years ago
parent 88a160cd94
commit d201c32d27
3 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File

18
kdm/kfrontend/kgreeter.cpp
Unescape View File

@ -84,11 +84,13 @@ class UserListView : public KListView {
addColumn( TQString::null );
setColumnAlignment( 0, AlignVCenter );
setResizeMode( TQListView::LastColumn );
if (themed) {
setBackgroundMode( Qt::NoBackground );
viewport()->setBackgroundMode( Qt::NoBackground );
setFrameStyle( TQFrame::NoFrame );
}
// FIXME: This must be configurable, so disable
// painting of list background for now.
// if (themed) {
// setBackgroundMode( Qt::NoBackground );
// viewport()->setBackgroundMode( Qt::NoBackground );
// setFrameStyle( TQFrame::NoFrame );
// }
}
bool themed;
@ -127,6 +129,10 @@ public:
if (!themed)
return KListView::paintEmptyArea(p, rect );
// FIXME: This must be configurable, so disable
// painting of list background for now.
return KListView::paintEmptyArea(p, rect );
const TQPixmap *pm = paletteBackgroundPixmap();
if (!pm || pm->isNull())
return;
@ -1049,7 +1055,7 @@ KThemedGreeter::pluginSetup()
inherited::pluginSetup();
if (userView && verify->entitiesLocal() && verify->entityPresettable() && userlist_rect) {
userView->setMaximumHeight( userView->sumHeight() );
// userView->setMaximumHeight( userView->sumHeight() );
userlist_rect->setWidget( userView );
} else {
if (userView)

18
kdm/kfrontend/themer/kdmitem.cpp
Unescape View File

@ -283,13 +283,17 @@ KdmItem::paint( TQPainter *p, const TQRect &rect )
return;
if (myWidget || (myLayoutItem && myLayoutItem->widget())) {
// KListView because it's missing a Q_OBJECT
if ( myWidget && myWidget->isA( "KListView" ) ) {
TQPixmap copy( myWidget->size() );
kdDebug() << myWidget->geometry() << " " << area << " " << myWidget->size() << endl;
bitBlt( &copy, TQPoint( 0, 0), p->device(), myWidget->geometry(), Qt::CopyROP );
myWidget->setPaletteBackgroundPixmap( copy );
}
// KListView because it's missing a Q_OBJECT'
// FIXME: This is a nice idea intheory, but in practice it is
// very confusing for the user not to see then empty list box
// delineated from the rest of the greeter.
// Maybe set a darker version of the background instead of an exact copy?
// if ( myWidget && myWidget->isA( "KListView" ) ) {
// TQPixmap copy( myWidget->size() );
// kdDebug() << myWidget->geometry() << " " << area << " " << myWidget->size() << endl;
// bitBlt( &copy, TQPoint( 0, 0), p->device(), myWidget->geometry(), Qt::CopyROP );
// myWidget->setPaletteBackgroundPixmap( copy );
// }
return;
}

4
konqueror/Makefile.am
Unescape View File

@ -48,8 +48,8 @@ noinst_HEADERS = KonqMainWindowIface.h KonqViewIface.h delayedinitializer.h \
konq_misc.h konq_openurlrequest.h konq_profiledlg.h konq_run.h \
konq_view.h konq_viewmgr.h konq_extensionmanager.h version.h
konqueror_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lconnectionmanager
konqueror_la_LIBADD = ../libkonq/libkonq.la libkonqueror_intern.la $(LIBMALLOC) $(LIB_KUTILS) -lconnectionmanager
konqueror_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lconnectionmanager -lnetworkstatus
konqueror_la_LIBADD = ../libkonq/libkonq.la libkonqueror_intern.la $(LIBMALLOC) $(LIB_KUTILS) -lconnectionmanager -lnetworkstatus
# Hmm, this experiment of a static konq failed, don't trust it...
# (but feel free to fix it :)

Write Preview
Loading…
Cancel
Save