diff --git a/eotimeseriesviewer/main.py b/eotimeseriesviewer/main.py index 2d2ab74721f213cc78da2fc33f1f2861eae0310c..ecf22b5df06ddfad28ff4451def373ef4a23b5fd 100644 --- a/eotimeseriesviewer/main.py +++ b/eotimeseriesviewer/main.py @@ -67,11 +67,6 @@ class AboutDialogUI(QDialog): def __init__(self, parent=None): """Constructor.""" super(AboutDialogUI, self).__init__(parent) - # Set up the user interface from Designer. - # After setupUI you can access any designer object by doing - # self.<objectname>, and you can use autoconnect slots - see - # http://qt-project.org/doc/qt-4.8/designer-using-a-ui-file.html - # #widgets-and-dialogs-with-auto-connect loadUi(DIR_UI / 'aboutdialog.ui', self) self.setWindowFlags(self.windowFlags() & ~Qt.WindowContextHelpButtonHint) self.init() @@ -96,8 +91,8 @@ class AboutDialogUI(QDialog): # page Changed self.tbAbout.setHtml(readTextFile(PATH_ABOUT)) - self.tbChanges.setHtml(readTextFile(PATH_CHANGELOG + '.html')) - self.tbLicense.setHtml(readTextFile(os.path.splitext(PATH_LICENSE)[0] + '.html')) + self.tbChanges.setHtml(readTextFile(PATH_CHANGELOG)) + self.tbLicense.setHtml(readTextFile(PATH_LICENSE)) def setAboutTitle(self, suffix=None): diff --git a/eotimeseriesviewer/mapcanvas.py b/eotimeseriesviewer/mapcanvas.py index 2b95262636c91291d3c931c4e7bf21cee352c934..85e8bab389e4d223b340c96e38c113b0e4c63eb6 100644 --- a/eotimeseriesviewer/mapcanvas.py +++ b/eotimeseriesviewer/mapcanvas.py @@ -968,7 +968,7 @@ class MapCanvas(QgsMapCanvas): sub = m.addMenu(name) if isinstance(mapLayer, SensorProxyLayer): - sub.setIcon(QIcon(':/timeseriesviewer/icons/icon.svg')) + sub.setIcon(QIcon(':/eotimeseriesviewer/icons/icon.svg')) elif isinstance(mapLayer, QgsRasterLayer): sub.setIcon(QIcon('')) elif isinstance(mapLayer, QgsVectorLayer): diff --git a/eotimeseriesviewer/mapvisualization.py b/eotimeseriesviewer/mapvisualization.py index 6b07c32f1800f6e0b6cbc2364d4f1f34329e1ce9..9793dbc86bf38c076f87f6082b0b919cbba77532 100644 --- a/eotimeseriesviewer/mapvisualization.py +++ b/eotimeseriesviewer/mapvisualization.py @@ -195,7 +195,7 @@ class MapViewLayerTreeModel(QgsLayerTreeModel): return f if role == Qt.DecorationRole: - return QIcon(':/timeseriesviewer/icons/icon.svg') + return QIcon(':/eotimeseriesviewer/icons/icon.svg') return super(MapViewLayerTreeModel, self).data(index, role=role) @@ -2004,9 +2004,9 @@ class MapViewDock(QgsDockWidget): if item == mapView: if mapView.isVisible(): - icon = QIcon(":/timeseriesviewer/icons/mapview.svg") + icon = QIcon(":/eotimeseriesviewer/icons/mapview.svg") else: - icon = QIcon(":/timeseriesviewer/icons/mapviewHidden.svg") + icon = QIcon(":/eotimeseriesviewer/icons/mapviewHidden.svg") self.toolBox.setItemIcon(i, icon) self.toolBox.setItemText(i, 'Map View {} "{}"'.format(numMV, mapView.title())) diff --git a/eotimeseriesviewer/timeseries.py b/eotimeseriesviewer/timeseries.py index 2d50a3ae19e3c8b3f87a0da913f1e5c16b566c0c..2c28fae44b7d0187a4af799c133a0f08883eefe1 100644 --- a/eotimeseriesviewer/timeseries.py +++ b/eotimeseriesviewer/timeseries.py @@ -2074,9 +2074,9 @@ class TimeSeries(QAbstractItemModel): b = isinstance(ext, SpatialExtent) and ext.intersects(self.mCurrentSpatialExtent) if b: - return QIcon(r':/timeseriesviewer/icons/mapview.svg') + return QIcon(r':/eotimeseriesviewer/icons/mapview.svg') else: - return QIcon(r':/timeseriesviewer/icons/mapviewHidden.svg') + return QIcon(r':/eotimeseriesviewer/icons/mapviewHidden.svg') else: print(ext) return None diff --git a/eotimeseriesviewer/ui/aboutdialog.ui b/eotimeseriesviewer/ui/aboutdialog.ui index 48dc3ab1ff9564c8ba31f88a0fdec6212192242c..6809acecf8058f073c0a182142000f61c7418085 100644 --- a/eotimeseriesviewer/ui/aboutdialog.ui +++ b/eotimeseriesviewer/ui/aboutdialog.ui @@ -30,7 +30,7 @@ </property> <property name="windowIcon"> <iconset resource="eotsv_resources.qrc"> - <normaloff>:/timeseriesviewer/icons/icon.svg</normaloff>:/timeseriesviewer/icons/icon.svg</iconset> + <normaloff>:/eotimeseriesviewer/icons/icon.svg</normaloff>:/eotimeseriesviewer/icons/icon.svg</iconset> </property> <property name="sizeGripEnabled"> <bool>false</bool> @@ -246,7 +246,7 @@ <string/> </property> <property name="pixmap"> - <pixmap resource="eotsv_resources.qrc">:/timeseriesviewer/icons/IconTimeSeries.svg</pixmap> + <pixmap resource="eotsv_resources.qrc">:/eotimeseriesviewer/icons/IconTimeSeries.svg</pixmap> </property> <property name="scaledContents"> <bool>true</bool> @@ -344,7 +344,7 @@ <string/> </property> <property name="pixmap"> - <pixmap resource="eotsv_resources.qrc">:/timeseriesviewer/icons/logo_hub.svg</pixmap> + <pixmap resource="eotsv_resources.qrc">:/eotimeseriesviewer/icons/logo_hub.svg</pixmap> </property> <property name="scaledContents"> <bool>true</bool> @@ -385,7 +385,7 @@ p, li { white-space: pre-wrap; } </property> <property name="source"> <url> - <string>qrc:/timeseriesviewer/ABOUT.txt</string> + <string>qrc:/eotimeseriesviewer/ABOUT.txt</string> </url> </property> <property name="openExternalLinks"> @@ -456,7 +456,7 @@ p, li { white-space: pre-wrap; } <action name="actionShowCreditsQgis"> <property name="icon"> <iconset> - <normaloff>:/timeseriesviewer/icons/qgis-icon.svg</normaloff>:/timeseriesviewer/icons/qgis-icon.svg</iconset> + <normaloff>:/eotimeseriesviewer/icons/qgis-icon.svg</normaloff>:/eotimeseriesviewer/icons/qgis-icon.svg</iconset> </property> <property name="text"> <string>showCreditsQgis</string> diff --git a/eotimeseriesviewer/ui/classificationscheme.ui b/eotimeseriesviewer/ui/classificationscheme.ui index dc4123fb744abeb865a1e00cdc4a9325bfde7dcb..1ff6bf2aa4c98977844e4f2b0c5b0b05e1778c4d 100644 --- a/eotimeseriesviewer/ui/classificationscheme.ui +++ b/eotimeseriesviewer/ui/classificationscheme.ui @@ -26,7 +26,7 @@ </property> <property name="icon"> <iconset resource="eotsv_resources.qrc"> - <normaloff>:/timeseriesviewer/icons/copyright_label.svg</normaloff>:/timeseriesviewer/icons/copyright_label.svg</iconset> + <normaloff>:/eotimeseriesviewer/icons/copyright_label.svg</normaloff>:/eotimeseriesviewer/icons/copyright_label.svg</iconset> </property> </widget> </item> @@ -37,7 +37,7 @@ </property> <property name="icon"> <iconset resource="eotsv_resources.qrc"> - <normaloff>:/timeseriesviewer/icons/mActionRemove.svg</normaloff>:/timeseriesviewer/icons/mActionRemove.svg</iconset> + <normaloff>:/eotimeseriesviewer/icons/mActionRemove.svg</normaloff>:/eotimeseriesviewer/icons/mActionRemove.svg</iconset> </property> </widget> </item> @@ -48,7 +48,7 @@ </property> <property name="icon"> <iconset resource="eotsv_resources.qrc"> - <normaloff>:/timeseriesviewer/icons/mActionAdd.svg</normaloff>:/timeseriesviewer/icons/mActionAdd.svg</iconset> + <normaloff>:/eotimeseriesviewer/icons/mActionAdd.svg</normaloff>:/eotimeseriesviewer/icons/mActionAdd.svg</iconset> </property> </widget> </item> diff --git a/eotimeseriesviewer/ui/cursorlocationinfodock.ui b/eotimeseriesviewer/ui/cursorlocationinfodock.ui index 722ca120a29fd610d1d1865f3b351f46d7caf5dc..358a71368eb32a1a73a9d4d5c975fac00bf69415 100644 --- a/eotimeseriesviewer/ui/cursorlocationinfodock.ui +++ b/eotimeseriesviewer/ui/cursorlocationinfodock.ui @@ -49,7 +49,7 @@ </property> <property name="icon"> <iconset resource="eotsv_resources.qrc"> - <normaloff>:/timeseriesviewer/icons/mActionIdentify.svg</normaloff>:/timeseriesviewer/icons/mActionIdentify.svg</iconset> + <normaloff>:/eotimeseriesviewer/icons/mActionIdentify.svg</normaloff>:/eotimeseriesviewer/icons/mActionIdentify.svg</iconset> </property> <property name="autoRaise"> <bool>true</bool> @@ -66,7 +66,7 @@ </property> <property name="icon"> <iconset> - <normaloff>:/timeseriesviewer/icons/mActionRefresh.png</normaloff>:/timeseriesviewer/icons/mActionRefresh.png</iconset> + <normaloff>:/eotimeseriesviewer/icons/mActionRefresh.png</normaloff>:/eotimeseriesviewer/icons/mActionRefresh.png</iconset> </property> <property name="autoRaise"> <bool>true</bool> @@ -241,7 +241,7 @@ <action name="actionRequestCursorLocation"> <property name="icon"> <iconset resource="eotsv_resources.qrc"> - <normaloff>:/timeseriesviewer/icons/mActionIdentify.svg</normaloff>:/timeseriesviewer/icons/mActionIdentify.svg</iconset> + <normaloff>:/eotimeseriesviewer/icons/mActionIdentify.svg</normaloff>:/eotimeseriesviewer/icons/mActionIdentify.svg</iconset> </property> <property name="text"> <string>Select Cursor Location</string> @@ -250,7 +250,7 @@ <action name="actionReload"> <property name="icon"> <iconset resource="eotsv_resources.qrc"> - <normaloff>:/timeseriesviewer/icons/mActionRefresh.svg</normaloff>:/timeseriesviewer/icons/mActionRefresh.svg</iconset> + <normaloff>:/eotimeseriesviewer/icons/mActionRefresh.svg</normaloff>:/eotimeseriesviewer/icons/mActionRefresh.svg</iconset> </property> <property name="text"> <string>Reload</string> diff --git a/eotimeseriesviewer/ui/eotsv_resources.qrc b/eotimeseriesviewer/ui/eotsv_resources.qrc index d63f37e1ba08e7ec85211ed9ff5eda0eba483baf..a797f1f799de81a0d00581f6c3e32cc4c62bad2a 100644 --- a/eotimeseriesviewer/ui/eotsv_resources.qrc +++ b/eotimeseriesviewer/ui/eotsv_resources.qrc @@ -1,5 +1,5 @@ <RCC> - <qresource prefix="timeseriesviewer"> + <qresource prefix="eotimeseriesviewer"> <file>icons/mActionArrowLeftEnd.svg</file> <file>icons/mActionArrowRightEnd.svg</file> <file>icons/qgsMapCenter.svg</file> diff --git a/eotimeseriesviewer/ui/mapview.ui b/eotimeseriesviewer/ui/mapview.ui index f563dc5db127332ad1a74ee37f27f7470d0493a9..3c02388903c417bbfbb05f2161afa6d9eb3d1b2c 100644 --- a/eotimeseriesviewer/ui/mapview.ui +++ b/eotimeseriesviewer/ui/mapview.ui @@ -27,7 +27,7 @@ </property> <property name="windowIcon"> <iconset resource="eotsv_resources.qrc"> - <normaloff>:/timeseriesviewer/icons/mapview.svg</normaloff>:/timeseriesviewer/icons/mapview.svg</iconset> + <normaloff>:/eotimeseriesviewer/icons/mapview.svg</normaloff>:/eotimeseriesviewer/icons/mapview.svg</iconset> </property> <property name="frameShape"> <enum>QFrame::StyledPanel</enum> @@ -72,7 +72,7 @@ </property> <property name="icon"> <iconset resource="eotsv_resources.qrc"> - <normaloff>:/timeseriesviewer/icons/mapviewHidden.svg</normaloff>:/timeseriesviewer/icons/mapviewHidden.svg</iconset> + <normaloff>:/eotimeseriesviewer/icons/mapviewHidden.svg</normaloff>:/eotimeseriesviewer/icons/mapviewHidden.svg</iconset> </property> <property name="checkable"> <bool>true</bool> @@ -110,7 +110,7 @@ </property> <property name="icon"> <iconset resource="eotsv_resources.qrc"> - <normaloff>:/timeseriesviewer/icons/crosshair.svg</normaloff>:/timeseriesviewer/icons/crosshair.svg</iconset> + <normaloff>:/eotimeseriesviewer/icons/crosshair.svg</normaloff>:/eotimeseriesviewer/icons/crosshair.svg</iconset> </property> <property name="checkable"> <bool>true</bool> @@ -248,7 +248,7 @@ </property> <property name="icon"> <iconset resource="eotsv_resources.qrc"> - <normaloff>:/timeseriesviewer/icons/mapviewHidden.svg</normaloff>:/timeseriesviewer/icons/mapviewHidden.svg</iconset> + <normaloff>:/eotimeseriesviewer/icons/mapviewHidden.svg</normaloff>:/eotimeseriesviewer/icons/mapviewHidden.svg</iconset> </property> <property name="text"> <string>Hide Map View</string> @@ -266,7 +266,7 @@ </property> <property name="icon"> <iconset resource="eotsv_resources.qrc"> - <normaloff>:/timeseriesviewer/icons/crosshair.svg</normaloff>:/timeseriesviewer/icons/crosshair.svg</iconset> + <normaloff>:/eotimeseriesviewer/icons/crosshair.svg</normaloff>:/eotimeseriesviewer/icons/crosshair.svg</iconset> </property> <property name="text"> <string>Show/hide Crosshair</string> @@ -278,7 +278,7 @@ <action name="actionSetCrosshairStyle"> <property name="icon"> <iconset resource="eotsv_resources.qrc"> - <normaloff>:/timeseriesviewer/icons/symbology.svg</normaloff>:/timeseriesviewer/icons/symbology.svg</iconset> + <normaloff>:/eotimeseriesviewer/icons/symbology.svg</normaloff>:/eotimeseriesviewer/icons/symbology.svg</iconset> </property> <property name="text"> <string>Set crosshair style</string> diff --git a/eotimeseriesviewer/ui/mapviewdock.ui b/eotimeseriesviewer/ui/mapviewdock.ui index a174b83ef26bd18c5f70548c8d4d9b62469b2c32..12537eb0c27cbe3c68d6a8dbe2a070c812a31056 100644 --- a/eotimeseriesviewer/ui/mapviewdock.ui +++ b/eotimeseriesviewer/ui/mapviewdock.ui @@ -60,7 +60,7 @@ </property> <property name="icon"> <iconset resource="eotsv_resources.qrc"> - <normaloff>:/timeseriesviewer/icons/mActionRemoveMapView.svg</normaloff>:/timeseriesviewer/icons/mActionRemoveMapView.svg</iconset> + <normaloff>:/eotimeseriesviewer/icons/mActionRemoveMapView.svg</normaloff>:/eotimeseriesviewer/icons/mActionRemoveMapView.svg</iconset> </property> <property name="autoRaise"> <bool>true</bool> @@ -80,7 +80,7 @@ </property> <property name="icon"> <iconset resource="eotsv_resources.qrc"> - <normaloff>:/timeseriesviewer/icons/mActionAddMapView.svg</normaloff>:/timeseriesviewer/icons/mActionAddMapView.svg</iconset> + <normaloff>:/eotimeseriesviewer/icons/mActionAddMapView.svg</normaloff>:/eotimeseriesviewer/icons/mActionAddMapView.svg</iconset> </property> <property name="autoRaise"> <bool>true</bool> @@ -591,7 +591,7 @@ QToolBox::tab:selected { /* italicize selected tabs */ <action name="actionRemoveMapView"> <property name="icon"> <iconset resource="eotsv_resources.qrc"> - <normaloff>:/timeseriesviewer/icons/mActionRemoveMapView.svg</normaloff>:/timeseriesviewer/icons/mActionRemoveMapView.svg</iconset> + <normaloff>:/eotimeseriesviewer/icons/mActionRemoveMapView.svg</normaloff>:/eotimeseriesviewer/icons/mActionRemoveMapView.svg</iconset> </property> <property name="text"> <string>Remove view</string> @@ -603,7 +603,7 @@ QToolBox::tab:selected { /* italicize selected tabs */ <action name="actionAddMapView"> <property name="icon"> <iconset resource="eotsv_resources.qrc"> - <normaloff>:/timeseriesviewer/icons/mActionAddMapView.svg</normaloff>:/timeseriesviewer/icons/mActionAddMapView.svg</iconset> + <normaloff>:/eotimeseriesviewer/icons/mActionAddMapView.svg</normaloff>:/eotimeseriesviewer/icons/mActionAddMapView.svg</iconset> </property> <property name="text"> <string>ApplyStyles</string> diff --git a/eotimeseriesviewer/ui/mapwidget.ui b/eotimeseriesviewer/ui/mapwidget.ui index e4afe8fc70c3d76c5ed79ba26a92b90ce23426d9..8cbda314fa192b9f7ad800fe2104673dab6cf6eb 100644 --- a/eotimeseriesviewer/ui/mapwidget.ui +++ b/eotimeseriesviewer/ui/mapwidget.ui @@ -82,7 +82,7 @@ </property> <property name="icon"> <iconset resource="eotsv_resources.qrc"> - <normaloff>:/timeseriesviewer/icons/mActionArrowLeftEnd.svg</normaloff>:/timeseriesviewer/icons/mActionArrowLeftEnd.svg</iconset> + <normaloff>:/eotimeseriesviewer/icons/mActionArrowLeftEnd.svg</normaloff>:/eotimeseriesviewer/icons/mActionArrowLeftEnd.svg</iconset> </property> <property name="autoRaise"> <bool>true</bool> @@ -168,7 +168,7 @@ </property> <property name="icon"> <iconset resource="eotsv_resources.qrc"> - <normaloff>:/timeseriesviewer/icons/mActionArrowRightEnd.svg</normaloff>:/timeseriesviewer/icons/mActionArrowRightEnd.svg</iconset> + <normaloff>:/eotimeseriesviewer/icons/mActionArrowRightEnd.svg</normaloff>:/eotimeseriesviewer/icons/mActionArrowRightEnd.svg</iconset> </property> <property name="autoRaise"> <bool>true</bool> @@ -205,7 +205,7 @@ <action name="actionLastDate"> <property name="icon"> <iconset resource="eotsv_resources.qrc"> - <normaloff>:/timeseriesviewer/icons/mActionArrowRightEnd.svg</normaloff>:/timeseriesviewer/icons/mActionArrowRightEnd.svg</iconset> + <normaloff>:/eotimeseriesviewer/icons/mActionArrowRightEnd.svg</normaloff>:/eotimeseriesviewer/icons/mActionArrowRightEnd.svg</iconset> </property> <property name="text"> <string>Last Date</string> @@ -214,7 +214,7 @@ <action name="actionFirstDate"> <property name="icon"> <iconset resource="eotsv_resources.qrc"> - <normaloff>:/timeseriesviewer/icons/mActionArrowLeftEnd.svg</normaloff>:/timeseriesviewer/icons/mActionArrowLeftEnd.svg</iconset> + <normaloff>:/eotimeseriesviewer/icons/mActionArrowLeftEnd.svg</normaloff>:/eotimeseriesviewer/icons/mActionArrowLeftEnd.svg</iconset> </property> <property name="text"> <string>First Date</string> diff --git a/eotimeseriesviewer/ui/profileviewdock.ui b/eotimeseriesviewer/ui/profileviewdock.ui index d4f159a0456cbb37dff8dc3af295888f7de8a06e..a5aa7894ab091a58537c8fe41a86db128acabd5d 100644 --- a/eotimeseriesviewer/ui/profileviewdock.ui +++ b/eotimeseriesviewer/ui/profileviewdock.ui @@ -126,7 +126,7 @@ </property> <property name="icon"> <iconset resource="eotsv_resources.qrc"> - <normaloff>:/timeseriesviewer/icons/mIconTemporalProfile2D.svg</normaloff>:/timeseriesviewer/icons/mIconTemporalProfile2D.svg</iconset> + <normaloff>:/eotimeseriesviewer/icons/mIconTemporalProfile2D.svg</normaloff>:/eotimeseriesviewer/icons/mIconTemporalProfile2D.svg</iconset> </property> </item> <item> @@ -138,7 +138,7 @@ </property> <property name="icon"> <iconset resource="eotsv_resources.qrc"> - <normaloff>:/timeseriesviewer/icons/mIconTemporalProfile3D.svg</normaloff>:/timeseriesviewer/icons/mIconTemporalProfile3D.svg</iconset> + <normaloff>:/eotimeseriesviewer/icons/mIconTemporalProfile3D.svg</normaloff>:/eotimeseriesviewer/icons/mIconTemporalProfile3D.svg</iconset> </property> </item> <item> @@ -150,7 +150,7 @@ </property> <property name="icon"> <iconset resource="eotsv_resources.qrc"> - <normaloff>:/timeseriesviewer/icons/mActionOpenTable.svg</normaloff>:/timeseriesviewer/icons/mActionOpenTable.svg</iconset> + <normaloff>:/eotimeseriesviewer/icons/mActionOpenTable.svg</normaloff>:/eotimeseriesviewer/icons/mActionOpenTable.svg</iconset> </property> </item> </widget> @@ -779,7 +779,7 @@ background-color: rgb(0, 0, 0);</string> <action name="actionRefresh2D"> <property name="icon"> <iconset resource="eotsv_resources.qrc"> - <normaloff>:/timeseriesviewer/icons/mActionRefresh.svg</normaloff>:/timeseriesviewer/icons/mActionRefresh.svg</iconset> + <normaloff>:/eotimeseriesviewer/icons/mActionRefresh.svg</normaloff>:/eotimeseriesviewer/icons/mActionRefresh.svg</iconset> </property> <property name="text"> <string>Refresh 2D Plot</string> @@ -791,7 +791,7 @@ background-color: rgb(0, 0, 0);</string> <action name="actionAddStyle2D"> <property name="icon"> <iconset resource="eotsv_resources.qrc"> - <normaloff>:/timeseriesviewer/icons/mActionAdd.svg</normaloff>:/timeseriesviewer/icons/mActionAdd.svg</iconset> + <normaloff>:/eotimeseriesviewer/icons/mActionAdd.svg</normaloff>:/eotimeseriesviewer/icons/mActionAdd.svg</iconset> </property> <property name="text"> <string>Add 2D profile visualization</string> @@ -803,7 +803,7 @@ background-color: rgb(0, 0, 0);</string> <action name="actionRemoveStyle2D"> <property name="icon"> <iconset resource="eotsv_resources.qrc"> - <normaloff>:/timeseriesviewer/icons/mActionRemove.svg</normaloff>:/timeseriesviewer/icons/mActionRemove.svg</iconset> + <normaloff>:/eotimeseriesviewer/icons/mActionRemove.svg</normaloff>:/eotimeseriesviewer/icons/mActionRemove.svg</iconset> </property> <property name="text"> <string>Remove 2D profiles</string> @@ -815,7 +815,7 @@ background-color: rgb(0, 0, 0);</string> <action name="actionLoadProfileRequest"> <property name="icon"> <iconset resource="eotsv_resources.qrc"> - <normaloff>:/timeseriesviewer/icons/mIconTemporalProfile.svg</normaloff>:/timeseriesviewer/icons/mIconTemporalProfile.svg</iconset> + <normaloff>:/eotimeseriesviewer/icons/mIconTemporalProfile.svg</normaloff>:/eotimeseriesviewer/icons/mIconTemporalProfile.svg</iconset> </property> <property name="text"> <string>Select Profile</string> @@ -827,7 +827,7 @@ background-color: rgb(0, 0, 0);</string> <action name="actionRefresh3D"> <property name="icon"> <iconset resource="eotsv_resources.qrc"> - <normaloff>:/timeseriesviewer/icons/mActionRefresh.svg</normaloff>:/timeseriesviewer/icons/mActionRefresh.svg</iconset> + <normaloff>:/eotimeseriesviewer/icons/mActionRefresh.svg</normaloff>:/eotimeseriesviewer/icons/mActionRefresh.svg</iconset> </property> <property name="text"> <string>Refresh 3D Plot</string> @@ -851,7 +851,7 @@ background-color: rgb(0, 0, 0);</string> <action name="actionReset3DCamera"> <property name="icon"> <iconset resource="eotsv_resources.qrc"> - <normaloff>:/timeseriesviewer/icons/mActionZoomFullExtent.svg</normaloff>:/timeseriesviewer/icons/mActionZoomFullExtent.svg</iconset> + <normaloff>:/eotimeseriesviewer/icons/mActionZoomFullExtent.svg</normaloff>:/eotimeseriesviewer/icons/mActionZoomFullExtent.svg</iconset> </property> <property name="text"> <string>Reset 3D Camera</string> @@ -860,7 +860,7 @@ background-color: rgb(0, 0, 0);</string> <action name="actionAddStyle3D"> <property name="icon"> <iconset resource="eotsv_resources.qrc"> - <normaloff>:/timeseriesviewer/icons/mActionAdd.svg</normaloff>:/timeseriesviewer/icons/mActionAdd.svg</iconset> + <normaloff>:/eotimeseriesviewer/icons/mActionAdd.svg</normaloff>:/eotimeseriesviewer/icons/mActionAdd.svg</iconset> </property> <property name="text"> <string>Add 3D visualization</string> @@ -872,7 +872,7 @@ background-color: rgb(0, 0, 0);</string> <action name="actionRemoveStyle3D"> <property name="icon"> <iconset resource="eotsv_resources.qrc"> - <normaloff>:/timeseriesviewer/icons/mActionRemove.svg</normaloff>:/timeseriesviewer/icons/mActionRemove.svg</iconset> + <normaloff>:/eotimeseriesviewer/icons/mActionRemove.svg</normaloff>:/eotimeseriesviewer/icons/mActionRemove.svg</iconset> </property> <property name="text"> <string>Remove 3D visualization</string> @@ -884,7 +884,7 @@ background-color: rgb(0, 0, 0);</string> <action name="actionLoadTPFromOgr"> <property name="icon"> <iconset resource="eotsv_resources.qrc"> - <normaloff>:/timeseriesviewer/icons/mActionAddOgrLayer.svg</normaloff>:/timeseriesviewer/icons/mActionAddOgrLayer.svg</iconset> + <normaloff>:/eotimeseriesviewer/icons/mActionAddOgrLayer.svg</normaloff>:/eotimeseriesviewer/icons/mActionAddOgrLayer.svg</iconset> </property> <property name="text"> <string>Load Coordinates</string> @@ -896,7 +896,7 @@ background-color: rgb(0, 0, 0);</string> <action name="actionReset2DPlot"> <property name="icon"> <iconset resource="eotsv_resources.qrc"> - <normaloff>:/timeseriesviewer/icons/mActionZoomFullExtent.svg</normaloff>:/timeseriesviewer/icons/mActionZoomFullExtent.svg</iconset> + <normaloff>:/eotimeseriesviewer/icons/mActionZoomFullExtent.svg</normaloff>:/eotimeseriesviewer/icons/mActionZoomFullExtent.svg</iconset> </property> <property name="text"> <string>Reset 3D Plot</string> @@ -908,7 +908,7 @@ background-color: rgb(0, 0, 0);</string> <action name="actionLoadMissingValues"> <property name="icon"> <iconset resource="eotsv_resources.qrc"> - <normaloff>:/timeseriesviewer/icons/mIconTemporalProfileRefresh.svg</normaloff>:/timeseriesviewer/icons/mIconTemporalProfileRefresh.svg</iconset> + <normaloff>:/eotimeseriesviewer/icons/mIconTemporalProfileRefresh.svg</normaloff>:/eotimeseriesviewer/icons/mIconTemporalProfileRefresh.svg</iconset> </property> <property name="text"> <string>Load Missing Values</string> @@ -920,7 +920,7 @@ background-color: rgb(0, 0, 0);</string> <action name="actionSaveTemporalProfiles"> <property name="icon"> <iconset resource="eotsv_resources.qrc"> - <normaloff>:/timeseriesviewer/icons/mActionFileSaveAs.svg</normaloff>:/timeseriesviewer/icons/mActionFileSaveAs.svg</iconset> + <normaloff>:/eotimeseriesviewer/icons/mActionFileSaveAs.svg</normaloff>:/eotimeseriesviewer/icons/mActionFileSaveAs.svg</iconset> </property> <property name="text"> <string>Save Temporal Profiles</string> diff --git a/eotimeseriesviewer/ui/spectrallibrarywidget.ui b/eotimeseriesviewer/ui/spectrallibrarywidget.ui index e0d3a80156f62590d2137cda3578781810f4e9f5..26b30181b7bb2b7964c2379783519560f540f9a9 100644 --- a/eotimeseriesviewer/ui/spectrallibrarywidget.ui +++ b/eotimeseriesviewer/ui/spectrallibrarywidget.ui @@ -244,7 +244,7 @@ <action name="actionImportSpeclib"> <property name="icon"> <iconset resource="eotsv_resources.qrc"> - <normaloff>:/timeseriesviewer/icons/speclib_add.svg</normaloff>:/timeseriesviewer/icons/speclib_add.svg</iconset> + <normaloff>:/eotimeseriesviewer/icons/speclib_add.svg</normaloff>:/eotimeseriesviewer/icons/speclib_add.svg</iconset> </property> <property name="text"> <string>importSpeclib</string> @@ -256,7 +256,7 @@ <action name="actionSaveSpeclib"> <property name="icon"> <iconset resource="eotsv_resources.qrc"> - <normaloff>:/timeseriesviewer/icons/speclib_save.svg</normaloff>:/timeseriesviewer/icons/speclib_save.svg</iconset> + <normaloff>:/eotimeseriesviewer/icons/speclib_save.svg</normaloff>:/eotimeseriesviewer/icons/speclib_save.svg</iconset> </property> <property name="text"> <string>Save Spectral Library</string> @@ -361,7 +361,7 @@ <action name="actionSelectProfilesFromMap"> <property name="icon"> <iconset resource="eotsv_resources.qrc"> - <normaloff>:/timeseriesviewer/icons/pickrasterspectrum.svg</normaloff>:/timeseriesviewer/icons/pickrasterspectrum.svg</iconset> + <normaloff>:/eotimeseriesviewer/icons/pickrasterspectrum.svg</normaloff>:/eotimeseriesviewer/icons/pickrasterspectrum.svg</iconset> </property> <property name="text"> <string>Select Profiles from Map</string> @@ -376,7 +376,7 @@ </property> <property name="icon"> <iconset resource="eotsv_resources.qrc"> - <normaloff>:/timeseriesviewer/icons/profile2speclib.svg</normaloff>:/timeseriesviewer/icons/profile2speclib.svg</iconset> + <normaloff>:/eotimeseriesviewer/icons/profile2speclib.svg</normaloff>:/eotimeseriesviewer/icons/profile2speclib.svg</iconset> </property> <property name="text"> <string>Save current profiles</string> @@ -391,7 +391,7 @@ <action name="actionReload"> <property name="icon"> <iconset resource="eotsv_resources.qrc"> - <normaloff>:/timeseriesviewer/icons/mActionRefresh.svg</normaloff>:/timeseriesviewer/icons/mActionRefresh.svg</iconset> + <normaloff>:/eotimeseriesviewer/icons/mActionRefresh.svg</normaloff>:/eotimeseriesviewer/icons/mActionRefresh.svg</iconset> </property> <property name="text"> <string>Reload the table</string> @@ -529,7 +529,7 @@ </property> <property name="icon"> <iconset resource="eotsv_resources.qrc"> - <normaloff>:/timeseriesviewer/icons/profile2speclib_auto.svg</normaloff>:/timeseriesviewer/icons/profile2speclib_auto.svg</iconset> + <normaloff>:/eotimeseriesviewer/icons/profile2speclib_auto.svg</normaloff>:/eotimeseriesviewer/icons/profile2speclib_auto.svg</iconset> </property> <property name="text"> <string>AddCurrentProfilesAutomatically</string> diff --git a/eotimeseriesviewer/ui/stackedinputdatadialog.ui b/eotimeseriesviewer/ui/stackedinputdatadialog.ui index 9bfeb872d506e9758b218c1274dfff6525f51797..50cad940140b8b7b5581169f219dbf1a46bc5a34 100644 --- a/eotimeseriesviewer/ui/stackedinputdatadialog.ui +++ b/eotimeseriesviewer/ui/stackedinputdatadialog.ui @@ -370,7 +370,7 @@ <action name="actionAddSourceStack"> <property name="icon"> <iconset resource="eotsv_resources.qrc"> - <normaloff>:/timeseriesviewer/icons/mActionAddRasterLayer.svg</normaloff>:/timeseriesviewer/icons/mActionAddRasterLayer.svg</iconset> + <normaloff>:/eotimeseriesviewer/icons/mActionAddRasterLayer.svg</normaloff>:/eotimeseriesviewer/icons/mActionAddRasterLayer.svg</iconset> </property> <property name="text"> <string>AddSourceStack</string> @@ -379,7 +379,7 @@ <action name="actionRemoveSourceStack"> <property name="icon"> <iconset resource="eotsv_resources.qrc"> - <normaloff>:/timeseriesviewer/icons/mActionRemoveTSD.svg</normaloff>:/timeseriesviewer/icons/mActionRemoveTSD.svg</iconset> + <normaloff>:/eotimeseriesviewer/icons/mActionRemoveTSD.svg</normaloff>:/eotimeseriesviewer/icons/mActionRemoveTSD.svg</iconset> </property> <property name="text"> <string>removeSourceStack</string> diff --git a/eotimeseriesviewer/ui/timeseriesviewer.ui b/eotimeseriesviewer/ui/timeseriesviewer.ui index 6784edb340aff8f3e9ef7eb9799ee8ea09b10cb6..c5f6d8e11b31875328ba1f1f1cc486ab59f5e52d 100644 --- a/eotimeseriesviewer/ui/timeseriesviewer.ui +++ b/eotimeseriesviewer/ui/timeseriesviewer.ui @@ -15,7 +15,7 @@ </property> <property name="windowIcon"> <iconset resource="eotsv_resources.qrc"> - <normaloff>:/timeseriesviewer/icons/IconTimeSeries.svg</normaloff>:/timeseriesviewer/icons/IconTimeSeries.svg</iconset> + <normaloff>:/eotimeseriesviewer/icons/IconTimeSeries.svg</normaloff>:/eotimeseriesviewer/icons/IconTimeSeries.svg</iconset> </property> <property name="toolButtonStyle"> <enum>Qt::ToolButtonFollowStyle</enum> @@ -224,7 +224,7 @@ <action name="actionMoveCenter"> <property name="icon"> <iconset resource="eotsv_resources.qrc"> - <normaloff>:/timeseriesviewer/icons/mActionZoomPoint.svg</normaloff>:/timeseriesviewer/icons/mActionZoomPoint.svg</iconset> + <normaloff>:/eotimeseriesviewer/icons/mActionZoomPoint.svg</normaloff>:/eotimeseriesviewer/icons/mActionZoomPoint.svg</iconset> </property> <property name="text"> <string>SelectCenter</string> @@ -236,7 +236,7 @@ <action name="actionSelectCRS"> <property name="icon"> <iconset resource="eotsv_resources.qrc"> - <normaloff>:/timeseriesviewer/icons/CRS.svg</normaloff>:/timeseriesviewer/icons/CRS.svg</iconset> + <normaloff>:/eotimeseriesviewer/icons/CRS.svg</normaloff>:/eotimeseriesviewer/icons/CRS.svg</iconset> </property> <property name="text"> <string>Select CRS</string> @@ -248,7 +248,7 @@ <action name="actionLoadTS"> <property name="icon"> <iconset resource="eotsv_resources.qrc"> - <normaloff>:/timeseriesviewer/icons/mActionAddTS.svg</normaloff>:/timeseriesviewer/icons/mActionAddTS.svg</iconset> + <normaloff>:/eotimeseriesviewer/icons/mActionAddTS.svg</normaloff>:/eotimeseriesviewer/icons/mActionAddTS.svg</iconset> </property> <property name="text"> <string>Load time series</string> @@ -260,7 +260,7 @@ <action name="actionAddTSD"> <property name="icon"> <iconset resource="eotsv_resources.qrc"> - <normaloff>:/timeseriesviewer/icons/mActionAddRasterLayer.svg</normaloff>:/timeseriesviewer/icons/mActionAddRasterLayer.svg</iconset> + <normaloff>:/eotimeseriesviewer/icons/mActionAddRasterLayer.svg</normaloff>:/eotimeseriesviewer/icons/mActionAddRasterLayer.svg</iconset> </property> <property name="text"> <string>Add images</string> @@ -272,7 +272,7 @@ <action name="actionRemoveTSD"> <property name="icon"> <iconset resource="eotsv_resources.qrc"> - <normaloff>:/timeseriesviewer/icons/mActionRemoveTSD.svg</normaloff>:/timeseriesviewer/icons/mActionRemoveTSD.svg</iconset> + <normaloff>:/eotimeseriesviewer/icons/mActionRemoveTSD.svg</normaloff>:/eotimeseriesviewer/icons/mActionRemoveTSD.svg</iconset> </property> <property name="text"> <string>Remove images</string> @@ -284,7 +284,7 @@ <action name="actionSaveTS"> <property name="icon"> <iconset resource="eotsv_resources.qrc"> - <normaloff>:/timeseriesviewer/icons/mActionSaveTS.svg</normaloff>:/timeseriesviewer/icons/mActionSaveTS.svg</iconset> + <normaloff>:/eotimeseriesviewer/icons/mActionSaveTS.svg</normaloff>:/eotimeseriesviewer/icons/mActionSaveTS.svg</iconset> </property> <property name="text"> <string>Save time serie</string> @@ -296,7 +296,7 @@ <action name="actionAddMapView"> <property name="icon"> <iconset resource="eotsv_resources.qrc"> - <normaloff>:/timeseriesviewer/icons/mActionAddMapView.svg</normaloff>:/timeseriesviewer/icons/mActionAddMapView.svg</iconset> + <normaloff>:/eotimeseriesviewer/icons/mActionAddMapView.svg</normaloff>:/eotimeseriesviewer/icons/mActionAddMapView.svg</iconset> </property> <property name="text"> <string>Add Map View</string> @@ -308,7 +308,7 @@ <action name="actionRemoveMapView"> <property name="icon"> <iconset resource="eotsv_resources.qrc"> - <normaloff>:/timeseriesviewer/icons/mActionRemoveMapView.svg</normaloff>:/timeseriesviewer/icons/mActionRemoveMapView.svg</iconset> + <normaloff>:/eotimeseriesviewer/icons/mActionRemoveMapView.svg</normaloff>:/eotimeseriesviewer/icons/mActionRemoveMapView.svg</iconset> </property> <property name="text"> <string>Remove Map View</string> @@ -320,7 +320,7 @@ <action name="actionAddTSExample"> <property name="icon"> <iconset resource="eotsv_resources.qrc"> - <normaloff>:/timeseriesviewer/icons/mActionAddTS.svg</normaloff>:/timeseriesviewer/icons/mActionAddTS.svg</iconset> + <normaloff>:/eotimeseriesviewer/icons/mActionAddTS.svg</normaloff>:/eotimeseriesviewer/icons/mActionAddTS.svg</iconset> </property> <property name="text"> <string>Add example</string> @@ -332,7 +332,7 @@ <action name="actionAbout"> <property name="icon"> <iconset resource="eotsv_resources.qrc"> - <normaloff>:/timeseriesviewer/icons/metadata.svg</normaloff>:/timeseriesviewer/icons/metadata.svg</iconset> + <normaloff>:/eotimeseriesviewer/icons/metadata.svg</normaloff>:/eotimeseriesviewer/icons/metadata.svg</iconset> </property> <property name="text"> <string>About</string> @@ -349,7 +349,7 @@ <action name="actionClearTS"> <property name="icon"> <iconset resource="eotsv_resources.qrc"> - <normaloff>:/timeseriesviewer/icons/mActionRemoveTS.svg</normaloff>:/timeseriesviewer/icons/mActionRemoveTS.svg</iconset> + <normaloff>:/eotimeseriesviewer/icons/mActionRemoveTS.svg</normaloff>:/eotimeseriesviewer/icons/mActionRemoveTS.svg</iconset> </property> <property name="text"> <string>Clear Time Series</string> @@ -369,7 +369,7 @@ </property> <property name="icon"> <iconset resource="eotsv_resources.qrc"> - <normaloff>:/timeseriesviewer/icons/mActionZoomIn.svg</normaloff>:/timeseriesviewer/icons/mActionZoomIn.svg</iconset> + <normaloff>:/eotimeseriesviewer/icons/mActionZoomIn.svg</normaloff>:/eotimeseriesviewer/icons/mActionZoomIn.svg</iconset> </property> <property name="text"> <string>Zoom in</string> @@ -384,7 +384,7 @@ </property> <property name="icon"> <iconset resource="eotsv_resources.qrc"> - <normaloff>:/timeseriesviewer/icons/mActionZoomOut.svg</normaloff>:/timeseriesviewer/icons/mActionZoomOut.svg</iconset> + <normaloff>:/eotimeseriesviewer/icons/mActionZoomOut.svg</normaloff>:/eotimeseriesviewer/icons/mActionZoomOut.svg</iconset> </property> <property name="text"> <string>Zoom out</string> @@ -399,7 +399,7 @@ </property> <property name="icon"> <iconset resource="eotsv_resources.qrc"> - <normaloff>:/timeseriesviewer/icons/mActionZoomFullExtent.svg</normaloff>:/timeseriesviewer/icons/mActionZoomFullExtent.svg</iconset> + <normaloff>:/eotimeseriesviewer/icons/mActionZoomFullExtent.svg</normaloff>:/eotimeseriesviewer/icons/mActionZoomFullExtent.svg</iconset> </property> <property name="text"> <string>Max. Extent</string> @@ -414,7 +414,7 @@ </property> <property name="icon"> <iconset resource="eotsv_resources.qrc"> - <normaloff>:/timeseriesviewer/icons/mActionZoomActual.svg</normaloff>:/timeseriesviewer/icons/mActionZoomActual.svg</iconset> + <normaloff>:/eotimeseriesviewer/icons/mActionZoomActual.svg</normaloff>:/eotimeseriesviewer/icons/mActionZoomActual.svg</iconset> </property> <property name="text"> <string>Pixel Scale</string> @@ -429,7 +429,7 @@ </property> <property name="icon"> <iconset resource="eotsv_resources.qrc"> - <normaloff>:/timeseriesviewer/icons/mActionPan.svg</normaloff>:/timeseriesviewer/icons/mActionPan.svg</iconset> + <normaloff>:/eotimeseriesviewer/icons/mActionPan.svg</normaloff>:/eotimeseriesviewer/icons/mActionPan.svg</iconset> </property> <property name="text"> <string>Pan Map</string> @@ -446,7 +446,7 @@ <action name="actionIdentifyCursorLocationValues"> <property name="icon"> <iconset resource="eotsv_resources.qrc"> - <normaloff>:/timeseriesviewer/icons/mActionIdentify.svg</normaloff>:/timeseriesviewer/icons/mActionIdentify.svg</iconset> + <normaloff>:/eotimeseriesviewer/icons/mActionIdentify.svg</normaloff>:/eotimeseriesviewer/icons/mActionIdentify.svg</iconset> </property> <property name="text"> <string>Identify</string> @@ -458,7 +458,7 @@ <action name="actionClearLabelList"> <property name="icon"> <iconset> - <normaloff>:/timeseriesviewer/icons/mIconClose.svg</normaloff>:/timeseriesviewer/icons/mIconClose.svg</iconset> + <normaloff>:/eotimeseriesviewer/icons/mIconClose.svg</normaloff>:/eotimeseriesviewer/icons/mIconClose.svg</iconset> </property> <property name="text"> <string>Clear labels</string> @@ -470,7 +470,7 @@ <action name="actionCopyLabelList"> <property name="icon"> <iconset resource="eotsv_resources.qrc"> - <normaloff>:/timeseriesviewer/icons/mActionEditCopy.svg</normaloff>:/timeseriesviewer/icons/mActionEditCopy.svg</iconset> + <normaloff>:/eotimeseriesviewer/icons/mActionEditCopy.svg</normaloff>:/eotimeseriesviewer/icons/mActionEditCopy.svg</iconset> </property> <property name="text"> <string>Copy labels</string> @@ -482,7 +482,7 @@ <action name="actionSettings"> <property name="icon"> <iconset resource="eotsv_resources.qrc"> - <normaloff>:/timeseriesviewer/icons/system.svg</normaloff>:/timeseriesviewer/icons/system.svg</iconset> + <normaloff>:/eotimeseriesviewer/icons/system.svg</normaloff>:/eotimeseriesviewer/icons/system.svg</iconset> </property> <property name="text"> <string>Settings</string> @@ -491,7 +491,7 @@ <action name="actionCollectLabels"> <property name="icon"> <iconset resource="eotsv_resources.qrc"> - <normaloff>:/timeseriesviewer/icons/mActionIdentify.svg</normaloff>:/timeseriesviewer/icons/mActionIdentify.svg</iconset> + <normaloff>:/eotimeseriesviewer/icons/mActionIdentify.svg</normaloff>:/eotimeseriesviewer/icons/mActionIdentify.svg</iconset> </property> <property name="text"> <string>Collect Labels</string> @@ -503,7 +503,7 @@ <action name="actionRefresh"> <property name="icon"> <iconset resource="eotsv_resources.qrc"> - <normaloff>:/timeseriesviewer/icons/mActionRefresh.svg</normaloff>:/timeseriesviewer/icons/mActionRefresh.svg</iconset> + <normaloff>:/eotimeseriesviewer/icons/mActionRefresh.svg</normaloff>:/eotimeseriesviewer/icons/mActionRefresh.svg</iconset> </property> <property name="text"> <string>Refresh Maps</string> @@ -524,7 +524,7 @@ </property> <property name="icon"> <iconset resource="eotsv_resources.qrc"> - <normaloff>:/timeseriesviewer/icons/crosshair.svg</normaloff>:/timeseriesviewer/icons/crosshair.svg</iconset> + <normaloff>:/eotimeseriesviewer/icons/crosshair.svg</normaloff>:/eotimeseriesviewer/icons/crosshair.svg</iconset> </property> <property name="text"> <string>Show Crosshair</string> @@ -533,7 +533,7 @@ <action name="actionImportExtent"> <property name="icon"> <iconset resource="eotsv_resources.qrc"> - <normaloff>:/timeseriesviewer/icons/mapExtentImport.svg</normaloff>:/timeseriesviewer/icons/mapExtentImport.svg</iconset> + <normaloff>:/eotimeseriesviewer/icons/mapExtentImport.svg</normaloff>:/eotimeseriesviewer/icons/mapExtentImport.svg</iconset> </property> <property name="text"> <string>Import extent</string> @@ -545,7 +545,7 @@ <action name="actionExportExtent"> <property name="icon"> <iconset resource="eotsv_resources.qrc"> - <normaloff>:/timeseriesviewer/icons/mapExtentExport.svg</normaloff>:/timeseriesviewer/icons/mapExtentExport.svg</iconset> + <normaloff>:/eotimeseriesviewer/icons/mapExtentExport.svg</normaloff>:/eotimeseriesviewer/icons/mapExtentExport.svg</iconset> </property> <property name="text"> <string>Set extent</string> @@ -557,7 +557,7 @@ <action name="actionImportCenter"> <property name="icon"> <iconset resource="eotsv_resources.qrc"> - <normaloff>:/timeseriesviewer/icons/mapCenterImport.svg</normaloff>:/timeseriesviewer/icons/mapCenterImport.svg</iconset> + <normaloff>:/eotimeseriesviewer/icons/mapCenterImport.svg</normaloff>:/eotimeseriesviewer/icons/mapCenterImport.svg</iconset> </property> <property name="text"> <string>Import center</string> @@ -569,7 +569,7 @@ <action name="actionExportCenter"> <property name="icon"> <iconset resource="eotsv_resources.qrc"> - <normaloff>:/timeseriesviewer/icons/mapCenterExport.svg</normaloff>:/timeseriesviewer/icons/mapCenterExport.svg</iconset> + <normaloff>:/eotimeseriesviewer/icons/mapCenterExport.svg</normaloff>:/eotimeseriesviewer/icons/mapCenterExport.svg</iconset> </property> <property name="text"> <string>Set center</string> @@ -593,7 +593,7 @@ <action name="actionShowOnlineHelp"> <property name="icon"> <iconset resource="eotsv_resources.qrc"> - <normaloff>:/timeseriesviewer/icons/metadata.svg</normaloff>:/timeseriesviewer/icons/metadata.svg</iconset> + <normaloff>:/eotimeseriesviewer/icons/metadata.svg</normaloff>:/eotimeseriesviewer/icons/metadata.svg</iconset> </property> <property name="text"> <string>Help (online)</string> @@ -679,7 +679,7 @@ </property> <property name="icon"> <iconset resource="eotsv_resources.qrc"> - <normaloff>:/timeseriesviewer/icons/mIconTemporalProfile.svg</normaloff>:/timeseriesviewer/icons/mIconTemporalProfile.svg</iconset> + <normaloff>:/eotimeseriesviewer/icons/mIconTemporalProfile.svg</normaloff>:/eotimeseriesviewer/icons/mIconTemporalProfile.svg</iconset> </property> <property name="text"> <string>TP</string> @@ -691,7 +691,7 @@ </property> <property name="icon"> <iconset resource="eotsv_resources.qrc"> - <normaloff>:/timeseriesviewer/icons/qgsMapCenter.svg</normaloff>:/timeseriesviewer/icons/qgsMapCenter.svg</iconset> + <normaloff>:/eotimeseriesviewer/icons/qgsMapCenter.svg</normaloff>:/eotimeseriesviewer/icons/qgsMapCenter.svg</iconset> </property> <property name="text"> <string>Sync. with QGIS map canvas </string> diff --git a/scripts/create_plugin.py b/scripts/create_plugin.py index 710d87b4aa4debeba635a645d69f689fcb2ce37a..3823f5398ccf79b9bedb16b78b7b222d07a313d6 100644 --- a/scripts/create_plugin.py +++ b/scripts/create_plugin.py @@ -125,6 +125,7 @@ def create_plugin(include_testdata: bool = False, include_qgisresources: bool = files.extend(list(scantree(DIR_REPO / 'tests', pattern=re.compile(r'\.py$')))) files.append(DIR_REPO / '__init__.py') files.append(DIR_REPO / 'CHANGELOG.rst') + files.append(DIR_REPO / 'ABOUT.html') files.append(DIR_REPO / 'CONTRIBUTORS.rst') files.append(DIR_REPO / 'LICENSE.md') files.append(DIR_REPO / 'requirements.txt') @@ -158,6 +159,7 @@ def create_plugin(include_testdata: bool = False, include_qgisresources: bool = createCHANGELOG(PLUGIN_DIR) + # 5. create a zip print('Create zipfile...') from eotimeseriesviewer.utils import zipdir @@ -185,20 +187,12 @@ def create_plugin(include_testdata: bool = False, include_qgisresources: bool = print('Finished') - -def createCHANGELOG(dirPlugin): +def rst2html(pathMD: pathlib.Path) -> str: """ - Reads the CHANGELOG.rst and creates the deploy/CHANGELOG (without extension!) for the QGIS Plugin Manager - :return: + Converst a rst file to html """ - - pathMD = os.path.join(DIR_REPO, 'CHANGELOG.rst') - pathCL = os.path.join(dirPlugin, 'CHANGELOG') - - os.makedirs(os.path.dirname(pathCL), exist_ok=True) - assert os.path.isfile(pathMD) - import sphinx.transforms import docutils.core + assert pathMD.is_file() overrides = {'stylesheet': None, 'embed_stylesheet': False, @@ -236,15 +230,23 @@ def createCHANGELOG(dirPlugin): line = line.strip() if line != '': html_cleaned.append(line) - # make html compact + return html +def createCHANGELOG(dirPlugin:pathlib.Path): + """ + Reads the CHANGELOG.rst and creates the deploy/CHANGELOG (without extension!) for the QGIS Plugin Manager + :return: + """ + + pathMD = DIR_REPO / 'CHANGELOG.rst' + pathCL = dirPlugin / 'CHANGELOG' + os.makedirs(pathCL.parent, exist_ok=True) + + # make html compact + html_cleaned = rst2html(pathMD) with open(pathCL, 'w', encoding='utf-8') as f: - f.write('\n'.join(html_cleaned)) + f.write(''.join(html_cleaned)) - if False: - with open(pathCL+'.html', 'w', encoding='utf-8') as f: - f.write('\n'.join(html_cleaned)) - s = "" if __name__ == "__main__": diff --git a/scripts/updateexternals.py b/scripts/updateexternals.py index a182cb53883457659e22c6c34fd3ffc4da953ed5..942e46fc41d0818101763ff133176aeb9b28ab58 100644 --- a/scripts/updateexternals.py +++ b/scripts/updateexternals.py @@ -38,10 +38,6 @@ if __name__ == "__main__": to_update = ['qps'] updateRemotes(to_update) - - if 'qps' in to_update: - import scripts - path = os.path.join(DIR_REPO, r'eotimeseriesviewer/externals/qps/qpsresources.qrc') - scripts.compileResourceFile(path) - + import scripts.compile_resourcefiles + scripts.compile_resourcefiles.compileEOTSVResourceFiles() exit(0) \ No newline at end of file diff --git a/tests/test_main.py b/tests/test_main.py index 4c103d6d6fe6a7ad059b08f901114d7588fc5a02..334a7b1a66bf34b55aca6333121135307802517f 100644 --- a/tests/test_main.py +++ b/tests/test_main.py @@ -117,7 +117,6 @@ class TestMain(EOTSVTestCase): self.showGui(TSV) - def test_AboutDialog(self): from eotimeseriesviewer.main import AboutDialogUI diff --git a/tests/test_resources.py b/tests/test_resources.py index 7f35d0b53e9a3d7c80246547d473159e4aac6d2d..23b6ad95117ca327984844fe492b8977478dda91 100644 --- a/tests/test_resources.py +++ b/tests/test_resources.py @@ -13,6 +13,8 @@ __date__ = '2017-07-17' __copyright__ = 'Copyright 2017, Benjamin Jakimow' import unittest +import pathlib +import re import xmlrunner from qgis import * from PyQt5.QtGui import QIcon @@ -20,23 +22,21 @@ from eotimeseriesviewer import file_search from eotimeseriesviewer.tests import start_app, EOTSVTestCase - class TestResources(EOTSVTestCase): - """Test rerources work.""" def test_icon(self): - """Test we can click OK.""" from eotimeseriesviewer import icon, DIR_UI + from eotimeseriesviewer.externals.qps.resources import scanResources + existing = list(scanResources()) self.assertFalse(icon().isNull()) - iconSVGs = file_search(os.path.join(DIR_UI, 'icons'), '*.svg') - #:/timeseriesviewer/icons/IconTimeSeries.svg - iconSVGs = [s.replace(DIR_UI,':').replace('\\', '/') for s in iconSVGs] + iconSVGs = [pathlib.Path(s).as_posix() for s in iconSVGs] + iconSVGs = [re.sub(r'^.*/eotimeseriesviewer/ui/icons/', ':/eotimeseriesviewer/icons/', s) for s in iconSVGs] for resource in iconSVGs: + self.assertTrue(resource in existing) icon = QIcon(resource) self.assertFalse(icon.isNull()) - if __name__ == "__main__": unittest.main(testRunner=xmlrunner.XMLTestRunner(output='test-reports'), buffer=False) exit(0)