nsm-proxy: simplify texts and UI-layout

src/NSM_Proxy_UI.fl

@@ -1,6 +1,6 @@
 # data file for the Fltk User Interface Designer (fluid)
-version 1.0300 
-header_name {.H} 
+version 1.0305
+header_name {.H}
 code_name {.C}
 class NSM_Proxy_UI {open
 } {
@@ -8,30 +8,28 @@ class NSM_Proxy_UI {open
   } {
     Fl_Window {} {
       label {NSM Proxy} open selected
-      xywh {644 190 635 665} type Double color 47 labelcolor 55 xclass {NSM-Proxy} visible
+      xywh {1041 284 645 830} type Double color 47 labelcolor 55 xclass {NSM-Proxy} visible
     } {
       Fl_Box {} {
-        label {Command-line options are incompatible with robust session management for a variety of reasons, so the NSM server does not support them directly. This proxy exists to allow programs which require command-line options to be included in an NSM session. Be warned that referring to files outside of the session directory will impair your ability to reliably archive and transport sessions. Patching the program to use NSM natively will result in a better experience.
+        label {NSM-Proxy handles clients without direct NSM support. It cannot be used to start real NSM clients
 
-The program will be started with its current directory being a uniquely named directory under the current session directory. It is recommended that you only refer to files in the current directory.
+Command-line options MUST go in the "Arguments" field. 
+
+ The program will be started with its current directory being a uniquely named directory under the current session directory. It is recommended that you only refer to files as arguments in this directory to guarantee a transportable and archivable session.
 }
         xywh {15 11 610 139} box BORDER_BOX color 41 labelfont 8 labelsize 12 labelcolor 55 align 128
       }
-      Fl_File_Input executable_input {
-        label {Executable: }
-        xywh {115 162 495 31}
-      }
       Fl_Input arguments_input {
         label {Arguments:}
-        xywh {110 310 350 28}
+        xywh {150 187 340 28}
       }
       Fl_Input label_input {
-        label {Label:}
-        xywh {110 340 350 28}
+        label {NSM GUI Label:}
+        xywh {150 217 340 28}
       }
       Fl_Return_Button start_button {
         label Start
-        xywh {535 630 88 25}
+        xywh {525 760 88 30}
       }
       Fl_Button kill_button {
         label Kill
@@ -39,7 +37,7 @@ The program will be started with its current directory being a uniquely named di
       }
       Fl_Choice save_signal_choice {
         label {Save Signal:} open
-        xywh {110 468 170 25} down_box BORDER_BOX
+        xywh {145 630 170 25} down_box BORDER_BOX
       } {
         MenuItem {} {
           label None
@@ -59,16 +57,16 @@ The program will be started with its current directory being a uniquely named di
         }
       }
       Fl_Box {} {
-        label {The environment variables $NSM_CLIENT_ID and $NSM_SESSION_NAME will contain the unique client ID (suitable for use as e.g. a JACK client name) and the display name for the session, respectively. The variable $CONFIG_FILE will contain the name of the config file selected above.}
-        xywh {15 235 610 69} box BORDER_BOX color 41 labelfont 8 labelsize 12 labelcolor 55 align 128
+        label {For advanced users: The environment variables $NSM_CLIENT_ID and $NSM_SESSION_NAME will contain the unique client ID (suitable for use as e.g. a JACK client name) and the display name for the session, respectively. The variable $CONFIG_FILE will contain the name of the config file selected above.}
+        xywh {15 306 610 69} box BORDER_BOX color 41 labelfont 8 labelsize 12 labelcolor 55 align 128
       }
       Fl_Box {} {
-        label {Some (very few) programs may respond to a specific Unix signal by somehow saving their state. If 'Save Signal' is set to something other than 'None', then NSM Proxy will deliver the specified signal to the proxied process upon an NSM 'Save' event. Most programs will treat these signals just like SIGTERM and die. You have been warned.}
-        xywh {15 378 610 79} box BORDER_BOX color 41 labelfont 8 labelsize 12 labelcolor 55 align 128
+        label {For advanced users: Very few programs may respond to a specific Unix signal by somehow saving their state. If 'Save Signal' is set to something other than 'None', then NSM Proxy will deliver the specified signal to the proxied process upon an NSM 'Save' event. Most programs will treat these signals just like SIGTERM and die. NSM-Proxy cannot force a program to save in our session directory.  }
+        xywh {10 546 610 79} box BORDER_BOX color 41 labelfont 8 labelsize 12 labelcolor 55 align 128
       }
       Fl_Choice stop_signal_choice {
         label {Stop Signal:} open
-        xywh {108 592 170 25} down_box BORDER_BOX
+        xywh {145 485 170 25} down_box BORDER_BOX
       } {
         MenuItem {} {
           label SIGTERM
@@ -84,17 +82,21 @@ The program will be started with its current directory being a uniquely named di
         }
       }
       Fl_Box {} {
-        label {Most programs will shutdown gracefully when sent a SIGTERM or SIGINT signal. It's impossible to know which signal a specific program will respond to. A unhandled signal will simply kill the process, and may cause problems with the audio subsystem (e.g. JACK). Check the program's documentation or source code to determine which signal to use to stop it gracefully.}
-        xywh {15 502 610 79} box BORDER_BOX color 41 labelfont 8 labelsize 12 labelcolor 55 align 128
+        label {For advanced users: Most programs will shutdown gracefully when sent a SIGTERM or SIGINT signal. It's impossible to know which signal a specific program will respond to. A unhandled signal will simply kill the process, and may cause problems with the audio subsystem (e.g. JACK). Check the program's documentation or source code to determine which signal to use to stop it gracefully.}
+        xywh {15 396 610 79} box BORDER_BOX color 41 labelfont 8 labelsize 12 labelcolor 55 align 128
       }
       Fl_File_Input config_file_input {
         label {Config File:}
-        xywh {114 195 406 31}
+        xywh {95 684 406 31}
       }
       Fl_Button config_file_browse_button {
         label Browse
-        xywh {530 195 85 25}
+        xywh {511 684 85 25}
+      }
+      Fl_Input executable_input {
+        label {Executable Name:}
+        xywh {150 160 340 25}
       }
     }
   }
-} 
+}

src/nsm-proxy-gui.cpp

@@ -351,7 +351,9 @@ main ( int argc, char **argv )
 
     lo_send_from( nsmp_addr, losrv,  LO_TT_IMMEDIATE, "/nsm/proxy/update", "" );
 
-
+    //The config file option allows the user to choose a different config file for the proxy settings.
+    //This does more harm than good, so we hide the gui field.
+    ui->config_file_input->hide()
 
     w->show();