various menu improvements

project/sequence.cpp

@@ -7,94 +7,94 @@
 
 Sequence::Sequence() :
 	playhead(0),
-    using_workarea(false),
-    workarea_in(0),
-    workarea_out(0),
-    wrapper_sequence(false)
+	using_workarea(false),
+	workarea_in(0),
+	workarea_out(0),
+	wrapper_sequence(false)
 {
 }
 
 Sequence::~Sequence() {
-    // dealloc all clips
-    for (int i=0;i<clips.size();i++) {
-        delete clips.at(i);
-    }
+	// dealloc all clips
+	for (int i=0;i<clips.size();i++) {
+		delete clips.at(i);
+	}
 }
 
 Sequence* Sequence::copy() {
-    Sequence* s = new Sequence();
-    s->name = name + " (copy)";
-    s->width = width;
-    s->height = height;
-    s->frame_rate = frame_rate;
-    s->audio_frequency = audio_frequency;
-    s->audio_layout = audio_layout;
-    s->clips.resize(clips.size());
-    for (int i=0;i<clips.size();i++) {
-        Clip* c = clips.at(i);
-        if (c == NULL) {
-            s->clips[i] = NULL;
-        } else {
-            Clip* copy = c->copy(s);
-            copy->linked = c->linked;
-            s->clips[i] = copy;
-        }
-    }
-    return s;
+	Sequence* s = new Sequence();
+	s->name = name + " (copy)";
+	s->width = width;
+	s->height = height;
+	s->frame_rate = frame_rate;
+	s->audio_frequency = audio_frequency;
+	s->audio_layout = audio_layout;
+	s->clips.resize(clips.size());
+	for (int i=0;i<clips.size();i++) {
+		Clip* c = clips.at(i);
+		if (c == NULL) {
+			s->clips[i] = NULL;
+		} else {
+			Clip* copy = c->copy(s);
+			copy->linked = c->linked;
+			s->clips[i] = copy;
+		}
+	}
+	return s;
 }
 
 long Sequence::getEndFrame() {
-    long end = 0;
-    for (int j=0;j<clips.size();j++) {
-        Clip* c = clips.at(j);
-        if (c != NULL && c->timeline_out > end) {
-            end = c->timeline_out;
-        }
-    }
-    return end;
+	long end = 0;
+	for (int j=0;j<clips.size();j++) {
+		Clip* c = clips.at(j);
+		if (c != NULL && c->timeline_out > end) {
+			end = c->timeline_out;
+		}
+	}
+	return end;
 }
 
 void Sequence::hard_delete_transition(Clip *c, int type) {
-    int transition_index = (type == TA_OPENING_TRANSITION) ? c->opening_transition : c->closing_transition;
-    if (transition_index > -1) {
-        bool del = true;
-        for (int i=0;i<clips.size();i++) {
-            Clip* cc = clips.at(i);
-            if (cc != NULL
-                    && c != cc
-                    && (cc->opening_transition == transition_index
-                        || cc->closing_transition == transition_index)) {
-                // another clip is using this, don't delete just yet
-                del = false;
-                break;
-            }
-        }
+	int transition_index = (type == TA_OPENING_TRANSITION) ? c->opening_transition : c->closing_transition;
+	if (transition_index > -1) {
+		bool del = true;
+		for (int i=0;i<clips.size();i++) {
+			Clip* cc = clips.at(i);
+			if (cc != NULL
+					&& c != cc
+					&& (cc->opening_transition == transition_index
+						|| cc->closing_transition == transition_index)) {
+				// another clip is using this, don't delete just yet
+				del = false;
+				break;
+			}
+		}
 
-        if (del) {
-            delete transitions.at(transition_index);
-            transitions[transition_index] = NULL;
-        }
+		if (del) {
+			delete transitions.at(transition_index);
+			transitions[transition_index] = NULL;
+		}
 
-        if (type == TA_OPENING_TRANSITION) {
-            c->opening_transition = -1;
-        } else {
-            c->closing_transition = -1;
-        }
-    }
+		if (type == TA_OPENING_TRANSITION) {
+			c->opening_transition = -1;
+		} else {
+			c->closing_transition = -1;
+		}
+	}
 }
 
 void Sequence::getTrackLimits(int* video_tracks, int* audio_tracks) {
 	int vt = 0;
 	int at = 0;
-    for (int j=0;j<clips.size();j++) {
-        Clip* c = clips.at(j);
-        if (c != NULL) {
-            if (c->track < 0 && c->track < vt) { // video clip
-                vt = c->track;
-            } else if (c->track > at) {
-                at = c->track;
-            }
-        }
+	for (int j=0;j<clips.size();j++) {
+		Clip* c = clips.at(j);
+		if (c != NULL) {
+			if (c->track < 0 && c->track < vt) { // video clip
+				vt = c->track;
+			} else if (c->track > at) {
+				at = c->track;
+			}
+		}
 	}
 	if (video_tracks != NULL) *video_tracks = vt;
 	if (audio_tracks != NULL) *audio_tracks = at;

project/sequence.h

@@ -8,35 +8,36 @@
 
 struct Clip;
 class Transition;
+class Media;
 
 struct Sequence {
 	Sequence();
 	~Sequence();
-    Sequence* copy();
-    QString name;
-    void getTrackLimits(int* video_tracks, int* audio_tracks);
+	Sequence* copy();
+	QString name;
+	void getTrackLimits(int* video_tracks, int* audio_tracks);
 	long getEndFrame();
-    void hard_delete_transition(Clip *c, int type);
+	void hard_delete_transition(Clip *c, int type);
 	int width;
 	int height;
-    double frame_rate;
+	double frame_rate;
 	int audio_frequency;
-    int audio_layout;
+	int audio_layout;
 
 	QVector<Selection> selections;
 	long playhead;
 
-    bool using_workarea;
-    long workarea_in;
-    long workarea_out;
+	bool using_workarea;
+	long workarea_in;
+	long workarea_out;
 
-    bool wrapper_sequence;
+	bool wrapper_sequence;
 
-    int save_id;
+	int save_id;
 
-    QVector<Marker> markers;
+	QVector<Marker> markers;
 	QVector<Clip*> clips;
-    QVector<Transition*> transitions;
+	QVector<Transition*> transitions;
 };
 
 // static variable for the currently active sequence

project/sourcescommon.cpp

@@ -52,8 +52,8 @@ void SourcesCommon::show_context_menu(QWidget* parent, const QModelIndexList& it
 	QAction* import_action = menu.addAction("Import...");
 	QObject::connect(import_action, SIGNAL(triggered(bool)), project_parent, SLOT(import_dialog()));
 
-	QAction* new_folder_action = menu.addAction("New Folder...");
-	QObject::connect(new_folder_action, SIGNAL(triggered(bool)), mainWindow, SLOT(new_folder()));
+	QMenu* new_menu = menu.addMenu("New");
+	mainWindow->make_new_menu(new_menu);
 
 	if (items.size() > 0) {
 		Media* m = project_parent->item_to_media(items.at(0));