Skip to content

Commit

Permalink
Add 25% to player zoom.
Browse files Browse the repository at this point in the history
  • Loading branch information
ddennedy committed Apr 15, 2016
1 parent cc0c322 commit 9a68d36
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 8 deletions.
22 changes: 16 additions & 6 deletions src/player.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -183,12 +183,15 @@ Player::Player(QWidget *parent)
m_zoomFitAction = zoomMenu->addAction(
QIcon::fromTheme("zoom-fit-best", QIcon(":/icons/oxygen/32x32/actions/zoom-fit-best")),
tr("Zoom Fit"), this, SLOT(zoomFit()));
m_zoomOutAction25 = zoomMenu->addAction(
QIcon::fromTheme("zoom-out", QIcon(":/icons/oxygen/32x32/actions/zoom-out")),
tr("Zoom 25%"), this, SLOT(zoomOut25()));
m_zoomOutAction50 = zoomMenu->addAction(
QIcon::fromTheme("zoom-out", QIcon(":/icons/oxygen/32x32/actions/zoom-out")),
tr("Zoom 50%"), this, SLOT(zoomOut50()));
m_zoomOriginalAction = zoomMenu->addAction(
QIcon::fromTheme("zoom-original", QIcon(":/icons/oxygen/32x32/actions/zoom-original")),
tr("Zoom 100%"), this, SLOT(zoomOriginal()));
m_zoomOutAction = zoomMenu->addAction(
QIcon::fromTheme("zoom-out", QIcon(":/icons/oxygen/32x32/actions/zoom-out")),
tr("Zoom 50%"), this, SLOT(zoomOut()));
m_zoomInAction = zoomMenu->addAction(
QIcon::fromTheme("zoom-in", QIcon(":/icons/oxygen/32x32/actions/zoom-in")),
tr("Zoom 200%"), this, SLOT(zoomIn()));
Expand Down Expand Up @@ -849,9 +852,14 @@ void Player::zoomOriginal()
setZoom(1.0f, m_zoomOriginalAction->icon());
}

void Player::zoomOut()
void Player::zoomOut50()
{
setZoom(0.5f, m_zoomOutAction50->icon());
}

void Player::zoomOut25()
{
setZoom(0.5f, m_zoomOutAction->icon());
setZoom(0.25f, m_zoomOutAction25->icon());
}

void Player::zoomIn()
Expand All @@ -866,7 +874,9 @@ void Player::toggleZoom(bool checked)
else if (m_zoomToggleFactor == 1.0f)
zoomOriginal();
else if (m_zoomToggleFactor == 0.5f)
zoomOut();
zoomOut50();
else if (m_zoomToggleFactor == 0.25f)
zoomOut25();
else if (m_zoomToggleFactor == 2.0f)
zoomIn();
}
6 changes: 4 additions & 2 deletions src/player.h
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,8 @@ public slots:
QToolButton* m_zoomButton;
QAction* m_zoomFitAction;
QAction* m_zoomOriginalAction;
QAction* m_zoomOutAction;
QAction* m_zoomOutAction50;
QAction* m_zoomOutAction25;
QAction* m_zoomInAction;
float m_zoomToggleFactor;
QTabBar* m_tabs;
Expand All @@ -163,7 +164,8 @@ private slots:
void setZoom(float factor, const QIcon &icon);
void zoomFit();
void zoomOriginal();
void zoomOut();
void zoomOut50();
void zoomOut25();
void zoomIn();
void toggleZoom(bool checked);
};
Expand Down

0 comments on commit 9a68d36

Please sign in to comment.