[qet] [3176] Add style to qelectrotech.pro, change url location to read style

[ Thread Index | Date Index | More lists.tuxfamily.org/qet Archives ]


Revision: 3176
Author:   scorpio810
Date:     2014-06-24 12:46:29 +0200 (Tue, 24 Jun 2014)
Log Message:
-----------
Add style to qelectrotech.pro, change url location to read style

Modified Paths:
--------------
    trunk/qelectrotech.pro
    trunk/sources/qetapp.cpp

Modified: trunk/qelectrotech.pro
===================================================================
--- trunk/qelectrotech.pro	2014-06-23 22:42:16 UTC (rev 3175)
+++ trunk/qelectrotech.pro	2014-06-24 10:46:29 UTC (rev 3176)
@@ -20,6 +20,7 @@
 	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 @@
 	QET_COMMON_TBT_PATH        = 'titleblocks/'
 	QET_LANG_PATH              = 'lang/'
 	QET_LICENSE_PATH           = './'
+	QET_STYLE_PATH             = './'
 }
 macx {
 	# Chemins MacOS X
@@ -137,6 +139,9 @@
 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 @@
 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

Modified: trunk/sources/qetapp.cpp
===================================================================
--- trunk/sources/qetapp.cpp	2014-06-23 22:42:16 UTC (rev 3175)
+++ trunk/sources/qetapp.cpp	2014-06-24 10:46:29 UTC (rev 3176)
@@ -954,7 +954,7 @@
 			"}"
 		);
 	} else {
-		QFile file("./style.css");
+		QFile file(":/style.css");
 		file.open(QFile::ReadOnly);
 		QString styleSheet = QLatin1String(file.readAll());
 		setStyleSheet(styleSheet);


Mail converted by MHonArc 2.6.19+ http://listengine.tuxfamily.org/