Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Migrate qt3 stuff to qt4.
git-svn-id: http://svn.osgeo.org/qgis/trunk@4779 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
g_j_m committed Jan 29, 2006
1 parent 9432742 commit 6c8b16b
Show file tree
Hide file tree
Showing 5 changed files with 57 additions and 59 deletions.
7 changes: 1 addition & 6 deletions src/gui/qgsmessageviewer.cpp
Expand Up @@ -29,14 +29,9 @@ QgsMessageViewer::~QgsMessageViewer()
{
}

void QgsMessageViewer::setTextFormat(Qt::TextFormat f)
{
txtMessage->setTextFormat(f);
}

void QgsMessageViewer::setMessage(const QString& msg)
{
txtMessage->setText(msg);
txtMessage->setHtml(msg);
}

void QgsMessageViewer::appendMessage(const QString& msg)
Expand Down
1 change: 0 additions & 1 deletion src/gui/qgsmessageviewer.h
Expand Up @@ -26,7 +26,6 @@ class QgsMessageViewer: public QDialog, private Ui::QgsMessageViewer
public:
QgsMessageViewer(QWidget *parent = 0, Qt::WFlags fl = QgisGui::ModalDialogFlags);
~QgsMessageViewer();
void setTextFormat(Qt::TextFormat f);
void setMessage(const QString& msg);
void appendMessage(const QString& msg);
};
Expand Down
1 change: 0 additions & 1 deletion src/gui/qgsrunprocess.cpp
Expand Up @@ -62,7 +62,6 @@ QgsRunProcess::QgsRunProcess(const QStringList& args,
// QgsMessageViewer dialog, but tweak its behaviour to suit our
// needs. It will delete itself when the dialog box is closed.
mLogViewer = new QgsMessageViewer(0, Qt::WDestructiveClose);
mLogViewer->setTextFormat(Qt::LogText);
mLogViewer->setCaption(whole_cmd);
mLogViewer->appendMessage( "<b>" + tr("Starting") + " " + whole_cmd + "...</b>" );
mLogViewer->show();
Expand Down
70 changes: 37 additions & 33 deletions src/ui/qgslayerprojectionselectorbase.ui
Expand Up @@ -20,15 +20,44 @@
</property>
<layout class="QGridLayout" >
<property name="margin" >
<number>10</number>
<number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item row="2" column="1" >
<widget class="QPushButton" name="pbnOK" >
<property name="text" >
<string>OK</string>
<item row="1" column="0" colspan="2" >
<widget class="QgsProjectionSelector" name="projectionSelector" />
</item>
<item row="0" column="0" colspan="2" >
<widget class="QTextEdit" name="textEdit" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>5</hsizetype>
<vsizetype>5</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize" >
<size>
<width>16777215</width>
<height>160</height>
</size>
</property>
<property name="focusPolicy" >
<enum>Qt::NoFocus</enum>
</property>
<property name="acceptDrops" >
<bool>false</bool>
</property>
<property name="lineWidth" >
<number>2</number>
</property>
<property name="readOnly" >
<bool>true</bool>
</property>
<property name="html" >
<string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;/head>&lt;body style=" white-space: pre-wrap; font-family:Sans Serif; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;">&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" font-size:12pt; font-weight:600;">Define this layer's projection:&lt;/span>&lt;/p>&lt;p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;/p>&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">This layer appears to have no projection specification. By default, this layer will now have its projection set to that of the project, but you may override this by selecting a different projection below.&lt;/p>&lt;/body>&lt;/html></string>
</property>
</widget>
</item>
Expand All @@ -48,28 +77,10 @@
</property>
</spacer>
</item>
<item row="1" column="0" colspan="2" >
<widget class="QgsProjectionSelector" name="projectionSelector" />
</item>
<item row="0" column="0" colspan="2" >
<widget class="Q3TextEdit" name="textEdit1" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>5</hsizetype>
<vsizetype>5</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<item row="2" column="1" >
<widget class="QPushButton" name="pbnOK" >
<property name="text" >
<string>&lt;html>&lt;head>&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; />&lt;/head>&lt;body style=&quot;font-size:10pt;font-family:Arial&quot;>
&lt;p style=&quot;margin-top:16px&quot; dir=&quot;ltr&quot;>&lt;span style=&quot;font-size:15pt;font-weight:600&quot;>Define this layer's projection:&lt;/span>&lt;/p>
&lt;p dir=&quot;ltr&quot;>This layer appears to have no projection specification. By default, this layer will now have its projection set to that of the project, but you may override this by selecting a different projection below.&lt;/p>
&lt;/body>&lt;/html>
</string>
</property>
<property name="wordWrap" >
<enum>Q3TextEdit::WidgetWidth</enum>
<string>OK</string>
</property>
</widget>
</item>
Expand All @@ -78,13 +89,6 @@
<layoutdefault spacing="6" margin="11" />
<pixmapfunction></pixmapfunction>
<customwidgets>
<customwidget>
<class>Q3TextEdit</class>
<extends></extends>
<header>q3textedit.h</header>
<container>0</container>
<pixmap></pixmap>
</customwidget>
<customwidget>
<class>QgsProjectionSelector</class>
<extends>QWidget</extends>
Expand Down
37 changes: 19 additions & 18 deletions src/ui/qgsmessageviewer.ui
Expand Up @@ -17,22 +17,25 @@
</property>
<layout class="QGridLayout" >
<property name="margin" >
<number>10</number>
<number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item row="0" column="0" colspan="3" >
<widget class="Q3TextEdit" name="txtMessage" />
</item>
<item row="1" column="1" >
<widget class="QPushButton" name="btnClose" >
<property name="text" >
<string>Close</string>
<widget class="QTextEdit" name="txtMessage" >
<property name="lineWidth" >
<number>2</number>
</property>
<property name="autoFormatting" >
<set>QTextEdit::AutoNone</set>
</property>
<property name="readOnly" >
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="0" >
<item row="1" column="2" >
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
Expand All @@ -48,7 +51,7 @@
</property>
</spacer>
</item>
<item row="1" column="2" >
<item row="1" column="0" >
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
Expand All @@ -64,19 +67,17 @@
</property>
</spacer>
</item>
<item row="1" column="1" >
<widget class="QPushButton" name="btnClose" >
<property name="text" >
<string>Close</string>
</property>
</widget>
</item>
</layout>
</widget>
<layoutdefault spacing="6" margin="11" />
<pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
<customwidgets>
<customwidget>
<class>Q3TextEdit</class>
<extends></extends>
<header>q3textedit.h</header>
<container>0</container>
<pixmap></pixmap>
</customwidget>
</customwidgets>
<resources/>
<connections>
<connection>
Expand Down

0 comments on commit 6c8b16b

Please sign in to comment.