summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2015-02-24 08:31:52 +0000
committerDavid Robillard <d@drobilla.net>2015-02-24 08:31:52 +0000
commitf408b385c2795359cfacb09032089c8387b74f45 (patch)
tree3550306f477daaece04e23736621b3ffed537be7
parent8ac65508e0c7d1a3f0585a16343b174b9cedb94c (diff)
downloadingen-f408b385c2795359cfacb09032089c8387b74f45.tar.gz
ingen-f408b385c2795359cfacb09032089c8387b74f45.tar.bz2
ingen-f408b385c2795359cfacb09032089c8387b74f45.zip
Add light theme for typesettable canvas export.
Don't show edge handles on export. Fix port control drawing to be pixel perfect. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@5605 a436a847-0d15-0410-975c-d299462d15a1
-rw-r--r--src/gui/Style.cpp8
-rw-r--r--src/gui/wscript7
-rw-r--r--wscript3
3 files changed, 17 insertions, 1 deletions
diff --git a/src/gui/Style.cpp b/src/gui/Style.cpp
index 30b2a4f1..342cb142 100644
--- a/src/gui/Style.cpp
+++ b/src/gui/Style.cpp
@@ -40,11 +40,19 @@ using namespace Ingen::Client;
Style::Style(App& app)
// Colours from the Tango palette with modified V
: _app(app)
+#ifdef INGEN_USE_LIGHT_THEME
+ , _audio_port_color(0xA4BC8CFF) // Green
+ , _control_port_color(0x7E8EAAFF) // Blue
+ , _cv_port_color(0x83AFABFF) // Teal (between audio and control)
+ , _event_port_color(0xC89595FF) // Red
+ , _string_port_color(0x8F7198FF) // Plum
+#else
, _audio_port_color(0x4A8A0EFF) // Green
, _control_port_color(0x244678FF) // Blue
, _cv_port_color(0x248780FF) // Teal (between audio and control)
, _event_port_color(0x960909FF) // Red
, _string_port_color(0x5C3566FF) // Plum
+#endif
{
}
diff --git a/src/gui/wscript b/src/gui/wscript
index fe54ad1a..9ca90ee6 100644
--- a/src/gui/wscript
+++ b/src/gui/wscript
@@ -3,6 +3,10 @@ import waflib.extras.autowaf as autowaf
import waflib.Utils as Utils
import waflib.Options as Options
+def options(opt):
+ opt.add_option('--light-theme', action='store_true', dest='light_theme',
+ help='Use light coloured theme')
+
def configure(conf):
autowaf.check_pkg(conf, 'gtkmm-2.4', uselib_store='GTKMM',
atleast_version='2.12.0', mandatory=False)
@@ -17,6 +21,9 @@ def configure(conf):
if conf.env.HAVE_GANV and conf.env.HAVE_GTKMM:
autowaf.define(conf, 'INGEN_BUILD_GUI', 1)
+ if Options.options.light_theme:
+ autowaf.define(conf, 'INGEN_USE_LIGHT_THEME', 1)
+
def build(bld):
obj = bld(features = 'cxx cxxshlib',
export_includes = ['../..'],
diff --git a/wscript b/wscript
index 2ae08103..4164744c 100644
--- a/wscript
+++ b/wscript
@@ -18,6 +18,7 @@ def options(opt):
opt.load('compiler_cxx')
opt.load('python')
opt.load('lv2')
+ opt.recurse('src/gui')
autowaf.set_options(opt)
opt.add_option('--data-dir', type='string', dest='datadir',
help='Ingen data install directory [Default: PREFIX/share/ingen]')
@@ -137,7 +138,7 @@ def configure(conf):
autowaf.define(conf, 'INGEN_BUILD_CLIENT', 1)
else:
Options.options.no_gui = True
-
+
if not Options.options.no_gui:
conf.recurse('src/gui')