Lubuntu/lxqt-qtplugin-packaging
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge tag 'upstream/0.9.0+20150819' into debian

Browse Source 
Upstream version 0.9.0+20150819

* tag 'upstream/0.9.0+20150819':
  Imported Upstream version 0.9.0+20150819
This commit is contained in:
ChangZhuo Chen (陳昌倬) 2015-08-19 23:58:11 +08:00
commit 204f6c8155
5 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -1 +1,2 @@
/test build
*.kdev4

8
CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8.11) cmake_minimum_required(VERSION 3.0.2 FATAL_ERROR)
project(lxqt-qtplugin) project(lxqt-qtplugin)
set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_INCLUDE_CURRENT_DIR ON)
@ -10,11 +10,7 @@ find_package(Qt5LinguistTools REQUIRED QUIET)
find_package(lxqt REQUIRED QUIET) find_package(lxqt REQUIRED QUIET)
include(${LXQT_USE_FILE}) include(LXQtCompilerSettings NO_POLICY_SCOPE)
if(CMAKE_COMPILER_IS_GNUCXX)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions -Wl,-no-undefined -Wall")
endif()
add_subdirectory(src) add_subdirectory(src)

3
lxqt-qtplugin.kdev4
View File

@ -1,3 +0,0 @@
[Project]
Manager=KDevCMakeManager
Name=lxqt-qtplugin

18
src/lxqtplatformtheme.cpp
View File

@ -43,6 +43,7 @@
#include <QDir> #include <QDir>
#include <QFileInfo> #include <QFileInfo>
#include <QFileSystemWatcher> #include <QFileSystemWatcher>
#include <QStyle>
#include "qiconloader_p.h" #include "qiconloader_p.h"
LXQtPlatformTheme::LXQtPlatformTheme(): LXQtPlatformTheme::LXQtPlatformTheme():
@ -157,7 +158,11 @@ void LXQtPlatformTheme::onSettingsChanged() {
loadSettings(); // reload the config file loadSettings(); // reload the config file
if(style_ != oldStyle) // the widget style is changed if(style_ != oldStyle) // the widget style is changed
qApp->setStyle(style_); // ask Qt5 to apply the new style {
// ask Qt5 to apply the new style
if (qobject_cast<QApplication *>(QCoreApplication::instance()))
QApplication::setStyle(style_);
}
if(iconTheme_ != oldIconTheme) { // the icon theme is changed if(iconTheme_ != oldIconTheme) { // the icon theme is changed
QIconLoader::instance()->updateSystemTheme(); // this is a private internal API of Qt5. QIconLoader::instance()->updateSystemTheme(); // this is a private internal API of Qt5.
@ -198,12 +203,15 @@ bool LXQtPlatformTheme::usePlatformNativeDialog(DialogType type) const {
QPlatformDialogHelper *LXQtPlatformTheme::createPlatformDialogHelper(DialogType type) const { QPlatformDialogHelper *LXQtPlatformTheme::createPlatformDialogHelper(DialogType type) const {
return 0; return 0;
} }
#endif
const QPalette *LXQtPlatformTheme::palette(Palette type) const { const QPalette *LXQtPlatformTheme::palette(Palette type) const {
return new QPalette();
}
#endif if (type == QPlatformTheme::SystemPalette)
// the default constructor uses the default palette
return new QPalette;
return QPlatformTheme::palette(type);
}
const QFont *LXQtPlatformTheme::font(Font type) const { const QFont *LXQtPlatformTheme::font(Font type) const {
// qDebug() << "font()" << type << SystemFont; // qDebug() << "font()" << type << SystemFont;
@ -250,7 +258,7 @@ QVariant LXQtPlatformTheme::themeHint(ThemeHint hint) const {
case ItemViewActivateItemOnSingleClick: case ItemViewActivateItemOnSingleClick:
return QVariant(singleClickActivate_); return QVariant(singleClickActivate_);
case SystemIconThemeName: case SystemIconThemeName:
qDebug() << "iconTheme" << iconTheme_; // qDebug() << "iconTheme" << iconTheme_;
return iconTheme_; return iconTheme_;
case SystemIconFallbackThemeName: case SystemIconFallbackThemeName:
return "hicolor"; return "hicolor";

4
src/lxqtplatformtheme.h
View File

@ -24,7 +24,7 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
* *
* END_COMMON_COPYRIGHT_HEADER */ * END_COMMON_COPYRIGHT_HEADER */
#ifndef LXQTPLATFORMTHEME_H #ifndef LXQTPLATFORMTHEME_H
#define LXQTPLATFORMTHEME_H #define LXQTPLATFORMTHEME_H
@ -48,7 +48,7 @@ public:
virtual bool usePlatformNativeDialog(DialogType type) const; virtual bool usePlatformNativeDialog(DialogType type) const;
// virtual QPlatformDialogHelper *createPlatformDialogHelper(DialogType type) const; // virtual QPlatformDialogHelper *createPlatformDialogHelper(DialogType type) const;
// virtual const QPalette *palette(Palette type = SystemPalette) const; virtual const QPalette *palette(Palette type = SystemPalette) const;
virtual const QFont *font(Font type = SystemFont) const; virtual const QFont *font(Font type = SystemFont) const;