From 80a9f6c0dea7695f07777bc19244d9d18edce1f6 Mon Sep 17 00:00:00 2001 From: Tobias Doerffel Date: Fri, 8 Oct 2010 13:36:48 +0200 Subject: [PATCH] ResourceBrowser: integrated new ManageResourceLocationsDialog Clicking the "Manage locations" button now opens an instance of the new ManageResourceLocationsDialog. Furthermore renamed ResourceBrowser::manageDirectories() to ResourceBrowser::manageLocations(). --- include/ResourceBrowser.h | 5 ++--- src/gui/ResourceBrowser.cpp | 8 +++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/include/ResourceBrowser.h b/include/ResourceBrowser.h index bebb354d3..de3c61804 100644 --- a/include/ResourceBrowser.h +++ b/include/ResourceBrowser.h @@ -1,7 +1,7 @@ /* * ResourceBrowser.h - header file for ResourceBrowser * - * Copyright (c) 2009 Tobias Doerffel + * Copyright (c) 2009-2010 Tobias Doerffel * * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net * @@ -22,7 +22,6 @@ * */ - #ifndef _RESOURCE_BROWSER_H #define _RESOURCE_BROWSER_H @@ -53,7 +52,7 @@ private slots: void stopPreview(); void triggerDefaultAction( const QModelIndex & _idx ); void updateFilterStatus(); - void manageDirectories(); + void manageLocations(); void currentChanged( const QModelIndex &, const QModelIndex & ); diff --git a/src/gui/ResourceBrowser.cpp b/src/gui/ResourceBrowser.cpp index c53f50a44..66147fb5e 100644 --- a/src/gui/ResourceBrowser.cpp +++ b/src/gui/ResourceBrowser.cpp @@ -1,7 +1,7 @@ /* * ResourceBrowser.cpp - implementation of ResourceBrowser * - * Copyright (c) 2009 Tobias Doerffel + * Copyright (c) 2009-2010 Tobias Doerffel * * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net * @@ -35,6 +35,7 @@ #include "ResourceTreeView.h" #include "engine.h" #include "embed.h" +#include "ManageResourceLocationsDialog.h" #include "MainWindow.h" #include "Piano.h" #include "PianoView.h" @@ -133,7 +134,7 @@ ResourceBrowser::ResourceBrowser( QWidget * _parent ) : QPushButton * manageButton = new QPushButton( tr( "Manage locations" ) ); connect( manageButton, SIGNAL( clicked() ), - this, SLOT( manageDirectories() ) ); + this, SLOT( manageLocations() ) ); QPushButton * pianoButton = new QPushButton( tr( "Show piano" ) ); pianoButton->setCheckable( true ); @@ -357,8 +358,9 @@ void ResourceBrowser::updateFilterStatus() -void ResourceBrowser::manageDirectories() +void ResourceBrowser::manageLocations() { + ManageResourceLocationsDialog().exec(); }