Skip to content

Commit 4b8da56

Browse files
committed
added material themes
1 parent 1fe0c87 commit 4b8da56

File tree

4 files changed

+74
-92
lines changed

4 files changed

+74
-92
lines changed

compile.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,8 @@ qx.Class.define("qxl.demobrowser.compile.CompilerApi", {
118118
"qx.theme.Modern",
119119
"qx.theme.Simple",
120120
"qx.theme.Classic",
121+
"qx.theme.TangibleLight",
122+
"qx.theme.TangibleDark",
121123
"qx.log.appender.Native",
122124
"qx.log.appender.Console"
123125
]).set({
@@ -131,7 +133,9 @@ qx.Class.define("qxl.demobrowser.compile.CompilerApi", {
131133
"qx.theme.Indigo",
132134
"qx.theme.Modern",
133135
"qx.theme.Simple",
134-
"qx.theme.Classic"
136+
"qx.theme.Classic",
137+
"qx.theme.TangibleLight",
138+
"qx.theme.TangibleDark"
135139
],
136140
templatePath: templateDir
137141
}),

compile.json

Lines changed: 54 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,55 @@
11
{
2-
"$schema": "https://qooxdoo.org/schema/compile-1-0-0.json",
3-
"environment": {
4-
"qx.allowUrlVariants": true,
5-
"qx.allowUrlSettings": true,
6-
"qx.contrib": false,
7-
"qx.icontheme": [
8-
"Tango",
9-
"Oxygen"
10-
]
11-
},
12-
"applications": [
13-
{
14-
"class": "qxl.demobrowser.Application",
15-
"theme": "qxl.demobrowser.Theme",
16-
"name": "demobrowser",
17-
"title": "DemoBrowser",
18-
"bootPath": "source/boot",
19-
"include": [
20-
"qxl.demobrowser.*",
21-
"qx.theme.Indigo",
22-
"qx.theme.Modern",
23-
"qx.theme.Simple",
24-
"qx.theme.Classic"
25-
]
26-
}
27-
],
28-
"targets": [
29-
{
30-
"type": "source",
31-
"outputPath": "compiled/source",
32-
"bundle": {
33-
"include": "qx.*"
34-
},
35-
"babelOptions": {
36-
"targets": {
37-
"edge": "18",
38-
"chrome": "73",
39-
"firefox": "66"
40-
}
41-
}
42-
},
43-
{
44-
"type": "build",
45-
"outputPath": "compiled/build",
46-
"deployPath": "html"
47-
}
48-
],
49-
"defaultTarget": "source",
50-
"locales": [
51-
"en"
52-
],
53-
"serve": {
54-
"listenPort": 8080
55-
}
56-
}
2+
"$schema": "https://qooxdoo.org/schema/compile-1-0-0.json",
3+
"environment": {
4+
"qx.allowUrlVariants": true,
5+
"qx.allowUrlSettings": true,
6+
"qx.contrib": false,
7+
"qx.icontheme": [
8+
"Tango",
9+
"Oxygen"
10+
]
11+
},
12+
"applications": [{
13+
"class": "qxl.demobrowser.Application",
14+
"theme": "qx.theme.Indigo",
15+
"name": "demobrowser",
16+
"title": "DemoBrowser",
17+
"bootPath": "source/boot",
18+
"include": [
19+
"qxl.demobrowser.*",
20+
"qx.theme.Indigo",
21+
"qx.theme.Modern",
22+
"qx.theme.Simple",
23+
"qx.theme.Classic",
24+
"qx.theme.TangibleLight",
25+
"qx.theme.TangibleDark"
26+
]
27+
}
28+
],
29+
"targets": [{
30+
"type": "source",
31+
"outputPath": "compiled/source",
32+
"bundle": {
33+
"include": "qx.*"
34+
},
35+
"babelOptions": {
36+
"targets": {
37+
"edge": "18",
38+
"chrome": "73",
39+
"firefox": "66"
40+
}
41+
}
42+
}, {
43+
"type": "build",
44+
"outputPath": "compiled/build",
45+
"deployPath": "html"
46+
}
47+
],
48+
"defaultTarget": "source",
49+
"locales": [
50+
"en"
51+
],
52+
"serve": {
53+
"listenPort": 8080
54+
}
55+
}

source/class/qxl/demobrowser/DemoBrowser.js

Lines changed: 15 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -479,29 +479,22 @@ qx.Class.define("qxl.demobrowser.DemoBrowser",
479479

480480
if (qx.core.Environment.get("qx.contrib") == false)
481481
{
482-
var themeMenu = new qx.ui.menu.Menu;
483-
484-
this.__themeMenu = themeMenu;
485-
486-
var t1 = new qx.ui.menu.RadioButton("Modern Theme");
487-
var t2 = new qx.ui.menu.RadioButton("Classic Theme");
488-
var t3 = new qx.ui.menu.RadioButton("Simple Theme");
489-
var t4 = new qx.ui.menu.RadioButton("Indigo Theme");
490-
491-
t1.setUserData("value", "qx.theme.Modern");
492-
t2.setUserData("value", "qx.theme.Classic");
493-
t3.setUserData("value", "qx.theme.Simple");
494-
t4.setUserData("value", "qx.theme.Indigo");
495-
t4.setValue(true);
496-
497-
var group = new qx.ui.form.RadioGroup(t1, t2, t3, t4);
482+
var themeMenu = this.__themeMenu = new qx.ui.menu.Menu;
483+
var group = new qx.ui.form.RadioGroup();
484+
485+
var themes = qx.Theme.getAll();
486+
var currentThemeItem;
487+
var currentTheme = qx.theme.manager.Meta.getInstance().getTheme();
488+
for (var key in themes) {
489+
let theme = themes[key];
490+
if (theme.type === "meta") {
491+
var item = new qx.ui.menu.RadioButton(theme.title);
492+
item.setUserData("value", theme.name);
493+
themeMenu.add(item);
494+
group.add(item);
495+
}
496+
}
498497
group.addListener("changeSelection", this.__onChangeTheme, this);
499-
500-
themeMenu.add(t4);
501-
themeMenu.add(t1);
502-
themeMenu.add(t2);
503-
themeMenu.add(t3);
504-
505498
var themeButton = new qx.ui.toolbar.MenuButton(this.tr("Theme"), "icon/22/apps/utilities-color-chooser.png", themeMenu);
506499
this.__themePart = menuPart;
507500
themeButton.setToolTipText("Choose theme");

source/class/qxl/demobrowser/Theme.js

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)