Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Tobias Hunger
qt-creator
Commits
db8507c4
Commit
db8507c4
authored
Jul 15, 2009
by
con
Browse files
Extract the styled painting of the find bar to utils widget.
parent
d476c996
Changes
16
Hide whitespace changes
Inline
Side-by-side
src/
plugins/coreplugin
/stylehelper.cpp
→
src/
libs/utils
/stylehelper.cpp
View file @
db8507c4
File moved
src/
plugins/coreplugin
/stylehelper.h
→
src/
libs/utils
/stylehelper.h
View file @
db8507c4
...
...
@@ -30,7 +30,7 @@
#ifndef STYLEHELPER_H
#define STYLEHELPER_H
#include
"
core
_global.h"
#include
"
utils
_global.h"
#include
<QtCore/QRect>
#include
<QtGui/QPainter>
...
...
@@ -40,7 +40,7 @@
// Helper class holding all custom color values
class
CORE
_EXPORT
StyleHelper
class
QTCREATOR_UTILS
_EXPORT
StyleHelper
{
public:
// Height of the project explorer navigation bar
...
...
src/libs/utils/utils.pro
View file @
db8507c4
...
...
@@ -30,7 +30,8 @@ SOURCES += reloadpromptutils.cpp \
parameteraction
.
cpp
\
treewidgetcolumnstretcher
.
cpp
\
checkablemessagebox
.
cpp
\
styledbar
.
cpp
styledbar
.
cpp
\
stylehelper
.
cpp
win32
{
SOURCES
+=
abstractprocess_win
.
cpp
\
...
...
@@ -69,7 +70,8 @@ HEADERS += utils_global.h \
treewidgetcolumnstretcher
.
h
\
checkablemessagebox
.
h
\
qtcassert
.
h
\
styledbar
.
h
styledbar
.
h
\
stylehelper
.
h
FORMS
+=
filewizardpage
.
ui
\
projectintropage
.
ui
\
...
...
src/plugins/coreplugin/coreplugin.pro
View file @
db8507c4
...
...
@@ -65,7 +65,6 @@ SOURCES += mainwindow.cpp \
coreimpl
.
cpp
\
basefilewizard
.
cpp
\
plugindialog
.
cpp
\
stylehelper
.
cpp
\
inavigationwidgetfactory
.
cpp
\
navigationwidget
.
cpp
\
manhattanstyle
.
cpp
\
...
...
@@ -150,7 +149,6 @@ HEADERS += mainwindow.h \
coreimpl
.
h
\
basefilewizard
.
h
\
plugindialog
.
h
\
stylehelper
.
h
\
inavigationwidgetfactory
.
h
\
navigationwidget
.
h
\
manhattanstyle
.
h
\
...
...
src/plugins/coreplugin/fancytabwidget.cpp
View file @
db8507c4
...
...
@@ -28,7 +28,7 @@
**************************************************************************/
#include
"fancytabwidget.h"
#include
"
stylehelper.h
"
#include
<utils/
stylehelper.h
>
#include
<QDebug>
...
...
src/plugins/coreplugin/generalsettings.cpp
View file @
db8507c4
...
...
@@ -29,8 +29,8 @@
#include
"generalsettings.h"
#include
"
stylehelper.h
"
#include
"
utils/qtcolorbutton.h
"
#include
<utils/
stylehelper.h
>
#include
<
utils/qtcolorbutton.h
>
#include
<utils/consoleprocess.h>
#include
<coreplugin/editormanager/editormanager.h>
#include
<coreplugin/icore.h>
...
...
src/plugins/coreplugin/mainwindow.cpp
View file @
db8507c4
...
...
@@ -51,7 +51,6 @@
#include
"scriptmanager_p.h"
#include
"settingsdialog.h"
#include
"stylehelper.h"
#include
"variablemanager.h"
#include
"versiondialog.h"
#include
"viewmanager.h"
...
...
@@ -68,6 +67,7 @@
#include
<coreplugin/findplaceholder.h>
#include
<coreplugin/settingsdatabase.h>
#include
<utils/pathchooser.h>
#include
<utils/stylehelper.h>
#include
<extensionsystem/pluginmanager.h>
#include
<QtCore/QDebug>
...
...
src/plugins/coreplugin/manhattanstyle.cpp
View file @
db8507c4
...
...
@@ -29,12 +29,14 @@
#include
"manhattanstyle.h"
#include
"stylehelper.h"
#include
"styleanimator.h"
#include
<QtCore/QDebug>
#include
<QtCore/QLibrary>
#include
<utils/qtcassert.h>
#include
<utils/stylehelper.h>
#include
<QtGui/QApplication>
#include
<QtGui/QComboBox>
#include
<QtGui/QDialog>
...
...
@@ -56,8 +58,6 @@
#include
<QtGui/QToolBar>
#include
<QtGui/QToolButton>
#include
<utils/qtcassert.h>
// We define a currently unused state for indicating animations
#define State_Animating 0x00000040
...
...
src/plugins/coreplugin/minisplitter.cpp
View file @
db8507c4
...
...
@@ -28,7 +28,8 @@
**************************************************************************/
#include
"minisplitter.h"
#include
"stylehelper.h"
#include
<utils/stylehelper.h>
#include
<QtGui/QPaintEvent>
#include
<QtGui/QPainter>
...
...
src/plugins/coreplugin/progressmanager/progresspie.cpp
View file @
db8507c4
...
...
@@ -28,7 +28,8 @@
**************************************************************************/
#include
"progresspie.h"
#include
"stylehelper.h"
#include
<utils/stylehelper.h>
#include
<QtGui/QPainter>
#include
<QtGui/QFont>
...
...
src/plugins/find/find_dependencies.pri
View file @
db8507c4
include(../../plugins/coreplugin/coreplugin.pri)
include(../../libs/utils/utils.pri)
src/plugins/find/findtoolbar.cpp
View file @
db8507c4
...
...
@@ -32,15 +32,13 @@
#include
"textfindconstants.h"
#include
<coreplugin/coreconstants.h>
#include
<coreplugin/stylehelper.h>
#include
<coreplugin/findplaceholder.h>
#include
<coreplugin/icore.h>
#include
<coreplugin/stylehelper.h>
#include
<coreplugin/actionmanager/actionmanager.h>
#include
<coreplugin/actionmanager/actioncontainer.h>
#include
<coreplugin/actionmanager/command.h>
#include
<extensionsystem/pluginmanager.h>
#include
<utils/stylehelper.h>
#include
<QtCore/QDebug>
#include
<QtCore/QSettings>
...
...
@@ -76,7 +74,6 @@ FindToolBar::FindToolBar(FindPlugin *plugin, CurrentDocumentFind *currentDocumen
{
//setup ui
m_ui
.
setupUi
(
this
);
setProperty
(
"panelwidget"
,
true
);
setFocusProxy
(
m_ui
.
findEdit
);
setProperty
(
"topBorder"
,
true
);
m_ui
.
findEdit
->
setAttribute
(
Qt
::
WA_MacShowFocusRect
,
false
);
...
...
@@ -230,56 +227,6 @@ FindToolBar::~FindToolBar()
{
}
void
FindToolBar
::
paintEvent
(
QPaintEvent
*
event
)
{
// Currently from the style
// Goal should be to migrate that into a Utils::StyledWidget class
Q_UNUSED
(
event
)
QPainter
painter
(
this
);
QRect
selfRect
=
rect
();
QString
key
;
key
.
sprintf
(
"mh_toolbar %d %d %d"
,
selfRect
.
width
(),
selfRect
.
height
(),
StyleHelper
::
baseColor
().
rgb
());;
QPixmap
pixmap
;
QPainter
*
p
=
&
painter
;
if
(
StyleHelper
::
usePixmapCache
()
&&
!
QPixmapCache
::
find
(
key
,
pixmap
))
{
pixmap
=
QPixmap
(
selfRect
.
size
());
p
=
new
QPainter
(
&
pixmap
);
selfRect
=
QRect
(
0
,
0
,
selfRect
.
width
(),
selfRect
.
height
());
}
// Map offset for global window gradient
QPoint
offset
=
window
()
->
mapToGlobal
(
selfRect
.
topLeft
())
-
mapToGlobal
(
selfRect
.
topLeft
());
QRect
gradientSpan
;
gradientSpan
=
QRect
(
offset
,
window
()
->
size
());
StyleHelper
::
horizontalGradient
(
p
,
gradientSpan
,
selfRect
);
p
->
setPen
(
StyleHelper
::
borderColor
());
// Note: This is a hack to determine if the
// toolbar should draw the top or bottom outline
// (needed for the find toolbar for instance)
QColor
lighter
(
255
,
255
,
255
,
40
);
if
(
property
(
"topBorder"
).
toBool
())
{
p
->
drawLine
(
selfRect
.
topLeft
(),
selfRect
.
topRight
());
p
->
setPen
(
lighter
);
p
->
drawLine
(
selfRect
.
topLeft
()
+
QPoint
(
0
,
1
),
selfRect
.
topRight
()
+
QPoint
(
0
,
1
));
}
else
{
p
->
drawLine
(
selfRect
.
bottomLeft
(),
selfRect
.
bottomRight
());
p
->
setPen
(
lighter
);
p
->
drawLine
(
selfRect
.
topLeft
(),
selfRect
.
topRight
());
}
if
(
StyleHelper
::
usePixmapCache
()
&&
!
QPixmapCache
::
find
(
key
,
pixmap
))
{
painter
.
drawPixmap
(
selfRect
.
topLeft
(),
pixmap
);
p
->
end
();
delete
p
;
QPixmapCache
::
insert
(
key
,
pixmap
);
}
}
bool
FindToolBar
::
eventFilter
(
QObject
*
obj
,
QEvent
*
event
)
{
if
((
obj
==
m_ui
.
findEdit
||
obj
==
m_findCompleter
->
popup
())
...
...
@@ -320,7 +267,7 @@ bool FindToolBar::eventFilter(QObject *obj, QEvent *event)
m_currentDocumentFind
->
clearFindScope
();
}
}
return
QWidget
::
eventFilter
(
obj
,
event
);
return
Core
::
Utils
::
StyledBar
::
eventFilter
(
obj
,
event
);
}
void
FindToolBar
::
updateActions
()
...
...
@@ -596,7 +543,7 @@ bool FindToolBar::focusNextPrevChild(bool next)
else
if
(
!
next
&&
m_ui
.
findEdit
->
hasFocus
())
m_ui
.
replaceAllButton
->
setFocus
(
Qt
::
TabFocusReason
);
else
return
QWidget
::
focusNextPrevChild
(
next
);
return
Core
::
Utils
::
StyledBar
::
focusNextPrevChild
(
next
);
return
true
;
}
...
...
src/plugins/find/findtoolbar.h
View file @
db8507c4
...
...
@@ -34,6 +34,8 @@
#include
"ifindfilter.h"
#include
"currentdocumentfind.h"
#include
<utils/styledbar.h>
#include
<QtGui/QStringListModel>
#include
<QtGui/QWidget>
#include
<QtGui/QToolBar>
...
...
@@ -44,14 +46,13 @@ namespace Internal {
class
FindPlugin
;
class
FindToolBar
:
public
QWidget
class
FindToolBar
:
public
Core
::
Utils
::
StyledBar
{
Q_OBJECT
public:
FindToolBar
(
FindPlugin
*
plugin
,
CurrentDocumentFind
*
currentDocumentFind
);
~
FindToolBar
();
void
paintEvent
(
QPaintEvent
*
event
);
void
readSettings
();
void
writeSettings
();
...
...
src/plugins/projectexplorer/buildprogress.cpp
View file @
db8507c4
...
...
@@ -29,7 +29,7 @@
#include
"buildprogress.h"
#include
<
coreplugin
/stylehelper.h>
#include
<
utils
/stylehelper.h>
#include
<QtGui/QVBoxLayout>
#include
<QtGui/QHBoxLayout>
...
...
src/plugins/texteditor/basefilefind.cpp
View file @
db8507c4
...
...
@@ -30,12 +30,12 @@
#include
"basefilefind.h"
#include
<coreplugin/icore.h>
#include
<coreplugin/stylehelper.h>
#include
<coreplugin/progressmanager/progressmanager.h>
#include
<coreplugin/editormanager/editormanager.h>
#include
<find/textfindconstants.h>
#include
<texteditor/itexteditor.h>
#include
<texteditor/basetexteditor.h>
#include
<utils/stylehelper.h>
#include
<QtCore/QDebug>
#include
<QtCore/QDirIterator>
...
...
src/plugins/texteditor/basetexteditor.cpp
View file @
db8507c4
...
...
@@ -39,14 +39,14 @@
#include
"codecselector.h"
#ifndef TEXTEDITOR_STANDALONE
#include
<aggregation/aggregate.h>
#include
<coreplugin/coreconstants.h>
#include
<coreplugin/editormanager/editormanager.h>
#include
<coreplugin/manhattanstyle.h>
#include
<coreplugin/stylehelper.h>
#include
<extensionsystem/pluginmanager.h>
#include
<find/basetextfind.h>
#include
<utils/stylehelper.h>
#include
<aggregation/aggregate.h>
#endif
#include
<utils/linecolumnlabel.h>
#include
<utils/qtcassert.h>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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