vitalif
/
openscad
mirror of https://github.com/vitalif/openscad
1
0
Fork 0
Code Issues Releases Wiki Activity

Remove setting the font size for the warning/error bar.

master
Torsten Paul 2015-01-09 18:20:07 +01:00
parent 76dc38008c
commit 166e3df850
3 changed files with 51 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/MainWindow.h
View File

@ -205,7 +205,7 @@ public slots:
void actionReloadRenderPreview();
void on_editorDock_visibilityChanged(bool);
void on_consoleDock_visibilityChanged(bool);
void on_pushButtonCompileResultClose_clicked();
void on_toolButtonCompileResultClose_clicked();
void editorTopLevelChanged(bool);
void consoleTopLevelChanged(bool);
#ifdef ENABLE_OPENCSG

78
src/MainWindow.ui
View File

@ -45,37 +45,18 @@
<property name="leftMargin">
<number>9</number>
</property>
<property name="topMargin">
<number>9</number>
</property>
<property name="rightMargin">
<number>2</number>
<number>9</number>
</property>
<property name="bottomMargin">
<number>2</number>
<number>6</number>
</property>
<property name="horizontalSpacing">
<number>4</number>
</property>
<item row="0" column="0">
<widget class="QLabel" name="labelCompileResultIcon">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>26</width>
<height>26</height>
</size>
</property>
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="../openscad.qrc">:/icons/information-icons-error.png</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="labelCompileResultMessage">
<property name="sizePolicy">
@ -86,7 +67,6 @@
</property>
<property name="font">
<font>
<pointsize>14</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
@ -97,7 +77,10 @@
</widget>
</item>
<item row="0" column="2">
<widget class="QPushButton" name="pushButtonCompileResultClose">
<widget class="QToolButton" name="toolButtonCompileResultClose">
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="text">
<string/>
</property>
@ -105,11 +88,43 @@
<iconset resource="../openscad.qrc">
<normaloff>:/icons/close.png</normaloff>:/icons/close.png</iconset>
</property>
<property name="flat">
<property name="iconSize">
<size>
<width>22</width>
<height>22</height>
</size>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonIconOnly</enum>
</property>
<property name="autoRaise">
<bool>true</bool>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QToolButton" name="toolButtonCompileResultIcon">
<property name="styleSheet">
<string notr="true">QToolButton { border: none; }</string>
</property>
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="../openscad.qrc">
<normaloff>:/icons/information-icons-error.png</normaloff>:/icons/information-icons-error.png</iconset>
</property>
<property name="iconSize">
<size>
<width>22</width>
<height>22</height>
</size>
</property>
<property name="autoRaise">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>
@ -874,9 +889,6 @@
<property name="text">
<string>Show Scale Markers</string>
</property>
<!--<property name="shortcut">
<string></string>
</property>-->
</action>
<action name="viewActionAnimate">
<property name="checkable">

9
src/mainwin.cc
View File

@ -957,7 +957,7 @@ void MainWindow::waitAfterReload()
}
}
void MainWindow::on_pushButtonCompileResultClose_clicked()
void MainWindow::on_toolButtonCompileResultClose_clicked()
{
frameCompileResult->hide();
}
@ -977,10 +977,11 @@ void MainWindow::updateCompileResult()
QFileInfo fileInfo(fileName);
msg = QString(_("Error while compiling '%1'.")).arg(fileInfo.fileName());
}
labelCompileResultIcon->setPixmap(QPixmap(QString::fromUtf8(":/icons/information-icons-error.png")));
toolButtonCompileResultIcon->setIcon(QIcon(QString::fromUtf8(":/icons/information-icons-error.png")));
} else {
msg = QString(_("Compilation generated %1 warnings.")).arg(compileWarnings);
labelCompileResultIcon->setPixmap(QPixmap(QString::fromUtf8(":/icons/information-icons-warning.png")));
const char *fmt = ngettext("Compilation generated %1 warning.", "Compilation generated %1 warnings.", compileWarnings);
msg = QString(fmt).arg(compileWarnings);
toolButtonCompileResultIcon->setIcon(QIcon(QString::fromUtf8(":/icons/information-icons-warning.png")));
}
msg += _(" For details see <a href=\"#console\">console window</a>.");
labelCompileResultMessage->setText(msg);