summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--muse2/ChangeLog1
-rw-r--r--muse2/muse/mixer/amixer.cpp29
-rw-r--r--muse2/muse/mixer/amixer.h3
-rw-r--r--muse2/muse/mixer/strip.cpp6
4 files changed, 17 insertions, 22 deletions
diff --git a/muse2/ChangeLog b/muse2/ChangeLog
index c632dc75..80ccb897 100644
--- a/muse2/ChangeLog
+++ b/muse2/ChangeLog
@@ -3,6 +3,7 @@
- Added printout of build type in top level cmake. (Tim)
- Removed duplicate LASH detection in top level cmake. (Tim)
- Ported the following .ui widgets to Qt4: transformbase, itransformbase, mrconfigbase (Orcan)
+ - Finished remaining port work of mixer and strips. Should be all done now. (Tim)
17.11.2010
- Removed a fix which cured graphic corruption for me in MusE-1. Not required now. (Tim)
- Small change to Orcan's filedialog, re-enabled global button. (Tim)
diff --git a/muse2/muse/mixer/amixer.cpp b/muse2/muse/mixer/amixer.cpp
index 7644d532..781a450e 100644
--- a/muse2/muse/mixer/amixer.cpp
+++ b/muse2/muse/mixer/amixer.cpp
@@ -13,7 +13,6 @@
#include <QMenuBar>
#include <QResizeEvent>
#include <QPaintEvent>
-//Added by qt3to4:
#include <QHBoxLayout>
#include <QCloseEvent>
#include <QMenu>
@@ -280,7 +279,7 @@ void AudioMixerApp::addStrip(Track* t, int idx)
if (si != stripList.end()
&& nsi != stripList.end()
&& (*nsi)->getTrack() == t) {
- layout->remove(*si);
+ layout->removeWidget(*si);
delete *si;
stripList.erase(si);
}
@@ -304,7 +303,7 @@ void AudioMixerApp::clear()
{
StripList::iterator si = stripList.begin();
for (; si != stripList.end(); ++si) {
- layout->remove(*si);
+ layout->removeWidget(*si);
delete *si;
}
stripList.clear();
@@ -321,16 +320,16 @@ void AudioMixerApp::updateMixer(UpdateAction action)
//name = cfg->name;
//setCaption(name);
- setCaption(cfg->name);
+ setWindowTitle(cfg->name);
- showMidiTracksId->setOn(cfg->showMidiTracks);
- showDrumTracksId->setOn(cfg->showDrumTracks);
- showInputTracksId->setOn(cfg->showInputTracks);
- showOutputTracksId->setOn(cfg->showOutputTracks);
- showWaveTracksId->setOn(cfg->showWaveTracks);
- showGroupTracksId->setOn(cfg->showGroupTracks);
- showAuxTracksId->setOn(cfg->showAuxTracks);
- showSyntiTracksId->setOn(cfg->showSyntiTracks);
+ showMidiTracksId->setChecked(cfg->showMidiTracks);
+ showDrumTracksId->setChecked(cfg->showDrumTracks);
+ showInputTracksId->setChecked(cfg->showInputTracks);
+ showOutputTracksId->setChecked(cfg->showOutputTracks);
+ showWaveTracksId->setChecked(cfg->showWaveTracks);
+ showGroupTracksId->setChecked(cfg->showGroupTracks);
+ showAuxTracksId->setChecked(cfg->showAuxTracks);
+ showSyntiTracksId->setChecked(cfg->showSyntiTracks);
int auxsSize = song->auxs()->size();
if ((action == UPDATE_ALL) || (auxsSize != oldAuxsSize)) {
@@ -352,7 +351,7 @@ void AudioMixerApp::updateMixer(UpdateAction action)
++si;
if (it != tl->end())
continue;
- layout->remove(*ssi);
+ layout->removeWidget(*ssi);
delete *ssi;
stripList.erase(ssi);
}
@@ -388,7 +387,7 @@ void AudioMixerApp::updateMixer(UpdateAction action)
StripList::iterator ssi = si;
++si;
- layout->remove(*ssi);
+ layout->removeWidget(*ssi);
delete *ssi;
stripList.erase(ssi);
}
@@ -576,7 +575,7 @@ void AudioMixerApp::showRouteDialog(bool on)
connect(routingDialog, SIGNAL(closed()), SLOT(routingDialogClosed()));
}
if (routingDialog)
- routingDialog->setShown(on);
+ routingDialog->setVisible(on);
//menuView->setItemChecked(routingId, on);
routingId->setChecked(on);
}
diff --git a/muse2/muse/mixer/amixer.h b/muse2/muse/mixer/amixer.h
index db966cd6..16e84c73 100644
--- a/muse2/muse/mixer/amixer.h
+++ b/muse2/muse/mixer/amixer.h
@@ -11,10 +11,7 @@
#include <QLayout>
#include <QPixmap>
-//#include <q3listbox.h>
#include <QToolTip>
-//#include <q3frame.h>
-//Added by qt3to4:
#include <QHBoxLayout>
#include <QLabel>
#include <QMenu>
diff --git a/muse2/muse/mixer/strip.cpp b/muse2/muse/mixer/strip.cpp
index 2f32270b..9ddf48f9 100644
--- a/muse2/muse/mixer/strip.cpp
+++ b/muse2/muse/mixer/strip.cpp
@@ -11,9 +11,7 @@
#include <QLayout>
#include <QPalette>
#include <QColor>
-//Added by qt3to4:
#include <QVBoxLayout>
-//#include <Q3Frame>
#include <QFrame>
#include "globals.h"
@@ -34,7 +32,7 @@ void Strip::setRecordFlag(bool flag)
{
if (record) {
record->blockSignals(true);
- record->setOn(flag);
+ record->setChecked(flag);
record->blockSignals(false);
}
}
@@ -60,7 +58,7 @@ void Strip::recordToggled(bool val)
}
audio->msgSetRecord((AudioOutput*)track, val);
if (!((AudioOutput*)track)->recFile())
- record->setOn(false);
+ record->setChecked(false);
return;
}
song->setRecordFlag(track, val);