Changeset View
Changeset View
Standalone View
Standalone View
app/kipiexportaction.cpp
Show First 20 Lines • Show All 98 Lines • ▼ Show 20 Line(s) | 96 | if (d->mKIPIInterface->isLoadingFinished()) { | |||
---|---|---|---|---|---|
99 | Q_FOREACH(QAction* action, d->mExportActionList) { | 99 | Q_FOREACH(QAction* action, d->mExportActionList) { | ||
100 | if (action->text() == defaultActionText) { | 100 | if (action->text() == defaultActionText) { | ||
101 | setDefaultAction(action); | 101 | setDefaultAction(action); | ||
102 | break; | 102 | break; | ||
103 | } | 103 | } | ||
104 | } | 104 | } | ||
105 | // We are done, don't come back next time menu is shown | 105 | // We are done, don't come back next time menu is shown | ||
106 | disconnect(menu(), SIGNAL(aboutToShow()), this, SLOT(init())); | 106 | disconnect(menu(), SIGNAL(aboutToShow()), this, SLOT(init())); | ||
107 | d->updateMenu(); | ||||
107 | } else { | 108 | } else { | ||
108 | // Loading is in progress, come back when it is done | 109 | // Loading is in progress, come back when it is done | ||
109 | connect(d->mKIPIInterface, &KIPIInterface::loadingFinished, this, &KIPIExportAction::init); | 110 | connect(d->mKIPIInterface, &KIPIInterface::loadingFinished, this, &KIPIExportAction::init); | ||
110 | } | 111 | } | ||
111 | d->updateMenu(); | | |||
112 | } | 112 | } | ||
113 | 113 | | |||
114 | void KIPIExportAction::setDefaultAction(QAction* action) | 114 | void KIPIExportAction::setDefaultAction(QAction* action) | ||
115 | { | 115 | { | ||
116 | if (action == d->mDefaultAction) { | 116 | if (action == d->mDefaultAction) { | ||
117 | return; | 117 | return; | ||
118 | } | 118 | } | ||
119 | d->mDefaultAction = action; | 119 | d->mDefaultAction = action; | ||
Show All 11 Lines |