Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

New control panel layout

  • Loading branch information...
commit e722120348eb277a30d3f752b9666635b2b9f81f 1 parent 33a127d
@sbourdeauducq sbourdeauducq authored
Showing with 32 additions and 13 deletions.
  1. +32 −13 src/cp.c
View
45 src/cp.c
@@ -225,6 +225,21 @@ void init_cp()
"g.place(g_iosetup0, -column 1 -row 1)",
"g.place(g_iosetup1, -column 1 -row 2)",
"g.place(g_iosetup2, -column 1 -row 3)",
+
+ "g_online0 = new Grid()",
+ "l_online = new Label(-text \"Online\" -font \"title\")",
+ "s_online1 = new Separator(-vertical no)",
+ "s_online2 = new Separator(-vertical no)",
+ "g_online0.place(s_online1, -column 1 -row 1)",
+ "g_online0.place(l_online, -column 2 -row 1)",
+ "g_online0.place(s_online2, -column 3 -row 1)",
+ "g_online = new Grid()",
+ "b_rss = new Button(-text \"RSS wall\")",
+ "b_webupdate = new Button(-text \"Web update\")",
+ "g_online.place(b_rss, -column 1 -row 1)",
+ "g_online.place(b_webupdate, -column 2 -row 1)",
+ "g.place(g_online0, -column 1 -row 4)",
+ "g.place(g_online, -column 1 -row 5)",
"g_patches0 = new Grid()",
"l_patches = new Label(-text \"Patches\" -font \"title\")",
@@ -238,8 +253,8 @@ void init_cp()
"b_monitor = new Button(-text \"Variable monitor\")",
"g_patches.place(b_editor, -column 1 -row 1)",
"g_patches.place(b_monitor, -column 2 -row 1)",
- "g.place(g_patches0, -column 1 -row 4)",
- "g.place(g_patches, -column 1 -row 5)",
+ "g.place(g_patches0, -column 1 -row 6)",
+ "g.place(g_patches, -column 1 -row 7)",
"g_performance0 = new Grid()",
"l_performance = new Label(-text \"Performance\" -font \"title\")",
@@ -249,18 +264,22 @@ void init_cp()
"g_performance0.place(l_performance, -column 2 -row 1)",
"g_performance0.place(s_performance2, -column 3 -row 1)",
"g_performance = new Grid()",
- "b_start = new Button(-text \"Start!\")",
- "b_firstpatch = new Button(-text \"First patch\")",
"b_new = new Button(-text \"New\")",
"b_load = new Button(-text \"Load\")",
"b_save = new Button(-text \"Save\")",
+ "b_firstpatch = new Button(-text \"First patch\")",
+ "g_start = new Grid()",
+ "b_start = new Button(-text \"Start!\")",
+ "b_startsimple = new Button(-text \"Simple mode\")",
+ "g_start.place(b_start, -column 1 -row 1)",
+ "g_start.place(b_startsimple, -column 2 -row 1)",
"g_performance.place(b_new, -column 1 -row 1)",
"g_performance.place(b_load, -column 2 -row 1)",
"g_performance.place(b_save, -column 3 -row 1)",
- "g.place(g_performance0, -column 1 -row 6)",
- "g.place(b_firstpatch, -column 1 -row 7)",
- "g.place(b_start, -column 1 -row 8)",
+ "g.place(g_performance0, -column 1 -row 8)",
"g.place(g_performance, -column 1 -row 9)",
+ "g.place(b_firstpatch, -column 1 -row 10)",
+ "g.place(g_start, -column 1 -row 11)",
"g_tools0 = new Grid()",
"l_tools = new Label(-text \"Tools\" -font \"title\")",
@@ -278,8 +297,8 @@ void init_cp()
#ifdef WITH_PDF
"g_tools.place(b_pdfreader, -column 2 -row 1)",
#endif
- "g.place(g_tools0, -column 1 -row 10)",
- "g.place(g_tools, -column 1 -row 11)",
+ "g.place(g_tools0, -column 1 -row 12)",
+ "g.place(g_tools, -column 1 -row 13)",
"g_system0 = new Grid()",
"l_system = new Label(-text \"System\" -font \"title\")",
@@ -294,11 +313,11 @@ void init_cp()
"b_shutdown = new Button(-text \"Shutdown\")",
"g_system.place(b_about, -column 1 -row 1)",
"g_system.place(b_shutdown, -column 2 -row 1)",
- "g.place(g_system0, -column 1 -row 12)",
- "g.place(b_sysettings, -column 1 -row 13)",
- "g.place(g_system, -column 1 -row 14)",
+ "g.place(g_system0, -column 1 -row 14)",
+ "g.place(b_sysettings, -column 1 -row 15)",
+ "g.place(g_system, -column 1 -row 16)",
- "w = new Window(-content g -title \"Control panel\" -workx 150 -worky 120)",
+ "w = new Window(-content g -title \"Control panel\" -workx 150 -worky 90)",
"w.open()",
0);

0 comments on commit e722120

Please sign in to comment.
Something went wrong with that request. Please try again.