change: change code style to Linux style except indent.
This commit is contained in:
Mike Solar
+113
-107
@@ -31,186 +31,192 @@
|
||||
#include "widget/menu/menu.h"
|
||||
#include "widget/menu/menushared.h"
|
||||
|
||||
namespace olive {
|
||||
namespace olive
|
||||
{
|
||||
|
||||
#define super QWidget
|
||||
|
||||
Toolbar::Toolbar(QWidget *parent) :
|
||||
super(parent)
|
||||
Toolbar::Toolbar(QWidget *parent)
|
||||
: super(parent)
|
||||
{
|
||||
layout_ = new FlowLayout(this);
|
||||
layout_->setContentsMargins(0, 0, 0, 0);
|
||||
layout_ = new FlowLayout(this);
|
||||
layout_->setContentsMargins(0, 0, 0, 0);
|
||||
|
||||
// Create standard tool buttons
|
||||
btn_pointer_tool_ = CreateToolButton(Tool::kPointer);
|
||||
btn_trackselect_tool_ = CreateToolButton(Tool::kTrackSelect);
|
||||
btn_edit_tool_ = CreateToolButton(Tool::kEdit);
|
||||
btn_ripple_tool_ = CreateToolButton(Tool::kRipple);
|
||||
btn_rolling_tool_ = CreateToolButton(Tool::kRolling);
|
||||
btn_razor_tool_ = CreateToolButton(Tool::kRazor);
|
||||
btn_slip_tool_ = CreateToolButton(Tool::kSlip);
|
||||
btn_slide_tool_ = CreateToolButton(Tool::kSlide);
|
||||
btn_hand_tool_ = CreateToolButton(Tool::kHand);
|
||||
btn_zoom_tool_ = CreateToolButton(Tool::kZoom);
|
||||
btn_record_ = CreateToolButton(Tool::kRecord);
|
||||
btn_transition_tool_ = CreateToolButton(Tool::kTransition);
|
||||
btn_add_ = CreateToolButton(Tool::kAdd);
|
||||
// Create standard tool buttons
|
||||
btn_pointer_tool_ = CreateToolButton(Tool::kPointer);
|
||||
btn_trackselect_tool_ = CreateToolButton(Tool::kTrackSelect);
|
||||
btn_edit_tool_ = CreateToolButton(Tool::kEdit);
|
||||
btn_ripple_tool_ = CreateToolButton(Tool::kRipple);
|
||||
btn_rolling_tool_ = CreateToolButton(Tool::kRolling);
|
||||
btn_razor_tool_ = CreateToolButton(Tool::kRazor);
|
||||
btn_slip_tool_ = CreateToolButton(Tool::kSlip);
|
||||
btn_slide_tool_ = CreateToolButton(Tool::kSlide);
|
||||
btn_hand_tool_ = CreateToolButton(Tool::kHand);
|
||||
btn_zoom_tool_ = CreateToolButton(Tool::kZoom);
|
||||
btn_record_ = CreateToolButton(Tool::kRecord);
|
||||
btn_transition_tool_ = CreateToolButton(Tool::kTransition);
|
||||
btn_add_ = CreateToolButton(Tool::kAdd);
|
||||
|
||||
// Create snapping button, which is not actually a tool, it's a toggle option
|
||||
btn_snapping_toggle_ = CreateNonToolButton();
|
||||
connect(btn_snapping_toggle_, &QPushButton::clicked, this, &Toolbar::SnappingButtonClicked);
|
||||
// Create snapping button, which is not actually a tool, it's a toggle option
|
||||
btn_snapping_toggle_ = CreateNonToolButton();
|
||||
connect(btn_snapping_toggle_, &QPushButton::clicked, this,
|
||||
&Toolbar::SnappingButtonClicked);
|
||||
|
||||
// Connect transition button to menu signal
|
||||
connect(btn_transition_tool_, &QPushButton::clicked, this, &Toolbar::TransitionButtonClicked);
|
||||
// Connect transition button to menu signal
|
||||
connect(btn_transition_tool_, &QPushButton::clicked, this,
|
||||
&Toolbar::TransitionButtonClicked);
|
||||
|
||||
// Connect add button to menu signal
|
||||
connect(btn_add_, &QPushButton::clicked, this, &Toolbar::AddButtonClicked);
|
||||
// Connect add button to menu signal
|
||||
connect(btn_add_, &QPushButton::clicked, this, &Toolbar::AddButtonClicked);
|
||||
|
||||
Retranslate();
|
||||
UpdateIcons();
|
||||
Retranslate();
|
||||
UpdateIcons();
|
||||
}
|
||||
|
||||
void Toolbar::SetTool(const Tool::Item& tool)
|
||||
void Toolbar::SetTool(const Tool::Item &tool)
|
||||
{
|
||||
// For each tool, set the "checked" state to whether the button's tool is the current tool
|
||||
for (int i=0;i<toolbar_btns_.size();i++) {
|
||||
ToolbarButton* btn = toolbar_btns_.at(i);
|
||||
// For each tool, set the "checked" state to whether the button's tool is the current tool
|
||||
for (int i = 0; i < toolbar_btns_.size(); i++) {
|
||||
ToolbarButton *btn = toolbar_btns_.at(i);
|
||||
|
||||
btn->setChecked(btn->tool() == tool);
|
||||
}
|
||||
btn->setChecked(btn->tool() == tool);
|
||||
}
|
||||
}
|
||||
|
||||
void Toolbar::SetSnapping(const bool& snapping)
|
||||
void Toolbar::SetSnapping(const bool &snapping)
|
||||
{
|
||||
// Set checked state of snapping toggle
|
||||
btn_snapping_toggle_->setChecked(snapping);
|
||||
// Set checked state of snapping toggle
|
||||
btn_snapping_toggle_->setChecked(snapping);
|
||||
}
|
||||
|
||||
void Toolbar::changeEvent(QEvent *e)
|
||||
{
|
||||
if (e->type() == QEvent::LanguageChange) {
|
||||
Retranslate();
|
||||
} else if (e->type() == QEvent::StyleChange) {
|
||||
UpdateIcons();
|
||||
}
|
||||
super::changeEvent(e);
|
||||
if (e->type() == QEvent::LanguageChange) {
|
||||
Retranslate();
|
||||
} else if (e->type() == QEvent::StyleChange) {
|
||||
UpdateIcons();
|
||||
}
|
||||
super::changeEvent(e);
|
||||
}
|
||||
|
||||
void Toolbar::resizeEvent(QResizeEvent *e)
|
||||
{
|
||||
super::resizeEvent(e);
|
||||
super::resizeEvent(e);
|
||||
|
||||
int min_height = toolbar_btns_.size() * toolbar_btns_.first()->height() + (toolbar_btns_.size()-1) * layout_->verticalSpacing();
|
||||
int new_height = e->size().height();
|
||||
int columns_required = min_height / new_height + (min_height % new_height != 0);
|
||||
setMinimumWidth(toolbar_btns_.first()->width() * columns_required + layout_->horizontalSpacing() * (columns_required-1) + 1);
|
||||
int min_height = toolbar_btns_.size() * toolbar_btns_.first()->height() +
|
||||
(toolbar_btns_.size() - 1) * layout_->verticalSpacing();
|
||||
int new_height = e->size().height();
|
||||
int columns_required =
|
||||
min_height / new_height + (min_height % new_height != 0);
|
||||
setMinimumWidth(toolbar_btns_.first()->width() * columns_required +
|
||||
layout_->horizontalSpacing() * (columns_required - 1) + 1);
|
||||
}
|
||||
|
||||
void Toolbar::Retranslate()
|
||||
{
|
||||
btn_pointer_tool_->setToolTip(tr("Pointer Tool"));
|
||||
btn_trackselect_tool_->setToolTip(tr("Track Select Tool"));
|
||||
btn_edit_tool_->setToolTip(tr("Edit Tool"));
|
||||
btn_ripple_tool_->setToolTip(tr("Ripple Tool"));
|
||||
btn_rolling_tool_->setToolTip(tr("Rolling Tool"));
|
||||
btn_razor_tool_->setToolTip(tr("Razor Tool"));
|
||||
btn_slip_tool_->setToolTip(tr("Slip Tool"));
|
||||
btn_slide_tool_->setToolTip(tr("Slide Tool"));
|
||||
btn_hand_tool_->setToolTip(tr("Hand Tool"));
|
||||
btn_zoom_tool_->setToolTip(tr("Zoom Tool"));
|
||||
btn_transition_tool_->setToolTip(tr("Transition Tool"));
|
||||
btn_record_->setToolTip(tr("Record Tool"));
|
||||
btn_add_->setToolTip(tr("Add Tool"));
|
||||
btn_snapping_toggle_->setToolTip(tr("Toggle Snapping"));
|
||||
btn_pointer_tool_->setToolTip(tr("Pointer Tool"));
|
||||
btn_trackselect_tool_->setToolTip(tr("Track Select Tool"));
|
||||
btn_edit_tool_->setToolTip(tr("Edit Tool"));
|
||||
btn_ripple_tool_->setToolTip(tr("Ripple Tool"));
|
||||
btn_rolling_tool_->setToolTip(tr("Rolling Tool"));
|
||||
btn_razor_tool_->setToolTip(tr("Razor Tool"));
|
||||
btn_slip_tool_->setToolTip(tr("Slip Tool"));
|
||||
btn_slide_tool_->setToolTip(tr("Slide Tool"));
|
||||
btn_hand_tool_->setToolTip(tr("Hand Tool"));
|
||||
btn_zoom_tool_->setToolTip(tr("Zoom Tool"));
|
||||
btn_transition_tool_->setToolTip(tr("Transition Tool"));
|
||||
btn_record_->setToolTip(tr("Record Tool"));
|
||||
btn_add_->setToolTip(tr("Add Tool"));
|
||||
btn_snapping_toggle_->setToolTip(tr("Toggle Snapping"));
|
||||
}
|
||||
|
||||
void Toolbar::UpdateIcons()
|
||||
{
|
||||
btn_pointer_tool_->setIcon(icon::ToolPointer);
|
||||
btn_trackselect_tool_->setIcon(icon::ToolTrackSelect);
|
||||
btn_edit_tool_->setIcon(icon::ToolEdit);
|
||||
btn_ripple_tool_->setIcon(icon::ToolRipple);
|
||||
btn_rolling_tool_->setIcon(icon::ToolRolling);
|
||||
btn_razor_tool_->setIcon(icon::ToolRazor);
|
||||
btn_slip_tool_->setIcon(icon::ToolSlip);
|
||||
btn_slide_tool_->setIcon(icon::ToolSlide);
|
||||
btn_hand_tool_->setIcon(icon::ToolHand);
|
||||
btn_zoom_tool_->setIcon(icon::ZoomIn);
|
||||
btn_record_->setIcon(icon::Record);
|
||||
btn_transition_tool_->setIcon(icon::ToolTransition);
|
||||
btn_add_->setIcon(icon::Add);
|
||||
btn_snapping_toggle_->setIcon(icon::Snapping);
|
||||
btn_pointer_tool_->setIcon(icon::ToolPointer);
|
||||
btn_trackselect_tool_->setIcon(icon::ToolTrackSelect);
|
||||
btn_edit_tool_->setIcon(icon::ToolEdit);
|
||||
btn_ripple_tool_->setIcon(icon::ToolRipple);
|
||||
btn_rolling_tool_->setIcon(icon::ToolRolling);
|
||||
btn_razor_tool_->setIcon(icon::ToolRazor);
|
||||
btn_slip_tool_->setIcon(icon::ToolSlip);
|
||||
btn_slide_tool_->setIcon(icon::ToolSlide);
|
||||
btn_hand_tool_->setIcon(icon::ToolHand);
|
||||
btn_zoom_tool_->setIcon(icon::ZoomIn);
|
||||
btn_record_->setIcon(icon::Record);
|
||||
btn_transition_tool_->setIcon(icon::ToolTransition);
|
||||
btn_add_->setIcon(icon::Add);
|
||||
btn_snapping_toggle_->setIcon(icon::Snapping);
|
||||
}
|
||||
|
||||
ToolbarButton* Toolbar::CreateToolButton(const Tool::Item& tool)
|
||||
ToolbarButton *Toolbar::CreateToolButton(const Tool::Item &tool)
|
||||
{
|
||||
// Create a ToolbarButton object
|
||||
ToolbarButton* b = new ToolbarButton(this, tool);
|
||||
// Create a ToolbarButton object
|
||||
ToolbarButton *b = new ToolbarButton(this, tool);
|
||||
|
||||
// Add it to the layout
|
||||
layout_->addWidget(b);
|
||||
// Add it to the layout
|
||||
layout_->addWidget(b);
|
||||
|
||||
// Add it to the list for iterating through later
|
||||
toolbar_btns_.append(b);
|
||||
// Add it to the list for iterating through later
|
||||
toolbar_btns_.append(b);
|
||||
|
||||
// Connect it to the tool button click handler
|
||||
connect(b, SIGNAL(clicked(bool)), this, SLOT(ToolButtonClicked()));
|
||||
// Connect it to the tool button click handler
|
||||
connect(b, SIGNAL(clicked(bool)), this, SLOT(ToolButtonClicked()));
|
||||
|
||||
return b;
|
||||
return b;
|
||||
}
|
||||
|
||||
ToolbarButton *Toolbar::CreateNonToolButton()
|
||||
{
|
||||
// Create a ToolbarButton object
|
||||
ToolbarButton* b = new ToolbarButton(this, Tool::kNone);
|
||||
// Create a ToolbarButton object
|
||||
ToolbarButton *b = new ToolbarButton(this, Tool::kNone);
|
||||
|
||||
// Add it to the layout
|
||||
layout_->addWidget(b);
|
||||
// Add it to the layout
|
||||
layout_->addWidget(b);
|
||||
|
||||
return b;
|
||||
return b;
|
||||
}
|
||||
|
||||
void Toolbar::ToolButtonClicked()
|
||||
{
|
||||
// Get new tool from ToolbarButton object
|
||||
Tool::Item new_tool = static_cast<ToolbarButton*>(sender())->tool();
|
||||
// Get new tool from ToolbarButton object
|
||||
Tool::Item new_tool = static_cast<ToolbarButton *>(sender())->tool();
|
||||
|
||||
// Set checked state of all tool buttons
|
||||
// NOTE: Not necessary if this is appropriately connected to Core
|
||||
//SetTool(new_tool);
|
||||
// Set checked state of all tool buttons
|
||||
// NOTE: Not necessary if this is appropriately connected to Core
|
||||
//SetTool(new_tool);
|
||||
|
||||
// Emit signal that the tool just changed
|
||||
emit ToolChanged(new_tool);
|
||||
// Emit signal that the tool just changed
|
||||
emit ToolChanged(new_tool);
|
||||
}
|
||||
|
||||
void Toolbar::SnappingButtonClicked(bool b)
|
||||
{
|
||||
emit SnappingChanged(b);
|
||||
emit SnappingChanged(b);
|
||||
}
|
||||
|
||||
void Toolbar::AddButtonClicked()
|
||||
{
|
||||
Menu m(this);
|
||||
Menu m(this);
|
||||
|
||||
MenuShared::instance()->AddItemsForAddableObjectsMenu(&m);
|
||||
MenuShared::instance()->AddItemsForAddableObjectsMenu(&m);
|
||||
|
||||
m.exec(QCursor::pos());
|
||||
m.exec(QCursor::pos());
|
||||
}
|
||||
|
||||
void Toolbar::TransitionButtonClicked()
|
||||
{
|
||||
Menu* m = NodeFactory::CreateMenu(this, false, Node::kCategoryTransition);
|
||||
Menu *m = NodeFactory::CreateMenu(this, false, Node::kCategoryTransition);
|
||||
|
||||
connect(m, &QMenu::triggered, this, &Toolbar::TransitionMenuItemTriggered);
|
||||
connect(m, &QMenu::triggered, this, &Toolbar::TransitionMenuItemTriggered);
|
||||
|
||||
m->exec(QCursor::pos());
|
||||
m->exec(QCursor::pos());
|
||||
|
||||
delete m;
|
||||
delete m;
|
||||
}
|
||||
|
||||
void Toolbar::TransitionMenuItemTriggered(QAction *a)
|
||||
{
|
||||
emit SelectedTransitionChanged(NodeFactory::GetIDFromMenuAction(a));
|
||||
emit SelectedTransitionChanged(NodeFactory::GetIDFromMenuAction(a));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user