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

[Mac] Small fixes in themes + fixed building

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/themes/mac/main.css
View File

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

2
src/lib/adblock/adblockmanager.cpp
View File

@ -119,7 +119,7 @@ QNetworkReply* AdBlockManager::block(const QNetworkRequest &request)
} }
#ifdef ADBLOCK_DEBUG #ifdef ADBLOCK_DEBUG
qDebug() << timer.elapsed() << request.url(); qDebug() << timer.elapsed() << request.url();
#endif #endif
return 0; return 0;

1
src/lib/app/qupzilla.cpp
View File

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

2
src/lib/lib.pro
View File

@ -462,7 +462,7 @@ mac {
HEADERS += other/macmenureceiver.h HEADERS += other/macmenureceiver.h
SOURCES += other/macmenureceiver.cpp SOURCES += other/macmenureceiver.cpp
LIBS +=- framework CoreServices LIBS += -framework CoreServices
} }
message(===========================================) message(===========================================)

24
src/lib/tools/qztools.cpp
View File

@ -613,6 +613,18 @@ void* QzTools::X11Display(const QWidget* widget)
QString QzTools::operatingSystem() 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 #ifdef Q_OS_LINUX
return "Linux"; return "Linux";
#endif #endif
@ -699,16 +711,4 @@ QString QzTools::operatingSystem()
return str; return str;
#endif #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
} }

2
src/lib/webview/tabwidget.cpp
View File

@ -755,7 +755,7 @@ void TabWidget::aboutToShowClosedTabsMenu()
} }
} }
QList<WebTab *> TabWidget::allTabs(bool withPinned) QList<WebTab*> TabWidget::allTabs(bool withPinned)
{ {
QList<WebTab*> allTabs; QList<WebTab*> allTabs;