Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
N&S Dependency Loader changelog
Rana Dependency Loader changelog
========================


1.2.18 (unreleased)
-------------------

- Display dependency loader as Rana Dependency Loader (nens/rana#4386)
- Bump hydxlib to 1.7.7
- Bump mi-utils to 0.1.15

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ QGIS comes bundled with several python libraries, but the N&S plugins need more.

## Usage

In order for your plugin to be loaded after the N&S dependency loader, append `N&S Dependency Loader` to the list of plugin dependencies in `metadata.txt`, or add the following line:
In order for your plugin to be loaded after the Rana dependency loader, append `Rana Dependency Loader` to the list of plugin dependencies in `metadata.txt`, or add the following line:

```
plugin_dependencies=Dependency Loader
Expand Down
4 changes: 2 additions & 2 deletions dependencies.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@

def create_progress_dialog(progress, text):
dialog = QProgressDialog()
dialog.setWindowTitle("N&S Dependency Loader install progress")
dialog.setWindowTitle("Rana Dependency Loader install progress")
dialog.setLabelText(text)
dialog.setWindowFlags(Qt.WindowType.WindowStaysOnTopHint)
bar = QProgressBar(dialog)
Expand Down Expand Up @@ -155,7 +155,7 @@ def ensure_everything_installed():
if _is_windows():
# We always want to restart when deps are missing
msg = "Please restart QGIS to complete the installation "
msg += "process of Nelen & Schuurmans Dependency Loader."
msg += "process of Rana Dependency Loader."
QMessageBox.information(
None,
"Restart required",
Expand Down
20 changes: 9 additions & 11 deletions icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions metadata.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[general]
name=Nelen and Schuurmans Dependency Loader
name=Rana Dependency Loader
qgisMinimumVersion=3.22
description=A QGIS plugin that installs and imports all required dependencies for Nelen and Schuurmans plugins.
description=A QGIS plugin that installs and imports all required dependencies for Rana plugins.
version=1.2.18
author=Nelen & Schuurmans
email=servicedesk@nelen-schuurmans.nl

about=This plugin will be installed automatically by Rana and 3Di plugins that need it. It provides python dependencies that these plugins share. They are bundled in one plugin to prevent dependency conflicts and to make updating easier.
about=This plugin will be installed automatically by the Rana plugins that need it. It provides python dependencies that these plugins share. They are bundled in one plugin to prevent dependency conflicts and to make updating easier.
tracker=https://github.com/nens/nens-dependency-loader
repository=https://github.com/nens/nens-dependency-loader
changelog=https://github.com/nens/nens-dependency-loader/blob/main/CHANGES.rst
Expand Down
8 changes: 4 additions & 4 deletions nens_dependency_loader.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ def initGui(self):
QIcon(str(PLUGIN_DIR / "icon.svg")), "Info", self.iface.mainWindow()
)
self.action.triggered.connect(self.run)
self.iface.addPluginToMenu("N&&S Dependency Loader", self.action)
menu = self.iface.mainWindow().getPluginMenu("N&&S Dependency Loader")
self.iface.addPluginToMenu("Rana Dependency Loader", self.action)
menu = self.iface.mainWindow().getPluginMenu("Rana Dependency Loader")

self.settings_action = QAction(
QgsApplication.getThemeIcon("/processingAlgorithm.svg"),
Expand All @@ -67,15 +67,15 @@ def initGui(self):
menu.addAction(self.settings_action)

def unload(self):
self.iface.removePluginMenu("N&&S Dependency Loader", self.action)
self.iface.removePluginMenu("Rana Dependency Loader", self.action)
del self.action
del self.settings_action

def run(self):
versions = "no constraints file detected"
with open(str(PLUGIN_DIR / "constraints.txt"), "r") as file:
versions = file.read()
QMessageBox.information(None, "N&S Dependency Loader", versions)
QMessageBox.information(None, "Rana Dependency Loader", versions)

def open_settings_dialog(self):
SettingsDialog(self.iface.mainWindow()).exec()
Expand Down
Loading