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

List:       kde-commits
Subject:    [kphotoalbum] MainWindow: Removed the dbv6 update code from MainWindow::Window.
From:       Tobias Leupold <tobias.leupold () web ! de>
Date:       2016-01-09 11:23:42
Message-ID: E1aHrcU-0001DK-Ch () scm ! kde ! org
[Download RAW message or body]

Git commit be3d07dee424b202bcc46c3298690622c84c0592 by Tobias Leupold.
Committed on 09/01/2016 at 11:23.
Pushed by tleupold into branch 'master'.

Removed the dbv6 update code from MainWindow::Window.

M  +0    -39   MainWindow/Window.cpp
M  +0    -5    MainWindow/Window.h

http://commits.kde.org/kphotoalbum/be3d07dee424b202bcc46c3298690622c84c0592

diff --git a/MainWindow/Window.cpp b/MainWindow/Window.cpp
index 2c8f25e..3e52b08 100644
--- a/MainWindow/Window.cpp
+++ b/MainWindow/Window.cpp
@@ -215,10 +215,6 @@ MainWindow::Window::Window( QWidget* parent )
     setAutoSaveSettings();
 
     executeStartupActions();
-
-    if (m_v6UpdateDone) {
-        slotSave();
-    }
 }
 
 MainWindow::Window::~Window()
@@ -468,26 +464,6 @@ void MainWindow::Window::createAnnotationDialog()
 
 void MainWindow::Window::slotSave()
 {
-    if (m_v6UpdateSkipped) {
-        int ret = KMessageBox::warningYesNo(
-            this,
-            i18n("<p><b>You skipped the database update!</b></p>"
-                 "<p>If you save your database now, the file moves and configuration \
                updates can't "
-                 "be done automatically anymore and <b>you will lose the concerned \
                category and "
-                 "tag thumbnails, and probably your \"untagged images\" tags \
                permanently. Also, "
-                 "face recognition will probably be broken.</b> (unless you do the \
                necessary "
-                 "updates by hand).</p>"
-                 "<p>Do you really want to save your database?</p>"),
-            i18n("Database Update skipped")
-        );
-
-        if (ret == KStandardGuiItem::No) {
-            return;
-        } else {
-            m_v6UpdateSkipped = false; // Don't ask again
-        }
-    }
-
     Utilities::ShowBusyCursor dummy;
     m_statusBar->showMessage(i18n("Saving..."), 5000 );
     DB::ImageDB::instance()->save( \
Settings::SettingsData::instance()->imageDirectory() + \
QString::fromLatin1("index.xml"), false ); @@ -1001,11 +977,6 @@ void \
MainWindow::Window::startAutoSaveTimer()  void MainWindow::Window::slotAutoSave()
 {
     if ( m_statusBar->mp_dirtyIndicator->isAutoSaveDirty() ) {
-        if (m_v6UpdateSkipped) {
-            m_statusBar->showMessage(i18n("Won't save the database automatically, as \
                you skipped the update."), 5000);
-            return;
-        }
-
         Utilities::ShowBusyCursor dummy;
         m_statusBar->showMessage(i18n("Auto saving...."));
         DB::ImageDB::instance()->save( \
Settings::SettingsData::instance()->imageDirectory() + \
QString::fromLatin1(".#index.xml"), true ); @@ -1952,15 +1923,5 @@ void \
MainWindow::Window::slotImageRotated(const DB::FileName& fileName)  \
ImageManager::ThumbnailCache::instance()->removeThumbnail(fileName);  }
 
-void MainWindow::Window::v6UpdateDone()
-{
-    m_v6UpdateDone = true;
-}
-
-void MainWindow::Window::v6UpdateSkipped()
-{
-    m_v6UpdateSkipped = true;
-}
-
 #include "Window.moc"
 // vi:expandtab:tabstop=4 shiftwidth=4:
diff --git a/MainWindow/Window.h b/MainWindow/Window.h
index aa74122..d6fefe7 100644
--- a/MainWindow/Window.h
+++ b/MainWindow/Window.h
@@ -75,8 +75,6 @@ public:
     QString currentBrowseCategory() const;
     void setStackHead( const DB::FileName& image );
     void setHistogramVisibilty( bool visible ) const;
-    void v6UpdateDone();
-    void v6UpdateSkipped();
 
 public slots:
     void showThumbNails(const DB::FileNameList& items);
@@ -242,9 +240,6 @@ private:
     bool m_hasLoadedPlugins;
     QMap<Qt::Key, QPair<QString,QString> > m_viewerInputMacros;
     MainWindow::StatusBar* m_statusBar;
-
-    bool m_v6UpdateDone = false;
-    bool m_v6UpdateSkipped = false;
 };
 
 }


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