Commit 932bb3fc authored by Boudewijn Rempt's avatar Boudewijn Rempt

Fix the action name: it was too far from what we show in the ui

parent b408571c
......@@ -267,7 +267,7 @@ view_grid=Ctrl+Shift+'
view_newwindow=none
view_ruler=none
view_show_guides=none
view_show_just_the_canvas=Tab
view_show_canvas_only=Tab
view_snap_to_grid=Ctrl+Shift+;
view_toggle_assistant_previews=none
view_toggle_painting_assistants=none
......
......@@ -412,7 +412,7 @@ view_grid=Ctrl+Shift+'
view_newwindow=none
view_ruler=none
view_show_guides=none
view_show_just_the_canvas=none
view_show_canvas_only=none
view_snap_to_grid=Ctrl+Shift+;
view_toggle_assistant_previews=none
view_toggle_painting_assistants=none
......
......@@ -412,7 +412,7 @@ view_grid=Ctrl+Shift+'
view_newwindow=none
view_ruler=none
view_show_guides=none
view_show_just_the_canvas=Tab
view_show_canvas_only=Tab
view_snap_to_grid=Ctrl+Shift+;
view_toggle_assistant_previews=none
view_toggle_painting_assistants=none
......
......@@ -217,7 +217,7 @@ void DesktopViewProxy::documentChanged()
{
// Remove existing linking for toggling canvas, in order
// to over-ride the window state behaviour
QAction* toggleJustTheCanvasAction = d->desktopWindow->actionCollection()->action("view_show_just_the_canvas");
QAction* toggleJustTheCanvasAction = d->desktopWindow->actionCollection()->action("view_show_canvas_only");
toggleJustTheCanvasAction->disconnect(d->desktopWindow);
connect(toggleJustTheCanvasAction, SIGNAL(toggled(bool)), this, SLOT(toggleShowJustTheCanvas(bool)));
}
......
......@@ -38,7 +38,7 @@
</Menu>
<Menu name="View"><text>&amp;View</text>
<Action name="view_show_just_the_canvas"/>
<Action name="view_show_canvas_only"/>
<Action name="view_fullscreen"/>
<Action name="mirror_canvas"/>
<Action name="wrap_around_mode"/>
......
......@@ -58,7 +58,7 @@ xsi:schemaLocation="http://www.kde.org/standards/kxmlgui/1.0 http://www.kde.org
</Menu>
<Menu name="view">
<text>&amp;View</text>
<Action name="view_show_just_the_canvas"/>
<Action name="view_show_canvas_only"/>
<Action name="fullscreen"/>
<Action name="wrap_around_mode"/>
<Action name="level_of_detail_mode"/>
......
......@@ -477,7 +477,7 @@
<Actions category="View">
<text>View</text>
<Action name="view_show_just_the_canvas">
<Action name="view_show_canvas_only">
<icon></icon>
<text>&amp;Show Canvas Only</text>
<whatsThis></whatsThis>
......
......@@ -38,7 +38,7 @@
</Menu>
<Menu name="View"><text>&amp;View</text>
<Action name="view_show_just_the_canvas"/>
<Action name="view_show_canvas_only"/>
<Action name="view_fullscreen"/>
<Action name="mirror_canvas"/>
<Action name="wrap_around_mode"/>
......
......@@ -599,7 +599,7 @@ void KisViewManager::createActions()
tAction->setChecked(true);
connect(tAction, SIGNAL(toggled(bool)), this, SLOT(showStatusBar(bool)));
tAction = actionManager()->createAction("view_show_just_the_canvas");
tAction = actionManager()->createAction("view_show_canvas_only");
tAction->setChecked(false);
connect(tAction, SIGNAL(toggled(bool)), this, SLOT(switchCanvasOnly(bool)));
......@@ -1075,7 +1075,7 @@ void KisViewManager::switchCanvasOnly(bool toggled)
// show a fading heads-up display about the shortcut to go back
showFloatingMessage(i18n("Going into Canvas-Only mode.\nPress %1 to go back.",
actionCollection()->action("view_show_just_the_canvas")->shortcut().toString()), QIcon());
actionCollection()->action("view_show_canvas_only")->shortcut().toString()), QIcon());
}
else {
main->restoreState(d->canvasState);
......@@ -1154,7 +1154,7 @@ void KisViewManager::showHideScrollbars()
if (!d->currentImageView->canvasController()) return;
KisConfig cfg;
bool toggled = actionCollection()->action("view_show_just_the_canvas")->isChecked();
bool toggled = actionCollection()->action("view_show_canvas_only")->isChecked();
if ( (toggled && cfg.hideScrollbarsFullscreen()) || (!toggled && cfg.hideScrollbars()) ) {
d->currentImageView->canvasController()->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
......
......@@ -559,7 +559,7 @@ void KisNodeManager::slotSomethingActivatedNodeImpl(KisNodeSP node)
emit sigNodeActivated(node);
nodesUpdated();
if (node) {
bool toggled = m_d->view->actionCollection()->action("view_show_just_the_canvas")->isChecked();
bool toggled = m_d->view->actionCollection()->action("view_show_canvas_only")->isChecked();
if (toggled) {
m_d->view->showFloatingMessage( activeLayer()->name(), QIcon(), 1600, KisFloatingMessage::Medium, Qt::TextSingleLine);
}
......@@ -573,7 +573,7 @@ void KisNodeManager::slotNonUiActivatedNode(KisNodeSP node)
slotSomethingActivatedNodeImpl(node);
if (node) {
bool toggled = m_d->view->actionCollection()->action("view_show_just_the_canvas")->isChecked();
bool toggled = m_d->view->actionCollection()->action("view_show_canvas_only")->isChecked();
if (toggled) {
m_d->view->showFloatingMessage( activeLayer()->name(), QIcon(), 1600, KisFloatingMessage::Medium, Qt::TextSingleLine);
}
......
......@@ -375,7 +375,7 @@ void KisZoomAndPanTest::initializeViewport(ZoomAndPanTester &t, bool fullscreenM
if (fullscreenMode) {
QCOMPARE(t.canvasController()->preferredCenter(), QPointF(320,220));
QAction *action = t.view()->viewManager()->actionCollection()->action("view_show_just_the_canvas");
QAction *action = t.view()->viewManager()->actionCollection()->action("view_show_canvas_only");
action->setChecked(true);
QVERIFY(verifyOffset(t, QPoint(79,-21)));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment