From 5d60438224836c9cb8dabc31302d895fe8de6253 Mon Sep 17 00:00:00 2001 From: scorpio810 Date: Tue, 24 Jun 2014 10:46:29 +0000 Subject: [PATCH] Add style to qelectrotech.pro, change url location to read style git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@3176 bfdf4180-ca20-0410-9c96-a3a8aa849046 --- qelectrotech.pro | 7 ++++++- sources/qetapp.cpp | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/qelectrotech.pro b/qelectrotech.pro index e5b8bd445..866a6bc99 100644 --- a/qelectrotech.pro +++ b/qelectrotech.pro @@ -20,6 +20,7 @@ unix { QET_ICONS_PATH = 'share/icons/hicolor/' QET_MAN_PATH = 'man/' QET_APPDATA_PATH = 'share/appdata' + QET_STYLE_PATH = 'share/qelectrotech/' } win32 { # Chemins Windows @@ -30,6 +31,7 @@ win32 { QET_COMMON_TBT_PATH = 'titleblocks/' QET_LANG_PATH = 'lang/' QET_LICENSE_PATH = './' + QET_STYLE_PATH = './' } macx { # Chemins MacOS X @@ -137,6 +139,9 @@ desktop.files = misc/qelectrotech.desktop appdata.path = $$join(INSTALL_PREFIX,,,$${QET_APPDATA_PATH}) appdata.files = misc/qelectrotech.appdata.xml +style.path = $$join(INSTALL_PREFIX,,,$${QET_STYLE_PATH}) +style.files = style.css + icons.path = $$join(INSTALL_PREFIX,,,$${QET_ICONS_PATH}) icons.files = ico/oxygen-icons/16x16 \ ico/oxygen-icons/22x22 \ @@ -154,7 +159,7 @@ man.extra = sh man/compress_man_pages.sh INSTALLS += target elements tbt lang copyright # Sous Unix, on installe egalement l'icone, un fichier .desktop, des fichiers mime et les pages de manuel unix { - INSTALLS += desktop mime_xml mime_desktop mime_package icons man examples appdata + INSTALLS += desktop mime_xml mime_desktop mime_package icons man examples appdata style } # Options de compilation communes a Unix et MacOS X diff --git a/sources/qetapp.cpp b/sources/qetapp.cpp index 7358020fe..5f6266cdd 100644 --- a/sources/qetapp.cpp +++ b/sources/qetapp.cpp @@ -954,7 +954,7 @@ void QETApp::useSystemPalette(bool use) { "}" ); } else { - QFile file("./style.css"); + QFile file(":/style.css"); file.open(QFile::ReadOnly); QString styleSheet = QLatin1String(file.readAll()); setStyleSheet(styleSheet);