Implemented using a ColorModeMenu class, derived from ToggleActionMenu (derived from KActionMenu), as a child object of PageView. * KToggleAction for every color mode, allows to set shortcuts for every mode. Color mode actions have icons. * KToggleAction for normal colors mode. * ToggleActionMenu containing all color mode actions. If triggered, toggles color mode between normal colors and last change colors mode. "Toggle Change Colors" is replaced by "Change Colors", which is actually a toggle action. BUG: 407217 BUG: 437755remotes/origin/work/spdx
David Hurka
5 years ago
parent
8b13d989c6
commit
195bbe3636
11 changed files with 269 additions and 22 deletions
@ -0,0 +1,145 @@ |
||||
/***************************************************************************
|
||||
* Copyright (C) 2019-2021 by David Hurka <david.hurka@mailbox.org> * |
||||
* * |
||||
* This program is free software; you can redistribute it and/or modify * |
||||
* it under the terms of the GNU General Public License as published by * |
||||
* the Free Software Foundation; either version 2 of the License, or * |
||||
* (at your option) any later version. * |
||||
***************************************************************************/ |
||||
|
||||
#include "colormodemenu.h" |
||||
|
||||
#include <KActionCollection> |
||||
#include <KLocalizedString> |
||||
#include <kwidgetsaddons_version.h> // TODO KF6: Remove, this was needed for KActionMenu::setPopupMode(). |
||||
|
||||
#include "guiutils.h" |
||||
#include "settings.h" |
||||
|
||||
ColorModeMenu::ColorModeMenu(KActionCollection *ac, QObject *parent) |
||||
: ToggleActionMenu(QIcon::fromTheme(QStringLiteral("color-management")), i18nc("@title:menu", "&Color Mode"), parent) |
||||
, m_colorModeActionGroup(new QActionGroup(this)) |
||||
, m_aChangeColors(new KToggleAction(QIcon::fromTheme(QStringLiteral("color-management")), i18nc("@action Change Colors feature toggle action", "Change Colors"), this)) |
||||
{ |
||||
#if KWIDGETSADDONS_VERSION < QT_VERSION_CHECK(5, 77, 0) |
||||
setDelayed(false); |
||||
setStickyMenu(true); |
||||
#else |
||||
setPopupMode(QToolButton::MenuButtonPopup); |
||||
#endif |
||||
|
||||
Q_ASSERT_X(ac->action(QStringLiteral("color_mode_menu")) == nullptr, "ColorModeMenu", "ColorModeMenu constructed twice; color_mode_menu already in action collection."); |
||||
ac->addAction(QStringLiteral("color_mode_menu"), this); |
||||
|
||||
// Normal Colors action.
|
||||
m_aNormal = new KToggleAction(i18nc("@item:inmenu color mode", "&Normal Colors"), this); |
||||
ac->addAction(QStringLiteral("color_mode_normal"), m_aNormal); |
||||
addAction(m_aNormal); |
||||
m_colorModeActionGroup->addAction(m_aNormal); |
||||
|
||||
// Other color mode actions.
|
||||
auto addColorMode = [=](KToggleAction *a, const QString &name, Okular::SettingsCore::EnumRenderMode::type id) { |
||||
a->setData(int(id)); |
||||
addAction(a); |
||||
ac->addAction(name, a); |
||||
m_colorModeActionGroup->addAction(a); |
||||
}; |
||||
addColorMode(new KToggleAction(QIcon::fromTheme(QStringLiteral("invertimage")), i18nc("@item:inmenu color mode", "&Invert Colors"), this), QStringLiteral("color_mode_inverted"), Okular::SettingsCore::EnumRenderMode::Inverted); |
||||
m_aPaperColor = new KToggleAction(i18nc("@item:inmenu color mode", "Change &Paper Color"), this); |
||||
addColorMode(m_aPaperColor, QStringLiteral("color_mode_paper"), Okular::SettingsCore::EnumRenderMode::Paper); |
||||
m_aDarkLight = new KToggleAction(i18nc("@item:inmenu color mode", "Change &Dark && Light Colors"), this); |
||||
addColorMode(m_aDarkLight, QStringLiteral("color_mode_recolor"), Okular::SettingsCore::EnumRenderMode::Recolor); |
||||
addColorMode(new KToggleAction(QIcon::fromTheme(QStringLiteral("color-mode-black-white")), i18nc("@item:inmenu color mode", "Convert to &Black && White"), this), |
||||
QStringLiteral("color_mode_black_white"), |
||||
Okular::SettingsCore::EnumRenderMode::BlackWhite); |
||||
addColorMode(new KToggleAction(QIcon::fromTheme(QStringLiteral("color-mode-invert-text")), i18nc("@item:inmenu color mode", "Invert &Lightness"), this), |
||||
QStringLiteral("color_mode_invert_lightness"), |
||||
Okular::SettingsCore::EnumRenderMode::InvertLightness); |
||||
addColorMode(new KToggleAction(QIcon::fromTheme(QStringLiteral("color-mode-invert-image")), i18nc("@item:inmenu color mode", "Invert L&uma (sRGB Linear)"), this), |
||||
QStringLiteral("color_mode_invert_luma_srgb"), |
||||
Okular::SettingsCore::EnumRenderMode::InvertLuma); |
||||
addColorMode(new KToggleAction(QIcon::fromTheme(QStringLiteral("color-mode-invert-image")), i18nc("@item:inmenu color mode", "Invert Luma (&Symmetric)"), this), |
||||
QStringLiteral("color_mode_invert_luma_symmetric"), |
||||
Okular::SettingsCore::EnumRenderMode::InvertLumaSymmetric); |
||||
addColorMode(new KToggleAction(QIcon::fromTheme(QStringLiteral("color-mode-hue-shift-positive")), i18nc("@item:inmenu color mode", "Shift Hue P&ositive"), this), |
||||
QStringLiteral("color_mode_hue_shift_positive"), |
||||
Okular::SettingsCore::EnumRenderMode::HueShiftPositive); |
||||
addColorMode(new KToggleAction(QIcon::fromTheme(QStringLiteral("color-mode-hue-shift-negative")), i18nc("@item:inmenu color mode", "Shift Hue N&egative"), this), |
||||
QStringLiteral("color_mode_hue_shift_negative"), |
||||
Okular::SettingsCore::EnumRenderMode::HueShiftNegative); |
||||
|
||||
// Add Configure Color Modes action.
|
||||
addSeparator(); |
||||
QAction *aConfigure = ac->action(QStringLiteral("options_configure_color_modes")); |
||||
Q_ASSERT_X(aConfigure, "ColorModeMenu", "ColorModeMenu constructed before Okular::Part?!? options_configure_color_modes not in action collection."); |
||||
addAction(aConfigure); |
||||
|
||||
connect(m_colorModeActionGroup, &QActionGroup::triggered, this, &ColorModeMenu::slotColorModeActionTriggered); |
||||
connect(Okular::SettingsCore::self(), &Okular::SettingsCore::colorModesChanged, this, &ColorModeMenu::slotConfigChanged); |
||||
connect(Okular::Settings::self(), &Okular::Settings::colorModesChanged2, this, &ColorModeMenu::slotConfigChanged); |
||||
connect(this, &QAction::changed, this, &ColorModeMenu::slotChanged); |
||||
|
||||
// Allow to configure a toggle shortcut.
|
||||
connect(m_aChangeColors, &QAction::toggled, this, &ColorModeMenu::slotSetChangeColors); |
||||
ac->addAction(QStringLiteral("color_mode_change_colors"), m_aChangeColors); |
||||
|
||||
slotConfigChanged(); |
||||
} |
||||
|
||||
void ColorModeMenu::slotColorModeActionTriggered(QAction *action) |
||||
{ |
||||
const int newRenderMode = action->data().toInt(); |
||||
// Color mode toggles to normal when the currently checked mode is triggered.
|
||||
// Normal mode is special, triggering it always enables normal mode.
|
||||
// Otherwise, the triggered color mode is activated.
|
||||
if (action == m_aNormal) { |
||||
Okular::SettingsCore::setChangeColors(false); |
||||
} else if (Okular::SettingsCore::renderMode() == newRenderMode) { |
||||
Okular::SettingsCore::setChangeColors(!Okular::SettingsCore::changeColors()); |
||||
} else { |
||||
Okular::SettingsCore::setRenderMode(newRenderMode); |
||||
Okular::SettingsCore::setChangeColors(true); |
||||
} |
||||
Okular::SettingsCore::self()->save(); |
||||
} |
||||
|
||||
void ColorModeMenu::slotSetChangeColors(bool on) |
||||
{ |
||||
Okular::SettingsCore::setChangeColors(on); |
||||
Okular::SettingsCore::self()->save(); |
||||
} |
||||
|
||||
void ColorModeMenu::slotConfigChanged() |
||||
{ |
||||
// Check the current color mode action, and update the toolbar button default action
|
||||
const int rm = Okular::SettingsCore::renderMode(); |
||||
const QList<QAction *> colorModeActions = m_colorModeActionGroup->actions(); |
||||
for (QAction *a : colorModeActions) { |
||||
if (a != m_aNormal && a->data().toInt() == rm) { |
||||
a->setChecked(true); |
||||
setDefaultAction(a); |
||||
break; |
||||
} |
||||
} |
||||
|
||||
// If Change Colors is disabled, check Normal Colors instead
|
||||
if (!Okular::SettingsCore::changeColors()) { |
||||
m_aNormal->setChecked(true); |
||||
} |
||||
|
||||
// Update color icons
|
||||
m_aPaperColor->setIcon(GuiUtils::createColorIcon(QList<QColor>() << Okular::Settings::paperColor(), QIcon::fromTheme(QStringLiteral("paper-color")))); |
||||
m_aDarkLight->setIcon(GuiUtils::createColorIcon(QList<QColor>() << Okular::Settings::recolorForeground() << Okular::Settings::recolorBackground(), QIcon::fromTheme(QStringLiteral("color-mode-black-white")))); |
||||
|
||||
// Update toggle action
|
||||
m_aChangeColors->setChecked(Okular::SettingsCore::changeColors()); |
||||
} |
||||
|
||||
void ColorModeMenu::slotChanged() |
||||
{ |
||||
const bool enabled = isEnabled(); |
||||
const QList<QAction *> colorModeActions = m_colorModeActionGroup->actions(); |
||||
for (QAction *a : colorModeActions) { |
||||
a->setEnabled(enabled); |
||||
} |
||||
} |
||||
@ -0,0 +1,74 @@ |
||||
/***************************************************************************
|
||||
* Copyright (C) 2019-2021 by David Hurka <david.hurka@mailbox.org> * |
||||
* * |
||||
* This program is free software; you can redistribute it and/or modify * |
||||
* it under the terms of the GNU General Public License as published by * |
||||
* the Free Software Foundation; either version 2 of the License, or * |
||||
* (at your option) any later version. * |
||||
***************************************************************************/ |
||||
|
||||
#ifndef COLORMODEMENU_H |
||||
#define COLORMODEMENU_H |
||||
|
||||
#include "toggleactionmenu.h" |
||||
|
||||
class KActionCollection; |
||||
class KToggleAction; |
||||
|
||||
/**
|
||||
* Color Mode menu. Allows to change Okular::Settings::RenderMode from the toolbar. |
||||
* |
||||
* The toolbar button will always show the last selected color mode (except normal mode), |
||||
* so it can be quickly enabled and disabled by just clicking the button. |
||||
* Clicking on the menu arrow opens a menu with all color modes (including normal mode), |
||||
* and an action to configure the color modes. |
||||
* |
||||
* Every color mode actions is available in the action collection, in addition to this menu itself. |
||||
* |
||||
* Color mode actions are enabled/disabled automatically when this menu is enabled/disabled. |
||||
*/ |
||||
class ColorModeMenu : public ToggleActionMenu |
||||
{ |
||||
Q_OBJECT |
||||
|
||||
public: |
||||
explicit ColorModeMenu(KActionCollection *ac, QObject *parent); |
||||
|
||||
protected: |
||||
/** Makes color mode actions exclusive */ |
||||
QActionGroup *m_colorModeActionGroup; |
||||
|
||||
KToggleAction *m_aNormal; |
||||
KToggleAction *m_aPaperColor; |
||||
KToggleAction *m_aDarkLight; |
||||
|
||||
/** Allows to set a shortcut to toggle the Change Colors feature. */ |
||||
KToggleAction *m_aChangeColors; |
||||
|
||||
protected Q_SLOTS: |
||||
/**
|
||||
* Sets the color mode (render mode) to the one represented by @p action. |
||||
* |
||||
* If @p action represents the current mode, toggles the Change Colors feature. |
||||
*/ |
||||
void slotColorModeActionTriggered(QAction *action); |
||||
|
||||
/**
|
||||
* Sets the change colors feature on or off. |
||||
*/ |
||||
void slotSetChangeColors(bool on); |
||||
|
||||
/**
|
||||
* Updates the default action and the checked states of the color mode menu. |
||||
* |
||||
* Call this when the color mode was changed or Change Colors was toggled. |
||||
*/ |
||||
void slotConfigChanged(); |
||||
|
||||
/**
|
||||
* Updates child actions as necessary |
||||
*/ |
||||
void slotChanged(); |
||||
}; |
||||
|
||||
#endif // COLORMODEMENU_H
|
||||
Loading…
Reference in new issue