X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.0%2Fcinelerra%2Finterfaceprefs.C;h=4758a1ae38bc577b0abfd4af488f81c83dba44c4;hp=3ef53c9f1aa2025c3c12605b48809b92ab17bca4;hb=52fcc46226f9df46f9ce9d0566dc568455a7db0b;hpb=8bbd1679c5811ba26608d5fc9ed60cedeb2bc103

diff --git a/cinelerra-5.0/cinelerra/interfaceprefs.C b/cinelerra-5.0/cinelerra/interfaceprefs.C
index 3ef53c9f..4758a1ae 100644
--- a/cinelerra-5.0/cinelerra/interfaceprefs.C
+++ b/cinelerra-5.0/cinelerra/interfaceprefs.C
@@ -28,6 +28,7 @@
 #include "preferences.h"
 #include "preferencesthread.h"
 #include "interfaceprefs.h"
+#include "shbtnprefs.h"
 #include "theme.h"
 
 #if 0
@@ -45,8 +46,37 @@ N_("No effect")
 InterfacePrefs::InterfacePrefs(MWindow *mwindow, PreferencesWindow *pwindow)
  : PreferencesDialog(mwindow, pwindow)
 {
+	hms = 0;
+	hmsf = 0;
+	samples = 0;
+	frames = 0;
+	hex = 0;
+	feet = 0;
+	min_db = 0;
+	max_db = 0;
+//	vu_db = 0;
+//	vu_int = 0;
+	thumbnails = 0;
+	shbtn_dialog = 0;
 }
 
+InterfacePrefs::~InterfacePrefs()
+{
+	delete hms;
+	delete hmsf;
+	delete samples;
+	delete frames;
+	delete hex;
+	delete feet;
+	delete min_db;
+	delete max_db;
+//	delete vu_db;
+//	delete vu_int;
+	delete thumbnails;
+	delete shbtn_dialog;
+}
+
+
 void InterfacePrefs::create_objects()
 {
 	int x, y;
@@ -154,7 +184,7 @@ void InterfacePrefs::create_objects()
 
 	add_subwindow(thumbnails = new ViewThumbnails(x, y, pwindow));
 
-	int x2 = x + 320, y2 = y;
+	int x2 = x + 400, y2 = y;
 	AndroidRemote *android_remote = new AndroidRemote(pwindow, x2, y2);
 	add_subwindow(android_remote);
 	y2 += android_remote->get_h() + 10;
@@ -167,6 +197,9 @@ void InterfacePrefs::create_objects()
 	AndroidPIN *android_pin = new AndroidPIN(pwindow, x3, y2);
 	add_subwindow(android_pin);
 
+	y2 += title->get_h() + 30;
+	add_subwindow(new ShBtnPrefs(pwindow, this, x2, y2));
+
 	y += 35;
 	add_subwindow(new BC_Title(x, y, _("Clicking on edit boundaries does what:")));
 	y += 25;
@@ -254,22 +287,6 @@ int InterfacePrefs::update(int new_value)
 	return 0;
 }
 
-InterfacePrefs::~InterfacePrefs()
-{
-	delete hms;
-	delete hmsf;
-	delete samples;
-	delete frames;
-	delete hex;
-	delete feet;
-	delete min_db;
-	delete max_db;
-//	delete vu_db;
-//	delete vu_int;
-	delete thumbnails;
-}
-
-
 
 
 
@@ -687,7 +704,6 @@ int AndroidRemote::handle_event()
 	return 1;
 }
 
-
 AndroidPIN::AndroidPIN(PreferencesWindow *pwindow, int x, int y)
  : BC_TextBox(x, y, 240, 1, pwindow->thread->preferences->android_pin)
 {
@@ -720,3 +736,24 @@ int AndroidPort::handle_event()
 	return 1;
 }
 
+int InterfacePrefs::start_shbtn_dialog()
+{
+	if( !shbtn_dialog )
+		shbtn_dialog = new ShBtnEditDialog(pwindow);
+	shbtn_dialog->start();
+	return 1;
+}
+
+ShBtnPrefs::ShBtnPrefs(PreferencesWindow *pwindow, InterfacePrefs *iface_prefs, int x, int y)
+ : BC_GenericButton(x, y, _("Shell Commands"))
+{
+	this->pwindow = pwindow;
+	this->iface_prefs = iface_prefs;
+	set_tooltip(_("Main Menu Shell Commands"));
+}
+
+int ShBtnPrefs::handle_event()
+{
+	return iface_prefs->start_shbtn_dialog();
+}
+