From bc1f437e8ac2eb327eb80d9ecd00098aaf51b2b8 Mon Sep 17 00:00:00 2001 From: turtletooth Date: May 23 2016 07:44:39 +0000 Subject: Added a desktop icon to the file browser (#348) * Added Desktop to file browser dialog * fixed desktop icon not appearing --- diff --git a/toonz/sources/toonz/Resources/desktop.png b/toonz/sources/toonz/Resources/desktop.png new file mode 100644 index 0000000..82373b8 Binary files /dev/null and b/toonz/sources/toonz/Resources/desktop.png differ diff --git a/toonz/sources/toonz/filebrowsermodel.cpp b/toonz/sources/toonz/filebrowsermodel.cpp index 59356b7..d6c6e96 100644 --- a/toonz/sources/toonz/filebrowsermodel.cpp +++ b/toonz/sources/toonz/filebrowsermodel.cpp @@ -53,6 +53,31 @@ TFilePath getMyDocumentsPath() return TFilePath(); #endif } + +//Desktop Path +TFilePath getDesktopPath() +{ +#ifdef _WIN32 + WCHAR szPath[MAX_PATH]; + if (SHGetSpecialFolderPath(NULL, szPath, CSIDL_DESKTOP, 0)) { + return TFilePath(szPath); + } + return TFilePath(); +#elif defined MACOSX + NSArray *foundref = NSSearchPathForDirectoriesInDomains( + NSDesktopDirectory, + NSUserDomainMask, + YES); + if (!foundref) + return TFilePath(); + int c = [foundref count]; + assert(c == 1); + NSString *desktopDirectory = [foundref objectAtIndex : 0]; + return TFilePath((const char *)[desktopDirectory cStringUsingEncoding : NSASCIIStringEncoding]); +#else + return TFilePath(); +#endif +} } //============================================================================= @@ -1188,6 +1213,10 @@ void DvDirModelRootNode::refreshChildren() child->setPixmap(QPixmap(":Resources/my_documents.png")); addChild(child); + child = new DvDirModelSpecialFileFolderNode(this, L"Desktop", getDesktopPath()); + child->setPixmap(QPixmap(":Resources/desktop.png")); + addChild(child); + child = new DvDirModelSpecialFileFolderNode(this, L"Library", ToonzFolder::getLibraryFolder()); child->setPixmap(QPixmap(":Resources/library.png")); addChild(child); diff --git a/toonz/sources/toonz/toonz.qrc b/toonz/sources/toonz/toonz.qrc index 6593591..ad154ce 100644 --- a/toonz/sources/toonz/toonz.qrc +++ b/toonz/sources/toonz/toonz.qrc @@ -68,6 +68,7 @@ Resources/cutter_rollover.svg Resources/paintbrush.svg Resources/paintbrush_rollover.svg + Resources/desktop.png Resources/downTitle.png Resources/edit.svg Resources/edit_rollover.svg