BC_SubMenu *submenu;
add_item(info = new AssetPopupInfo(mwindow, this));
add_item(format = new AWindowListFormat(mwindow, gui));
- add_item(new AssetPopupSort(mwindow, this));
+ add_item(menu_item = new BC_MenuItem(_("Sort...")));
+ menu_item->add_submenu(submenu = new BC_SubMenu());
+ submenu->add_submenuitem(new AssetPopupSortNames(mwindow, this));
+ submenu->add_submenuitem(new AssetPopupSortTimes(mwindow, this));
add_item(index = new AssetPopupBuildIndex(mwindow, this));
add_item(view = new AssetPopupView(mwindow, this));
add_item(view_window = new AssetPopupViewWindow(mwindow, this));
}
-AssetPopupSort::AssetPopupSort(MWindow *mwindow, AssetPopup *popup)
- : BC_MenuItem(_("Sort items"))
+AssetPopupSortNames::AssetPopupSortNames(MWindow *mwindow, AssetPopup *popup)
+ : BC_MenuItem(_("Sort names"))
+{
+ this->mwindow = mwindow;
+ this->popup = popup;
+}
+
+AssetPopupSortNames::~AssetPopupSortNames()
+{
+}
+
+int AssetPopupSortNames::handle_event()
+{
+ mwindow->awindow->gui->sort_assets(0);
+ return 1;
+}
+
+AssetPopupSortTimes::AssetPopupSortTimes(MWindow *mwindow, AssetPopup *popup)
+ : BC_MenuItem(_("Sort times"))
{
this->mwindow = mwindow;
this->popup = popup;
}
-AssetPopupSort::~AssetPopupSort()
+AssetPopupSortTimes::~AssetPopupSortTimes()
{
}
-int AssetPopupSort::handle_event()
+int AssetPopupSortTimes::handle_event()
{
- mwindow->awindow->gui->sort_assets();
+ mwindow->awindow->gui->sort_assets(1);
return 1;
}
int AssetPopupMixer::handle_event()
{
+ ArrayList<ZWindow *>new_mixers;
+
mwindow->select_zwindow(0);
for( int i=0; i<mwindow->session->drag_assets->total; ++i ) {
Indexable *indexable = mwindow->session->drag_assets->values[i];
char *tp = strrchr(path, '/');
if( !tp ) tp = path; else ++tp;
zwindow->set_title(tp);
- zwindow->start();
+ new_mixers.append(zwindow);
}
- mwindow->queue_mixers(mwindow->edl,CURRENT_FRAME,0,0,1,0);
+
+ mwindow->tile_mixers();
+ for( int i=0; i<new_mixers.size(); ++i )
+ new_mixers[i]->start();
+
+ mwindow->refresh_mixers();
mwindow->resync_guis();
return 1;
}