sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-26 00:02:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

made dialogs to chose marker, linestyle, pattern stay on top of the other widgets

Browse Source 
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@1118 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
mhugent 2004-03-29 17:59:22 +00:00
parent cc2d1b5f92
commit 4d96667091
7 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/qgscontcoldialog.cpp
View File

@ -258,12 +258,12 @@ void QgsContColDialog::apply()
void QgsContColDialog::selectMinimumColor()
{
mincolorbutton->setPaletteBackgroundColor(QColorDialog::getColor());
mincolorbutton->setPaletteBackgroundColor(QColorDialog::getColor(QColor(black),this));
setActiveWindow();
}
void QgsContColDialog::selectMaximumColor()
{
maxcolorbutton->setPaletteBackgroundColor(QColorDialog::getColor());
maxcolorbutton->setPaletteBackgroundColor(QColorDialog::getColor(QColor(black),this));
setActiveWindow();
}

2
src/qgsgrasyextensionwidget.cpp
View File

@ -233,7 +233,7 @@ QWidget *QgsGraSyExtensionWidget::getWidget(int column, int row)
void QgsGraSyExtensionWidget::selectColor()
{
((QPushButton *) sender())->setPaletteBackgroundColor(QColorDialog::getColor());
((QPushButton *) sender())->setPaletteBackgroundColor(QColorDialog::getColor(QColor(black),this));
setActiveWindow();
}

2
src/qgslinestyledialog.h
View File

@ -27,7 +27,7 @@ class QgsLineStyleDialog: public QgsLineStyleDialogBase
{
Q_OBJECT
public:
QgsLineStyleDialog(QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0);
QgsLineStyleDialog(QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = Qt::WStyle_StaysOnTop);
~QgsLineStyleDialog();
Qt::PenStyle style();
protected:

2
src/qgsmarkerdialog.cpp
View File

@ -25,7 +25,7 @@
#include <qpushbutton.h>
#include <qpainter.h>
QgsMarkerDialog::QgsMarkerDialog(QString startdir): QgsMarkerDialogBase(), mCurrentDir(startdir)
QgsMarkerDialog::QgsMarkerDialog(QString startdir): QgsMarkerDialogBase(0,0,true,Qt::WStyle_StaysOnTop), mCurrentDir(startdir)
{
QObject::connect(mOkButton,SIGNAL(clicked()),this,SLOT(accept()));
QObject::connect(mCancelButton,SIGNAL(clicked()),this,SLOT(reject()));

3
src/qgsmarkerdialogbase.ui
View File

@ -15,6 +15,9 @@
<property name="caption">
<string>Choose a marker symbol</string>
</property>
<property name="modal">
<bool>false</bool>
</property>
<grid>
<property name="name">
<cstring>unnamed</cstring>

2
src/qgspatterndialog.h
View File

@ -27,7 +27,7 @@ class QgsPatternDialog: public QgsPatternDialogBase
{
Q_OBJECT
public:
QgsPatternDialog(QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0);
QgsPatternDialog(QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = Qt::WStyle_StaysOnTop);
~QgsPatternDialog();
Qt::BrushStyle pattern();
protected:

4
src/qgssisydialog.cpp
View File

@ -101,7 +101,7 @@ QgsSiSyDialog::~QgsSiSyDialog()
void QgsSiSyDialog::selectOutlineColor()
{
outlinecolorbutton->setPaletteBackgroundColor(QColorDialog::getColor());
outlinecolorbutton->setPaletteBackgroundColor(QColorDialog::getColor(QColor(black),this));
setActiveWindow();
}
@ -118,7 +118,7 @@ void QgsSiSyDialog::selectOutlineStyle()
void QgsSiSyDialog::selectFillColor()
{
fillcolorbutton->setPaletteBackgroundColor(QColorDialog::getColor());
fillcolorbutton->setPaletteBackgroundColor(QColorDialog::getColor(QColor(black),this));
setActiveWindow();
}