From 3746dac8855a25ffc53743ed439632d71e3d2b5b Mon Sep 17 00:00:00 2001 From: Markus Gans Date: Fri, 27 Oct 2017 23:28:37 +0200 Subject: [PATCH] FWidget now inherits directly from FObject --- ChangeLog | 3 + README.md | 14 +- doc/class-diagram.txt | 14 +- examples/opti-move.cpp | 3 +- examples/termcap.cpp | 3 +- icon/scalable/finalcut.svg | 329 +++++++++++------------------ include/final/fvterm.h | 29 ++- include/final/fwidget.h | 8 +- logo/png/finalcut-logo.png | Bin 12544 -> 10218 bytes logo/svg/finalcut-logo.svg | 417 ++++++++++++------------------------- src/flistview.cpp | 2 +- src/fvterm.cpp | 39 +--- src/fwidget.cpp | 49 ++++- 13 files changed, 360 insertions(+), 550 deletions(-) mode change 100755 => 100644 icon/scalable/finalcut.svg mode change 100755 => 100644 logo/svg/finalcut-logo.svg diff --git a/ChangeLog b/ChangeLog index 2e84e012..2679b60c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2017-10-27 Markus Gans + * FWidget now inherits directly from FObject + 2017-10-23 Markus Gans * A FListView tree branch can now be expand and collapsed with a single click diff --git a/README.md b/README.md index ab5a1c21..70cd3700 100644 --- a/README.md +++ b/README.md @@ -150,13 +150,13 @@ Class digramm : ┌--------┤ FRect │ : │ ┌───────────┐ : : └───────┘ : ├────┤ FLineEdit │ :1 :1 : │ └───────────┘ - ┌─┴──┴──┐ : │ ┌──────────────┐ ┌──────────────┐ - │ FTerm │◄────┐ :1 ├────┤ FButtonGroup │ ┌──┤ FRadioButton │ - └───────┘ │ ┌────────┐ ┌────┴────┐ │ └──────────────┘ │ └──────────────┘ - ├─┤ FVTerm │◄──┤ FWidget │◄─┤ ┌───────────────┐ │ ┌───────────┐ - ┌─────────┐ │ └────────┘ └─────────┘ ├────┤ FToggleButton │◄─┼──┤ FCheckBox │ - │ FObject │◄──┘ │ └───────────────┘ │ └───────────┘ - └─────────┘ │ ┌──────────────┐ │ ┌─────────┐ + ┌─┴──┴──┐ ┌────────┐ : │ ┌──────────────┐ ┌──────────────┐ + │ FTerm │◄───┤ FVTerm │◄──┐ :1 ├────┤ FButtonGroup │ ┌──┤ FRadioButton │ + └───────┘ └────────┘ │ ┌────┴────┐ │ └──────────────┘ │ └──────────────┘ + ├──┤ FWidget │◄─┤ ┌───────────────┐ │ ┌───────────┐ + ┌─────────┐ │ └─────────┘ ├────┤ FToggleButton │◄─┼──┤ FCheckBox │ + │ FObject │◄──┘ │ └───────────────┘ │ └───────────┘ + └─────────┘ │ ┌──────────────┐ │ ┌─────────┐ ├────┤ FProgressbar │ └──┤ FSwitch │ │ └──────────────┘ └─────────┘ │ ┌────────────┐ diff --git a/doc/class-diagram.txt b/doc/class-diagram.txt index 27a00466..546b2814 100644 --- a/doc/class-diagram.txt +++ b/doc/class-diagram.txt @@ -45,13 +45,13 @@ : ┌--------┤ FRect │ : │ ┌───────────┐ : : └───────┘ : ├────┤ FLineEdit │ :1 :1 : │ └───────────┘ - ┌─┴──┴──┐ : │ ┌──────────────┐ ┌──────────────┐ - │ FTerm │◄────┐ :1 ├────┤ FButtonGroup │ ┌──┤ FRadioButton │ - └───────┘ │ ┌────────┐ ┌────┴────┐ │ └──────────────┘ │ └──────────────┘ - ├─┤ FVTerm │◄──┤ FWidget │◄─┤ ┌───────────────┐ │ ┌───────────┐ - ┌─────────┐ │ └────────┘ └─────────┘ ├────┤ FToggleButton │◄─┼──┤ FCheckBox │ - │ FObject │◄──┘ │ └───────────────┘ │ └───────────┘ - └─────────┘ │ ┌──────────────┐ │ ┌─────────┐ + ┌─┴──┴──┐ ┌────────┐ : │ ┌──────────────┐ ┌──────────────┐ + │ FTerm │◄───┤ FVTerm │◄──┐ :1 ├────┤ FButtonGroup │ ┌──┤ FRadioButton │ + └───────┘ └────────┘ │ ┌────┴────┐ │ └──────────────┘ │ └──────────────┘ + ├──┤ FWidget │◄─┤ ┌───────────────┐ │ ┌───────────┐ + ┌─────────┐ │ └─────────┘ ├────┤ FToggleButton │◄─┼──┤ FCheckBox │ + │ FObject │◄──┘ │ └───────────────┘ │ └───────────┘ + └─────────┘ │ ┌──────────────┐ │ ┌─────────┐ ├────┤ FProgressbar │ └──┤ FSwitch │ │ └──────────────┘ └─────────┘ │ ┌────────────┐ diff --git a/examples/opti-move.cpp b/examples/opti-move.cpp index 1746ee9b..ad4b9ef5 100644 --- a/examples/opti-move.cpp +++ b/examples/opti-move.cpp @@ -149,13 +149,14 @@ void move (int xold, int yold, int xnew, int ynew) //---------------------------------------------------------------------- int main (int argc, char* argv[]) { + bool init = true; int xmax, ymax; // Create the application object FApplication app(argc, argv); // Create a FVTerm object as virtual terminal - terminal = new FVTerm(&app); + terminal = new FVTerm(init); xmax = terminal->getColumnNumber() - 1; ymax = terminal->getLineNumber() - 1; FString line(xmax + 1, '-'); diff --git a/examples/termcap.cpp b/examples/termcap.cpp index 0b35a455..855b8744 100644 --- a/examples/termcap.cpp +++ b/examples/termcap.cpp @@ -106,9 +106,10 @@ void tcapString (const std::string& name, const char* cap_str) //---------------------------------------------------------------------- int main (int argc, char* argv[]) { + bool init = true; bool disable_alt_screen = true; FApplication app (argc, argv, disable_alt_screen); - terminal = new FVTerm(&app); + terminal = new FVTerm(init); FTermcap::tcap_map* tcap = 0; tcap = FTermcap::getTermcapMap(); diff --git a/icon/scalable/finalcut.svg b/icon/scalable/finalcut.svg old mode 100755 new mode 100644 index a8e9adbf..3983e085 --- a/icon/scalable/finalcut.svg +++ b/icon/scalable/finalcut.svg @@ -8,212 +8,137 @@ xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.1" width="100%" height="100%" viewBox="0 0 135 128" id="svg2" - xml:space="preserve" - style="fill-rule:evenodd" - inkscape:version="0.48.5 r10040" - sodipodi:docname="finalcut.svg" - preserveAspectRatio="none">image/svg+xml