Merge branch 'master' into transition-offsets

app/widget/menu/menu.cpp

@@ -87,7 +87,7 @@ void Menu::InsertAlphabetically(Menu *menu)
   InsertAlphabetically(menu->menuAction());
 }
 
-void Menu::ConformItem(QAction *a, const QString &id, const QString &key)
+void Menu::ConformItem(QAction *a, const QString &id, const QKeySequence &key)
 {
   a->setProperty("id", id);
 

app/widget/menu/menu.h

@@ -122,7 +122,7 @@ public:
   QAction* AddItem(const QString& id,
                    const typename QtPrivate::FunctionPointer<Func>::Object *receiver,
                    Func member,
-                   const QString &key = QString())
+                   const QKeySequence &key = QKeySequence())
   {
     QAction* a = CreateItem(this, id, receiver, member, key);
 
@@ -171,7 +171,7 @@ public:
                              const QString& id,
                              const typename QtPrivate::FunctionPointer<Func>::Object *receiver,
                              Func member,
-                             const QString& key = QString())
+                             const QKeySequence &key = QKeySequence())
   {
     QAction* a = new QAction(parent);
 
@@ -215,7 +215,7 @@ public:
                           const QString& id,
                           const typename QtPrivate::FunctionPointer<Func>::Object *receiver,
                           Func member,
-                          const QString& key = QString())
+                          const QKeySequence &key = QKeySequence())
   {
     ConformItem(a, id, key);
 
@@ -224,7 +224,7 @@ public:
 
   static void ConformItem(QAction *a,
                           const QString& id,
-                          const QString& key = QString());
+                          const QKeySequence &key = QKeySequence());
 
 private:
   void Init();

app/widget/menu/menushared.cpp

@@ -33,32 +33,32 @@ MenuShared* MenuShared::instance_ = nullptr;
 MenuShared::MenuShared()
 {
   // "New" menu shared items
-  new_project_item_ = Menu::CreateItem(this, "newproj", Core::instance(), &Core::CreateNewProject, "Ctrl+N");
-  new_sequence_item_ = Menu::CreateItem(this, "newseq", Core::instance(), &Core::CreateNewSequence, "Ctrl+Shift+N");
+  new_project_item_ = Menu::CreateItem(this, "newproj", Core::instance(), &Core::CreateNewProject, tr("Ctrl+N"));
+  new_sequence_item_ = Menu::CreateItem(this, "newseq", Core::instance(), &Core::CreateNewSequence, tr("Ctrl+Shift+N"));
   new_folder_item_ = Menu::CreateItem(this, "newfolder", Core::instance(), &Core::CreateNewFolder);
 
   // "Edit" menu shared items
-  edit_cut_item_ = Menu::CreateItem(this, "cut", this, &MenuShared::CutTriggered, "Ctrl+X");
-  edit_copy_item_ = Menu::CreateItem(this, "copy", this, &MenuShared::CopyTriggered, "Ctrl+C");
-  edit_paste_item_ = Menu::CreateItem(this, "paste", this, &MenuShared::PasteTriggered, "Ctrl+V");
-  edit_paste_insert_item_ = Menu::CreateItem(this, "pasteinsert", this, &MenuShared::PasteInsertTriggered, "Ctrl+Shift+V");
-  edit_duplicate_item_ = Menu::CreateItem(this, "duplicate", this, &MenuShared::DuplicateTriggered, "Ctrl+D");
-  edit_delete_item_ = Menu::CreateItem(this, "delete", this, &MenuShared::DeleteSelectedTriggered, "Del");
-  edit_ripple_delete_item_ = Menu::CreateItem(this, "rippledelete", this, &MenuShared::RippleDeleteTriggered, "Shift+Del");
-  edit_split_item_ = Menu::CreateItem(this, "split", this, &MenuShared::SplitAtPlayheadTriggered, "Ctrl+K");
-  edit_speedduration_item_ = Menu::CreateItem(this, "speeddur", this, &MenuShared::SpeedDurationTriggered, "Ctrl+R");
+  edit_cut_item_ = Menu::CreateItem(this, "cut", this, &MenuShared::CutTriggered, tr("Ctrl+X"));
+  edit_copy_item_ = Menu::CreateItem(this, "copy", this, &MenuShared::CopyTriggered, tr("Ctrl+C"));
+  edit_paste_item_ = Menu::CreateItem(this, "paste", this, &MenuShared::PasteTriggered, tr("Ctrl+V"));
+  edit_paste_insert_item_ = Menu::CreateItem(this, "pasteinsert", this, &MenuShared::PasteInsertTriggered, tr("Ctrl+Shift+V"));
+  edit_duplicate_item_ = Menu::CreateItem(this, "duplicate", this, &MenuShared::DuplicateTriggered, tr("Ctrl+D"));
+  edit_delete_item_ = Menu::CreateItem(this, "delete", this, &MenuShared::DeleteSelectedTriggered, tr("Del"));
+  edit_ripple_delete_item_ = Menu::CreateItem(this, "rippledelete", this, &MenuShared::RippleDeleteTriggered, tr("Shift+Del"));
+  edit_split_item_ = Menu::CreateItem(this, "split", this, &MenuShared::SplitAtPlayheadTriggered, tr("Ctrl+K"));
+  edit_speedduration_item_ = Menu::CreateItem(this, "speeddur", this, &MenuShared::SpeedDurationTriggered, tr("Ctrl+R"));
 
   // "In/Out" menu shared items
-  inout_set_in_item_ = Menu::CreateItem(this, "setinpoint", this, &MenuShared::SetInTriggered, "I");
-  inout_set_out_item_ = Menu::CreateItem(this, "setoutpoint", this, &MenuShared::SetOutTriggered, "O");
+  inout_set_in_item_ = Menu::CreateItem(this, "setinpoint", this, &MenuShared::SetInTriggered, tr("I"));
+  inout_set_out_item_ = Menu::CreateItem(this, "setoutpoint", this, &MenuShared::SetOutTriggered, tr("O"));
   inout_reset_in_item_ = Menu::CreateItem(this, "resetin", this, &MenuShared::ResetInTriggered);
   inout_reset_out_item_ = Menu::CreateItem(this, "resetout", this, &MenuShared::ResetOutTriggered);
-  inout_clear_inout_item_ = Menu::CreateItem(this, "clearinout", this, &MenuShared::ClearInOutTriggered, "G");
+  inout_clear_inout_item_ = Menu::CreateItem(this, "clearinout", this, &MenuShared::ClearInOutTriggered, tr("G"));
 
   // "Clip Edit" menu shared items
-  clip_add_default_transition_item_ = Menu::CreateItem(this, "deftransition", this, &MenuShared::DefaultTransitionTriggered, "Ctrl+Shift+D");
-  clip_link_unlink_item_ = Menu::CreateItem(this, "linkunlink", this, &MenuShared::ToggleLinksTriggered, "Ctrl+L");
-  clip_enable_disable_item_ = Menu::CreateItem(this, "enabledisable", this, &MenuShared::EnableDisableTriggered, "Shift+E");
+  clip_add_default_transition_item_ = Menu::CreateItem(this, "deftransition", this, &MenuShared::DefaultTransitionTriggered, tr("Ctrl+Shift+D"));
+  clip_link_unlink_item_ = Menu::CreateItem(this, "linkunlink", this, &MenuShared::ToggleLinksTriggered, tr("Ctrl+L"));
+  clip_enable_disable_item_ = Menu::CreateItem(this, "enabledisable", this, &MenuShared::EnableDisableTriggered, tr("Shift+E"));
   clip_nest_item_ = Menu::CreateItem(this, "nest", this, &MenuShared::NestTriggered);
 
   // TimeRuler menu shared items

app/widget/nodeparamview/nodeparamviewwidgetbridge.cpp

@@ -514,7 +514,17 @@ void NodeParamViewWidgetBridge::UpdateWidgetValues()
   {
     QComboBox* cb = static_cast<QComboBox*>(widgets_.first());
     cb->blockSignals(true);
-    cb->setCurrentIndex(input_.GetValueAtTime(node_time).toInt());
+    int index = input_.GetValueAtTime(node_time).toInt();
+    int real_row = -1;
+    for (int i=0; i<cb->count(); i++) {
+      if (!cb->itemText(i).isEmpty()) {
+        real_row++;
+      }
+
+      if (real_row == index) {
+        cb->setCurrentIndex(i);
+      }
+    }
     cb->blockSignals(false);
     break;
   }

app/widget/nodeview/nodeview.cpp

@@ -363,9 +363,13 @@ void NodeView::Duplicate()
 
 void NodeView::SetColorLabel(int index)
 {
+  MultiUndoCommand *command = new MultiUndoCommand();
+
   for (Node* node : qAsConst(selected_nodes_)) {
-    node->SetOverrideColor(index);
+    command->add_child(new NodeOverrideColorCommand(node, index));
   }
+
+  Core::instance()->undo_stack()->push(command);
 }
 
 void NodeView::ZoomIn()

app/widget/nodeview/nodeviewtoolbar.cpp

@@ -43,13 +43,13 @@ void NodeViewToolBar::changeEvent(QEvent *e)
 void NodeViewToolBar::Retranslate()
 {
   add_node_btn_->setToolTip(tr("Add Node"));
-  minimap_btn_->setText(tr("Mini-Map"));
   minimap_btn_->setToolTip(tr("Toggle Mini-Map"));
 }
 
 void NodeViewToolBar::UpdateIcons()
 {
   add_node_btn_->setIcon(icon::Add);
+  minimap_btn_->setIcon(icon::MiniMap);
 }
 
 }

app/widget/nodeview/nodeviewundo.cpp

@@ -171,4 +171,26 @@ Project *NodeRenameCommand::GetRelevantProject() const
   return nodes_.isEmpty() ? nullptr : nodes_.first()->project();
 }
 
+NodeOverrideColorCommand::NodeOverrideColorCommand(Node *node, int index) :
+  node_(node),
+  new_index_(index)
+{
+}
+
+Project *NodeOverrideColorCommand::GetRelevantProject() const
+{
+  return node_->project();
+}
+
+void NodeOverrideColorCommand::redo()
+{
+  old_index_ = node_->GetOverrideColor();
+  node_->SetOverrideColor(new_index_);
+}
+
+void NodeOverrideColorCommand::undo()
+{
+  node_->SetOverrideColor(old_index_);
+}
+
 }

app/widget/nodeview/nodeviewundo.h

@@ -342,6 +342,27 @@ private:
 
 };
 
+class NodeOverrideColorCommand : public UndoCommand
+{
+public:
+  NodeOverrideColorCommand(Node *node, int index);
+
+  virtual Project * GetRelevantProject() const override;
+
+protected:
+  virtual void redo() override;
+
+  virtual void undo() override;
+
+private:
+  Node *node_;
+
+  int old_index_;
+
+  int new_index_;
+
+};
+
 }
 
 #endif // NODEVIEWUNDO_H

app/widget/timebased/timebasedview.cpp

@@ -217,6 +217,8 @@ bool TimeBasedView::PlayheadMove(QMouseEvent *event)
     rational movement;
 
     snap_service_->SnapPoint({mouse_time}, &movement, SnapService::kSnapAll & ~SnapService::kSnapToPlayhead);
+
+    mouse_time += movement;
   }
 
   SetTime(mouse_time);

app/widget/timelinewidget/timelinewidget.cpp

@@ -720,9 +720,13 @@ void TimelineWidget::ToggleSelectedEnabled()
 
 void TimelineWidget::SetColorLabel(int index)
 {
+  MultiUndoCommand *command = new MultiUndoCommand();
+
   foreach (Block* b, selected_blocks_) {
-    b->SetOverrideColor(index);
+    command->add_child(new NodeOverrideColorCommand(b, index));
   }
+
+  Core::instance()->undo_stack()->push(command);
 }
 
 void TimelineWidget::NudgeLeft()

app/widget/timelinewidget/undo/timelineundopointer.cpp

@@ -426,9 +426,7 @@ void TrackPlaceBlockCommand::undo()
   }
   t->EndOperation();
 
-  if (ripple_remove_command_) {
-    t->Node::InvalidateCache(insert_range, Track::kBlockInput);
-  }
+  t->Node::InvalidateCache(insert_range, Track::kBlockInput);
 
   // Remove tracks if we added them
   for (int i=add_track_commands_.size()-1; i>=0; i--) {

app/widget/timeruler/seekablewidget.cpp

@@ -151,6 +151,8 @@ void SeekableWidget::SeekToScreenPoint(int screen)
     snap_service_->SnapPoint({playhead_time},
                              &movement,
                              SnapService::kSnapAll & ~SnapService::kSnapToPlayhead);
+
+    playhead_time += movement;
   }
 
   if (playhead_time != GetTime()) {