[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kphotoalbum/category_settings_fix] /: Re-enable addition of new categories.
From:       Tobias Leupold <tobias.leupold () web ! de>
Date:       2016-02-01 22:09:53
Message-ID: E1aQMfR-0003Ai-7x () scm ! kde ! org
[Download RAW message or body]

Git commit 572b3ff94af952eb9d2534417dc5fec5c1ab46ab by Tobias Leupold.
Committed on 01/02/2016 at 22:09.
Pushed by tleupold into branch 'category_settings_fix'.

Re-enable addition of new categories.

M  +5    -0    Settings/CategoryItem.cpp
M  +1    -0    Settings/CategoryItem.h
M  +2    -1    Settings/CategoryPage.cpp
M  +0    -1    XMLDB/FileReader.cpp

http://commits.kde.org/kphotoalbum/572b3ff94af952eb9d2534417dc5fec5c1ab46ab

diff --git a/Settings/CategoryItem.cpp b/Settings/CategoryItem.cpp
index be6e2b0..8b64ab1 100644
--- a/Settings/CategoryItem.cpp
+++ b/Settings/CategoryItem.cpp
@@ -186,4 +186,9 @@ QString Settings::CategoryItem::originalName() const
     return m_categoryOrig;
 }
 
+void Settings::CategoryItem::markAsNewCategory()
+{
+    m_categoryOrig = QString();
+}
+
 // vi:expandtab:tabstop=4 shiftwidth=4:
diff --git a/Settings/CategoryItem.h b/Settings/CategoryItem.h
index 21ebcde..9cad450 100644
--- a/Settings/CategoryItem.h
+++ b/Settings/CategoryItem.h
@@ -61,6 +61,7 @@ public:
     QString icon() const;
     void setIcon(const QString& icon);
     QString originalName() const;
+    void markAsNewCategory();
 
 #ifdef HAVE_KFACE
 signals:
diff --git a/Settings/CategoryPage.cpp b/Settings/CategoryPage.cpp
index 8eacb4d..12141c1 100644
--- a/Settings/CategoryPage.cpp
+++ b/Settings/CategoryPage.cpp
@@ -404,6 +404,7 @@ void Settings::CategoryPage::newCategory()
                                                    DB::Category::TreeView,
                                                    64,
                                                    m_categoriesListWidget);
+    m_currentCategory->markAsNewCategory();
     emit currentCategoryNameChanged();
     m_currentCategory->setLabel(checkedCategory);
     m_categoriesListWidget->blockSignals(false);
@@ -417,7 +418,7 @@ void Settings::CategoryPage::newCategory()
     editCategory(m_currentCategory);
     m_categoriesListWidget->editItem(m_currentCategory);
 
-    MainWindow::DirtyIndicator::markDirty();
+    //MainWindow::DirtyIndicator::markDirty();
 }
 
 void Settings::CategoryPage::deleteCurrentCategory()
diff --git a/XMLDB/FileReader.cpp b/XMLDB/FileReader.cpp
index 0780e0a..a4b1155 100644
--- a/XMLDB/FileReader.cpp
+++ b/XMLDB/FileReader.cpp
@@ -95,7 +95,6 @@ void XMLDB::FileReader::createSpecialCategories()
     m_db->m_categoryCollection.addCategory( m_folderCategory );
     dynamic_cast<XMLCategory*>( m_folderCategory.data() )->setShouldSave( false );
 
-    qDebug() << "Folder \
category:"<<m_db->m_categoryCollection.categoryForSpecial(DB::Category::FolderCategory);
  // Setup the "Tokens" category
 
     DB::CategoryPtr tokenCat;


[prev in list] [next in list] [prev in thread] [next in thread]