X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fawindowgui.C;h=03c8f22132266cb337352178e5910869503436cb;hp=c3147a462302cb646ee5c8b370365062894d8441;hb=0df48ad2d876409c5beeae2e21933a728ea76c33;hpb=281532ab870d8f6ded35d8e8555bf974014ace77

diff --git a/cinelerra-5.1/cinelerra/awindowgui.C b/cinelerra-5.1/cinelerra/awindowgui.C
index c3147a46..03c8f221 100644
--- a/cinelerra-5.1/cinelerra/awindowgui.C
+++ b/cinelerra-5.1/cinelerra/awindowgui.C
@@ -1258,7 +1258,7 @@ AWindowGUI::AWindowGUI(MWindow *mwindow, AWindow *awindow)
  : BC_Window(_(PROGRAM_NAME ": Resources"),
 	mwindow->session->awindow_x, mwindow->session->awindow_y,
 	mwindow->session->awindow_w, mwindow->session->awindow_h,
-	100, 100, 1, 1, 1)
+	xS(100), yS(100), 1, 1, 1)
 {
 	this->mwindow = mwindow;
 	this->awindow = awindow;
@@ -1422,6 +1422,7 @@ void AWindowGUI::plugin_icon(VFrame *&vfrm, BC_Pixmap *&icon, const char *fn, un
 
 void AWindowGUI::create_objects()
 {
+	int ys5 = yS(5), ys10 = yS(10);
 	lock_window("AWindowGUI::create_objects");
 	asset_titles[0] = C_("Title");
 	asset_titles[1] = _("Comments");
@@ -1482,9 +1483,9 @@ void AWindowGUI::create_objects()
 
 	int x1 = mwindow->theme->alist_x, y1 = mwindow->theme->alist_y;
 	int w1 = mwindow->theme->alist_w, h1 = mwindow->theme->alist_h;
-	search_text = new AWindowSearchText(mwindow, this, x1, y1+5);
+	search_text = new AWindowSearchText(mwindow, this, x1, y1+ys5);
 	search_text->create_objects();
-	int dy = search_text->get_h() + 10;
+	int dy = search_text->get_h() + ys10;
 	y1 += dy;  h1 -= dy;
 	add_subwindow(asset_list = new AWindowAssets(mwindow, this, x1, y1, w1, h1));
 
@@ -1507,7 +1508,7 @@ void AWindowGUI::create_objects()
 		int nw = get_text_width(MEDIUMFONT, _(av_names[i]));
 		if( tw < nw )  tw = nw;
 	}
-	int pw = BC_PopupMenu::calculate_w(16, tw, 1);
+	int pw = BC_PopupMenu::calculate_w(xS(16), tw, 1);
 	const char *text = _(AVIconDrawing::avicon_names[vicon_drawing]);
 	add_subwindow(avicon_drawing = new AVIconDrawing(this, fw, fy, pw, text));
 	avicon_drawing->create_objects();
@@ -1596,10 +1597,11 @@ int AWindowGUI::translation_event()
 
 void AWindowGUI::reposition_objects()
 {
+	int ys5 = yS(5), ys10 = yS(10);
 	int x1 = mwindow->theme->alist_x, y1 = mwindow->theme->alist_y;
 	int w1 = mwindow->theme->alist_w, h1 = mwindow->theme->alist_h;
-	search_text->reposition_window(x1, y1+5, w1);
-	int dy = search_text->get_h() + 10;
+	search_text->reposition_window(x1, y1+ys5, w1);
+	int dy = search_text->get_h() + ys10;
 	y1 += dy;  h1 -= dy;
 	asset_list->reposition_window(x1, y1, w1, h1);
 	divider->reposition_window(
@@ -1617,6 +1619,7 @@ int AWindowGUI::save_defaults(BC_Hash *defaults)
 {
 	defaults->update("PLUGIN_VISIBILTY", plugin_visibility);
 	defaults->update("VICON_DRAWING", vicon_drawing);
+	defaults->update("TIP_INFO", tip_info);
 	return 0;
 }
 
@@ -1624,6 +1627,7 @@ int AWindowGUI::load_defaults(BC_Hash *defaults)
 {
 	plugin_visibility = defaults->get("PLUGIN_VISIBILTY", plugin_visibility);
 	vicon_drawing = defaults->get("VICON_DRAWING", vicon_drawing);
+	tip_info = defaults->get("TIP_INFO", tip_info);
 	return 0;
 }
 
@@ -1727,10 +1731,18 @@ int AWindowGUI::cycle_assetlist_format()
 	return 1;
 }
 
+void AWindowGUI::hide_tip_info()
+{
+	asset_list->hide_tooltip();
+}
+
+
 AWindowRemovePluginGUI::
 AWindowRemovePluginGUI(AWindow *awindow, AWindowRemovePlugin *thread,
 	int x, int y, PluginServer *plugin)
- : BC_Window(_(PROGRAM_NAME ": Remove plugin"), x,y, 500,200, 50, 50, 1, 0, 1, -1, "", 1)
+ : BC_Window(_(PROGRAM_NAME ": Remove plugin"), x,y,
+		xS(500),yS(200), xS(50), yS(50),
+		1, 0, 1, -1, "", 1)
 {
 	this->awindow = awindow;
 	this->thread = thread;
@@ -1750,17 +1762,19 @@ AWindowRemovePluginGUI::
 
 void AWindowRemovePluginGUI::create_objects()
 {
+	int xs10 = xS(10), xs20 = xS(20);
+	int ys5 = yS(5), ys10 = yS(10);
 	lock_window("AWindowRemovePluginGUI::create_objects");
 	BC_Button *ok_button = new BC_OKButton(this);
 	add_subwindow(ok_button);
 	BC_Button *cancel_button = new BC_CancelButton(this);
 	add_subwindow(cancel_button);
-	int x = 10, y = 10;
+	int x = xs10, y = ys10;
 	BC_Title *title = new BC_Title(x, y, _("remove plugin?"));
 	add_subwindow(title);
-	y += title->get_h() + 5;
+	y += title->get_h() + ys5;
 	list = new BC_ListBox(x, y,
-		get_w() - 20, ok_button->get_y() - y - 5, LISTBOX_TEXT, &plugin_list,
+		get_w() - xs20, ok_button->get_y() - y - ys5, LISTBOX_TEXT, &plugin_list,
 		0, 0, 1, 0, 0, LISTBOX_SINGLE, ICON_LEFT, 0);
 	add_subwindow(list);
 	show_window();
@@ -1856,6 +1870,10 @@ int AWindowGUI::keypress_event()
 			return 1;
 		}
 		break;
+	case 'i':
+		tip_info = !tip_info ? 1 : 0;
+		if( !tip_info ) hide_tip_info();
+		return 1;
 	case 'o':
 		if( !ctrl_down() && !shift_down() ) {
 			assetlist_menu->load_file->handle_event();
@@ -2484,7 +2502,7 @@ int AWindowDivider::button_press_event()
 int AWindowDivider::cursor_motion_event()
 {
 	if( mwindow->session->current_operation == DRAG_PARTITION ) {
-		int wmin = 25;
+		int wmin = xS(25);
 		int wmax = mwindow->session->awindow_w - mwindow->theme->adivider_w - wmin;
 		int fw = gui->get_relative_cursor_x();
 		if( fw > wmax ) fw = wmax;
@@ -2571,6 +2589,7 @@ int AWindowFolders::selection_changed()
 
 int AWindowFolders::button_press_event()
 {
+	gui->hide_tip_info();
 	int result = BC_ListBox::button_press_event();
 
 	if( !result ) {
@@ -2692,6 +2711,7 @@ AWindowAssets::AWindowAssets(MWindow *mwindow, AWindowGUI *gui, int x, int y, in
 {
 	this->mwindow = mwindow;
 	this->gui = gui;
+	this->info_tip = -1;
 	set_drag_scroll(0);
 	set_scroll_stretch(1, 1);
 }
@@ -2702,6 +2722,7 @@ AWindowAssets::~AWindowAssets()
 
 int AWindowAssets::button_press_event()
 {
+	hide_tip_info();
 	AssetVIconThread *avt = gui->vicon_thread;
 	if( avt->draw_mode != ASSET_VIEW_NONE && is_event_win() ) {
 		int dir = 1, button = get_buttonpress();
@@ -2872,7 +2893,7 @@ void AWindowAssets::draw_background()
 	set_font(LARGEFONT);
 	int folder = mwindow->edl->session->awindow_folder;
 	const char *title = mwindow->edl->get_folder_name(folder);
-	draw_text(get_w() - get_text_width(LARGEFONT, title) - 4, 30,
+	draw_text(get_w() - get_text_width(LARGEFONT, title) - xS(4), yS(30),
 		title, -1, get_bg_surface());
 }
 
@@ -3049,6 +3070,7 @@ int AWindowAssets::cursor_enter_event()
 
 int AWindowAssets::cursor_leave_event()
 {
+	hide_tip_info();
 	if( !is_event_win() ) return 0;
 	if( !gui->vicon_thread->viewing )
 		gui->stop_vicon_drawing();
@@ -3099,7 +3121,32 @@ int AWindowAssets::mouse_over_event(int no)
 	default:
 		break;
 	}
-	return 0;
+	if( no < 0 && info_tip >= 0 ) {
+		hide_tip_info();
+	}
+	if( gui->tip_info && no >= 0 &&
+	    info_tip != no && picon && picon->plugin ) {
+		const char *info = picon->plugin->tip;
+		if( !info ) info = _("No info available");
+		show_tip_info(info, no);
+	}
+	return 1;
+}
+
+void AWindowAssets::show_tip_info(const char *info, int no)
+{
+	int tw = get_text_width(MEDIUMFONT, info) + TOOLTIP_MARGIN * 2;
+	int th = get_text_height(MEDIUMFONT, info) + TOOLTIP_MARGIN * 2;
+	int tx = get_w() - (tw + xS(28));
+	int ty = get_h() - (th + yS(28));
+	show_tooltip(info, tx, ty, tw, th);
+	info_tip = no;
+}
+
+void AWindowAssets::hide_tip_info()
+{
+	hide_tooltip();
+	info_tip = -1;
 }
 
 
@@ -3124,10 +3171,11 @@ AWindowSearchText::AWindowSearchText(MWindow *mwindow, AWindowGUI *gui, int x, i
 
 void AWindowSearchText::create_objects()
 {
-	int x1 = x, y1 = y, margin = 10;
+	int xs10 = xS(10);
+	int x1 = x, y1 = y;
 	gui->add_subwindow(text_title = new BC_Title(x1, y1, _("Search:")));
-	x1 += text_title->get_w() + margin;
-	int w1 = gui->get_w() - x1 - 2*margin;
+	x1 += text_title->get_w() + xs10;
+	int w1 = gui->get_w() - x1 - 2*xs10;
 	gui->add_subwindow(text_box = new AWindowSearchTextBox(this, x1, y1, w1));
 }
 
@@ -3139,7 +3187,7 @@ int AWindowSearchText::handle_event()
 
 int AWindowSearchText::get_w()
 {
-	return text_box->get_w() + text_title->get_w() + 10;
+	return text_box->get_w() + text_title->get_w() + xS(10);
 }
 
 int AWindowSearchText::get_h()
@@ -3149,10 +3197,11 @@ int AWindowSearchText::get_h()
 
 void AWindowSearchText::reposition_window(int x, int y, int w)
 {
-	int x1 = x, y1 = y, margin = 10;
+	int xs10 = xS(10);
+	int x1 = x, y1 = y;
 	text_title->reposition_window(x1, y1);
-	x1 += text_title->get_w() + margin;
-	int w1 = gui->get_w() - x1 - 2*margin;
+	x1 += text_title->get_w() + xs10;
+	int w1 = gui->get_w() - x1 - 2*xs10;
 	text_box->reposition_window(x1, y1, w1);
 }