linuxaudio
/
new-session-manager
mirror of https://github.com/linuxaudio/new-session-manager
1
0
Fork 0
Code Issues 0 Releases 17 Wiki Activity
Browse Source

legacy-gui: dark theme

tags/v1.4.0
Nils 5 years ago
parent
964314f745
commit
9075c1b0be
1 changed files with 24 additions and 34 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +24
    -34
      src/legacy-gui.cpp

+ 24
- 34
src/legacy-gui.cpp View File

@@ -23,6 +23,7 @@


#include "Endpoint.hpp" #include "Endpoint.hpp"



#include <FL/Fl.H> #include <FL/Fl.H>


#include <FL/Fl_Window.H> #include <FL/Fl_Window.H>
@@ -61,7 +62,6 @@ static time_t last_ping_response;


static OSC::Endpoint *osc; static OSC::Endpoint *osc;



struct Daemon struct Daemon
{ {
const char *url; const char *url;
@@ -226,7 +226,6 @@ public:
_kill_button->hide(); _kill_button->hide();
_gui->deactivate(); _gui->deactivate();
_dirty->deactivate(); _dirty->deactivate();
color( fl_color_average( FL_BLACK, FL_RED, 0.50 ) );
redraw(); redraw();
} }
else else
@@ -249,28 +248,21 @@ public:


stopped( 0 ); stopped( 0 );


// The following colors are a thin borders around client entries.
// Even without a color there will still be a rounded border from the label itself, which looks fine.

if ( ! strcmp( command, "ready" ) ) if ( ! strcmp( command, "ready" ) )
{ {
color( FL_BACKGROUND_COLOR );
_progress->value( 0.0f ); _progress->value( 0.0f );
} }
else if ( ! strcmp( command, "quit" ) || else if ( ! strcmp( command, "quit" ) ||
! strcmp( command, "kill" ) || ! strcmp( command, "kill" ) ||
! strcmp( command, "error" ) ) ! strcmp( command, "error" ) )
{ {
//Set a border color to indicate warning
color( fl_color_average( FL_BLACK, FL_RED, 0.50 ) ); color( fl_color_average( FL_BLACK, FL_RED, 0.50 ) );
} }
else if ( ! strcmp( command, "stopped" ) ) else if ( ! strcmp( command, "stopped" ) )
{ {
stopped( 1 ); stopped( 1 );
} }
else
{
color( FL_BACKGROUND_COLOR );
}


redraw(); redraw();
} }
@@ -344,7 +336,6 @@ public:
_client_label = NULL; _client_label = NULL;


align( FL_ALIGN_LEFT | FL_ALIGN_INSIDE ); align( FL_ALIGN_LEFT | FL_ALIGN_INSIDE );
color( fl_darker( FL_RED ) );
box( FL_UP_FRAME ); box( FL_UP_FRAME );


int yy = Y + H * 0.25; int yy = Y + H * 0.25;
@@ -365,7 +356,6 @@ public:
} }


{ Fl_Box *o = client_name = new Fl_Box( 0, 0, 300, 48 ); { Fl_Box *o = client_name = new Fl_Box( 0, 0, 300, 48 );
/* o->color( FL_BLUE ); */
o->align( FL_ALIGN_INSIDE | FL_ALIGN_LEFT ); o->align( FL_ALIGN_INSIDE | FL_ALIGN_LEFT );
o->labeltype( FL_NORMAL_LABEL ); o->labeltype( FL_NORMAL_LABEL );
} }
@@ -378,7 +368,6 @@ public:


{ Fl_Progress *o = _progress = new Fl_Progress( xx, Y + H * 0.25, 75, H * 0.50, NULL ); { Fl_Progress *o = _progress = new Fl_Progress( xx, Y + H * 0.25, 75, H * 0.50, NULL );
o->box( FL_FLAT_BOX ); o->box( FL_FLAT_BOX );
o->color( FL_DARK1, FL_LIGHT1 );
o->copy_label( "launch" ); o->copy_label( "launch" );
o->labelsize( 12 ); o->labelsize( 12 );
o->minimum( 0.0f ); o->minimum( 0.0f );
@@ -395,8 +384,6 @@ public:
o->labelsize( 9 ); o->labelsize( 9 );
o->box( FL_UP_BOX ); o->box( FL_UP_BOX );
o->type(0); o->type(0);
o->color();
o->selection_color( FL_YELLOW );
o->value( 0 ); o->value( 0 );
o->callback( cb_button, this ); o->callback( cb_button, this );
} }
@@ -409,8 +396,6 @@ public:
o->labelsize( 9 ); o->labelsize( 9 );
o->box( FL_UP_BOX ); o->box( FL_UP_BOX );
o->type(0); o->type(0);
o->color();
o->selection_color( FL_YELLOW );
o->value( 0 ); o->value( 0 );
o->hide(); o->hide();
o->callback( cb_button, this ); o->callback( cb_button, this );
@@ -422,7 +407,6 @@ public:
o->labelsize( 9 ); o->labelsize( 9 );
o->box( FL_UP_BOX ); o->box( FL_UP_BOX );
o->type(0); o->type(0);
// o->color( FL_RED );
o->value( 0 ); o->value( 0 );
o->tooltip( "Stop" ); o->tooltip( "Stop" );
o->callback( cb_button, this ); o->callback( cb_button, this );
@@ -435,7 +419,6 @@ public:


o->box( FL_UP_BOX ); o->box( FL_UP_BOX );
o->type(0); o->type(0);
// o->color( FL_GREEN );
o->value( 0 ); o->value( 0 );
o->label( "@>" ); o->label( "@>" );
o->tooltip( "Resume" ); o->tooltip( "Resume" );
@@ -450,7 +433,6 @@ public:


o->box( FL_UP_BOX ); o->box( FL_UP_BOX );
o->type(0); o->type(0);
// o->color( FL_RED );
o->value( 0 ); o->value( 0 );
o->label( "X" ); o->label( "X" );
o->tooltip( "Remove" ); o->tooltip( "Remove" );
@@ -635,7 +617,8 @@ public:


Fl_Tree_Item *item = session_browser->callback_item(); Fl_Tree_Item *item = session_browser->callback_item();


// session_browser->deselect( item, 0 );
if ( item )
session_browser->deselect( item, 0 ); //Deselect on program start, otherwise it looks like the first session is already loaded.


if ( item->children() ) if ( item->children() )
return; return;
@@ -679,7 +662,6 @@ public:
{ {
Fl_Select_Browser *o = browser = new Fl_Select_Browser( 0, 100, 300, 300 ); Fl_Select_Browser *o = browser = new Fl_Select_Browser( 0, 100, 300, 300 );
o->box( FL_ROUNDED_BOX ); o->box( FL_ROUNDED_BOX );
o->color( FL_BLACK );
o->callback( browser_callback, win ); o->callback( browser_callback, win );
foreach_daemon( d ) foreach_daemon( d )
{ {
@@ -911,7 +893,6 @@ public:
{ Fl_Button *o = abort_button = new Fl_Button( 0, 0, 160, 50, "Close &without Saving" ); { Fl_Button *o = abort_button = new Fl_Button( 0, 0, 160, 50, "Close &without Saving" );
o->shortcut( FL_CTRL | 'w' ); o->shortcut( FL_CTRL | 'w' );
o->box( FL_UP_BOX ); o->box( FL_UP_BOX );
o->color( fl_color_average( FL_RED, fl_rgb_color(10,10,10), 0.5f ) );
o->callback( cb_handle, (void*)this ); o->callback( cb_handle, (void*)this );
} }


@@ -931,12 +912,8 @@ public:
{ {
Fl_Tree *o = session_browser = new Fl_Tree( X, Y + 50, W / 3, H - ( 50 + SH ) ); Fl_Tree *o = session_browser = new Fl_Tree( X, Y + 50, W / 3, H - ( 50 + SH ) );
o->callback( cb_handle, (void *)this ); o->callback( cb_handle, (void *)this );
o->color( FL_DARK1 );
o->item_labelbgcolor( o->color() );
o->item_labelfgcolor( FL_FOREGROUND_COLOR );
o->sortorder( FL_TREE_SORT_ASCENDING ); o->sortorder( FL_TREE_SORT_ASCENDING );
o->showroot( 0 ); o->showroot( 0 );
o->selection_color( fl_darker( FL_GREEN ) );
o->selectbox( FL_UP_FRAME ); o->selectbox( FL_UP_FRAME );
o->box( FL_FLAT_BOX ); o->box( FL_FLAT_BOX );
/* o->label( "Sessions" ); */ /* o->label( "Sessions" ); */
@@ -951,8 +928,9 @@ public:
o->type( FL_VERTICAL ); o->type( FL_VERTICAL );
o->spacing( 2 ); o->spacing( 2 );


{ session_name_box = new Fl_Box( 0, 0, 100, 25, "" );

{
session_name_box = new Fl_Box( 0, 0, 100, 25, "" );
session_name_box->labelsize( 20 );
} }


{ Fl_Button *o = add_button = new Fl_Button( 0, 0, 100, 25, "&Add Client to Session" ); { Fl_Button *o = add_button = new Fl_Button( 0, 0, 100, 25, "&Add Client to Session" );
@@ -985,12 +963,10 @@ public:
} }


{ Fl_Text_Display *o = status_display = new Fl_Text_Display( X, Y + H - SH, W, SH ); { Fl_Text_Display *o = status_display = new Fl_Text_Display( X, Y + H - SH, W, SH );
o->color( FL_DARK1 );
o->textcolor( FL_FOREGROUND_COLOR );
o->box( FL_UP_BOX ); o->box( FL_UP_BOX );
o->textfont( FL_COURIER );
o->textsize( 10 );
Fl_Text_Buffer *b = new Fl_Text_Buffer(); Fl_Text_Buffer *b = new Fl_Text_Buffer();
o->textfont( FL_COURIER ); // Create the "technical log" look&feel
o->textsize( 12 );
o->buffer(b); o->buffer(b);
} }


@@ -1305,7 +1281,9 @@ cb_main ( Fl_Widget *, void * )
int int
main (int argc, char **argv ) main (int argc, char **argv )
{ {
Fl::scheme("gtk+"); //Fl::scheme("gleam");
Fl::scheme( "gtk+" );

Fl::visual(FL_DOUBLE|FL_INDEX); // FLKT Double_Window: "higly recommended […] put before the first show() of any window in your program"


fl_register_images(); fl_register_images();


@@ -1332,6 +1310,18 @@ main (int argc, char **argv )
o->show( 0, NULL ); o->show( 0, NULL );
} }


//Setting colors only after main window creation.
//We keep them all in once place instead of setting them in the widgets
Fl::set_color( FL_BACKGROUND_COLOR, 37, 40, 45 ); //These are the colors used as backgrounds by almost all widgets and used to draw the edges of all the boxtypes.
Fl::set_color( FL_BACKGROUND2_COLOR, 55, 61, 69 ); //This color is used as a background by Fl_Input and other text widgets.
Fl::set_color( FL_FOREGROUND_COLOR, 223, 237, 255 );
Fl::set_color( FL_INACTIVE_COLOR, 255, 0, 0 ); // Not used
Fl::set_color( FL_SELECTION_COLOR, 80, 84, 92 ); // e.g. the currently selected session
Fl::reload_scheme();
controller->session_browser->item_labelfgcolor( fl_rgb_color (213, 227, 245 ) ); // a bit darker than foreground



static struct option long_options[] = static struct option long_options[] =
{ {
{ "nsm-url", required_argument, 0, 'n' }, { "nsm-url", required_argument, 0, 'n' },


Write Preview
Loading…
Cancel
Save