Skip to content

Give "Clear" action more appropriate text and icon

Nate Graham requested to merge ngraham/skanpage:discard-all into master

This action is currently a bit unclear about what it will clear (Everything? The selected thing? Something else?) and its icon is not as destructive-looking as it should be given what it actually does. This commit resolves those issues.

Unfortunately I cannot test this as Skanpage current crashes on launch for me with the following backtrace:

#0  QQmlObjectModel::object (this=0x7d4ac0, index=3)
    at /usr/src/debug/qt5-qtdeclarative-5.15.2-8.fc35.x86_64/src/qmlmodels/qqmlobjectmodel.cpp:279
#1  0x00007ffff5443847 in QQuickSplitView::restoreState (this=0x7fffffffaaf8, state=...)
    at /usr/src/debug/qt5-qtquickcontrols2-5.15.2-4.fc35.x86_64/src/quicktemplates2/qquicksplitview.cpp:1351
#2  0x00007ffff5444789 in QQuickSplitView::qt_static_metacall (_o=_o@entry=0x7d4610, 
    _c=_c@entry=QMetaObject::InvokeMetaMethod, _id=_id@entry=4, _a=_a@entry=0x7fffffffada0)
    at .moc/moc_qquicksplitview_p.cpp:113
#3  0x00007ffff5444953 in QQuickSplitView::qt_metacall (this=0x7d4610, 
    _c=QMetaObject::InvokeMetaMethod, _id=4, _a=0x7fffffffada0)
    at .moc/moc_qquicksplitview_p.cpp:203
#4  0x00007ffff6f0b6f5 in QQmlObjectOrGadget::metacall (this=0x7fffffffb040, 
    type=QMetaObject::InvokeMetaMethod, index=, argv=)
    at qml/qqmlobjectorgadget.cpp:51
#5  0x00007ffff6e156ab in CallMethod (callType=, callArgs=0x7fffffffae28, 
    engine=, argTypes=, argCount=, 
    returnType=, index=, object=...)
    at /usr/include/qt5/QtCore/qvarlengtharray.h:190
#6  CallPrecise (object=..., data=..., engine=engine@entry=0x598450, 
    callArgs=callArgs@entry=0x7fffd8fa3588, callType=callType@entry=QMetaObject::InvokeMetaMethod)
    at jsruntime/qv4qobjectwrapper.cpp:1569
#7  0x00007ffff6e165c7 in QV4::QObjectMethod::callInternal (this=, 
    thisObject=, argv=, argc=)
    at jsruntime/qv4qobjectwrapper.cpp:2131
#8  0x00007ffff6e26271 in QV4::Moth::VME::interpret (frame=0x7fffffffb450, engine=0x598450, 
    code=0x7fffd8fa3538 "\340\371\237\330\377\177") at jsruntime/qv4vme_moth.cpp:754
#9  0x00007ffff6e29c15 in QV4::Moth::VME::exec (frame=, engine=)
    at jsruntime/qv4vme_moth.cpp:463
#10 0x00007ffff6dcc7de in QV4::Function::call (this=, thisObject=, 
    argv=, argc=, context=)
    at jsruntime/qv4function.cpp:69
#11 0x00007ffff6f26c71 in QQmlJavaScriptExpression::evaluate (this=0x936680, 
    callData=0x7fffd8fa34d0, isUndefined=0x0) at qml/qqmljavascriptexpression.cpp:212
#12 0x00007ffff6ee0ae1 in QQmlBoundSignalExpression::evaluate (this=, 
    a=) at qml/qqmlboundsignal.cpp:224
#13 0x00007ffff6ee0e73 in QQmlBoundSignal_callback (a=0x0, e=0x9280a0)
    at ../../include/QtQml/5.15.2/QtQml/private/../../../../../src/qml/qml/qqmlboundsignalexpressionpointer_p.h:69
#14 QQmlBoundSignal_callback (e=0x9280a0, a=0x0) at qml/qqmlboundsignal.cpp:341
#15 0x00007ffff6f0b625 in QQmlNotifier::emitNotify (endpoint=, a=0x0)
    at qml/qqmlnotifier.cpp:104
#16 0x00007ffff6123272 in doActivate (sender=0x874c60, signal_index=3, argv=0x0)
    at kernel/qobject.cpp:3778
#17 0x00007ffff6f35ec5 in QQmlObjectCreator::finalize (this=0x4f7180, interrupt=...)
    at qml/qqmlobjectcreator.cpp:1442
#18 0x00007ffff6eda26c in QQmlComponentPrivate::complete (state=0x6620c8, enginePriv=0x5e9c00)
    at /usr/include/qt5/QtCore/qscopedpointer.h:116
#19 QQmlComponentPrivate::complete (enginePriv=0x5e9c00, state=state@entry=0x6620c8)
    at qml/qqmlcomponent.cpp:983
#20 0x00007ffff6eda439 in QQmlComponentPrivate::completeCreate (this=0x662040)
--Type  for more, q to quit, c to continue without paging--
    at qml/qqmlcomponent.cpp:1079
#21 0x00007ffff6eda5b3 in QQmlComponent::completeCreate (this=0x661f10)
    at qml/qqmlcomponent.cpp:1062
#22 QQmlComponent::create (this=0x661f10, context=) at qml/qqmlcomponent.cpp:820
#23 0x00007ffff6f309fa in QQmlApplicationEnginePrivate::finishLoad (this=0x5e9c00, c=0x661f10)
    at qml/qqmlapplicationengine.cpp:148
#24 0x00007ffff6f30e28 in QQmlApplicationEnginePrivate::startLoad (this=, url=..., 
    data=..., dataFlag=) at qml/qqmlapplicationengine.cpp:132
#25 0x00007ffff6f30ef1 in QQmlApplicationEngine::load (this=this@entry=0x7fffffffd3e0, url=...)
    at qml/qqmlapplicationengine.cpp:279
#26 0x000000000040c7b2 in main (argc=, argv=)
    at /home/nate/kde/src/skanpage/src/main.cpp:83

!17 (merged) fixes that, so I'm not overly worried.

Merge request reports