[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Traverso-commit] traverso resources/themes/default/traversotheme...
|
From: |
Remon Sijrier |
|
Subject: |
[Traverso-commit] traverso resources/themes/default/traversotheme... |
|
Date: |
Thu, 28 Jun 2007 14:57:22 +0000 |
CVSROOT: /sources/traverso
Module name: traverso
Changes by: Remon Sijrier <r_sijrier> 07/06/28 14:57:22
Modified files:
resources/themes/default: traversotheme.xml
src/traverso/songcanvas: AudioClipView.cpp AudioClipView.h
MarkerView.cpp PositionIndicator.cpp
Log message:
more theme tuning
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/resources/themes/default/traversotheme.xml?cvsroot=traverso&r1=1.39&r2=1.40
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/AudioClipView.cpp?cvsroot=traverso&r1=1.75&r2=1.76
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/AudioClipView.h?cvsroot=traverso&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/MarkerView.cpp?cvsroot=traverso&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/PositionIndicator.cpp?cvsroot=traverso&r1=1.4&r2=1.5
Patches:
Index: resources/themes/default/traversotheme.xml
===================================================================
RCS file:
/sources/traverso/traverso/resources/themes/default/traversotheme.xml,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- resources/themes/default/traversotheme.xml 27 Jun 2007 21:09:45 -0000
1.39
+++ resources/themes/default/traversotheme.xml 28 Jun 2007 14:57:21 -0000
1.40
@@ -57,17 +57,19 @@
<color name="AudioClip:wavemacroview:outline:curvemode"
red="135" green="130" blue="255" alpha="255" />
<color name="AudioClip:wavemacroview:outline:muted" red="90"
green="90" blue="90" alpha="255" />
<color name="AudioClip:wavemacroview:brush" red="145"
green="145" blue="195" alpha="255" />
- <color name="AudioClip:wavemacroview:brush:muted" red="185"
green="185" blue="195" alpha="255" />
+ <color name="AudioClip:wavemacroview:brush:hover" red="160"
green="160" blue="215" alpha="255" />
+ <color name="AudioClip:wavemacroview:brush:muted" red="200"
green="200" blue="200" alpha="255" />
<color name="AudioClip:wavemacroview:brush:curvemode" red="232"
green="230" blue="255" alpha="255" />
+ <color name="AudioClip:wavemacroview:brush:curvemode:hover"
red="232" green="230" blue="240" alpha="255" />
<color name="AudioClip:wavemicroview" red="150" green="150"
blue="205" alpha="255" />
<color name="AudioClip:wavemicroview:curvemode" red="210"
green="210" blue="255" alpha="255" />
- <color name="AudioClip:background:muted" red="235" green="235"
blue="235" alpha="170" />
+ <color name="AudioClip:background:muted" red="245" green="245"
blue="245" alpha="170" />
<color name="AudioClip:background:recording" red="255"
green="255" blue="255" alpha="170" />
- <color name="AudioClip:background:muted:mousehover" red="245"
green="245" blue="245" alpha="170" />
+ <color name="AudioClip:background:muted:mousehover" red="255"
green="255" blue="255" alpha="170" />
<color name="AudioClip:background:selected" red="101"
green="111" blue="171" alpha="170" />
<color name="AudioClip:background:selected:mousehover"
red="111" green="121" blue="182" alpha="170" />
- <color name="AudioClip:background" red="251" green="255"
blue="251" alpha="170" />
- <color name="AudioClip:background:mousehover" red="255"
green="253" blue="255" alpha="230" />
+ <color name="AudioClip:background" red="251" green="255"
blue="251" alpha="150" />
+ <color name="AudioClip:background:mousehover" red="255"
green="253" blue="255" alpha="200" />
<color name="AudioClip:channelseperator" red="178" green="191"
blue="182" alpha="255" />
<color name="AudioClip:channelseperator:selected" red="24"
green="137" blue="210" alpha="255" />
<color name="AudioClip:contour" red="50" green="50" blue="50"
alpha="150" />
@@ -117,17 +119,17 @@
<color name="ResourcesBin:alternaterowcolor" red="243"
green="248" blue="255" alpha="255" />
- <color name="Song:background" red="244" green="244" blue="243"
alpha="255" />
+ <color name="Song:background" red="243" green="243" blue="244"
alpha="255" />
<color name="SongPanel:background" red="240" green="240"
blue="248" alpha="255" />
<color name="Timeline:background" red="180" green="189"
blue="189" alpha="255" />
<color name="Timeline:text" red="0" green="0" blue="0"
alpha="255" />
<color name="Track:cliptopoffset" red="220" green="220"
blue="240" alpha="255" />
- <color name="Track:clipbottomoffset" red="120" green="120"
blue="160" alpha="255" />
+ <color name="Track:clipbottomoffset" red="100" green="100"
blue="120" alpha="255" />
<color name="Track:background" red="250" green="250" blue="251"
alpha="100" />
- <color name="TrackPanel:background" red="250" green="250"
blue="250" alpha="255" />
+ <color name="TrackPanel:background" red="248" green="248"
blue="248" alpha="255" />
<color name="TrackPanel:text" red="0" green="0" blue="25"
alpha="255" />
<color name="TrackPanel:slider:background" red="200"
green="200" blue="240" alpha="255" />
<color name="TrackPanel:head:active" red="240" green="140"
blue="150" alpha="255" />
@@ -135,7 +137,7 @@
<color name="TrackPanel:muteled" red="255" green="255"
blue="90" alpha="255" />
<color name="TrackPanel:sololed" red="135" green="254"
blue="135" alpha="255" />
<color name="TrackPanel:recled" red="255" green="58" blue="58"
alpha="255" />
- <color name="TrackPanel:led:inactive" red="240" green="240"
blue="253" alpha="255" />
+ <color name="TrackPanel:led:inactive" red="237" green="237"
blue="250" alpha="255" />
<color name="TrackPanel:trackseparation" red="160" green="160"
blue="200" alpha="255" />
<color name="Workcursor:default" red="255" green="0" blue="0"
alpha="255" />
Index: src/traverso/songcanvas/AudioClipView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/AudioClipView.cpp,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -b -r1.75 -r1.76
--- src/traverso/songcanvas/AudioClipView.cpp 26 Jun 2007 23:43:21 -0000
1.75
+++ src/traverso/songcanvas/AudioClipView.cpp 28 Jun 2007 14:57:21 -0000
1.76
@@ -40,7 +40,7 @@
#include "PluginChain.h"
#include <QFileDialog>
-
+#include "AudioClipEditDialog.h"
// Always put me below _all_ includes, this is needed
// in case we run with memory leak detection enabled!
@@ -68,6 +68,7 @@
m_waitingForPeaks = false;
m_progress = m_peakloadingcount = 0;
m_posIndicator = 0;
+ m_editdialog = 0;
m_song = m_clip->get_song();
if (FadeCurve* curve = m_clip->get_fade_in()) {
@@ -86,9 +87,8 @@
connect(curveView, SIGNAL(curveModified()), m_sv,
SLOT(stop_follow_play_head()));
connect(m_clip, SIGNAL(muteChanged()), this, SLOT(repaint()));
- connect(m_clip, SIGNAL(stateChanged()), this, SLOT(repaint()));
+ connect(m_clip, SIGNAL(stateChanged()), this,
SLOT(clip_state_changed()));
connect(m_clip, SIGNAL(lockChanged()), this, SLOT(repaint()));
- connect(m_clip, SIGNAL(gainChanged()), this, SLOT (gain_changed()));
connect(m_clip, SIGNAL(fadeAdded(FadeCurve*)), this,
SLOT(add_new_fadeview( FadeCurve*)));
connect(m_clip, SIGNAL(fadeRemoved(FadeCurve*)), this,
SLOT(remove_fadeview( FadeCurve*)));
connect(m_clip, SIGNAL(positionChanged(Snappable*)), this,
SLOT(position_changed()));
@@ -107,6 +107,9 @@
AudioClipView::~ AudioClipView()
{
+ if (m_editdialog) {
+ delete m_editdialog;
+ }
PENTERDES;
}
@@ -142,9 +145,9 @@
return;
}
- if (m_drawbackground) {
- bool mousehover = (option->state & QStyle::State_MouseOver);
+ bool mousehover = (option->state & QStyle::State_MouseOver) ||
m_dragging;
+ if (m_drawbackground) {
if (m_clip->recording_state() == AudioClip::RECORDING) {
m_backgroundColor = m_backgroundColorMouseHover =
themer()->get_color("AudioClip:background:recording");
} else {
@@ -167,6 +170,19 @@
}
}
+ if (m_song->get_mode() == Song::EDIT) {
+ if (mousehover)
+ m_waveBrush =
themer()->get_color("AudioClip:wavemacroview:brush:hover");
+ else
+ m_waveBrush =
themer()->get_color("AudioClip:wavemacroview:brush");
+
+ } else {
+ if (mousehover)
+ m_waveBrush =
themer()->get_color("AudioClip:wavemacroview:brush:curvemode:hover");
+ else
+ m_waveBrush =
themer()->get_color("AudioClip:wavemacroview:brush:curvemode");
+ }
+
int channels = m_clip->get_channels();
@@ -443,12 +459,12 @@
if (m_song->get_mode() == Song::EDIT) {
p->setPen(themer()->get_color("AudioClip:wavemacroview:outline"));
if (m_fillwave) {
-
p->setBrush(themer()->get_color("AudioClip:wavemacroview:brush"));
+ p->setBrush(m_waveBrush);
}
} else {
p->setPen(themer()->get_color("AudioClip:wavemacroview:outline:curvemode"));
if (m_fillwave) {
-
p->setBrush(themer()->get_color("AudioClip:wavemacroview:brush:curvemode"));
+ p->setBrush(m_waveBrush);
}
}
if (m_clip->is_muted()) {
@@ -558,12 +574,6 @@
return m_clip;
}
-void AudioClipView::gain_changed( )
-{
- create_clipinfo_string();
- update();
-}
-
void AudioClipView::add_new_fadeview( FadeCurve * fade )
{
PENTER;
@@ -800,5 +810,19 @@
setParentItem(m_tv);
}
-//eof
+Command * AudioClipView::edit_properties()
+{
+ if (!m_editdialog) {
+ m_editdialog = new AudioClipEditDialog(m_clip,
Interface::instance());
+ }
+
+ m_editdialog->exec();
+
+ return 0;
+}
+void AudioClipView::clip_state_changed()
+{
+ create_clipinfo_string();
+ update();
+}
Index: src/traverso/songcanvas/AudioClipView.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/AudioClipView.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- src/traverso/songcanvas/AudioClipView.h 24 May 2007 18:28:59 -0000
1.26
+++ src/traverso/songcanvas/AudioClipView.h 28 Jun 2007 14:57:22 -0000
1.27
@@ -36,6 +36,7 @@
class FadeView;
class Peak;
class PositionIndicator;
+class AudioClipEditDialog;
class AudioClipView : public ViewItem
{
@@ -45,6 +46,7 @@
Q_CLASSINFO("select_fade_out_shape", tr("Out: Select shape"));
Q_CLASSINFO("reset_fade", tr("In/Out: Reset"));
Q_CLASSINFO("set_audio_file", tr("Reset Audio File"));
+ Q_CLASSINFO("edit_properties", tr("Edit Properties"));
public:
AudioClipView(SongView* view, TrackView* parent, AudioClip* clip);
@@ -77,6 +79,7 @@
CurveView* curveView;
QList<Peak*> m_peakloadinglist;
PositionIndicator* m_posIndicator;
+ AudioClipEditDialog* m_editdialog;
QTimer m_recordingTimer;
@@ -98,6 +101,7 @@
int m_fillwave;
QColor m_backgroundColor;
QColor m_backgroundColorMouseHover;
+ QBrush m_waveBrush;
QString m_clipinfoString;
@@ -112,7 +116,6 @@
public slots:
void add_new_fadeview(FadeCurve* fade);
void remove_fadeview(FadeCurve* fade);
- void gain_changed();
void repaint();
void update_start_pos();
void position_changed();
@@ -122,6 +125,7 @@
Command* select_fade_out_shape();
Command* reset_fade();
Command* set_audio_file();
+ Command* edit_properties();
private slots:
void update_progress_info(int progress);
@@ -129,6 +133,7 @@
void start_recording();
void finish_recording();
void update_recording();
+ void clip_state_changed();
};
Index: src/traverso/songcanvas/MarkerView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/MarkerView.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- src/traverso/songcanvas/MarkerView.cpp 22 May 2007 16:35:35 -0000
1.19
+++ src/traverso/songcanvas/MarkerView.cpp 28 Jun 2007 14:57:22 -0000
1.20
@@ -132,10 +132,10 @@
if (b) {
m_fillColor = themer()->get_color("Marker:blink");
- m_line->set_color(QColor(0, 0, 0, 200));
+ m_line->set_color(QColor(0, 0, 0, 140));
} else {
m_fillColor = themer()->get_color("Marker:default");
- m_line->set_color(QColor(0, 0, 0, 80));
+ m_line->set_color(QColor(0, 0, 0, 45));
}
m_line->update();
Index: src/traverso/songcanvas/PositionIndicator.cpp
===================================================================
RCS file:
/sources/traverso/traverso/src/traverso/songcanvas/PositionIndicator.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- src/traverso/songcanvas/PositionIndicator.cpp 5 May 2007 20:54:03
-0000 1.4
+++ src/traverso/songcanvas/PositionIndicator.cpp 28 Jun 2007 14:57:22
-0000 1.5
@@ -52,7 +52,7 @@
QPainter painter(&m_background);
painter.setRenderHint(QPainter::Antialiasing);
- painter.setBrush(QColor(255, 255, 255, 225));
+ painter.setBrush(QColor(255, 255, 255));
painter.setPen(Qt::NoPen);
int rounding = 10;
painter.drawRoundRect(0, 0, (int)m_boundingRect.width(),
(int)m_boundingRect.height(), rounding, rounding);