improve templates signaling

app/settings/settingsdialog/tablayoutshandler.cpp

@@ -150,7 +150,7 @@ void TabLayouts::initLayoutMenu()
     m_newLayoutAction->setMenu(m_layoutTemplatesSubMenu);
     m_ui->newButton->setMenu(m_layoutTemplatesSubMenu);
 
-    connect(m_corona->templatesManager(), &Latte::Templates::Manager::templatesChanged, this, &TabLayouts::initLayoutTemplatesSubMenu);
+    connect(m_corona->templatesManager(), &Latte::Templates::Manager::layoutTemplatesChanged, this, &TabLayouts::initLayoutTemplatesSubMenu);
 
     m_copyLayoutAction = m_layoutMenu->addAction(i18nc("copy layout", "&Copy"));
     m_copyLayoutAction->setToolTip(i18n("Copy selected layout"));

app/templates/templatesmanager.cpp

@@ -41,7 +41,8 @@ Manager::Manager(Latte::Corona *corona)
       m_corona(corona)
 {
     KDirWatch::self()->addDir(Latte::configPath() + "/latte/templates", KDirWatch::WatchFiles);
-    connect(KDirWatch::self(), &KDirWatch::deleted, this, &Manager::onCustomTemplateDeleted);
+    connect(KDirWatch::self(), &KDirWatch::created, this, &Manager::onCustomTemplatesCountChanged);
+    connect(KDirWatch::self(), &KDirWatch::deleted, this, &Manager::onCustomTemplatesCountChanged);
 }
 
 Manager::~Manager()
@@ -50,22 +51,30 @@ Manager::~Manager()
 
 void Manager::init()
 {
-    m_layoutTemplates.clear();
-    m_viewTemplates.clear();
-
     //! Local Templates
     QDir localTemplatesDir(Latte::configPath() + "/latte/templates");
     if (!localTemplatesDir.exists()) {
         QDir(Latte::configPath() + "/latte").mkdir("templates");
     }
 
+    initLayoutTemplates();
+    initViewTemplates();
+}
+
+void Manager::initLayoutTemplates()
+{
+    m_layoutTemplates.clear();
     initLayoutTemplates(m_corona->kPackage().filePath("templates"));
     initLayoutTemplates(Latte::configPath() + "/latte/templates");
+    emit layoutTemplatesChanged();
+}
 
+void Manager::initViewTemplates()
+{
+    m_viewTemplates.clear();
     initViewTemplates(m_corona->kPackage().filePath("templates"));
     initViewTemplates(Latte::configPath() + "/latte/templates");
-
-    emit templatesChanged();
+    emit viewTemplatesChanged();
 }
 
 void Manager::initLayoutTemplates(const QString &path)
@@ -172,20 +181,17 @@ QString Manager::newLayout(QString layoutName, QString layoutTemplate)
 
 bool Manager::exportTemplate(const QString &originFile, const QString &destinationFile, const Data::AppletsTable &approvedApplets)
 {
-    bool result = Latte::Layouts::Storage::self()->exportTemplate(originFile, destinationFile, approvedApplets);
-
-    if (result) {
-        init();
-    }
-
-    return result;
+    return Latte::Layouts::Storage::self()->exportTemplate(originFile, destinationFile, approvedApplets);
 }
 
-void Manager::onCustomTemplateDeleted(const QString &file)
+void Manager::onCustomTemplatesCountChanged(const QString &file)
 {
-    qDebug() << " file removed ::: " << file;
     if (file.startsWith(Latte::configPath() + "/latte/templates")) {
-        init();
+        if (file.endsWith(".layout.latte")) {
+            initLayoutTemplates();
+        } else if (file.endsWith(".view.latte")) {
+            initViewTemplates();
+        }
     }
 }
 

app/templates/templatesmanager.h

@@ -74,12 +74,16 @@ public:
 
 signals:
     void newLayoutAdded(const QString &path);
-    void templatesChanged();
+    void layoutTemplatesChanged();
+    void viewTemplatesChanged();
 
 private slots:
-    void onCustomTemplateDeleted(const QString &file);
+    void onCustomTemplatesCountChanged(const QString &file);
 
 private:
+    void initLayoutTemplates();
+    void initViewTemplates();
+
     void initLayoutTemplates(const QString &path);
     void initViewTemplates(const QString &path);