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

Version 0.2.0

This commit is contained in:
Markus Gans 2015-12-19 22:01:48 +01:00
parent 7dc30f7c70
commit 54c45a6501
5 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure vendored
View File

@ -16846,8 +16846,9 @@ $lt_cl_success || as_fn_exit 1
### This defines the version number of the installed .so files ### 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. ### using libtool's versioning system.
SO_VERSION="0:1:0" SO_VERSION="2:0:2"

3
configure.ac
View File

@ -46,8 +46,9 @@ LT_LANG([C++])
LT_OUTPUT LT_OUTPUT
### This defines the version number of the installed .so files ### 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. ### using libtool's versioning system.
AC_SUBST(SO_VERSION, ["0:1:0"]) AC_SUBST(SO_VERSION, ["2:0:2"])
AC_SUBST([LIBTOOL_DEPS]) AC_SUBST([LIBTOOL_DEPS])

4
src/fmenu.cpp
View File

@ -965,6 +965,10 @@ void FMenu::onMouseDown (FMouseEvent* ev)
open_sub_menu->hideSubMenus(); open_sub_menu->hideSubMenus();
open_sub_menu->hide(); open_sub_menu->hide();
open_sub_menu = 0; open_sub_menu = 0;
getSelectedItem()->setFocus();
redraw();
if ( statusBar() )
statusBar()->drawMessage();
updateTerminal(); updateTerminal();
flush_out(); flush_out();
} }

2
src/fobject.cpp
View File

@ -215,7 +215,7 @@ bool FObject::delOwnTimer()
iter = timer_list->begin(); iter = timer_list->begin();
while ( iter != timer_list->end() ) while ( iter != timer_list->end() )
{ {
if ( (*iter).object == this ) if ( (*iter).object == this )
iter = timer_list->erase(iter); iter = timer_list->erase(iter);
else else

11
test/ui.cpp
View File

@ -558,12 +558,12 @@ void MyDialog::cb_noFunctionMsg (FWidget* widget, void*)
//---------------------------------------------------------------------- //----------------------------------------------------------------------
void MyDialog::cb_about (FWidget*, void*) void MyDialog::cb_about (FWidget*, void*)
{ {
const char ver[] = F_VERSION; const char libver[] = F_VERSION;
FString line(2, wchar_t(fc::BoxDrawingsHorizontal)); FString line(2, wchar_t(fc::BoxDrawingsHorizontal));
FMessageBox info ( "About" FMessageBox info ( "About"
, line + L" The Final Cut " + line + "\n\n" , line + L" The Final Cut " + line + "\n\n"
L"Version " + ver + "\n\n" L"Version " + libver + "\n\n"
L"(c) 2015 by Markus Gans" L"(c) 2015 by Markus Gans"
, FMessageBox::Ok, 0, 0, this ); , FMessageBox::Ok, 0, 0, this );
info.setCenterText(); info.setCenterText();
@ -796,6 +796,9 @@ void MyDialog::adjustSize()
int main (int argc, char* argv[]) 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 if ( argv[1] && ( strcmp(argv[1], "--help") == 0
|| strcmp(argv[1], "-h") == 0 ) ) || strcmp(argv[1], "-h") == 0 ) )
{ {
@ -807,14 +810,14 @@ int main (int argc, char* argv[])
} }
FApplication app(argc, 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.setEncoding("VT100");
//app.setTermGeometry(94,30); //app.setTermGeometry(94,30);
//app.setNewFont(); //app.setNewFont();
MyDialog d(&app); 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.setGeometry (int((app.getWidth()-56)/2), 2, 56, app.getHeight()-4);
d.setShadow(); d.setShadow();