lot of bugfixes, UI-improvements and more

git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@56 0778d3d1-df1d-0410-868b-ea421aaaa00d

ChangeLog

@@ -1,3 +1,117 @@
+2006-01-22	Tobias Doerffel	<tobydox/at/users.sourceforge.net>
+
+	* include/timeline.h:
+	* src/core/song_editor.cpp:
+	* src/core/timeline.cpp:
+	updates are now completely done by timeline/QTimer without being
+	called from song-editor out of non-GUI-thread which caused segfaults
+	etc. sometimes
+
+	* include/name_label.h:
+	* src/core/name_label.cpp:
+	* src/tracks/bb_track.cpp:
+	* src/tracks/sample_track.cpp:
+	added support for user-defined track-icons
+
+	* artwork/track_icons/*png:
+	added several icons to be used as track-icons
+
+	* include/track.h:
+	* src/core/track.cpp:
+	* src/core/track_container.cpp:
+	do not hide track for completely repainting it, use special method for
+	it
+
+	* include/pattern.h:
+	* src/tracks/pattern.cpp:
+	only repaint if neccessary, otherwise just paint the pixmap we painted
+	before
+
+	* include/bb_editor.h:
+	* src/core/bb_editor.cpp:
+	added combobox for selecting bb-track inside bb-editor
+
+	* include/combobox.h:
+	* src/widgets/combobox.cpp:
+	- added clear()-method
+	- do not crash when having no items
+	- scale pixmap to fit into combobox
+	- place menu below combobox if possible
+
+2006-01-21	Tobias Doerffel	<tobydox/at/users.sourceforge.net>
+
+	* include/track.h:
+	* src/core/track.cpp:
+	* src/tracks/pattern.cpp:
+	* src/tracks/sample_track.cpp:
+	added support for used-defined track-height by pressing <Shift> and
+	move mouse (with pressed button)
+
+	* include/song_editor.h:
+	* include/track.h:
+	* include/track_container.h:
+	* src/core/song_editor.cpp:
+	* src/core/track.cpp:
+	* src/core/track_container.cpp:
+	take advantage of new rubberband:
+	- selecting track-content-objects of any type either via rubberband or
+	  by clicking while pressing <Ctrl>
+	- move selected track-content-objects
+	- delete selected track-content-objects
+
+	* include/rubberband.h:
+	* src/widgets/rubberband.cpp:
+	added rubberband which either acts as wrapper for Qt4's QRubberBand or
+	as a widget imitating a rubberband
+
+	* include/track.h:
+	* src/core/track.cpp:
+	draw vertical lines for each bar
+
+	* include/bb_editor.h:
+	* include/song_editor.h:
+	* include/track_container.h:
+	* src/core/bb_editor.cpp:
+	* src/core/song_editor.cpp:
+	* src/core/track.cpp:
+	* src/core/track_container.cpp:
+	fixed all that stuff with annoying scrollbars which partly hid important
+	widgets
+
+2006-01-20	Tobias Doerffel	<tobydox/at/users.sourceforge.net>
+
+	* src/tracks/pattern.cpp:
+	also update after clearing all notes
+
+	* include/piano_roll.h:
+	* include/song_editor.h:
+	* src/core/piano_roll.cpp:
+	* src/core/song_editor.cpp:
+	use new combobox for zooming-comboboxes
+
+	* include/export_project_dialog.h:
+	* src/core/export_project_dialog.cpp:
+	- reject() dialog when pressing cancel
+	- use new combobox
+
+	* include/arp_and_chords_tab_widget.h:
+	* src/core/arp_and_chords_tab_widget.cpp:
+	use new combobox with according arpeggio-mode-icons
+
+	* include/envelope_tab_widget.h:
+	* src/core/envelope_tab_widget.cpp:
+	* resources/filter_2lp.png:
+	* resources/filter_ap.png:
+	* resources/filter_bp.png:
+	* resources/filter_hp.png:
+	* resources/filter_lp.png:
+	use new combobox with according filter-icons
+
+	* include/combobox.h:
+	* src/widgets/combobox.cpp:
+	added own cool-looking combobox with menu-extension which basically
+	has the same API as QComboBox
+
 2006-01-19	Andreas M. Brandmaier <andy/at/brandmaier.de>
 
 	* plugins/bit_invader/bit_invader.h:

Makefile.am

@@ -47,6 +47,7 @@ lmms_MOC =						\
 		./bb_editor.moc				\
 		./bb_track.moc				\
 		./channel_track.moc			\
+		./combobox.moc				\
 		./config_mgr.moc			\
 		./cpuload_widget.moc			\
 		./envelope_and_lfo_widget.moc		\
@@ -72,6 +73,7 @@ lmms_MOC =						\
 		./pixmap_button.moc			\
 		./plugin_browser.moc			\
 		./project_notes.moc			\
+		./rubberband.moc			\
 		./qxembed.moc				\
 		./rename_dialog.moc			\
 		./sample_buffer.moc			\
@@ -160,6 +162,7 @@ lmms_SOURCES =								\
 		$(srcdir)/src/tracks/channel_track.cpp			\
 		$(srcdir)/src/tracks/pattern.cpp			\
 		$(srcdir)/src/tracks/sample_track.cpp			\
+		$(srcdir)/src/widgets/combobox.cpp			\
 		$(srcdir)/src/widgets/cpuload_widget.cpp		\
 		$(srcdir)/src/widgets/fade_button.cpp			\
 		$(srcdir)/src/widgets/group_box.cpp			\
@@ -170,6 +173,7 @@ lmms_SOURCES =								\
 		$(srcdir)/src/widgets/nstate_button.cpp			\
 		$(srcdir)/src/widgets/pixmap_button.cpp			\
 		$(srcdir)/src/widgets/project_notes.cpp			\
+		$(srcdir)/src/widgets/rubberband.cpp			\
 		$(srcdir)/src/widgets/qxembed.cpp			\
 		$(srcdir)/src/widgets/rename_dialog.cpp			\
 		$(srcdir)/src/widgets/side_bar_widget.cpp		\
@@ -283,6 +287,8 @@ lmms_SOURCES =								\
 		$(srcdir)/include/midi_alsa_seq.h			\
 		$(srcdir)/include/micro_timer.h				\
 		$(srcdir)/include/fade_button.h				\
+		$(srcdir)/include/combobox.h				\
+		$(srcdir)/include/rubberband.h				\
 		$(srcdir)/include/qxembed.h
 
 

TODO

@@ -1,7 +1,9 @@
 to be done as soon as possible:
 
-- performance-settings
-- arp-sync-mode
+- disable auto-cleanup of bufferAllocator during memory-expensive operations (pattern-freezing etc.)
+- autosave every 30s (configurable!) and offer recovery at startup after crash
+- make piano-roll use rubberband instead of implementing a simple one on it's own
+- level-meters in output-graph and channel-track
 - do not skip samples because of rounding-errors when resampling in src/lib/sample_buffer.cpp
 - MIDI-program/MIDI-mapping/process program-/channel-change-events from MIDI-files
 - add note-len- and note-alignment-selectbox to piano-roll
@@ -10,20 +12,17 @@ to be done as soon as possible:
 - use drawLineF() for drawing notes in pattern::paintEvent() in qt4-version
 - only redraw region given by paint-event in pattern, bbTCO, sampleTCO etc.
 - pre-listen when opening sample with QFileDialog
-- level-meters in output-graph and channel-track
 - panning-editing in piano-roll
 - speed up painting of sampleTCO
 - save window-positions, -states and -sizes in files
 - solve problems with different keyboard-layouts when playing channel-track with pc-keyboard -> use tr()
 - balance env+lfo
-- autosave every 1 minute
 - plucked-string-synth: knob for metallic -> use noise as wave-shape
 - finish qt4-port and make LMMS usable when compiling with Qt4
 - rewrite export-project-dialog using layout-mechanism
 - dynamic pitch-change
 - make piano-roll use the global clipboard??
 - add more localizations:
-	- Italian
 	- Swedish
 	- Norwegian
 	- Greece

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-cvs20060119, tobydox/at/users.sourceforge.net)
-AM_INIT_AUTOMAKE(lmms, 0.1.2-cvs20060119)
+AC_INIT(lmms, 0.1.2-cvs20060122, tobydox/at/users.sourceforge.net)
+AM_INIT_AUTOMAKE(lmms, 0.1.2-cvs20060122)
 
 AM_CONFIG_HEADER(config.h)
 
@@ -405,6 +405,7 @@ fi
 
 AC_CONFIG_FILES([Makefile
 		 artwork/Makefile
+		 artwork/track_icons/Makefile
 		 buildtools/Makefile
 		 locale/Makefile
 		 midi-maps/Makefile

include/arp_and_chords_tab_widget.h

@@ -47,10 +47,10 @@
 #include "types.h"
 
 
-class QComboBox;
 class QPixmap;
 
 class channelTrack;
+class comboBox;
 class groupBox;
 class knob;
 class ledCheckBox;
@@ -124,12 +124,12 @@ protected slots:
 
 	// chord-stuff
 	groupBox * m_chordsGroupBox;
-	QComboBox * m_chordsComboBox;
+	comboBox * m_chordsComboBox;
 	knob * m_chordRangeKnob;
 
 	// arpeggio-stuff
 	groupBox * m_arpGroupBox;
-	QComboBox * m_arpComboBox;
+	comboBox * m_arpComboBox;
 	knob * m_arpRangeKnob;
 	tempoSyncKnob * m_arpTimeKnob;
 	knob * m_arpGateKnob;
@@ -140,7 +140,7 @@ protected slots:
 	pixmapButton * m_arpUpAndDownBtn;
 	pixmapButton * m_arpRandomBtn;
 
-	QComboBox * m_arpModeComboBox;
+	comboBox * m_arpModeComboBox;
 
 } ;
 

include/bb_editor.h

@@ -1,7 +1,7 @@
 /*
  * bb_editor.h - declaration of class bbEditor, a basic-component of LMMS
  *
- * 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
  *
@@ -33,10 +33,12 @@
 #include "lmms_main_win.h"
 
 
-class toolButton;
-class songEditor;
 class QPixmap;
 
+class comboBox;
+class songEditor;
+class toolButton;
+
 
 class bbEditor : public trackContainer
 {
@@ -71,7 +73,6 @@ class bbEditor : public trackContainer
 	}
 
 	csize currentBB( void ) const;
-	void FASTCALL setCurrentBB( csize _bb );
 	tact FASTCALL lengthOfBB( csize _bb );
 	inline tact lengthOfCurrentBB( void )
 	{
@@ -85,11 +86,18 @@ class bbEditor : public trackContainer
 	void updateBBTrack( trackContentObject * _tco );
 
 
+public slots:
+	void updateComboBox( void );
+	void setCurrentBB( int _bb );
+
+
 protected:
 	virtual void closeEvent( QCloseEvent * _ce );
 	virtual void keyPressEvent( QKeyEvent * _ke );
 	virtual void resizeEvent( QResizeEvent * _re );
 
+	virtual QRect scrollAreaRect( void ) const;
+
 
 protected slots:
 	void play( void );
@@ -111,6 +119,8 @@ protected slots:
 	toolButton * m_playButton;
 	toolButton * m_stopButton;
 
+	comboBox * m_bbComboBox;
+
 
 	friend class songEditor;
 	friend lmmsMainWin::~lmmsMainWin();

include/bb_track.h

@@ -2,7 +2,7 @@
  * bb_track.h - class bbTrack, a wrapper for using bbEditor
  *              (which is a singleton-class) as track
  *
- * 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
  *
@@ -135,12 +135,8 @@ public slots:
 private:
 	nameLabel * m_trackLabel;
 
-	struct bbInfoStruct
-	{
-		csize num;
-		QString name;
-	} ;
-	static QMap<bbTrack *, bbInfoStruct> s_bbNums;
+	typedef QMap<bbTrack *, csize> infoMap;
+	static infoMap s_infoMap;
 
 } ;