Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 02:36:34 +01:00
Code Releases Activity

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

Browse Source
This commit is contained in:
nowrep 2012-07-12 12:55:22 +02:00
parent 274c234988
commit f65b30fda7
7 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
bin/locale/qt_uk.qm Normal file
View File

Binary file not shown.

5
src/lib/navigation/completer/locationcompleterdelegate.cpp
View File

@ -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);

4
src/lib/preferences/pluginlistdelegate.cpp
View File

@ -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;

4
src/lib/tools/globalfunctions.h
View File

@ -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);
}

4
src/plugins/GreaseMonkey/settings/gm_settingslistdelegate.cpp
View File

@ -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

3
src/plugins/PIM/PIM_plugin.h
View File

@ -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;
};

8
windows/installer.nsi
View File

@ -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