wilderjds
/
okular
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename kcfg setting to primaryAnnotationToolBar

Browse Source
remotes/origin/work/schwarzer/update_platform_name
Simone Gaiarin 5 years ago
parent f57e12e2e7
commit 60645dfda5
3 changed files with 20 additions and 19 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      conf/okular.kcfg
  2. 16
      part/annotationactionhandler.cpp
  3. 13
      part/dlgannotations.cpp

10
conf/okular.kcfg
Unescape View File

@ -11,7 +11,7 @@
<signal name="colorModesChanged2" > <signal name="colorModesChanged2" >
<label>Same as colorModesChanged(), but kconfig_compiler does not allow to inherit signals, so appending a '2'.</label> <label>Same as colorModesChanged(), but kconfig_compiler does not allow to inherit signals, so appending a '2'.</label>
</signal> </signal>
<signal name="defaultAnnotationToolBarChanged" /> <signal name="primaryAnnotationToolBarChanged" />
<group name="Dlg Performance" > <group name="Dlg Performance" >
<entry key="EnableCompositing" type="Bool" > <entry key="EnableCompositing" type="Bool" >
<default>true</default> <default>true</default>
@ -322,13 +322,13 @@
<default>true</default> <default>true</default>
<emit signal="viewContinuousChanged" /> <emit signal="viewContinuousChanged" />
</entry> </entry>
<entry key="DefaultAnnotationToolBar" type="Enum" > <entry key="PrimaryAnnotationToolBar" type="Enum" >
<default>AnnotationToolBar</default> <default>FullAnnotationToolBar</default>
<choices> <choices>
<choice name="AnnotationToolBar" /> <choice name="FullAnnotationToolBar" />
<choice name="QuickAnnotationToolBar" /> <choice name="QuickAnnotationToolBar" />
</choices> </choices>
<emit signal="defaultAnnotationToolBarChanged" /> <emit signal="primaryAnnotationToolBarChanged" />
</entry> </entry>
<entry key="ViewMode" type="Enum" > <entry key="ViewMode" type="Enum" >
<default>Single</default> <default>Single</default>

16
part/annotationactionhandler.cpp
Unescape View File

@ -769,7 +769,7 @@ AnnotationActionHandler::AnnotationActionHandler(PageViewAnnotator *parent, KAct
ac->setDefaultShortcut(d->aAddToQuickTools, QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_B)); ac->setDefaultShortcut(d->aAddToQuickTools, QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_B));
d->updateConfigActions(); d->updateConfigActions();
connect(Okular::Settings::self(), &Okular::Settings::defaultAnnotationToolBarChanged, this, &AnnotationActionHandler::setupAnnotationToolBarVisibilityAction); connect(Okular::Settings::self(), &Okular::Settings::primaryAnnotationToolBarChanged, this, &AnnotationActionHandler::setupAnnotationToolBarVisibilityAction);
} }
AnnotationActionHandler::~AnnotationActionHandler() AnnotationActionHandler::~AnnotationActionHandler()
@ -797,16 +797,16 @@ void AnnotationActionHandler::setupAnnotationToolBarVisibilityAction()
// hide action // hide action
connect(d->aHideToolBar, &QAction::triggered, annotationToolBar, &KToolBar::hide, Qt::UniqueConnection); connect(d->aHideToolBar, &QAction::triggered, annotationToolBar, &KToolBar::hide, Qt::UniqueConnection);
KToolBar *defaultAnnotationToolBar = annotationToolBar; KToolBar *primaryAnnotationToolBar = annotationToolBar;
if (Okular::Settings::defaultAnnotationToolBar() == Okular::Settings::EnumDefaultAnnotationToolBar::QuickAnnotationToolBar) { if (Okular::Settings::primaryAnnotationToolBar() == Okular::Settings::EnumPrimaryAnnotationToolBar::QuickAnnotationToolBar) {
defaultAnnotationToolBar = mw->toolBar(QStringLiteral("quickAnnotationToolBar")); primaryAnnotationToolBar = mw->toolBar(QStringLiteral("quickAnnotationToolBar"));
} }
d->aToolBarVisibility->setChecked(false); d->aToolBarVisibility->setChecked(false);
d->aToolBarVisibility->disconnect(); d->aToolBarVisibility->disconnect();
d->aToolBarVisibility->setChecked(defaultAnnotationToolBar->isVisible()); d->aToolBarVisibility->setChecked(primaryAnnotationToolBar->isVisible());
connect(defaultAnnotationToolBar, &QToolBar::visibilityChanged, d->aToolBarVisibility, &QAction::setChecked, Qt::UniqueConnection); connect(primaryAnnotationToolBar, &QToolBar::visibilityChanged, d->aToolBarVisibility, &QAction::setChecked, Qt::UniqueConnection);
connect(d->aToolBarVisibility, &QAction::toggled, defaultAnnotationToolBar, &KToolBar::setVisible, Qt::UniqueConnection); connect(d->aToolBarVisibility, &QAction::toggled, primaryAnnotationToolBar, &KToolBar::setVisible, Qt::UniqueConnection);
d->aShowToolBar->setEnabled(!defaultAnnotationToolBar->isVisible()); d->aShowToolBar->setEnabled(!primaryAnnotationToolBar->isVisible());
} }
void AnnotationActionHandler::reparseBuiltinToolsConfig() void AnnotationActionHandler::reparseBuiltinToolsConfig()

13
part/dlgannotations.cpp
Unescape View File

@ -20,12 +20,13 @@ DlgAnnotations::DlgAnnotations(QWidget *parent)
{ {
QFormLayout *layout = new QFormLayout(this); QFormLayout *layout = new QFormLayout(this);
// Combobox: default annotation toolbar associated to annotation action in tool menu // BEGIN Annotation toolbar: Combo box to set the annotation toolbar associated to annotation action in tool menu
QComboBox *annotationToolBar = new QComboBox(this); QComboBox *primaryAnnotationToolBar = new QComboBox(this);
annotationToolBar->addItem(i18nc("item:inlistbox Config dialog, general page", "Full Annotation Toobar")); primaryAnnotationToolBar->addItem(i18nc("item:inlistbox Config dialog, general page", "Full Annotation Toobar"));
annotationToolBar->addItem(i18nc("item:inlistbox Config dialog, general page", "Quick Annotation Toolbar")); primaryAnnotationToolBar->addItem(i18nc("item:inlistbox Config dialog, general page", "Quick Annotation Toolbar"));
annotationToolBar->setObjectName(QStringLiteral("kcfg_AnnotationToolBar")); primaryAnnotationToolBar->setObjectName(QStringLiteral("kcfg_PrimaryAnnotationToolBar"));
layout->addRow(i18nc("label:listbox Config dialog, general page", "Annotation toolbar:"), annotationToolBar); layout->addRow(i18nc("label:listbox Config dialog, general page", "Annotation toolbar:"), primaryAnnotationToolBar);
// END Annotation toolbar
// BEGIN Author row: Line edit to set the annotation’s default author value. // BEGIN Author row: Line edit to set the annotation’s default author value.
QLineEdit *authorLineEdit = new QLineEdit(this); QLineEdit *authorLineEdit = new QLineEdit(this);

Write Preview
Loading…
Cancel
Save