improve Default Layout Template name is accessed

pull/19/head
Michail Vourlakos 5 years ago
parent 2fdbc134a1
commit 6e2d8143e5

@ -247,11 +247,11 @@ void Corona::load()
}
if (!m_layoutsManager->synchronizer()->layoutExists(loadLayoutName)) {
loadLayoutName = m_layoutsManager->defaultLayoutName();
loadLayoutName = i18n(Templates::DEFAULTLAYOUTTEMPLATENAME);
m_layoutsManager->importDefaultLayout(false);
}
} else if (m_defaultLayoutOnStartup) {
loadLayoutName = m_layoutsManager->importer()->uniqueLayoutName(m_layoutsManager->defaultLayoutName());
loadLayoutName = m_layoutsManager->importer()->uniqueLayoutName(i18n(Templates::DEFAULTLAYOUTTEMPLATENAME));
m_layoutsManager->importDefaultLayout(true);
} else {
loadLayoutName = m_layoutNameOnStartUp;

@ -155,17 +155,6 @@ QString Manager::currentLayoutName() const
return m_synchronizer->currentLayoutName();
}
QString Manager::defaultLayoutName() const
{
QByteArray presetNameOrig = QString("preset" + QString::number(1)).toUtf8();
QString presetPath = m_corona->kPackage().filePath(presetNameOrig);
QString presetName = CentralLayout::layoutName(presetPath);
QByteArray presetNameChars = presetName.toUtf8();
presetName = i18n(presetNameChars);
return presetName;
}
QStringList Manager::layouts() const
{
return m_synchronizer->layouts();

@ -90,7 +90,6 @@ public:
void unload();
QString currentLayoutName() const;
QString defaultLayoutName() const;
QStringList layouts() const;
QStringList menuLayouts() const;

@ -69,8 +69,8 @@ void Manager::init()
//! it is used just in order to provide translations for the presets
void Manager::exposeTranslatedTemplateNames()
{
i18n(DEFAULTLAYOUTTEMPLATENAME);
i18n(EMPTYLAYOUTTEMPLATENAME);
i18nc("default layout template name", "Default");
i18n("empty layout template name", "Empty");
}
}

@ -35,8 +35,8 @@ class Corona;
namespace Latte {
namespace Templates {
#define DEFAULTLAYOUTTEMPLATENAME "Default"
#define EMPTYLAYOUTTEMPLATENAME "Empty"
const char DEFAULTLAYOUTTEMPLATENAME[] = "Default";
const char EMPTYLAYOUTTEMPLATENAME[] = "Empty";
class Manager : public QObject
{

Loading…
Cancel
Save