[OldOpenFile/Dependencies] Remove old 'OpenFile' element; remove QtQu…

…ick.Dialogs and QtQuick.Window dependency
erqan · Jan 16, 2017 · 4a6411a · 4a6411a
1 parent 38b0478
commit 4a6411a
Show file tree

Hide file tree

Showing 13 changed files with 3 additions and 111 deletions.
diff --git a/CMake/ListFilesQML.cmake b/CMake/ListFilesQML.cmake
@@ -12,7 +12,7 @@ SET(d "qml/mainview")
 SET(photoqt_SOURCES ${photoqt_SOURCES} ${d}/Background.qml ${d}/QuickInfo.qml ${d}/SmartImage.qml ${d}/ImageItem.qml ${d}/MainView.qml ${d}/Histogram.qml)
 
 SET(d "qml/openfile")
-SET(photoqt_SOURCES ${photoqt_SOURCES} ${d}/OpenFile.qml ${d}/OldOpenFile.qml ${d}/BreadCrumbs.qml ${d}/UserPlaces.qml ${d}/Folders.qml ${d}/FilesView.qml)
+SET(photoqt_SOURCES ${photoqt_SOURCES} ${d}/OpenFile.qml ${d}/BreadCrumbs.qml ${d}/UserPlaces.qml ${d}/Folders.qml ${d}/FilesView.qml)
 SET(photoqt_SOURCES ${photoqt_SOURCES} ${d}/EditFiles.qml ${d}/TweaksZoom.qml ${d}/Tweaks.qml ${d}/TweaksViewMode.qml ${d}/TweaksPreview.qml)
 SET(photoqt_SOURCES ${photoqt_SOURCES} ${d}/TweaksThumbnail.qml ${d}/FilesViewGrid.qml ${d}/FilesViewList.qml ${d}/TweaksFileTypeSelection.qml)
 

diff --git a/qml/mainview/Background.qml b/qml/mainview/Background.qml
@@ -1,6 +1,5 @@
 import QtQuick 2.3
 import QtQuick.Controls 1.2
-import QtQuick.Window 2.1
 
 Rectangle {
 

diff --git a/qml/mainview/SmartImage.qml b/qml/mainview/SmartImage.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.3
-import QtQuick.Controls 1.3
+import QtQuick.Controls 1.2
 
 Rectangle {
 

diff --git a/qml/mainwindow.qml b/qml/mainwindow.qml
@@ -7,7 +7,6 @@ import ThumbnailManagement 1.0
 import ToolTip 1.0
 import ShortcutsNotifier 1.0
 import Colour 1.0
-import QtQuick.Dialogs 1.2
 import QtGraphicalEffects 1.0
 import ImageWatch 1.0
 

diff --git a/qml/openfile/OldOpenFile.qml b/qml/openfile/OldOpenFile.qml
diff --git a/qml/settingsmanager/EntryContainer.qml b/qml/settingsmanager/EntryContainer.qml
@@ -1,6 +1,4 @@
 import QtQuick 2.3
-import QtQuick.Dialogs 1.1
-import QtQuick.Controls 1.2
 
 Rectangle {
 

diff --git a/qml/settingsmanager/tabs/TabLookAndFeel.qml b/qml/settingsmanager/tabs/TabLookAndFeel.qml
@@ -1,5 +1,4 @@
 import QtQuick 2.3
-import QtQuick.Dialogs 1.1
 import QtQuick.Controls 1.2
 
 import "./lookandfeel"

diff --git a/qml/settingsmanager/tabs/TabMetadata.qml b/qml/settingsmanager/tabs/TabMetadata.qml
@@ -1,5 +1,4 @@
 import QtQuick 2.3
-import QtQuick.Dialogs 1.1
 import QtQuick.Controls 1.2
 
 import "./metadata"

diff --git a/qml/settingsmanager/tabs/TabOther.qml b/qml/settingsmanager/tabs/TabOther.qml
@@ -1,5 +1,4 @@
 import QtQuick 2.3
-import QtQuick.Dialogs 1.1
 import QtQuick.Controls 1.2
 
 import "./other"

diff --git a/qml/settingsmanager/tabs/TabShortcuts.qml b/qml/settingsmanager/tabs/TabShortcuts.qml
@@ -1,5 +1,4 @@
 import QtQuick 2.3
-import QtQuick.Dialogs 1.1
 import QtQuick.Controls 1.2
 
 import "../../elements"

diff --git a/qml/settingsmanager/tabs/TabThumbnails.qml b/qml/settingsmanager/tabs/TabThumbnails.qml
@@ -1,5 +1,4 @@
 import QtQuick 2.3
-import QtQuick.Dialogs 1.1
 import QtQuick.Controls 1.2
 
 import "./thumbnails"

diff --git a/qml/settingsmanager/tabs/lookandfeel/BorderAroundImage.qml b/qml/settingsmanager/tabs/lookandfeel/BorderAroundImage.qml
@@ -1,6 +1,4 @@
 import QtQuick 2.3
-//import QtQuick.Dialogs 1.1
-//import QtQuick.Controls 1.2
 
 import "../../../elements"
 import "../../"

diff --git a/qmlresources/openfile.qrc b/qmlresources/openfile.qrc
@@ -1,7 +1,6 @@
 <RCC>
     <qresource prefix="/">
-	<file>../qml/openfile/OpenFile.qml</file>
-	<file>../qml/openfile/OldOpenFile.qml</file>
+        <file>../qml/openfile/OpenFile.qml</file>
 	<file>../qml/openfile/BreadCrumbs.qml</file>
 	<file>../qml/openfile/Folders.qml</file>
 	<file>../qml/openfile/UserPlaces.qml</file>