diff --git a/basket.tdevelop b/basket.tdevelop index 821cf2e..f7c0e9e 100644 --- a/basket.tdevelop +++ b/basket.tdevelop @@ -33,7 +33,7 @@ /home/seb/Programmation/basket/debug/src/.libs/basket build / - --nofork --use-drkonquy --data-folder ~/.kde/share/apps/basket-debug + --nofork --use-drkonquy --data-folder ~/.trinity/share/apps/basket-debug false true @@ -160,7 +160,7 @@ libtool - -d --nofork --use-drkonquy --data-folder ~/.kde/share/apps/basket-debug + -d --nofork --use-drkonquy --data-folder ~/.trinity/share/apps/basket-debug diff --git a/src/archive.cpp b/src/archive.cpp index 6f57f87..1b9490a 100644 --- a/src/archive.cpp +++ b/src/archive.cpp @@ -436,7 +436,7 @@ void Archive::importTagEmblems(const TQString &extractionFolder) // The icon does not exists on that computer, import it: if (emblem.isNull()) { // Of the emblem path was eg. "/home/seb/emblem.png", it was exported as "tag-emblems/_home_seb_emblem.png". - // So we need to copy that image to "~/.kde/share/apps/basket/tag-emblems/emblem.png": + // So we need to copy that image to "~/.trinity/share/apps/basket/tag-emblems/emblem.png": int slashIndex = emblemName.findRev("/"); TQString emblemFileName = (slashIndex < 0 ? emblemName : emblemName.right(slashIndex - 2)); TQString source = extractionFolder + "tag-emblems/" + emblemName.replace('/', '_'); @@ -554,7 +554,7 @@ void Archive::importBasketIcon(TQDomElement properties, const TQString &extracti dir.mkdir(Global::savesFolder() + "basket-icons/"); FormatImporter copier; // Only used to copy files synchronously // Of the icon path was eg. "/home/seb/icon.png", it was exported as "basket-icons/_home_seb_icon.png". - // So we need to copy that image to "~/.kde/share/apps/basket/basket-icons/icon.png": + // So we need to copy that image to "~/.trinity/share/apps/basket/basket-icons/icon.png": int slashIndex = iconName.findRev("/"); TQString iconFileName = (slashIndex < 0 ? iconName : iconName.right(slashIndex - 2)); TQString source = extractionFolder + "basket-icons/" + iconName.replace('/', '_'); diff --git a/src/backgroundmanager.cpp b/src/backgroundmanager.cpp index 14a2ac2..73e56b2 100644 --- a/src/backgroundmanager.cpp +++ b/src/backgroundmanager.cpp @@ -68,7 +68,7 @@ OpaqueBackgroundEntry::~OpaqueBackgroundEntry() BackgroundManager::BackgroundManager() { /// std::cout << "BackgroundManager: Found the following background images in "; - TQStringList directories = KGlobal::dirs()->resourceDirs("data"); // eg. { "/home/seb/.kde/share/apps/", "/usr/share/apps/" } + TQStringList directories = KGlobal::dirs()->resourceDirs("data"); // eg. { "/home/seb/.trinity/share/apps/", "/usr/share/apps/" } // For each folder: for (TQStringList::Iterator it = directories.begin(); it != directories.end(); ++it) { // For each file in those directories: diff --git a/src/global.h b/src/global.h index 805836b..dcfc93e 100644 --- a/src/global.h +++ b/src/global.h @@ -55,11 +55,11 @@ class Global // Application Folders: static void setCustomSavesFolder(const TQString &folder); - static TQString savesFolder(); /// << @return e.g. "/home/username/.kde/share/apps/basket/". - static TQString basketsFolder(); /// << @return e.g. "/home/username/.kde/share/apps/basket/baskets/". - static TQString backgroundsFolder(); /// << @return e.g. "/home/username/.kde/share/apps/basket/backgrounds/". - static TQString templatesFolder(); /// << @return e.g. "/home/username/.kde/share/apps/basket/templates/". - static TQString tempCutFolder(); /// << @return e.g. "/home/username/.kde/share/apps/basket/temp-cut/". (was ".tmp/") + static TQString savesFolder(); /// << @return e.g. "/home/username/.trinity/share/apps/basket/". + static TQString basketsFolder(); /// << @return e.g. "/home/username/.trinity/share/apps/basket/baskets/". + static TQString backgroundsFolder(); /// << @return e.g. "/home/username/.trinity/share/apps/basket/backgrounds/". + static TQString templatesFolder(); /// << @return e.g. "/home/username/.trinity/share/apps/basket/templates/". + static TQString tempCutFolder(); /// << @return e.g. "/home/username/.trinity/share/apps/basket/temp-cut/". (was ".tmp/") // Various Things: static TQString openNoteIcon(); /// << @return the icon used for the "Open" action on notes.