Move qml directory to src

adapt setup.py

79 files changed, 16 insertions, 16 deletions

diff --git a/Makefile b/Makefile
index 2d2925b..53e3d14 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
 PACKAGE = mageiawelcome
-VERSION = 2.25
+VERSION = 3.0
 GITPATH = git://git.mageia.org/software/mageiawelcome
 
 TEXT_FILES = Makefile
 
-DIRS = etc usr po qml i18n
+DIRS = etc usr po src i18n
 
 FILES = $(TEXT_FILES) $(DIRS) LICENSE *.pro setup.py
 
@@ -13,8 +13,6 @@ check:
 
 version:
 	echo "version='$(VERSION)'" > version.py
-	echo "import QtQuick 2.0" >qml/Version.qml
-	echo "Item { property var version: '$(VERSION)';}" >>qml/Version.qml
 
 clean:
 	rm -f *~ \#*\#
diff --git a/qml/img/.directory b/qml/img/.directory
deleted file mode 100644
index e715fe1..0000000
--- a/qml/img/.directory
+++ /dev/null
@@ -1,4 +0,0 @@
-[Dolphin]
-PreviewsShown=true
-Timestamp=2018,11,10,17,35,0
-Version=4
diff --git a/setup.py b/setup.py
index 3612c3f..ac33629 100644
--- a/setup.py
+++ b/setup.py
@@ -13,14 +13,13 @@ class BuildQm(build):
   os.system('msgfmt --desktop --template=usr/share/applications/template_mageiawelcome.desktop -d po -o usr/share/applications/mageiawelcome.desktop')
 
 
-data_files = [("bin",["usr/bin/mageiawelcome","usr/bin/mageiawelcome-launcher"]),
+data_files = [("bin",["usr/bin/mageiawelcome","usr/bin/mageiawelcome"]),
               ("share/applications/", ["usr/share/applications/mageiawelcome.desktop"]),
-              ("share/icons/hicolor/32x32/apps/", ["qml/icons/32x32/apps/mageiawelcome.png"]),
-              ("share/icons/hicolor/scalable/apps/", ["qml/icons/scalable/apps/mageiawelcome.svg"]),
-              ("share/mageiawelcome/",glob.glob('qml/*.py')),
-              ("share/mageiawelcome/",glob.glob('qml/*.qml')),
-              ("share/mageiawelcome/img",glob.glob('qml/img/*.png')),
-	      ("share/mageiawelcome/translations/",glob.glob('i18n/*.qm')),
+              ("share/icons/hicolor/32x32/apps/", ["src/icons/32x32/apps/mageiawelcome.png"]),
+              ("share/icons/hicolor/scalable/apps/", ["src/icons/scalable/apps/mageiawelcome.svg"]),
+              ("share/mageiawelcome/",glob.glob('src/*.py')),
+              ("share/mageiawelcome/img",glob.glob('src/img/*.png')),
+	          ("share/mageiawelcome/translations/",glob.glob('i18n/*.qm')),
               ("/etc/xdg/autostart/",["etc/xdg/autostart/mageiawelcome.desktop"]),
               ]
 
diff --git a/qml/AppList.py b/src/AppList.py
index 8ccb99f..8ccb99f 100644
--- a/qml/AppList.py
+++ b/src/AppList.py
diff --git a/qml/helpers.py b/src/helpers.py
index 7023011..7023011 100644
--- a/qml/helpers.py
+++ b/src/helpers.py
diff --git a/qml/icons/16x16/apps/mageiawelcome.png b/src/icons/16x16/apps/mageiawelcome.png
index 1e37675..1e37675 100644
--- a/qml/icons/16x16/apps/mageiawelcome.png
+++ b/src/icons/16x16/apps/mageiawelcome.png
diff --git a/qml/icons/32x32/apps/mageiawelcome.png b/src/icons/32x32/apps/mageiawelcome.png
index 5dabbca..5dabbca 100644
--- a/qml/icons/32x32/apps/mageiawelcome.png
+++ b/src/icons/32x32/apps/mageiawelcome.png
diff --git a/qml/icons/48x48/apps/mageiawelcome.png b/src/icons/48x48/apps/mageiawelcome.png
index bb9df77..bb9df77 100644
--- a/qml/icons/48x48/apps/mageiawelcome.png
+++ b/src/icons/48x48/apps/mageiawelcome.png
diff --git a/qml/icons/scalable/apps/mageiawelcome.svg b/src/icons/scalable/apps/mageiawelcome.svg
index 71ec37a..71ec37a 100644
--- a/qml/icons/scalable/apps/mageiawelcome.svg
+++ b/src/icons/scalable/apps/mageiawelcome.svg
diff --git a/qml/img/0ad.png b/src/img/0ad.png
index 544554a..544554a 100644
--- a/qml/img/0ad.png
+++ b/src/img/0ad.png
diff --git a/qml/img/abiword.png b/src/img/abiword.png
index 1ae2dc0..1ae2dc0 100644
--- a/qml/img/abiword.png
+++ b/src/img/abiword.png
diff --git a/qml/img/amule.png b/src/img/amule.png
index 7cad1b3..7cad1b3 100644
--- a/qml/img/amule.png
+++ b/src/img/amule.png
diff --git a/qml/img/bleachbit.png b/src/img/bleachbit.png
index c819132..c819132 100644
--- a/qml/img/bleachbit.png
+++ b/src/img/bleachbit.png
diff --git a/qml/img/blender.png b/src/img/blender.png
index 574b2f8..574b2f8 100644
--- a/qml/img/blender.png
+++ b/src/img/blender.png
diff --git a/qml/img/calibre.png b/src/img/calibre.png
index e38fe33..e38fe33 100644
--- a/qml/img/calibre.png
+++ b/src/img/calibre.png
diff --git a/qml/img/calligra.png b/src/img/calligra.png
index a1f9dac..a1f9dac 100644
--- a/qml/img/calligra.png
+++ b/src/img/calligra.png
diff --git a/qml/img/chromium.png b/src/img/chromium.png
index 24ea921..24ea921 100644
--- a/qml/img/chromium.png
+++ b/src/img/chromium.png
diff --git a/qml/img/claws-mail.png b/src/img/claws-mail.png
index 199a571..199a571 100644
--- a/qml/img/claws-mail.png
+++ b/src/img/claws-mail.png
diff --git a/qml/img/clementine.png b/src/img/clementine.png
index 44d91e8..44d91e8 100644
--- a/qml/img/clementine.png
+++ b/src/img/clementine.png
diff --git a/qml/img/codecs-audio.png b/src/img/codecs-audio.png
index 23f2d18..23f2d18 100644
--- a/qml/img/codecs-audio.png
+++ b/src/img/codecs-audio.png
diff --git a/qml/img/codecs-video.png b/src/img/codecs-video.png
index e3850da..e3850da 100644
--- a/qml/img/codecs-video.png
+++ b/src/img/codecs-video.png
diff --git a/qml/img/darktable.png b/src/img/darktable.png
index 913c2a2..913c2a2 100644
--- a/qml/img/darktable.png
+++ b/src/img/darktable.png
diff --git a/qml/img/digikam.png b/src/img/digikam.png
index 8c44268..8c44268 100644
--- a/qml/img/digikam.png
+++ b/src/img/digikam.png
diff --git a/qml/img/filezilla.png b/src/img/filezilla.png
index 55b33cc..55b33cc 100644
--- a/qml/img/filezilla.png
+++ b/src/img/filezilla.png
diff --git a/qml/img/firefox.png b/src/img/firefox.png
index 0c4f681..0c4f681 100644
--- a/qml/img/firefox.png
+++ b/src/img/firefox.png
diff --git a/qml/img/flash-player-plugin.png b/src/img/flash-player-plugin.png
index 30d7c58..30d7c58 100644
--- a/qml/img/flash-player-plugin.png
+++ b/src/img/flash-player-plugin.png
diff --git a/qml/img/fuse-exfat.png b/src/img/fuse-exfat.png
index 657ba56..657ba56 100644
--- a/qml/img/fuse-exfat.png
+++ b/src/img/fuse-exfat.png
diff --git a/qml/img/gimp.png b/src/img/gimp.png
index 5cbd7f0..5cbd7f0 100644
--- a/qml/img/gimp.png
+++ b/src/img/gimp.png
diff --git a/qml/img/gnumeric.png b/src/img/gnumeric.png
index 0c20caa..0c20caa 100644
--- a/qml/img/gnumeric.png
+++ b/src/img/gnumeric.png
diff --git a/qml/img/gparted.png b/src/img/gparted.png
index f897c05..f897c05 100644
--- a/qml/img/gparted.png
+++ b/src/img/gparted.png
diff --git a/qml/img/handbrake.png b/src/img/handbrake.png
index c58193f..c58193f 100644
--- a/qml/img/handbrake.png
+++ b/src/img/handbrake.png
diff --git a/qml/img/hardware.png b/src/img/hardware.png
index 411f21d..411f21d 100644
--- a/qml/img/hardware.png
+++ b/src/img/hardware.png
diff --git a/qml/img/homebank.png b/src/img/homebank.png
index 4293f19..4293f19 100644
--- a/qml/img/homebank.png
+++ b/src/img/homebank.png
diff --git a/qml/img/inkscape.png b/src/img/inkscape.png
index aa445e4..aa445e4 100644
--- a/qml/img/inkscape.png
+++ b/src/img/inkscape.png
diff --git a/qml/img/isodumper.png b/src/img/isodumper.png
index 991be95..991be95 100644
--- a/qml/img/isodumper.png
+++ b/src/img/isodumper.png
diff --git a/qml/img/k3b.png b/src/img/k3b.png
index c716d58..c716d58 100644
--- a/qml/img/k3b.png
+++ b/src/img/k3b.png
diff --git a/qml/img/kdenlive.png b/src/img/kdenlive.png
index b8945de..b8945de 100644
--- a/qml/img/kdenlive.png
+++ b/src/img/kdenlive.png
diff --git a/qml/img/kodi.png b/src/img/kodi.png
index da2c920..da2c920 100644
--- a/qml/img/kodi.png
+++ b/src/img/kodi.png
diff --git a/qml/img/lazarus.png b/src/img/lazarus.png
index 1ac13ba..1ac13ba 100644
--- a/qml/img/lazarus.png
+++ b/src/img/lazarus.png
diff --git a/qml/img/libreoffice-calc.png b/src/img/libreoffice-calc.png
index b65c141..b65c141 100644
--- a/qml/img/libreoffice-calc.png
+++ b/src/img/libreoffice-calc.png
diff --git a/qml/img/libreoffice-writer.png b/src/img/libreoffice-writer.png
index 1942e73..1942e73 100644
--- a/qml/img/libreoffice-writer.png
+++ b/src/img/libreoffice-writer.png
diff --git a/qml/img/mageia-2013-alpha.png b/src/img/mageia-2013-alpha.png
index a75bf06..a75bf06 100644
--- a/qml/img/mageia-2013-alpha.png
+++ b/src/img/mageia-2013-alpha.png
diff --git a/qml/img/mageia-2013-black-alpha.png b/src/img/mageia-2013-black-alpha.png
index 3b5a36e..3b5a36e 100644
--- a/qml/img/mageia-2013-black-alpha.png
+++ b/src/img/mageia-2013-black-alpha.png
diff --git a/qml/img/mageia-2016-alpha.png b/src/img/mageia-2016-alpha.png
index e424d6d..e424d6d 100644
--- a/qml/img/mageia-2016-alpha.png
+++ b/src/img/mageia-2016-alpha.png
diff --git a/qml/img/mageia-theme-extra.png b/src/img/mageia-theme-extra.png
index 4d37fc4..4d37fc4 100644
--- a/qml/img/mageia-theme-extra.png
+++ b/src/img/mageia-theme-extra.png
diff --git a/qml/img/mageia.png b/src/img/mageia.png
index 4ce0c12..4ce0c12 100644
--- a/qml/img/mageia.png
+++ b/src/img/mageia.png
diff --git a/qml/img/mcc.jpg b/src/img/mcc.jpg
index f415357..f415357 100644
--- a/qml/img/mcc.jpg
+++ b/src/img/mcc.jpg
diff --git a/qml/img/megaglest.png b/src/img/megaglest.png
index ba4d86c..ba4d86c 100644
--- a/qml/img/megaglest.png
+++ b/src/img/megaglest.png
diff --git a/qml/img/mga_bg.png b/src/img/mga_bg.png
index 3243445..3243445 100644
--- a/qml/img/mga_bg.png
+++ b/src/img/mga_bg.png
diff --git a/qml/img/mypaint.png b/src/img/mypaint.png
index 56d21e4..56d21e4 100644
--- a/qml/img/mypaint.png
+++ b/src/img/mypaint.png
diff --git a/qml/img/ok.png b/src/img/ok.png
index fcb66a2..fcb66a2 100644
--- a/qml/img/ok.png
+++ b/src/img/ok.png
diff --git a/qml/img/opera.png b/src/img/opera.png
index fc8cd53..fc8cd53 100644
--- a/qml/img/opera.png
+++ b/src/img/opera.png
diff --git a/qml/img/pidgin.png b/src/img/pidgin.png
index 3494e74..3494e74 100644
--- a/qml/img/pidgin.png
+++ b/src/img/pidgin.png
diff --git a/qml/img/playonlinux.png b/src/img/playonlinux.png
index 9b5e5c2..9b5e5c2 100644
--- a/qml/img/playonlinux.png
+++ b/src/img/playonlinux.png
diff --git a/qml/img/pysol01.png b/src/img/pysol01.png
index d730851..d730851 100644
--- a/qml/img/pysol01.png
+++ b/src/img/pysol01.png
diff --git a/qml/img/qbittorrent.png b/src/img/qbittorrent.png
index fd76d5f..fd76d5f 100644
--- a/qml/img/qbittorrent.png
+++ b/src/img/qbittorrent.png
diff --git a/qml/img/qmmp.png b/src/img/qmmp.png
index 32126f8..32126f8 100644
--- a/qml/img/qmmp.png
+++ b/src/img/qmmp.png
diff --git a/qml/img/qt-creator.png b/src/img/qt-creator.png
index fca5342..fca5342 100644
--- a/qml/img/qt-creator.png
+++ b/src/img/qt-creator.png
diff --git a/qml/img/radiotray.png b/src/img/radiotray.png
index 6715e5c..6715e5c 100644
--- a/qml/img/radiotray.png
+++ b/src/img/radiotray.png
diff --git a/qml/img/sauerbraten.png b/src/img/sauerbraten.png
index 145aaca..145aaca 100644
--- a/qml/img/sauerbraten.png
+++ b/src/img/sauerbraten.png
diff --git a/qml/img/scribus.png b/src/img/scribus.png
index 325bd55..325bd55 100644
--- a/qml/img/scribus.png
+++ b/src/img/scribus.png
diff --git a/qml/img/skrooge.png b/src/img/skrooge.png
index e6a0c54..e6a0c54 100644
--- a/qml/img/skrooge.png
+++ b/src/img/skrooge.png
diff --git a/qml/img/skype.png b/src/img/skype.png
index a192daf..a192daf 100644
--- a/qml/img/skype.png
+++ b/src/img/skype.png
diff --git a/qml/img/smplayer.png b/src/img/smplayer.png
index 7fe0489..7fe0489 100644
--- a/qml/img/smplayer.png
+++ b/src/img/smplayer.png
diff --git a/qml/img/soundkonverter.png b/src/img/soundkonverter.png
index 5952509..5952509 100644
--- a/qml/img/soundkonverter.png
+++ b/src/img/soundkonverter.png
diff --git a/qml/img/spyder3.png b/src/img/spyder3.png
index b0aa9bd..b0aa9bd 100644
--- a/qml/img/spyder3.png
+++ b/src/img/spyder3.png
diff --git a/qml/img/steam.png b/src/img/steam.png
index 5590da6..5590da6 100644
--- a/qml/img/steam.png
+++ b/src/img/steam.png
diff --git a/qml/img/supertux.png b/src/img/supertux.png
index 7cdc9b2..7cdc9b2 100644
--- a/qml/img/supertux.png
+++ b/src/img/supertux.png
diff --git a/qml/img/supertuxkart.png b/src/img/supertuxkart.png
index 4a75df8..4a75df8 100644
--- a/qml/img/supertuxkart.png
+++ b/src/img/supertuxkart.png
diff --git a/qml/img/svg/mageia.svg b/src/img/svg/mageia.svg
index 5578abe..5578abe 100644
--- a/qml/img/svg/mageia.svg
+++ b/src/img/svg/mageia.svg
diff --git a/qml/img/system-config-printer.png b/src/img/system-config-printer.png
index 5df9aae..5df9aae 100644
--- a/qml/img/system-config-printer.png
+++ b/src/img/system-config-printer.png
diff --git a/qml/img/thunderbird.png b/src/img/thunderbird.png
index 0ea7046..0ea7046 100644
--- a/qml/img/thunderbird.png
+++ b/src/img/thunderbird.png
diff --git a/qml/img/virtualbox.png b/src/img/virtualbox.png
index 505e0b5..505e0b5 100644
--- a/qml/img/virtualbox.png
+++ b/src/img/virtualbox.png
diff --git a/qml/img/vlc.png b/src/img/vlc.png
index 1a0f859..1a0f859 100644
--- a/qml/img/vlc.png
+++ b/src/img/vlc.png
diff --git a/qml/img/warzone2100.png b/src/img/warzone2100.png
index 4ae4d9f..4ae4d9f 100644
--- a/qml/img/warzone2100.png
+++ b/src/img/warzone2100.png
diff --git a/qml/img/wesnoth.png b/src/img/wesnoth.png
index 451bdff..451bdff 100644
--- a/qml/img/wesnoth.png
+++ b/src/img/wesnoth.png
diff --git a/qml/mageiawelcome.py b/src/mageiawelcome.py
index a6c7de7..a6c7de7 100644
--- a/qml/mageiawelcome.py
+++ b/src/mageiawelcome.py
diff --git a/qml/ui.py b/src/ui.py
index 1ce7763..1431770 100644
--- a/qml/ui.py
+++ b/src/ui.py
@@ -989,6 +989,7 @@ class BreadcrumbItem(QWidget):
                         background-color: #262F45;
                         font-size: 14px;
                         border-radius: 5px;
+                        min-height: 30px;
                     }
                     """
                 )
@@ -998,6 +999,7 @@ class BreadcrumbItem(QWidget):
                     QWidget:hover {
                         background-color: #2397D4;
                         border-radius: 5px;
+                        min-height: 30px;
                     }
                     QLabel {
                         color: white;
@@ -1013,6 +1015,7 @@ class BreadcrumbItem(QWidget):
                     QWidget {
                         background-color: #2397D4;
                         border-radius: 5px;
+                        min-height: 40px;
                     }
                     QLabel {
                         color: white;
@@ -1027,6 +1030,7 @@ class BreadcrumbItem(QWidget):
                     QWidget:hover {
                         background-color: #2397D4;
                         border-radius: 5px;
+                        min-height: 40px;
                     }
                     QLabel {
                         background-color: white;
@@ -1045,6 +1049,9 @@ class BreadcrumbItem(QWidget):
             # Émettre un signal personnalisé pour indiquer que cet élément a été cliqué
             self.parent().item_clicked(self.index)
 
+    def showEvent(self, event):
+        self.update_style()
+
 
 class Breadcrumb(QWidget):
     """Fil d'Ariane for navigation in pages or in application groups (lateral)"""
diff --git a/version.py b/version.py
index 10f116f..7ce65a1 100644
--- a/version.py
+++ b/version.py
@@ -1 +1 @@
-version='2.25'
+version='3.0'