From 3f8b9d774b2dc7cbac7e743fc689fc2f30a568bf Mon Sep 17 00:00:00 2001 From: Markus Gans Date: Thu, 24 Aug 2017 00:47:35 +0200 Subject: [PATCH] Rename fapp.{cpp,h} to fapplication.{cpp,h} --- .gitignore | 1 + .travis.yml | 5 - ChangeLog | 3 + src/Makefile.am | 4 +- src/Makefile.clang | 4 +- src/Makefile.gcc | 4 +- src/Makefile.in | 9 +- src/{fapp.cpp => fapplication.cpp} | 2 +- src/{fapp.h => fapplication.h} | 0 src/fbutton.cpp | 2 +- src/fbuttongroup.cpp | 2 +- src/fdialog.cpp | 2 +- src/final.h | 2 +- src/flabel.cpp | 2 +- src/flineedit.cpp | 2 +- src/flistbox.cpp | 2 +- src/flistview.cpp | 2 +- src/fmenu.cpp | 2 +- src/fmenubar.cpp | 2 +- src/fmenuitem.cpp | 2 +- src/fmessagebox.cpp | 2 +- src/fobject.h | 4 +- src/fradiobutton.cpp | 2 +- src/ftextview.h | 50 +++++----- src/ftogglebutton.cpp | 2 +- src/ftooltip.cpp | 2 +- src/fvterm.cpp | 2 +- src/fwidget.cpp | 2 +- src/fwindow.cpp | 2 +- test/Makefile.am | 2 + test/Makefile.in | 27 ++++-- test/calculator.cpp | 2 +- test/choice.cpp | 2 +- test/dialog.cpp | 2 +- test/hello.cpp | 2 +- test/input-dialog.cpp | 2 +- test/listbox.cpp | 2 +- test/listview.cpp | 2 +- test/mandelbrot.cpp | 2 +- test/menu.cpp | 2 +- test/mouse.cpp | 2 +- test/opti-move.cpp | 2 +- test/scrollview.cpp | 2 +- test/term-attributes.cpp | 2 +- test/termcap.cpp | 2 +- test/transparent.cpp | 2 +- test/treeview.cpp | 141 +++++++++++++++++++++++++++++ test/watch.cpp | 2 +- test/windows.cpp | 2 +- 49 files changed, 240 insertions(+), 86 deletions(-) rename src/{fapp.cpp => fapplication.cpp} (99%) rename src/{fapp.h => fapplication.h} (100%) create mode 100644 test/treeview.cpp diff --git a/.gitignore b/.gitignore index 92d6149a..fad926d0 100644 --- a/.gitignore +++ b/.gitignore @@ -39,6 +39,7 @@ test/input-dialog test/choice test/listbox test/listview +test/treeview test/mandelbrot test/keyboard test/mouse diff --git a/.travis.yml b/.travis.yml index 83d96fd2..6a5d1fb2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,8 +38,3 @@ script: 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 - diff --git a/ChangeLog b/ChangeLog index 99e110dc..45459fe6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2017-08-24 Markus Gans + * Rename fapp.{cpp,h} to fapplication.{cpp,h} + 2017-08-20 Markus Gans * Screen characters got a union structure for a faster attribute compare operation diff --git a/src/Makefile.am b/src/Makefile.am index 10dd7ee8..4804a6f8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -45,7 +45,7 @@ libfinal_la_SOURCES = \ foptiattr.cpp \ foptimove.cpp \ ftermbuffer.cpp \ - fapp.cpp \ + fapplication.cpp \ fwidget.cpp \ fobject.cpp @@ -54,7 +54,7 @@ libfinal_la_LDFLAGS = -version-info @SO_VERSION@ finalcutincludedir = $(includedir)/final finalcutinclude_HEADERS = \ - fapp.h \ + fapplication.h \ fbutton.h \ fbuttongroup.h \ fcharmap.h \ diff --git a/src/Makefile.clang b/src/Makefile.clang index aa97f97f..ef1d1671 100644 --- a/src/Makefile.clang +++ b/src/Makefile.clang @@ -8,7 +8,7 @@ MAJOR := $(shell echo ${VERSION} | cut -d. -f1) LIBDIR = /usr/local/lib64 INCLUDEDIR = /usr/local/include/final INCLUDE_HEADERS = \ - fapp.h \ + fapplication.h \ fbuttongroup.h \ fbutton.h \ fcheckbox.h \ @@ -95,7 +95,7 @@ OBJS = \ foptiattr.o \ foptimove.o \ ftermbuffer.o \ - fapp.o \ + fapplication.o \ fwidget.o \ fobject.o diff --git a/src/Makefile.gcc b/src/Makefile.gcc index 533cb6de..e512655c 100644 --- a/src/Makefile.gcc +++ b/src/Makefile.gcc @@ -8,7 +8,7 @@ MAJOR := $(shell echo ${VERSION} | cut -d. -f1) LIBDIR = /usr/local/lib64 INCLUDEDIR = /usr/local/include/final INCLUDE_HEADERS = \ - fapp.h \ + fapplication.h \ fbuttongroup.h \ fbutton.h \ fcheckbox.h \ @@ -95,7 +95,7 @@ OBJS = \ foptiattr.o \ foptimove.o \ ftermbuffer.o \ - fapp.o \ + fapplication.o \ fwidget.o \ fobject.o diff --git a/src/Makefile.in b/src/Makefile.in index ad384d4a..2a6cd8b1 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -136,7 +136,8 @@ am_libfinal_la_OBJECTS = fstring.lo fpoint.lo frect.lo fscrollbar.lo \ fmenulist.lo fdialog.lo fscrollview.lo fwindow.lo \ fmessagebox.lo ftooltip.lo ffiledialog.lo ftextview.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) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) @@ -411,14 +412,14 @@ libfinal_la_SOURCES = \ foptiattr.cpp \ foptimove.cpp \ ftermbuffer.cpp \ - fapp.cpp \ + fapplication.cpp \ fwidget.cpp \ fobject.cpp libfinal_la_LDFLAGS = -version-info @SO_VERSION@ finalcutincludedir = $(includedir)/final finalcutinclude_HEADERS = \ - fapp.h \ + fapplication.h \ fbutton.h \ fbuttongroup.h \ fcharmap.h \ @@ -544,7 +545,7 @@ mostlyclean-compile: distclean-compile: -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)/fbuttongroup.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fcheckbox.Plo@am__quote@ diff --git a/src/fapp.cpp b/src/fapplication.cpp similarity index 99% rename from src/fapp.cpp rename to src/fapplication.cpp index e1db28f4..9a14c1a9 100644 --- a/src/fapp.cpp +++ b/src/fapplication.cpp @@ -1,7 +1,7 @@ // File: fapplication.cpp // Provides: class FApplication -#include "fapp.h" +#include "fapplication.h" #include "fmenu.h" #include "fstatusbar.h" #include "fwindow.h" diff --git a/src/fapp.h b/src/fapplication.h similarity index 100% rename from src/fapp.h rename to src/fapplication.h diff --git a/src/fbutton.cpp b/src/fbutton.cpp index b723581e..6e4a43e1 100644 --- a/src/fbutton.cpp +++ b/src/fbutton.cpp @@ -1,7 +1,7 @@ // File: fbutton.cpp // Provides: class FButton -#include "fapp.h" +#include "fapplication.h" #include "fbutton.h" #include "fstatusbar.h" diff --git a/src/fbuttongroup.cpp b/src/fbuttongroup.cpp index f19324d8..3dc70ace 100644 --- a/src/fbuttongroup.cpp +++ b/src/fbuttongroup.cpp @@ -1,7 +1,7 @@ // File: fbuttongroup.cpp // Provides: class FButtonGroup -#include "fapp.h" +#include "fapplication.h" #include "fbuttongroup.h" #include "fstatusbar.h" #include "ftogglebutton.h" diff --git a/src/fdialog.cpp b/src/fdialog.cpp index 05af75f6..6c7ab971 100644 --- a/src/fdialog.cpp +++ b/src/fdialog.cpp @@ -1,7 +1,7 @@ // File: fdialog.cpp // Provides: class FDialog -#include "fapp.h" +#include "fapplication.h" #include "fdialog.h" #include "fstatusbar.h" diff --git a/src/final.h b/src/final.h index 3f4f58f0..62ea44f1 100644 --- a/src/final.h +++ b/src/final.h @@ -3,7 +3,7 @@ #ifndef FINAL_H #define FINAL_H -#include "fapp.h" +#include "fapplication.h" #include "fbuttongroup.h" #include "fbutton.h" #include "fcheckbox.h" diff --git a/src/flabel.cpp b/src/flabel.cpp index 018fa38e..909fa9a5 100644 --- a/src/flabel.cpp +++ b/src/flabel.cpp @@ -1,7 +1,7 @@ // File: flabel.cpp // Provides: class FLabel -#include "fapp.h" +#include "fapplication.h" #include "flabel.h" #include "fstatusbar.h" diff --git a/src/flineedit.cpp b/src/flineedit.cpp index fef778f7..778c93ef 100644 --- a/src/flineedit.cpp +++ b/src/flineedit.cpp @@ -1,7 +1,7 @@ // File: flineedit.cpp // Provides: class FLineEdit -#include "fapp.h" +#include "fapplication.h" #include "flineedit.h" #include "fstatusbar.h" diff --git a/src/flistbox.cpp b/src/flistbox.cpp index 3a414fde..f0ddb0c0 100644 --- a/src/flistbox.cpp +++ b/src/flistbox.cpp @@ -2,7 +2,7 @@ // Provides: class FListBoxItem // class FListBox -#include "fapp.h" +#include "fapplication.h" #include "flistbox.h" #include "fscrollbar.h" #include "fstatusbar.h" diff --git a/src/flistview.cpp b/src/flistview.cpp index a90a5cbc..69f9572b 100644 --- a/src/flistview.cpp +++ b/src/flistview.cpp @@ -2,7 +2,7 @@ // Provides: class FListViewItem // class FListView -#include "fapp.h" +#include "fapplication.h" #include "flistview.h" #include "fscrollbar.h" #include "fstatusbar.h" diff --git a/src/fmenu.cpp b/src/fmenu.cpp index 48322287..26bdc452 100644 --- a/src/fmenu.cpp +++ b/src/fmenu.cpp @@ -1,7 +1,7 @@ // File: fmenu.cpp // Provides: class FMenu -#include "fapp.h" +#include "fapplication.h" #include "fdialog.h" #include "fmenu.h" #include "fstatusbar.h" diff --git a/src/fmenubar.cpp b/src/fmenubar.cpp index 0e7ec753..9843655e 100644 --- a/src/fmenubar.cpp +++ b/src/fmenubar.cpp @@ -1,7 +1,7 @@ // File: fmenubar.cpp // Provides: class FMenuBar -#include "fapp.h" +#include "fapplication.h" #include "fmenubar.h" #include "fstatusbar.h" diff --git a/src/fmenuitem.cpp b/src/fmenuitem.cpp index 5d1c4c3c..628ebd1e 100644 --- a/src/fmenuitem.cpp +++ b/src/fmenuitem.cpp @@ -1,7 +1,7 @@ // File: fmenuitem.cpp // Provides: class FMenuItem -#include "fapp.h" +#include "fapplication.h" #include "fdialog.h" #include "fmenu.h" #include "fmenubar.h" diff --git a/src/fmessagebox.cpp b/src/fmessagebox.cpp index 7da6cb82..f3b0397f 100644 --- a/src/fmessagebox.cpp +++ b/src/fmessagebox.cpp @@ -1,7 +1,7 @@ // File: fmessagebox.cpp // Provides: class FMessageBox -#include "fapp.h" +#include "fapplication.h" #include "fmessagebox.h" diff --git a/src/fobject.h b/src/fobject.h index cb5f6b71..b3d92195 100644 --- a/src/fobject.h +++ b/src/fobject.h @@ -64,7 +64,7 @@ class FObject virtual const char* getClassName() const; FObject* getParent() const; FObject* getChild (int) const; - FObjectList getChildren() const; + const FObjectList& getChildren() const; int numOfChildren() const; // Inquiries @@ -133,7 +133,7 @@ inline FObject* FObject::getParent() const { return parent_obj; } //---------------------------------------------------------------------- -inline FObject::FObjectList FObject::getChildren() const +inline const FObject::FObjectList& FObject::getChildren() const { return children_list; } //---------------------------------------------------------------------- diff --git a/src/fradiobutton.cpp b/src/fradiobutton.cpp index afcd031e..ca151e19 100644 --- a/src/fradiobutton.cpp +++ b/src/fradiobutton.cpp @@ -1,7 +1,7 @@ // File: fradiobutton.cpp // Provides: class FRadioButton -#include "fapp.h" +#include "fapplication.h" #include "fradiobutton.h" diff --git a/src/ftextview.h b/src/ftextview.h index 5302eb39..e8599236 100644 --- a/src/ftextview.h +++ b/src/ftextview.h @@ -28,7 +28,7 @@ #ifndef FTEXTVIEW_H #define FTEXTVIEW_H -#include "fapp.h" +#include "fapplication.h" #include "fscrollbar.h" #include "fstatusbar.h" #include "fstring.h" @@ -58,38 +58,38 @@ class FTextView : public FWidget ~FTextView(); // Accessors - const char* getClassName() const; - uInt getColumns() const; - uInt getRows() const; - const FString getText() const; - stringLines getLines() const; + const char* getClassName() const; + uInt getColumns() const; + uInt getRows() const; + const FString getText() const; + const stringLines& getLines() const; // Mutators - void setGeometry (int, int, int, int, bool = true); - void setPosition (int); - void setText (const FString&); + void setGeometry (int, int, int, int, bool = true); + void setPosition (int); + void setText (const FString&); // Methods - void hide(); - void append (const FString&); - void insert (const FString&, int); - void replaceRange (const FString&, int, int); - void deleteRange (int, int); - void deleteLine (int); - void clear(); + void hide(); + void append (const FString&); + void insert (const FString&, int); + void replaceRange (const FString&, int, int); + void deleteRange (int, int); + void deleteLine (int); + void clear(); // Event handlers - void onKeyPress (FKeyEvent*); - void onMouseDown (FMouseEvent*); - void onMouseUp (FMouseEvent*); - void onMouseMove (FMouseEvent*); - void onWheel (FWheelEvent*); - void onFocusIn (FFocusEvent*); - void onFocusOut (FFocusEvent*); + void onKeyPress (FKeyEvent*); + void onMouseDown (FMouseEvent*); + void onMouseUp (FMouseEvent*); + void onMouseMove (FMouseEvent*); + void onWheel (FWheelEvent*); + void onFocusIn (FFocusEvent*); + void onFocusOut (FFocusEvent*); protected: // Method - void adjustSize(); + void adjustSize(); private: // Disable copy constructor @@ -134,7 +134,7 @@ inline uInt FTextView::getRows() const { return uInt(data.size()); } //---------------------------------------------------------------------- -inline FTextView::stringLines FTextView::getLines() const +inline const FTextView::stringLines& FTextView::getLines() const { return data; } //---------------------------------------------------------------------- diff --git a/src/ftogglebutton.cpp b/src/ftogglebutton.cpp index 12fd4bd8..8754c118 100644 --- a/src/ftogglebutton.cpp +++ b/src/ftogglebutton.cpp @@ -1,7 +1,7 @@ // File: ftogglebutton.cpp // Provides: class FToggleButton -#include "fapp.h" +#include "fapplication.h" #include "fbuttongroup.h" #include "fstatusbar.h" #include "ftogglebutton.h" diff --git a/src/ftooltip.cpp b/src/ftooltip.cpp index 4fbeffbf..b00731db 100644 --- a/src/ftooltip.cpp +++ b/src/ftooltip.cpp @@ -1,7 +1,7 @@ // File: ftooltip.cpp // Provides: class FToolTip -#include "fapp.h" +#include "fapplication.h" #include "ftooltip.h" diff --git a/src/fvterm.cpp b/src/fvterm.cpp index 751885ec..5d3d3c56 100644 --- a/src/fvterm.cpp +++ b/src/fvterm.cpp @@ -1,7 +1,7 @@ // File: fvterm.cpp // Provides: class FVTerm -#include "fapp.h" +#include "fapplication.h" #include "fvterm.h" #include "fwidget.h" #include "fwindow.h" diff --git a/src/fwidget.cpp b/src/fwidget.cpp index b28da6fe..ce385236 100644 --- a/src/fwidget.cpp +++ b/src/fwidget.cpp @@ -1,7 +1,7 @@ // File: fwidget.cpp // Provides: class FWidget -#include "fapp.h" +#include "fapplication.h" #include "fmenubar.h" #include "fstatusbar.h" #include "fwidget.h" diff --git a/src/fwindow.cpp b/src/fwindow.cpp index a9844f1d..72c8faa8 100644 --- a/src/fwindow.cpp +++ b/src/fwindow.cpp @@ -1,7 +1,7 @@ // File: fwindow.cpp // Provides: class FWindow -#include "fapp.h" +#include "fapplication.h" #include "fmenubar.h" #include "fstatusbar.h" #include "fwindow.h" diff --git a/test/Makefile.am b/test/Makefile.am index a6410bcd..c9f9d428 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -12,6 +12,7 @@ noinst_PROGRAMS = \ choice \ listbox \ listview \ + treeview \ opti-move \ termcap \ string-operations \ @@ -34,6 +35,7 @@ input_dialog_SOURCES = input-dialog.cpp choice_SOURCES = choice.cpp listbox_SOURCES = listbox.cpp listview_SOURCES = listview.cpp +treeview_SOURCES = treeview.cpp opti_move_SOURCES = opti-move.cpp string_operations_SOURCES = string-operations.cpp mandelbrot_SOURCES = mandelbrot.cpp diff --git a/test/Makefile.in b/test/Makefile.in index 993fd2b0..e4e82082 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -84,11 +84,12 @@ build_triplet = @build@ host_triplet = @host@ noinst_PROGRAMS = hello$(EXEEXT) dialog$(EXEEXT) input-dialog$(EXEEXT) \ choice$(EXEEXT) listbox$(EXEEXT) listview$(EXEEXT) \ - opti-move$(EXEEXT) termcap$(EXEEXT) string-operations$(EXEEXT) \ - mandelbrot$(EXEEXT) calculator$(EXEEXT) watch$(EXEEXT) \ - term-attributes$(EXEEXT) transparent$(EXEEXT) \ - keyboard$(EXEEXT) mouse$(EXEEXT) timer$(EXEEXT) \ - scrollview$(EXEEXT) windows$(EXEEXT) menu$(EXEEXT) ui$(EXEEXT) + treeview$(EXEEXT) opti-move$(EXEEXT) termcap$(EXEEXT) \ + string-operations$(EXEEXT) mandelbrot$(EXEEXT) \ + calculator$(EXEEXT) watch$(EXEEXT) term-attributes$(EXEEXT) \ + transparent$(EXEEXT) keyboard$(EXEEXT) mouse$(EXEEXT) \ + timer$(EXEEXT) scrollview$(EXEEXT) windows$(EXEEXT) \ + menu$(EXEEXT) ui$(EXEEXT) subdir = test DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/depcomp @@ -162,6 +163,9 @@ timer_LDADD = $(LDADD) am_transparent_OBJECTS = transparent.$(OBJEXT) transparent_OBJECTS = $(am_transparent_OBJECTS) transparent_LDADD = $(LDADD) +am_treeview_OBJECTS = treeview.$(OBJEXT) +treeview_OBJECTS = $(am_treeview_OBJECTS) +treeview_LDADD = $(LDADD) am_ui_OBJECTS = ui.$(OBJEXT) ui_OBJECTS = $(am_ui_OBJECTS) ui_LDADD = $(LDADD) @@ -211,8 +215,8 @@ SOURCES = $(calculator_SOURCES) $(choice_SOURCES) $(dialog_SOURCES) \ $(menu_SOURCES) $(mouse_SOURCES) $(opti_move_SOURCES) \ $(scrollview_SOURCES) $(string_operations_SOURCES) \ $(term_attributes_SOURCES) $(termcap_SOURCES) $(timer_SOURCES) \ - $(transparent_SOURCES) $(ui_SOURCES) $(watch_SOURCES) \ - $(windows_SOURCES) + $(transparent_SOURCES) $(treeview_SOURCES) $(ui_SOURCES) \ + $(watch_SOURCES) $(windows_SOURCES) DIST_SOURCES = $(calculator_SOURCES) $(choice_SOURCES) \ $(dialog_SOURCES) $(hello_SOURCES) $(input_dialog_SOURCES) \ $(keyboard_SOURCES) $(listbox_SOURCES) $(listview_SOURCES) \ @@ -220,7 +224,8 @@ DIST_SOURCES = $(calculator_SOURCES) $(choice_SOURCES) \ $(opti_move_SOURCES) $(scrollview_SOURCES) \ $(string_operations_SOURCES) $(term_attributes_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 = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -376,6 +381,7 @@ input_dialog_SOURCES = input-dialog.cpp choice_SOURCES = choice.cpp listbox_SOURCES = listbox.cpp listview_SOURCES = listview.cpp +treeview_SOURCES = treeview.cpp opti_move_SOURCES = opti-move.cpp string_operations_SOURCES = string-operations.cpp mandelbrot_SOURCES = mandelbrot.cpp @@ -507,6 +513,10 @@ transparent$(EXEEXT): $(transparent_OBJECTS) $(transparent_DEPENDENCIES) $(EXTRA @rm -f transparent$(EXEEXT) $(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) @rm -f ui$(EXEEXT) $(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)/timer.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)/watch.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/windows.Po@am__quote@ diff --git a/test/calculator.cpp b/test/calculator.cpp index cf9ccdd5..c2b1c2d0 100644 --- a/test/calculator.cpp +++ b/test/calculator.cpp @@ -10,7 +10,7 @@ #include #include -#include "fapp.h" +#include "fapplication.h" #include "fdialog.h" #include "fmessagebox.h" diff --git a/test/choice.cpp b/test/choice.cpp index 0152766f..88c234f8 100644 --- a/test/choice.cpp +++ b/test/choice.cpp @@ -1,6 +1,6 @@ // File: os-choice.cpp -#include "fapp.h" +#include "fapplication.h" #include "fbutton.h" #include "fbuttongroup.h" #include "fdialog.h" diff --git a/test/dialog.cpp b/test/dialog.cpp index 99237f47..268b17b7 100644 --- a/test/dialog.cpp +++ b/test/dialog.cpp @@ -1,6 +1,6 @@ // File: dialog.cpp -#include "fapp.h" +#include "fapplication.h" #include "fbutton.h" #include "fdialog.h" #include "flabel.h" diff --git a/test/hello.cpp b/test/hello.cpp index 2e5cc097..dd15e583 100644 --- a/test/hello.cpp +++ b/test/hello.cpp @@ -1,6 +1,6 @@ // File: hello.cpp -#include "fapp.h" +#include "fapplication.h" #include "fmessagebox.h" diff --git a/test/input-dialog.cpp b/test/input-dialog.cpp index ed74c76f..466908b9 100644 --- a/test/input-dialog.cpp +++ b/test/input-dialog.cpp @@ -1,6 +1,6 @@ // File: input-dialog.cpp -#include "fapp.h" +#include "fapplication.h" #include "fbutton.h" #include "fbuttongroup.h" #include "fcheckbox.h" diff --git a/test/listbox.cpp b/test/listbox.cpp index ae54a70d..1cdaf404 100644 --- a/test/listbox.cpp +++ b/test/listbox.cpp @@ -3,7 +3,7 @@ #include #include -#include "fapp.h" +#include "fapplication.h" #include "fdialog.h" #include "flistbox.h" #include "fmessagebox.h" diff --git a/test/listview.cpp b/test/listview.cpp index 9c46351b..ad5e2325 100644 --- a/test/listview.cpp +++ b/test/listview.cpp @@ -3,7 +3,7 @@ #include #include -#include "fapp.h" +#include "fapplication.h" #include "fdialog.h" #include "flistview.h" #include "fmessagebox.h" diff --git a/test/mandelbrot.cpp b/test/mandelbrot.cpp index c684b5bb..76b5a781 100644 --- a/test/mandelbrot.cpp +++ b/test/mandelbrot.cpp @@ -1,6 +1,6 @@ // File: mandelbrot.cpp -#include "fapp.h" +#include "fapplication.h" #include "fdialog.h" #include "fmessagebox.h" diff --git a/test/menu.cpp b/test/menu.cpp index a30538ba..06310ed9 100644 --- a/test/menu.cpp +++ b/test/menu.cpp @@ -1,6 +1,6 @@ // File: menu.cpp -#include "fapp.h" +#include "fapplication.h" #include "fcheckmenuitem.h" #include "fdialog.h" #include "flabel.h" diff --git a/test/mouse.cpp b/test/mouse.cpp index fe69127b..87190a23 100644 --- a/test/mouse.cpp +++ b/test/mouse.cpp @@ -1,6 +1,6 @@ // File: mouse.cpp -#include "fapp.h" +#include "fapplication.h" #include "fdialog.h" #include "flabel.h" #include "fmessagebox.h" diff --git a/test/opti-move.cpp b/test/opti-move.cpp index 498c659b..b3da3819 100644 --- a/test/opti-move.cpp +++ b/test/opti-move.cpp @@ -1,7 +1,7 @@ // File: opti-move.cpp #include -#include "fapp.h" +#include "fapplication.h" #include "fvterm.h" diff --git a/test/scrollview.cpp b/test/scrollview.cpp index 474b83be..dc88f3ca 100644 --- a/test/scrollview.cpp +++ b/test/scrollview.cpp @@ -1,6 +1,6 @@ // File: scrollview.cpp -#include "fapp.h" +#include "fapplication.h" #include "fbutton.h" #include "fdialog.h" #include "flabel.h" diff --git a/test/term-attributes.cpp b/test/term-attributes.cpp index fc4fcdf2..e55469cd 100644 --- a/test/term-attributes.cpp +++ b/test/term-attributes.cpp @@ -1,6 +1,6 @@ // File: term-attributes.cpp -#include "fapp.h" +#include "fapplication.h" #include "fbutton.h" #include "fdialog.h" #include "fmessagebox.h" diff --git a/test/termcap.cpp b/test/termcap.cpp index 913f39e2..33b76ada 100644 --- a/test/termcap.cpp +++ b/test/termcap.cpp @@ -2,7 +2,7 @@ #include #include -#include "fapp.h" +#include "fapplication.h" #include "ftermcap.h" #include "fvterm.h" diff --git a/test/transparent.cpp b/test/transparent.cpp index a4b1087f..0aa3c08d 100644 --- a/test/transparent.cpp +++ b/test/transparent.cpp @@ -1,6 +1,6 @@ // File: transparent.cpp -#include "fapp.h" +#include "fapplication.h" #include "fdialog.h" #include "flabel.h" #include "fmessagebox.h" diff --git a/test/treeview.cpp b/test/treeview.cpp new file mode 100644 index 00000000..9000324f --- /dev/null +++ b/test/treeview.cpp @@ -0,0 +1,141 @@ +// File: treeview.cpp + +#include +#include + +#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 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(); +} diff --git a/test/watch.cpp b/test/watch.cpp index 5deb2c61..8dcd66db 100644 --- a/test/watch.cpp +++ b/test/watch.cpp @@ -2,7 +2,7 @@ #include -#include "fapp.h" +#include "fapplication.h" #include "flabel.h" #include "fdialog.h" #include "fmessagebox.h" diff --git a/test/windows.cpp b/test/windows.cpp index 9cadab92..6ec569eb 100644 --- a/test/windows.cpp +++ b/test/windows.cpp @@ -1,6 +1,6 @@ // File: windows.cpp -#include "fapp.h" +#include "fapplication.h" #include "fdialog.h" #include "fdialoglistmenu.h" #include "flabel.h"