mirror/lmms
1
0
Fork 0
mirror of https://github.com/LMMS/lmms.git synced 2026-04-02 05:16:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'stable-1.1'

Browse Source 
Conflicts:
	src/gui/FileBrowser.cpp
This commit is contained in:
Vesa
2014-09-09 23:55:39 +03:00
parent c2d7cf787e 5bbd79de0f
commit bf6659fbb1
17 changed files with 538 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/gui/MainWindow.cpp
View File

@@ -48,7 +48,7 @@
#include "PianoView.h"
#include "about_dialog.h"
#include "ControllerRackView.h"
#include "file_browser.h"
#include "FileBrowser.h"
#include "plugin_browser.h"
#include "SideBar.h"
#include "config_mgr.h"
@@ -95,42 +95,50 @@ MainWindow::MainWindow() :
QString wdir = configManager::inst()->workingDir();
sideBar->appendTab( new pluginBrowser( splitter ) );
sideBar->appendTab( new fileBrowser(
sideBar->appendTab( new FileBrowser(
configManager::inst()->userProjectsDir() + "*" +
configManager::inst()->factoryProjectsDir(),
"*.mmp *.mmpz *.xml *.mid *.flp",
tr( "My projects" ),
embed::getIconPixmap( "project_file" ).transformed( QTransform().rotate( 90 ) ),
splitter ) );
sideBar->appendTab( new fileBrowser(
sideBar->appendTab( new FileBrowser(
configManager::inst()->userSamplesDir() + "*" +
configManager::inst()->factorySamplesDir(),
"*", tr( "My samples" ),
embed::getIconPixmap( "sample_file" ).transformed( QTransform().rotate( 90 ) ),
splitter ) );
sideBar->appendTab( new fileBrowser(
sideBar->appendTab( new FileBrowser(
configManager::inst()->userPresetsDir() + "*" +
configManager::inst()->factoryPresetsDir(),
"*.xpf *.cs.xml *.xiz",
tr( "My presets" ),
embed::getIconPixmap( "preset_file" ).transformed( QTransform().rotate( 90 ) ),
splitter ) );
sideBar->appendTab( new fileBrowser( QDir::homePath(), "*",
sideBar->appendTab( new FileBrowser( QDir::homePath(), "*",
tr( "My home" ),
embed::getIconPixmap( "home" ).transformed( QTransform().rotate( 90 ) ),
splitter ) );
QFileInfoList drives = QDir::drives();
QStringList root_paths;
#ifdef LMMS_BUILD_APPLE
root_paths += "/Volumes";
#else
QFileInfoList drives = QDir::drives();
foreach( const QFileInfo & drive, drives )
{
root_paths += drive.absolutePath();
}
sideBar->appendTab( new fileBrowser( root_paths.join( "*" ), "*",
#endif
sideBar->appendTab( new FileBrowser( root_paths.join( "*" ), "*",
#ifdef LMMS_BUILD_WIN32
tr( "My computer" ),
#elif defined(LMMS_BUILD_APPLE)
tr( "Volumes" ),
#else
tr( "Root directory" ),
#endif
embed::getIconPixmap( "computer" ).transformed( QTransform().rotate( 90 ) ),
splitter,
#ifdef LMMS_BUILD_WIN32