From 7dc30f7c7034dc1598e9371ddcae885eec6654f5 Mon Sep 17 00:00:00 2001 From: Markus Gans Date: Sat, 19 Dec 2015 20:51:04 +0100 Subject: [PATCH] Version 0.2.0 --- ChangeLog | 5 +++++ configure | 22 +++++++++++----------- configure.ac | 2 +- doc/Makefile.in | 4 ++-- doc/TODO | 1 - finalcut.spec | 6 ++++-- src/Makefile.clang | 2 +- src/Makefile.gcc | 2 +- src/Makefile.in | 4 ++-- src/fconfig.h | 6 +++--- src/fonts/Makefile.in | 4 ++-- src/fscrollbar.cpp | 14 +++++++------- test/Makefile.in | 4 ++-- 13 files changed, 41 insertions(+), 35 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1d3a5642..1c7e2b9b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2015-12-19 Markus Gans + * Add delOwnTimer() for FObject + * Close sub-menu on right and middle click + * Version 0.2.0 + 2015-12-18 Markus Gans * Optimize menu example * More string types for FString relational operators diff --git a/configure b/configure index 1f7f4f6f..3f2dd36b 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for finalcut 0.1.1. +# Generated by GNU Autoconf 2.69 for finalcut 0.2.0. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -587,8 +587,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='finalcut' PACKAGE_TARNAME='finalcut' -PACKAGE_VERSION='0.1.1' -PACKAGE_STRING='finalcut 0.1.1' +PACKAGE_VERSION='0.2.0' +PACKAGE_STRING='finalcut 0.2.0' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1322,7 +1322,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures finalcut 0.1.1 to adapt to many kinds of systems. +\`configure' configures finalcut 0.2.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1392,7 +1392,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of finalcut 0.1.1:";; + short | recursive ) echo "Configuration of finalcut 0.2.0:";; esac cat <<\_ACEOF @@ -1502,7 +1502,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -finalcut configure 0.1.1 +finalcut configure 0.2.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1988,7 +1988,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by finalcut $as_me 0.1.1, which was +It was created by finalcut $as_me 0.2.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2857,7 +2857,7 @@ fi # Define the identity of the package. PACKAGE='finalcut' - VERSION='0.1.1' + VERSION='0.2.0' cat >>confdefs.h <<_ACEOF @@ -15617,7 +15617,7 @@ Usage: $0 [OPTIONS] Report bugs to ." lt_cl_version="\ -finalcut config.lt 0.1.1 +finalcut config.lt 0.2.0 configured by $0, generated by GNU Autoconf 2.69. Copyright (C) 2011 Free Software Foundation, Inc. @@ -17495,7 +17495,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by finalcut $as_me 0.1.1, which was +This file was extended by finalcut $as_me 0.2.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17561,7 +17561,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -finalcut config.status 0.1.1 +finalcut config.status 0.2.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 10ed6248..f4026863 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ # Process this file with autoconf to produce a configure script. -AC_INIT([finalcut], [0.1.1]) +AC_INIT([finalcut], [0.2.0]) AC_CONFIG_HEADER([config.h]) AX_PREFIX_CONFIG_H([src/fconfig.h], [F]) AC_CONFIG_SRCDIR([src/fobject.cpp]) diff --git a/doc/Makefile.in b/doc/Makefile.in index 85ee7163..87419e3a 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -316,9 +316,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/Makefile + $(AUTOMAKE) --foreign doc/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/doc/TODO b/doc/TODO index 5f3ed342..f2ed0d68 100644 --- a/doc/TODO +++ b/doc/TODO @@ -4,7 +4,6 @@ Bugs Improvements ~~~~~~~~~~~~ -- Stabilize the application menu classes (FMenuBar, FMenu, FMenuItem) - If t_exit_underline_mode == "\E[24m" -> implement t_exit_bold_mode with "\E[21m" -> implement t_exit_reverse_mode with "\E[27m" diff --git a/finalcut.spec b/finalcut.spec index 0b8ed127..e9c9a4ab 100644 --- a/finalcut.spec +++ b/finalcut.spec @@ -8,7 +8,7 @@ Name: finalcut %define libname libfinal %define libsoname %{libname}0 -Version: 0.1.1 +Version: 0.2.0 Release: %{buildno} License: GPL-3.0 Summary: The Final Cut @@ -137,6 +137,8 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/%{libname}.a %changelog +* Sat Dec 19 2015 Markus Gans - 0.2.0-1 +- Release (version 0.2.0) + * Fri Sep 18 2015 Markus Gans - 0.1.1-1 - Initial Release (version 0.1.1) - diff --git a/src/Makefile.clang b/src/Makefile.clang index eae701c6..488150f3 100644 --- a/src/Makefile.clang +++ b/src/Makefile.clang @@ -3,7 +3,7 @@ #----------------------------------------------------------------------------- # This is where make install will install the library -VERSION = "0.1.1" +VERSION = "0.2.0" MAJOR := $(shell echo ${VERSION} | cut -d. -f1) LIBDIR = /usr/local/lib64 INCLUDEDIR = /usr/local/include/final diff --git a/src/Makefile.gcc b/src/Makefile.gcc index 094b2a9a..6396f013 100644 --- a/src/Makefile.gcc +++ b/src/Makefile.gcc @@ -3,7 +3,7 @@ #----------------------------------------------------------------------------- # This is where make install will install the library -VERSION = "0.1.1" +VERSION = "0.2.0" MAJOR := $(shell echo ${VERSION} | cut -d. -f1) LIBDIR = /usr/local/lib64 INCLUDEDIR = /usr/local/include/final diff --git a/src/Makefile.in b/src/Makefile.in index 120408fb..f3d19156 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -461,9 +461,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/Makefile + $(AUTOMAKE) --foreign src/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/src/fconfig.h b/src/fconfig.h index 6bbb1b4f..caf06d89 100644 --- a/src/fconfig.h +++ b/src/fconfig.h @@ -144,7 +144,7 @@ /* Define to the full name and version of this package. */ #ifndef F_PACKAGE_STRING -#define F_PACKAGE_STRING "finalcut 0.1.1" +#define F_PACKAGE_STRING "finalcut 0.2.0" #endif /* Define to the one symbol short name of this package. */ @@ -159,7 +159,7 @@ /* Define to the version of this package. */ #ifndef F_PACKAGE_VERSION -#define F_PACKAGE_VERSION "0.1.1" +#define F_PACKAGE_VERSION "0.2.0" #endif /* Define to 1 if you have the ANSI C header files. */ @@ -169,7 +169,7 @@ /* Version number of package */ #ifndef F_VERSION -#define F_VERSION "0.1.1" +#define F_VERSION "0.2.0" #endif /* once: _SRC_FCONFIG_H */ diff --git a/src/fonts/Makefile.in b/src/fonts/Makefile.in index 2caba703..320a1360 100644 --- a/src/fonts/Makefile.in +++ b/src/fonts/Makefile.in @@ -262,9 +262,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/fonts/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/fonts/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/fonts/Makefile + $(AUTOMAKE) --foreign src/fonts/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/src/fscrollbar.cpp b/src/fscrollbar.cpp index f55b1d86..00c72610 100644 --- a/src/fscrollbar.cpp +++ b/src/fscrollbar.cpp @@ -65,7 +65,7 @@ FScrollbar::FScrollbar(int o, FWidget* parent) //---------------------------------------------------------------------- FScrollbar::~FScrollbar() { - delAllTimer(); + delOwnTimer(); } // private methods of FScrollbar @@ -284,7 +284,7 @@ void FScrollbar::onMouseUp (FMouseEvent* ev) if ( scrollType != FScrollbar::noScroll ) { - delAllTimer(); + delOwnTimer(); scrollType = FScrollbar::noScroll; } } @@ -341,7 +341,7 @@ void FScrollbar::onMouseMove (FMouseEvent* ev) if ( mouse_x < 1 || mouse_x > width || mouse_y < 1 || mouse_y > height ) { - delAllTimer(); + delOwnTimer(); } else if ( scrollType != FScrollbar::scrollJump ) { @@ -350,7 +350,7 @@ void FScrollbar::onMouseMove (FMouseEvent* ev) if ( scrollType != newScrollType ) { - delAllTimer(); + delOwnTimer(); } } @@ -361,7 +361,7 @@ void FScrollbar::onWheel (FWheelEvent* ev) if ( scrollType != FScrollbar::noScroll ) { - delAllTimer(); + delOwnTimer(); scrollType = FScrollbar::noScroll; } @@ -382,7 +382,7 @@ void FScrollbar::onTimer (FTimerEvent*) if ( ! thresholdReached ) { thresholdReached = true; - delAllTimer(); + delOwnTimer(); addTimer(repeatTime); } @@ -391,7 +391,7 @@ void FScrollbar::onTimer (FTimerEvent*) || ( scrollType == scrollPageForward && SliderPos+SliderLength > SliderClickStopPos ) ) { - delAllTimer(); + delOwnTimer(); return; } diff --git a/test/Makefile.in b/test/Makefile.in index a1fbbceb..1cb6d315 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -354,9 +354,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu test/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign test/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu test/Makefile + $(AUTOMAKE) --foreign test/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \