From 54c45a6501eb44704a8972fd3722f5e758dee882 Mon Sep 17 00:00:00 2001 From: Markus Gans Date: Sat, 19 Dec 2015 22:01:48 +0100 Subject: [PATCH] Version 0.2.0 --- configure | 3 ++- configure.ac | 3 ++- src/fmenu.cpp | 4 ++++ src/fobject.cpp | 2 +- test/ui.cpp | 11 +++++++---- 5 files changed, 16 insertions(+), 7 deletions(-) diff --git a/configure b/configure index 3f2dd36b..e3c58055 100755 --- a/configure +++ b/configure @@ -16846,8 +16846,9 @@ $lt_cl_success || as_fn_exit 1 ### This defines the version number of the installed .so files +### Update this value for every release! (A:B:C will map to foo.so.(A-C).C.B) ### using libtool's versioning system. -SO_VERSION="0:1:0" +SO_VERSION="2:0:2" diff --git a/configure.ac b/configure.ac index f4026863..0cb60efd 100644 --- a/configure.ac +++ b/configure.ac @@ -46,8 +46,9 @@ LT_LANG([C++]) LT_OUTPUT ### This defines the version number of the installed .so files +### Update this value for every release! (A:B:C will map to foo.so.(A-C).C.B) ### using libtool's versioning system. -AC_SUBST(SO_VERSION, ["0:1:0"]) +AC_SUBST(SO_VERSION, ["2:0:2"]) AC_SUBST([LIBTOOL_DEPS]) diff --git a/src/fmenu.cpp b/src/fmenu.cpp index 13cc7b30..2a7968b4 100644 --- a/src/fmenu.cpp +++ b/src/fmenu.cpp @@ -965,6 +965,10 @@ void FMenu::onMouseDown (FMouseEvent* ev) open_sub_menu->hideSubMenus(); open_sub_menu->hide(); open_sub_menu = 0; + getSelectedItem()->setFocus(); + redraw(); + if ( statusBar() ) + statusBar()->drawMessage(); updateTerminal(); flush_out(); } diff --git a/src/fobject.cpp b/src/fobject.cpp index d60995a3..e6445663 100644 --- a/src/fobject.cpp +++ b/src/fobject.cpp @@ -215,7 +215,7 @@ bool FObject::delOwnTimer() iter = timer_list->begin(); while ( iter != timer_list->end() ) - { + { if ( (*iter).object == this ) iter = timer_list->erase(iter); else diff --git a/test/ui.cpp b/test/ui.cpp index 93a6e3e6..da2c8452 100644 --- a/test/ui.cpp +++ b/test/ui.cpp @@ -558,12 +558,12 @@ void MyDialog::cb_noFunctionMsg (FWidget* widget, void*) //---------------------------------------------------------------------- void MyDialog::cb_about (FWidget*, void*) { - const char ver[] = F_VERSION; + const char libver[] = F_VERSION; FString line(2, wchar_t(fc::BoxDrawingsHorizontal)); FMessageBox info ( "About" , line + L" The Final Cut " + line + "\n\n" - L"Version " + ver + "\n\n" + L"Version " + libver + "\n\n" L"(c) 2015 by Markus Gans" , FMessageBox::Ok, 0, 0, this ); info.setCenterText(); @@ -796,6 +796,9 @@ void MyDialog::adjustSize() int main (int argc, char* argv[]) { + FString ver = F_VERSION; // library version + FString title = "The FINAL CUT " + ver + " (C) 2015 by Markus Gans"; + if ( argv[1] && ( strcmp(argv[1], "--help") == 0 || strcmp(argv[1], "-h") == 0 ) ) { @@ -807,14 +810,14 @@ int main (int argc, char* argv[]) } FApplication app(argc, argv); - app.setXTermTitle ("The FINAL CUT 0.2.0 (C) 2015 by Markus Gans"); + app.setXTermTitle (title); //app.setEncoding("VT100"); //app.setTermGeometry(94,30); //app.setNewFont(); MyDialog d(&app); - d.setText ("The FINAL CUT 0.2.0 (C) 2015 by Markus Gans"); + d.setText (title); d.setGeometry (int((app.getWidth()-56)/2), 2, 56, app.getHeight()-4); d.setShadow();