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
Marco Bubke
flatpak-qt-creator
Commits
4fda3e91
Commit
4fda3e91
authored
Jul 10, 2009
by
ck
Browse files
Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
parents
911d15a8
abee2e0b
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
View file @
4fda3e91
...
...
@@ -253,7 +253,7 @@ CMakeRunConfigurationWidget::CMakeRunConfigurationWidget(CMakeRunConfiguration *
fl
->
addRow
(
tr
(
"Working Directory:"
),
boxlayout
);
QGroupBox
*
box
=
new
QGroupBox
(
tr
(
"Environment"
),
this
);
QVBoxLayout
*
boxLayout
=
new
QVBoxLayout
()
;
QVBoxLayout
*
boxLayout
=
new
QVBoxLayout
;
box
->
setLayout
(
boxLayout
);
box
->
setFlat
(
true
);
...
...
src/plugins/coreplugin/welcomemode.cpp
View file @
4fda3e91
...
...
@@ -39,6 +39,7 @@
#include
<QtGui/QToolBar>
#include
<QtGui/QDesktopServices>
#include
<QtGui/QMouseEvent>
#include
<QtGui/QScrollArea>
#include
<QtCore/QDateTime>
#include
<QtCore/QDir>
...
...
@@ -58,6 +59,7 @@ struct WelcomeModePrivate
{
WelcomeModePrivate
();
QScrollArea
*
m_scrollArea
;
QWidget
*
m_widget
;
QWidget
*
m_welcomePage
;
QButtonGroup
*
btnGrp
;
...
...
@@ -140,6 +142,11 @@ WelcomeMode::WelcomeMode() :
m_d
->
ui
.
feedbackButton
->
setAttribute
(
Qt
::
WA_LayoutUsesWidgetRect
);
l
->
addWidget
(
m_d
->
m_welcomePage
);
m_d
->
m_scrollArea
=
new
QScrollArea
;
m_d
->
m_scrollArea
->
setFrameStyle
(
QFrame
::
NoFrame
);
m_d
->
m_scrollArea
->
setWidget
(
m_d
->
m_widget
);
m_d
->
m_scrollArea
->
setWidgetResizable
(
true
);
updateWelcomePage
(
WelcomePageData
());
m_d
->
btnGrp
=
new
QButtonGroup
(
this
);
...
...
@@ -229,7 +236,7 @@ int WelcomeMode::priority() const
QWidget
*
WelcomeMode
::
widget
()
{
return
m_d
->
m_
widget
;
return
m_d
->
m_
scrollArea
;
}
const
char
*
WelcomeMode
::
uniqueModeName
()
const
...
...
src/plugins/projectexplorer/projectwindow.cpp
View file @
4fda3e91
...
...
@@ -45,6 +45,7 @@
#include
<QtGui/QApplication>
#include
<QtGui/QBoxLayout>
#include
<QtGui/QComboBox>
#include
<QtGui/QScrollArea>
#include
<QtGui/QTabWidget>
#include
<QtGui/QToolBar>
#include
<QtGui/QTreeWidget>
...
...
@@ -88,9 +89,18 @@ ProjectWindow::ProjectWindow(QWidget *parent)
m_panelsTabWidget
->
setDocumentMode
(
true
);
QVBoxLayout
*
panelsLayout
=
new
QVBoxLayout
(
panelsWidget
);
QWidget
*
marginWidget
=
new
QWidget
;
QVBoxLayout
*
marginLayout
=
new
QVBoxLayout
(
marginWidget
);
marginLayout
->
setContentsMargins
(
0
,
panelsLayout
->
margin
(),
0
,
0
);
marginLayout
->
addWidget
(
m_panelsTabWidget
);
QScrollArea
*
scrollArea
=
new
QScrollArea
;
scrollArea
->
setWidgetResizable
(
true
);
scrollArea
->
setFrameStyle
(
QFrame
::
NoFrame
);
scrollArea
->
setWidget
(
marginWidget
);
panelsLayout
->
setSpacing
(
0
);
panelsLayout
->
set
ContentsMargins
(
0
,
panelsLayout
->
margin
(),
0
,
0
);
panelsLayout
->
addWidget
(
m_panelsTabWidget
);
panelsLayout
->
set
Margin
(
0
);
panelsLayout
->
addWidget
(
scrollArea
);
QWidget
*
dummy
=
new
QWidget
;
QVBoxLayout
*
dummyLayout
=
new
QVBoxLayout
(
dummy
);
...
...
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