simplify Layout::newView calls

--template file is already provided from Data::View
so there is no real reason to expose it one
more time

app/data/viewdata.cpp

@@ -39,6 +39,7 @@ View::View(View &&o)
       alignment(o.alignment),
       m_state(o.m_state),
       m_originFile(o.m_originFile),
+      m_originLayout(o.m_originLayout),
       m_originView(o.m_originView),
       subcontainments(o.subcontainments)
 {
@@ -55,6 +56,7 @@ View::View(const View &o)
       alignment(o.alignment),
       m_state(o.m_state),
       m_originFile(o.m_originFile),
+      m_originLayout(o.m_originLayout),
       m_originView(o.m_originView),
       subcontainments(o.subcontainments)
 {
@@ -73,6 +75,7 @@ View &View::operator=(const View &rhs)
     alignment = rhs.alignment;
     m_state = rhs.m_state;
     m_originFile = rhs.m_originFile;
+    m_originLayout == rhs.m_originLayout;
     m_originView = rhs.m_originView;
     subcontainments = rhs.subcontainments;
 
@@ -92,6 +95,7 @@ View &View::operator=(View &&rhs)
     alignment = rhs.alignment;
     m_state = rhs.m_state;
     m_originFile = rhs.m_originFile;
+    m_originLayout = rhs.m_originLayout;
     m_originView = rhs.m_originView;
     subcontainments = rhs.subcontainments;
 
@@ -111,6 +115,7 @@ bool View::operator==(const View &rhs) const
             && (alignment == rhs.alignment)
             && (m_state == rhs.m_state)
             && (m_originFile == rhs.m_originFile)
+            && (m_originLayout == rhs.m_originLayout)
             && (m_originView == rhs.m_originView)
             && (subcontainments == rhs.subcontainments);
 }
@@ -219,6 +224,11 @@ QString View::originFile() const
     return m_originFile;
 }
 
+QString View::originLayout() const
+{
+    return m_originLayout;
+}
+
 QString View::originView() const
 {
     return m_originView;
@@ -229,10 +239,11 @@ View::State View::state() const
     return m_state;
 }
 
-void View::setState(View::State state, QString file, QString view)
+void View::setState(View::State state, QString file, QString layout, QString view)
 {
     m_state = state;
     m_originFile = file;
+    m_originLayout = layout;
     m_originView = view;
 }
 

app/data/viewdata.h

@@ -43,8 +43,8 @@ public:
     enum State {
         IsInvalid = -1,
         IsCreated = 0,
-        OriginFromViewTemplate,
-        OriginFromLayout
+        OriginFromViewTemplate, /*used for view templates files*/
+        OriginFromLayout /*used from duplicate, copy, move view functions*/
     };
 
     View();
@@ -71,10 +71,11 @@ public:
     bool isVertical() const;
 
     QString originFile() const;
-    QString originView() const;
+    QString originLayout() const;
+    QString originView() const;    
 
     View::State state() const;
-    void setState(View::State state, QString file = QString(), QString view = QString());
+    void setState(View::State state, QString file = QString(), QString layout = QString(), QString view = QString());
 
     //! Operators
     View &operator=(const View &rhs);
@@ -88,6 +89,7 @@ protected:
 
     //! Origin Data
     QString m_originFile;
+    QString m_originLayout;
     QString m_originView;
 };
 

app/layout/genericlayout.cpp

@@ -1550,13 +1550,13 @@ void GenericLayout::duplicateView(Plasma::Containment *containment)
     emit viewEdgeChanged();
 }
 
-Data::View GenericLayout::newView(const QString &templateFile, const Latte::Data::View &nextViewData)
+Data::View GenericLayout::newView(const Latte::Data::View &nextViewData)
 {
     if (nextViewData.state() == Data::View::IsInvalid) {
         return Data::View();
     }
 
-    Data::View result = Layouts::Storage::self()->newView(this, templateFile, nextViewData);
+    Data::View result = Layouts::Storage::self()->newView(this, nextViewData);
     emit viewEdgeChanged();
 
     return result;

app/layout/genericlayout.h

@@ -125,7 +125,7 @@ public:
     void recreateView(Plasma::Containment *containment, bool delayed = true);
     bool latteViewExists(Plasma::Containment *containment);
 
-    Data::View newView(const QString &templateFile, const Latte::Data::View &nextViewData);
+    Data::View newView(const Latte::Data::View &nextViewData);
     void removeView(const Latte::Data::View &viewData);
     void updateView(const Latte::Data::View &viewData);    
 

app/layouts/storage.cpp

@@ -605,9 +605,9 @@ void Storage::importContainments(const QString &originFile, const QString &desti
     destinationContainments.sync();
 }
 
-Data::View Storage::newView(const Layout::GenericLayout *destinationLayout, const QString &templateFile, const Data::View &nextViewData)
+Data::View Storage::newView(const Layout::GenericLayout *destinationLayout, const Data::View &nextViewData)
 {
-    if (!destinationLayout) {
+    if (!destinationLayout || nextViewData.originFile().isEmpty()) {
         return Data::View();
     }
 
@@ -618,6 +618,7 @@ Data::View Storage::newView(const Layout::GenericLayout *destinationLayout, cons
         destinationLayout->corona()->setImmutability(Plasma::Types::Mutable);
     }
 
+    QString templateFile = nextViewData.originFile();
     //! copy view template path in temp file
     QString templateTmpAbsolutePath = m_storageTmpDir.path() + "/" + QFileInfo(templateFile).fileName() + ".newids";
 

app/layouts/storage.h

@@ -86,7 +86,7 @@ public:
     void importToCorona(const Layout::GenericLayout *layout);
     void syncToLayoutFile(const Layout::GenericLayout *layout, bool removeLayoutId);
     ViewDelayedCreationData copyView(const Layout::GenericLayout *layout, Plasma::Containment *containment);
-    Data::View newView(const Layout::GenericLayout *destination, const QString &templateFile, const Data::View &nextViewData);
+    Data::View newView(const Layout::GenericLayout *destination, const Data::View &nextViewData);
 
     void updateView(const Layout::GenericLayout *layout, const Data::View &viewData);
     void updateView(KConfigGroup viewGroup, const Data::View &viewData);

app/settings/viewsdialog/viewscontroller.cpp

@@ -231,7 +231,7 @@ void Views::save()
     //! add new views
     for(int i=0; i<newViews.rowCount(); ++i){
         if (newViews[i].state() == Data::View::OriginFromViewTemplate) {
-            Data::View addedview = central->newView(newViews[i].originFile(), newViews[i]);
+            Data::View addedview = central->newView(newViews[i]);
             newviewsresponses[newViews[i].id] = addedview;
         }
     }

app/view/view.cpp

@@ -497,7 +497,7 @@ void View::newView(const QString &templateFile)
 
     nextdata.setState(Data::View::OriginFromViewTemplate, templateFile);
 
-    m_layout->newView(templateFile, nextdata);
+    m_layout->newView(nextdata);
 }
 
 void View::removeView()