mirror of
https://github.com/qgis/QGIS.git
synced 2025-02-25 00:58:06 -05:00
passing window focus back to the vector properties dialog after chosing a color/ linestyle/ image
git-svn-id: http://svn.osgeo.org/qgis/trunk@1104 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
parent
96fed52767
commit
d57835a2b7
@ -259,13 +259,11 @@ void QgsContColDialog::apply()
|
||||
void QgsContColDialog::selectMinimumColor()
|
||||
{
|
||||
mincolorbutton->setPaletteBackgroundColor(QColorDialog::getColor());
|
||||
mVectorLayer->propertiesDialog()->raise();
|
||||
raise();
|
||||
setActiveWindow();
|
||||
}
|
||||
|
||||
void QgsContColDialog::selectMaximumColor()
|
||||
{
|
||||
maxcolorbutton->setPaletteBackgroundColor(QColorDialog::getColor());
|
||||
mVectorLayer->propertiesDialog()->raise();
|
||||
raise();
|
||||
setActiveWindow();
|
||||
}
|
||||
|
@ -234,6 +234,7 @@ QWidget *QgsGraSyExtensionWidget::getWidget(int column, int row)
|
||||
void QgsGraSyExtensionWidget::selectColor()
|
||||
{
|
||||
((QPushButton *) sender())->setPaletteBackgroundColor(QColorDialog::getColor());
|
||||
setActiveWindow();
|
||||
}
|
||||
|
||||
void QgsGraSyExtensionWidget::selectFillPattern()
|
||||
@ -244,6 +245,7 @@ void QgsGraSyExtensionWidget::selectFillPattern()
|
||||
((QPushButton *) sender())->setName(QgsSymbologyUtils::brushStyle2Char(patterndialog.pattern()));
|
||||
((QPushButton *) sender())->setPixmap(QgsSymbologyUtils::brushStyle2Pixmap(patterndialog.pattern()));
|
||||
}
|
||||
setActiveWindow();
|
||||
}
|
||||
|
||||
void QgsGraSyExtensionWidget::selectOutlineStyle()
|
||||
@ -254,6 +256,7 @@ void QgsGraSyExtensionWidget::selectOutlineStyle()
|
||||
((QPushButton *) sender())->setName(QgsSymbologyUtils::penStyle2Char(linestyledialog.style()));
|
||||
((QPushButton *) sender())->setPixmap(QgsSymbologyUtils::penStyle2Pixmap(linestyledialog.style()));
|
||||
}
|
||||
setActiveWindow();
|
||||
}
|
||||
|
||||
void QgsGraSyExtensionWidget::resizeEvent(QResizeEvent* e)
|
||||
|
@ -222,6 +222,8 @@ void QgsSiMaDialog::selectMarker()
|
||||
p.scale(scalefactor,scalefactor);
|
||||
p.drawPicture(0,0,pic);
|
||||
mImageButton->setPixmap(pixmap);
|
||||
|
||||
setActiveWindow();
|
||||
}
|
||||
|
||||
void QgsSiMaDialog::updateMarkerSize()
|
||||
|
@ -102,8 +102,7 @@ QgsSiSyDialog::~QgsSiSyDialog()
|
||||
void QgsSiSyDialog::selectOutlineColor()
|
||||
{
|
||||
outlinecolorbutton->setPaletteBackgroundColor(QColorDialog::getColor());
|
||||
mVectorLayer->propertiesDialog()->raise();
|
||||
raise();
|
||||
setActiveWindow();
|
||||
}
|
||||
|
||||
void QgsSiSyDialog::selectOutlineStyle()
|
||||
@ -114,15 +113,13 @@ void QgsSiSyDialog::selectOutlineStyle()
|
||||
stylebutton->setName(QgsSymbologyUtils::penStyle2QString(linestyledialog.style()).ascii());
|
||||
stylebutton->setPixmap(QgsSymbologyUtils::qString2LinePixmap(QString::fromAscii(stylebutton->name())));
|
||||
}
|
||||
mVectorLayer->propertiesDialog()->raise();
|
||||
raise();
|
||||
setActiveWindow();
|
||||
}
|
||||
|
||||
void QgsSiSyDialog::selectFillColor()
|
||||
{
|
||||
fillcolorbutton->setPaletteBackgroundColor(QColorDialog::getColor());
|
||||
mVectorLayer->propertiesDialog()->raise();
|
||||
raise();
|
||||
setActiveWindow();
|
||||
}
|
||||
|
||||
void QgsSiSyDialog::selectFillPattern()
|
||||
@ -133,8 +130,7 @@ void QgsSiSyDialog::selectFillPattern()
|
||||
patternbutton->setName(QgsSymbologyUtils::brushStyle2Char(patterndialog.pattern()));
|
||||
patternbutton->setPixmap(QgsSymbologyUtils::brushStyle2Pixmap(patterndialog.pattern()));
|
||||
}
|
||||
mVectorLayer->propertiesDialog()->raise();
|
||||
raise();
|
||||
setActiveWindow();
|
||||
}
|
||||
|
||||
void QgsSiSyDialog::apply()
|
||||
|
Loading…
x
Reference in New Issue
Block a user