Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-02-06 08:21:40 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update dependencies and fix whitespace errors

Browse Source 
- replace tabs with spaces
- remove trailing whitespace
This commit is contained in:
Albrecht Schlosser
2023-02-02 17:03:09 +01:00
parent fb00fb3d66
commit 4e75549e7b
16 changed files with 488 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
FL/fl_attr.h
View File

@@ -33,7 +33,7 @@
/** To be used in prototypes with a variable list of arguments.
This macro helps detection of mismatches between format string and
argument list at compilation time.
Usage example: FL/fl_ask.H
*/
#define __fl_attr(x)

1
cairo/makedepend
View File

@@ -2,6 +2,7 @@
Fl_Cairo.o: ../FL/Enumerations.H
Fl_Cairo.o: ../FL/Fl.H
Fl_Cairo.o: ../FL/fl_attr.h
Fl_Cairo.o: ../FL/Fl_Bitmap.H
Fl_Cairo.o: ../FL/Fl_Cairo.H
Fl_Cairo.o: ../FL/fl_casts.H

4
documentation/src/bundled-libs.dox
View File

@@ -352,7 +352,7 @@ Run `make depend' in the jpeg folder on a Linux system after
the system version of libdecor. libdecor will remain as an FLTK bundle to
support Linux configurations where the libdecor package is not
available or not installed.
FLTK uses libdecor source files without any modification.
This part of the libdecor source tree is copied to directory libdecor/ of
the FLTK source tree:
@@ -366,5 +366,5 @@ Run `make depend' in the jpeg folder on a Linux system after
</pre>
Furthermore, directory libdecor/build/ of the FLTK source tree does not
originate from the libdecor source tree but contains 3 FLTK-created files.
*/

2
examples/animgifimage.cxx
View File

@@ -196,7 +196,7 @@ bool openDirectory(const char *dir, char *flags) {
if (!p) continue;
if (*(p+4)) continue; // is no extension!
snprintf(buf, sizeof(buf), "%s/%s", dir, name);
if (strstr(name, "debug")) // hack: when name contains 'debug' open single frames
if (strstr(name, "debug")) // hack: when name contains 'debug' open single frames
strcat(flags, "d");
if (openFile(buf, flags, cnt == 0))
cnt++;

42
fltk-options/makedepend
View File

@@ -1 +1,43 @@
# DO NOT DELETE THIS LINE -- make depend depends on it.
fltk-options.o: ../config.h
fltk-options.o: ../FL/Enumerations.H
fltk-options.o: ../FL/filename.H
fltk-options.o: ../FL/Fl.H
fltk-options.o: ../FL/fl_attr.h
fltk-options.o: ../FL/Fl_Bitmap.H
fltk-options.o: ../FL/Fl_Box.H
fltk-options.o: ../FL/Fl_Browser.H
fltk-options.o: ../FL/Fl_Browser_.H
fltk-options.o: ../FL/Fl_Button.H
fltk-options.o: ../FL/Fl_Cairo.H
fltk-options.o: ../FL/fl_casts.H
fltk-options.o: ../FL/Fl_Choice.H
fltk-options.o: ../FL/fl_config.h
fltk-options.o: ../FL/Fl_Device.H
fltk-options.o: ../FL/Fl_Double_Window.H
fltk-options.o: ../FL/fl_draw.H
fltk-options.o: ../FL/Fl_Export.H
fltk-options.o: ../FL/Fl_Graphics_Driver.H
fltk-options.o: ../FL/Fl_Group.H
fltk-options.o: ../FL/Fl_Hold_Browser.H
fltk-options.o: ../FL/Fl_Image.H
fltk-options.o: ../FL/Fl_Menu_.H
fltk-options.o: ../FL/Fl_Menu_Item.H
fltk-options.o: ../FL/Fl_Pack.H
fltk-options.o: ../FL/Fl_Pixmap.H
fltk-options.o: ../FL/Fl_Plugin.H
fltk-options.o: ../FL/Fl_Preferences.H
fltk-options.o: ../FL/Fl_Rect.H
fltk-options.o: ../FL/Fl_RGB_Image.H
fltk-options.o: ../FL/Fl_Scroll.H
fltk-options.o: ../FL/Fl_Scrollbar.H
fltk-options.o: ../FL/Fl_Slider.H
fltk-options.o: ../FL/Fl_Tooltip.H
fltk-options.o: ../FL/fl_types.h
fltk-options.o: ../FL/fl_utf8.h
fltk-options.o: ../FL/Fl_Valuator.H
fltk-options.o: ../FL/Fl_Widget.H
fltk-options.o: ../FL/Fl_Window.H
fltk-options.o: ../FL/platform_types.h
fltk-options.o: ../src/flstring.h

2
fluid/Fluid_Image.cxx
View File

@@ -123,7 +123,7 @@ void Fluid_Image::write_static(Fd_Code_Writer& f, int compressed) {
if (!img) return;
const char *idata_name = f.unique_id(this, "idata", fl_filename_name(name()), 0);
function_name_ = f.unique_id(this, "image", fl_filename_name(name()), 0);
if (is_animated_gif_) {
// Write animated gif image data...
f.write_c("\n");

2
fluid/Shortcut_Button.cxx
View File

@@ -89,7 +89,7 @@ int Shortcut_Button::handle(int e) {
The Widget_Bin_Button button is a button that can be used in the widget bin to
allow the user to drag and drop widgets into a window or group. This feature
makes it easy for the user to position a widget at a specific location within
the window or group.
the window or group.
*/
/**

41
fluid/makedepend
View File

@@ -3,6 +3,8 @@
about_panel.o: ../config.h
about_panel.o: ../FL/Enumerations.H
about_panel.o: ../FL/Fl.H
about_panel.o: ../FL/Fl_Anim_GIF_Image.H
about_panel.o: ../FL/fl_attr.h
about_panel.o: ../FL/Fl_Bitmap.H
about_panel.o: ../FL/Fl_Box.H
about_panel.o: ../FL/Fl_Button.H
@@ -11,6 +13,7 @@ about_panel.o: ../FL/fl_casts.H
about_panel.o: ../FL/fl_config.h
about_panel.o: ../FL/Fl_Double_Window.H
about_panel.o: ../FL/Fl_Export.H
about_panel.o: ../FL/Fl_GIF_Image.H
about_panel.o: ../FL/Fl_Group.H
about_panel.o: ../FL/Fl_Image.H
about_panel.o: ../FL/Fl_Pixmap.H
@@ -57,6 +60,8 @@ alignment_panel.o: ../FL/Fl_Repeat_Button.H
alignment_panel.o: ../FL/Fl_Return_Button.H
alignment_panel.o: ../FL/Fl_RGB_Image.H
alignment_panel.o: ../FL/Fl_Round_Button.H
alignment_panel.o: ../FL/Fl_Scheme.H
alignment_panel.o: ../FL/Fl_Scheme_Choice.H
alignment_panel.o: ../FL/Fl_Scrollbar.H
alignment_panel.o: ../FL/Fl_Simple_Terminal.H
alignment_panel.o: ../FL/Fl_Slider.H
@@ -79,6 +84,7 @@ alignment_panel.o: widget_browser.h
align_widget.o: ../FL/Enumerations.H
align_widget.o: ../FL/filename.H
align_widget.o: ../FL/Fl.H
align_widget.o: ../FL/fl_attr.h
align_widget.o: ../FL/Fl_Bitmap.H
align_widget.o: ../FL/Fl_Cairo.H
align_widget.o: ../FL/fl_casts.H
@@ -106,6 +112,7 @@ align_widget.o: ../FL/Fl_Window.H
align_widget.o: ../FL/Fl_Wizard.H
align_widget.o: ../FL/platform_types.h
align_widget.o: align_widget.h
align_widget.o: code.h
align_widget.o: fluid.h
align_widget.o: Fl_Group_Type.h
align_widget.o: Fl_Type.h
@@ -149,6 +156,8 @@ code.o: ../FL/Fl_Repeat_Button.H
code.o: ../FL/Fl_Return_Button.H
code.o: ../FL/Fl_RGB_Image.H
code.o: ../FL/Fl_Round_Button.H
code.o: ../FL/Fl_Scheme.H
code.o: ../FL/Fl_Scheme_Choice.H
code.o: ../FL/Fl_Scrollbar.H
code.o: ../FL/Fl_Shared_Image.H
code.o: ../FL/Fl_Simple_Terminal.H
@@ -183,6 +192,7 @@ code.o: shell_command.h
code.o: widget_browser.h
CodeEditor.o: ../FL/Enumerations.H
CodeEditor.o: ../FL/Fl.H
CodeEditor.o: ../FL/fl_attr.h
CodeEditor.o: ../FL/Fl_Bitmap.H
CodeEditor.o: ../FL/Fl_Cairo.H
CodeEditor.o: ../FL/fl_casts.H
@@ -219,12 +229,14 @@ ExternalCodeEditor_UNIX.o: ../FL/Fl_Cairo.H
ExternalCodeEditor_UNIX.o: ../FL/fl_casts.H
ExternalCodeEditor_UNIX.o: ../FL/fl_config.h
ExternalCodeEditor_UNIX.o: ../FL/Fl_Export.H
ExternalCodeEditor_UNIX.o: ../FL/Fl_Image.H
ExternalCodeEditor_UNIX.o: ../FL/Fl_Menu_Item.H
ExternalCodeEditor_UNIX.o: ../FL/Fl_Preferences.H
ExternalCodeEditor_UNIX.o: ../FL/Fl_String.H
ExternalCodeEditor_UNIX.o: ../FL/fl_string_functions.h
ExternalCodeEditor_UNIX.o: ../FL/fl_types.h
ExternalCodeEditor_UNIX.o: ../FL/fl_utf8.h
ExternalCodeEditor_UNIX.o: ../FL/Fl_Widget.H
ExternalCodeEditor_UNIX.o: ../FL/platform_types.h
ExternalCodeEditor_UNIX.o: ExternalCodeEditor_UNIX.h
ExternalCodeEditor_UNIX.o: fluid.h
@@ -233,6 +245,7 @@ factory.o: ../FL/Enumerations.H
factory.o: ../FL/filename.H
factory.o: ../FL/Fl.H
factory.o: ../FL/Fl_Adjuster.H
factory.o: ../FL/fl_attr.h
factory.o: ../FL/Fl_Bitmap.H
factory.o: ../FL/Fl_Box.H
factory.o: ../FL/Fl_Browser.H
@@ -298,6 +311,7 @@ factory.o: ../FL/Fl_Window.H
factory.o: ../FL/Fl_Wizard.H
factory.o: ../FL/platform_types.h
factory.o: ../src/flstring.h
factory.o: code.h
factory.o: factory.h
factory.o: fluid.h
factory.o: Fl_Group_Type.h
@@ -344,6 +358,8 @@ file.o: ../FL/Fl_Repeat_Button.H
file.o: ../FL/Fl_Return_Button.H
file.o: ../FL/Fl_RGB_Image.H
file.o: ../FL/Fl_Round_Button.H
file.o: ../FL/Fl_Scheme.H
file.o: ../FL/Fl_Scheme_Choice.H
file.o: ../FL/Fl_Scrollbar.H
file.o: ../FL/Fl_Shared_Image.H
file.o: ../FL/Fl_Simple_Terminal.H
@@ -374,6 +390,7 @@ file.o: Fl_Type.h
file.o: Fl_Widget_Type.h
file.o: Fl_Window_Type.h
file.o: shell_command.h
file.o: undo.h
file.o: widget_browser.h
fluid.o: ../config.h
fluid.o: ../FL/Enumerations.H
@@ -427,6 +444,8 @@ fluid.o: ../FL/Fl_Repeat_Button.H
fluid.o: ../FL/Fl_Return_Button.H
fluid.o: ../FL/Fl_RGB_Image.H
fluid.o: ../FL/Fl_Round_Button.H
fluid.o: ../FL/Fl_Scheme.H
fluid.o: ../FL/Fl_Scheme_Choice.H
fluid.o: ../FL/Fl_Scrollbar.H
fluid.o: ../FL/Fl_Shared_Image.H
fluid.o: ../FL/Fl_Simple_Terminal.H
@@ -474,6 +493,7 @@ Fluid_Image.o: ../config.h
Fluid_Image.o: ../FL/Enumerations.H
Fluid_Image.o: ../FL/filename.H
Fluid_Image.o: ../FL/Fl.H
Fluid_Image.o: ../FL/Fl_Anim_GIF_Image.H
Fluid_Image.o: ../FL/fl_ask.H
Fluid_Image.o: ../FL/fl_attr.h
Fluid_Image.o: ../FL/Fl_Bitmap.H
@@ -495,6 +515,7 @@ Fluid_Image.o: ../FL/Fl_File_Chooser.H
Fluid_Image.o: ../FL/Fl_File_Icon.H
Fluid_Image.o: ../FL/Fl_File_Input.H
Fluid_Image.o: ../FL/Fl_Flex.H
Fluid_Image.o: ../FL/Fl_GIF_Image.H
Fluid_Image.o: ../FL/Fl_Graphics_Driver.H
Fluid_Image.o: ../FL/Fl_Group.H
Fluid_Image.o: ../FL/Fl_Image.H
@@ -514,6 +535,7 @@ Fluid_Image.o: ../FL/Fl_RGB_Image.H
Fluid_Image.o: ../FL/Fl_Shared_Image.H
Fluid_Image.o: ../FL/Fl_String.H
Fluid_Image.o: ../FL/fl_string_functions.h
Fluid_Image.o: ../FL/Fl_SVG_Image.H
Fluid_Image.o: ../FL/Fl_Tabs.H
Fluid_Image.o: ../FL/Fl_Tile.H
Fluid_Image.o: ../FL/fl_types.h
@@ -696,6 +718,8 @@ Fl_Menu_Type.o: ../FL/Fl_Repeat_Button.H
Fl_Menu_Type.o: ../FL/Fl_Return_Button.H
Fl_Menu_Type.o: ../FL/Fl_RGB_Image.H
Fl_Menu_Type.o: ../FL/Fl_Round_Button.H
Fl_Menu_Type.o: ../FL/Fl_Scheme.H
Fl_Menu_Type.o: ../FL/Fl_Scheme_Choice.H
Fl_Menu_Type.o: ../FL/Fl_Scrollbar.H
Fl_Menu_Type.o: ../FL/Fl_Shared_Image.H
Fl_Menu_Type.o: ../FL/Fl_Simple_Terminal.H
@@ -821,6 +845,8 @@ Fl_Widget_Type.o: ../FL/Fl_Repeat_Button.H
Fl_Widget_Type.o: ../FL/Fl_Return_Button.H
Fl_Widget_Type.o: ../FL/Fl_RGB_Image.H
Fl_Widget_Type.o: ../FL/Fl_Round_Button.H
Fl_Widget_Type.o: ../FL/Fl_Scheme.H
Fl_Widget_Type.o: ../FL/Fl_Scheme_Choice.H
Fl_Widget_Type.o: ../FL/Fl_Scroll.H
Fl_Widget_Type.o: ../FL/Fl_Scrollbar.H
Fl_Widget_Type.o: ../FL/Fl_Shared_Image.H
@@ -907,7 +933,10 @@ Fl_Window_Type.o: ../FL/Fl_Repeat_Button.H
Fl_Window_Type.o: ../FL/Fl_Return_Button.H
Fl_Window_Type.o: ../FL/Fl_RGB_Image.H
Fl_Window_Type.o: ../FL/Fl_Round_Button.H
Fl_Window_Type.o: ../FL/Fl_Scheme.H
Fl_Window_Type.o: ../FL/Fl_Scheme_Choice.H
Fl_Window_Type.o: ../FL/Fl_Scrollbar.H
Fl_Window_Type.o: ../FL/Fl_Shared_Image.H
Fl_Window_Type.o: ../FL/Fl_Simple_Terminal.H
Fl_Window_Type.o: ../FL/Fl_Slider.H
Fl_Window_Type.o: ../FL/Fl_Spinner.H
@@ -949,6 +978,7 @@ Fl_Window_Type.o: widget_panel.h
function_panel.o: ../FL/Enumerations.H
function_panel.o: ../FL/filename.H
function_panel.o: ../FL/Fl.H
function_panel.o: ../FL/fl_attr.h
function_panel.o: ../FL/Fl_Bitmap.H
function_panel.o: ../FL/Fl_Box.H
function_panel.o: ../FL/Fl_Browser_.H
@@ -990,6 +1020,7 @@ function_panel.o: ../FL/Fl_Valuator.H
function_panel.o: ../FL/Fl_Widget.H
function_panel.o: ../FL/Fl_Window.H
function_panel.o: ../FL/platform_types.h
function_panel.o: code.h
function_panel.o: CodeEditor.h
function_panel.o: factory.h
function_panel.o: fluid.h
@@ -1004,6 +1035,7 @@ pixmaps.o: ../FL/Fl_Image.H
pixmaps.o: ../FL/Fl_Pixmap.H
pixmaps.o: pixmaps.h
pixmaps.o: pixmaps/bind.xpm
pixmaps.o: pixmaps/compressed.xpm
pixmaps.o: pixmaps/flAdjuster.xpm
pixmaps.o: pixmaps/flBox.xpm
pixmaps.o: pixmaps/flBrowser.xpm
@@ -1099,6 +1131,8 @@ shell_command.o: ../FL/Fl_Repeat_Button.H
shell_command.o: ../FL/Fl_Return_Button.H
shell_command.o: ../FL/Fl_RGB_Image.H
shell_command.o: ../FL/Fl_Round_Button.H
shell_command.o: ../FL/Fl_Scheme.H
shell_command.o: ../FL/Fl_Scheme_Choice.H
shell_command.o: ../FL/Fl_Scrollbar.H
shell_command.o: ../FL/Fl_Simple_Terminal.H
shell_command.o: ../FL/Fl_Slider.H
@@ -1123,6 +1157,7 @@ Shortcut_Button.o: ../config.h
Shortcut_Button.o: ../FL/Enumerations.H
Shortcut_Button.o: ../FL/filename.H
Shortcut_Button.o: ../FL/Fl.H
Shortcut_Button.o: ../FL/fl_attr.h
Shortcut_Button.o: ../FL/Fl_Bitmap.H
Shortcut_Button.o: ../FL/Fl_Box.H
Shortcut_Button.o: ../FL/Fl_Browser_.H
@@ -1171,6 +1206,7 @@ Shortcut_Button.o: ../FL/platform.H
Shortcut_Button.o: ../FL/platform_types.h
Shortcut_Button.o: ../FL/x11.H
Shortcut_Button.o: ../src/flstring.h
Shortcut_Button.o: code.h
Shortcut_Button.o: CodeEditor.h
Shortcut_Button.o: factory.h
Shortcut_Button.o: fluid.h
@@ -1250,6 +1286,7 @@ undo.o: ../FL/Fl_Widget.H
undo.o: ../FL/Fl_Window.H
undo.o: ../FL/platform_types.h
undo.o: ../src/flstring.h
undo.o: code.h
undo.o: file.h
undo.o: fluid.h
undo.o: Fl_Type.h
@@ -1259,6 +1296,7 @@ undo.o: widget_browser.h
widget_browser.o: ../FL/Enumerations.H
widget_browser.o: ../FL/filename.H
widget_browser.o: ../FL/Fl.H
widget_browser.o: ../FL/fl_attr.h
widget_browser.o: ../FL/Fl_Bitmap.H
widget_browser.o: ../FL/Fl_Browser_.H
widget_browser.o: ../FL/Fl_Cairo.H
@@ -1283,6 +1321,7 @@ widget_browser.o: ../FL/fl_utf8.h
widget_browser.o: ../FL/Fl_Valuator.H
widget_browser.o: ../FL/Fl_Widget.H
widget_browser.o: ../FL/platform_types.h
widget_browser.o: code.h
widget_browser.o: fluid.h
widget_browser.o: Fl_Type.h
widget_browser.o: Fl_Widget_Type.h
@@ -1290,6 +1329,7 @@ widget_browser.o: pixmaps.h
widget_browser.o: widget_browser.h
widget_panel.o: ../FL/Enumerations.H
widget_panel.o: ../FL/Fl.H
widget_panel.o: ../FL/fl_attr.h
widget_panel.o: ../FL/Fl_Bitmap.H
widget_panel.o: ../FL/Fl_Box.H
widget_panel.o: ../FL/Fl_Button.H
@@ -1332,6 +1372,7 @@ widget_panel.o: ../FL/Fl_Value_Input.H
widget_panel.o: ../FL/Fl_Widget.H
widget_panel.o: ../FL/Fl_Window.H
widget_panel.o: ../FL/platform_types.h
widget_panel.o: code.h
widget_panel.o: CodeEditor.h
widget_panel.o: Fl_Type.h
widget_panel.o: Fl_Widget_Type.h

4
src/Fl.cxx
View File

@@ -258,7 +258,7 @@ int Fl::event_inside(const Fl_Widget *o) /*const*/ {
If you need more accurate, repeated timeouts, use Fl::repeat_timeout() to
reschedule the subsequent timeouts. Please see Fl::repeat_timeout() for
an example.
Since version 1.4, a timeout can be started from a child thread under the
condition that the call to Fl::add_timeout is wrapped in Fl::lock() and Fl::unlock().
@@ -2084,7 +2084,7 @@ int Fl::clipboard_contains(const char *type)
Under UNIX/Linux/macOS <I>any</I> file descriptor can be monitored (files,
devices, pipes, sockets, etc.). Due to limitations in Microsoft Windows,
Windows applications can only monitor sockets.
Under macOS, Fl::add_fd() opens the display if that's not been done before.
*/
void Fl::add_fd(int fd, int when, Fl_FD_Handler cb, void *d)

2
src/Fl_Anim_GIF_Image.cxx
View File

@@ -820,7 +820,7 @@ void Fl_Anim_GIF_Image::draw(int x, int y, int w, int h,
Fl_RGB_Image *rgb = fi_->frames[f].rgb;
if (rgb) {
float s = Fl_Graphics_Driver::default_driver().scale();
rgb->scale(s*fi_->frames[f].w, s*fi_->frames[f].h, 0, 1);
rgb->scale(s*fi_->frames[f].w, s*fi_->frames[f].h, 0, 1);
rgb->draw(x + s*fi_->frames[f].x, y + s*fi_->frames[f].y, w, h, cx, cy);
}
}

4
src/Fl_lock.cxx
View File

@@ -179,10 +179,10 @@ int Fl::awake(Fl_Awake_Handler func, void *data) {
argument will trigger event loop handling in the main thread. Since
it is not possible to call Fl::flush() from a subsidiary thread,
Fl::awake() is the best (and only, really) substitute.
It's \e not necessary to wrap calls to any form of Fl::awake() by Fl::lock() and Fl::unlock().
Nevertheless, the early, single call to Fl::lock() used to initialize threading support is necessary.
Function Fl::awake() in all its forms is typically called by worker threads, but it can be used safely
by the main thread too, as a means to break the event loop.

6
src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx
View File

@@ -996,7 +996,7 @@ static const char *get_prog_name() {
the source window and the display top. FLTK can later reposition the same tall popup,
without the constraint not to go beyond the display top, at the exact position so that
the desired series of menu items appear in the visible part of the tall popup.
In case 1) above, the values that represent the display bounds are given very
large values. That's done by member function Fl_Wayland_Window_Driver::menu_window_area().
Consequently, FLTK computes an initial layout of future popups relatively to
@@ -1010,7 +1010,7 @@ static const char *get_prog_name() {
process_menu_or_tooltip(), makeWindow() calls Fl_Window::wait_for_expose() so its constrained
position is known before computing the position of the next popup. This ensures each
popup is correctly placed relatively to its parent.
Groups of popups containing a menutitle, the associated menuwindow, and optionally
a submenu window and that don't belong to an Fl_Menu_Bar are mapped in a different order:
the menuwindow is mapped first, and the menutitle is mapped second above it as a child popup.
@@ -1019,7 +1019,7 @@ static const char *get_prog_name() {
the menutitle is mapped only after the menuwindow has been mapped, as a child of it.
This positions better the popup group in the display relatively to where the popup
was created.
In case 2) above, a tall popup is mapped with XDG_POSITIONER_CONSTRAINT_ADJUSTMENT_SLIDE_Y
which puts its top at the display top border. The Wayland system then calls the
popup_configure() callback function with the x,y coordinates of the top left corner

257
src/makedepend
View File

File diff suppressed because it is too large Load Diff

107
test/makedepend
View File

File diff suppressed because it is too large Load Diff

88
test/preferences.fl
View File

@@ -12,13 +12,13 @@ comment {About test/preferences:
The preferences app shows two features of FLTK and FLUID.
The Fl_Preferences class is used as a storage for user
settings between app launches. Fl_Preferences can store
settings between app launches. Fl_Preferences can store
small amounts of arbitrary data in an .ini file format
which can be retrieved again at the next app launch.
The FLUID setup uses GNU gettext for internationalisation
(i18n). FLUID finds the texts that need to be translated
and writes them into .po files that can be processed by
and writes them into .po files that can be processed by
the GNU gettext tools. FLUID produces source code that
will translate all text into the current locale when
generating the UI.
@@ -62,45 +62,45 @@ Function {gettext(const char *text)} {
for systems that don't have GNU libintl library.} open return_type {const char*}
} {
code {static const char* translation_table[][2] = {
{ "Alarm at:", "Wecken um:" },
{ "Bread:", "Brot:" },
{ "Breakfast:", "Frühstück:" },
{ "Cancel", "Abbrechen" },
{ "Drink:", "Getränk:" },
{ "English", "Englisch" },
{ "German", "Deutsch" },
{ "Get Up:", "Aufstehen:" },
{ "Language:", "Sprache:" },
{ "My Preferences", "Meine Vorlieben" },
{ "NY Times", "Der Spiegel" },
{ "Newspaper:", "Tageszeitung:" },
{ "OK", "OK" },
{ "Please restart the app to use your new language setting.",
"Bitte starten Sie die App erneut um Ihre Spracheinstellung zu nutzen." },
{ "Wear:", "Schuhwerk:" },
{ "a.m.", "früh" },
{ "bare foot", "barfuß" },
{ "brush teeth", "Zähne putzen" },
{ "coffee", "Kaffee" },
{ "eggs", "Eier" },
{ "flip flops", "Schlappen" },
{ "juice", "Saft" },
{ "left side", "linke Seite" },
{ "min.", "Min." },
{ "of the bed", "vom Bett" },
{ "p.m.", "spät" },
{ "right side", "rechte Seite" },
{ "rye", "Roggen" },
{ "sandals", "Sandalen" },
{ "shave", "rasieren" },
{ "shoes", "Schuhe" },
{ "shower", "duschen" },
{ "sourdough", "Sauerteig" },
{ "tea", "Tee" },
{ "wheat", "Weizen" },
{ "white", "Weißbrot" },
{ "with butter", "mit Butter" },
{ "with milk", "mit Milch" },
{ "Alarm at:", "Wecken um:" },
{ "Bread:", "Brot:" },
{ "Breakfast:", "Frühstück:" },
{ "Cancel", "Abbrechen" },
{ "Drink:", "Getränk:" },
{ "English", "Englisch" },
{ "German", "Deutsch" },
{ "Get Up:", "Aufstehen:" },
{ "Language:", "Sprache:" },
{ "My Preferences", "Meine Vorlieben" },
{ "NY Times", "Der Spiegel" },
{ "Newspaper:", "Tageszeitung:" },
{ "OK", "OK" },
{ "Please restart the app to use your new language setting.",
"Bitte starten Sie die App erneut um Ihre Spracheinstellung zu nutzen." },
{ "Wear:", "Schuhwerk:" },
{ "a.m.", "früh" },
{ "bare foot", "barfuß" },
{ "brush teeth", "Zähne putzen" },
{ "coffee", "Kaffee" },
{ "eggs", "Eier" },
{ "flip flops", "Schlappen" },
{ "juice", "Saft" },
{ "left side", "linke Seite" },
{ "min.", "Min." },
{ "of the bed", "vom Bett" },
{ "p.m.", "spät" },
{ "right side", "rechte Seite" },
{ "rye", "Roggen" },
{ "sandals", "Sandalen" },
{ "shave", "rasieren" },
{ "shoes", "Schuhe" },
{ "shower", "duschen" },
{ "sourdough", "Sauerteig" },
{ "tea", "Tee" },
{ "wheat", "Weizen" },
{ "white", "Weißbrot" },
{ "with butter", "mit Butter" },
{ "with milk", "mit Milch" },
};
int lang = g_language;
int i, n = 38;
@@ -113,7 +113,7 @@ for (i=0; i<n; i++) {
break;
}
}
if (found)
if (found)
return found;
else
return text;} {}
@@ -340,7 +340,7 @@ Fl_Preferences app( Fl_Preferences::USER_L, project, application );
} else {
printf("Location of Preferences user data directory not found.\\n");
}
wLanguage->value( g_language );
Fl_Preferences bed( app, "Bed" );
@@ -413,7 +413,7 @@ Function {writePrefs()} {open return_type void
code {Fl_Preferences app( Fl_Preferences::USER_L, project, application );
app.set( "language", wLanguage->value() );
Fl_Preferences bed( app, "Bed" );
bed.set( "alarm", wAlarm->value() );

2
test/tiled_image.cxx
View File

@@ -49,7 +49,7 @@ int arg(int argc, char **argv, int &i) {
int main(int argc, char **argv) {
int i = 1;
Fl::args(argc,argv,i,arg);
#ifdef FLTK_USE_X11
if (visid >= 0) {
fl_open_display();