1
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 02:36:34 +01:00

[Mac] Small fixes in themes + fixed building

Theme: fixed color of statusbar
Building: fixed linking to CoreServices framework
QzTools: show correct version of Mac OS X
Code: coding style
This commit is contained in:
S. Razi Alavizadeh 2013-02-26 12:58:04 +01:00 committed by nowrep
parent d885444501
commit b52d150e7d
6 changed files with 17 additions and 16 deletions

View File

@ -42,7 +42,7 @@
#mainwindow-statusbar
{
background-color: #b5b5b5;
background-color: #a7a7a7;
}
#statusbar-ip-label

View File

@ -1778,6 +1778,7 @@ bool QupZilla::event(QEvent* event)
statusBar()->setVisible(m_statusBarVisible);
m_navigationContainer->show();
m_tabWidget->showTabBar();
m_tabWidget->getTabBar()->updateVisibilityWithFullscreen(true);
#ifndef Q_OS_MAC
m_navigationBar->buttonSuperMenu()->setVisible(!m_menuBarVisible);
#endif

View File

@ -613,6 +613,18 @@ void* QzTools::X11Display(const QWidget* widget)
QString QzTools::operatingSystem()
{
#ifdef Q_OS_MAC
QString str = "Mac OS X";
SInt32 majorVersion;
SInt32 minorVersion;
if (Gestalt(gestaltSystemVersionMajor, &majorVersion) == noErr && Gestalt(gestaltSystemVersionMinor, &minorVersion) == noErr) {
str.append(QString(" %1.%2").arg(majorVersion).arg(minorVersion));
}
return str;
#endif
#ifdef Q_OS_LINUX
return "Linux";
#endif
@ -699,16 +711,4 @@ QString QzTools::operatingSystem()
return str;
#endif
#ifdef Q_OS_MAC
QString str = "Mac OS X";
SInt32 majorVersion;
SInt32 minorVersion;
if (Gestalt(gestaltSystemVersionMajor, &majorVersion) == noErr && Gestalt(gestaltSystemVersionMinor, &minorVersion) == noErr) {
str.append(QString(" %1.%2").arg(majorVersion, minorVersion));
}
return str;
#endif
}