[Krusader-commits] SF.net SVN: krusader: [5984] trunk/krusader_kde4

[<vac...@us...>]

Revision: 5984
          http://krusader.svn.sourceforge.net/krusader/?rev=5984&view=rev
Author:   vaclavjuza
Date:     2008-05-12 16:18:11 -0700 (Mon, 12 May 2008)

Log Message:
-----------
Clear location button (In KDE4 it is part of the KLineEdit). Thanks Fathi Bourda for the patch.

Modified Paths:
--------------
    trunk/krusader_kde4/ChangeLog
    trunk/krusader_kde4/krusader/Konfigurator/kglookfeel.cpp
    trunk/krusader_kde4/krusader/Panel/listpanel.cpp
    trunk/krusader_kde4/krusader/Panel/listpanel.h
    trunk/krusader_kde4/krusader/defaults.h

Modified: trunk/krusader_kde4/ChangeLog
===================================================================
--- trunk/krusader_kde4/ChangeLog	2008-05-12 22:46:20 UTC (rev 5983)
+++ trunk/krusader_kde4/ChangeLog	2008-05-12 23:18:11 UTC (rev 5984)
@@ -13,6 +13,9 @@
     FIXED: Konfigurator: Dependency lists are now scrollable
     FIXED: Filter: Don't list comments in user/group chooser
 
+    REMOVED: Clear location button (In KDE4 it is part of the KLineEdit).
+           Thanks Fathi Bourda for the patch.
+
     I18N: Updated Ukrainian translation (thanks to Yuri Chornoivan)
     I18N: Updated French translation (thanks Tourneur Henry-Nicolas)
 

Modified: trunk/krusader_kde4/krusader/Konfigurator/kglookfeel.cpp
===================================================================
--- trunk/krusader_kde4/krusader/Konfigurator/kglookfeel.cpp	2008-05-12 22:46:20 UTC (rev 5983)
+++ trunk/krusader_kde4/krusader/Konfigurator/kglookfeel.cpp	2008-05-12 23:18:11 UTC (rev 5984)
@@ -241,7 +241,6 @@
   KONFIGURATOR_CHECKBOX_PARAM panelToolbarCheckboxes[] = 
     {
   //   cfg_class    cfg_name                default             text                       restart tooltip
-     {"Look&Feel",  "Clear Location Bar Visible",  _ClearLocation,      i18n( "Clear location bar button" ),    true ,  i18n( "Clears the location bar" ) },
      {"Look&Feel",  "Open Button Visible",  _Open,      i18n( "Open button" ),     true ,  i18n( "Opens the directory browser." ) },
      {"Look&Feel",  "Equal Button Visible", _cdOther,   i18n( "Equal button (=)" ),true ,  i18n( "Changes the panel directory to the other panel directory." ) },
      {"Look&Feel",  "Up Button Visible",    _cdUp,      i18n( "Up button (..)" ),  true ,  i18n( "Changes the panel directory to the parent directory." ) },

Modified: trunk/krusader_kde4/krusader/Panel/listpanel.cpp
===================================================================
--- trunk/krusader_kde4/krusader/Panel/listpanel.cpp	2008-05-12 22:46:20 UTC (rev 5983)
+++ trunk/krusader_kde4/krusader/Panel/listpanel.cpp	2008-05-12 23:18:11 UTC (rev 5984)
@@ -193,15 +193,6 @@
    hbox->setContentsMargins( 0, 0, 0, 0 );
    hbox->setSpacing( 0 );
 
-	// clear-origin button
-	bool clearButton = group.readEntry("Clear Location Bar Visible", _ClearLocation);
-	if (clearButton){
-		clearOrigin = new QToolButton(hboxWidget);
-		clearOrigin->setIcon(krLoader->loadIcon("locationbar_erase", KIconLoader::Toolbar, 16));
-		hbox->addWidget( clearOrigin );
-		clearOrigin->setToolTip( i18n( "Clear the location bar" ) );
-	}
-	
 	QuickNavLineEdit *qnle = new QuickNavLineEdit(this);
    origin = new KUrlRequester( qnle, hboxWidget );
    hbox->addWidget( origin );
@@ -219,14 +210,6 @@
    connect( origin, SIGNAL( urlSelected( const KUrl & ) ), func, SLOT( openUrl( const KUrl & ) ) );
    connect( origin, SIGNAL( urlSelected( const KUrl & ) ), this, SLOT( slotFocusOnMe() ) );
    
-	// this is here on purpose, do not move up!
-	if (clearButton) {
-		clearOrigin->setFixedSize( 20, origin->button() ->height() );
-		connect(clearOrigin, SIGNAL(clicked()), origin->lineEdit(), SLOT(clear()));
-		connect(clearOrigin, SIGNAL(clicked()), origin->lineEdit(), SLOT(setFocus()));
-	}
-	//
-   
    cdOtherButton = new QToolButton( hboxWidget );
    cdOtherButton->setFixedSize( 20, origin->button() ->height() );
    cdOtherButton->setText( i18n( "=" ) );

Modified: trunk/krusader_kde4/krusader/Panel/listpanel.h
===================================================================
--- trunk/krusader_kde4/krusader/Panel/listpanel.h	2008-05-12 22:46:20 UTC (rev 5983)
+++ trunk/krusader_kde4/krusader/Panel/listpanel.h	2008-05-12 23:18:11 UTC (rev 5984)
@@ -185,7 +185,6 @@
    QToolButton *cdUpButton;
    QToolButton *cdOtherButton;
 	QToolButton *popupBtn;
-	QToolButton *clearOrigin;
 	PanelPopup *popup;
    KrBookmarkButton *bookmarksButton;
    DirHistoryQueue* dirHistoryQueue;

Modified: trunk/krusader_kde4/krusader/defaults.h
===================================================================
--- trunk/krusader_kde4/krusader/defaults.h	2008-05-12 22:46:20 UTC (rev 5983)
+++ trunk/krusader_kde4/krusader/defaults.h	2008-05-12 23:18:11 UTC (rev 5984)
@@ -95,8 +95,6 @@
 #define _Open               false 
 // syncBrowseButton is turned on
 #define _syncBrowseButton   false 
-// Clear Location Bar Visible
-#define _ClearLocation		true
 // Use the default colors of KDE
 #define _KDEDefaultColors     true 
 // Enable Alternate Background colors


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.