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
97d501de
Commit
97d501de
authored
Mar 12, 2010
by
dt
Browse files
Switching buildconfiguration on the projects page now changes the active
This is now possible due to the async evaluation
parent
ced92664
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/plugins/projectexplorer/buildsettingspropertiespage.cpp
View file @
97d501de
...
...
@@ -174,31 +174,21 @@ void BuildSettingsWidget::setupUi()
m_removeButton
->
setSizePolicy
(
QSizePolicy
::
Fixed
,
QSizePolicy
::
Fixed
);
hbox
->
addWidget
(
m_removeButton
);
m_makeActiveButton
=
new
QPushButton
(
this
);
m_makeActiveButton
->
setText
(
tr
(
"Make Active"
));
m_makeActiveButton
->
setToolTip
(
tr
(
"Sets this build configuration to be used for this target."
));
m_makeActiveButton
->
setSizePolicy
(
QSizePolicy
::
Fixed
,
QSizePolicy
::
Fixed
);
hbox
->
addWidget
(
m_makeActiveButton
);
hbox
->
addSpacerItem
(
new
QSpacerItem
(
0
,
0
,
QSizePolicy
::
Expanding
,
QSizePolicy
::
Fixed
));
vbox
->
addLayout
(
hbox
);
}
m_buildConfiguration
=
m_target
->
activeBuildConfiguration
();
updateAddButtonMenu
();
updateBuildSettings
();
connect
(
m_buildConfigurationComboBox
,
SIGNAL
(
currentIndexChanged
(
int
)),
this
,
SLOT
(
currentIndexChanged
(
int
)));
connect
(
m_removeButton
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
deleteConfiguration
()));
connect
(
m_makeActiveButton
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
makeActive
()));
// TODO update on displayNameChange
// connect(m_project, SIGNAL(buildConfigurationDisplayNameChanged(const QString &)),
// this, SLOT(buildConfigurationDisplayNameChanged(const QString &)));
connect
(
m_target
,
SIGNAL
(
activeBuildConfigurationChanged
(
ProjectExplorer
::
BuildConfiguration
*
)),
this
,
SLOT
(
updateActiveConfiguration
()));
...
...
@@ -216,9 +206,6 @@ void BuildSettingsWidget::setupUi()
if
(
m_target
->
buildConfigurationFactory
())
connect
(
m_target
->
buildConfigurationFactory
(),
SIGNAL
(
availableCreationIdsChanged
()),
SLOT
(
updateAddButtonMenu
()));
updateAddButtonMenu
();
updateBuildSettings
();
}
void
BuildSettingsWidget
::
addedBuildConfiguration
(
BuildConfiguration
*
bc
)
...
...
@@ -237,11 +224,11 @@ void BuildSettingsWidget::buildConfigurationDisplayNameChanged()
{
for
(
int
i
=
0
;
i
<
m_buildConfigurationComboBox
->
count
();
++
i
)
{
BuildConfiguration
*
bc
=
m_buildConfigurationComboBox
->
itemData
(
i
).
value
<
BuildConfiguration
*>
();
m_buildConfigurationComboBox
->
setItemText
(
i
,
b
uildConfigurationItem
Name
(
bc
));
m_buildConfigurationComboBox
->
setItemText
(
i
,
b
c
->
display
Name
());
}
}
void
BuildSettingsWidget
::
addSubWidget
(
const
QString
&
name
,
Q
Widget
*
widget
)
void
BuildSettingsWidget
::
addSubWidget
(
const
QString
&
name
,
BuildConfig
Widget
*
widget
)
{
widget
->
setContentsMargins
(
m_leftMargin
,
10
,
0
,
0
);
...
...
@@ -269,7 +256,7 @@ void BuildSettingsWidget::clear()
m_labels
.
clear
();
}
QList
<
Q
Widget
*>
BuildSettingsWidget
::
subWidgets
()
const
QList
<
BuildConfig
Widget
*>
BuildSettingsWidget
::
subWidgets
()
const
{
return
m_subWidgets
;
}
...
...
@@ -293,8 +280,6 @@ void BuildSettingsWidget::updateAddButtonMenu()
void
BuildSettingsWidget
::
updateBuildSettings
()
{
// TODO save position, entry from combbox
// Delete old tree items
bool
blocked
=
m_buildConfigurationComboBox
->
blockSignals
(
true
);
m_buildConfigurationComboBox
->
clear
();
...
...
@@ -316,30 +301,30 @@ void BuildSettingsWidget::updateBuildSettings()
// Add tree items
foreach
(
BuildConfiguration
*
bc
,
m_target
->
buildConfigurations
())
{
m_buildConfigurationComboBox
->
addItem
(
b
uildConfigurationItem
Name
(
bc
),
QVariant
::
fromValue
<
BuildConfiguration
*>
(
bc
));
m_buildConfigurationComboBox
->
addItem
(
b
c
->
display
Name
(),
QVariant
::
fromValue
<
BuildConfiguration
*>
(
bc
));
if
(
bc
==
m_buildConfiguration
)
m_buildConfigurationComboBox
->
setCurrentIndex
(
m_buildConfigurationComboBox
->
count
()
-
1
);
}
m_buildConfigurationComboBox
->
blockSignals
(
blocked
);
foreach
(
BuildConfigWidget
*
widget
,
subWidgets
())
widget
->
init
(
m_buildConfiguration
);
currentB
uildConfigurationC
hang
ed
(
);
m_b
uildConfigurationC
omboBox
->
blockSignals
(
block
ed
);
}
void
BuildSettingsWidget
::
currentIndexChanged
(
int
index
)
{
m_
buildConfiguration
=
m_buildConfigurationComboBox
->
itemData
(
index
).
value
<
BuildConfiguration
*>
();
currentBuildConfigurationChanged
(
);
BuildConfiguration
*
buildConfiguration
=
m_buildConfigurationComboBox
->
itemData
(
index
).
value
<
BuildConfiguration
*>
();
m_target
->
setActiveBuildConfiguration
(
buildConfiguration
);
}
void
BuildSettingsWidget
::
currentBuild
Configuration
Changed
()
void
BuildSettingsWidget
::
updateActive
Configuration
()
{
m_makeActiveButton
->
setEnabled
(
m_buildConfiguration
&&
m_buildConfiguration
!=
m_target
->
activeBuildConfiguration
());
if
(
!
m_buildConfiguration
)
if
(
!
m_buildConfiguration
||
m_buildConfiguration
==
m_target
->
activeBuildConfiguration
())
return
;
m_buildConfiguration
=
m_target
->
activeBuildConfiguration
();
for
(
int
i
=
0
;
i
<
m_buildConfigurationComboBox
->
count
();
++
i
)
{
if
(
m_buildConfigurationComboBox
->
itemData
(
i
).
value
<
BuildConfiguration
*>
()
==
m_buildConfiguration
)
{
m_buildConfigurationComboBox
->
setCurrentIndex
(
i
);
...
...
@@ -354,28 +339,6 @@ void BuildSettingsWidget::currentBuildConfigurationChanged()
}
}
void
BuildSettingsWidget
::
updateActiveConfiguration
()
{
for
(
int
i
=
0
;
i
<
m_buildConfigurationComboBox
->
count
();
++
i
)
{
BuildConfiguration
*
bc
=
m_buildConfigurationComboBox
->
itemData
(
i
).
value
<
BuildConfiguration
*>
();
m_buildConfigurationComboBox
->
setItemText
(
i
,
buildConfigurationItemName
(
bc
));
}
m_makeActiveButton
->
setEnabled
(
currentBuildConfiguration
()
&&
currentBuildConfiguration
()
!=
m_target
->
activeBuildConfiguration
());
}
QString
BuildSettingsWidget
::
buildConfigurationItemName
(
const
BuildConfiguration
*
bc
)
const
{
if
(
bc
==
m_target
->
activeBuildConfiguration
())
return
tr
(
"%1 (Active)"
).
arg
(
bc
->
displayName
());
return
bc
->
displayName
();
}
BuildConfiguration
*
BuildSettingsWidget
::
currentBuildConfiguration
()
const
{
const
int
index
=
m_buildConfigurationComboBox
->
currentIndex
();
return
m_buildConfigurationComboBox
->
itemData
(
index
).
value
<
BuildConfiguration
*>
();
}
void
BuildSettingsWidget
::
createConfiguration
()
{
if
(
!
m_target
->
buildConfigurationFactory
())
...
...
@@ -392,17 +355,12 @@ void BuildSettingsWidget::createConfiguration()
void
BuildSettingsWidget
::
cloneConfiguration
()
{
cloneConfiguration
(
currentB
uildConfiguration
()
);
cloneConfiguration
(
m_b
uildConfiguration
);
}
void
BuildSettingsWidget
::
deleteConfiguration
()
{
deleteConfiguration
(
currentBuildConfiguration
());
}
void
BuildSettingsWidget
::
makeActive
()
{
m_target
->
setActiveBuildConfiguration
(
currentBuildConfiguration
());
deleteConfiguration
(
m_buildConfiguration
);
}
void
BuildSettingsWidget
::
cloneConfiguration
(
BuildConfiguration
*
sourceConfiguration
)
...
...
src/plugins/projectexplorer/buildsettingspropertiespage.h
View file @
97d501de
...
...
@@ -44,6 +44,7 @@ QT_END_NAMESPACE
namespace
ProjectExplorer
{
class
BuildConfiguration
;
class
BuildConfigWidget
;
class
IBuildStepFactory
;
namespace
Internal
{
...
...
@@ -88,20 +89,18 @@ public:
~
BuildSettingsWidget
();
void
clear
();
void
addSubWidget
(
const
QString
&
name
,
Q
Widget
*
widget
);
QList
<
Q
Widget
*>
subWidgets
()
const
;
void
addSubWidget
(
const
QString
&
name
,
BuildConfig
Widget
*
widget
);
QList
<
BuildConfig
Widget
*>
subWidgets
()
const
;
void
setupUi
();
private
slots
:
void
updateBuildSettings
();
void
currentIndexChanged
(
int
index
);
void
currentBuildConfigurationChanged
();
void
createConfiguration
();
void
cloneConfiguration
();
void
deleteConfiguration
();
void
makeActive
();
void
updateAddButtonMenu
();
void
addedBuildConfiguration
(
ProjectExplorer
::
BuildConfiguration
*
bc
);
...
...
@@ -112,8 +111,6 @@ private slots:
private:
void
cloneConfiguration
(
BuildConfiguration
*
toClone
);
void
deleteConfiguration
(
BuildConfiguration
*
toDelete
);
QString
buildConfigurationItemName
(
const
BuildConfiguration
*
bc
)
const
;
BuildConfiguration
*
currentBuildConfiguration
()
const
;
Target
*
m_target
;
BuildConfiguration
*
m_buildConfiguration
;
...
...
@@ -124,7 +121,7 @@ private:
QComboBox
*
m_buildConfigurationComboBox
;
QMenu
*
m_addButtonMenu
;
QList
<
Q
Widget
*>
m_subWidgets
;
QList
<
BuildConfig
Widget
*>
m_subWidgets
;
QList
<
QLabel
*>
m_labels
;
int
m_leftMargin
;
...
...
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