projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1ca60a8
)
Remove extra unnecessary type string in timeline views.
author
Carl Hetherington
<cth@carlh.net>
Mon, 16 Nov 2015 09:41:22 +0000
(09:41 +0000)
committer
Carl Hetherington
<cth@carlh.net>
Mon, 16 Nov 2015 09:41:22 +0000
(09:41 +0000)
src/wx/timeline_audio_content_view.cc
patch
|
blob
|
history
src/wx/timeline_audio_content_view.h
patch
|
blob
|
history
src/wx/timeline_content_view.cc
patch
|
blob
|
history
src/wx/timeline_content_view.h
patch
|
blob
|
history
src/wx/timeline_subtitle_content_view.cc
patch
|
blob
|
history
src/wx/timeline_subtitle_content_view.h
patch
|
blob
|
history
src/wx/timeline_video_content_view.cc
patch
|
blob
|
history
src/wx/timeline_video_content_view.h
patch
|
blob
|
history
diff --git
a/src/wx/timeline_audio_content_view.cc
b/src/wx/timeline_audio_content_view.cc
index a9e3a6a425aa73954c6754742705c1f285c3bd8c..325830e8598bd1be13311d02ed8f87e5f8dade4f 100644
(file)
--- a/
src/wx/timeline_audio_content_view.cc
+++ b/
src/wx/timeline_audio_content_view.cc
@@
-31,12
+31,6
@@
TimelineAudioContentView::TimelineAudioContentView (Timeline& tl, shared_ptr<Con
}
}
-wxString
-TimelineAudioContentView::type () const
-{
- return _("audio");
-}
-
wxColour
TimelineAudioContentView::background_colour () const
{
wxColour
TimelineAudioContentView::background_colour () const
{
diff --git
a/src/wx/timeline_audio_content_view.h
b/src/wx/timeline_audio_content_view.h
index 6f1a383deecfc1952fa8d41100ee7271353c8712..3d034eed4c192e6fe6a07deeb727fa7df5384433 100644
(file)
--- a/
src/wx/timeline_audio_content_view.h
+++ b/
src/wx/timeline_audio_content_view.h
@@
-28,7
+28,6
@@
public:
TimelineAudioContentView (Timeline& tl, boost::shared_ptr<Content> c);
private:
TimelineAudioContentView (Timeline& tl, boost::shared_ptr<Content> c);
private:
- wxString type () const;
wxColour background_colour () const;
wxColour foreground_colour () const;
};
wxColour background_colour () const;
wxColour foreground_colour () const;
};
diff --git
a/src/wx/timeline_content_view.cc
b/src/wx/timeline_content_view.cc
index 324790f8715a4ae3e4f9a3498f92bebee030aca0..858214c33945cf83fe09e6b18a1ffa86e080f1cd 100644
(file)
--- a/
src/wx/timeline_content_view.cc
+++ b/
src/wx/timeline_content_view.cc
@@
-121,7
+121,7
@@
TimelineContentView::do_paint (wxGraphicsContext* gc)
gc->StrokePath (path);
gc->FillPath (path);
gc->StrokePath (path);
gc->FillPath (path);
- wxString name =
wxString::Format (wxT ("%s [%s]"), std_to_wx (cont->summary()).data(), type().data
());
+ wxString name =
std_to_wx (cont->summary
());
wxDouble name_width;
wxDouble name_height;
wxDouble name_descent;
wxDouble name_width;
wxDouble name_height;
wxDouble name_descent;
diff --git
a/src/wx/timeline_content_view.h
b/src/wx/timeline_content_view.h
index 3262f13f37ad71cecdd36b519e850c431504f323..676e4792bbc95687f1ea1f27f1a9a45375f96452 100644
(file)
--- a/
src/wx/timeline_content_view.h
+++ b/
src/wx/timeline_content_view.h
@@
-43,7
+43,6
@@
public:
void unset_track ();
boost::optional<int> track () const;
void unset_track ();
boost::optional<int> track () const;
- virtual wxString type () const = 0;
virtual wxColour background_colour () const = 0;
virtual wxColour foreground_colour () const = 0;
virtual wxColour background_colour () const = 0;
virtual wxColour foreground_colour () const = 0;
diff --git
a/src/wx/timeline_subtitle_content_view.cc
b/src/wx/timeline_subtitle_content_view.cc
index 3d1766391eb678291c2939083bddfbb299738360..559fc7f4d2a93834f07ddbb2578e750e70109ded 100644
(file)
--- a/
src/wx/timeline_subtitle_content_view.cc
+++ b/
src/wx/timeline_subtitle_content_view.cc
@@
-29,12
+29,6
@@
TimelineSubtitleContentView::TimelineSubtitleContentView (Timeline& tl, shared_p
}
}
-wxString
-TimelineSubtitleContentView::type () const
-{
- return _("subtitles");
-}
-
wxColour
TimelineSubtitleContentView::background_colour () const
{
wxColour
TimelineSubtitleContentView::background_colour () const
{
diff --git
a/src/wx/timeline_subtitle_content_view.h
b/src/wx/timeline_subtitle_content_view.h
index b2ba96c7059eb4d24c6cb2bf3df49183e8c91128..42ba432f382e7400ab7ec7fcdfefa4bf295da9e5 100644
(file)
--- a/
src/wx/timeline_subtitle_content_view.h
+++ b/
src/wx/timeline_subtitle_content_view.h
@@
-30,7
+30,6
@@
public:
TimelineSubtitleContentView (Timeline& tl, boost::shared_ptr<SubtitleContent> c);
private:
TimelineSubtitleContentView (Timeline& tl, boost::shared_ptr<SubtitleContent> c);
private:
- wxString type () const;
wxColour background_colour () const;
wxColour foreground_colour () const;
wxColour background_colour () const;
wxColour foreground_colour () const;
diff --git
a/src/wx/timeline_video_content_view.cc
b/src/wx/timeline_video_content_view.cc
index 6d37c68a61ecea788a85786716cfbee8485f6564..a54b91de02ca864b84947e3d2353ba904f929acb 100644
(file)
--- a/
src/wx/timeline_video_content_view.cc
+++ b/
src/wx/timeline_video_content_view.cc
@@
-29,16
+29,6
@@
TimelineVideoContentView::TimelineVideoContentView (Timeline& tl, shared_ptr<Con
}
}
-wxString
-TimelineVideoContentView::type () const
-{
- if (dynamic_pointer_cast<ImageContent> (content ()) && content()->number_of_paths() == 1) {
- return _("still");
- } else {
- return _("video");
- }
-}
-
wxColour
TimelineVideoContentView::background_colour () const
{
wxColour
TimelineVideoContentView::background_colour () const
{
diff --git
a/src/wx/timeline_video_content_view.h
b/src/wx/timeline_video_content_view.h
index 3dd76140a32d654e922ab1956b387313df597be9..795c23006114a95b82b1e72bc0724fde29b617a3 100644
(file)
--- a/
src/wx/timeline_video_content_view.h
+++ b/
src/wx/timeline_video_content_view.h
@@
-28,7
+28,6
@@
public:
TimelineVideoContentView (Timeline& tl, boost::shared_ptr<Content> c);
private:
TimelineVideoContentView (Timeline& tl, boost::shared_ptr<Content> c);
private:
- wxString type () const;
wxColour background_colour () const;
wxColour foreground_colour () const;
};
wxColour background_colour () const;
wxColour foreground_colour () const;
};