perso
/
finalcut
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename fapp.{cpp,h} to fapplication.{cpp,h}

This commit is contained in:
Markus Gans 2017-08-24 00:47:35 +02:00
parent aad380ca6f
commit 3f8b9d774b
49 changed files with 240 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -39,6 +39,7 @@ test/input-dialog
test/choice test/choice
test/listbox test/listbox
test/listview test/listview
test/treeview
test/mandelbrot test/mandelbrot
test/keyboard test/keyboard
test/mouse test/mouse

5
.travis.yml
View File

@ -38,8 +38,3 @@ script:
sudo: required sudo: required
after_success:
- curl https://copilot.blackducksoftware.com/scripts/init/gradle -o bds_init.gradle
- ./gradlew --init-script bds_init.gradle buildBom -DbdsPluginVersion=5.0.2
- bash <(curl -s https://copilot.blackducksoftware.com/bash/travis) ./build/blackduck/*_bdio.jsonld

3
ChangeLog
View File

@ -1,3 +1,6 @@
2017-08-24 Markus Gans <guru.mail@muenster.de>
* Rename fapp.{cpp,h} to fapplication.{cpp,h}
2017-08-20 Markus Gans <guru.mail@muenster.de> 2017-08-20 Markus Gans <guru.mail@muenster.de>
* Screen characters got a union structure for a faster * Screen characters got a union structure for a faster
attribute compare operation attribute compare operation

4
src/Makefile.am
View File

@ -45,7 +45,7 @@ libfinal_la_SOURCES = \
foptiattr.cpp \ foptiattr.cpp \
foptimove.cpp \ foptimove.cpp \
ftermbuffer.cpp \ ftermbuffer.cpp \
fapp.cpp \ fapplication.cpp \
fwidget.cpp \ fwidget.cpp \
fobject.cpp fobject.cpp
@ -54,7 +54,7 @@ libfinal_la_LDFLAGS = -version-info @SO_VERSION@
finalcutincludedir = $(includedir)/final finalcutincludedir = $(includedir)/final
finalcutinclude_HEADERS = \ finalcutinclude_HEADERS = \
fapp.h \ fapplication.h \
fbutton.h \ fbutton.h \
fbuttongroup.h \ fbuttongroup.h \
fcharmap.h \ fcharmap.h \

4
src/Makefile.clang
View File

@ -8,7 +8,7 @@ MAJOR := $(shell echo ${VERSION} | cut -d. -f1)
LIBDIR = /usr/local/lib64 LIBDIR = /usr/local/lib64
INCLUDEDIR = /usr/local/include/final INCLUDEDIR = /usr/local/include/final
INCLUDE_HEADERS = \ INCLUDE_HEADERS = \
fapp.h \ fapplication.h \
fbuttongroup.h \ fbuttongroup.h \
fbutton.h \ fbutton.h \
fcheckbox.h \ fcheckbox.h \
@ -95,7 +95,7 @@ OBJS = \
foptiattr.o \ foptiattr.o \
foptimove.o \ foptimove.o \
ftermbuffer.o \ ftermbuffer.o \
fapp.o \ fapplication.o \
fwidget.o \ fwidget.o \
fobject.o fobject.o

4
src/Makefile.gcc
View File

@ -8,7 +8,7 @@ MAJOR := $(shell echo ${VERSION} | cut -d. -f1)
LIBDIR = /usr/local/lib64 LIBDIR = /usr/local/lib64
INCLUDEDIR = /usr/local/include/final INCLUDEDIR = /usr/local/include/final
INCLUDE_HEADERS = \ INCLUDE_HEADERS = \
fapp.h \ fapplication.h \
fbuttongroup.h \ fbuttongroup.h \
fbutton.h \ fbutton.h \
fcheckbox.h \ fcheckbox.h \
@ -95,7 +95,7 @@ OBJS = \
foptiattr.o \ foptiattr.o \
foptimove.o \ foptimove.o \
ftermbuffer.o \ ftermbuffer.o \
fapp.o \ fapplication.o \
fwidget.o \ fwidget.o \
fobject.o fobject.o

9
src/Makefile.in
View File

@ -136,7 +136,8 @@ am_libfinal_la_OBJECTS = fstring.lo fpoint.lo frect.lo fscrollbar.lo \
fmenulist.lo fdialog.lo fscrollview.lo fwindow.lo \ fmenulist.lo fdialog.lo fscrollview.lo fwindow.lo \
fmessagebox.lo ftooltip.lo ffiledialog.lo ftextview.lo \ fmessagebox.lo ftooltip.lo ffiledialog.lo ftextview.lo \
fstatusbar.lo fterm.lo fvterm.lo fevent.lo foptiattr.lo \ fstatusbar.lo fterm.lo fvterm.lo fevent.lo foptiattr.lo \
foptimove.lo ftermbuffer.lo fapp.lo fwidget.lo fobject.lo foptimove.lo ftermbuffer.lo fapplication.lo fwidget.lo \
fobject.lo
libfinal_la_OBJECTS = $(am_libfinal_la_OBJECTS) libfinal_la_OBJECTS = $(am_libfinal_la_OBJECTS)
AM_V_lt = $(am__v_lt_@AM_V@) AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@ -411,14 +412,14 @@ libfinal_la_SOURCES = \
foptiattr.cpp \ foptiattr.cpp \
foptimove.cpp \ foptimove.cpp \
ftermbuffer.cpp \ ftermbuffer.cpp \
fapp.cpp \ fapplication.cpp \
fwidget.cpp \ fwidget.cpp \
fobject.cpp fobject.cpp
libfinal_la_LDFLAGS = -version-info @SO_VERSION@ libfinal_la_LDFLAGS = -version-info @SO_VERSION@
finalcutincludedir = $(includedir)/final finalcutincludedir = $(includedir)/final
finalcutinclude_HEADERS = \ finalcutinclude_HEADERS = \
fapp.h \ fapplication.h \
fbutton.h \ fbutton.h \
fbuttongroup.h \ fbuttongroup.h \
fcharmap.h \ fcharmap.h \
@ -544,7 +545,7 @@ mostlyclean-compile:
distclean-compile: distclean-compile:
-rm -f *.tab.c -rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fapp.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fapplication.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fbutton.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fbutton.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fbuttongroup.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fbuttongroup.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fcheckbox.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fcheckbox.Plo@am__quote@

2
src/fapp.cpp → src/fapplication.cpp
View File

@ -1,7 +1,7 @@
// File: fapplication.cpp // File: fapplication.cpp
// Provides: class FApplication // Provides: class FApplication
#include "fapp.h" #include "fapplication.h"
#include "fmenu.h" #include "fmenu.h"
#include "fstatusbar.h" #include "fstatusbar.h"
#include "fwindow.h" #include "fwindow.h"

0
src/fapp.h → src/fapplication.h
View File

2
src/fbutton.cpp
View File

@ -1,7 +1,7 @@
// File: fbutton.cpp // File: fbutton.cpp
// Provides: class FButton // Provides: class FButton
#include "fapp.h" #include "fapplication.h"
#include "fbutton.h" #include "fbutton.h"
#include "fstatusbar.h" #include "fstatusbar.h"

2
src/fbuttongroup.cpp
View File

@ -1,7 +1,7 @@
// File: fbuttongroup.cpp // File: fbuttongroup.cpp
// Provides: class FButtonGroup // Provides: class FButtonGroup
#include "fapp.h" #include "fapplication.h"
#include "fbuttongroup.h" #include "fbuttongroup.h"
#include "fstatusbar.h" #include "fstatusbar.h"
#include "ftogglebutton.h" #include "ftogglebutton.h"

2
src/fdialog.cpp
View File

@ -1,7 +1,7 @@
// File: fdialog.cpp // File: fdialog.cpp
// Provides: class FDialog // Provides: class FDialog
#include "fapp.h" #include "fapplication.h"
#include "fdialog.h" #include "fdialog.h"
#include "fstatusbar.h" #include "fstatusbar.h"

2
src/final.h
View File

@ -3,7 +3,7 @@
#ifndef FINAL_H #ifndef FINAL_H
#define FINAL_H #define FINAL_H
#include "fapp.h" #include "fapplication.h"
#include "fbuttongroup.h" #include "fbuttongroup.h"
#include "fbutton.h" #include "fbutton.h"
#include "fcheckbox.h" #include "fcheckbox.h"

2
src/flabel.cpp
View File

@ -1,7 +1,7 @@
// File: flabel.cpp // File: flabel.cpp
// Provides: class FLabel // Provides: class FLabel
#include "fapp.h" #include "fapplication.h"
#include "flabel.h" #include "flabel.h"
#include "fstatusbar.h" #include "fstatusbar.h"

2
src/flineedit.cpp
View File

@ -1,7 +1,7 @@
// File: flineedit.cpp // File: flineedit.cpp
// Provides: class FLineEdit // Provides: class FLineEdit
#include "fapp.h" #include "fapplication.h"
#include "flineedit.h" #include "flineedit.h"
#include "fstatusbar.h" #include "fstatusbar.h"

2
src/flistbox.cpp
View File

@ -2,7 +2,7 @@
// Provides: class FListBoxItem // Provides: class FListBoxItem
// class FListBox // class FListBox
#include "fapp.h" #include "fapplication.h"
#include "flistbox.h" #include "flistbox.h"
#include "fscrollbar.h" #include "fscrollbar.h"
#include "fstatusbar.h" #include "fstatusbar.h"

2
src/flistview.cpp
View File

@ -2,7 +2,7 @@
// Provides: class FListViewItem // Provides: class FListViewItem
// class FListView // class FListView
#include "fapp.h" #include "fapplication.h"
#include "flistview.h" #include "flistview.h"
#include "fscrollbar.h" #include "fscrollbar.h"
#include "fstatusbar.h" #include "fstatusbar.h"

2
src/fmenu.cpp
View File

@ -1,7 +1,7 @@
// File: fmenu.cpp // File: fmenu.cpp
// Provides: class FMenu // Provides: class FMenu
#include "fapp.h" #include "fapplication.h"
#include "fdialog.h" #include "fdialog.h"
#include "fmenu.h" #include "fmenu.h"
#include "fstatusbar.h" #include "fstatusbar.h"

2
src/fmenubar.cpp
View File

@ -1,7 +1,7 @@
// File: fmenubar.cpp // File: fmenubar.cpp
// Provides: class FMenuBar // Provides: class FMenuBar
#include "fapp.h" #include "fapplication.h"
#include "fmenubar.h" #include "fmenubar.h"
#include "fstatusbar.h" #include "fstatusbar.h"

2
src/fmenuitem.cpp
View File

@ -1,7 +1,7 @@
// File: fmenuitem.cpp // File: fmenuitem.cpp
// Provides: class FMenuItem // Provides: class FMenuItem
#include "fapp.h" #include "fapplication.h"
#include "fdialog.h" #include "fdialog.h"
#include "fmenu.h" #include "fmenu.h"
#include "fmenubar.h" #include "fmenubar.h"

2
src/fmessagebox.cpp
View File

@ -1,7 +1,7 @@
// File: fmessagebox.cpp // File: fmessagebox.cpp
// Provides: class FMessageBox // Provides: class FMessageBox
#include "fapp.h" #include "fapplication.h"
#include "fmessagebox.h" #include "fmessagebox.h"

4
src/fobject.h
View File

@ -64,7 +64,7 @@ class FObject
virtual const char* getClassName() const; virtual const char* getClassName() const;
FObject* getParent() const; FObject* getParent() const;
FObject* getChild (int) const; FObject* getChild (int) const;
FObjectList getChildren() const; const FObjectList& getChildren() const;
int numOfChildren() const; int numOfChildren() const;
// Inquiries // Inquiries
@ -133,7 +133,7 @@ inline FObject* FObject::getParent() const
{ return parent_obj; } { return parent_obj; }
//---------------------------------------------------------------------- //----------------------------------------------------------------------
inline FObject::FObjectList FObject::getChildren() const inline const FObject::FObjectList& FObject::getChildren() const
{ return children_list; } { return children_list; }
//---------------------------------------------------------------------- //----------------------------------------------------------------------

2
src/fradiobutton.cpp
View File

@ -1,7 +1,7 @@
// File: fradiobutton.cpp // File: fradiobutton.cpp
// Provides: class FRadioButton // Provides: class FRadioButton
#include "fapp.h" #include "fapplication.h"
#include "fradiobutton.h" #include "fradiobutton.h"

6
src/ftextview.h
View File

@ -28,7 +28,7 @@
#ifndef FTEXTVIEW_H #ifndef FTEXTVIEW_H
#define FTEXTVIEW_H #define FTEXTVIEW_H
#include "fapp.h" #include "fapplication.h"
#include "fscrollbar.h" #include "fscrollbar.h"
#include "fstatusbar.h" #include "fstatusbar.h"
#include "fstring.h" #include "fstring.h"
@ -62,7 +62,7 @@ class FTextView : public FWidget
uInt getColumns() const; uInt getColumns() const;
uInt getRows() const; uInt getRows() const;
const FString getText() const; const FString getText() const;
stringLines getLines() const; const stringLines& getLines() const;
// Mutators // Mutators
void setGeometry (int, int, int, int, bool = true); void setGeometry (int, int, int, int, bool = true);
@ -134,7 +134,7 @@ inline uInt FTextView::getRows() const
{ return uInt(data.size()); } { return uInt(data.size()); }
//---------------------------------------------------------------------- //----------------------------------------------------------------------
inline FTextView::stringLines FTextView::getLines() const inline const FTextView::stringLines& FTextView::getLines() const
{ return data; } { return data; }
//---------------------------------------------------------------------- //----------------------------------------------------------------------

2
src/ftogglebutton.cpp
View File

@ -1,7 +1,7 @@
// File: ftogglebutton.cpp // File: ftogglebutton.cpp
// Provides: class FToggleButton // Provides: class FToggleButton
#include "fapp.h" #include "fapplication.h"
#include "fbuttongroup.h" #include "fbuttongroup.h"
#include "fstatusbar.h" #include "fstatusbar.h"
#include "ftogglebutton.h" #include "ftogglebutton.h"

2
src/ftooltip.cpp
View File

@ -1,7 +1,7 @@
// File: ftooltip.cpp // File: ftooltip.cpp
// Provides: class FToolTip // Provides: class FToolTip
#include "fapp.h" #include "fapplication.h"
#include "ftooltip.h" #include "ftooltip.h"

2
src/fvterm.cpp
View File

@ -1,7 +1,7 @@
// File: fvterm.cpp // File: fvterm.cpp
// Provides: class FVTerm // Provides: class FVTerm
#include "fapp.h" #include "fapplication.h"
#include "fvterm.h" #include "fvterm.h"
#include "fwidget.h" #include "fwidget.h"
#include "fwindow.h" #include "fwindow.h"

2
src/fwidget.cpp
View File

@ -1,7 +1,7 @@
// File: fwidget.cpp // File: fwidget.cpp
// Provides: class FWidget // Provides: class FWidget
#include "fapp.h" #include "fapplication.h"
#include "fmenubar.h" #include "fmenubar.h"
#include "fstatusbar.h" #include "fstatusbar.h"
#include "fwidget.h" #include "fwidget.h"

2
src/fwindow.cpp
View File

@ -1,7 +1,7 @@
// File: fwindow.cpp // File: fwindow.cpp
// Provides: class FWindow // Provides: class FWindow
#include "fapp.h" #include "fapplication.h"
#include "fmenubar.h" #include "fmenubar.h"
#include "fstatusbar.h" #include "fstatusbar.h"
#include "fwindow.h" #include "fwindow.h"

2
test/Makefile.am
View File

@ -12,6 +12,7 @@ noinst_PROGRAMS = \
choice \ choice \
listbox \ listbox \
listview \ listview \
treeview \
opti-move \ opti-move \
termcap \ termcap \
string-operations \ string-operations \
@ -34,6 +35,7 @@ input_dialog_SOURCES = input-dialog.cpp
choice_SOURCES = choice.cpp choice_SOURCES = choice.cpp
listbox_SOURCES = listbox.cpp listbox_SOURCES = listbox.cpp
listview_SOURCES = listview.cpp listview_SOURCES = listview.cpp
treeview_SOURCES = treeview.cpp
opti_move_SOURCES = opti-move.cpp opti_move_SOURCES = opti-move.cpp
string_operations_SOURCES = string-operations.cpp string_operations_SOURCES = string-operations.cpp
mandelbrot_SOURCES = mandelbrot.cpp mandelbrot_SOURCES = mandelbrot.cpp

27
test/Makefile.in
View File

@ -84,11 +84,12 @@ build_triplet = @build@
host_triplet = @host@ host_triplet = @host@
noinst_PROGRAMS = hello$(EXEEXT) dialog$(EXEEXT) input-dialog$(EXEEXT) \ noinst_PROGRAMS = hello$(EXEEXT) dialog$(EXEEXT) input-dialog$(EXEEXT) \
choice$(EXEEXT) listbox$(EXEEXT) listview$(EXEEXT) \ choice$(EXEEXT) listbox$(EXEEXT) listview$(EXEEXT) \
opti-move$(EXEEXT) termcap$(EXEEXT) string-operations$(EXEEXT) \ treeview$(EXEEXT) opti-move$(EXEEXT) termcap$(EXEEXT) \
mandelbrot$(EXEEXT) calculator$(EXEEXT) watch$(EXEEXT) \ string-operations$(EXEEXT) mandelbrot$(EXEEXT) \
term-attributes$(EXEEXT) transparent$(EXEEXT) \ calculator$(EXEEXT) watch$(EXEEXT) term-attributes$(EXEEXT) \
keyboard$(EXEEXT) mouse$(EXEEXT) timer$(EXEEXT) \ transparent$(EXEEXT) keyboard$(EXEEXT) mouse$(EXEEXT) \
scrollview$(EXEEXT) windows$(EXEEXT) menu$(EXEEXT) ui$(EXEEXT) timer$(EXEEXT) scrollview$(EXEEXT) windows$(EXEEXT) \
menu$(EXEEXT) ui$(EXEEXT)
subdir = test subdir = test
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/depcomp $(top_srcdir)/depcomp
@ -162,6 +163,9 @@ timer_LDADD = $(LDADD)
am_transparent_OBJECTS = transparent.$(OBJEXT) am_transparent_OBJECTS = transparent.$(OBJEXT)
transparent_OBJECTS = $(am_transparent_OBJECTS) transparent_OBJECTS = $(am_transparent_OBJECTS)
transparent_LDADD = $(LDADD) transparent_LDADD = $(LDADD)
am_treeview_OBJECTS = treeview.$(OBJEXT)
treeview_OBJECTS = $(am_treeview_OBJECTS)
treeview_LDADD = $(LDADD)
am_ui_OBJECTS = ui.$(OBJEXT) am_ui_OBJECTS = ui.$(OBJEXT)
ui_OBJECTS = $(am_ui_OBJECTS) ui_OBJECTS = $(am_ui_OBJECTS)
ui_LDADD = $(LDADD) ui_LDADD = $(LDADD)
@ -211,8 +215,8 @@ SOURCES = $(calculator_SOURCES) $(choice_SOURCES) $(dialog_SOURCES) \
$(menu_SOURCES) $(mouse_SOURCES) $(opti_move_SOURCES) \ $(menu_SOURCES) $(mouse_SOURCES) $(opti_move_SOURCES) \
$(scrollview_SOURCES) $(string_operations_SOURCES) \ $(scrollview_SOURCES) $(string_operations_SOURCES) \
$(term_attributes_SOURCES) $(termcap_SOURCES) $(timer_SOURCES) \ $(term_attributes_SOURCES) $(termcap_SOURCES) $(timer_SOURCES) \
$(transparent_SOURCES) $(ui_SOURCES) $(watch_SOURCES) \ $(transparent_SOURCES) $(treeview_SOURCES) $(ui_SOURCES) \
$(windows_SOURCES) $(watch_SOURCES) $(windows_SOURCES)
DIST_SOURCES = $(calculator_SOURCES) $(choice_SOURCES) \ DIST_SOURCES = $(calculator_SOURCES) $(choice_SOURCES) \
$(dialog_SOURCES) $(hello_SOURCES) $(input_dialog_SOURCES) \ $(dialog_SOURCES) $(hello_SOURCES) $(input_dialog_SOURCES) \
$(keyboard_SOURCES) $(listbox_SOURCES) $(listview_SOURCES) \ $(keyboard_SOURCES) $(listbox_SOURCES) $(listview_SOURCES) \
@ -220,7 +224,8 @@ DIST_SOURCES = $(calculator_SOURCES) $(choice_SOURCES) \
$(opti_move_SOURCES) $(scrollview_SOURCES) \ $(opti_move_SOURCES) $(scrollview_SOURCES) \
$(string_operations_SOURCES) $(term_attributes_SOURCES) \ $(string_operations_SOURCES) $(term_attributes_SOURCES) \
$(termcap_SOURCES) $(timer_SOURCES) $(transparent_SOURCES) \ $(termcap_SOURCES) $(timer_SOURCES) $(transparent_SOURCES) \
$(ui_SOURCES) $(watch_SOURCES) $(windows_SOURCES) $(treeview_SOURCES) $(ui_SOURCES) $(watch_SOURCES) \
$(windows_SOURCES)
am__can_run_installinfo = \ am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \ case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \ n|no|NO) false;; \
@ -376,6 +381,7 @@ input_dialog_SOURCES = input-dialog.cpp
choice_SOURCES = choice.cpp choice_SOURCES = choice.cpp
listbox_SOURCES = listbox.cpp listbox_SOURCES = listbox.cpp
listview_SOURCES = listview.cpp listview_SOURCES = listview.cpp
treeview_SOURCES = treeview.cpp
opti_move_SOURCES = opti-move.cpp opti_move_SOURCES = opti-move.cpp
string_operations_SOURCES = string-operations.cpp string_operations_SOURCES = string-operations.cpp
mandelbrot_SOURCES = mandelbrot.cpp mandelbrot_SOURCES = mandelbrot.cpp
@ -507,6 +513,10 @@ transparent$(EXEEXT): $(transparent_OBJECTS) $(transparent_DEPENDENCIES) $(EXTRA
@rm -f transparent$(EXEEXT) @rm -f transparent$(EXEEXT)
$(AM_V_CXXLD)$(CXXLINK) $(transparent_OBJECTS) $(transparent_LDADD) $(LIBS) $(AM_V_CXXLD)$(CXXLINK) $(transparent_OBJECTS) $(transparent_LDADD) $(LIBS)
treeview$(EXEEXT): $(treeview_OBJECTS) $(treeview_DEPENDENCIES) $(EXTRA_treeview_DEPENDENCIES)
@rm -f treeview$(EXEEXT)
$(AM_V_CXXLD)$(CXXLINK) $(treeview_OBJECTS) $(treeview_LDADD) $(LIBS)
ui$(EXEEXT): $(ui_OBJECTS) $(ui_DEPENDENCIES) $(EXTRA_ui_DEPENDENCIES) ui$(EXEEXT): $(ui_OBJECTS) $(ui_DEPENDENCIES) $(EXTRA_ui_DEPENDENCIES)
@rm -f ui$(EXEEXT) @rm -f ui$(EXEEXT)
$(AM_V_CXXLD)$(CXXLINK) $(ui_OBJECTS) $(ui_LDADD) $(LIBS) $(AM_V_CXXLD)$(CXXLINK) $(ui_OBJECTS) $(ui_LDADD) $(LIBS)
@ -543,6 +553,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/termcap.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/termcap.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/timer.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/timer.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/transparent.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/transparent.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/treeview.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ui.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ui.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/watch.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/watch.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/windows.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/windows.Po@am__quote@

2
test/calculator.cpp
View File

@ -10,7 +10,7 @@
#include <limits> #include <limits>
#include <stack> #include <stack>
#include "fapp.h" #include "fapplication.h"
#include "fdialog.h" #include "fdialog.h"
#include "fmessagebox.h" #include "fmessagebox.h"

2
test/choice.cpp
View File

@ -1,6 +1,6 @@
// File: os-choice.cpp // File: os-choice.cpp
#include "fapp.h" #include "fapplication.h"
#include "fbutton.h" #include "fbutton.h"
#include "fbuttongroup.h" #include "fbuttongroup.h"
#include "fdialog.h" #include "fdialog.h"

2
test/dialog.cpp
View File

@ -1,6 +1,6 @@
// File: dialog.cpp // File: dialog.cpp
#include "fapp.h" #include "fapplication.h"
#include "fbutton.h" #include "fbutton.h"
#include "fdialog.h" #include "fdialog.h"
#include "flabel.h" #include "flabel.h"

2
test/hello.cpp
View File

@ -1,6 +1,6 @@
// File: hello.cpp // File: hello.cpp
#include "fapp.h" #include "fapplication.h"
#include "fmessagebox.h" #include "fmessagebox.h"

2
test/input-dialog.cpp
View File

@ -1,6 +1,6 @@
// File: input-dialog.cpp // File: input-dialog.cpp
#include "fapp.h" #include "fapplication.h"
#include "fbutton.h" #include "fbutton.h"
#include "fbuttongroup.h" #include "fbuttongroup.h"
#include "fcheckbox.h" #include "fcheckbox.h"

2
test/listbox.cpp
View File

@ -3,7 +3,7 @@
#include <iostream> #include <iostream>
#include <fstream> #include <fstream>
#include "fapp.h" #include "fapplication.h"
#include "fdialog.h" #include "fdialog.h"
#include "flistbox.h" #include "flistbox.h"
#include "fmessagebox.h" #include "fmessagebox.h"

2
test/listview.cpp
View File

@ -3,7 +3,7 @@
#include <iostream> #include <iostream>
#include <fstream> #include <fstream>
#include "fapp.h" #include "fapplication.h"
#include "fdialog.h" #include "fdialog.h"
#include "flistview.h" #include "flistview.h"
#include "fmessagebox.h" #include "fmessagebox.h"

2
test/mandelbrot.cpp
View File

@ -1,6 +1,6 @@
// File: mandelbrot.cpp // File: mandelbrot.cpp
#include "fapp.h" #include "fapplication.h"
#include "fdialog.h" #include "fdialog.h"
#include "fmessagebox.h" #include "fmessagebox.h"

2
test/menu.cpp
View File

@ -1,6 +1,6 @@
// File: menu.cpp // File: menu.cpp
#include "fapp.h" #include "fapplication.h"
#include "fcheckmenuitem.h" #include "fcheckmenuitem.h"
#include "fdialog.h" #include "fdialog.h"
#include "flabel.h" #include "flabel.h"

2
test/mouse.cpp
View File

@ -1,6 +1,6 @@
// File: mouse.cpp // File: mouse.cpp
#include "fapp.h" #include "fapplication.h"
#include "fdialog.h" #include "fdialog.h"
#include "flabel.h" #include "flabel.h"
#include "fmessagebox.h" #include "fmessagebox.h"

2
test/opti-move.cpp
View File

@ -1,7 +1,7 @@
// File: opti-move.cpp // File: opti-move.cpp
#include <iomanip> #include <iomanip>
#include "fapp.h" #include "fapplication.h"
#include "fvterm.h" #include "fvterm.h"

2
test/scrollview.cpp
View File

@ -1,6 +1,6 @@
// File: scrollview.cpp // File: scrollview.cpp
#include "fapp.h" #include "fapplication.h"
#include "fbutton.h" #include "fbutton.h"
#include "fdialog.h" #include "fdialog.h"
#include "flabel.h" #include "flabel.h"

2
test/term-attributes.cpp
View File

@ -1,6 +1,6 @@
// File: term-attributes.cpp // File: term-attributes.cpp
#include "fapp.h" #include "fapplication.h"
#include "fbutton.h" #include "fbutton.h"
#include "fdialog.h" #include "fdialog.h"
#include "fmessagebox.h" #include "fmessagebox.h"

2
test/termcap.cpp
View File

@ -2,7 +2,7 @@
#include <iomanip> #include <iomanip>
#include <iostream> #include <iostream>
#include "fapp.h" #include "fapplication.h"
#include "ftermcap.h" #include "ftermcap.h"
#include "fvterm.h" #include "fvterm.h"

2
test/transparent.cpp
View File

@ -1,6 +1,6 @@
// File: transparent.cpp // File: transparent.cpp
#include "fapp.h" #include "fapplication.h"
#include "fdialog.h" #include "fdialog.h"
#include "flabel.h" #include "flabel.h"
#include "fmessagebox.h" #include "fmessagebox.h"

141
test/treeview.cpp Normal file
View File

@ -0,0 +1,141 @@
// File: treeview.cpp
#include <iostream>
#include <fstream>
#include "fapplication.h"
#include "fdialog.h"
#include "flistview.h"
#include "fmessagebox.h"
//----------------------------------------------------------------------
// class Treeview
//----------------------------------------------------------------------
#pragma pack(push)
#pragma pack(1)
class Treeview : public FDialog
{
public:
// Constructor
explicit Treeview (FWidget* = 0);
// Destructor
~Treeview();
private:
// Disable copy constructor
Treeview (const Treeview&);
// Disable assignment operator (=)
Treeview& operator = (const Treeview&);
// Event handlers
void onClose (FCloseEvent*);
// Callback methods
void cb_exitApp (FWidget*, data_ptr);
};
#pragma pack(pop)
//----------------------------------------------------------------------
Treeview::Treeview (FWidget* parent)
: FDialog(parent)
{
// Create FListView object
FListView* listView = new FListView (this);
listView->setGeometry(2, 1, 33, 14);
// Add columns to the view
listView->addColumn ("Name");
listView->addColumn ("Population");
listView->addColumn ("Density/km²");
// Set right alignment for the second and third column
listView->setColumnAlignment (2, fc::alignRight);
listView->setColumnAlignment (3, fc::alignRight);
// Populate FListView with a list of items
std::string continent[][3] =
{
{ "Africa", "944,000,000", "31.2" },
{ "Asia", "4,010,000,000", "90.3" },
{ "Europe", "733,000,000", "69.9" },
{ "North America", "523,000,000", "21" },
{ "South America", "381,000,000", "21.4" },
{ "Antarctica", "1000", "0" },
{ "Australia/Oceania", "34,000,000", "4" }
};
const int lastItem = int(sizeof(continent) / sizeof(continent[0])) - 1;
for (int i=0; i <= lastItem; i++)
{
std::vector<FString> line (&continent[i][0], &continent[i][0] + 3);
listView->insert (line);
}
// Quit button
FButton* Quit = new FButton (this);
Quit->setGeometry(24, 16, 10, 1);
Quit->setText (L"&Quit");
// Add some function callbacks
Quit->addCallback
(
"clicked",
F_METHOD_CALLBACK (this, &Treeview::cb_exitApp)
);
}
//----------------------------------------------------------------------
Treeview::~Treeview()
{ }
//----------------------------------------------------------------------
void Treeview::onClose (FCloseEvent* ev)
{
int ret = FMessageBox::info ( this, "Quit"
, "Do you really want\n"
"to quit the program ?"
, FMessageBox::Yes
, FMessageBox::No );
if ( ret == FMessageBox::Yes )
ev->accept();
else
ev->ignore();
}
//----------------------------------------------------------------------
void Treeview::cb_exitApp (FWidget*, data_ptr)
{
close();
}
//----------------------------------------------------------------------
// main part
//----------------------------------------------------------------------
int main (int argc, char* argv[])
{
if ( argv[1] && ( std::strcmp(argv[1], "--help") == 0
|| std::strcmp(argv[1], "-h") == 0 ) )
{
std::cout << "Generic options:" << std::endl
<< " -h, --help "
<< "Display this help and exit" << std::endl;
FApplication::print_cmd_Options();
std::exit(EXIT_SUCCESS);
}
FApplication app(argc, argv);
Treeview d(&app);
d.setText (L"Continents");
d.setGeometry (int(1 + (app.getWidth() - 37) / 2), 3, 37, 20);
d.setShadow();
app.setMainWidget(&d);
d.show();
return app.exec();
}

2
test/watch.cpp
View File

@ -2,7 +2,7 @@
#include <ctime> #include <ctime>
#include "fapp.h" #include "fapplication.h"
#include "flabel.h" #include "flabel.h"
#include "fdialog.h" #include "fdialog.h"
#include "fmessagebox.h" #include "fmessagebox.h"

2
test/windows.cpp
View File

@ -1,6 +1,6 @@
// File: windows.cpp // File: windows.cpp
#include "fapp.h" #include "fapplication.h"
#include "fdialog.h" #include "fdialog.h"
#include "fdialoglistmenu.h" #include "fdialoglistmenu.h"
#include "flabel.h" #include "flabel.h"