Skip to content

Commit

Permalink
Update icons
Browse files Browse the repository at this point in the history
* New icons for markers/in/out
* New icons for audio mute state
  • Loading branch information
rodlie committed Nov 24, 2024
1 parent ae2121b commit 4c1371a
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 14 deletions.
6 changes: 3 additions & 3 deletions src/app/GUI/extraactions.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ void MainWindow::setupMenuExtras()
}
// add in
{
const auto act = menu->addAction(QIcon::fromTheme("pivot-align-left"),
const auto act = menu->addAction(QIcon::fromTheme("range-in"),
tr("In at ..."));
act->setData("cmd:in");
act->setToolTip(QString("<p><b>%1</b> %2 <i>%3</i></p>").arg(tr("Frame In"),
Expand All @@ -94,7 +94,7 @@ void MainWindow::setupMenuExtras()
}
// add out
{
const auto act = menu->addAction(QIcon::fromTheme("pivot-align-right"),
const auto act = menu->addAction(QIcon::fromTheme("range-out"),
tr("Out at ..."));
act->setData("cmd:out");
act->setToolTip(QString("<p><b>%1</b> %2 <i>%3</i></p>").arg(tr("Frame Out"),
Expand Down Expand Up @@ -126,7 +126,7 @@ void MainWindow::setupMenuExtras()
cmdAddAction(act);
}
{
const auto act = menu->addAction(QIcon::fromTheme("trash"/* TODO: find new (blender) icon! */),
const auto act = menu->addAction(QIcon::fromTheme("range-clear"),
tr("Clear In/Out"));
connect(act, &QAction::triggered,
this, [this](){
Expand Down
10 changes: 5 additions & 5 deletions src/app/GUI/mainwindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1126,27 +1126,27 @@ void MainWindow::setupMenuScene()
cmdAddAction(mAddToQueAct);

mSceneMenu->addSeparator();
mSceneMenu->addAction(QIcon::fromTheme("sequence"),
mSceneMenu->addAction(QIcon::fromTheme("range-in"),
tr("Set In"), this, [this]() {
const auto scene = *mDocument.fActiveScene;
if (!scene) { return; }
scene->setFrameIn(true, scene->getCurrentFrame());
});
mSceneMenu->addAction(QIcon::fromTheme("sequence"),
mSceneMenu->addAction(QIcon::fromTheme("range-out"),
tr("Set Out"), this, [this]() {
const auto scene = *mDocument.fActiveScene;
if (!scene) { return; }
scene->setFrameOut(true, scene->getCurrentFrame());
});
mSceneMenu->addAction(QIcon::fromTheme("sequence"),
mSceneMenu->addAction(QIcon::fromTheme("range-clear"),
tr("Clear In/Out"), this, [this]() {
const auto scene = *mDocument.fActiveScene;
if (!scene) { return; }
scene->setFrameIn(false, 0);
scene->setFrameOut(false, 0);
});
mSceneMenu->addSeparator();
mSceneMenu->addAction(QIcon::fromTheme("dialog-information"),
mSceneMenu->addAction(QIcon::fromTheme("markers-add"),
tr("Add Marker"), this, [this]() {
const auto scene = *mDocument.fActiveScene;
if (!scene) { return; }
Expand All @@ -1158,7 +1158,7 @@ void MainWindow::setupMenuScene()
if (!scene) { return; }
scene->clearMarkers();
});
mSceneMenu->addAction(QIcon::fromTheme("dialog-information"),
mSceneMenu->addAction(QIcon::fromTheme("markers-edit"),
tr("Edit Markers"), this, [this]() {
openMarkerEditor();
});
Expand Down
2 changes: 1 addition & 1 deletion src/app/icons
Submodule icons updated 129 files
10 changes: 5 additions & 5 deletions src/ui/widgets/framescrollbar.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -341,17 +341,17 @@ void FrameScrollBar::mousePressEvent(QMouseEvent *event)

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

const auto setFrameInAct = new QAction(QIcon::fromTheme("sequence"),
const auto setFrameInAct = new QAction(QIcon::fromTheme("range-in"),
tr("Set In"), this);
const auto setFrameOutAct = new QAction(QIcon::fromTheme("sequence"),
const auto setFrameOutAct = new QAction(QIcon::fromTheme("range-out"),
tr("Set Out"), this);
const auto clearFrameOutAct = new QAction(QIcon::fromTheme("trash"),
const auto clearFrameOutAct = new QAction(QIcon::fromTheme("range-clear"),
tr("Clear In/Out"), this);
const auto setMarkerAct = new QAction(QIcon::fromTheme("dialog-information"),
const auto setMarkerAct = new QAction(QIcon::fromTheme("markers-add"),
tr(hasMarker ? "Remove Marker" : "Add Marker"), this);
const auto clearMarkersAct = new QAction(QIcon::fromTheme("trash"),
tr("Clear Markers"), this);
const auto openMarkerEditorAct = new QAction(QIcon::fromTheme("dialog-information"),
const auto openMarkerEditorAct = new QAction(QIcon::fromTheme("markers-edit"),
tr("Edit Markers"), this);
const auto splitDurationAct = new QAction(QIcon::fromTheme("cut"),
tr("Split Clip"), this);
Expand Down

0 comments on commit 4c1371a

Please sign in to comment.