From a69c6f8e29347cad604ddf1ffa279410765f9d4d Mon Sep 17 00:00:00 2001 From: Mohammed Nafees Date: Thu, 19 Jun 2014 23:58:31 +0530 Subject: [PATCH 1/3] Change pt to px to solve the Windows font size issue --- interface/src/ui/ScriptsTableWidget.cpp | 2 +- interface/ui/runningScriptsWidget.ui | 26 ++++++++++++------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/interface/src/ui/ScriptsTableWidget.cpp b/interface/src/ui/ScriptsTableWidget.cpp index 95acca052c..7b4f9e6b1f 100644 --- a/interface/src/ui/ScriptsTableWidget.cpp +++ b/interface/src/ui/ScriptsTableWidget.cpp @@ -23,7 +23,7 @@ ScriptsTableWidget::ScriptsTableWidget(QWidget* parent) : setShowGrid(false); setSelectionMode(QAbstractItemView::NoSelection); setEditTriggers(QAbstractItemView::NoEditTriggers); - setStyleSheet("QTableWidget { background: transparent; color: #333333; } QToolTip { color: #000000; background: #f9f6e4; padding: 2px; }"); + setStyleSheet("QTableWidget { border: none; background: transparent; color: #333333; } QToolTip { color: #000000; background: #f9f6e4; padding: 2px; }"); setToolTipDuration(200); setWordWrap(true); setGeometry(0, 0, parent->width(), parent->height()); diff --git a/interface/ui/runningScriptsWidget.ui b/interface/ui/runningScriptsWidget.ui index 6cb23f4c89..d8d95cabc6 100644 --- a/interface/ui/runningScriptsWidget.ui +++ b/interface/ui/runningScriptsWidget.ui @@ -25,18 +25,18 @@ QWidget { 37 - 29 + 20 251 - 20 + 31 color: #0e7077; -font-size: 20pt; +font-size: 20px; background: transparent; - <html><head/><body><p><span style=" font-size:18pt;">Running Scripts</span></p></body></html> + <html><head/><body><p><span style=" font-size:18px;">Running Scripts</span></p></body></html> 0 @@ -56,7 +56,7 @@ background: transparent; color: #0e7077; -font: bold 14pt; +font: bold 14px; background: transparent; @@ -82,7 +82,7 @@ background: transparent; background: #0e7077; color: #fff; border-radius: 4px; -font: bold 14pt; +font: bold 14px; padding-top: 3px; @@ -105,7 +105,7 @@ padding-top: 3px; background: #0e7077; color: #fff; border-radius: 4px; -font: bold 14pt; +font: bold 14px; padding-top: 3px; @@ -123,7 +123,7 @@ padding-top: 3px; color: #0e7077; -font: bold 14pt; +font: bold 14px; <html><head/><body><p><span style=" font-weight:600;">Recently loaded</span></p></body></html> @@ -140,7 +140,7 @@ font: bold 14pt; color: #95a5a6; -font-size: 14pt; +font-size: 14px; (click a script to load and run it) @@ -184,7 +184,7 @@ font-size: 14pt; - font: 14pt; + font: 14px; There are no scripts currently running. @@ -204,7 +204,7 @@ font-size: 14pt; background: transparent; -font-size: 14pt; +font-size: 14px; @@ -218,7 +218,7 @@ font-size: 14pt; background: transparent; -font-size: 14pt; +font-size: 14px; @@ -237,7 +237,7 @@ font-size: 14pt; background: #0e7077; color: #fff; border-radius: 4px; -font: bold 14pt; +font: bold 14px; padding-top: 3px; From ad41f2da9a631e4e2f362dfba4dc74916b86a89e Mon Sep 17 00:00:00 2001 From: Mohammed Nafees Date: Sat, 21 Jun 2014 16:27:13 +0530 Subject: [PATCH 2/3] Make changes to other UI forms as well --- interface/ui/preferencesDialog.ui | 2 +- interface/ui/shareSnapshot.ui | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/interface/ui/preferencesDialog.ui b/interface/ui/preferencesDialog.ui index f00d7c4788..df33d09939 100644 --- a/interface/ui/preferencesDialog.ui +++ b/interface/ui/preferencesDialog.ui @@ -660,7 +660,7 @@ color: #0e7077 background: #0e7077; color: #fff; border-radius: 4px; -font: bold 14pt; +font: bold 14px; padding: 10px;margin-top:10px diff --git a/interface/ui/shareSnapshot.ui b/interface/ui/shareSnapshot.ui index df7fc4939f..19e0772f13 100644 --- a/interface/ui/shareSnapshot.ui +++ b/interface/ui/shareSnapshot.ui @@ -277,7 +277,7 @@ padding-left:20px; <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Helvetica'; font-size:14pt; font-weight:400; font-style:normal;"> +</style></head><body style=" font-family:'Helvetica'; font-size:14px; font-weight:400; font-style:normal;"> <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;"><br /></p></body></html> From 7271f850413d56be65bbac7478181c82c3241a00 Mon Sep 17 00:00:00 2001 From: Mohammed Nafees Date: Wed, 25 Jun 2014 01:49:17 +0530 Subject: [PATCH 3/3] Change font size values from pt to px in Chat Window. --- interface/src/ui/ChatWindow.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/interface/src/ui/ChatWindow.cpp b/interface/src/ui/ChatWindow.cpp index fde77334f4..d42c40ac76 100644 --- a/interface/src/ui/ChatWindow.cpp +++ b/interface/src/ui/ChatWindow.cpp @@ -178,7 +178,7 @@ void ChatWindow::addTimeStamp() { QLabel* timeLabel = new QLabel(timeString); timeLabel->setStyleSheet("color: #333333;" "background-color: white;" - "font-size: 14pt;" + "font-size: 14px;" "padding: 4px;"); timeLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred); timeLabel->setAlignment(Qt::AlignLeft); @@ -284,7 +284,7 @@ void ChatWindow::participantsChanged() { "padding-bottom: 2px;" "padding-left: 2px;" "border: 1px solid palette(shadow);" - "font-size: 14pt;" + "font-size: 14px;" "font-weight: bold"); userLabel->setProperty("user", participantName); userLabel->setCursor(Qt::PointingHandCursor); @@ -320,7 +320,7 @@ void ChatWindow::messageReceived(const QXmppMessage& message) { "padding-right: 20px;" "margin: 0px;" "color: #333333;" - "font-size: 14pt;" + "font-size: 14px;" "background-color: rgba(0, 0, 0, 0%);" "border: 0; }" "QMenu{ border: 2px outset gray; }");