Skip to content

Commit

Permalink
Misc icon fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
rodlie committed Aug 16, 2024
1 parent 9e5c0bf commit ced77ef
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 18 deletions.
2 changes: 1 addition & 1 deletion src/app/GUI/RenderWidgets/renderinstancewidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -468,7 +468,7 @@ OutputProfilesListButton::OutputProfilesListButton(RenderInstanceWidget *parent)
QPushButton(parent) {
mParentWidget = parent;
setText(tr("Profiles"));
setIcon(QIcon::fromTheme("file_movie"));
setIcon(QIcon::fromTheme("renderlayers"));
setToolTip(tr("Select output profile"));
}

Expand Down
6 changes: 3 additions & 3 deletions src/app/GUI/Settings/pluginssettingswidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,14 @@ PluginsSettingsWidget::PluginsSettingsWidget(QWidget *parent)
mShaderLabel->setToolTip(tr("This location will be scanned for shader plugins during startup."));
mShaderPath = new QLineEdit(this);
mShaderPath->setText(AppSupport::getAppShaderEffectsPath());
const auto mShaderPathButton = new QPushButton(QIcon::fromTheme("dots"),
const auto mShaderPathButton = new QPushButton(QIcon::fromTheme("file_folder"),
QString(),
this);
mShaderPathButton->setObjectName("FlatButton");
mShaderPathButton->setFocusPolicy(Qt::NoFocus);

eSizesUI::widget.add(mShaderPathButton, [mShaderPathButton](const int size) {
mShaderPathButton->setFixedSize(size, size);
Q_UNUSED(size)
mShaderPathButton->setFixedSize(eSizesUI::button, eSizesUI::button);
});

mShaderLayout->addWidget(mShaderLabel);
Expand Down
4 changes: 2 additions & 2 deletions src/app/GUI/keysview.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -343,8 +343,8 @@ void KeysView::mousePressEvent(QMouseEvent *e) {
QMenu menu;
const QString editStr = tr("Edit duration");
const QString splitStr = tr("Split Clip");
menu.addAction(editStr);
menu.addAction(splitStr);
menu.addAction(QIcon::fromTheme("sequence"), editStr);
menu.addAction(QIcon::fromTheme("image-missing"), splitStr);
const auto selectedAction = menu.exec(e->globalPos());
if (selectedAction) {
if (selectedAction->text() == editStr) {
Expand Down
11 changes: 7 additions & 4 deletions src/app/GUI/mainwindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -665,6 +665,7 @@ void MainWindow::setupMenuBar()
{
const auto qAct = new NoShortcutAction(tr("Duplicate", "MenuBar_Edit"));
mEditMenu->addAction(qAct);
qAct->setIcon(QIcon::fromTheme("duplicate"));
qAct->setShortcut(Qt::CTRL + Qt::Key_D);
mActions.duplicateAction->connect(qAct);
cmdAddAction(qAct);
Expand Down Expand Up @@ -729,14 +730,16 @@ void MainWindow::setupMenuBar()

mEditMenu->addSeparator();

const auto clearCacheAct = mEditMenu->addAction(tr("Clear Cache", "MenuBar_Edit"), [this]() {
const auto clearCacheAct = mEditMenu->addAction(QIcon::fromTheme("trash"),
tr("Clear Cache", "MenuBar_Edit"), [this]() {
const auto m = MemoryHandler::sInstance;
m->clearMemory();
mTimeline->update();
}, QKeySequence(tr("Ctrl+R")));
cmdAddAction(clearCacheAct);

const auto clearRecentAct = mEditMenu->addAction(tr("Clear Recent Files"), [this]() {
const auto clearRecentAct = mEditMenu->addAction(QIcon::fromTheme("trash"),
tr("Clear Recent Files"), [this]() {
mRecentFiles.clear();
writeRecentFiles();
updateRecentMenu();
Expand Down Expand Up @@ -1006,8 +1009,7 @@ void MainWindow::setupMenuBar()
mToolbar->addWidget(sceneToolBtn);
}

const auto zoomMenu = mViewMenu->addMenu(
tr("Zoom","MenuBar_View"));
const auto zoomMenu = mViewMenu->addMenu(QIcon::fromTheme("zoom"), tr("Zoom","MenuBar_View"));

mZoomInAction = zoomMenu->addAction(tr("Zoom In", "MenuBar_View_Zoom"));
mZoomInAction->setShortcut(QKeySequence("Ctrl+Shift++"));
Expand Down Expand Up @@ -1290,6 +1292,7 @@ void MainWindow::setupMenuBar()
QMessageBox::aboutQt(this, tr("About Qt"));
});

help->addSeparator();
help->addAction(QIcon::fromTheme("cmd"),
tr("Command Palette"), this, [this]() {
CommandPalette dialog(mDocument, this);
Expand Down
24 changes: 16 additions & 8 deletions src/ui/widgets/framescrollbar.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -318,24 +318,32 @@ void FrameScrollBar::mousePressEvent(QMouseEvent *event)

//menu.addSeparator();

QAction *timeAction = new QAction(tr("Display Timecodes"), this);
QAction *timeAction = new QAction(QIcon::fromTheme("visible"),
tr("Display Timecodes"), this);
timeAction->setCheckable(true);
timeAction->setChecked(mDisplayTime);
menu.addAction(timeAction);

QAction *framesAction = new QAction(tr("Display Frames"), this);
QAction *framesAction = new QAction(QIcon::fromTheme("visible"),
tr("Display Frames"), this);
framesAction->setCheckable(true);
framesAction->setChecked(!mDisplayTime);
menu.addAction(framesAction);

bool hasMarker = mCurrentCanvas ? mCurrentCanvas->hasMarker(mCurrentCanvas->getCurrentFrame()) : false;

const auto setFrameInAct = new QAction(tr("Set Frame In"), this);
const auto setFrameOutAct = new QAction(tr("Set Frame Out"), this);
const auto clearFrameOutAct = new QAction(tr("Clear Frame In/Out"), this);
const auto setMarkerAct = new QAction(tr(hasMarker ? "Remove Marker" : "Add Marker"), this);
const auto clearMarkersAct = new QAction(tr("Clear Markers"), this);
const auto splitDurationAct = new QAction(tr("Split Clip"), this);
const auto setFrameInAct = new QAction(QIcon::fromTheme("sequence"),
tr("Set In"), this);
const auto setFrameOutAct = new QAction(QIcon::fromTheme("sequence"),
tr("Set Out"), this);
const auto clearFrameOutAct = new QAction(QIcon::fromTheme("trash"),
tr("Clear In/Out"), this);
const auto setMarkerAct = new QAction(QIcon::fromTheme("dialog-information"),
tr(hasMarker ? "Remove Marker" : "Add Marker"), this);
const auto clearMarkersAct = new QAction(QIcon::fromTheme("trash"),
tr("Clear Markers"), this);
const auto splitDurationAct = new QAction(QIcon::fromTheme("image-missing"),
tr("Split Clip"), this);

menu.addSeparator();
menu.addAction(setFrameInAct);
Expand Down
1 change: 1 addition & 0 deletions src/ui/widgets/performancesettingswidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@ PerformanceSettingsWidget::PerformanceSettingsWidget(QWidget *parent)
mCpuThreadsCapCheck->setFixedHeight(size);
mRamMBCapCheck->setFixedHeight(size);
mPathGpuAccCheck->setFixedHeight(size);
mAudioDevicesCombo->setFixedHeight(eSizesUI::button);
});

QTimer::singleShot(250, this,
Expand Down

0 comments on commit ced77ef

Please sign in to comment.