diff options
Diffstat (limited to 'konqueror')
| -rw-r--r-- | konqueror/Makefile.am | 4 | ||||
| -rw-r--r-- | konqueror/konq_combo.cc | 12 | ||||
| -rw-r--r-- | konqueror/konq_combo.h | 1 | ||||
| -rw-r--r-- | konqueror/konq_frame.cc | 5 |
4 files changed, 20 insertions, 2 deletions
diff --git a/konqueror/Makefile.am b/konqueror/Makefile.am index 0fd86b2f5..116a7a915 100644 --- a/konqueror/Makefile.am +++ b/konqueror/Makefile.am @@ -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) -konqueror_la_LIBADD = ../libkonq/libkonq.la libkonqueror_intern.la $(LIBMALLOC) $(LIB_KUTILS) +konqueror_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lconnectionmanager +konqueror_la_LIBADD = ../libkonq/libkonq.la libkonqueror_intern.la $(LIBMALLOC) $(LIB_KUTILS) -lconnectionmanager # Hmm, this experiment of a static konq failed, don't trust it... # (but feel free to fix it :) diff --git a/konqueror/konq_combo.cc b/konqueror/konq_combo.cc index 86747ebde..0a73e6c83 100644 --- a/konqueror/konq_combo.cc +++ b/konqueror/konq_combo.cc @@ -128,6 +128,9 @@ KonqCombo::KonqCombo( TQWidget *parent, const char *name ) connect( this, TQT_SIGNAL(activated( const TQString& )), TQT_SLOT(slotActivated( const TQString& )) ); + setHistoryEditorEnabled( true ); + connect( this, TQT_SIGNAL(removed( const TQString&) ), TQT_SLOT(slotRemoved( const TQString& )) ); + if ( !kapp->dcopClient()->isAttached() ) kapp->dcopClient()->attach(); } @@ -507,6 +510,15 @@ void KonqCombo::slotCleared() kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "comboCleared(TQCString)", data); } +void KonqCombo::slotRemoved( const TQString& item ) +{ + TQByteArray data; + TQDataStream s( data, IO_WriteOnly ); + s << item << kapp->dcopClient()->defaultObject(); + kapp->dcopClient()->send( "konqueror*", "KonquerorIface", + "removeFromCombo(TQString,TQCString)", data); +} + void KonqCombo::removeURL( const TQString& url ) { setUpdatesEnabled( false ); diff --git a/konqueror/konq_combo.h b/konqueror/konq_combo.h index dfb2778dc..3650eb9a4 100644 --- a/konqueror/konq_combo.h +++ b/konqueror/konq_combo.h @@ -87,6 +87,7 @@ signals: private slots: void slotCleared(); + void slotRemoved( const TQString& item ); void slotSetIcon( int index ); void slotActivated( const TQString& text ); diff --git a/konqueror/konq_frame.cc b/konqueror/konq_frame.cc index 77310ebbc..149a2f92d 100644 --- a/konqueror/konq_frame.cc +++ b/konqueror/konq_frame.cc @@ -34,6 +34,7 @@ #include <kprogress.h> #include <klocale.h> #include <ksqueezedtextlabel.h> +#include <networkstatusindicator.h> #include "konq_events.h" #include "konq_frame.h" @@ -97,6 +98,10 @@ KonqFrameStatusBar::KonqFrameStatusBar( KonqFrame *_parent, const char *_name ) m_progressBar->hide(); addWidget( m_progressBar, 0, true /*permanent->right align*/ ); + StatusBarNetworkStatusIndicator * indicator = new StatusBarNetworkStatusIndicator( this, "networkstatusindicator" ); + addWidget( indicator, 0, false ); + indicator->init(); + fontChange(TQFont()); installEventFilter( this ); } |