made 0.1.3 release

git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@74 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Tobias Doerffel
2006-02-01 16:35:45 +00:00
parent f0cfa20676
commit 7df6381800
10 changed files with 66 additions and 12 deletions

View File

@@ -1,7 +1,7 @@
/*
* main.cpp - just main.cpp which is starting up app...
*
* Copyright (c) 2004-2005 Tobias Doerffel <tobydox/at/users.sourceforge.net>
* Copyright (c) 2004-2006 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* 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 <file_to_render> [ -o <format> ] [ -h ] "
"[ <file_to_load> ]\n"
"-r, --render render given file.\n"

View File

@@ -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();

View File

@@ -34,6 +34,7 @@
#include <QPixmap>
#include <QApplication>
#include <QDesktopWidget>
#include <QMouseEvent>
#else
@@ -113,7 +114,7 @@ void comboBox::addItem( const QString & _item, const QPixmap & _pixmap )
for( vvector<item>::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

View File

@@ -137,12 +137,22 @@ vvector<selectableObject *> rubberBand::selectableObjects( void ) const
{
return( so );
}
#ifndef QT3
QList<selectableObject *> l =
parentWidget()->findChildren<selectableObject *>();
for( QList<selectableObject *>::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<selectableObject *>( *it ) );
}
delete l;
#endif
return( so );
}