diff --git a/inc/util.h b/inc/util.h index 48b14bc..938429a 100644 --- a/inc/util.h +++ b/inc/util.h @@ -37,5 +37,7 @@ namespace util std::string getInfoString(data::user& u, data::titledata& d); std::string getStringInput(const std::string& def, const std::string& head, size_t maxLength, unsigned dictCnt, const std::string dictWords[]); + + std::string generateAbbrev(data::titledata& dat); } #endif // UTIL_H diff --git a/src/ui/clsui.cpp b/src/ui/clsui.cpp index 2691a7f..b4ab38b 100644 --- a/src/ui/clsui.cpp +++ b/src/ui/clsui.cpp @@ -144,7 +144,15 @@ namespace ui folder = data::curUser.getUsernameSafe() + " - " + util::getDateTime(util::DATE_FMT_HOYSTE); else { - folder = util::getStringInput("", "New Folder", 256, 0, NULL); + const std::string dict[] = + { + util::getDateTime(util::DATE_FMT_YMD).c_str(), + util::getDateTime(util::DATE_FMT_YDM).c_str(), + util::getDateTime(util::DATE_FMT_HOYSTE).c_str(), + data::curUser.getUsernameSafe().c_str(), + util::generateAbbrev(data::curData) + }; + folder = util::getStringInput("", "New Folder", 64, 5, dict); } if(!folder.empty()) { diff --git a/src/ui/fldrsel.cpp b/src/ui/fldrsel.cpp index 50d8929..f377391 100644 --- a/src/ui/fldrsel.cpp +++ b/src/ui/fldrsel.cpp @@ -62,7 +62,7 @@ namespace ui util::getDateTime(util::DATE_FMT_YDM).c_str(), util::getDateTime(util::DATE_FMT_HOYSTE).c_str(), data::curUser.getUsernameSafe().c_str(), - data::curData.getTitleSafe(), + util::generateAbbrev(data::curData) }; folder = util::getStringInput("", "Enter a folder name", 64, 5, dict); } diff --git a/src/util.cpp b/src/util.cpp index cc8f710..2327db4 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -232,4 +232,24 @@ namespace util return std::string(out); } + + std::string generateAbbrev(data::titledata& dat) + { + size_t titleLength = dat.getTitle().length(); + + char temp[titleLength + 1]; + memset(temp, 0, titleLength + 1); + memcpy(temp, dat.getTitle().c_str(), titleLength); + + std::string ret; + char *tok = strtok(temp, " "); + while(tok) + { + ret += tok[0]; + tok = strtok(NULL, " "); + } + + return ret; + } } +