psa: moved harmattan to /opt

diff --git a/FeedingIt-Sync/FeedingIt-Sync.pro b/FeedingIt-Sync/FeedingIt-Sync.pro
index a66a899..bc343b7 100644 (file)
--- a/FeedingIt-Sync/FeedingIt-Sync.pro
+++ b/FeedingIt-Sync/FeedingIt-Sync.pro
@@ -46,10 +46,10 @@ settingsdesktop.files = xml/settings/feedingitsync.desktop
 settingsxml.path = /usr/share/duicontrolpanel/uidescriptions
 settingsxml.files = xml/settings/feedingitsync.xml
 
-pysrc.path = /usr/share/feedingit
+pysrc.path = /opt/feedingit
 pysrc.files = pysrc/*.py splash.jpg
 
-qmlfiles.path = /usr/share/feedingit/qml
+qmlfiles.path = /opt/feedingit/qml
 qmlfiles.files = qml/*
 
 dbusfiles.path = /usr/share/dbus-1/services
@@ -61,7 +61,7 @@ icon.files = feedingit.png
 desktopfiles.path = /usr/share/applications
 desktopfiles.files = feedingit.desktop
 
-binfile.path = /usr/share/feedingit/
+binfile.path = /opt/feedingit/
 binfile.files = feedingit
 
 backup.path = /usr/share/backup-framework/applications

diff --git a/FeedingIt-Sync/dbus/feedingit.service b/FeedingIt-Sync/dbus/feedingit.service
index 1e47b05..b76c27a 100644 (file)
--- a/FeedingIt-Sync/dbus/feedingit.service
+++ b/FeedingIt-Sync/dbus/feedingit.service
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.maemo.feedingit
-Exec=invoker --single-instance --splash=/usr/share/feedingit/splash.jpg --type=e /usr/bin/python /usr/share/feedingit/feedingit.py
+Exec=invoker --single-instance --splash=/opt/feedingit/splash.jpg --type=e /usr/bin/python /opt/feedingit/feedingit.py

diff --git a/FeedingIt-Sync/dbus/feedingit_status.service b/FeedingIt-Sync/dbus/feedingit_status.service
index 5e85d8b..7cc0975 100644 (file)
--- a/FeedingIt-Sync/dbus/feedingit_status.service
+++ b/FeedingIt-Sync/dbus/feedingit_status.service
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.marcoz.feedingit
-Exec=/usr/bin/nice /usr/bin/python /usr/share/feedingit/update_feeds.py --daemon
+Exec=/usr/bin/nice /usr/bin/python /opt/feedingit/update_feeds.py --daemon

diff --git a/FeedingIt-Sync/feedingit b/FeedingIt-Sync/feedingit
index 698f459..3a58943 100644 (file)
--- a/FeedingIt-Sync/feedingit
+++ b/FeedingIt-Sync/feedingit
@@ -5,10 +5,10 @@ update)
     dbus-send --print-reply --dest='org.marcoz.feedingit' --session /org/marcoz/feedingit/update org.marcoz.feedingit.UpdateAll
     ;;
 dbus)
-    nice python /usr/share/feedingit/update_feeds.py --daemon
+    nice python /opt/feedingit/update_feeds.py --daemon
     ;;
 *)
-  cd /usr/share/feedingit
+  cd /opt/feedingit
   python feedingit.py 2>&1 >/dev/null
   ;;
 

diff --git a/FeedingIt-Sync/feedingit.desktop b/FeedingIt-Sync/feedingit.desktop
index 82c8f7e..383d317 100644 (file)
--- a/FeedingIt-Sync/feedingit.desktop
+++ b/FeedingIt-Sync/feedingit.desktop
@@ -3,7 +3,7 @@ Encoding=UTF-8
 Version=1.0
 Type=Application
 Name=FeedingIt RSS Reader
-Exec=invoker --single-instance --splash=/usr/share/feedingit/splash.jpg --type=e /usr/bin/python /usr/share/feedingit/feedingit.py
+Exec=invoker --single-instance --splash=/opt/feedingit/splash.jpg --type=e /usr/bin/python /opt/feedingit/feedingit.py
 Icon=/usr/share/icons/hicolor/80x80/apps/feedingit.png
 Categories=Network;News;
 MimeType=x-maemo-urischeme/feedingit;

diff --git a/FeedingIt-Sync/pysrc/feedingit.py b/FeedingIt-Sync/pysrc/feedingit.py
index f2791ad..283bc45 100644 (file)
--- a/FeedingIt-Sync/pysrc/feedingit.py
+++ b/FeedingIt-Sync/pysrc/feedingit.py
@@ -340,10 +340,10 @@ def main():
     #glw = QtOpenGL.QGLWidget()
     #view.setViewport(glw)
 
-    if os.path.exists('/usr/share/feedingit/qml'):
+    if os.path.exists('/opt/feedingit/qml'):
         glw = QtOpenGL.QGLWidget()
         view.setViewport(glw)
-        view.setSource('/usr/share/feedingit/qml/main.qml')
+        view.setSource('/opt/feedingit/qml/main.qml')
         view.showFullScreen()
     else:
         view.setSource(os.path.join('qml','main.qml'))

diff --git a/FeedingIt-Sync/pysrc/rss_sqlite.py b/FeedingIt-Sync/pysrc/rss_sqlite.py
index ca588ad..0bb1a24 100644 (file)
--- a/FeedingIt-Sync/pysrc/rss_sqlite.py
+++ b/FeedingIt-Sync/pysrc/rss_sqlite.py
@@ -1173,7 +1173,7 @@ class Listing(BaseObject):
                 if oldId > 0:
                     sender.remove_item(oldId)
                 
-                item = EventFeedItem('/usr/share/feedingit/qml/common/images/feedingit.png', self.getFeedTitle(key))
+                item = EventFeedItem('/opt/feedingit/qml/common/images/feedingit.png', self.getFeedTitle(key))
                 item.set_body(str(self.getFeedNumberOfUnreadItems(key)) + ' unread items')
                 item.set_url('feedingit:')
                 eventId = sender.add_item(item)

diff --git a/FeedingIt-Sync/qml/debug.log b/FeedingIt-Sync/qml/debug.log
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/FeedingIt-Sync/qml/main.qml b/FeedingIt-Sync/qml/main.qml
index 4dfbc33..c051b17 100644 (file)
--- a/FeedingIt-Sync/qml/main.qml
+++ b/FeedingIt-Sync/qml/main.qml
@@ -32,7 +32,7 @@ PageStackWindow {
     function updateFinished() {
         categoryReloadRequest()
         feedReloadRequest()
-        banner.show(qsTr("Updated Completed"))
+        banner.show(qsTr("Update Completed"))
         isUpdateInProgress = false
     }
 

diff --git a/FeedingIt-Sync/qml/qml.qmlproject b/FeedingIt-Sync/qml/qml.qmlproject
deleted file mode 100644 (file)
index 8f554f8..0000000
--- a/FeedingIt-Sync/qml/qml.qmlproject
+++ /dev/null
@@ -1,20 +0,0 @@
-/* File generated by Qt Creator, version 2.2.1 */
-
-import QmlProject 1.1
-
-Project {
-    mainFile: "main.qml"
-
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ "../exampleplugin" ]
-}

diff --git a/FeedingIt-Sync/qml/qml.qmlproject.user b/FeedingIt-Sync/qml/qml.qmlproject.user
deleted file mode 100644 (file)
index 373245f..0000000
--- a/FeedingIt-Sync/qml/qml.qmlproject.user
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE QtCreatorProject>
-<!-- Written by Qt Creator 2.4.0, 2012-01-28T23:11:58. -->
-<qtcreator>
- <data>
-  <variable>ProjectExplorer.Project.ActiveTarget</variable>
-  <value type="int">0</value>
- </data>
- <data>
-  <variable>ProjectExplorer.Project.EditorSettings</variable>
-  <valuemap type="QVariantMap">
-   <value type="bool" key="EditorConfiguration.AutoIndent">true</value>
-   <value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value>
-   <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0">
-    <value type="QString" key="language">Cpp</value>
-    <valuemap type="QVariantMap" key="value">
-     <value type="QString" key="CurrentPreferences">CppGlobal</value>
-    </valuemap>
-   </valuemap>
-   <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1">
-    <value type="QString" key="language">QmlJS</value>
-    <valuemap type="QVariantMap" key="value">
-     <value type="QString" key="CurrentPreferences">QmlJSGlobal</value>
-    </valuemap>
-   </valuemap>
-   <value type="int" key="EditorConfiguration.CodeStyle.Count">2</value>
-   <value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value>
-   <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value>
-   <value type="int" key="EditorConfiguration.IndentSize">4</value>
-   <value type="bool" key="EditorConfiguration.MouseNavigation">true</value>
-   <value type="int" key="EditorConfiguration.PaddingMode">1</value>
-   <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value>
-   <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value>
-   <value type="bool" key="EditorConfiguration.SpacesForTabs">true</value>
-   <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value>
-   <value type="int" key="EditorConfiguration.TabSize">8</value>
-   <value type="bool" key="EditorConfiguration.UseGlobal">true</value>
-   <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value>
-   <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value>
-   <value type="bool" key="EditorConfiguration.cleanIndentation">true</value>
-   <value type="bool" key="EditorConfiguration.cleanWhitespace">true</value>
-   <value type="bool" key="EditorConfiguration.inEntireDocument">false</value>
-  </valuemap>
- </data>
- <data>
-  <variable>ProjectExplorer.Project.PluginSettings</variable>
-  <valuemap type="QVariantMap"/>
- </data>
- <data>
-  <variable>ProjectExplorer.Project.Target.0</variable>
-  <valuemap type="QVariantMap">
-   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">QML Viewer</value>
-   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">QML Viewer</value>
-   <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QmlProjectManager.QmlTarget</value>
-   <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">-1</value>
-   <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">-1</value>
-   <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
-   <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">0</value>
-   <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">0</value>
-   <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
-    <value type="bool" key="Analyzer.Project.UseGlobal">true</value>
-    <value type="bool" key="Analyzer.Project.UseGlobal">true</value>
-    <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
-    <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
-    <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
-    <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
-    <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
-    <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
-    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
-    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
-    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
-    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
-    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
-    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
-    <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
-    <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
-    <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
-    <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
-    <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
-    <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
-    <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
-    <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
-    <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
-    <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
-    <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
-    <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
-    <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
-    <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
-    <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
-     <value type="int">0</value>
-     <value type="int">1</value>
-     <value type="int">2</value>
-     <value type="int">3</value>
-     <value type="int">4</value>
-     <value type="int">5</value>
-     <value type="int">6</value>
-     <value type="int">7</value>
-     <value type="int">8</value>
-     <value type="int">9</value>
-     <value type="int">10</value>
-     <value type="int">11</value>
-     <value type="int">12</value>
-     <value type="int">13</value>
-     <value type="int">14</value>
-    </valuelist>
-    <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
-     <value type="int">0</value>
-     <value type="int">1</value>
-     <value type="int">2</value>
-     <value type="int">3</value>
-     <value type="int">4</value>
-     <value type="int">5</value>
-     <value type="int">6</value>
-     <value type="int">7</value>
-     <value type="int">8</value>
-     <value type="int">9</value>
-     <value type="int">10</value>
-     <value type="int">11</value>
-     <value type="int">12</value>
-     <value type="int">13</value>
-     <value type="int">14</value>
-    </valuelist>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName"></value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">QML Viewer</value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QmlProjectManager.QmlRunConfiguration</value>
-    <value type="QString" key="QmlProjectManager.QmlRunConfiguration.MainScript">CurrentFile</value>
-    <value type="QString" key="QmlProjectManager.QmlRunConfiguration.QDeclarativeViewerArguments"></value>
-    <value type="int" key="QmlProjectManager.QmlRunConfiguration.QtVersion">26</value>
-    <valuelist type="QVariantList" key="QmlProjectManager.QmlRunConfiguration.UserEnvironmentChanges"/>
-    <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
-    <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
-    <value type="bool" key="RunConfiguration.UseQmlDebugger">true</value>
-    <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">false</value>
-   </valuemap>
-   <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
-  </valuemap>
- </data>
- <data>
-  <variable>ProjectExplorer.Project.TargetCount</variable>
-  <value type="int">1</value>
- </data>
- <data>
-  <variable>ProjectExplorer.Project.Updater.EnvironmentId</variable>
-  <value type="QString">{6449687d-a4d3-4afc-95ac-89e1027ef47e}</value>
- </data>
- <data>
-  <variable>ProjectExplorer.Project.Updater.FileVersion</variable>
-  <value type="int">10</value>
- </data>
-</qtcreator>

diff --git a/FeedingIt-Sync/qml/qml.qmlproject.user.2.3pre1 b/FeedingIt-Sync/qml/qml.qmlproject.user.2.3pre1
deleted file mode 100644 (file)
index a05015c..0000000
--- a/FeedingIt-Sync/qml/qml.qmlproject.user.2.3pre1
+++ /dev/null
@@ -1,92 +0,0 @@
-<!DOCTYPE QtCreatorProject>
-<qtcreator>
- <data>
-  <variable>ProjectExplorer.Project.ActiveTarget</variable>
-  <value type="int">0</value>
- </data>
- <data>
-  <variable>ProjectExplorer.Project.EditorSettings</variable>
-  <valuemap type="QVariantMap">
-   <value key="EditorConfiguration.AutoIndent" type="bool">true</value>
-   <value key="EditorConfiguration.AutoSpacesForTabs" type="bool">false</value>
-   <value key="EditorConfiguration.Codec" type="QByteArray">UTF-8</value>
-   <value key="EditorConfiguration.DoubleIndentBlocks" type="bool">false</value>
-   <value key="EditorConfiguration.IndentBraces" type="bool">false</value>
-   <value key="EditorConfiguration.IndentSize" type="int">4</value>
-   <value key="EditorConfiguration.MouseNavigation" type="bool">true</value>
-   <value key="EditorConfiguration.PaddingMode" type="int">1</value>
-   <value key="EditorConfiguration.ScrollWheelZooming" type="bool">true</value>
-   <value key="EditorConfiguration.SmartBackspace" type="bool">false</value>
-   <value key="EditorConfiguration.SpacesForTabs" type="bool">true</value>
-   <value key="EditorConfiguration.TabKeyBehavior" type="int">0</value>
-   <value key="EditorConfiguration.TabSize" type="int">8</value>
-   <value key="EditorConfiguration.UseGlobal" type="bool">true</value>
-   <value key="EditorConfiguration.Utf8BomBehavior" type="int">1</value>
-   <value key="EditorConfiguration.addFinalNewLine" type="bool">true</value>
-   <value key="EditorConfiguration.cleanIndentation" type="bool">true</value>
-   <value key="EditorConfiguration.cleanWhitespace" type="bool">true</value>
-   <value key="EditorConfiguration.inEntireDocument" type="bool">false</value>
-  </valuemap>
- </data>
- <data>
-  <variable>ProjectExplorer.Project.Target.0</variable>
-  <valuemap type="QVariantMap">
-   <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">QML Viewer</value>
-   <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">QML Viewer</value>
-   <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">QmlProjectManager.QmlTarget</value>
-   <value key="ProjectExplorer.Target.ActiveBuildConfiguration" type="int">-1</value>
-   <value key="ProjectExplorer.Target.ActiveDeployConfiguration" type="int">-1</value>
-   <value key="ProjectExplorer.Target.ActiveRunConfiguration" type="int">0</value>
-   <value key="ProjectExplorer.Target.BuildConfigurationCount" type="int">0</value>
-   <value key="ProjectExplorer.Target.DeployConfigurationCount" type="int">0</value>
-   <valuemap key="ProjectExplorer.Target.RunConfiguration.0" type="QVariantMap">
-    <valuelist key="Analyzer.Valgrind.AddedSupressionFiles" type="QVariantList"/>
-    <value key="Analyzer.Valgrind.FilterExternalIssues" type="bool">true</value>
-    <value key="Analyzer.Valgrind.NumCallers" type="int">25</value>
-    <valuelist key="Analyzer.Valgrind.RemovedSupressionFiles" type="QVariantList"/>
-    <value key="Analyzer.Valgrind.TrackOrigins" type="bool">true</value>
-    <value key="Analyzer.Valgrind.ValgrindExecutable" type="QString">valgrind</value>
-    <valuelist key="Analyzer.Valgrind.VisibleErrorKinds" type="QVariantList">
-     <value type="int">0</value>
-     <value type="int">1</value>
-     <value type="int">2</value>
-     <value type="int">3</value>
-     <value type="int">4</value>
-     <value type="int">5</value>
-     <value type="int">6</value>
-     <value type="int">7</value>
-     <value type="int">8</value>
-     <value type="int">9</value>
-     <value type="int">10</value>
-     <value type="int">11</value>
-     <value type="int">12</value>
-     <value type="int">13</value>
-     <value type="int">14</value>
-    </valuelist>
-    <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString"></value>
-    <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">QML Viewer</value>
-    <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">QmlProjectManager.QmlRunConfiguration</value>
-    <value key="QmlProjectManager.QmlRunConfiguration.MainScript" type="QString">CurrentFile</value>
-    <value key="QmlProjectManager.QmlRunConfiguration.QDeclarativeViewerArguments" type="QString"></value>
-    <value key="QmlProjectManager.QmlRunConfiguration.QtVersion" type="int">14</value>
-    <valuelist key="QmlProjectManager.QmlRunConfiguration.UserEnvironmentChanges" type="QVariantList"/>
-    <value key="RunConfiguration.QmlDebugServerPort" type="uint">3768</value>
-    <value key="RunConfiguration.UseCppDebugger" type="bool">false</value>
-    <value key="RunConfiguration.UseQmlDebugger" type="bool">true</value>
-   </valuemap>
-   <value key="ProjectExplorer.Target.RunConfigurationCount" type="int">1</value>
-  </valuemap>
- </data>
- <data>
-  <variable>ProjectExplorer.Project.TargetCount</variable>
-  <value type="int">1</value>
- </data>
- <data>
-  <variable>ProjectExplorer.Project.Updater.EnvironmentId</variable>
-  <value type="QString">{6449687d-a4d3-4afc-95ac-89e1027ef47e}</value>
- </data>
- <data>
-  <variable>ProjectExplorer.Project.Updater.FileVersion</variable>
-  <value type="int">9</value>
- </data>
-</qtcreator>

diff --git a/FeedingIt-Sync/qml/qmlDev/AddFeed.qml b/FeedingIt-Sync/qml/qmlDev/AddFeed.qml
deleted file mode 100644 (file)
index 9b53f8a..0000000
--- a/FeedingIt-Sync/qml/qmlDev/AddFeed.qml
+++ /dev/null
@@ -1,135 +0,0 @@
-import QtQuick 1.0
-import com.nokia.meego 1.0
-
-Page {
-    id: root
-    tools: tabTools
-    anchors.margins: UiConstants.DefaultMargin
-
-    TabGroup {
-        id: tabGroup
-        anchors.fill: parent
-        currentTab: showcaseTab
-
-        Item {
-            id: searchTab
-
-            Text {
-                id: searchText
-                font.pixelSize: 22
-                color: "white"
-                text: "Search for feeds"
-            }
-
-            TextInputClear {
-                id: searchInput
-                placeHolder: "Enter a search term"
-            }
-
-            Button {
-                id: searchButton
-                text: "Search"
-                checkable: true
-                onClicked: feedJS.search(searchInput.text)
-            }
-
-            SelectionDialog {
-                     id: searchDialog
-                     titleText: "Select feed:"
-                     //model: []
-                     onSelectedIndexChanged: {
-                         if (selectedIndex>=0) {
-                             var feedTitle = singleSelectionDialog.model.get(singleSelectionDialog.selectedIndex).name;
-                             var feedUrl = singleSelectionDialog.model.get(singleSelectionDialog.selectedIndex).url;
-                             console.log("Adding feed "+title+" at " +url);
-                         }
-                     }
-            }
-
-        } //searchTab
-
-        Item {
-            id: urlTab
-
-            Text {
-                id: urlText
-                font.pixelSize: 22
-                color: "white"
-                text: "Enter the feed URL"
-            }
-
-            TextInputClear {
-                id: urlInput
-                placeHolder: "Feed URL"
-
-            }
-
-            Button {
-                id: urlButton
-                text: "Add"
-                checkable: true
-                onClicked: {
-                    console.log("Adding "+urlInput.text)
-                }
-            }
-
-        } //searchTab
-
-        ToolBarLayout {
-            id: tabTools
-            ToolIcon {
-                iconId: "toolbar-back"
-                onClicked: tabGroup.currentTab.depth > 1 ? tabGroup.currentTab.pop() : pageStack.pop()
-            }
-            ButtonRow {
-                TabButton {
-                    text: "Search"
-                    tab: showcaseTab
-                }
-                TabButton {
-                    text: "URL"
-                    tab: specialFieldsTab
-                }
-            }
-        }
-    }
-}
-
-
-//Dialog {
-//    id: myDialog
-
-//    title: Item {
-//        height: myDialog.platformStyle.titleBarHeight
-//        width: parent.width
-//        Label {
-//            id: titleLabel
-//            anchors.left: supplement.right
-//            anchors.verticalCenter: titleField.verticalCenter
-//            font.capitalization: Font.MixedCase
-//            color: "white"
-//            text: "Add A Feed"
-//        }
-
-//    }
-
-//    content:Item {
-//        id: name
-//        //height: childrenRect.height
-
-
-
-//        TextInputClear {
-//            id: urlInput
-//            placeHolder: "Enter a feed URL"
-//        }
-
-//    }
-
-//    buttons: ButtonRow {
-//                    platformStyle: ButtonStyle { }
-//                    anchors.horizontalCenter: parent.horizontalCenter
-//                    Button {id: b1; text: "OK"; onClicked: myDialog.accept()}
-//                    Button {id: b2; text: "Cancel"; onClicked: myDialog.reject()}
-//                }
-//}

diff --git a/FeedingIt-Sync/qml/qmlDev/MainPage.qml b/FeedingIt-Sync/qml/qmlDev/MainPage.qml
deleted file mode 100644 (file)
index 9de6496..0000000
--- a/FeedingIt-Sync/qml/qmlDev/MainPage.qml
+++ /dev/null
@@ -1,23 +0,0 @@
-import QtQuick 1.1
-import com.nokia.meego 1.0
-
-Page {
-    tools: commonTools
-
-    Label {
-        id: label
-        anchors.centerIn: parent
-        text: qsTr("Hello world!")
-        visible: false
-    }
-
-    Button{
-        anchors {
-            horizontalCenter: parent.horizontalCenter
-            top: label.bottom
-            topMargin: 10
-        }
-        text: qsTr("Click here!")
-        onClicked: label.visible = true
-    }
-}

diff --git a/FeedingIt-Sync/qml/qmlDev/TextInputClear.qml b/FeedingIt-Sync/qml/qmlDev/TextInputClear.qml
deleted file mode 100644 (file)
index fdc4667..0000000
--- a/FeedingIt-Sync/qml/qmlDev/TextInputClear.qml
+++ /dev/null
@@ -1,48 +0,0 @@
-import QtQuick 1.0
-import com.nokia.meego 1.0
-
-Item {
-    anchors {left: parent.left; right: parent.right}
-    height: custom.height
-    property string placeHolder: ""
-    property alias text: custom.text
-
-//    Rectangle {
-//        id: suggestionBubble
-//        radius: 10
-//        color: "lightgrey"
-//        anchors {left: parent.left; right: custom.right; bottom: custom.top; bottomMargin:5}
-//        height: 100
-
-//        visible: custom.activeFocus
-
-//        Text {
-//            font.pointSize: 14
-//            color: "darkgrey"
-//            anchors {fill: parent; margins: 10}
-//            wrapMode: "Wrap"
-//            text: "Enter a URL (http:// or https://) or a search term: \n" /* + custom.text*/
-//        }
-//    }
-
-    TextField {
-        id: custom
-        anchors {left: parent.left; right: parent.right; rightMargin: 10}
-
-        placeholderText: parent.placeHolder
-        platformStyle: TextFieldStyle { paddingRight: clearButton.width }
-        Image {
-            id: clearButton
-            anchors.right: parent.right
-            anchors.verticalCenter: parent.verticalCenter
-            source: "image://theme/icon-m-input-clear"
-            MouseArea {
-                anchors.fill: parent
-                onClicked: {
-                    inputContext.reset();
-                    custom.text = "";
-                }
-            }
-        }
-    }
-}

diff --git a/FeedingIt-Sync/qml/qmlDev/feedSearch.js b/FeedingIt-Sync/qml/qmlDev/feedSearch.js
deleted file mode 100644 (file)
index a31a663..0000000
--- a/FeedingIt-Sync/qml/qmlDev/feedSearch.js
+++ /dev/null
@@ -1,43 +0,0 @@
-function keywordSearch(keyword) {
-
-    //https://ajax.googleapis.com/ajax/services/feed/find?v=1.0&q=Slashdot
-
-    //console.log("Downloading "+articleUrl)
-    var xhr = new XMLHttpRequest;
-
-    //var params = "apikey=" + Storage.getSetting("apikey")+"&images=1&url="+articleUrl;
-    var params = "v=1.0&output=xml&q=" + keyword
-    var url= "https://ajax.googleapis.com/ajax/services/feed/find";
-    xhr.open("POST", url);
-    xhr.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
-    xhr.setRequestHeader("Content-length", params.length);
-    xhr.setRequestHeader("Connection", "close");
-    //xhr.send(params);
-    //console.log(url);
-    xhr.onreadystatechange = function() {
-        if (xhr.readyState == XMLHttpRequest.DONE) {
-            console.log(xhr.responseText)
-            if ( xhr.status == 200)
-            {
-                var jsonObject = eval('(' + xhr.responseText + ')');
-                searchDialog.model = loaded(jsonObject);
-                searchDialog.open();
-            }
-        }
-    }
-    xhr.send(params);
-
-}
-
-function loaded(jsonObject)
-{
-    //data.responseData["entries"][0]["title"]
-    var listModel = Qt.createQmlObject('ListModel {}');
-    for ( var index in jsonObject.responseData.entries   )
-    {
-        listModel.append({
-                         "name" : jsonObject.responseData["entries"][0]["title"],
-                         "url" : jsonObject.responseData["entries"][0]["url"]});
-    }
-    return listModel;
-}

diff --git a/FeedingIt-Sync/qml/qmlDev/main.qml b/FeedingIt-Sync/qml/qmlDev/main.qml
deleted file mode 100644 (file)
index 0a79ea0..0000000
--- a/FeedingIt-Sync/qml/qmlDev/main.qml
+++ /dev/null
@@ -1,30 +0,0 @@
-import QtQuick 1.1
-import com.nokia.meego 1.0
-
-PageStackWindow {
-    id: appWindow
-
-    initialPage: mainPage
-
-    AddFeed {
-        id: mainPage
-    }
-
-    ToolBarLayout {
-        id: commonTools
-        visible: true
-        ToolIcon {
-            platformIconId: "toolbar-view-menu"
-            anchors.right: (parent === undefined) ? undefined : parent.right
-            onClicked: (myMenu.status == DialogStatus.Closed) ? myMenu.open() : myMenu.close()
-        }
-    }
-
-    Menu {
-        id: myMenu
-        visualParent: pageStack
-        MenuLayout {
-            MenuItem { text: qsTr("Sample menu item") }
-        }
-    }
-}