projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Keep the Target Param Dialog above its parent
[synfig.git]
/
synfig-studio
/
src
/
gtkmm
/
dialog_targetparam.cpp
diff --git
a/synfig-studio/src/gtkmm/dialog_targetparam.cpp
b/synfig-studio/src/gtkmm/dialog_targetparam.cpp
index
14db3e6
..
ac8540b
100644
(file)
--- a/
synfig-studio/src/gtkmm/dialog_targetparam.cpp
+++ b/
synfig-studio/src/gtkmm/dialog_targetparam.cpp
@@
-53,7
+53,7
@@
using namespace studio;
*/
const char* allowed_video_codecs[] =
{
*/
const char* allowed_video_codecs[] =
{
- "flv", "h263p", "huffyuv", "libtheora", "libx264",
"libxvid",
+ "flv", "h263p", "huffyuv", "libtheora", "libx264",
"mjpeg", "mpeg1video", "mpeg2video", "mpeg4", "msmpeg4",
"msmpeg4v1", "msmpeg4v2", "wmv1", "wmv2", "customvc", NULL
};
"mjpeg", "mpeg1video", "mpeg2video", "mpeg4", "msmpeg4",
"msmpeg4v1", "msmpeg4v2", "wmv1", "wmv2", "customvc", NULL
};
@@
-69,11
+69,10
@@
const char* allowed_video_codecs_description[] =
_("Huffyuv / HuffYUV."),
_("libtheora Theora."),
_("libx264 H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10."),
_("Huffyuv / HuffYUV."),
_("libtheora Theora."),
_("libx264 H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10."),
- _("libxvidcore MPEG-4 part 2."),
_("MJPEG (Motion JPEG)."),
_("raw MPEG-1 video."),
_("raw MPEG-2 video."),
_("MJPEG (Motion JPEG)."),
_("raw MPEG-1 video."),
_("raw MPEG-2 video."),
- _("MPEG-4 part 2."),
+ _("MPEG-4 part 2.
(XviD/DivX)
"),
_("MPEG-4 part 2 Microsoft variant version 3."),
_("MPEG-4 part 2 Microsoft variant version 1."),
_("MPEG-4 part 2 Microsoft variant version 2."),
_("MPEG-4 part 2 Microsoft variant version 3."),
_("MPEG-4 part 2 Microsoft variant version 1."),
_("MPEG-4 part 2 Microsoft variant version 2."),
@@
-88,9
+87,9
@@
const char* allowed_video_codecs_description[] =
/* === E N T R Y P O I N T ================================================= */
/* === E N T R Y P O I N T ================================================= */
-Dialog_TargetParam::Dialog_TargetParam(synfig::TargetParam &tparam)
+Dialog_TargetParam::Dialog_TargetParam(Gtk::Window &parent, synfig::TargetParam &tparam):
+ Gtk::Dialog(_("TargetParam Dialog"), parent, false, true)
{
{
- set_title(_("TargetParam Dialog"));
set_tparam(tparam);
// Custom Video Codec Entry
Gtk::Label* custom_label(manage(new Gtk::Label(CUSTOM_VCODEC)));
set_tparam(tparam);
// Custom Video Codec Entry
Gtk::Label* custom_label(manage(new Gtk::Label(CUSTOM_VCODEC)));