diff --git a/ChangeLog b/ChangeLog index ea44f238a..bd8d1c98c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,25 @@ +2006-02-01 Tobias Doerffel + + * configure.in: + made 0.1.3 release + + * lmms.1: + added manpage (taken from debian-package and updated) + + * include/base64.h: + * include/rubberband.h: + * plugins/bit_invader/graph.cpp: + * src/core/name_label.cpp: + * src/widgets/combobox.cpp: + * src/widgets/rubberband.cpp: + Qt4-compat fixes + + * locale/de.ts: + updated German translation + + * src/core/main.cpp: + updated copyright-notice in help-text + 2006-01-30 Tobias Doerffel * plugins/vestige/fstclient.h: @@ -194,7 +216,7 @@ * plugins/bit_invader/bit_invader.cpp: * plugins/bit_invader/graph.h: * plugins/bit_invader/graph.cpp: - added "BitInvader"-plugin, a usereditable wavetable-synthesizer + added "BitInvader"-plugin, an usereditable wavetable-synthesizer 2006-01-16 Tobias Doerffel @@ -607,7 +629,6 @@ * configure.in: made 0.1.2 release -======= 2006-01-02 Tobias Doerffel * plugins/vestige/vestige.cpp: diff --git a/Makefile.am b/Makefile.am index ae488fd0e..b00f0a834 100644 --- a/Makefile.am +++ b/Makefile.am @@ -40,6 +40,8 @@ AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS) $(LRELEASE) $< +man1_MANS = lmms.1 + lmms_MOC = \ ./about_dialog.moc \ @@ -295,7 +297,7 @@ lmms_SOURCES = \ -EXTRA_DIST = $(lmms_EMBEDDED_RESOURCES) vst_sdk23_headers.diff +EXTRA_DIST = $(lmms_EMBEDDED_RESOURCES) vst_sdk23_headers.diff lmms.1 CLEANFILES = $(lmms_MOC) ./embedded_resources.h @@ -329,5 +331,5 @@ LIB_SF_LDADD = -lsndfile endif lmms_LDADD = $(QT_LDADD) $(LIB_SDL_LDADD) $(LIB_ASOUND_LDADD) $(LIB_JACK_LDADD) $(LIB_SDL_SOUND_LDADD) $(LIB_VORBIS_LDADD) $(LIB_SRC_LDADD) $(LIB_SF_LDADD) $(LIB_FST_LDADD) -ldl -lmms_LDFLAGS = -rdynamic -rpath $(pkglibdir) +# lmms_LDFLAGS = -rdynamic -rpath $(pkglibdir) diff --git a/configure.in b/configure.in index dd3bdaca7..129e32d20 100644 --- a/configure.in +++ b/configure.in @@ -2,8 +2,8 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.50) -AC_INIT(lmms, 0.1.2-cvs20060130, tobydox/at/users/dot/sourceforge/dot/net) -AM_INIT_AUTOMAKE(lmms, 0.1.2-cvs20060130) +AC_INIT(lmms, 0.1.3, tobydox/at/users/dot/sourceforge/dot/net) +AM_INIT_AUTOMAKE(lmms, 0.1.3) AM_CONFIG_HEADER(config.h) diff --git a/include/base64.h b/include/base64.h index 7ef7e7e6e..e1ee51764 100644 --- a/include/base64.h +++ b/include/base64.h @@ -39,7 +39,7 @@ namespace base64 { #ifndef QT3 - inline encode( const char * _data, const int _size, QString & _dst ) + inline void encode( const char * _data, const int _size, QString & _dst ) { _dst = QByteArray( _data, _size ).toBase64(); } diff --git a/include/rubberband.h b/include/rubberband.h index 286b92d3a..11fdabf54 100644 --- a/include/rubberband.h +++ b/include/rubberband.h @@ -51,7 +51,11 @@ public: , WFlags _f #endif ) : - QWidget( _parent, NULL, _f ), + QWidget( _parent +#ifdef QT3 + , NULL, _f +#endif + ), m_selected( FALSE ) { } diff --git a/plugins/bit_invader/graph.cpp b/plugins/bit_invader/graph.cpp index 7b5ede0d7..20883bf88 100644 --- a/plugins/bit_invader/graph.cpp +++ b/plugins/bit_invader/graph.cpp @@ -129,7 +129,11 @@ void graph::mousePressEvent( QMouseEvent * _me ) // toggle mouse state m_mouseDown = true; +#ifndef QT3 + setCursor( Qt::BlankCursor ); +#else setCursor( QCursor::BlankCursor ); +#endif m_lastCursorX = x; } @@ -157,7 +161,11 @@ void graph::mouseReleaseEvent( QMouseEvent * _me ) { // toggle mouse state m_mouseDown = false; +#ifndef QT3 + setCursor( Qt::ArrowCursor ); +#else setCursor( QCursor::ArrowCursor ); +#endif update(); } diff --git a/src/core/main.cpp b/src/core/main.cpp index c1acd2137..b9d21d7c9 100644 --- a/src/core/main.cpp +++ b/src/core/main.cpp @@ -1,7 +1,7 @@ /* * main.cpp - just main.cpp which is starting up app... * - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2006 Tobias Doerffel * * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net * @@ -69,7 +69,7 @@ int main( int argc, char * * argv ) QString( app.argv()[i] ) == "-v" ) { printf( "\nLinux MultiMedia Studio %s\n\n" - "Copyright (c) 2004-2005 Tobias Doerffel and others.\n\n" + "Copyright (c) 2004-2006 Tobias Doerffel and others.\n\n" "This program is free software; you can redistribute it and/or\n" "modify it under the terms of the GNU General Public\n" "License as published by the Free Software Foundation; either\n" @@ -83,7 +83,7 @@ int main( int argc, char * * argv ) QString( app.argv()[i] ) == "-h" ) ) { printf( "\nLinux MultiMedia Studio %s\n" - "Copyright (c) 2004-2005 Tobias Doerffel and others.\n\n" + "Copyright (c) 2004-2006 Tobias Doerffel and others.\n\n" "usage: lmms [ -r [ -o ] [ -h ] " "[ ]\n" "-r, --render render given file.\n" diff --git a/src/core/name_label.cpp b/src/core/name_label.cpp index 5cc82c56c..22dbcb9af 100644 --- a/src/core/name_label.cpp +++ b/src/core/name_label.cpp @@ -189,7 +189,11 @@ void nameLabel::mousePressEvent( QMouseEvent * _me ) if( _me->button() == Qt::RightButton ) { QSize s( m_pixmap.width(), m_pixmap.height() ); +#ifndef QT3 + s.scale( width(), height(), Qt::KeepAspectRatio ); +#else s.scale( width(), height(), QSize::ScaleMin ); +#endif if( _me->x() > 4 + s.width() ) { rename(); @@ -212,7 +216,11 @@ void nameLabel::mousePressEvent( QMouseEvent * _me ) void nameLabel::mouseDoubleClickEvent( QMouseEvent * _me ) { QSize s( m_pixmap.width(), m_pixmap.height() ); +#ifndef QT3 + s.scale( width(), height(), Qt::KeepAspectRatio ); +#else s.scale( width(), height(), QSize::ScaleMin ); +#endif if( _me->x() > 4 + s.width() ) { rename(); diff --git a/src/widgets/combobox.cpp b/src/widgets/combobox.cpp index 433e508c9..9586d0766 100644 --- a/src/widgets/combobox.cpp +++ b/src/widgets/combobox.cpp @@ -34,6 +34,7 @@ #include #include #include +#include #else @@ -113,7 +114,7 @@ void comboBox::addItem( const QString & _item, const QPixmap & _pixmap ) for( vvector::iterator it = m_items.begin(); it != m_items.end(); ++it ) { - m_menu.addItem( ( *it ).second, ( *it ).first + m_menu.addAction( ( *it ).second, ( *it ).first // when using Qt3, we pass item-index as id for using // it in setItem( int ) as index #ifdef QT3 diff --git a/src/widgets/rubberband.cpp b/src/widgets/rubberband.cpp index 5f5b7da91..3b4e238d6 100644 --- a/src/widgets/rubberband.cpp +++ b/src/widgets/rubberband.cpp @@ -137,12 +137,22 @@ vvector rubberBand::selectableObjects( void ) const { return( so ); } +#ifndef QT3 + QList l = + parentWidget()->findChildren(); + for( QList::iterator it = l.begin(); it != l.end(); + ++it ) + { + so.push_back( *it ); + } +#else QObjectList * l = parentWidget()->queryList( "selectableObject" ); for( QObjectListIt it = *l; it.current() != NULL; ++it ) { so.push_back( static_cast( *it ) ); } delete l; +#endif return( so ); }