oak-team/oak-editor
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed olive:: qualifier from icon:: namespace

Browse Source
This commit is contained in:
itsmattkc
2019-12-26 17:38:18 +11:00
parent bb9284a894
commit 7d907d7ee1
16 changed files with 93 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/widget/nodeparamview/nodeparamviewitem.cpp
+2 -2
View File
@@ -209,9 +209,9 @@ void NodeParamViewItem::SetExpanded(bool e)
contents_->setVisible(e);
if (expanded_) {
title_bar_collapse_btn_->setIcon(olive::icon::TriDown);
title_bar_collapse_btn_->setIcon(icon::TriDown);
} else {
title_bar_collapse_btn_->setIcon(olive::icon::TriRight);
title_bar_collapse_btn_->setIcon(icon::TriRight);
}
}
app/widget/nodeparamview/nodeparamviewkeyframecontrol.cpp
+4 -4
View File
@@ -15,20 +15,20 @@ NodeParamViewKeyframeControl::NodeParamViewKeyframeControl(NodeInput* input, QWi
// Automatically right aligns all buttons
layout->addStretch();
prev_key_btn_ = CreateNewToolButton(olive::icon::TriLeft);
prev_key_btn_ = CreateNewToolButton(icon::TriLeft);
prev_key_btn_->setIconSize(prev_key_btn_->iconSize() / 2);
layout->addWidget(prev_key_btn_);
toggle_key_btn_ = CreateNewToolButton(olive::icon::Diamond);
toggle_key_btn_ = CreateNewToolButton(icon::Diamond);
toggle_key_btn_->setCheckable(true);
toggle_key_btn_->setIconSize(toggle_key_btn_->iconSize() / 2);
layout->addWidget(toggle_key_btn_);
next_key_btn_ = CreateNewToolButton(olive::icon::TriRight);
next_key_btn_ = CreateNewToolButton(icon::TriRight);
next_key_btn_->setIconSize(next_key_btn_->iconSize() / 2);
layout->addWidget(next_key_btn_);
enable_key_btn_ = CreateNewToolButton(olive::icon::Clock);
enable_key_btn_ = CreateNewToolButton(icon::Clock);
enable_key_btn_->setCheckable(true);
enable_key_btn_->setIconSize(enable_key_btn_->iconSize() / 4 * 3);
layout->addWidget(enable_key_btn_);
app/widget/nodeview/nodeviewitem.cpp
+2 -2
View File
@@ -248,9 +248,9 @@ void NodeViewItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *opti
// Draw the icon
if (IsExpanded()) {
olive::icon::TriDown.paint(painter, expand_hitbox_.toRect(), Qt::AlignLeft | Qt::AlignVCenter);
icon::TriDown.paint(painter, expand_hitbox_.toRect(), Qt::AlignLeft | Qt::AlignVCenter);
} else {
olive::icon::TriRight.paint(painter, expand_hitbox_.toRect(), Qt::AlignLeft | Qt::AlignVCenter);
icon::TriRight.paint(painter, expand_hitbox_.toRect(), Qt::AlignLeft | Qt::AlignVCenter);
}
// Draw the text in a rect (the rect is sized around text already in the constructor)
app/widget/playbackcontrols/playbackcontrols.cpp
+6 -6
View File
@@ -162,12 +162,12 @@ void PlaybackControls::changeEvent(QEvent *e)
void PlaybackControls::UpdateIcons()
{
go_to_start_btn_->setIcon(olive::icon::GoToStart);
prev_frame_btn_->setIcon(olive::icon::PrevFrame);
play_btn_->setIcon(olive::icon::Play);
pause_btn_->setIcon(olive::icon::Pause);
next_frame_btn_->setIcon(olive::icon::NextFrame);
go_to_end_btn_->setIcon(olive::icon::GoToEnd);
go_to_start_btn_->setIcon(icon::GoToStart);
prev_frame_btn_->setIcon(icon::PrevFrame);
play_btn_->setIcon(icon::Play);
pause_btn_->setIcon(icon::Pause);
next_frame_btn_->setIcon(icon::NextFrame);
go_to_end_btn_->setIcon(icon::GoToEnd);
}
void PlaybackControls::SetTimeLabelInternal(QLabel* label, const int64_t& time)
app/widget/projectexplorer/projectexplorernavigation.cpp
+1 -1
View File
@@ -88,7 +88,7 @@ void ProjectExplorerNavigation::Retranslate()
void ProjectExplorerNavigation::UpdateIcons()
{
dir_up_btn_->setIcon(olive::icon::DirUp);
dir_up_btn_->setIcon(icon::DirUp);
size_slider_->setMinimum(olive::kProjectIconSizeMinimum);
size_slider_->setMaximum(olive::kProjectIconSizeMaximum);
size_slider_->setValue(olive::kProjectIconSizeDefault);
app/widget/projecttoolbar/projecttoolbar.cpp
+8 -8
View File
@@ -126,14 +126,14 @@ void ProjectToolbar::Retranslate()
void ProjectToolbar::UpdateIcons()
{
new_button_->setIcon(olive::icon::New);
open_button_->setIcon(olive::icon::Open);
save_button_->setIcon(olive::icon::Save);
undo_button_->setIcon(olive::icon::Undo);
redo_button_->setIcon(olive::icon::Redo);
tree_button_->setIcon(olive::icon::TreeView);
list_button_->setIcon(olive::icon::ListView);
icon_button_->setIcon(olive::icon::IconView);
new_button_->setIcon(icon::New);
open_button_->setIcon(icon::Open);
save_button_->setIcon(icon::Save);
undo_button_->setIcon(icon::Undo);
redo_button_->setIcon(icon::Redo);
tree_button_->setIcon(icon::TreeView);
list_button_->setIcon(icon::ListView);
icon_button_->setIcon(icon::IconView);
}
void ProjectToolbar::ViewButtonClicked()
app/widget/taskview/taskviewitem.cpp
+1 -1
View File
@@ -49,7 +49,7 @@ TaskViewItem::TaskViewItem(QWidget *parent) :
// Create cancel button
cancel_btn_ = new QPushButton(this);
cancel_btn_->setIcon(olive::icon::Error);
cancel_btn_->setIcon(icon::Error);
middle_layout->addWidget(cancel_btn_);
// Create status label
app/widget/toolbar/toolbar.cpp
+13 -13
View File
@@ -100,19 +100,19 @@ void Toolbar::Retranslate()
void Toolbar::UpdateIcons()
{
btn_pointer_tool_->setIcon(olive::icon::ToolPointer);
btn_edit_tool_->setIcon(olive::icon::ToolEdit);
btn_ripple_tool_->setIcon(olive::icon::ToolRipple);
btn_rolling_tool_->setIcon(olive::icon::ToolRolling);
btn_razor_tool_->setIcon(olive::icon::ToolRazor);
btn_slip_tool_->setIcon(olive::icon::ToolSlip);
btn_slide_tool_->setIcon(olive::icon::ToolSlide);
btn_hand_tool_->setIcon(olive::icon::ToolHand);
btn_zoom_tool_->setIcon(olive::icon::ZoomIn);
btn_record_->setIcon(olive::icon::Record);
btn_transition_tool_->setIcon(olive::icon::ToolTransition);
btn_add_->setIcon(olive::icon::Add);
btn_snapping_toggle_->setIcon(olive::icon::Snapping);
btn_pointer_tool_->setIcon(icon::ToolPointer);
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)