added UI items for a rolling edit tool
This commit is contained in:
@@ -26,6 +26,11 @@
|
|||||||
* Use the navigation above to find documentation on classes or source files.
|
* Use the navigation above to find documentation on classes or source files.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
extern "C" {
|
||||||
|
#include <libavformat/avformat.h>
|
||||||
|
#include <libavfilter/avfilter.h>
|
||||||
|
}
|
||||||
|
|
||||||
#include <QApplication>
|
#include <QApplication>
|
||||||
#include <QSurfaceFormat>
|
#include <QSurfaceFormat>
|
||||||
|
|
||||||
@@ -51,6 +56,14 @@ int main(int argc, char *argv[]) {
|
|||||||
format.setProfile(QSurfaceFormat::CoreProfile);
|
format.setProfile(QSurfaceFormat::CoreProfile);
|
||||||
QSurfaceFormat::setDefaultFormat(format);
|
QSurfaceFormat::setDefaultFormat(format);
|
||||||
|
|
||||||
|
// Register FFmpeg codecs and filters (deprecated in 4.0+)
|
||||||
|
#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(58, 9, 100)
|
||||||
|
av_register_all();
|
||||||
|
#endif
|
||||||
|
#if LIBAVFILTER_VERSION_INT < AV_VERSION_INT(7, 14, 100)
|
||||||
|
avfilter_register_all();
|
||||||
|
#endif
|
||||||
|
|
||||||
// Start core
|
// Start core
|
||||||
olive::core.Start();
|
olive::core.Start();
|
||||||
|
|
||||||
|
|||||||
@@ -41,6 +41,9 @@ enum Tool {
|
|||||||
/// Ripple tool
|
/// Ripple tool
|
||||||
kRipple,
|
kRipple,
|
||||||
|
|
||||||
|
/// Rolling tool
|
||||||
|
kRolling,
|
||||||
|
|
||||||
/// Razor tool
|
/// Razor tool
|
||||||
kRazor,
|
kRazor,
|
||||||
|
|
||||||
|
|||||||
@@ -47,6 +47,7 @@ QIcon olive::icon::IconView;
|
|||||||
QIcon olive::icon::ToolPointer;
|
QIcon olive::icon::ToolPointer;
|
||||||
QIcon olive::icon::ToolEdit;
|
QIcon olive::icon::ToolEdit;
|
||||||
QIcon olive::icon::ToolRipple;
|
QIcon olive::icon::ToolRipple;
|
||||||
|
QIcon olive::icon::ToolRolling;
|
||||||
QIcon olive::icon::ToolRazor;
|
QIcon olive::icon::ToolRazor;
|
||||||
QIcon olive::icon::ToolSlip;
|
QIcon olive::icon::ToolSlip;
|
||||||
QIcon olive::icon::ToolSlide;
|
QIcon olive::icon::ToolSlide;
|
||||||
@@ -85,6 +86,7 @@ void olive::icon::LoadAll()
|
|||||||
ToolPointer = Create("arrow");
|
ToolPointer = Create("arrow");
|
||||||
ToolEdit = Create("beam");
|
ToolEdit = Create("beam");
|
||||||
ToolRipple = Create("ripple");
|
ToolRipple = Create("ripple");
|
||||||
|
ToolRolling = Create("rolling");
|
||||||
ToolRazor = Create("razor");
|
ToolRazor = Create("razor");
|
||||||
ToolSlip = Create("slip");
|
ToolSlip = Create("slip");
|
||||||
ToolSlide = Create("slide");
|
ToolSlide = Create("slide");
|
||||||
|
|||||||
@@ -48,6 +48,7 @@ extern QIcon IconView;
|
|||||||
extern QIcon ToolPointer;
|
extern QIcon ToolPointer;
|
||||||
extern QIcon ToolEdit;
|
extern QIcon ToolEdit;
|
||||||
extern QIcon ToolRipple;
|
extern QIcon ToolRipple;
|
||||||
|
extern QIcon ToolRolling;
|
||||||
extern QIcon ToolRazor;
|
extern QIcon ToolRazor;
|
||||||
extern QIcon ToolSlip;
|
extern QIcon ToolSlip;
|
||||||
extern QIcon ToolSlide;
|
extern QIcon ToolSlide;
|
||||||
|
|||||||
@@ -37,6 +37,7 @@ Toolbar::Toolbar(QWidget *parent) :
|
|||||||
btn_pointer_tool_ = CreateToolButton(olive::icon::ToolPointer, olive::tool::kPointer);
|
btn_pointer_tool_ = CreateToolButton(olive::icon::ToolPointer, olive::tool::kPointer);
|
||||||
btn_edit_tool_ = CreateToolButton(olive::icon::ToolEdit, olive::tool::kEdit);
|
btn_edit_tool_ = CreateToolButton(olive::icon::ToolEdit, olive::tool::kEdit);
|
||||||
btn_ripple_tool_ = CreateToolButton(olive::icon::ToolRipple, olive::tool::kRipple);
|
btn_ripple_tool_ = CreateToolButton(olive::icon::ToolRipple, olive::tool::kRipple);
|
||||||
|
btn_rolling_tool_ = CreateToolButton(olive::icon::ToolRolling, olive::tool::kRolling);
|
||||||
btn_razor_tool_ = CreateToolButton(olive::icon::ToolRazor, olive::tool::kRazor);
|
btn_razor_tool_ = CreateToolButton(olive::icon::ToolRazor, olive::tool::kRazor);
|
||||||
btn_slip_tool_ = CreateToolButton(olive::icon::ToolSlip, olive::tool::kSlip);
|
btn_slip_tool_ = CreateToolButton(olive::icon::ToolSlip, olive::tool::kSlip);
|
||||||
btn_slide_tool_ = CreateToolButton(olive::icon::ToolSlide, olive::tool::kSlide);
|
btn_slide_tool_ = CreateToolButton(olive::icon::ToolSlide, olive::tool::kSlide);
|
||||||
@@ -82,6 +83,7 @@ void Toolbar::Retranslate()
|
|||||||
btn_pointer_tool_->setToolTip(tr("Pointer Tool"));
|
btn_pointer_tool_->setToolTip(tr("Pointer Tool"));
|
||||||
btn_edit_tool_->setToolTip(tr("Edit Tool"));
|
btn_edit_tool_->setToolTip(tr("Edit Tool"));
|
||||||
btn_ripple_tool_->setToolTip(tr("Ripple Tool"));
|
btn_ripple_tool_->setToolTip(tr("Ripple Tool"));
|
||||||
|
btn_rolling_tool_->setToolTip(tr("Rolling Tool"));
|
||||||
btn_razor_tool_->setToolTip(tr("Razor Tool"));
|
btn_razor_tool_->setToolTip(tr("Razor Tool"));
|
||||||
btn_slip_tool_->setToolTip(tr("Slip Tool"));
|
btn_slip_tool_->setToolTip(tr("Slip Tool"));
|
||||||
btn_slide_tool_->setToolTip(tr("Slide Tool"));
|
btn_slide_tool_->setToolTip(tr("Slide Tool"));
|
||||||
|
|||||||
@@ -156,6 +156,7 @@ private:
|
|||||||
ToolbarButton* btn_pointer_tool_;
|
ToolbarButton* btn_pointer_tool_;
|
||||||
ToolbarButton* btn_edit_tool_;
|
ToolbarButton* btn_edit_tool_;
|
||||||
ToolbarButton* btn_ripple_tool_;
|
ToolbarButton* btn_ripple_tool_;
|
||||||
|
ToolbarButton* btn_rolling_tool_;
|
||||||
ToolbarButton* btn_razor_tool_;
|
ToolbarButton* btn_razor_tool_;
|
||||||
ToolbarButton* btn_slip_tool_;
|
ToolbarButton* btn_slip_tool_;
|
||||||
ToolbarButton* btn_slide_tool_;
|
ToolbarButton* btn_slide_tool_;
|
||||||
|
|||||||
@@ -222,6 +222,11 @@ MainMenu::MainMenu(QWidget *parent) :
|
|||||||
tools_ripple_item_->setData(olive::tool::kRipple);
|
tools_ripple_item_->setData(olive::tool::kRipple);
|
||||||
tools_group->addAction(tools_ripple_item_);
|
tools_group->addAction(tools_ripple_item_);
|
||||||
|
|
||||||
|
tools_rolling_item_ = tools_menu_->AddItem("rollingtool", this, SLOT(ToolItemTriggered()), "N");
|
||||||
|
tools_rolling_item_->setCheckable(true);
|
||||||
|
tools_rolling_item_->setData(olive::tool::kRolling);
|
||||||
|
tools_group->addAction(tools_rolling_item_);
|
||||||
|
|
||||||
tools_razor_item_ = tools_menu_->AddItem("razortool", this, SLOT(ToolItemTriggered()), "C");
|
tools_razor_item_ = tools_menu_->AddItem("razortool", this, SLOT(ToolItemTriggered()), "C");
|
||||||
tools_razor_item_->setCheckable(true);
|
tools_razor_item_->setCheckable(true);
|
||||||
tools_razor_item_->setData(olive::tool::kRazor);
|
tools_razor_item_->setData(olive::tool::kRazor);
|
||||||
|
|||||||
@@ -130,6 +130,7 @@ private:
|
|||||||
QAction* tools_pointer_item_;
|
QAction* tools_pointer_item_;
|
||||||
QAction* tools_edit_item_;
|
QAction* tools_edit_item_;
|
||||||
QAction* tools_ripple_item_;
|
QAction* tools_ripple_item_;
|
||||||
|
QAction* tools_rolling_item_;
|
||||||
QAction* tools_razor_item_;
|
QAction* tools_razor_item_;
|
||||||
QAction* tools_slip_item_;
|
QAction* tools_slip_item_;
|
||||||
QAction* tools_slide_item_;
|
QAction* tools_slide_item_;
|
||||||
|
|||||||
Reference in New Issue
Block a user