Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Tusooa Zhu
Krita
Commits
cea7e9d1
Commit
cea7e9d1
authored
Oct 11, 2014
by
Friedrich W. H. Kossebau
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
QApplication::setOverrideCursor/restoreOverrideCursor are static methods
parent
a3b47880
Changes
17
Hide whitespace changes
Inline
Side-by-side
Showing
17 changed files
with
27 additions
and
27 deletions
+27
-27
krita/plugins/extensions/gmic/kis_gmic_plugin.cpp
krita/plugins/extensions/gmic/kis_gmic_plugin.cpp
+2
-2
krita/plugins/extensions/gmic/kis_gmic_widget.cpp
krita/plugins/extensions/gmic/kis_gmic_widget.cpp
+2
-2
krita/plugins/extensions/separate_channels/kis_separate_channels_plugin.cc
...ensions/separate_channels/kis_separate_channels_plugin.cc
+2
-2
krita/plugins/formats/exr/exr_export.cc
krita/plugins/formats/exr/exr_export.cc
+1
-1
krita/plugins/formats/heightmap/kis_heightmap_export.cpp
krita/plugins/formats/heightmap/kis_heightmap_export.cpp
+1
-1
krita/plugins/formats/heightmap/kis_heightmap_import.cpp
krita/plugins/formats/heightmap/kis_heightmap_import.cpp
+1
-1
krita/plugins/formats/jp2/jp2_export.cc
krita/plugins/formats/jp2/jp2_export.cc
+1
-1
krita/plugins/formats/jpeg/kis_jpeg_export.cc
krita/plugins/formats/jpeg/kis_jpeg_export.cc
+1
-1
krita/plugins/formats/pdf/kis_pdf_import.cpp
krita/plugins/formats/pdf/kis_pdf_import.cpp
+1
-1
krita/plugins/formats/png/kis_png_export.cc
krita/plugins/formats/png/kis_png_export.cc
+1
-1
krita/plugins/formats/ppm/kis_ppm_export.cpp
krita/plugins/formats/ppm/kis_ppm_export.cpp
+1
-1
krita/plugins/formats/tiff/kis_dlg_options_tiff.cpp
krita/plugins/formats/tiff/kis_dlg_options_tiff.cpp
+1
-1
krita/plugins/tools/defaulttools/kis_tool_gradient.cc
krita/plugins/tools/defaulttools/kis_tool_gradient.cc
+2
-2
krita/ui/kis_doc2.cc
krita/ui/kis_doc2.cc
+2
-2
krita/ui/kis_part2.cpp
krita/ui/kis_part2.cpp
+2
-2
libs/main/KoPart.cpp
libs/main/KoPart.cpp
+4
-4
libs/widgets/KoCsvImportDialog.cpp
libs/widgets/KoCsvImportDialog.cpp
+2
-2
No files found.
krita/plugins/extensions/gmic/kis_gmic_plugin.cpp
View file @
cea7e9d1
...
...
@@ -175,13 +175,13 @@ void KisGmicPlugin::slotApplyGmicCommand(KisGmicFilterSetting* setting)
QTime
myTimer
;
myTimer
.
start
();
q
App
->
setOverrideCursor
(
Qt
::
WaitCursor
);
Q
App
lication
::
setOverrideCursor
(
Qt
::
WaitCursor
);
m_gmicApplicator
->
setProperties
(
m_view
->
image
(),
node
,
actionName
,
kritaNodes
,
setting
->
gmicCommand
(),
m_gmicCustomCommands
);
m_gmicApplicator
->
start
();
m_gmicApplicator
->
wait
();
m_view
->
image
()
->
waitForDone
();
q
App
->
restoreOverrideCursor
();
Q
App
lication
::
restoreOverrideCursor
();
double
seconds
=
myTimer
.
elapsed
()
*
0.001
;
// temporary feedback
...
...
krita/plugins/extensions/gmic/kis_gmic_widget.cpp
View file @
cea7e9d1
...
...
@@ -271,12 +271,12 @@ void KisGmicWidget::startUpdate()
m_updater
=
new
KisGmicUpdater
(
m_updateUrl
);
connect
(
m_updater
,
SIGNAL
(
updated
()),
this
,
SLOT
(
finishUpdate
()));
m_updater
->
start
();
q
App
->
setOverrideCursor
(
Qt
::
WaitCursor
);
Q
App
lication
::
setOverrideCursor
(
Qt
::
WaitCursor
);
}
void
KisGmicWidget
::
finishUpdate
()
{
q
App
->
restoreOverrideCursor
();
Q
App
lication
::
restoreOverrideCursor
();
m_updater
->
deleteLater
();
QString
msg
=
i18nc
(
"@info"
,
"Update filters done. "
...
...
krita/plugins/extensions/separate_channels/kis_separate_channels_plugin.cc
View file @
cea7e9d1
...
...
@@ -82,7 +82,7 @@ void KisSeparateChannelsPlugin::slotSeparate()
if
(
dlgSeparate
->
exec
()
==
QDialog
::
Accepted
)
{
q
App
->
setOverrideCursor
(
Qt
::
BusyCursor
);
Q
App
lication
::
setOverrideCursor
(
Qt
::
BusyCursor
);
KoProgressUpdater
*
pu
=
m_view
->
createProgressUpdater
(
KoProgressUpdater
::
Unthreaded
);
pu
->
start
(
100
,
i18n
(
"Separate Image"
));
QPointer
<
KoUpdater
>
u
=
pu
->
startSubtask
();
...
...
@@ -95,7 +95,7 @@ void KisSeparateChannelsPlugin::slotSeparate()
dlgSeparate
->
getDownscale
(),
dlgSeparate
->
getToColor
());
pu
->
deleteLater
();
q
App
->
restoreOverrideCursor
();
Q
App
lication
::
restoreOverrideCursor
();
}
delete
dlgSeparate
;
...
...
krita/plugins/formats/exr/exr_export.cc
View file @
cea7e9d1
...
...
@@ -84,7 +84,7 @@ KoFilter::ConversionStatus exrExport::convert(const QByteArray& from, const QByt
widget
.
flatten
->
setChecked
(
cfg
.
getBool
(
"flatten"
,
false
));
if
(
!
m_chain
->
manager
()
->
getBatchMode
()
)
{
q
App
->
restoreOverrideCursor
();
Q
App
lication
::
restoreOverrideCursor
();
if
(
dialog
.
exec
()
==
QDialog
::
Rejected
)
{
return
KoFilter
::
UserCancelled
;
}
...
...
krita/plugins/formats/heightmap/kis_heightmap_export.cpp
View file @
cea7e9d1
...
...
@@ -94,7 +94,7 @@ KoFilter::ConversionStatus KisHeightMapExport::convert(const QByteArray& from, c
optionsHeightMap
.
setupUi
(
wdg
);
kdb
->
setMainWidget
(
wdg
);
q
App
->
restoreOverrideCursor
();
Q
App
lication
::
restoreOverrideCursor
();
QString
filterConfig
=
KisConfig
().
exportConfiguration
(
"HeightMap"
);
KisPropertiesConfiguration
cfg
;
...
...
krita/plugins/formats/heightmap/kis_heightmap_import.cpp
View file @
cea7e9d1
...
...
@@ -102,7 +102,7 @@ KoFilter::ConversionStatus KisHeightMapImport::convert(const QByteArray& from, c
return
KoFilter
::
FileNotFound
;
}
q
App
->
restoreOverrideCursor
();
Q
App
lication
::
restoreOverrideCursor
();
KDialog
*
kdb
=
new
KDialog
(
0
);
kdb
->
setWindowTitle
(
i18n
(
"R16 HeightMap Import Options"
));
...
...
krita/plugins/formats/jp2/jp2_export.cc
View file @
cea7e9d1
...
...
@@ -88,7 +88,7 @@ KoFilter::ConversionStatus jp2Export::convert(const QByteArray& from, const QByt
optionsJP2
.
qualityLevel
->
setValue
(
cfg
.
getInt
(
"quality"
,
100
));
kdb
->
setMainWidget
(
wdg
);
q
App
->
restoreOverrideCursor
();
Q
App
lication
::
restoreOverrideCursor
();
if
(
!
m_chain
->
manager
()
->
getBatchMode
())
{
if
(
kdb
->
exec
()
==
QDialog
::
Rejected
)
{
...
...
krita/plugins/formats/jpeg/kis_jpeg_export.cc
View file @
cea7e9d1
...
...
@@ -114,7 +114,7 @@ KoFilter::ConversionStatus KisJPEGExport::convert(const QByteArray& from, const
frm
.
setEnabledFilters
(
cfg
.
getString
(
"filters"
).
split
(
','
));
kdb
->
setMainWidget
(
wdg
);
q
App
->
restoreOverrideCursor
();
Q
App
lication
::
restoreOverrideCursor
();
if
(
!
m_chain
->
manager
()
->
getBatchMode
())
{
if
(
kdb
->
exec
()
==
QDialog
::
Rejected
)
{
...
...
krita/plugins/formats/pdf/kis_pdf_import.cpp
View file @
cea7e9d1
...
...
@@ -119,7 +119,7 @@ KisPDFImport::ConversionStatus KisPDFImport::convert(const QByteArray& , const Q
KisPDFImportWidget
*
wdg
=
new
KisPDFImportWidget
(
pdoc
,
kdb
);
kdb
->
setMainWidget
(
wdg
);
q
App
->
restoreOverrideCursor
();
Q
App
lication
::
restoreOverrideCursor
();
if
(
kdb
->
exec
()
==
QDialog
::
Rejected
)
{
delete
pdoc
;
delete
kdb
;
...
...
krita/plugins/formats/png/kis_png_export.cc
View file @
cea7e9d1
...
...
@@ -170,7 +170,7 @@ KoFilter::ConversionStatus KisPNGExport::convert(const QByteArray& from, const Q
wdg
->
bnTransparencyFillColor
->
setColor
(
QColor
(
rgb
[
0
].
toInt
(),
rgb
[
1
].
toInt
(),
rgb
[
2
].
toInt
()));
kdb
->
setMainWidget
(
wdg
);
q
App
->
restoreOverrideCursor
();
Q
App
lication
::
restoreOverrideCursor
();
if
(
hasVisibleWidgets
())
{
if
(
!
m_chain
->
manager
()
->
getBatchMode
())
{
if
(
kdb
->
exec
()
==
QDialog
::
Rejected
)
{
...
...
krita/plugins/formats/ppm/kis_ppm_export.cpp
View file @
cea7e9d1
...
...
@@ -162,7 +162,7 @@ KoFilter::ConversionStatus KisPPMExport::convert(const QByteArray& from, const Q
optionsPPM
.
setupUi
(
wdg
);
kdb
->
setMainWidget
(
wdg
);
q
App
->
restoreOverrideCursor
();
Q
App
lication
::
restoreOverrideCursor
();
QString
filterConfig
=
KisConfig
().
exportConfiguration
(
"PPM"
);
KisPropertiesConfiguration
cfg
;
...
...
krita/plugins/formats/tiff/kis_dlg_options_tiff.cpp
View file @
cea7e9d1
...
...
@@ -45,7 +45,7 @@ KisDlgOptionsTIFF::KisDlgOptionsTIFF(QWidget *parent)
connect
(
optionswdg
->
kComboBoxCompressionType
,
SIGNAL
(
activated
(
int
)),
this
,
SLOT
(
activated
(
int
)));
connect
(
optionswdg
->
flatten
,
SIGNAL
(
toggled
(
bool
)),
this
,
SLOT
(
flattenToggled
(
bool
)));
setMainWidget
(
wdg
);
q
App
->
restoreOverrideCursor
();
Q
App
lication
::
restoreOverrideCursor
();
setSizePolicy
(
QSizePolicy
(
QSizePolicy
::
Minimum
,
QSizePolicy
::
Minimum
));
QString
filterConfig
=
KisConfig
().
exportConfiguration
(
"TIFF"
);
...
...
krita/plugins/tools/defaulttools/kis_tool_gradient.cc
View file @
cea7e9d1
...
...
@@ -148,7 +148,7 @@ void KisToolGradient::endPrimaryAction(KoPointerEvent *event)
new
KisResourcesSnapshot
(
image
,
0
,
this
->
canvas
()
->
resourceManager
());
if
(
image
&&
(
device
=
resources
->
currentNode
()
->
paintDevice
()))
{
q
App
->
setOverrideCursor
(
Qt
::
BusyCursor
);
Q
App
lication
::
setOverrideCursor
(
Qt
::
BusyCursor
);
KUndo2MagicString
actionName
=
kundo2_i18n
(
"Gradient"
);
KisUndoAdapter
*
undoAdapter
=
image
->
undoAdapter
();
...
...
@@ -169,7 +169,7 @@ void KisToolGradient::endPrimaryAction(KoPointerEvent *event)
painter
.
endTransaction
(
undoAdapter
);
undoAdapter
->
endMacro
();
q
App
->
restoreOverrideCursor
();
Q
App
lication
::
restoreOverrideCursor
();
currentNode
()
->
setDirty
();
notifyModified
();
delete
updater
;
...
...
krita/ui/kis_doc2.cc
View file @
cea7e9d1
...
...
@@ -421,7 +421,7 @@ bool KisDoc2::newImage(const QString& name,
if
(
!
cs
)
return
false
;
q
App
->
setOverrideCursor
(
Qt
::
BusyCursor
);
Q
App
lication
::
setOverrideCursor
(
Qt
::
BusyCursor
);
image
=
new
KisImage
(
createUndoStore
(),
width
,
height
,
cs
,
name
);
Q_CHECK_PTR
(
image
);
...
...
@@ -450,7 +450,7 @@ bool KisDoc2::newImage(const QString& name,
cfg
.
setDefaultColorDepth
(
image
->
colorSpace
()
->
colorDepthId
().
id
());
cfg
.
defColorProfile
(
image
->
colorSpace
()
->
profile
()
->
name
());
q
App
->
restoreOverrideCursor
();
Q
App
lication
::
restoreOverrideCursor
();
return
true
;
}
...
...
krita/ui/kis_part2.cpp
View file @
cea7e9d1
...
...
@@ -72,7 +72,7 @@ void KisPart2::setDocument(KisDoc2 *document)
KoView
*
KisPart2
::
createViewInstance
(
KoDocument
*
document
,
QWidget
*
parent
)
{
q
App
->
setOverrideCursor
(
Qt
::
WaitCursor
);
Q
App
lication
::
setOverrideCursor
(
Qt
::
WaitCursor
);
KisView2
*
v
=
new
KisView2
(
this
,
qobject_cast
<
KisDoc2
*>
(
document
),
parent
);
//XXX : fix this ugliness
...
...
@@ -84,7 +84,7 @@ KoView *KisPart2::createViewInstance(KoDocument *document, QWidget *parent)
// see: https://bugs.kde.org/show_bug.cgi?id=208239.
document
->
setModified
(
true
);
document
->
setModified
(
false
);
q
App
->
restoreOverrideCursor
();
Q
App
lication
::
restoreOverrideCursor
();
return
v
;
}
...
...
libs/main/KoPart.cpp
View file @
cea7e9d1
...
...
@@ -241,15 +241,15 @@ KoMainWindow *KoPart::currentMainwindow() const
void
KoPart
::
openExistingFile
(
const
KUrl
&
url
)
{
q
App
->
setOverrideCursor
(
Qt
::
BusyCursor
);
Q
App
lication
::
setOverrideCursor
(
Qt
::
BusyCursor
);
d
->
document
->
openUrl
(
url
);
d
->
document
->
setModified
(
false
);
q
App
->
restoreOverrideCursor
();
Q
App
lication
::
restoreOverrideCursor
();
}
void
KoPart
::
openTemplate
(
const
KUrl
&
url
)
{
q
App
->
setOverrideCursor
(
Qt
::
BusyCursor
);
Q
App
lication
::
setOverrideCursor
(
Qt
::
BusyCursor
);
bool
ok
=
d
->
document
->
loadNativeFormat
(
url
.
toLocalFile
());
d
->
document
->
setModified
(
false
);
d
->
document
->
undoStack
()
->
clear
();
...
...
@@ -266,7 +266,7 @@ void KoPart::openTemplate(const KUrl& url)
d
->
document
->
showLoadingErrorDialog
();
d
->
document
->
initEmpty
();
}
q
App
->
restoreOverrideCursor
();
Q
App
lication
::
restoreOverrideCursor
();
}
void
KoPart
::
addRecentURLToAllMainWindows
(
KUrl
url
)
...
...
libs/widgets/KoCsvImportDialog.cpp
View file @
cea7e9d1
...
...
@@ -313,7 +313,7 @@ void KoCsvImportDialog::Private::fillTable()
QChar
x
;
QString
field
;
q
App
->
setOverrideCursor
(
Qt
::
WaitCursor
);
Q
App
lication
::
setOverrideCursor
(
Qt
::
WaitCursor
);
for
(
row
=
0
;
row
<
dialog
->
m_sheet
->
rowCount
();
++
row
)
{
for
(
column
=
0
;
column
<
dialog
->
m_sheet
->
columnCount
();
++
column
)
{
...
...
@@ -569,7 +569,7 @@ void KoCsvImportDialog::Private::fillTable()
dialog
->
m_rowEnd
->
setValue
(
endRow
==
-
1
?
row
:
endRow
);
dialog
->
m_colEnd
->
setValue
(
endCol
==
-
1
?
maxColumn
:
endCol
);
q
App
->
restoreOverrideCursor
();
Q
App
lication
::
restoreOverrideCursor
();
}
KoCsvImportDialog
::
DataType
KoCsvImportDialog
::
dataType
(
int
col
)
const
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment