* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
***************************************************************************/
#include "urlnavigatorbutton.h"
-#include <qcursor.h>
-#include <qfontmetrics.h>
-#include <qpainter.h>
-#include <qtimer.h>
-#include <qtooltip.h>
-//Added by qt3to4:
-#include <QDropEvent>
-#include <QDragLeaveEvent>
-#include <Q3PopupMenu>
-#include <QEvent>
-#include <QDragEnterEvent>
-#include <kglobalsettings.h>
-#include <kiconloader.h>
-#include <kio/jobclasses.h>
-#include <klocale.h>
-#include <kurl.h>
#include <assert.h>
#include "urlnavigator.h"
-#include "dolphinview.h"
-#include "dolphinmainwindow.h"
+
+#include <kio/job.h>
+#include <kio/jobclasses.h>
+#include <kglobalsettings.h>
+#include <kmenu.h>
+
+#include <QPainter>
+#include <QPaintEvent>
+#include <QTimer>
UrlNavigatorButton::UrlNavigatorButton(int index, UrlNavigator* parent) :
UrlButton(parent),
m_index(-1),
+ m_popupDelay(0),
m_listJob(0)
{
setAcceptDrops(true);
connect(this, SIGNAL(clicked()), this, SLOT(updateNavigatorUrl()));
m_popupDelay = new QTimer(this);
+ m_popupDelay->setSingleShot(true);
connect(m_popupDelay, SIGNAL(timeout()), this, SLOT(startListJob()));
connect(this, SIGNAL(pressed()), this, SLOT(startPopupDelay()));
}
}
// dimm the colors if the parent view does not have the focus
- const DolphinView* parentView = urlNavigator()->dolphinView();
- const DolphinMainWindow* dolphin = parentView->mainWindow();
-
- const bool isActive = (dolphin->activeView() == parentView);
+ const bool isActive = urlNavigator()->isActive();
if (!isActive) {
QColor dimmColor(palette().brush(QPalette::Background).color());
foregroundColor = mixColors(foregroundColor, dimmColor);
return;
}
- KUrl::List urls;
- /* KDE4-TODO:
- if (KUrlDrag::decode(event, urls) && !urls.isEmpty()) {
+ const KUrl::List urls = KUrl::List::fromMimeData(event->mimeData());
+ if (!urls.isEmpty()) {
+ event->acceptProposedAction();
+
setDisplayHintEnabled(DraggedHint, true);
QString path(urlNavigator()->url().prettyUrl());
- path = path.section('/', 0, m_index);
+ path = path.section('/', 0, m_index + 2);
- Dolphin::mainWin().dropUrls(urls, KUrl(path));
+ urlNavigator()->dropUrls(urls, KUrl(path));
setDisplayHintEnabled(DraggedHint, false);
update();
- }*/
+ }
}
void UrlNavigatorButton::dragEnterEvent(QDragEnterEvent* event)
{
- /* KDE4-TODO:
- event->accept(KUrlDrag::canDecode(event));
+ if (event->mimeData()->hasUrls()) {
+ setDisplayHintEnabled(DraggedHint, true);
+ event->acceptProposedAction();
- setDisplayHintEnabled(DraggedHint, true);*/
- update();
+ update();
+ }
}
void UrlNavigatorButton::dragLeaveEvent(QDragLeaveEvent* event)
void UrlNavigatorButton::updateNavigatorUrl()
{
+ stopPopupDelay();
+
if (m_index < 0) {
return;
}
- UrlNavigator* navigator = urlNavigator();
- assert(navigator != 0);
- navigator->setUrl(navigator->url(m_index));
+ urlNavigator()->setUrl(urlNavigator()->url(m_index));
}
void UrlNavigatorButton::startPopupDelay()
{
- if (m_popupDelay->isActive() || m_listJob || m_index < 0) {
+ if (m_popupDelay->isActive() || (m_listJob != 0) || (m_index < 0)) {
return;
}
- m_popupDelay->setSingleShot(true);
m_popupDelay->start(300);
}
void UrlNavigatorButton::stopPopupDelay()
{
m_popupDelay->stop();
- if (m_listJob) {
+ if (m_listJob != 0) {
m_listJob->kill();
m_listJob = 0;
}
void UrlNavigatorButton::startListJob()
{
- if (m_listJob) {
+ if (m_listJob != 0) {
return;
}
- KUrl url = urlNavigator()->url(m_index);
- m_listJob = KIO::listDir(url, false, false);
+ const KUrl& url = urlNavigator()->url(m_index);
+ m_listJob = KIO::listDir(url, false, urlNavigator()->showHiddenFiles());
m_subdirs.clear(); // just to be ++safe
connect(m_listJob, SIGNAL(entries(KIO::Job*, const KIO::UDSEntryList &)),
KIO::UDSEntryList::const_iterator it = entries.constBegin();
KIO::UDSEntryList::const_iterator itEnd = entries.constEnd();
+
+ bool showHidden = urlNavigator()->showHiddenFiles();
while (it != itEnd) {
QString name;
- bool isDir = false;
+ //bool isDir = false;
KIO::UDSEntry entry = *it;
/* KDE3 reference:
*/
if (entry.isDir()) {
- m_subdirs.append(entry.stringValue(KIO::UDS_NAME));
+ QString dir = entry.stringValue(KIO::UDS_NAME);
+
+ if (!showHidden || (dir != "." && dir != "..")) {
+ m_subdirs.append(entry.stringValue(KIO::UDS_NAME));
+ }
}
++it;
setDisplayHintEnabled(PopupActiveHint, true);
update(); // ensure the button is drawn highlighted
- Q3PopupMenu* dirsMenu = new Q3PopupMenu(this);
- //setPopup(dirsMenu);
+
+ KMenu* dirsMenu = new KMenu(this);
QStringList::const_iterator it = m_subdirs.constBegin();
QStringList::const_iterator itEnd = m_subdirs.constEnd();
int i = 0;
while (it != itEnd) {
- dirsMenu->insertItem(*it, i);
+ QAction* action = new QAction(*it, this);
+ action->setData(i);
+ dirsMenu->addAction(action);
++it;
++i;
}
- int result = dirsMenu->exec(urlNavigator()->mapToGlobal(geometry().bottomLeft()));
-
- if (result != -1) {
+ const QAction* action = dirsMenu->exec(urlNavigator()->mapToGlobal(geometry().bottomLeft()));
+ if (action != 0) {
+ const int result = action->data().toInt();
KUrl url = urlNavigator()->url(m_index);
url.addPath(m_subdirs[result]);
urlNavigator()->setUrl(url);
m_listJob = 0;
m_subdirs.clear();
delete dirsMenu;
+ dirsMenu = 0;
+
setDisplayHintEnabled(PopupActiveHint, false);
}
projects / dolphin.git / blobdiff