summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Melcher <github@matthiasm.com>2023-10-31 19:33:42 +0100
committerMatthias Melcher <github@matthiasm.com>2023-10-31 19:33:50 +0100
commit4b02c3614971f9334514e3f37cc27686c6485e2b (patch)
treefe6855bede5bee66366c1dc7c20939a0c62949dc
parentbcc6de53322fc53bf99885f352fd6229d7e713d1 (diff)
FLUID: Disables MergeBack.
I decided to disable MergeBack for now. During testing, some issues could not be resolved, and focus should be on V1.4.
Diffstat
-rw-r--r--fluid/Fl_Function_Type.cxx4
-rw-r--r--fluid/Fl_Menu_Type.cxx4
-rw-r--r--fluid/Fl_Widget_Type.cxx4
-rw-r--r--fluid/alignment_panel.cxx197
-rw-r--r--fluid/alignment_panel.fl434
-rw-r--r--fluid/fluid.cxx5
-rw-r--r--fluid/mergeback.cxx6
-rw-r--r--fluid/mergeback.h5
8 files changed, 242 insertions, 417 deletions
diff --git a/fluid/Fl_Function_Type.cxx b/fluid/Fl_Function_Type.cxx
index 33932cc93..3d45fb881 100644
--- a/fluid/Fl_Function_Type.cxx
+++ b/fluid/Fl_Function_Type.cxx
@@ -665,9 +665,9 @@ void Fl_Code_Type::write_code1(Fd_Code_Writer& f) {
if ( handle_editor_changes() == 1 ) {
main_window->redraw(); // tell fluid to redraw; edits may affect tree's contents
}
- f.tag(FD_TAG_GENERIC, 0);
+ // Matt: disabled f.tag(FD_TAG_GENERIC, 0);
f.write_c_indented(name(), 0, '\n');
- f.tag(FD_TAG_CODE, get_uid());
+ // Matt: disabled f.tag(FD_TAG_CODE, get_uid());
}
/**
diff --git a/fluid/Fl_Menu_Type.cxx b/fluid/Fl_Menu_Type.cxx
index 6e65db871..8cd63d95f 100644
--- a/fluid/Fl_Menu_Type.cxx
+++ b/fluid/Fl_Menu_Type.cxx
@@ -278,7 +278,7 @@ void Fl_Menu_Item_Type::write_static(Fd_Code_Writer& f) {
f.write_c(", %s", ut);
if (use_v) f.write_c(" v");
f.write_c(") {\n");
- f.tag(FD_TAG_GENERIC, 0);
+ // Matt: disabled f.tag(FD_TAG_GENERIC, 0);
f.write_c_indented(callback(), 1, 0);
if (*(d-1) != ';' && *(d-1) != '}') {
const char *p = strrchr(callback(), '\n');
@@ -289,7 +289,7 @@ void Fl_Menu_Item_Type::write_static(Fd_Code_Writer& f) {
if (*p != '#' && *p) f.write_c(";");
}
f.write_c("\n");
- f.tag(FD_TAG_MENU_CALLBACK, get_uid());
+ // Matt: disabled f.tag(FD_TAG_MENU_CALLBACK, get_uid());
f.write_c("}\n");
if (k) {
f.write_c("void %s::%s(Fl_Menu_* o, %s v) {\n", k, cn, ut);
diff --git a/fluid/Fl_Widget_Type.cxx b/fluid/Fl_Widget_Type.cxx
index f4e33232c..4c7617597 100644
--- a/fluid/Fl_Widget_Type.cxx
+++ b/fluid/Fl_Widget_Type.cxx
@@ -2848,7 +2848,7 @@ void Fl_Widget_Type::write_static(Fd_Code_Writer& f) {
f.write_c(", %s", ut);
if (use_v) f.write_c(" v");
f.write_c(") {\n");
- f.tag(FD_TAG_GENERIC, 0);
+ // Matt: disabled f.tag(FD_TAG_GENERIC, 0);
f.write_c_indented(callback(), 1, 0);
if (*(d-1) != ';' && *(d-1) != '}') {
const char *p = strrchr(callback(), '\n');
@@ -2859,7 +2859,7 @@ void Fl_Widget_Type::write_static(Fd_Code_Writer& f) {
if (*p != '#' && *p) f.write_c(";");
}
f.write_c("\n");
- f.tag(FD_TAG_WIDGET_CALLBACK, get_uid());
+ // Matt: disabled f.tag(FD_TAG_WIDGET_CALLBACK, get_uid());
f.write_c("}\n");
if (k) {
f.write_c("void %s::%s(%s* o, %s v) {\n", k, cn, t, ut);
diff --git a/fluid/alignment_panel.cxx b/fluid/alignment_panel.cxx
index 316168712..8bb4ac2a3 100644
--- a/fluid/alignment_panel.cxx
+++ b/fluid/alignment_panel.cxx
@@ -29,11 +29,9 @@ int w_settings_shell_list_selected;
Fl_Double_Window *script_panel=(Fl_Double_Window *)0;
static void cb_script_panel(Fl_Double_Window*, void*) {
-//~fl~0~0000~d63cf325~~
if (Fl::event()==FL_SHORTCUT && Fl::event_key()==FL_Escape)
return; // ignore Escape
script_panel->hide(); // otherwise hide..;
-//~fl~3~f5ed~653ca372~~
}
Fl_Text_Editor *script_input=(Fl_Text_Editor *)0;
@@ -74,11 +72,9 @@ Fl_Double_Window* make_script_panel() {
o->size_range(200, 150);
script_panel->end();
} // Fl_Double_Window* script_panel
-//~fl~0~0000~fa5002f6~~
// Enable line numbers
script_input->linenumber_width(60);
script_input->linenumber_size(script_input->Fl_Text_Display::textsize());
-//~fl~1~339c~95aed424~~
return script_panel;
}
@@ -87,9 +83,7 @@ Fl_Double_Window *settings_window=(Fl_Double_Window *)0;
Fl_Tabs *w_settings_tabs=(Fl_Tabs *)0;
static void cb_w_settings_tabs(Fl_Tabs* o, void* v) {
-//~fl~0~0000~b2ea2cd0~~
propagate_load(o, v);
-//~fl~3~dae5~50833204~~
}
#include <FL/Fl_PNG_Image.H>
@@ -202,9 +196,7 @@ static Fl_Image *image_general_64() {
}
static void cb_(Fl_Group* o, void* v) {
-//~fl~0~0000~8b6a4f13~~
propagate_load(o, v);
-//~fl~3~05f1~50833204~~
}
Fl_Scheme_Choice *scheme_choice=(Fl_Scheme_Choice *)0;
@@ -212,80 +204,62 @@ Fl_Scheme_Choice *scheme_choice=(Fl_Scheme_Choice *)0;
Fl_Check_Button *tooltips_button=(Fl_Check_Button *)0;
static void cb_tooltips_button(Fl_Check_Button*, void*) {
-//~fl~0~0000~22407b10~~
Fl_Tooltip::enable(tooltips_button->value());
fluid_prefs.set("show_tooltips", tooltips_button->value());
-//~fl~3~c339~b60eb0d5~~
}
Fl_Check_Button *completion_button=(Fl_Check_Button *)0;
static void cb_completion_button(Fl_Check_Button*, void*) {
-//~fl~0~0000~e63c99e7~~
fluid_prefs.set("show_completion_dialogs", completion_button->value());
-//~fl~3~07f7~75f43754~~
}
Fl_Check_Button *openlast_button=(Fl_Check_Button *)0;
static void cb_openlast_button(Fl_Check_Button*, void*) {
-//~fl~0~0000~19e86ad0~~
fluid_prefs.set("open_previous_file", openlast_button->value());
-//~fl~3~4ca1~eb6803cb~~
}
Fl_Check_Button *prevpos_button=(Fl_Check_Button *)0;
static void cb_prevpos_button(Fl_Check_Button*, void*) {
-//~fl~0~0000~1eb02531~~
fluid_prefs.set("prev_window_pos", prevpos_button->value());
-//~fl~3~ead3~081cd782~~
}
Fl_Check_Button *show_comments_button=(Fl_Check_Button *)0;
static void cb_show_comments_button(Fl_Check_Button*, void*) {
-//~fl~0~0000~20984206~~
show_comments = show_comments_button->value();
fluid_prefs.set("show_comments", show_comments);
redraw_browser();
-//~fl~3~f3ed~7e12c220~~
}
static void cb_1(Fl_Group* o, void* v) {
-//~fl~0~0000~8a50c4af~~
propagate_load(o, v);
-//~fl~3~b8d5~50833204~~
}
Fl_Spinner *recent_spinner=(Fl_Spinner *)0;
static void cb_recent_spinner(Fl_Spinner*, void*) {
-//~fl~0~0000~b1d67afc~~
fluid_prefs.set("recent_files", recent_spinner->value());
load_history();
-//~fl~3~9ad9~c11dca25~~
}
Fl_Check_Button *use_external_editor_button=(Fl_Check_Button *)0;
static void cb_use_external_editor_button(Fl_Check_Button*, void*) {
-//~fl~0~0000~692aa10e~~
G_use_external_editor = use_external_editor_button->value();
fluid_prefs.set("use_external_editor", G_use_external_editor);
redraw_browser();
-//~fl~3~546c~9406f8e4~~
}
Fl_Input *editor_command_input=(Fl_Input *)0;
static void cb_editor_command_input(Fl_Input*, void*) {
-//~fl~0~0000~f3b84b34~~
strncpy(G_external_editor_command, editor_command_input->value(), sizeof(G_external_editor_command)-1);
G_external_editor_command[sizeof(G_external_editor_command)-1] = 0;
fluid_prefs.set("external_editor_command", G_external_editor_command);
redraw_browser();
-//~fl~3~1151~2c28d30d~~
}
Fl_Check_Button *guides_button=(Fl_Check_Button *)0;
@@ -295,9 +269,7 @@ Fl_Check_Button *restricted_button=(Fl_Check_Button *)0;
Fl_Group *w_settings_project_tab=(Fl_Group *)0;
static void cb_w_settings_project_tab(Fl_Group* o, void* v) {
-//~fl~0~0000~a52da131~~
propagate_load(o, v);
-//~fl~3~5fff~50833204~~
}
static const unsigned char idata_document_64[] =
@@ -353,7 +325,6 @@ static Fl_Image *image_document_64() {
Fl_Input *header_file_input=(Fl_Input *)0;
static void cb_header_file_input(Fl_Input* o, void* v) {
-//~fl~0~0000~ebfa1479~~
if (v == LOAD) {
o->value(g_project.header_file_name.c_str());
} else {
@@ -362,13 +333,11 @@ static void cb_header_file_input(Fl_Input* o, void* v) {
set_modflag(1);
}
}
-//~fl~3~42e9~d94de24c~~
}
Fl_Input *code_file_input=(Fl_Input *)0;
static void cb_code_file_input(Fl_Input* o, void* v) {
-//~fl~0~0000~3d36c33a~~
if (v == LOAD) {
o->value(g_project.code_file_name.c_str());
} else {
@@ -377,13 +346,11 @@ static void cb_code_file_input(Fl_Input* o, void* v) {
set_modflag(1);
}
}
-//~fl~3~9a81~9ccae002~~
}
Fl_Check_Button *include_H_from_C_button=(Fl_Check_Button *)0;
static void cb_include_H_from_C_button(Fl_Check_Button* o, void* v) {
-//~fl~0~0000~364552dd~~
if (v == LOAD) {
o->value(g_project.include_H_from_C);
} else {
@@ -392,13 +359,11 @@ static void cb_include_H_from_C_button(Fl_Check_Button* o, void* v) {
g_project.include_H_from_C = o->value();
}
}
-//~fl~3~0fc3~a9382397~~
}
Fl_Check_Button *use_FL_COMMAND_button=(Fl_Check_Button *)0;
static void cb_use_FL_COMMAND_button(Fl_Check_Button* o, void* v) {
-//~fl~0~0000~1638bd23~~
if (v == LOAD) {
o->value(g_project.use_FL_COMMAND);
} else {
@@ -407,13 +372,11 @@ static void cb_use_FL_COMMAND_button(Fl_Check_Button* o, void* v) {
g_project.use_FL_COMMAND = o->value();
}
}
-//~fl~3~9dc0~5de48539~~
}
Fl_Check_Button *utf8_in_src_button=(Fl_Check_Button *)0;
static void cb_utf8_in_src_button(Fl_Check_Button* o, void* v) {
-//~fl~0~0000~9410c9c6~~
if (v == LOAD) {
o->value(g_project.utf8_in_src);
} else {
@@ -422,13 +385,11 @@ static void cb_utf8_in_src_button(Fl_Check_Button* o, void* v) {
g_project.utf8_in_src = o->value();
}
}
-//~fl~3~9244~3b6fa627~~
}
Fl_Check_Button *avoid_early_includes_button=(Fl_Check_Button *)0;
static void cb_avoid_early_includes_button(Fl_Check_Button* o, void* v) {
-//~fl~0~0000~3bdf0f16~~
if (v == LOAD) {
o->value(g_project.avoid_early_includes);
} else {
@@ -437,13 +398,11 @@ static void cb_avoid_early_includes_button(Fl_Check_Button* o, void* v) {
g_project.avoid_early_includes = o->value();
}
}
-//~fl~3~4a7a~06858aea~~
}
Fl_Check_Button *w_proj_mergeback=(Fl_Check_Button *)0;
static void cb_w_proj_mergeback(Fl_Check_Button* o, void* v) {
-//~fl~0~0000~5d00a773~~
if (v == LOAD) {
o->value(g_project.write_mergeback_data);
} else {
@@ -452,15 +411,12 @@ static void cb_w_proj_mergeback(Fl_Check_Button* o, void* v) {
g_project.write_mergeback_data = o->value();
}
}
-//~fl~3~04c9~145f3302~~
}
Fl_Group *w_settings_layout_tab=(Fl_Group *)0;
static void cb_w_settings_layout_tab(Fl_Group* o, void* v) {
-//~fl~0~0000~e43cacfc~~
propagate_load(o, v);
-//~fl~3~e8f6~50833204~~
}
static const unsigned char idata_layout_64[] =
@@ -495,7 +451,6 @@ static Fl_Image *image_layout_64() {
Fl_Choice *layout_choice=(Fl_Choice *)0;
static void cb_layout_choice(Fl_Choice* o, void* v) {
-//~fl~0~0000~404277fb~~
if (v == LOAD) {
o->value(g_layout_list.current_suite());
} else {
@@ -503,7 +458,6 @@ static void cb_layout_choice(Fl_Choice* o, void* v) {
g_layout_list.current_suite(index);
g_layout_list.update_dialogs();
}
-//~fl~3~604f~841c3967~~
}
Fl_Menu_Item menu_layout_choice[] = {
@@ -513,7 +467,6 @@ Fl_Menu_Item menu_layout_choice[] = {
};
static void cb_2(Fl_Button*, void* v) {
-//~fl~0~0000~ef630678~~
// Clone the current layout suite
if (v == LOAD) return;
@@ -526,13 +479,11 @@ static void cb_2(Fl_Button*, void* v) {
g_layout_list.add(new_name);
g_layout_list.update_dialogs();
-//~fl~3~adce~28d4d389~~
}
Fl_Menu_Button *w_layout_menu=(Fl_Menu_Button *)0;
static void cb_w_layout_menu(Fl_Menu_Button*, void* v) {
-//~fl~0~0000~7387a6f8~~
if (v == LOAD) {
Fd_Layout_Suite &suite = g_layout_list[g_layout_list.current_suite()];
if (suite.storage_ == FD_STORE_INTERNAL) {
@@ -546,11 +497,9 @@ static void cb_w_layout_menu(Fl_Menu_Button*, void* v) {
}
w_layout_menu_storage[suite.storage_]->setonly();
}
-//~fl~3~cbf2~27881b25~~
}
static void cb_w_layout_menu_rename(Fl_Menu_*, void*) {
-//~fl~0~0000~2667563f~~
// Rename the current layout suite
Fl_String old_name = g_layout_list[g_layout_list.current_suite()].name_;
@@ -560,43 +509,33 @@ static void cb_w_layout_menu_rename(Fl_Menu_*, void*) {
g_layout_list.rename(new_name);
g_layout_list.update_dialogs();
-//~fl~2~f100~71cc7c62~~
}
static void cb_w_layout_menu_storage(Fl_Menu_*, void*) {
-//~fl~0~0000~0e7b558d~~
Fd_Layout_Suite &suite = g_layout_list[g_layout_list.current_suite()];
suite.storage(FD_STORE_INTERNAL);
g_layout_list.update_dialogs();
-//~fl~2~2678~eea63d0a~~
}
static void cb_w_layout_menu_storage1(Fl_Menu_*, void*) {
-//~fl~0~0000~f9136a03~~
Fd_Layout_Suite &suite = g_layout_list[g_layout_list.current_suite()];
suite.storage(FD_STORE_USER);
g_layout_list.update_dialogs();
-//~fl~2~ad97~daeea163~~
}
static void cb_w_layout_menu_storage2(Fl_Menu_*, void*) {
-//~fl~0~0000~c06bc743~~
Fd_Layout_Suite &suite = g_layout_list[g_layout_list.current_suite()];
suite.storage(FD_STORE_PROJECT);
g_layout_list.update_dialogs();
-//~fl~2~5a34~f7c135cb~~
}
static void cb_w_layout_menu_storage3(Fl_Menu_*, void*) {
-//~fl~0~0000~d743a383~~
Fd_Layout_Suite &suite = g_layout_list[g_layout_list.current_suite()];
suite.storage(FD_STORE_FILE);
g_layout_list.update_dialogs();
-//~fl~2~c707~19d71da4~~
}
static void cb_w_layout_menu_load(Fl_Menu_*, void*) {
-//~fl~0~0000~ec15d339~~
// Give the user a file chooser and load that file
Fl_Native_File_Chooser fnfc;
fnfc.title("Load Layout Settings:");
@@ -609,11 +548,9 @@ static void cb_w_layout_menu_load(Fl_Menu_*, void*) {
g_layout_list.load(new_filename);
//g_layout_list.current_suite(n);
g_layout_list.update_dialogs();
-//~fl~2~2c5e~3c8717b8~~
}
static void cb_w_layout_menu_save(Fl_Menu_*, void*) {
-//~fl~0~0000~548a8f84~~
// Give the user a file chooser with a suggested name
Fl_Native_File_Chooser fnfc;
fnfc.title("Save Layout Settings:");
@@ -628,16 +565,13 @@ static void cb_w_layout_menu_save(Fl_Menu_*, void*) {
if (!new_filename) return;
g_layout_list.filename_ = new_filename;
g_layout_list.save(new_filename);
-//~fl~2~1aa1~f136697d~~
}
static void cb_w_layout_menu_delete(Fl_Menu_*, void*) {
-//~fl~0~0000~a7923711~~
// remove the current suite
g_layout_list.remove(g_layout_list.current_suite());
g_layout_list.update_dialogs();
-//~fl~2~b429~437d0f96~~
}
Fl_Menu_Item menu_w_layout_menu[] = {
@@ -655,243 +589,195 @@ Fl_Menu_Item menu_w_layout_menu[] = {
Fl_Button *preset_choice[3]={(Fl_Button *)0};
static void cb_Left(Fl_Value_Input* o, void* v) {
-//~fl~0~0000~258cf08a~~
if (v == LOAD) {
o->value((double)layout->left_window_margin);
} else {
layout->left_window_margin = (int)o->value();
}
-//~fl~3~9c64~aa182acd~~
}
static void cb_Top(Fl_Value_Input* o, void* v) {
-//~fl~0~0000~828bcdb2~~
if (v == LOAD) {
o->value((double)layout->top_window_margin);
} else {
layout->top_window_margin = (int)o->value();
}
-//~fl~3~2f06~f61c794a~~
}
static void cb_Right(Fl_Value_Input* o, void* v) {
-//~fl~0~0000~f9212ca5~~
if (v == LOAD) {
o->value((double)layout->right_window_margin);
} else {
layout->right_window_margin = (int)o->value();
}
-//~fl~3~5cef~30018da3~~
}
static void cb_Bottom(Fl_Value_Input* o, void* v) {
-//~fl~0~0000~a351318c~~
if (v == LOAD) {
o->value((double)layout->bottom_window_margin);
} else {
layout->bottom_window_margin = (int)o->value();
}
-//~fl~3~3509~9d6618c2~~
}
static void cb_Horizontal(Fl_Value_Input* o, void* v) {
-//~fl~0~0000~66fe2b77~~
if (v == LOAD) {
o->value((double)layout->window_grid_x);
} else {
layout->window_grid_x = (int)o->value();
}
-//~fl~3~234f~73e0a613~~
}
static void cb_Vertical(Fl_Value_Input* o, void* v) {
-//~fl~0~0000~8e022d1a~~
if (v == LOAD) {
o->value((double)layout->window_grid_y);
} else {
layout->window_grid_y = (int)o->value();
}
-//~fl~3~e1f8~f5065f10~~
}
static void cb_Left1(Fl_Value_Input* o, void* v) {
-//~fl~0~0000~5c8cce39~~
if (v == LOAD) {
o->value((double)layout->left_group_margin);
} else {
layout->left_group_margin = (int)o->value();
}
-//~fl~3~b3b7~ac52b044~~
}
static void cb_Top1(Fl_Value_Input* o, void* v) {
-//~fl~0~0000~136bd57e~~
if (v == LOAD) {
o->value((double)layout->top_group_margin);
} else {
layout->top_group_margin = (int)o->value();
}
-//~fl~3~7b19~69c82c2d~~
}
static void cb_Right1(Fl_Value_Input* o, void* v) {
-//~fl~0~0000~90c3fa58~~
if (v == LOAD) {
o->value((double)layout->right_group_margin);
} else {
layout->right_group_margin = (int)o->value();
}
-//~fl~3~689a~cd20c87f~~
}
static void cb_Bottom1(Fl_Value_Input* o, void* v) {
-//~fl~0~0000~d22b1229~~
if (v == LOAD) {
o->value((double)layout->bottom_group_margin);
} else {
layout->bottom_group_margin = (int)o->value();
}
-//~fl~3~f9d7~635e9e6a~~
}
static void cb_Horizontal1(Fl_Value_Input* o, void* v) {
-//~fl~0~0000~f88196a7~~
if (v == LOAD) {
o->value((double)layout->group_grid_x);
} else {
layout->group_grid_x = (int)o->value();
}
-//~fl~3~c8a2~e47e8565~~
}
static void cb_Vertical1(Fl_Value_Input* o, void* v) {
-//~fl~0~0000~cb6a7744~~
if (v == LOAD) {
o->value((double)layout->group_grid_y);
} else {
layout->group_grid_y = (int)o->value();
}
-//~fl~3~678c~5d0edca1~~
}
static void cb_Top2(Fl_Value_Input* o, void* v) {
-//~fl~0~0000~da74ddc1~~
if (v == LOAD) {
o->value((double)layout->top_tabs_margin);
} else {
layout->top_tabs_margin = (int)o->value();
}
-//~fl~3~d9d1~95ebcf51~~
}
static void cb_Bottom2(Fl_Value_Input* o, void* v) {
-//~fl~0~0000~1b341a96~~
if (v == LOAD) {
o->value((double)layout->bottom_tabs_margin);
} else {
layout->bottom_tabs_margin = (int)o->value();
}
-//~fl~3~2fd1~03319093~~
}
static void cb_Minimum(Fl_Value_Input* o, void* v) {
-//~fl~0~0000~63926d5a~~
if (v == LOAD) {
o->value((double)layout->widget_min_w);
} else {
layout->widget_min_w = (int)o->value();
}
-//~fl~3~8be9~098b8cca~~
}
static void cb_Increment(Fl_Value_Input* o, void* v) {
-//~fl~0~0000~bdc0cef8~~
if (v == LOAD) {
o->value((double)layout->widget_inc_w);
} else {
layout->widget_inc_w = (int)o->value();
}
-//~fl~3~77b7~2c06e402~~
}
static void cb_Gap(Fl_Value_Input* o, void* v) {
-//~fl~0~0000~1071c4b8~~
if (v == LOAD) {
o->value((double)layout->widget_gap_x);
} else {
layout->widget_gap_x = (int)o->value();
}
-//~fl~3~28cb~dd5cc5f2~~
}
static void cb_3(Fl_Value_Input* o, void* v) {
-//~fl~0~0000~af0fe6f1~~
if (v == LOAD) {
o->value((double)layout->widget_min_h);
} else {
layout->widget_min_h = (int)o->value();
}
-//~fl~3~81f2~16376d7c~~
}
static void cb_4(Fl_Value_Input* o, void* v) {
-//~fl~0~0000~179af464~~
if (v == LOAD) {
o->value((double)layout->widget_inc_h);
} else {
layout->widget_inc_h = (int)o->value();
}
-//~fl~3~028c~33ba05b4~~
}
static void cb_5(Fl_Value_Input* o, void* v) {
-//~fl~0~0000~e640f1ce~~
if (v == LOAD) {
o->value((double)layout->widget_gap_y);
} else {
layout->widget_gap_y = (int)o->value();
}
-//~fl~3~3e48~642c9c36~~
}
static void cb_6(Fl_Choice* o, void* v) {
-//~fl~0~0000~38c0dadb~~
if (v == LOAD) {
o->value(layout->labelfont+1);
} else {
layout->labelfont = (int)o->value()-1;
}
-//~fl~3~fc1b~de8ae6fa~~
}
static void cb_7(Fl_Value_Input* o, void* v) {
-//~fl~0~0000~de85fcdb~~
if (v == LOAD) {
o->value(layout->labelsize);
} else {
layout->labelsize = (int)o->value();
}
-//~fl~3~8d4f~448a0cfa~~
}
static void cb_8(Fl_Choice* o, void* v) {
-//~fl~0~0000~461b5196~~
if (v == LOAD) {
o->value(layout->textfont+1);
} else {
layout->textfont = (int)o->value()-1;
}
-//~fl~3~2080~96100d58~~
}
static void cb_9(Fl_Value_Input* o, void* v) {
-//~fl~0~0000~74dedfb0~~
if (v == LOAD) {
o->value(layout->textsize);
} else {
layout->textsize = (int)o->value();
}
-//~fl~3~14d7~435bca5e~~
}
Fl_Group *w_settings_shell_tab=(Fl_Group *)0;
@@ -943,7 +829,6 @@ static Fl_Image *image_shell_64() {
Fl_Browser *w_settings_shell_list=(Fl_Browser *)0;
static void cb_w_settings_shell_list(Fl_Browser* o, void* v) {
-//~fl~0~0000~a8ca82df~~
if (v == LOAD) {
// load from g_shell_config
if (g_shell_config) {
@@ -969,21 +854,17 @@ static void cb_w_settings_shell_list(Fl_Browser* o, void* v) {
w_settings_shell_cmd->do_callback(w_settings_shell_cmd, LOAD);
w_settings_shell_toolbox->do_callback(w_settings_shell_toolbox, LOAD);
}
-//~fl~3~7f94~26359753~~
}
Fl_Group *w_settings_shell_toolbox=(Fl_Group *)0;
static void cb_w_settings_shell_toolbox(Fl_Group* o, void* v) {
-//~fl~0~0000~2ef19102~~
if (v==LOAD) {
propagate_load(o, v);
}
-//~fl~3~32e8~56d23597~~
}
static void cb_a(Fl_Button*, void* v) {
-//~fl~0~0000~50aa3a7d~~
if (v != LOAD) {
int selected = w_settings_shell_list_selected;
Fd_Shell_Command *cmd = new Fd_Shell_Command("new shell command");
@@ -1000,13 +881,11 @@ static void cb_a(Fl_Button*, void* v) {
w_settings_shell_toolbox->do_callback(w_settings_shell_toolbox, LOAD);
g_shell_config->rebuild_shell_menu();
}
-//~fl~3~cfab~ba9c6fa6~~
}
Fl_Button *w_settings_shell_dup=(Fl_Button *)0;
static void cb_w_settings_shell_dup(Fl_Button* o, void* v) {
-//~fl~0~0000~d75617a9~~
int selected = w_settings_shell_list_selected;
if (v==LOAD) {
if (selected) {
@@ -1031,13 +910,11 @@ static void cb_w_settings_shell_dup(Fl_Button* o, void* v) {
w_settings_shell_toolbox->do_callback(w_settings_shell_toolbox, LOAD);
g_shell_config->rebuild_shell_menu();
}
-//~fl~3~f893~675a49a6~~
}
Fl_Button *w_settings_shell_remove=(Fl_Button *)0;
static void cb_w_settings_shell_remove(Fl_Button* o, void* v) {
-//~fl~0~0000~15ddc2ee~~
int selected = w_settings_shell_list_selected;
if (v==LOAD) {
if (selected) {
@@ -1061,23 +938,18 @@ static void cb_w_settings_shell_remove(Fl_Button* o, void* v) {
w_settings_shell_toolbox->do_callback(w_settings_shell_toolbox, LOAD);
g_shell_config->rebuild_shell_menu();
}
-//~fl~3~0573~aa5ce24d~~
}
Fl_Menu_Button *w_settings_shell_menu=(Fl_Menu_Button *)0;
static void cb_Import(Fl_Menu_*, void* v) {
-//~fl~0~0000~3835f3ea~~
if (v != LOAD)
Fd_Shell_Command_List::import_from_file();
-//~fl~2~2cd9~a52ce6b7~~
}
static void cb_Export(Fl_Menu_*, void* v) {
-//~fl~0~0000~b34c035b~~
if (v != LOAD)
Fd_Shell_Command_List::export_selected();
-//~fl~2~e939~6437097d~~
}
Fl_Menu_Item menu_w_settings_shell_menu[] = {
@@ -1094,7 +966,6 @@ Fl_Menu_Item menu_w_settings_shell_menu[] = {
Fl_Button *w_settings_shell_play=(Fl_Button *)0;
static void cb_w_settings_shell_play(Fl_Button* o, void* v) {
-//~fl~0~0000~01bcfc3c~~
int selected = w_settings_shell_list_selected;
if (v==LOAD) {
if (selected) {
@@ -1107,13 +978,11 @@ static void cb_w_settings_shell_play(Fl_Button* o, void* v) {
Fd_Shell_Command *cmd = g_shell_config->list[selected-1];
cmd->run();
}
-//~fl~3~29ce~88fbdd91~~
}
Fl_Group *w_settings_shell_cmd=(Fl_Group *)0;
static void cb_w_settings_shell_cmd(Fl_Group* o, void* v) {
-//~fl~0~0000~bfa081d7~~
if (v==LOAD) {
int selected = w_settings_shell_list_selected;
if (selected) {
@@ -1123,11 +992,9 @@ static void cb_w_settings_shell_cmd(Fl_Group* o, void* v) {
}
propagate_load(o, v);
}
-//~fl~3~ed18~61a3273f~~
}
static void cb_Name(Fl_Input* o, void* v) {
-//~fl~0~0000~24a67cd4~~
int selected = w_settings_shell_list_selected;
if (v == LOAD) {
if (selected) {
@@ -1143,11 +1010,9 @@ static void cb_Name(Fl_Input* o, void* v) {
if (cmd->storage == FD_STORE_PROJECT) set_modflag(1);
}
}
-//~fl~3~aefa~774a9eda~~
}
static void cb_Menu(Fl_Input* o, void* v) {
-//~fl~0~0000~9ebf9577~~
int selected = w_settings_shell_list_selected;
if (v == LOAD) {
if (selected) {
@@ -1163,17 +1028,13 @@ static void cb_Menu(Fl_Input* o, void* v) {
if (cmd->storage == FD_STORE_PROJECT) set_modflag(1);
}
}
-//~fl~3~2b68~d6faeaaf~~
}
static void cb_b(Fl_Group* o, void* v) {
-//~fl~0~0000~168f150c~~
propagate_load(o, v);
-//~fl~3~5afc~50833204~~
}
static void cb_Shortcut(Fl_Shortcut_Button* o, void* v) {
-//~fl~0~0000~df23ee48~~
int selected = w_settings_shell_list_selected;
if (v == LOAD) {
if (selected) {
@@ -1190,11 +1051,9 @@ static void cb_Shortcut(Fl_Shortcut_Button* o, void* v) {
if (cmd->storage == FD_STORE_PROJECT) set_modflag(1);
}
}
-//~fl~3~e632~c8f9aa5b~~
}
static void cb_Store(Fl_Choice* o, void* v) {
-//~fl~0~0000~da90793a~~
int selected = w_settings_shell_list_selected;
if (v == LOAD) {
if (selected) {
@@ -1217,7 +1076,6 @@ static void cb_Store(Fl_Choice* o, void* v) {
if (cmd->storage == FD_STORE_PROJECT) set_modflag(1);
}
}
-//~fl~3~8701~475d4ad4~~
}
Fl_Menu_Item menu_Store[] = {
@@ -1227,7 +1085,6 @@ Fl_Menu_Item menu_Store[] = {
};
static void cb_Condition(Fl_Choice* o, void* v) {
-//~fl~0~0000~18c4c68c~~
int selected = w_settings_shell_list_selected;
if (v == LOAD) {
if (selected) {
@@ -1245,7 +1102,6 @@ static void cb_Condition(Fl_Choice* o, void* v) {
if (cmd->storage == FD_STORE_PROJECT) set_modflag(1);
}
}
-//~fl~3~a5e5~70480294~~
}
Fl_Menu_Item menu_Condition[] = {
@@ -1259,19 +1115,16 @@ Fl_Menu_Item menu_Condition[] = {
};
static void cb_Label(Fl_Input* o, void* v) {
-//~fl~0~0000~bf1e5ee6~~
if (v == LOAD) {
// o->value(g_shell_command.c_str());
} else {
// g_shell_command = o->value();
}
-//~fl~3~3880~eb97b0e1~~
}
Fl_Text_Editor *w_settings_shell_command=(Fl_Text_Editor *)0;
static void cb_w_settings_shell_command(Fl_Text_Editor* o, void* v) {
-//~fl~0~0000~41a1eadd~~
int selected = w_settings_shell_list_selected;
if (v == LOAD) {
if (selected) {
@@ -1286,13 +1139,11 @@ static void cb_w_settings_shell_command(Fl_Text_Editor* o, void* v) {
if (cmd->storage == FD_STORE_PROJECT) set_modflag(1);
}
}
-//~fl~3~2ecf~ce985002~~
}
Fl_Menu_Button *w_settings_shell_text_macros=(Fl_Menu_Button *)0;
static void cb_w_settings_shell_text_macros(Fl_Menu_Button* o, void*) {
-//~fl~0~0000~e24b9b56~~
const Fl_Menu_Item *mi = o->mvalue();
if (mi) {
char buffer[256];
@@ -1311,7 +1162,6 @@ static void cb_w_settings_shell_text_macros(Fl_Menu_Button* o, void*) {
}
w_settings_shell_command->do_callback(w_settings_shell_command, (void*)NULL);
}
-//~fl~3~6519~b6875296~~
}
Fl_Menu_Item menu_w_settings_shell_text_macros[] = {
@@ -1331,7 +1181,6 @@ Fl_Menu_Item menu_w_settings_shell_text_macros[] = {
};
static void cb_1fd_zoom(Fl_Button*, void*) {
-//~fl~0~0000~d5dc24f4~~
if (!script_panel) make_script_panel();
script_input->buffer()->text(w_settings_shell_command->buffer()->text());
script_panel->show();
@@ -1347,11 +1196,9 @@ static void cb_1fd_zoom(Fl_Button*, void*) {
w_settings_shell_command->do_callback();
BREAK2:
script_panel->hide();
-//~fl~3~a916~22f99a94~~
}
static void cb_save(Fl_Check_Button* o, void* v) {
-//~fl~0~0000~88af01b3~~
int selected = w_settings_shell_list_selected;
if (v == LOAD) {
if (selected) {
@@ -1371,11 +1218,9 @@ static void cb_save(Fl_Check_Button* o, void* v) {
if (cmd->storage == FD_STORE_PROJECT) set_modflag(1);
}
}
-//~fl~3~81c9~58c14315~~
}
static void cb_save1(Fl_Check_Button* o, void* v) {
-//~fl~0~0000~1305d9d2~~
int selected = w_settings_shell_list_selected;
if (v == LOAD) {
if (selected) {
@@ -1395,11 +1240,9 @@ static void cb_save1(Fl_Check_Button* o, void* v) {
if (cmd->storage == FD_STORE_PROJECT) set_modflag(1);
}
}
-//~fl~3~4c02~4da652b9~~
}
static void cb_save2(Fl_Check_Button* o, void* v) {
-//~fl~0~0000~481268c7~~
int selected = w_settings_shell_list_selected;
if (v == LOAD) {
if (selected) {
@@ -1419,7 +1262,6 @@ static void cb_save2(Fl_Check_Button* o, void* v) {
if (cmd->storage == FD_STORE_PROJECT) set_modflag(1);
}
}
-//~fl~3~9a10~1c6d3453~~
}
Fl_Box *w_settings_shell_fd_project=(Fl_Box *)0;
@@ -2079,9 +1921,7 @@ static Fl_Image *image_fd_user() {
Fl_Group *w_settings_i18n_tab=(Fl_Group *)0;
static void cb_w_settings_i18n_tab(Fl_Group* o, void* v) {
-//~fl~0~0000~b806caa7~~
propagate_load(o, v);
-//~fl~3~5cf7~50833204~~
}
static const unsigned char idata_language_64[] =
@@ -2169,15 +2009,12 @@ Fl_Menu_Item menu_i18n_type_chooser[] = {
Fl_Group *i18n_gnu_group=(Fl_Group *)0;
static void cb_i18n_gnu_group(Fl_Group* o, void* v) {
-//~fl~0~0000~4e561a5c~~
propagate_load(o, v);
-//~fl~3~a381~50833204~~
}
Fl_Input *i18n_gnu_include_input=(Fl_Input *)0;
static void cb_i18n_gnu_include_input(Fl_Input* o, void* v) {
-//~fl~0~0000~c8ff5adf~~
if (v == LOAD) {
o->value(g_project.i18n_gnu_include.c_str());
} else {
@@ -2185,13 +2022,11 @@ static void cb_i18n_gnu_include_input(Fl_Input* o, void* v) {
g_project.i18n_gnu_include = o->value();
set_modflag(1);
}
-//~fl~3~5603~3001413b~~
}
Fl_Input *i18n_gnu_conditional_input=(Fl_Input *)0;
static void cb_i18n_gnu_conditional_input(Fl_Input* o, void* v) {
-//~fl~0~0000~06d8e7c1~~
if (v == LOAD) {
o->value(g_project.i18n_gnu_conditional.c_str());
} else {
@@ -2199,13 +2034,11 @@ static void cb_i18n_gnu_conditional_input(Fl_Input* o, void* v) {
g_project.i18n_gnu_conditional = o->value();
set_modflag(1);
}
-//~fl~3~c4ca~47091379~~
}
Fl_Input *i18n_gnu_function_input=(Fl_Input *)0;
static void cb_i18n_gnu_function_input(Fl_Input* o, void* v) {
-//~fl~0~0000~6be4453c~~
if (v == LOAD) {
o->value(g_project.i18n_gnu_function.c_str());
} else {
@@ -2213,13 +2046,11 @@ static void cb_i18n_gnu_function_input(Fl_Input* o, void* v) {
g_project.i18n_gnu_function = o->value();
set_modflag(1);
}
-//~fl~3~094c~782b9047~~
}
Fl_Input *i18n_gnu_static_function_input=(Fl_Input *)0;
static void cb_i18n_gnu_static_function_input(Fl_Input* o, void* v) {
-//~fl~0~0000~45ce4926~~
if (v == LOAD) {
o->value(g_project.i18n_gnu_static_function.c_str());
} else {
@@ -2227,21 +2058,17 @@ static void cb_i18n_gnu_static_function_input(Fl_Input* o, void* v) {
g_project.i18n_gnu_static_function = o->value();
set_modflag(1);
}
-//~fl~3~03b3~21832541~~
}
Fl_Group *i18n_posix_group=(Fl_Group *)0;
static void cb_i18n_posix_group(Fl_Group* o, void* v) {
-//~fl~0~0000~257c37c8~~
propagate_load(o, v);
-//~fl~3~9310~50833204~~
}
Fl_Input *i18n_pos_include_input=(Fl_Input *)0;
static void cb_i18n_pos_include_input(Fl_Input* o, void* v) {
-//~fl~0~0000~d4cc6b45~~
if (v == LOAD) {
o->value(g_project.i18n_pos_include.c_str());
} else {
@@ -2249,13 +2076,11 @@ static void cb_i18n_pos_include_input(Fl_Input* o, void* v) {
g_project.i18n_pos_include = o->value();
set_modflag(1);
}
-//~fl~3~647f~41fa0d1c~~
}
Fl_Input *i18n_pos_conditional_input=(Fl_Input *)0;
static void cb_i18n_pos_conditional_input(Fl_Input* o, void* v) {
-//~fl~0~0000~fde185c1~~
if (v == LOAD) {
o->value(g_project.i18n_pos_conditional.c_str());
} else {
@@ -2263,13 +2088,11 @@ static void cb_i18n_pos_conditional_input(Fl_Input* o, void* v) {
g_project.i18n_pos_conditional = o->value();
set_modflag(1);
}
-//~fl~3~b76b~6bb5d246~~
}
Fl_Input *i18n_pos_file_input=(Fl_Input *)0;
static void cb_i18n_pos_file_input(Fl_Input* o, void* v) {
-//~fl~0~0000~97538505~~
if (v == LOAD) {
o->value(g_project.i18n_pos_file.c_str());
} else {
@@ -2277,19 +2100,15 @@ static void cb_i18n_pos_file_input(Fl_Input* o, void* v) {
g_project.i18n_pos_file = o->value();
set_modflag(1);
}
-//~fl~3~5f88~04796294~~
}
static void cb_c(Fl_Group* o, void* v) {
-//~fl~0~0000~f192b39b~~
propagate_load(o, v);
-//~fl~3~2eaa~50833204~~
}
Fl_Int_Input *i18n_pos_set_input=(Fl_Int_Input *)0;
static void cb_i18n_pos_set_input(Fl_Int_Input* o, void* v) {
-//~fl~0~0000~d09e0191~~
if (v == LOAD) {
o->value(g_project.i18n_pos_set.c_str());
} else {
@@ -2297,16 +2116,13 @@ static void cb_i18n_pos_set_input(Fl_Int_Input* o, void* v) {
g_project.i18n_pos_set = o->value();
set_modflag(1);
}
-//~fl~3~cdf4~a3e1b311~~
}
static void cb_Close(Fl_Button*, void*) {
-//~fl~0~0000~eaac9f35~~
if (g_shell_config)
g_shell_config->write(fluid_prefs, FD_STORE_USER);
g_layout_list.write(fluid_prefs, FD_STORE_USER);
settings_window->hide();
-//~fl~3~fe4e~3f4611d9~~
}
Fl_Double_Window* make_settings_window() {
@@ -2320,6 +2136,7 @@ Fl_Double_Window* make_settings_window() {
{ Fl_Group* o = new Fl_Group(10, 60, 320, 480, "General");
o->image( image_general_64() );
o->labelsize(11);
+ o->hide();
{ Fl_Group* o = new Fl_Group(120, 78, 130, 25);
o->callback((Fl_Callback*)cb_);
{ scheme_choice = new Fl_Scheme_Choice(120, 78, 120, 25, "Scheme: ");
@@ -2459,7 +2276,6 @@ ps");
w_settings_project_tab->image( image_document_64() );
w_settings_project_tab->labelsize(11);
w_settings_project_tab->callback((Fl_Callback*)cb_w_settings_project_tab);
- w_settings_project_tab->hide();
{ Fl_Group* o = new Fl_Group(100, 78, 220, 30);
{ Fl_Box* o = new Fl_Box(100, 78, 210, 30, "Use \"name.ext\" to set a file name\nor just \".ext\" to set extension.");
o->labelsize(11);
@@ -2526,14 +2342,17 @@ ped using octal notation `\\0123`. If this option is checked, Fluid will write\
o->labelfont(1);
o->labelsize(11);
o->align(Fl_Align(FL_ALIGN_LEFT));
+ o->hide();
} // Fl_Box* o
- { w_proj_mergeback = new Fl_Check_Button(100, 283, 220, 20, "generate MergeBack data");
+ { // // Matt: disabled
+ w_proj_mergeback = new Fl_Check_Button(100, 283, 220, 20, "generate MergeBack data");
w_proj_mergeback->tooltip("MergeBack is a feature under construction that allows changes in code files t\
o be merged back into the project file. Checking this option will generate add\
itional data in code and project files.");
w_proj_mergeback->down_box(FL_DOWN_BOX);
w_proj_mergeback->labelsize(11);
w_proj_mergeback->callback((Fl_Callback*)cb_w_proj_mergeback);
+ w_proj_mergeback->hide();
} // Fl_Check_Button* w_proj_mergeback
{ Fl_Box* o = new Fl_Box(100, 530, 220, 10);
o->hide();
@@ -3194,9 +3013,7 @@ le FLTK_GETTEXT_FOUND");
settings_window->size_range(340, 580);
settings_window->end();
} // Fl_Double_Window* settings_window
-//~fl~0~0000~d0a79484~~
w_settings_tabs->do_callback(w_settings_tabs, LOAD);
-//~fl~1~81e7~102614d8~~
return settings_window;
}
@@ -3205,22 +3022,18 @@ Fl_Double_Window *shell_run_window=(Fl_Double_Window *)0;
Fl_Simple_Terminal *shell_run_terminal=(Fl_Simple_Terminal *)0;
static void cb_Clear(Fl_Button*, void*) {
-//~fl~0~0000~e5195ca2~~
shell_run_terminal->clear();
-//~fl~3~601b~9e598b81~~
}
Fl_Return_Button *shell_run_button=(Fl_Return_Button *)0;
static void cb_shell_run_button(Fl_Return_Button*, void*) {
-//~fl~0~0000~a6a701ac~~
Fl_Preferences pos(fluid_prefs, "shell_run_Window_pos");
pos.set("x", shell_run_window->x());
pos.set("y", shell_run_window->y());
pos.set("w", shell_run_window->w());
pos.set("h", shell_run_window->h());
shell_run_window->hide();
-//~fl~3~d20c~f206a765~~
}
Fl_Double_Window* make_shell_window() {
diff --git a/fluid/alignment_panel.fl b/fluid/alignment_panel.fl
index 12300c0c0..f64f7c52e 100644
--- a/fluid/alignment_panel.fl
+++ b/fluid/alignment_panel.fl
@@ -31,7 +31,6 @@ snap {
}
}
}
-mergeback 1
comment {//
// Setting and shell dialogs for the Fast Light Tool Kit (FLTK).
//
@@ -47,73 +46,73 @@ comment {//
//
// https://www.fltk.org/bugs.php
//
-} {uid 0001 in_source in_header
+} {in_source in_header
}
-decl {\#include "fluid.h"} {uid acd9 public global
+decl {\#include "fluid.h"} {public global
}
-decl {\#include "undo.h"} {uid b782 private global
+decl {\#include "undo.h"} {private global
}
-decl {\#include "widget_browser.h"} {uid 8ed8 public global
+decl {\#include "widget_browser.h"} {public global
}
-decl {\#include "Fd_Snap_Action.h"} {uid 2f43 public global
+decl {\#include "Fd_Snap_Action.h"} {public global
}
-decl {\#include "shell_command.h"} {uid 9898 public global
+decl {\#include "shell_command.h"} {public global
}
-decl {\#include <FL/Fl_Text_Buffer.H>} {uid 128c public local
+decl {\#include <FL/Fl_Text_Buffer.H>} {public local
}
-decl {\#include <FL/Fl_Text_Display.H>} {uid d4b3 public local
+decl {\#include <FL/Fl_Text_Display.H>} {public local
}
-decl {\#include "fluid_filename.h"} {uid 3917 public local
+decl {\#include "fluid_filename.h"} {public local
}
-decl {\#include <FL/fl_string_functions.h>} {uid c398 public local
+decl {\#include <FL/fl_string_functions.h>} {public local
}
-decl {\#include <FL/Fl_Scheme_Choice.H>} {uid 2e2f public local
+decl {\#include <FL/Fl_Scheme_Choice.H>} {public local
}
-decl {\#include <FL/Fl_Preferences.H>} {uid 962d private global
+decl {\#include <FL/Fl_Preferences.H>} {private global
}
-decl {\#include <FL/Fl_Tooltip.H>} {uid 3258 private global
+decl {\#include <FL/Fl_Tooltip.H>} {private global
}
-decl {\#include <FL/fl_ask.H>} {uid 816b private global
+decl {\#include <FL/fl_ask.H>} {private global
}
-decl {\#include <string.h>} {uid 7788 private global
+decl {\#include <string.h>} {private global
}
-decl {\#include "../src/flstring.h"} {uid 6499 private global
+decl {\#include "../src/flstring.h"} {private global
}
-decl {void init_scheme(void);} {uid 0f48
+decl {void init_scheme(void);} {
comment {// initialize the scheme from preferences} public global
}
-decl {extern struct Fl_Menu_Item *dbmanager_item;} {uid ee62 public local
+decl {extern struct Fl_Menu_Item *dbmanager_item;} {public local
}
-decl {extern void i18n_cb(Fl_Choice *,void *);} {uid 4cf3 public local
+decl {extern void i18n_cb(Fl_Choice *,void *);} {public local
}
-decl {void scheme_cb(Fl_Scheme_Choice *, void *);} {uid 5023 public local
+decl {void scheme_cb(Fl_Scheme_Choice *, void *);} {public local
}
-decl {int w_settings_shell_list_selected;} {uid f85f public local
+decl {int w_settings_shell_list_selected;} {public local
}
-Function {make_script_panel()} {uid 22d1 open
+Function {make_script_panel()} {open
} {
- Fl_Window script_panel {uid f5ed
+ Fl_Window script_panel {
label {Shell Script Editor}
callback {if (Fl::event()==FL_SHORTCUT && Fl::event_key()==FL_Escape)
return; // ignore Escape
@@ -121,67 +120,66 @@ script_panel->hide(); // otherwise hide..} open
xywh {764 319 540 180} type Double labelsize 11 resizable
code0 {o->size_range(200, 150);} modal visible
} {
- Fl_Text_Editor script_input {uid 680c
+ Fl_Text_Editor script_input {
xywh {10 10 520 130} box DOWN_BOX labelsize 11 when 13 textfont 4 textsize 11 resizable
code0 {script_input->buffer(new Fl_Text_Buffer);}
}
- Fl_Group {} {uid 2902 open
+ Fl_Group {} {open
xywh {10 150 520 20} labelsize 11
} {
- Fl_Return_Button script_panel_ok {uid 8039
+ Fl_Return_Button script_panel_ok {
label OK
xywh {400 150 60 20} labelsize 11 hotspot
}
- Fl_Button script_panel_cancel {uid 6484
+ Fl_Button script_panel_cancel {
label Cancel
xywh {470 150 60 20} labelsize 11
}
- Fl_Box {} {uid 6514
+ Fl_Box {} {
xywh {10 150 380 20} labelsize 11 resizable
}
}
}
code {// Enable line numbers
script_input->linenumber_width(60);
-script_input->linenumber_size(script_input->Fl_Text_Display::textsize());} {uid 339c
- }
+script_input->linenumber_size(script_input->Fl_Text_Display::textsize());} {}
}
-Function {make_settings_window()} {uid ee5a open selected
+Function {make_settings_window()} {open
} {
- Fl_Window settings_window {uid ac2a
+ Fl_Window settings_window {
label {FLUID Settings} open
xywh {392 362 340 580} type Double align 80 resizable size_range {340 580 0 0} visible
} {
- Fl_Tabs w_settings_tabs {uid dae5
+ Fl_Tabs w_settings_tabs {
callback {propagate_load(o, v);} open
xywh {10 10 320 530} selection_color 12 labelsize 11 labelcolor 255 resizable
} {
- Fl_Group {} {uid 49e9
+ Fl_Group {} {
label General open
- image {icons/general_64.png} compress_image 1 xywh {10 60 320 480} labelsize 11 resizable
+ image {icons/general_64.png} compress_image 1 xywh {10 60 320 480} labelsize 11 hide resizable
code0 {o->image()->scale(36, 24);}
} {
- Fl_Group {} {uid 05f1
+ Fl_Group {} {
callback {propagate_load(o, v);} open
xywh {120 78 130 25}
} {
- Fl_Choice scheme_choice {uid 56c4
+ Fl_Choice scheme_choice {
label {Scheme: }
callback scheme_cb open
xywh {120 78 120 25} down_box BORDER_BOX labelfont 1 labelsize 11
code0 {init_scheme();}
class Fl_Scheme_Choice
} {}
- Fl_Box {} {uid 2b8a
+ Fl_Box {} {
xywh {240 78 10 25} hide resizable
}
}
- Fl_Box {} {uid 6a9b
+ Fl_Box {} {
label {Options: }
xywh {120 115 0 20} labelfont 1 labelsize 11 align 4
}
- Fl_Check_Button tooltips_button {uid c339
+ Fl_Check_Button tooltips_button {
label {Show Tooltips}
callback {Fl_Tooltip::enable(tooltips_button->value());
fluid_prefs.set("show_tooltips", tooltips_button->value());}
@@ -191,7 +189,7 @@ fluid_prefs.set("show_tooltips", tooltips_button->value());}
code2 {tooltips_button->value(b);}
code3 {Fl_Tooltip::enable(b);}
}
- Fl_Check_Button completion_button {uid 07f7
+ Fl_Check_Button completion_button {
label {Show Completion Dialogs}
callback {fluid_prefs.set("show_completion_dialogs", completion_button->value());}
xywh {120 135 200 20} down_box DOWN_BOX labelsize 11
@@ -199,7 +197,7 @@ fluid_prefs.set("show_tooltips", tooltips_button->value());}
code1 {fluid_prefs.get("show_completion_dialogs", b, 1);}
code2 {completion_button->value(b);}
}
- Fl_Check_Button openlast_button {uid 4ca1
+ Fl_Check_Button openlast_button {
label {Open Previous File on Startup}
callback {fluid_prefs.set("open_previous_file", openlast_button->value());}
xywh {120 155 200 20} down_box DOWN_BOX labelsize 11
@@ -207,7 +205,7 @@ fluid_prefs.set("show_tooltips", tooltips_button->value());}
code1 {fluid_prefs.get("open_previous_file", b, 0);}
code2 {openlast_button->value(b);}
}
- Fl_Check_Button prevpos_button {uid ead3
+ Fl_Check_Button prevpos_button {
label {Remember Window Positions}
callback {fluid_prefs.set("prev_window_pos", prevpos_button->value());}
xywh {120 175 200 20} down_box DOWN_BOX labelsize 11
@@ -215,7 +213,7 @@ fluid_prefs.set("show_tooltips", tooltips_button->value());}
code1 {fluid_prefs.get("prev_window_pos", b, 1);}
code2 {prevpos_button->value(b);}
}
- Fl_Check_Button show_comments_button {uid f3ed
+ Fl_Check_Button show_comments_button {
label {Show Comments in Browser}
callback {show_comments = show_comments_button->value();
fluid_prefs.set("show_comments", show_comments);
@@ -224,11 +222,11 @@ redraw_browser();}
code1 {fluid_prefs.get("show_comments", show_comments, 1);}
code2 {show_comments_button->value(show_comments);}
}
- Fl_Group {} {uid b8d5
+ Fl_Group {} {
callback {propagate_load(o, v);} open
xywh {120 225 50 20}
} {
- Fl_Spinner recent_spinner {uid 9ad9
+ Fl_Spinner recent_spinner {
label {\# Recent Files:}
callback {fluid_prefs.set("recent_files", recent_spinner->value());
load_history();}
@@ -238,11 +236,11 @@ load_history();}
code2 {recent_spinner->maximum(10);}
code3 {recent_spinner->value(c);}
}
- Fl_Box {} {uid 3c5b
+ Fl_Box {} {
xywh {160 225 10 20} hide resizable
}
}
- Fl_Check_Button use_external_editor_button {uid 546c
+ Fl_Check_Button use_external_editor_button {
label {Use for Code Nodes}
callback {G_use_external_editor = use_external_editor_button->value();
fluid_prefs.set("use_external_editor", G_use_external_editor);
@@ -251,7 +249,7 @@ redraw_browser();}
code1 {fluid_prefs.get("use_external_editor", G_use_external_editor, 0);}
code2 {use_external_editor_button->value(G_use_external_editor);}
}
- Fl_Input editor_command_input {uid 1151
+ Fl_Input editor_command_input {
label {External Editor:}
callback {strncpy(G_external_editor_command, editor_command_input->value(), sizeof(G_external_editor_command)-1);
G_external_editor_command[sizeof(G_external_editor_command)-1] = 0;
@@ -266,45 +264,45 @@ Examples:
code1 {fluid_prefs.get("external_editor_command", G_external_editor_command, "", sizeof(G_external_editor_command)-1);}
code2 {editor_command_input->value(G_external_editor_command);}
}
- Fl_Box {} {uid 9c20
+ Fl_Box {} {
label {Overlays: }
xywh {120 300 0 20} labelfont 1 labelsize 11 align 4
}
- Fl_Check_Button guides_button {uid 100c
+ Fl_Check_Button guides_button {
label {Show Positioning Guides}
callback toggle_guides_cb
tooltip {show guides that help to position and resize widgets and enable snapping} xywh {120 300 200 20} down_box DOWN_BOX labelsize 11
code0 {o->value(show_guides);}
}
- Fl_Check_Button restricted_button {uid fd06
+ Fl_Check_Button restricted_button {
label {Show Restricted Areas}
callback toggle_restricted_cb
tooltip {show overlapping and out of bounds areas, show unfilled areas in Fl_Pack groups} xywh {120 320 200 20} down_box DOWN_BOX labelsize 11
code0 {o->value(show_restricted);}
}
- Fl_Box {} {uid 606d
+ Fl_Box {} {
xywh {120 530 200 10} hide resizable
}
}
- Fl_Group w_settings_project_tab {uid 5fff
+ Fl_Group w_settings_project_tab {
label Project
callback {propagate_load(o, v);} open
- image {icons/document_64.png} compress_image 1 xywh {10 60 320 480} labelsize 11 hide
+ image {icons/document_64.png} compress_image 1 xywh {10 60 320 480} labelsize 11
code0 {o->image()->scale(36, 24);}
} {
- Fl_Group {} {uid 18a1 open
+ Fl_Group {} {open
xywh {100 78 220 30}
} {
- Fl_Box {} {uid 3b19
+ Fl_Box {} {
label {Use "name.ext" to set a file name
or just ".ext" to set extension.}
xywh {100 78 210 30} labelsize 11 align 148
}
- Fl_Box {} {uid da36
+ Fl_Box {} {
xywh {310 78 10 30} hide resizable
}
}
- Fl_Input header_file_input {uid 42e9
+ Fl_Input header_file_input {
label {Header File:}
user_data 1 user_data_type {void*}
callback {if (v == LOAD) {
@@ -317,7 +315,7 @@ or just ".ext" to set extension.}
}}
tooltip {The name of the generated header file.} xywh {100 112 220 20} box THIN_DOWN_BOX labelfont 1 labelsize 11 when 1 textfont 4 textsize 11
}
- Fl_Input code_file_input {uid 9a81
+ Fl_Input code_file_input {
label {Code File:}
user_data 1 user_data_type {void*}
callback {if (v == LOAD) {
@@ -330,7 +328,7 @@ or just ".ext" to set extension.}
}}
tooltip {The name of the generated code file.} xywh {100 137 220 20} box THIN_DOWN_BOX labelfont 1 labelsize 11 when 1 textfont 4 textsize 11
}
- Fl_Check_Button include_H_from_C_button {uid 0fc3
+ Fl_Check_Button include_H_from_C_button {
label {Include Header from Code}
callback {if (v == LOAD) {
o->value(g_project.include_H_from_C);
@@ -342,11 +340,11 @@ or just ".ext" to set extension.}
}}
tooltip {Include the header file from the code file.} xywh {100 162 220 20} down_box DOWN_BOX labelsize 11
}
- Fl_Box {} {uid 431e
+ Fl_Box {} {
label {Options: }
xywh {100 205 0 20} labelfont 1 labelsize 11 align 4
}
- Fl_Check_Button use_FL_COMMAND_button {uid 9dc0
+ Fl_Check_Button use_FL_COMMAND_button {
label {Menu shortcuts use FL_COMMAND}
callback {if (v == LOAD) {
o->value(g_project.use_FL_COMMAND);
@@ -358,7 +356,7 @@ or just ".ext" to set extension.}
}}
tooltip {Replace FL_CTRL and FL_META with FL_COMMAND when generating menu shortcuts} xywh {100 205 220 20} down_box DOWN_BOX labelsize 11
}
- Fl_Check_Button utf8_in_src_button {uid 9244
+ Fl_Check_Button utf8_in_src_button {
label {allow Unicode UTF-8 in source code}
callback {if (v == LOAD) {
o->value(g_project.utf8_in_src);
@@ -370,7 +368,7 @@ or just ".ext" to set extension.}
}}
tooltip {For older compilers, characters outside of the printable ASCII range are escaped using octal notation `\\0123`. If this option is checked, Fluid will write UTF-8 characters unchanged.} xywh {100 230 220 20} down_box DOWN_BOX labelsize 11
}
- Fl_Check_Button avoid_early_includes_button {uid 4a7a
+ Fl_Check_Button avoid_early_includes_button {
label {avoid early include of Fl.H}
callback {if (v == LOAD) {
o->value(g_project.avoid_early_includes);
@@ -382,11 +380,11 @@ or just ".ext" to set extension.}
}}
tooltip {Do not emit \#include <FL//Fl.H> until it is needed by another include file.} xywh {100 255 220 20} down_box DOWN_BOX labelsize 11
}
- Fl_Box {} {uid aeab
+ Fl_Box {} {
label {Experimental: }
- xywh {100 283 0 20} labelfont 1 labelsize 11 align 4
+ xywh {100 283 0 20} labelfont 1 labelsize 11 align 4 hide
}
- Fl_Check_Button w_proj_mergeback {uid 04c9
+ Fl_Check_Button w_proj_mergeback {
label {generate MergeBack data}
callback {if (v == LOAD) {
o->value(g_project.write_mergeback_data);
@@ -396,23 +394,24 @@ or just ".ext" to set extension.}
g_project.write_mergeback_data = o->value();
}
}}
- tooltip {MergeBack is a feature under construction that allows changes in code files to be merged back into the project file. Checking this option will generate additional data in code and project files.} xywh {100 283 220 20} down_box DOWN_BOX labelsize 11
+ comment {// Matt: disabled} selected
+ tooltip {MergeBack is a feature under construction that allows changes in code files to be merged back into the project file. Checking this option will generate additional data in code and project files.} xywh {100 283 220 20} down_box DOWN_BOX labelsize 11 hide
}
- Fl_Box {} {uid 98de
+ Fl_Box {} {
xywh {100 530 220 10} hide resizable
}
}
- Fl_Group w_settings_layout_tab {uid e8f6
+ Fl_Group w_settings_layout_tab {
label Layout
callback {propagate_load(o, v);} open
image {icons/layout_64.png} compress_image 1 xywh {10 60 320 480} labelsize 11 hide
code0 {o->image()->scale(36, 24);}
} {
- Fl_Box {} {uid 2de2
+ Fl_Box {} {
label {Layout:}
xywh {25 78 60 24} labelfont 1 labelsize 11 align 24
}
- Fl_Choice layout_choice {uid 604f
+ Fl_Choice layout_choice {
callback {if (v == LOAD) {
o->value(g_layout_list.current_suite());
} else {
@@ -422,16 +421,16 @@ or just ".ext" to set extension.}
}}
xywh {85 78 187 24} down_box BORDER_BOX
} {
- MenuItem {} {uid 839f
+ MenuItem {} {
label FLTK
xywh {0 0 31 20}
}
- MenuItem {} {uid ee67
+ MenuItem {} {
label Grid
xywh {0 0 31 20}
}
}
- Fl_Button {} {uid adce
+ Fl_Button {} {
label {+}
callback {// Clone the current layout suite
@@ -447,7 +446,7 @@ g_layout_list.add(new_name);
g_layout_list.update_dialogs();}
xywh {272 78 24 24}
}
- Fl_Menu_Button w_layout_menu {uid cbf2
+ Fl_Menu_Button w_layout_menu {
callback {if (v == LOAD) {
Fd_Layout_Suite &suite = g_layout_list[g_layout_list.current_suite()];
if (suite.storage_ == FD_STORE_INTERNAL) {
@@ -463,7 +462,7 @@ g_layout_list.update_dialogs();}
}} open
xywh {296 78 24 24}
} {
- MenuItem w_layout_menu_rename {uid f100
+ MenuItem w_layout_menu_rename {
label {Rename...}
callback {// Rename the current layout suite
@@ -476,35 +475,35 @@ g_layout_list.rename(new_name);
g_layout_list.update_dialogs();}
xywh {0 0 31 20} divider
}
- MenuItem {w_layout_menu_storage[0]} {uid 2678
+ MenuItem {w_layout_menu_storage[0]} {
label {@fd_beaker FLUID Built-In}
callback {Fd_Layout_Suite &suite = g_layout_list[g_layout_list.current_suite()];
suite.storage(FD_STORE_INTERNAL);
g_layout_list.update_dialogs();}
xywh {0 0 31 20} type Radio deactivate
}
- MenuItem {w_layout_menu_storage[1]} {uid ad97
+ MenuItem {w_layout_menu_storage[1]} {
label {@fd_user User Preference}
callback {Fd_Layout_Suite &suite = g_layout_list[g_layout_list.current_suite()];
suite.storage(FD_STORE_USER);
g_layout_list.update_dialogs();}
xywh {0 0 31 20} type Radio
}
- MenuItem {w_layout_menu_storage[2]} {uid 5a34
+ MenuItem {w_layout_menu_storage[2]} {
label {@fd_project Store in .fl Project File}
callback {Fd_Layout_Suite &suite = g_layout_list[g_layout_list.current_suite()];
suite.storage(FD_STORE_PROJECT);
g_layout_list.update_dialogs();}
xywh {0 0 31 20} type Radio
}
- MenuItem {w_layout_menu_storage[3]} {uid c707
+ MenuItem {w_layout_menu_storage[3]} {
label {@fd_file Store in External File}
callback {Fd_Layout_Suite &suite = g_layout_list[g_layout_list.current_suite()];
suite.storage(FD_STORE_FILE);
g_layout_list.update_dialogs();}
xywh {0 0 31 20} type Radio divider
}
- MenuItem w_layout_menu_load {uid 2c5e
+ MenuItem w_layout_menu_load {
label {Load...}
callback {// Give the user a file chooser and load that file
Fl_Native_File_Chooser fnfc;
@@ -520,7 +519,7 @@ g_layout_list.load(new_filename);
g_layout_list.update_dialogs();}
xywh {0 0 31 20}
}
- MenuItem w_layout_menu_save {uid 1aa1
+ MenuItem w_layout_menu_save {
label {Save...}
callback {// Give the user a file chooser with a suggested name
Fl_Native_File_Chooser fnfc;
@@ -539,7 +538,7 @@ g_layout_list.update_dialogs();}
xywh {0 0 31 20} divider
code0 {\#include <FL/Fl_Native_File_Chooser.H>}
}
- MenuItem w_layout_menu_delete {uid b429
+ MenuItem w_layout_menu_delete {
label Delete
callback {// remove the current suite
@@ -548,42 +547,42 @@ g_layout_list.update_dialogs();}
xywh {0 0 31 20}
}
}
- Fl_Box {} {uid 475b
+ Fl_Box {} {
label {Preset:}
xywh {25 107 60 20} labelfont 1 labelsize 11 align 24
}
- Fl_Group {} {uid 0bf5
+ Fl_Group {} {
callback propagate_load open
xywh {85 107 235 20} labelsize 11
} {
- Fl_Button {preset_choice[0]} {uid cc46
+ Fl_Button {preset_choice[0]} {
label Application
user_data 0 user_data_type long
callback edit_layout_preset_cb
xywh {85 107 78 20} type Radio value 1 selection_color 45 labelsize 11 compact 1
}
- Fl_Button {preset_choice[1]} {uid 779c
+ Fl_Button {preset_choice[1]} {
label Dialog
user_data 1 user_data_type long
callback edit_layout_preset_cb
xywh {163 107 79 20} type Radio selection_color 45 labelsize 11 compact 1
}
- Fl_Button {preset_choice[2]} {uid 3f2e
+ Fl_Button {preset_choice[2]} {
label Toolbox
user_data 2 user_data_type long
callback edit_layout_preset_cb
xywh {242 107 78 20} type Radio selection_color 45 labelsize 11 compact 1
}
}
- Fl_Box {} {uid c92a
+ Fl_Box {} {
label {---- Window ----}
xywh {85 132 235 20} labelfont 1 labelsize 11 align 20
}
- Fl_Box {} {uid 5873
+ Fl_Box {} {
label {Margin:}
xywh {25 167 60 20} labelsize 11 align 24
}
- Fl_Value_Input {} {uid 9c64
+ Fl_Value_Input {} {
label {Left:}
callback {if (v == LOAD) {
o->value((double)layout->left_window_margin);
@@ -592,7 +591,7 @@ g_layout_list.update_dialogs();}
}}
xywh {85 167 55 20} labelsize 11 align 5 maximum 32767 step 1 textsize 11
}
- Fl_Value_Input {} {uid 2f06
+ Fl_Value_Input {} {
label {Top:}
callback {if (v == LOAD) {
o->value((double)layout->top_window_margin);
@@ -601,7 +600,7 @@ g_layout_list.update_dialogs();}
}}
xywh {145 167 55 20} labelsize 11 align 5 maximum 32767 step 1 textsize 11
}
- Fl_Value_Input {} {uid 5cef
+ Fl_Value_Input {} {
label {Right:}
callback {if (v == LOAD) {
o->value((double)layout->right_window_margin);
@@ -610,7 +609,7 @@ g_layout_list.update_dialogs();}
}}
xywh {205 167 55 20} labelsize 11 align 5 maximum 32767 step 1 textsize 11
}
- Fl_Value_Input {} {uid 3509
+ Fl_Value_Input {} {
label {Bottom:}
callback {if (v == LOAD) {
o->value((double)layout->bottom_window_margin);
@@ -619,11 +618,11 @@ g_layout_list.update_dialogs();}
}}
xywh {265 167 55 20} labelsize 11 align 5 maximum 32767 step 1 textsize 11
}
- Fl_Box {} {uid 7f08
+ Fl_Box {} {
label {Grid:}
xywh {32 201 53 20} labelsize 11 align 24
}
- Fl_Value_Input {} {uid 234f
+ Fl_Value_Input {} {
label {Horizontal:}
callback {if (v == LOAD) {
o->value((double)layout->window_grid_x);
@@ -632,7 +631,7 @@ g_layout_list.update_dialogs();}
}}
xywh {85 201 55 20} labelsize 11 align 5 maximum 32767 step 1 textsize 11
}
- Fl_Value_Input {} {uid e1f8
+ Fl_Value_Input {} {
label {Vertical:}
callback {if (v == LOAD) {
o->value((double)layout->window_grid_y);
@@ -641,15 +640,15 @@ g_layout_list.update_dialogs();}
}}
xywh {145 201 55 20} labelsize 11 align 5 maximum 32767 step 1 textsize 11
}
- Fl_Box {} {uid 1d8f
+ Fl_Box {} {
label {---- Group ----}
xywh {85 226 235 20} labelfont 1 labelsize 11 align 20
}
- Fl_Box {} {uid 52f0
+ Fl_Box {} {
label {Margin:}
xywh {25 261 60 20} labelsize 11 align 24
}
- Fl_Value_Input {} {uid b3b7
+ Fl_Value_Input {} {
label {Left:}
callback {if (v == LOAD) {
o->value((double)layout->left_group_margin);
@@ -658,7 +657,7 @@ g_layout_list.update_dialogs();}
}}
xywh {85 261 55 20} labelsize 11 align 5 maximum 32767 step 1 textsize 11
}
- Fl_Value_Input {} {uid 7b19
+ Fl_Value_Input {} {
label {Top:}
callback {if (v == LOAD) {
o->value((double)layout->top_group_margin);
@@ -667,7 +666,7 @@ g_layout_list.update_dialogs();}
}}
xywh {145 261 55 20} labelsize 11 align 5 maximum 32767 step 1 textsize 11
}
- Fl_Value_Input {} {uid 689a
+ Fl_Value_Input {} {
label {Right:}
callback {if (v == LOAD) {
o->value((double)layout->right_group_margin);
@@ -676,7 +675,7 @@ g_layout_list.update_dialogs();}
}}
xywh {205 261 55 20} labelsize 11 align 5 maximum 32767 step 1 textsize 11
}
- Fl_Value_Input {} {uid f9d7
+ Fl_Value_Input {} {
label {Bottom:}
callback {if (v == LOAD) {
o->value((double)layout->bottom_group_margin);
@@ -685,11 +684,11 @@ g_layout_list.update_dialogs();}
}}
xywh {265 261 55 20} labelsize 11 align 5 maximum 32767 step 1 textsize 11
}
- Fl_Box {} {uid 86cc
+ Fl_Box {} {
label {Grid:}
xywh {32 295 53 20} labelsize 11 align 24
}
- Fl_Value_Input {} {uid c8a2
+ Fl_Value_Input {} {
label {Horizontal:}
callback {if (v == LOAD) {
o->value((double)layout->group_grid_x);
@@ -698,7 +697,7 @@ g_layout_list.update_dialogs();}
}}
xywh {85 295 55 20} labelsize 11 align 5 maximum 32767 step 1 textsize 11
}
- Fl_Value_Input {} {uid 678c
+ Fl_Value_Input {} {
label {Vertical:}
callback {if (v == LOAD) {
o->value((double)layout->group_grid_y);
@@ -707,15 +706,15 @@ g_layout_list.update_dialogs();}
}}
xywh {145 295 55 20} labelsize 11 align 5 maximum 32767 step 1 textsize 11
}
- Fl_Box {} {uid 5ddf
+ Fl_Box {} {
label {---- Tabs ----}
xywh {85 320 235 20} labelfont 1 labelsize 11 align 20
}
- Fl_Box {} {uid 52ad
+ Fl_Box {} {
label {Margin:}
xywh {25 355 60 20} labelsize 11 align 24
}
- Fl_Value_Input {} {uid d9d1
+ Fl_Value_Input {} {
label {Top:}
callback {if (v == LOAD) {
o->value((double)layout->top_tabs_margin);
@@ -724,7 +723,7 @@ g_layout_list.update_dialogs();}
}}
xywh {85 355 55 20} labelsize 11 align 5 maximum 32767 step 1 textsize 11
}
- Fl_Value_Input {} {uid 2fd1
+ Fl_Value_Input {} {
label {Bottom:}
callback {if (v == LOAD) {
o->value((double)layout->bottom_tabs_margin);
@@ -733,15 +732,15 @@ g_layout_list.update_dialogs();}
}}
xywh {145 355 55 20} labelsize 11 align 5 maximum 32767 step 1 textsize 11
}
- Fl_Box {} {uid 08be
+ Fl_Box {} {
label {---- Widget ----}
xywh {85 380 235 20} labelfont 1 labelsize 11 align 20
}
- Fl_Box {} {uid 00f0
+ Fl_Box {} {
label {Horizontal:}
xywh {25 415 60 20} labelsize 11 align 24
}
- Fl_Value_Input {} {uid 8be9
+ Fl_Value_Input {} {
label {Minimum:}
callback {if (v == LOAD) {
o->value((double)layout->widget_min_w);
@@ -750,7 +749,7 @@ g_layout_list.update_dialogs();}
}}
xywh {85 414 55 20} labelsize 11 align 5 maximum 32767 step 1 textsize 11
}
- Fl_Value_Input {} {uid 77b7
+ Fl_Value_Input {} {
label {Increment:}
callback {if (v == LOAD) {
o->value((double)layout->widget_inc_w);
@@ -759,7 +758,7 @@ g_layout_list.update_dialogs();}
}}
xywh {145 414 55 20} labelsize 11 align 5 maximum 32767 step 1 textsize 11
}
- Fl_Value_Input {} {uid 28cb
+ Fl_Value_Input {} {
label {Gap:}
callback {if (v == LOAD) {
o->value((double)layout->widget_gap_x);
@@ -768,11 +767,11 @@ g_layout_list.update_dialogs();}
}}
xywh {205 414 55 20} labelsize 11 align 5 maximum 32767 step 1 textsize 11
}
- Fl_Box {} {uid 6c2f
+ Fl_Box {} {
label {Vertical:}
xywh {32 440 53 20} labelsize 11 align 24
}
- Fl_Value_Input {} {uid 81f2
+ Fl_Value_Input {} {
callback {if (v == LOAD) {
o->value((double)layout->widget_min_h);
} else {
@@ -780,7 +779,7 @@ g_layout_list.update_dialogs();}
}}
xywh {85 440 55 20} labelsize 11 maximum 32767 step 1 textsize 11
}
- Fl_Value_Input {} {uid 028c
+ Fl_Value_Input {} {
callback {if (v == LOAD) {
o->value((double)layout->widget_inc_h);
} else {
@@ -788,7 +787,7 @@ g_layout_list.update_dialogs();}
}}
xywh {145 440 55 20} labelsize 11 align 5 maximum 32767 step 1 textsize 11
}
- Fl_Value_Input {} {uid 3e48
+ Fl_Value_Input {} {
callback {if (v == LOAD) {
o->value((double)layout->widget_gap_y);
} else {
@@ -796,12 +795,12 @@ g_layout_list.update_dialogs();}
}}
xywh {205 440 55 20} labelsize 11 align 5 maximum 32767 step 1 textsize 11
}
- Fl_Group {} {uid 191e
+ Fl_Group {} {
label {Label Font:}
callback propagate_load open
xywh {85 465 201 20} labelsize 11 align 4
} {
- Fl_Choice {} {uid fc1b
+ Fl_Choice {} {
callback {if (v == LOAD) {
o->value(layout->labelfont+1);
} else {
@@ -811,7 +810,7 @@ g_layout_list.update_dialogs();}
code0 {extern Fl_Menu_Item fontmenu_w_default[];}
code1 {o->menu(fontmenu_w_default);}
} {}
- Fl_Value_Input {} {uid 8d4f
+ Fl_Value_Input {} {
callback {if (v == LOAD) {
o->value(layout->labelsize);
} else {
@@ -820,12 +819,12 @@ g_layout_list.update_dialogs();}
tooltip {The size of the label text.} xywh {235 465 50 20} labelsize 11 minimum 1 maximum 1000 step 1 value 14 textsize 11
}
}
- Fl_Group {} {uid eb71
+ Fl_Group {} {
label {Text Font:}
callback propagate_load open
xywh {85 490 200 20} labelsize 11 align 4
} {
- Fl_Choice {} {uid 2080
+ Fl_Choice {} {
callback {if (v == LOAD) {
o->value(layout->textfont+1);
} else {
@@ -835,7 +834,7 @@ g_layout_list.update_dialogs();}
code0 {extern Fl_Menu_Item fontmenu_w_default[];}
code1 {o->menu(fontmenu_w_default);}
} {}
- Fl_Value_Input {} {uid 14d7
+ Fl_Value_Input {} {
callback {if (v == LOAD) {
o->value(layout->textsize);
} else {
@@ -844,21 +843,21 @@ g_layout_list.update_dialogs();}
tooltip {The value text size.} xywh {235 490 50 20} labelsize 11 maximum 1000 step 1 value 14 textsize 11
}
}
- Fl_Box {} {uid 7fd3
+ Fl_Box {} {
xywh {325 535 5 5} hide resizable
}
}
- Fl_Group w_settings_shell_tab {uid 0df4
+ Fl_Group w_settings_shell_tab {
label Shell
callback propagate_load open
image {icons/shell_64.png} compress_image 1 xywh {10 60 320 480} labelsize 11 hide
code0 {o->image()->scale(36, 24);}
} {
- Fl_Group {} {uid d6f1
+ Fl_Group {} {
callback propagate_load open
xywh {10 90 320 132}
} {
- Fl_Browser w_settings_shell_list {uid 7f94
+ Fl_Browser w_settings_shell_list {
label {Shell
command
list:}
@@ -889,13 +888,13 @@ list:}
}}
xywh {100 90 220 110} type Multi labelfont 1 labelsize 11 align 4 textsize 13 resizable
}
- Fl_Group w_settings_shell_toolbox {uid 32e8
+ Fl_Group w_settings_shell_toolbox {
callback {if (v==LOAD) {
propagate_load(o, v);
}} open
xywh {100 200 220 22}
} {
- Fl_Button {} {uid cfab
+ Fl_Button {} {
label {+}
callback {if (v != LOAD) {
int selected = w_settings_shell_list_selected;
@@ -915,7 +914,7 @@ list:}
}}
tooltip {insert a new shell command into the list after the selected command} xywh {100 200 24 22} labelfont 1 labelsize 11
}
- Fl_Button w_settings_shell_dup {uid f893
+ Fl_Button w_settings_shell_dup {
label {++}
callback {int selected = w_settings_shell_list_selected;
if (v==LOAD) {
@@ -943,7 +942,7 @@ if (v==LOAD) {
}}
tooltip {duplicate the selected shell command and insert it into the list} xywh {124 200 24 22} labelfont 1 labelsize 11 deactivate
}
- Fl_Button w_settings_shell_remove {uid 0573
+ Fl_Button w_settings_shell_remove {
label DEL
callback {int selected = w_settings_shell_list_selected;
if (v==LOAD) {
@@ -970,46 +969,46 @@ if (v==LOAD) {
}}
tooltip {remove the selected shell command - this can not be undone} xywh {148 200 24 22} labelsize 10 deactivate
}
- Fl_Menu_Button w_settings_shell_menu {uid e91b open
+ Fl_Menu_Button w_settings_shell_menu {open
xywh {172 200 24 22} labelsize 11 textsize 11
} {
- MenuItem {} {uid 2cd9
+ MenuItem {} {
label {Import...}
callback {if (v != LOAD)
Fd_Shell_Command_List::import_from_file();}
tooltip {import shell commands from an external file} xywh {90 90 100 20} labelsize 11
}
- MenuItem {} {uid e939
+ MenuItem {} {
label {Export selected...}
callback {if (v != LOAD)
Fd_Shell_Command_List::export_selected();}
tooltip {export selected shell commands to an external file} xywh {10 10 100 20} labelsize 11
}
- MenuItem {} {uid 8216
+ MenuItem {} {
label {Example Scripts:}
xywh {20 20 100 20} labelfont 1 labelsize 10 hide deactivate
}
- MenuItem {} {uid 3341
+ MenuItem {} {
label {Compile with fltk-config}
xywh {30 30 100 20} labelsize 11 hide
}
- MenuItem {} {uid 5e35
+ MenuItem {} {
label {Build and run}
xywh {40 40 100 20} labelsize 11 hide
}
- MenuItem {} {uid b8e8
+ MenuItem {} {
label {Build with Xcode on macOS}
xywh {50 50 100 20} labelsize 11 hide
}
- MenuItem {} {uid fe3c
+ MenuItem {} {
label {Build with CMake}
xywh {60 60 100 20} labelsize 11 hide
}
}
- Fl_Box {} {uid 56d8
+ Fl_Box {} {
xywh {253 200 13 22} hide resizable
}
- Fl_Button w_settings_shell_play {uid 29ce
+ Fl_Button w_settings_shell_play {
label Run
callback {int selected = w_settings_shell_list_selected;
if (v==LOAD) {
@@ -1027,7 +1026,7 @@ if (v==LOAD) {
}
}
}
- Fl_Group w_settings_shell_cmd {uid ed18
+ Fl_Group w_settings_shell_cmd {
callback {if (v==LOAD) {
int selected = w_settings_shell_list_selected;
if (selected) {
@@ -1039,7 +1038,7 @@ if (v==LOAD) {
}} open
xywh {10 235 320 291} resizable
} {
- Fl_Input {} {uid aefa
+ Fl_Input {} {
label {Name:}
callback {int selected = w_settings_shell_list_selected;
if (v == LOAD) {
@@ -1058,7 +1057,7 @@ if (v == LOAD) {
}}
tooltip {file the shell command under this name in the shell command list} xywh {100 246 220 20} labelfont 1 labelsize 11 when 13 textfont 4 textsize 11
}
- Fl_Input {} {uid 2b68
+ Fl_Input {} {
label {Menu Label:}
callback {int selected = w_settings_shell_list_selected;
if (v == LOAD) {
@@ -1077,11 +1076,11 @@ if (v == LOAD) {
}}
tooltip {label text for the Shell menu in the main menu bar} xywh {100 272 220 20} labelfont 1 labelsize 11 textfont 4 textsize 11
}
- Fl_Group {} {uid 5afc
+ Fl_Group {} {
callback {propagate_load(o, v);} open
xywh {100 297 140 71}
} {
- Fl_Button {} {uid e632
+ Fl_Button {} {
label Shortcut
callback {int selected = w_settings_shell_list_selected;
if (v == LOAD) {
@@ -1103,7 +1102,7 @@ if (v == LOAD) {
code0 {\#include <FL/Fl_Shortcut_Button.H>}
class Fl_Shortcut_Button
}
- Fl_Choice {} {uid 8701
+ Fl_Choice {} {
label {Store:}
callback {int selected = w_settings_shell_list_selected;
if (v == LOAD) {
@@ -1129,18 +1128,18 @@ if (v == LOAD) {
}} open
tooltip {store this shell command as a user setting or save it with the .fl project file} xywh {100 322 130 20} down_box BORDER_BOX labelfont 1 labelsize 11 textsize 11
} {
- MenuItem {} {uid b839
+ MenuItem {} {
label {@fd_user User Setting}
user_data FD_STORE_USER user_data_type long
xywh {0 0 100 20} labelsize 11
}
- MenuItem {} {uid 940f
+ MenuItem {} {
label {@fd_project Project File}
user_data FD_STORE_PROJECT user_data_type long
xywh {0 0 100 20} labelsize 11
}
}
- Fl_Choice {} {uid a5e5
+ Fl_Choice {} {
label {Condition:}
callback {int selected = w_settings_shell_list_selected;
if (v == LOAD) {
@@ -1161,42 +1160,42 @@ if (v == LOAD) {
}} open
tooltip {add this command to the main menu bar only if this condition is true} xywh {100 348 130 20} down_box BORDER_BOX labelfont 1 labelsize 11 textsize 11
} {
- MenuItem {} {uid c471
+ MenuItem {} {
label {all platforms}
user_data {Fd_Shell_Command::ALWAYS} user_data_type long
xywh {0 0 100 20} labelsize 11
}
- MenuItem {} {uid 7c05
+ MenuItem {} {
label {MS Windows only}
user_data {Fd_Shell_Command::WIN_ONLY} user_data_type long
xywh {0 0 100 20} labelsize 11
}
- MenuItem {} {uid 3b2e
+ MenuItem {} {
label {Linux only}
user_data {Fd_Shell_Command::UX_ONLY} user_data_type long
xywh {0 0 100 20} labelsize 11
}
- MenuItem {} {uid 5cdc
+ MenuItem {} {
label {macOS only}
user_data {Fd_Shell_Command::MAC_ONLY} user_data_type long
xywh {0 0 100 20} labelsize 11
}
- MenuItem {} {uid b6ad
+ MenuItem {} {
label {Linux and macOS}
user_data {Fd_Shell_Command::MAC_AND_UX_ONLY} user_data_type long
xywh {0 0 100 20} labelsize 11
}
- MenuItem {} {uid 2c6a
+ MenuItem {} {
label {don't use}
user_data {Fd_Shell_Command::NEVER} user_data_type long
xywh {0 0 100 20} labelsize 11
}
}
- Fl_Box {} {uid 01ed
+ Fl_Box {} {
xywh {230 297 10 71} hide resizable
}
}
- Fl_Input {} {uid 3880
+ Fl_Input {} {
label {Label:}
callback {if (v == LOAD) {
// o->value(g_shell_command.c_str());
@@ -1205,11 +1204,11 @@ if (v == LOAD) {
}}
xywh {230 348 90 20} labelfont 1 labelsize 11 textfont 4 textsize 11 hide
}
- Fl_Group {} {uid 8e9a
+ Fl_Group {} {
callback propagate_load open
xywh {100 373 220 80} resizable
} {
- Fl_Text_Editor w_settings_shell_command {uid 2ecf
+ Fl_Text_Editor w_settings_shell_command {
label {Shell script:}
callback {int selected = w_settings_shell_list_selected;
if (v == LOAD) {
@@ -1228,10 +1227,10 @@ if (v == LOAD) {
xywh {100 373 196 80} labelfont 1 labelsize 11 align 4 textfont 4 textsize 12 resizable
code0 {o->buffer(new Fl_Text_Buffer);}
}
- Fl_Group {} {uid e026 open
+ Fl_Group {} {open
xywh {296 373 24 80}
} {
- Fl_Menu_Button w_settings_shell_text_macros {uid 6519
+ Fl_Menu_Button w_settings_shell_text_macros {
callback {const Fl_Menu_Item *mi = o->mvalue();
if (mi) {
char buffer[256];
@@ -1252,53 +1251,53 @@ if (mi) {
}} open
tooltip {a list of text replacements available for the shell script} xywh {296 373 24 22} labelsize 11 textsize 11
} {
- MenuItem {} {uid edaf
+ MenuItem {} {
label {@@BASENAME@@}
xywh {80 80 100 20} labelfont 4 labelsize 11
}
- MenuItem {} {uid 783a
+ MenuItem {} {
label {@@PROJECTFILE_PATH@@}
xywh {0 0 100 20} labelfont 4 labelsize 11
}
- MenuItem {} {uid 7cc5
+ MenuItem {} {
label {@@PROJECTFILE_NAME@@}
xywh {10 10 100 20} labelfont 4 labelsize 11
}
- MenuItem {} {uid 053c
+ MenuItem {} {
label {@@CODEFILE_PATH@@}
xywh {20 20 100 20} labelfont 4 labelsize 11
}
- MenuItem {} {uid 9319
+ MenuItem {} {
label {@@CODEFILE_NAME@@}
xywh {30 30 100 20} labelfont 4 labelsize 11
}
- MenuItem {} {uid e738
+ MenuItem {} {
label {@@HEADERFILE_PATH@@}
xywh {40 40 100 20} labelfont 4 labelsize 11
}
- MenuItem {} {uid 7410
+ MenuItem {} {
label {@@HEADERFILE_NAME@@}
xywh {50 50 100 20} labelfont 4 labelsize 11
}
- MenuItem {} {uid 8760
+ MenuItem {} {
label {@@TEXTFILE_PATH@@}
xywh {60 60 100 20} labelfont 4 labelsize 11
}
- MenuItem {} {uid 867b
+ MenuItem {} {
label {@@TEXTFILE_NAME@@}
xywh {70 70 100 20} labelfont 4 labelsize 11
}
- MenuItem {} {uid ee72
+ MenuItem {} {
label {@@FLTK_CONFIG@@}
comment {Not yet implemented}
xywh {70 70 100 20} labelfont 4 labelsize 11 hide
}
- MenuItem {} {uid 09f2
+ MenuItem {} {
label {@@TMPDIR@@}
xywh {70 70 100 20} labelfont 4 labelsize 11
}
}
- Fl_Button {} {uid a916
+ Fl_Button {} {
label {@+1fd_zoom}
callback {if (!script_panel) make_script_panel();
script_input->buffer()->text(w_settings_shell_command->buffer()->text());
@@ -1317,12 +1316,12 @@ BREAK2:
script_panel->hide();}
tooltip {open the big code editor} xywh {296 395 24 22} labelsize 11
}
- Fl_Box {} {uid 43de
+ Fl_Box {} {
xywh {296 417 24 10} hide resizable
}
}
}
- Fl_Check_Button {} {uid 81c9
+ Fl_Check_Button {} {
label {save .fl project file}
callback {int selected = w_settings_shell_list_selected;
if (v == LOAD) {
@@ -1345,7 +1344,7 @@ if (v == LOAD) {
}}
tooltip {save the project to the .fl file before running the command} xywh {100 458 220 20} down_box DOWN_BOX labelsize 11
}
- Fl_Check_Button {} {uid 4c02
+ Fl_Check_Button {} {
label {save source code}
callback {int selected = w_settings_shell_list_selected;
if (v == LOAD) {
@@ -1368,7 +1367,7 @@ if (v == LOAD) {
}}
tooltip {generate the source code and header file before running the command} xywh {100 478 220 19} down_box DOWN_BOX labelsize 11
}
- Fl_Check_Button {} {uid 9a10
+ Fl_Check_Button {} {
label {save i18n strings}
callback {int selected = w_settings_shell_list_selected;
if (v == LOAD) {
@@ -1392,52 +1391,52 @@ if (v == LOAD) {
tooltip {save the internationalisation strings before running the command} xywh {100 497 220 20} down_box DOWN_BOX labelsize 11
}
}
- Fl_Box w_settings_shell_fd_project {uid 1b62
+ Fl_Box w_settings_shell_fd_project {
image {pixmaps/fd_project.png} compress_image 1 bind_image 1 bind_deimage 1 xywh {20 70 16 15} labelsize 11 hide deactivate
code0 {o->image()->scale(16, 16);}
}
- Fl_Box w_settings_shell_fd_user {uid 36b9
+ Fl_Box w_settings_shell_fd_user {
image {pixmaps/fd_user.png} compress_image 1 bind_image 1 bind_deimage 1 xywh {20 70 16 15} labelsize 11 hide deactivate
code0 {o->image()->scale(16, 16);}
}
}
- Fl_Group w_settings_i18n_tab {uid 5cf7
+ Fl_Group w_settings_i18n_tab {
label Locale
callback {propagate_load(o, v);} open
image {icons/language_64.png} compress_image 1 xywh {10 60 320 480} labelsize 11 hide
code0 {o->image()->scale(36, 24);}
} {
- Fl_Group {} {uid e676
+ Fl_Group {} {
callback propagate_load open
xywh {100 78 170 20}
} {
- Fl_Choice i18n_type_chooser {uid 21d3
+ Fl_Choice i18n_type_chooser {
label {i18n Library:}
callback i18n_type_cb open
tooltip {Type of internationalization to use.} xywh {100 78 160 20} box THIN_UP_BOX down_box BORDER_BOX labelsize 11 textsize 11
} {
- MenuItem {} {uid 08b7
+ MenuItem {} {
label None
xywh {0 -11 100 20} labelsize 11
}
- MenuItem {} {uid ccd5
+ MenuItem {} {
label {GNU gettext}
xywh {0 -11 100 20} labelsize 11
}
- MenuItem {} {uid 6287
+ MenuItem {} {
label {POSIX catgets}
xywh {0 -11 100 20} labelsize 11
}
}
- Fl_Box {} {uid 117f
+ Fl_Box {} {
xywh {260 78 10 20} hide resizable
}
}
- Fl_Group i18n_gnu_group {uid a381
+ Fl_Group i18n_gnu_group {
callback {propagate_load(o, v);} open
xywh {100 103 220 95}
} {
- Fl_Input i18n_gnu_include_input {uid 5603
+ Fl_Input i18n_gnu_include_input {
label {\#include:}
callback {if (v == LOAD) {
o->value(g_project.i18n_gnu_include.c_str());
@@ -1448,7 +1447,7 @@ if (v == LOAD) {
}}
tooltip {The include file for internationalization.} xywh {100 103 220 20} box THIN_DOWN_BOX labelsize 11 textfont 4 textsize 11
}
- Fl_Input i18n_gnu_conditional_input {uid c4ca
+ Fl_Input i18n_gnu_conditional_input {
label {Conditional:}
callback {if (v == LOAD) {
o->value(g_project.i18n_gnu_conditional.c_str());
@@ -1459,7 +1458,7 @@ if (v == LOAD) {
}}
tooltip {only include the header file if this preprocessor macro is defined, for example FLTK_GETTEXT_FOUND} xywh {100 128 220 20} box THIN_DOWN_BOX labelsize 11 textfont 4 textsize 11
}
- Fl_Input i18n_gnu_function_input {uid 094c
+ Fl_Input i18n_gnu_function_input {
label {Function:}
callback {if (v == LOAD) {
o->value(g_project.i18n_gnu_function.c_str());
@@ -1470,7 +1469,7 @@ if (v == LOAD) {
}}
tooltip {The function to call to translate labels and tooltips, usually "gettext" or "_"} xywh {100 153 220 20} box THIN_DOWN_BOX labelsize 11 textfont 4 textsize 11
}
- Fl_Input i18n_gnu_static_function_input {uid 03b3
+ Fl_Input i18n_gnu_static_function_input {
label {Static Function:}
callback {if (v == LOAD) {
o->value(g_project.i18n_gnu_static_function.c_str());
@@ -1482,11 +1481,11 @@ if (v == LOAD) {
tooltip {function to call to translate static text, The function to call to internationalize labels and tooltips, usually "gettext_noop" or "N_"} xywh {100 178 220 20} box THIN_DOWN_BOX labelsize 11 textfont 4 textsize 11
}
}
- Fl_Group i18n_posix_group {uid 9310
+ Fl_Group i18n_posix_group {
callback {propagate_load(o, v);} open
xywh {100 103 220 95} hide
} {
- Fl_Input i18n_pos_include_input {uid 647f
+ Fl_Input i18n_pos_include_input {
label {\#include:}
callback {if (v == LOAD) {
o->value(g_project.i18n_pos_include.c_str());
@@ -1497,7 +1496,7 @@ if (v == LOAD) {
}}
tooltip {The include file for internationalization.} xywh {100 103 220 20} box THIN_DOWN_BOX labelsize 11 textfont 4 textsize 11
}
- Fl_Input i18n_pos_conditional_input {uid b76b
+ Fl_Input i18n_pos_conditional_input {
label {Conditional:}
callback {if (v == LOAD) {
o->value(g_project.i18n_pos_conditional.c_str());
@@ -1508,7 +1507,7 @@ if (v == LOAD) {
}}
tooltip {only include the header file if this preprocessor macro is defined, for example FLTK_GETTEXT_FOUND} xywh {100 128 220 20} box THIN_DOWN_BOX labelsize 11 textfont 4 textsize 11
}
- Fl_Input i18n_pos_file_input {uid 5f88
+ Fl_Input i18n_pos_file_input {
label {File:}
callback {if (v == LOAD) {
o->value(g_project.i18n_pos_file.c_str());
@@ -1519,11 +1518,11 @@ if (v == LOAD) {
}}
tooltip {The name of the message catalog.} xywh {100 153 220 20} box THIN_DOWN_BOX labelsize 11 textfont 4 textsize 11
}
- Fl_Group {} {uid 2eaa
+ Fl_Group {} {
callback {propagate_load(o, v);} open
xywh {100 178 90 20}
} {
- Fl_Input i18n_pos_set_input {uid cdf4
+ Fl_Input i18n_pos_set_input {
label {Set:}
callback {if (v == LOAD) {
o->value(g_project.i18n_pos_set.c_str());
@@ -1534,20 +1533,20 @@ if (v == LOAD) {
}}
tooltip {The message set number.} xywh {100 178 80 20} type Int box THIN_DOWN_BOX labelsize 11 textfont 4 textsize 11
}
- Fl_Box {} {uid 803e
+ Fl_Box {} {
xywh {180 178 10 20} hide resizable
}
}
}
- Fl_Box {} {uid 8947
+ Fl_Box {} {
xywh {100 530 220 10} hide resizable
}
}
}
- Fl_Group {} {uid 2ece open
+ Fl_Group {} {open
xywh {10 550 320 20}
} {
- Fl_Button {} {uid fe4e
+ Fl_Button {} {
label Close
callback {if (g_shell_config)
g_shell_config->write(fluid_prefs, FD_STORE_USER);
@@ -1555,37 +1554,36 @@ g_layout_list.write(fluid_prefs, FD_STORE_USER);
settings_window->hide();}
tooltip {Close this dialog.} xywh {230 550 100 20} labelsize 11
}
- Fl_Box {} {uid fe23
+ Fl_Box {} {
xywh {220 550 10 20} hide resizable
}
}
}
- code {w_settings_tabs->do_callback(w_settings_tabs, LOAD);} {uid 81e7
- }
+ code {w_settings_tabs->do_callback(w_settings_tabs, LOAD);} {}
}
-Function {make_shell_window()} {uid bc92 open
+Function {make_shell_window()} {open
} {
- Fl_Window shell_run_window {uid 9da3
+ Fl_Window shell_run_window {
label {Shell Command Output} open
xywh {769 585 555 430} type Double align 80 resizable visible
} {
- Fl_Simple_Terminal shell_run_terminal {uid 3abb
+ Fl_Simple_Terminal shell_run_terminal {
xywh {10 10 535 375} resizable
code0 {shell_run_terminal->ansi(1);}
}
- Fl_Group {} {uid 0bee open
+ Fl_Group {} {open
xywh {10 395 535 25}
} {
- Fl_Button {} {uid 601b
+ Fl_Button {} {
label Clear
callback {shell_run_terminal->clear();}
xywh {10 395 94 25}
}
- Fl_Box {} {uid db15
+ Fl_Box {} {
xywh {104 395 341 25} hide resizable
}
- Fl_Return_Button shell_run_button {uid d20c
+ Fl_Return_Button shell_run_button {
label Close
callback {Fl_Preferences pos(fluid_prefs, "shell_run_Window_pos");
pos.set("x", shell_run_window->x());
@@ -1599,5 +1597,5 @@ shell_run_window->hide();}
}
}
-decl {Fl_Menu_Item *w_layout_menu_storage[4];} {uid b11e private global
+decl {Fl_Menu_Item *w_layout_menu_storage[4];} {private global
}
diff --git a/fluid/fluid.cxx b/fluid/fluid.cxx
index 157b99630..57baeecd6 100644
--- a/fluid/fluid.cxx
+++ b/fluid/fluid.cxx
@@ -1271,6 +1271,8 @@ void write_cb(Fl_Widget *, void *) {
write_code_files();
}
+#if 0
+// Matt: disabled
/**
Merge the possibly modified content of code files back into the project.
*/
@@ -1313,6 +1315,7 @@ int mergeback_code_files()
void mergeback_cb(Fl_Widget *, void *) {
mergeback_code_files();
}
+#endif
/**
Write the strings that are used in i18n.
@@ -1665,7 +1668,7 @@ Fl_Menu_Item Main_Menu[] = {
{"Save As &Template...", 0, save_template_cb, 0, FL_MENU_DIVIDER},
{"&Print...", FL_COMMAND+'p', print_menu_cb},
{"Write &Code...", FL_COMMAND+FL_SHIFT+'c', write_cb, 0},
- {"MergeBack Code", FL_COMMAND+FL_SHIFT+'m', mergeback_cb, 0},
+// Matt: disabled {"MergeBack Code", FL_COMMAND+FL_SHIFT+'m', mergeback_cb, 0},
{"&Write Strings...", FL_COMMAND+FL_SHIFT+'w', write_strings_cb, 0, FL_MENU_DIVIDER},
{relative_history[0], FL_COMMAND+'1', menu_file_open_history_cb, absolute_history[0]},
{relative_history[1], FL_COMMAND+'2', menu_file_open_history_cb, absolute_history[1]},
diff --git a/fluid/mergeback.cxx b/fluid/mergeback.cxx
index 7e92040b1..4b3bf2807 100644
--- a/fluid/mergeback.cxx
+++ b/fluid/mergeback.cxx
@@ -14,6 +14,9 @@
// https://www.fltk.org/bugs.php
//
+#if 0
+// Matt: disabled
+
#include "mergeback.h"
#include "fluid.h"
@@ -485,3 +488,6 @@ int Fd_Mergeback::merge_back(const Fl_String &s, const Fl_String &p, int task) {
code = NULL;
return ret;
}
+
+#endif
+
diff --git a/fluid/mergeback.h b/fluid/mergeback.h
index bb64053d9..7be18c710 100644
--- a/fluid/mergeback.h
+++ b/fluid/mergeback.h
@@ -14,6 +14,9 @@
// https://www.fltk.org/bugs.php
//
+// Matt: disabled
+#if 0
+
#ifndef _FLUID_MERGEBACK_H
#define _FLUID_MERGEBACK_H
@@ -75,3 +78,5 @@ extern int merge_back(const Fl_String &s, const Fl_String &p, int task);
#endif // _FLUID_MERGEBACK_H
+
+#endif
generated by cgit v1.2.3 (git 2.25.1) at 2026-02-09 02:38:24 +0000