Skip to content

Commit 2bbe10d

Browse files
committed
App: modify main window size prolicy to fixed, and then status box message to color
1 parent 50c608c commit 2bbe10d

File tree

2 files changed

+22
-19
lines changed

2 files changed

+22
-19
lines changed

App/Client/mainwindow.cpp

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1289,28 +1289,25 @@ void MainWindow::slotInformation(const QString& szInfo)
12891289

12901290
void MainWindow::slotStatusMessage(QString szMessage, MessageLevel level)
12911291
{
1292-
if(this->isMaximized()) {
1293-
QPalette pe;
1294-
switch ((MessageLevel)level) {
1295-
case MessageLevel::Error:
1296-
pe.setColor(QPalette::WindowText, Qt::red);
1297-
break;
1298-
case MessageLevel::Warning:
1299-
pe.setColor(QPalette::WindowText, Qt::yellow);
1300-
break;
1301-
default:
1302-
break;
1303-
}
1292+
QPalette pe;
1293+
switch ((MessageLevel)level) {
1294+
case MessageLevel::Error:
1295+
pe.setColor(QPalette::WindowText, Qt::red);
1296+
break;
1297+
case MessageLevel::Warning:
1298+
pe.setColor(QPalette::WindowText, Qt::yellow);
1299+
break;
1300+
default:
1301+
break;
1302+
}
13041303

1305-
m_StatusBarMessage.setPalette(pe);
1306-
m_StatusBarMessage.setToolTip(szMessage);
1307-
QFontMetrics metrics(m_StatusBarMessage.font());
1304+
m_StatusBarMessage.setPalette(pe);
1305+
m_StatusBarMessage.setToolTip(szMessage);
13081306

1309-
szMessage = metrics.elidedText(szMessage, Qt::ElideRight, m_StatusBarMessage.width());
1307+
//QFontMetrics metrics(m_StatusBarMessage.font());
1308+
//szMessage = metrics.elidedText(szMessage, Qt::ElideRight, m_StatusBarMessage.width());
13101309

1311-
m_StatusBarMessage.setText(szMessage);
1312-
} else
1313-
this->statusBar()->showMessage(szMessage);
1310+
m_StatusBarMessage.setText(szMessage);
13141311
}
13151312

13161313
void MainWindow::slotUpdateName()

App/Client/mainwindow.ui

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@
1010
<height>600</height>
1111
</rect>
1212
</property>
13+
<property name="sizePolicy">
14+
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
15+
<horstretch>0</horstretch>
16+
<verstretch>0</verstretch>
17+
</sizepolicy>
18+
</property>
1319
<property name="windowTitle">
1420
<string>Rabbit Remote Control</string>
1521
</property>

0 commit comments

Comments
 (0)