Commit 07632476 authored by Aaron J. Seigo's avatar Aaron J. Seigo
Browse files

good bye ugly clear button, hello cute embedded clear icon

svn path=/trunk/KDE/kdebase/konqueror/; revision=651089
parent 3a245c5b
...@@ -790,7 +790,10 @@ bool KonqComboListBoxPixmap::reuse( const QString& newText ) ...@@ -790,7 +790,10 @@ bool KonqComboListBoxPixmap::reuse( const QString& newText )
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
KonqComboLineEdit::KonqComboLineEdit( QWidget *parent ) KonqComboLineEdit::KonqComboLineEdit( QWidget *parent )
:KLineEdit( parent ) {} :KLineEdit( parent )
{
setClearButtonShown( true );
}
void KonqComboLineEdit::setCompletedItems( const QStringList& items ) void KonqComboLineEdit::setCompletedItems( const QStringList& items )
{ {
......
...@@ -3444,16 +3444,6 @@ void KonqMainWindow::slotCheckComboSelection() ...@@ -3444,16 +3444,6 @@ void KonqMainWindow::slotCheckComboSelection()
m_paCut->setEnabled( hasSelection ); m_paCut->setEnabled( hasSelection );
} }
void KonqMainWindow::slotClearLocationBar( Qt::MouseButtons buttons, Qt::KeyboardModifiers )
{
kDebug(1202) << "slotClearLocationBar" << endl;
slotStop();
m_combo->clearTemporary();
focusLocationBar();
if ( buttons & Qt::MidButton )
m_combo->setURL( QApplication::clipboard()->text( QClipboard::Selection ) );
}
void KonqMainWindow::slotForceSaveMainWindowSettings() void KonqMainWindow::slotForceSaveMainWindowSettings()
{ {
// kDebug(1202)<<"slotForceSaveMainWindowSettings()"<<endl; // kDebug(1202)<<"slotForceSaveMainWindowSettings()"<<endl;
...@@ -3992,15 +3982,6 @@ void KonqMainWindow::initActions() ...@@ -3992,15 +3982,6 @@ void KonqMainWindow::initActions()
m_combo->setWhatsThis( i18n( "Location Bar<p>" m_combo->setWhatsThis( i18n( "Location Bar<p>"
"Enter a web address or search term." ) ); "Enter a web address or search term." ) );
QAction *clearLocation = actionCollection()->addAction("clear_location");
clearLocation->setIcon( KIcon(QApplication::isRightToLeft() ? "clear-left" : "locationbar-erase") );
clearLocation->setText( i18n( "Clear Location Bar" ) );
clearLocation->setShortcut(Qt::CTRL+Qt::Key_L);
connect( clearLocation, SIGNAL( triggered( Qt::MouseButtons, Qt::KeyboardModifiers ) ),
SLOT( slotClearLocationBar( Qt::MouseButtons, Qt::KeyboardModifiers ) ) );
clearLocation->setWhatsThis( i18n( "Clear Location bar<p>"
"Clears the content of the location bar." ) );
// Bookmarks menu // Bookmarks menu
m_pamBookmarks = new KonqBookmarkActionMenu(KonqBookmarkManager::self()->root(), m_pamBookmarks = new KonqBookmarkActionMenu(KonqBookmarkManager::self()->root(),
i18n( "&Bookmarks" ), this); i18n( "&Bookmarks" ), this);
......
...@@ -407,7 +407,6 @@ public Q_SLOTS: ...@@ -407,7 +407,6 @@ public Q_SLOTS:
void slotPartChanged( KonqView *childView, KParts::ReadOnlyPart *oldPart, KParts::ReadOnlyPart *newPart ); void slotPartChanged( KonqView *childView, KParts::ReadOnlyPart *oldPart, KParts::ReadOnlyPart *newPart );
void slotRunFinished(); void slotRunFinished();
void slotClearLocationBar( Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers );
// reimplement from KParts::MainWindow // reimplement from KParts::MainWindow
virtual void slotSetStatusBarText( const QString &text ); virtual void slotSetStatusBarText( const QString &text );
......
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