Skip to content

Commit

Permalink
Added skip buttons, tooltips, and separators on toolbar
Browse files Browse the repository at this point in the history
  • Loading branch information
CarlosFdez committed Jan 11, 2017
1 parent ec28d41 commit 3d85366
Show file tree
Hide file tree
Showing 3 changed files with 92 additions and 13 deletions.
27 changes: 27 additions & 0 deletions src/mainwindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,10 @@ MainWindow::MainWindow(QWidget *parent) :
ui->togglePlayButton->setIcon(QIcon(":/images/play.png"));
ui->speedDecreaseButton->setIcon(style()->standardIcon(QStyle::SP_MediaSeekBackward));
ui->speedIncreaseButton->setIcon(style()->standardIcon(QStyle::SP_MediaSeekForward));
ui->skipBackwardsButton->setIcon(style()->standardIcon(QStyle::SP_MediaSkipBackward));
ui->skipForwardsButton->setIcon(style()->standardIcon(QStyle::SP_MediaSkipForward));

updateTooltips();

// wire up events
connect(videoPlayer.get(), SIGNAL(loaded()), SLOT(on_playerLoaded()));
Expand Down Expand Up @@ -156,6 +160,19 @@ void MainWindow::close()
ui->progressLabel->setText("");
}

void MainWindow::updateTooltips()
{
ui->togglePlayButton->setToolTip("Play/Pause (spacebar)");
ui->speedDecreaseButton->setToolTip("Slow Down");
ui->speedIncreaseButton->setToolTip("Speed Up");
ui->skipBackwardsButton->setToolTip("Skip Backwards (Left Arrow)");
ui->skipForwardsButton->setToolTip("Skip Forwards (Right Arrow)");
ui->trimLeftButton->setToolTip("Adjust Range Left Border");
ui->trimRightButton->setToolTip("Adjust Range Right Border");
ui->splitMiddleButton->setToolTip("Split Range");
ui->snapshotButton->setToolTip("Export Frame Image");
}

void MainWindow::skipAmount(qint64 skipAmount)
{
qint64 position = (seekPosition > -1) ? seekPosition: videoPlayer->position();
Expand Down Expand Up @@ -419,3 +436,13 @@ void MainWindow::on_snapshotButton_clicked()
message.exec();
}
}

void MainWindow::on_skipBackwardsButton_clicked()
{
skipAmount(-SEEK_JUMP);
}

void MainWindow::on_skipForwardsButton_clicked()
{
skipAmount(SEEK_JUMP);
}
6 changes: 6 additions & 0 deletions src/mainwindow.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ class MainWindow : public QMainWindow
void close();

protected:
void updateTooltips();

/// Skips a certain amount of video. Can be positive or negative
void skipAmount(qint64 skipAmount);

Expand Down Expand Up @@ -78,6 +80,10 @@ private slots:

void on_snapshotButton_clicked();

void on_skipBackwardsButton_clicked();

void on_skipForwardsButton_clicked();

private:
Ui::MainWindow *ui;

Expand Down
72 changes: 59 additions & 13 deletions src/mainwindow.ui
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
}

#rangeInput {
min-width: 150px;
min-width: 150px;
max-width: 150px;
font-size: 0.8em;
}
Expand Down Expand Up @@ -122,24 +122,20 @@
</widget>
</item>
<item>
<widget class="QToolButton" name="snapshotButton">
<widget class="QToolButton" name="speedDecreaseButton">
<property name="enabled">
<bool>true</bool>
</property>
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="../images.qrc">
<normaloff>:/images/screenshot.png</normaloff>:/images/screenshot.png</iconset>
</property>
<property name="checkable">
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="speedDecreaseButton">
<widget class="QToolButton" name="speedIncreaseButton">
<property name="enabled">
<bool>true</bool>
</property>
Expand All @@ -152,18 +148,35 @@
</widget>
</item>
<item>
<widget class="QToolButton" name="speedIncreaseButton">
<property name="enabled">
<bool>true</bool>
</property>
<widget class="QToolButton" name="skipBackwardsButton">
<property name="text">
<string/>
</property>
<property name="checkable">
<bool>false</bool>
</widget>
</item>
<item>
<widget class="QToolButton" name="skipForwardsButton">
<property name="text">
<string/>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>16</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QToolButton" name="trimLeftButton">
<property name="enabled">
Expand Down Expand Up @@ -215,6 +228,39 @@
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>16</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QToolButton" name="snapshotButton">
<property name="enabled">
<bool>true</bool>
</property>
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="../images.qrc">
<normaloff>:/images/screenshot.png</normaloff>:/images/screenshot.png</iconset>
</property>
<property name="checkable">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</item>
<item alignment="Qt::AlignRight">
Expand Down

0 comments on commit 3d85366

Please sign in to comment.