X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Faboutprefs.C;h=0ffb807292741a15deb42138f1c05e0b4381156e;hb=bd7011a86f60b4ef1abf11e2667373eba3a98c99;hp=d07ce4deac0d5ee77e97dab2596e7afd6cf65f4c;hpb=7fd85fb66168f6b518c5f2d73e04036e87faa0e1;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/aboutprefs.C b/cinelerra-5.1/cinelerra/aboutprefs.C
index d07ce4de..0ffb8072 100644
--- a/cinelerra-5.1/cinelerra/aboutprefs.C
+++ b/cinelerra-5.1/cinelerra/aboutprefs.C
@@ -28,14 +28,18 @@
 #include "vframe.h"
 #include "versioninfo.h"
 
+
 #ifndef COMPILEDATE
 #define COMPILEDATE "built: " __DATE__ " " __TIME__
 #endif
 const char *AboutPrefs::build_timestamp = COMPILEDATE;
+const char *AboutPrefs::ffmpeg_version  = CINELERRA_LIBAV_VERSION;
 
 AboutPrefs::AboutPrefs(MWindow *mwindow, PreferencesWindow *pwindow)
  : PreferencesDialog(mwindow, pwindow)
 {
+// *** CONTEXT_HELP ***
+	context_help_set_keyword("About");
 }
 
 AboutPrefs::~AboutPrefs()
@@ -47,15 +51,8 @@ void AboutPrefs::create_objects()
 {
 	lock_window("AboutPrefs::create_objects");
 	int x, y;
-
-
 	BC_Resources *resources = BC_WindowBase::get_resources();
 
-// 	add_subwindow(new BC_Title(mwindow->theme->preferencestitle_x,
-// 		mwindow->theme->preferencestitle_y,
-// 		_("About"),
-// 		LARGEFONT,
-// 		resources->text_default));
 
 	x = mwindow->theme->preferencesoptions_x;
 	y = mwindow->theme->preferencesoptions_y +
@@ -72,7 +69,12 @@ void AboutPrefs::create_objects()
 	COPYRIGHTTEXT2
 #endif
 	);
-	y += get_text_height(MEDIUMFONT) * 3;
+	y += 2*get_text_height(MEDIUMFONT);
+	draw_text(x,y, COPYRIGHTTEXT3);
+	y += get_text_height(MEDIUMFONT);
+	draw_text(x,y, COPYRIGHTTEXT4);
+	
+	y += get_text_height(MEDIUMFONT) * 2;
 
 
 	const char *cfg_path = File::get_cindat_path();
@@ -99,12 +101,12 @@ void AboutPrefs::create_objects()
 			about.append(new BC_ListBoxItem(msg));
 		}
 		BC_ListBox *listbox;
-		add_subwindow(listbox = new BC_ListBox(x, y, 450, 280,
+		add_subwindow(listbox = new BC_ListBox(x, y, xS(450), yS(250),
 			LISTBOX_TEXT, &about, 0, 0, 1));
-		y += listbox->get_h() + get_text_height(LARGEFONT) + 10;
+		y += listbox->get_h() + get_text_height(LARGEFONT) + yS(10);
 	}
 	else
-		y += 300 + get_text_height(LARGEFONT) + 10;
+		y += yS(300) + get_text_height(LARGEFONT) + yS(10);
 
 	set_font(LARGEFONT);
 	set_color(resources->text_default);
@@ -125,27 +127,28 @@ void AboutPrefs::create_objects()
 	y += get_text_height(MEDIUMFONT, license3);
 
 	draw_text(x, y, build_timestamp);
+	x += get_text_width(MEDIUMFONT, build_timestamp);
+	draw_text(x,y, " ");
+	x += get_text_width(MEDIUMFONT, " ");
+	draw_text(x,y, ffmpeg_version);
+	x -= get_text_width(MEDIUMFONT, build_timestamp);
+	x -= get_text_width(MEDIUMFONT, " ");
 #if defined(REPOMAINTXT)
 	y += get_text_height(MEDIUMFONT, build_timestamp);
 	draw_text(x, y, REPOMAINTXT);
 #endif
 
-	x = get_w() - mwindow->theme->about_bg->get_w() - 10;
+	x = get_w() - mwindow->theme->about_bg->get_w() - xS(10);
 	y = mwindow->theme->preferencesoptions_y;
 	BC_Pixmap *temp_pixmap = new BC_Pixmap(this,
 		mwindow->theme->about_bg,
 		PIXMAP_ALPHA);
-	draw_pixmap(temp_pixmap,
-		x,
-		y);
-
+	draw_pixmap(temp_pixmap, x, y);
 	delete temp_pixmap;
 
-
-	x += mwindow->theme->about_bg->get_w() + 10;
+	x += mwindow->theme->about_bg->get_w() + xS(10);
 	y += get_text_height(LARGEFONT) * 2;
 
-
 	flash();
 	flush();
 	unlock_window();