summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2016-03-25 16:13:53 (GMT)
committerTobias Markmann <tm@ayena.de>2016-03-29 07:36:36 (GMT)
commitc26314684cd4e6140e5ea882285c2076505bd53d (patch)
tree9d31b6bfaced4a01aff8069096e2c9bb28efad43 /Swift/QtUI/SConscript
parentdaf513a6567100322d3c51733ea0c449ca6adb1b (diff)
downloadswift-c26314684cd4e6140e5ea882285c2076505bd53d.zip
swift-c26314684cd4e6140e5ea882285c2076505bd53d.tar.bz2
Replace chat view theme with one based on the new design
This also removes the old chat theme resources and some code in QtWebKitChatView that was required for compatibility to Adium-style themes. The new code uses a CSS style in the header to change the font size and does not iterate the whole DOM tree itself anymore. Added new resources for failed and successful asks. Test-Information: Tested MUCs, PMs, message correction and file-transfers with the new chat theme. Change-Id: If922a972c658189444e60a7b00e5e5e96661620d
Diffstat (limited to 'Swift/QtUI/SConscript')
-rw-r--r--Swift/QtUI/SConscript14
1 files changed, 7 insertions, 7 deletions
diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript
index 3ff11a8..c3a1760 100644
--- a/Swift/QtUI/SConscript
+++ b/Swift/QtUI/SConscript
@@ -1,15 +1,15 @@
import os, datetime, re, time
import Version
-def generateDefaultTheme(dir) :
+def generateQRCTheme(dir, prefix) :
sourceDir = dir.abspath
result = "<!-- WARNING: This file is automatically generated. Any changes will be overwritten. -->\n"
result += "<RCC version =\"1.0\">"
- result += "<qresource prefix=\"/themes/Default\">"
+ result += "<qresource prefix=\"/themes/" + prefix + "\">"
for (path, dirs, files) in os.walk(sourceDir) :
for file in files :
filePath = os.path.join(path,file)
- result += "<file alias=\"%(alias)s\">%(path)s</file>" % {
+ result += "<file alias=\"%(alias)s\">%(path)s</file>" % {
"alias": filePath[len(sourceDir)+1:],
"path": filePath
}
@@ -84,7 +84,7 @@ if env["PLATFORM"] == "win32" :
if env["debug"] and not env["optimize"]:
myenv.Append(LINKFLAGS = ["/NODEFAULTLIB:msvcrt"])
-myenv.WriteVal("DefaultTheme.qrc", myenv.Value(generateDefaultTheme(myenv.Dir("#/Swift/resources/themes/Default"))))
+myenv.WriteVal("DefaultTheme.qrc", myenv.Value(generateQRCTheme(myenv.Dir("#/Swift/resources/themes/Default"), "Default")))
sources = [
"main.cpp",
@@ -357,7 +357,7 @@ if env["PLATFORM"] == "win32" :
nsis_translation_uninstall_script += "delete $INSTDIR\\translations\\swift_" + lang + ".qm\n"
myenv.WriteVal("../Packaging/nsis/translations-install.nsh", myenv.Value(nsis_translation_install_script))
myenv.WriteVal("../Packaging/nsis/translations-uninstall.nsh", myenv.Value(nsis_translation_uninstall_script))
-
+
################################################################################
@@ -412,11 +412,11 @@ if env["PLATFORM"] == "win32" :
resources = commonResources,
qtplugins = qtplugins,
qtlibs = qtlibs,
- qtversion = qt_version)
+ qtversion = qt_version)
if env["DIST"] :
#myenv.Append(NSIS_OPTIONS = [
- # "/DmsvccRedistributableDir=\"" + env["vcredist"] + "\"",
+ # "/DmsvccRedistributableDir=\"" + env["vcredist"] + "\"",
# "/DbuildVersion=" + myenv["SWIFT_VERSION"]
# ])
#myenv.Nsis("../Packaging/nsis/swift.nsi")