Another Windows fixes + added qt_uk.qm (ukrainian qt translation)

src/lib/navigation/completer/locationcompleterdelegate.cpp

@@ -60,8 +60,13 @@ void LocationCompleterDelegate::paint(QPainter* painter, const QStyleOptionViewI
         opt.state &= ~QStyle::State_Selected;
     }
 
+#ifdef Q_WS_WIN
+    const QPalette::ColorRole colorRole = QPalette::Text;
+    const QPalette::ColorRole colorLinkRole = QPalette::Link;
+#else
     const QPalette::ColorRole colorRole = opt.state & QStyle::State_Selected ? QPalette::HighlightedText : QPalette::Text;
     const QPalette::ColorRole colorLinkRole = opt.state & QStyle::State_Selected ? QPalette::HighlightedText : QPalette::Link;
+#endif
 
     // Draw background
     style->drawPrimitive(QStyle::PE_PanelItemViewItem, &opt, painter, w);

src/lib/preferences/pluginlistdelegate.cpp

@@ -44,7 +44,11 @@ void PluginListDelegate::paint(QPainter* painter, const QStyleOptionViewItem &op
     titleFont.setPointSize(titleFont.pointSize() + 1);
 
     const QFontMetrics titleMetrics(titleFont);
+#ifdef Q_WS_WIN
+    const QPalette::ColorRole colorRole = QPalette::Text;
+#else
     const QPalette::ColorRole colorRole = opt.state & QStyle::State_Selected ? QPalette::HighlightedText : QPalette::Text;
+#endif
 
     int leftPosition = m_padding;
     int rightPosition = opt.rect.right() - m_padding;

src/lib/tools/globalfunctions.h

@@ -32,7 +32,7 @@ class QUrl;
 QByteArray QT_QUPZILLA_EXPORT qz_pixmapToByteArray(const QPixmap &pix);
 QPixmap QT_QUPZILLA_EXPORT qz_pixmapFromByteArray(const QByteArray &data);
 
-QString qz_readAllFileContents(const QString &filename);
+QString QT_QUPZILLA_EXPORT qz_readAllFileContents(const QString &filename);
 
 void QT_QUPZILLA_EXPORT qz_centerWidgetOnScreen(QWidget* w);
 void QT_QUPZILLA_EXPORT qz_centerWidgetToParent(QWidget* w, QWidget* parent);
@@ -55,7 +55,7 @@ QPixmap QT_QUPZILLA_EXPORT qz_createPixmapForSite(const QIcon &icon, const QStri
 QString QT_QUPZILLA_EXPORT qz_buildSystem();
 
 template <typename T>
-bool QT_QUPZILLA_EXPORT qz_listContainsIndex(const QList<T> &list, int index)
+bool qz_listContainsIndex(const QList<T> &list, int index)
 {
     return (index >= 0 && list.count() > index);
 }

src/plugins/GreaseMonkey/settings/gm_settingslistdelegate.cpp

@@ -52,7 +52,11 @@ void GM_SettingsListDelegate::paint(QPainter* painter, const QStyleOptionViewIte
     titleFont.setPointSize(titleFont.pointSize() + 1);
 
     const QFontMetrics titleMetrics(titleFont);
+#ifdef Q_WS_WIN
+    const QPalette::ColorRole colorRole = QPalette::Text;
+#else
     const QPalette::ColorRole colorRole = opt.state & QStyle::State_Selected ? QPalette::HighlightedText : QPalette::Text;
+#endif
 
     int leftPosition = m_padding;
     int rightPosition = opt.rect.right() - m_padding - 16; // 16 for remove button

src/plugins/PIM/PIM_plugin.h

@@ -44,9 +44,6 @@ public:
     void populateWebViewMenu(QMenu* menu, WebView* view, const QWebHitTestResult &r);
     bool keyPress(const Qz::ObjectName &type, QObject* obj, QKeyEvent* event);
 
-private slots:
-    void webPageCreated(WebPage* page);
-
 private:
     PIM_Handler* m_handler;
 };

windows/installer.nsi

@@ -3,7 +3,7 @@
 SetCompressor /SOLID /FINAL lzma
 
 !define PRODUCT_NAME "QupZilla"
-!define /date PRODUCT_VERSION "1.2.0"
+!define /date PRODUCT_VERSION "1.3.0"
 !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\qupzilla.exe"
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
 !define PRODUCT_UNINST_ROOT_KEY "HKLM"
@@ -261,6 +261,12 @@ SectionGroup $(TITLE_SecTranslations) SecTranslations
   File "locale\qt_sv.qm"
   SectionEnd
 
+  Section "Ukrainian"
+  SetOutPath "$INSTDIR\locale"
+  File "locale\uk_UA.qm"
+  File "locale\qt_uk.qm"
+  SectionEnd
+
 SectionGroupEnd
 
 Section $(TITLE_SecPlugins) SecPlugins