Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-05-31 22:04:26 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

FLUID: Adds helpful message for MergeBack.

Browse Source
This commit is contained in:
Matthias Melcher
2023-10-26 03:19:05 +02:00
parent 6d5021c00e
commit f33dfc1c6a
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fluid/fluid.cxx
+7
View File
@@ -1277,6 +1277,12 @@ int mergeback_code_files()
{ {
flush_text_widgets(); flush_text_widgets();
if (!filename) return 1; if (!filename) return 1;
if (!g_project.write_mergeback_data) {
fl_message("MergeBack is not enabled for this project.\n"
"Please enable MergeBack in the project settings\n"
"dialog and re-save the project file and the code.");
return 0;
}
// -- generate the file names with absolute paths // -- generate the file names with absolute paths
Fd_Code_Writer f; Fd_Code_Writer f;
@@ -1288,6 +1294,7 @@ int mergeback_code_files()
if (!batch_mode) leave_project_dir(); if (!batch_mode) leave_project_dir();
if (c==0) fl_message("MergeBack found no external modifications\n" if (c==0) fl_message("MergeBack found no external modifications\n"
"in the source code."); "in the source code.");
return c;
} }
void mergeback_cb(Fl_Widget *, void *) { void mergeback_cb(Fl_Widget *, void *) {