oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests 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/dialog/export/export.cpp
+3 -3
View File
@@ -40,7 +40,7 @@ ExportDialog::ExportDialog(ViewerOutput *viewer_node, QWidget *parent) :
QPushButton* file_browse_btn = new QPushButton();
file_browse_btn->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
file_browse_btn->setIcon(olive::icon::Folder);
file_browse_btn->setIcon(icon::Folder);
file_browse_btn->setToolTip(tr("Browse for exported file filename"));
connect(file_browse_btn, SIGNAL(clicked(bool)), this, SLOT(BrowseFilename()));
preferences_layout->addWidget(file_browse_btn, row, 3);
@@ -57,12 +57,12 @@ ExportDialog::ExportDialog(ViewerOutput *viewer_node, QWidget *parent) :
preferences_layout->addWidget(preset_combobox, row, 1);
QPushButton* preset_load_btn = new QPushButton();
preset_load_btn->setIcon(olive::icon::Open);
preset_load_btn->setIcon(icon::Open);
preset_load_btn->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
preferences_layout->addWidget(preset_load_btn, row, 2);
QPushButton* preset_save_btn = new QPushButton();
preset_save_btn->setIcon(olive::icon::Save);
preset_save_btn->setIcon(icon::Save);
preset_save_btn->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
preferences_layout->addWidget(preset_save_btn, row, 3);
app/project/item/folder/folder.cpp
+1 -1
View File
@@ -38,5 +38,5 @@ bool Folder::CanHaveChildren() const
QIcon Folder::icon()
{
return olive::icon::Folder;
return icon::Folder;
}
app/project/item/footage/footage.cpp
+4 -4
View File
@@ -126,22 +126,22 @@ QIcon Footage::icon()
if (HasStreamsOfType(Stream::kVideo)) {
// Prioritize the video icon
return olive::icon::Video;
return icon::Video;
} else if (HasStreamsOfType(Stream::kAudio)) {
// Otherwise assume it's audio only
return olive::icon::Audio;
return icon::Audio;
} else if (HasStreamsOfType(Stream::kImage)) {
// Otherwise assume it's an image
return olive::icon::Image;
return icon::Image;
}
/* fall-through */
case kInvalid:
return olive::icon::Error;
return icon::Error;
}
return QIcon();
app/project/item/footage/stream.cpp
+3 -3
View File
@@ -105,11 +105,11 @@ QIcon Stream::IconFromType(const Stream::Type &type)
{
switch (type) {
case Stream::kVideo:
return olive::icon::Video;
return icon::Video;
case Stream::kImage:
return olive::icon::Image;
return icon::Image;
case Stream::kAudio:
return olive::icon::Audio;
return icon::Audio;
default:
break;
}
app/project/item/sequence/sequence.cpp
+1 -1
View File
@@ -84,7 +84,7 @@ Item::Type Sequence::type() const
QIcon Sequence::icon()
{
return olive::icon::Sequence;
return icon::Sequence;
}
QString Sequence::duration()
app/ui/icons/icons.cpp
+43 -43
View File
@@ -30,49 +30,49 @@ const int ICON_SIZES[] = {
};
/// Internal icon library for use throughout Olive without having to regenerate constantly
QIcon olive::icon::GoToStart;
QIcon olive::icon::PrevFrame;
QIcon olive::icon::Play;
QIcon olive::icon::Pause;
QIcon olive::icon::NextFrame;
QIcon olive::icon::GoToEnd;
QIcon olive::icon::New;
QIcon olive::icon::Open;
QIcon olive::icon::Save;
QIcon olive::icon::Undo;
QIcon olive::icon::Redo;
QIcon olive::icon::TreeView;
QIcon olive::icon::ListView;
QIcon olive::icon::IconView;
QIcon olive::icon::ToolPointer;
QIcon olive::icon::ToolEdit;
QIcon olive::icon::ToolRipple;
QIcon olive::icon::ToolRolling;
QIcon olive::icon::ToolRazor;
QIcon olive::icon::ToolSlip;
QIcon olive::icon::ToolSlide;
QIcon olive::icon::ToolHand;
QIcon olive::icon::ToolTransition;
QIcon olive::icon::Folder;
QIcon olive::icon::Sequence;
QIcon olive::icon::Video;
QIcon olive::icon::Audio;
QIcon olive::icon::Image;
QIcon olive::icon::TriUp;
QIcon olive::icon::TriLeft;
QIcon olive::icon::TriDown;
QIcon olive::icon::TriRight;
QIcon olive::icon::Snapping;
QIcon olive::icon::ZoomIn;
QIcon olive::icon::ZoomOut;
QIcon olive::icon::Record;
QIcon olive::icon::Add;
QIcon olive::icon::Error;
QIcon olive::icon::DirUp;
QIcon olive::icon::Clock;
QIcon olive::icon::Diamond;
QIcon icon::GoToStart;
QIcon icon::PrevFrame;
QIcon icon::Play;
QIcon icon::Pause;
QIcon icon::NextFrame;
QIcon icon::GoToEnd;
QIcon icon::New;
QIcon icon::Open;
QIcon icon::Save;
QIcon icon::Undo;
QIcon icon::Redo;
QIcon icon::TreeView;
QIcon icon::ListView;
QIcon icon::IconView;
QIcon icon::ToolPointer;
QIcon icon::ToolEdit;
QIcon icon::ToolRipple;
QIcon icon::ToolRolling;
QIcon icon::ToolRazor;
QIcon icon::ToolSlip;
QIcon icon::ToolSlide;
QIcon icon::ToolHand;
QIcon icon::ToolTransition;
QIcon icon::Folder;
QIcon icon::Sequence;
QIcon icon::Video;
QIcon icon::Audio;
QIcon icon::Image;
QIcon icon::TriUp;
QIcon icon::TriLeft;
QIcon icon::TriDown;
QIcon icon::TriRight;
QIcon icon::Snapping;
QIcon icon::ZoomIn;
QIcon icon::ZoomOut;
QIcon icon::Record;
QIcon icon::Add;
QIcon icon::Error;
QIcon icon::DirUp;
QIcon icon::Clock;
QIcon icon::Diamond;
void olive::icon::LoadAll(const QString& theme)
void icon::LoadAll(const QString& theme)
{
GoToStart = Create(theme, "prev");
PrevFrame = Create(theme, "rew");
@@ -122,7 +122,7 @@ void olive::icon::LoadAll(const QString& theme)
Diamond = Create(theme, "diamond");
}
QIcon olive::icon::Create(const QString& theme, const QString &name)
QIcon icon::Create(const QString& theme, const QString &name)
{
QIcon icon;
app/ui/icons/icons.h
-2
View File
@@ -23,7 +23,6 @@
#include <QIcon>
namespace olive {
namespace icon {
// Playback Icons
@@ -118,7 +117,6 @@ QIcon Create(const QString &theme, const QString& name);
*/
void LoadAll(const QString &theme);
}
}
#endif // ICONS_H
app/ui/style/style.cpp
+1 -1
View File
@@ -140,7 +140,7 @@ void StyleManager::SetStyle(const StyleDescriptor &style)
void StyleManager::SetStyle(const QString &style_path)
{
// Load all icons for this style (icons must be loaded first because the style change below triggers the icon change)
olive::icon::LoadAll(style_path);
icon::LoadAll(style_path);
// Set palette for this
QString palette_file = QStringLiteral("%1/palette.ini").arg(style_path);
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)