Skip to content

Commit a95d0ec

Browse files
gerome-igngerome-ign
committed
Merge branch '1.8.0'
2 parents 3cd0709 + f562ab2 commit a95d0ec

9 files changed

Lines changed: 45 additions & 41 deletions

File tree

‎.github/workflows/release.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,16 @@ jobs:
2727

2828
- name: Build plugin zip
2929
run: |
30-
mkdir -p plugin_maitre
31-
rsync -av --progress . plugin_maitre/ \
30+
mkdir -p PluginsManager
31+
rsync -av --progress . PluginsManager/ \
3232
--exclude .git \
3333
--exclude .github \
34-
--exclude plugin_maitre
35-
zip -r plugin_maitre.zip plugin_maitre
34+
--exclude PluginsManager
35+
zip -r PluginsManager.zip PluginsManager
3636
3737
- name: Create Release
3838
uses: softprops/action-gh-release@v1
3939
with:
40-
files: "plugin_maitre.zip"
40+
files: "PluginsManager.zip"
4141
env:
4242
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎LICENSE.md‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11

22

3-
# MAITRE
3+
# PluginsManager
44

5-
"Maitre" is a plugin that manages the integration of plugins prefixed _IGN into a menu and/or toolbars.
5+
"PluginsManager" is a plugin that manages the integration of plugins prefixed _IGN into a menu and/or toolbars.
66

77

88
## Fonctionnalités
@@ -22,11 +22,11 @@ English :
2222

2323
- Mainteneur principal : gerome.pecheur@ign.fr
2424
- Organisation : [IGNF](https://github.com/IGNF)
25-
- Issues GitHub : https://github.com/IGNF/maitre-qgis-plugin/issues
25+
- Issues GitHub : https://github.com/IGNF/PluginsManager-qgis-plugin/issues
2626

2727
## Ressources
2828

29-
User documentation : https://ignf.github.io/maitre-qgis-plugin/
29+
User documentation : https://ignf.github.io/PluginsManager-qgis-plugin/
3030

3131

3232
## Licence

‎aproposde.ui‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,9 @@
100100
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
101101
p, li { white-space: pre-wrap; }
102102
</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
103+
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:7pt; font-weight:600; text-decoration: underline;">v1.8.0 (Juillet 2026)</span></p>
104+
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:7pt;"> - Changement de nom : PluginsManager.</span></p>
105+
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:7pt;"><br /></p>
103106
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:7pt; font-weight:600; text-decoration: underline;">v1.7.5 (Juillet 2026)</span></p>
104107
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:7pt;"> - Ne prend plus en compte le package defusedxml.</span></p>
105108
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:7pt;"><br /></p>

‎config_PluginsManager/tabwidget.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
<?xml version='1.0' encoding='utf-8'?>
2+
<tabwidget><onglet id="menu IGN " /></tabwidget>

‎docs/index.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
<td rowspan="2"><img src="images/image1.jpeg"
99
style="width:1.38681in;height:1.47153in"
1010
alt="logo_IGN_pour_lettre" /></td>
11-
<td style="text-align: center;font-size: 24px;"><strong>Plugin Maitre
12-
v1.7.5</strong></td>
11+
<td style="text-align: center;font-size: 24px;"><strong>PluginsManager
12+
v1.8.0</strong></td>
1313
</tr>
1414
<tr>
1515
<td style="font-size: 16px;text-align: center;">Développeur : Gérôme PECHEUR (IGN)</td>

‎maj.py‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ def log(message,reset=False):
2929
current_directory = os.path.dirname(__file__)
3030
# Remonter d'un niveau
3131
parent_directory = os.path.abspath(Path(current_directory, os.pardir))
32-
fichier = Path(parent_directory, "log_maitre.txt")
32+
fichier = Path(parent_directory, "log_PluginsManager.txt")
3333
mode = "w" if reset else "a" # "w" pour écraser, "a" pour ajouter
3434
with open(fichier, mode, encoding="utf-8") as f:
3535
f.write(f"{message}\n")
@@ -338,8 +338,20 @@ def install_package(self,packages):
338338
echec_package = "<br>"
339339
for package in packages:
340340
archive = Path(plugin_dir/"packages-requis"/package[1])
341-
cmd = f'start "" cmd /c call "{self.osgeo_bat}" && pip install "{archive}" && exit'
342-
result = subprocess.run(cmd, shell=True)
341+
# cmd = f'start "" cmd /c call "{self.osgeo_bat}" && pip install "{archive}" && exit'
342+
# result = subprocess.run(cmd, shell=True)
343+
result = subprocess.run(
344+
[
345+
"cmd.exe",
346+
"/c",
347+
"call",
348+
self.osgeo_bat,
349+
"&&",
350+
"pip",
351+
"install",
352+
archive
353+
]
354+
)
343355

344356
if result.returncode != 0:
345357
echec_package += f"<br>{package[0]}"

‎metadata.txt‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,29 @@
33
# This file should be included when you package your plugin.# Mandatory items:
44

55
[general]
6-
name=IGN maitre
6+
name=IGN PluginsManager
77
qgisMinimumVersion=3.0
88
qgisMaximumVersion=4.99
9-
description=Centralise et intègre les plugins IGN dans un menu et barres d'outils personnalisables pour un accès simplifié.
10-
version=1.7.5
9+
description=This plugin centralizes and organizes IGN plugins into customizable menus and toolbars, making them easier to access and improving the overall user experience. IGN plugins are prefixed with "IGN_".
10+
version=1.8.0
1111
author=Gérôme PECHEUR (IGN)
1212
email=gerome.pecheur@ign.fr
1313
license=GNU AGPL v3
1414

15-
about=Ce plugin centralise et organise les plugins IGN dans des menus et barres d’outils personnalisables, facilitant leur accès et améliorant l’ergonomie globale. Les plugins IGN sont préfixés par «IGN_».
15+
about=This plugin centralizes and organizes IGN plugins into customizable menus and toolbars, making them easier to access and improving the overall user experience. IGN plugins are prefixed with "IGN_".
1616

17-
tracker=https://github.com/IGNF/maitre-qgis-plugin/issues
18-
repository=https://github.com/IGNF/maitre-qgis-plugin
19-
homepage=https://ignf.github.io/maitre-qgis-plugin/
17+
tracker=https://github.com/IGNF/PluginsManager-qgis-plugin/issues
18+
repository=https://github.com/IGNF/PluginsManager-qgis-plugin
19+
homepage=https://ignf.github.io/PluginsManager-qgis-plugin/
2020

2121
# End of mandatory metadata
2222

2323
# Recommended items:
2424

2525
hasProcessingProvider=no
2626
# Uncomment the following line and add your changelog:
27-
changelog= v1.7.3 : Notification et installation des dépendances manquantes
27+
changelog= v1.8.0 : Changement de nom
28+
v1.7.3 : Notification et installation des dépendances manquantes
2829

2930
# Tags are comma separated with spaces allowed
3031
tags=python

‎plugin_maitre.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@
3434
from .add_onglet import *
3535
from .plugin_maitre_dialog import PluginMaitreDialog
3636

37-
TITRE = "Maître"
37+
TITRE = "PluginsManager"
3838
MENU_IGN = "menu IGN "
3939
PREFIXE_PLUGIN_IGN = "IGN_"
40-
DOSSIER_ONGLET = "config_plugin_maitre"
40+
DOSSIER_ONGLET = "config_PluginsManager"
4141
# liste des plugins à exclure du menu et de la barre d'outils (ex : plugin sans interface)
4242
# EXCEPT_PLUGIN = ["IGN_Vues"]
4343
EXCEPT_PLUGIN = [""]
@@ -75,7 +75,7 @@ def log(message,reset=False):
7575
current_directory = os.path.dirname(__file__)
7676
# Remonter d'un niveau
7777
parent_directory = os.path.abspath(Path(current_directory, os.pardir))
78-
fichier = Path(parent_directory, "log_maitre.txt")
78+
fichier = Path(parent_directory, "log_PluginsManager.txt")
7979
mode = "w" if reset else "a" # "w" pour écraser, "a" pour ajouter
8080
with open(fichier, mode, encoding="utf-8") as f:
8181
f.write(f"{message}\n")
@@ -110,7 +110,7 @@ def affichemessageAvertissement( titre, text):
110110
return None
111111

112112
def afficheDoc():
113-
webbrowser.open("https://ignf.github.io/maitre-qgis-plugin/")
113+
webbrowser.open("https://ignf.github.io/PluginsManager-qgis-plugin/")
114114

115115
class PluginMaitre:
116116
def __init__(self, iface):
@@ -167,7 +167,7 @@ def init_menuIGN(self):
167167
parent_directory = os.path.abspath(Path(current_directory, os.pardir))
168168

169169
# ************************************************************************
170-
# plugin maitre
170+
# plugin PluginsManager
171171
icon_path = Path(os.path.dirname(__file__)) / "icons" / "icon.png"
172172
action = QAction(QIcon(str(icon_path)),"Configuration",self.iface.mainWindow())
173173
action.triggered.connect(self.run)

0 commit comments

Comments
 (0)