Merge branch 'master' into graesslin/kdecoration2

AUTHORS

@@ -1,2 +1,6 @@
 Cursors:
  Ken Vermette <vermette@gmail.com> 
+
+Kstyle:
+ Hugo Pereira Da Costa <hugo.pereira@free.fr> - Developer
+ Andrew Lake <jamboarder@gmail.com> - Designer

CMakeLists.txt

@@ -4,22 +4,32 @@ cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
 include(WriteBasicConfigVersionFile)
 include(FeatureSummary)
 
-find_package(ECM 0.0.9 REQUIRED NO_MODULE)
-set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
+if(USE_KDE4)
+  add_subdirectory(kstyle)
+else()
+  find_package(ECM 0.0.9 REQUIRED NO_MODULE)
+  set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
 
-include(KDEInstallDirs)
-include(KDECMakeSettings)
-include(KDECompilerSettings)
-include(GenerateExportHeader)
+  include(KDEInstallDirs)
+  include(KDECMakeSettings)
+  include(KDECompilerSettings)
+  include(GenerateExportHeader)
 
-add_subdirectory(cursors)
-add_subdirectory(icons)
-add_subdirectory(windec)
-add_subdirectory(widgetstyles)
-add_subdirectory(kde4breeze)
-add_subdirectory(wallpapers)
-
-INSTALL(FILES colors/Breeze.colors DESTINATION ${DATA_INSTALL_DIR}/color-schemes/)
+  add_subdirectory(cursors)
+  add_subdirectory(icons)
+  add_subdirectory(icons-dark)
+  add_subdirectory(kstyle)
+  add_subdirectory(misc)
+  add_subdirectory(qtquickcontrols)
+  add_subdirectory(wallpapers)
+  add_subdirectory(windec)
 
+  INSTALL(FILES colors/Breeze.colors DESTINATION ${DATA_INSTALL_DIR}/color-schemes/)
+  INSTALL(FILES colors/BreezeDark.colors DESTINATION ${DATA_INSTALL_DIR}/color-schemes/)
+  if(EXISTS ${CMAKE_SOURCE_DIR}/po AND IS_DIRECTORY ${CMAKE_SOURCE_DIR}/po)
+    find_package(KF5I18n CONFIG REQUIRED)
+    ki18n_install(po)
+  endif()
+endif()
 
 feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)

colors/Breeze.colors

@@ -19,74 +19,74 @@ IntensityAmount=0
 IntensityEffect=0
 
 [Colors:Button]
-BackgroundAlternate=224,223,222
+BackgroundAlternate=189,195,199
 BackgroundNormal=239,240,241
 DecorationFocus=61,174,233
-DecorationHover=142,203,233
-ForegroundActive=255,128,224
-ForegroundInactive=136,135,134
-ForegroundLink=0,87,174
-ForegroundNegative=191,3,3
-ForegroundNeutral=176,128,0
+DecorationHover=147,206,233
+ForegroundActive=61,174,233
+ForegroundInactive=127,140,141
+ForegroundLink=41,128,185
+ForegroundNegative=218,68,83
+ForegroundNeutral=246,116,0
 ForegroundNormal=49,54,59
-ForegroundPositive=0,110,40
-ForegroundVisited=69,40,134
+ForegroundPositive=39,174,96
+ForegroundVisited=127,140,141
 
 [Colors:Selection]
-BackgroundAlternate=62,138,204
+BackgroundAlternate=29,153,243
 BackgroundNormal=61,174,233
 DecorationFocus=61,174,233
-DecorationHover=142,203,233
-ForegroundActive=255,128,224
-ForegroundInactive=142,203,233
-ForegroundLink=0,49,110
-ForegroundNegative=156,14,14
-ForegroundNeutral=255,221,0
-ForegroundNormal=252,252,252
-ForegroundPositive=128,255,128
-ForegroundVisited=69,40,134
+DecorationHover=147,206,233
+ForegroundActive=252,252,252
+ForegroundInactive=239,240,241
+ForegroundLink=253,188,75
+ForegroundNegative=218,68,83
+ForegroundNeutral=246,116,0
+ForegroundNormal=239,240,241
+ForegroundPositive=39,174,96
+ForegroundVisited=189,195,199
 
 [Colors:Tooltip]
-BackgroundAlternate=196,224,255
-BackgroundNormal=252,252,252
+BackgroundAlternate=77,77,77
+BackgroundNormal=49,54,59
 DecorationFocus=61,174,233
-DecorationHover=142,203,233
-ForegroundActive=255,128,224
-ForegroundInactive=96,112,128
-ForegroundLink=0,87,174
-ForegroundNegative=191,3,3
-ForegroundNeutral=176,128,0
-ForegroundNormal=49,54,59
-ForegroundPositive=0,110,40
-ForegroundVisited=69,40,134
+DecorationHover=147,206,233
+ForegroundActive=61,174,233
+ForegroundInactive=189,195,199
+ForegroundLink=41,128,185
+ForegroundNegative=218,68,83
+ForegroundNeutral=246,116,0
+ForegroundNormal=239,240,241
+ForegroundPositive=39,174,96
+ForegroundVisited=127,140,141
 
 [Colors:View]
-BackgroundAlternate=248,247,246
+BackgroundAlternate=239,240,241
 BackgroundNormal=252,252,252
 DecorationFocus=61,174,233
-DecorationHover=142,203,233
-ForegroundActive=255,128,224
-ForegroundInactive=136,135,134
-ForegroundLink=0,87,174
-ForegroundNegative=191,3,3
-ForegroundNeutral=176,128,0
+DecorationHover=147,206,233
+ForegroundActive=61,174,233
+ForegroundInactive=127,140,141
+ForegroundLink=41,128,185
+ForegroundNegative=218,68,83
+ForegroundNeutral=246,116,0
 ForegroundNormal=49,54,59
-ForegroundPositive=0,110,40
-ForegroundVisited=69,40,134
+ForegroundPositive=39,174,96
+ForegroundVisited=127,140,141
 
 [Colors:Window]
-BackgroundAlternate=218,217,216
+BackgroundAlternate=189,195,199
 BackgroundNormal=239,240,241
 DecorationFocus=61,174,233
-DecorationHover=142,203,233
-ForegroundActive=255,128,224
-ForegroundInactive=136,135,134
-ForegroundLink=0,87,174
-ForegroundNegative=191,3,3
-ForegroundNeutral=176,128,0
+DecorationHover=147,206,233
+ForegroundActive=61,174,233
+ForegroundInactive=127,140,141
+ForegroundLink=41,128,185
+ForegroundNegative=218,68,83
+ForegroundNeutral=246,116,0
 ForegroundNormal=49,54,59
-ForegroundPositive=0,110,40
-ForegroundVisited=69,40,134
+ForegroundPositive=39,174,96
+ForegroundVisited=127,140,141
 
 [General]
 ColorScheme=Breeze
@@ -97,9 +97,9 @@ shadeSortColumn=true
 contrast=4
 
 [WM]
-activeBackground=65,72,79
+activeBackground=71,80,87
 activeBlend=255,255,255
-activeForeground=252,252,252
-inactiveBackground=229,229,229
+activeForeground=239,240,241
+inactiveBackground=239,240,241
 inactiveBlend=75,71,67
-inactiveForeground=104,108,111
+inactiveForeground=189,195,199

colors/BreezeDark.colors

@@ -0,0 +1,105 @@
+[ColorEffects:Disabled]
+Color=56,56,56
+ColorAmount=0
+ColorEffect=0
+ContrastAmount=0.65
+ContrastEffect=1
+IntensityAmount=0.1
+IntensityEffect=2
+
+[ColorEffects:Inactive]
+ChangeSelectionColor=true
+Color=112,111,110
+ColorAmount=0.025
+ColorEffect=2
+ContrastAmount=0.1
+ContrastEffect=2
+Enable=false
+IntensityAmount=0
+IntensityEffect=0
+
+[Colors:Button]
+BackgroundAlternate=77,77,77
+BackgroundNormal=49,54,59
+DecorationFocus=61,174,233
+DecorationHover=61,174,233
+ForegroundActive=61,174,233
+ForegroundInactive=189,195,199
+ForegroundLink=41,128,185
+ForegroundNegative=218,68,83
+ForegroundNeutral=246,116,0
+ForegroundNormal=239,240,241
+ForegroundPositive=39,174,96
+ForegroundVisited=127,140,141
+
+[Colors:Selection]
+BackgroundAlternate=29,153,243
+BackgroundNormal=61,174,233
+DecorationFocus=61,174,233
+DecorationHover=61,174,233
+ForegroundActive=252,252,252
+ForegroundInactive=239,240,241
+ForegroundLink=253,188,75
+ForegroundNegative=218,68,83
+ForegroundNeutral=246,116,0
+ForegroundNormal=239,240,241
+ForegroundPositive=39,174,96
+ForegroundVisited=189,195,199
+
+[Colors:Tooltip]
+BackgroundAlternate=77,77,77
+BackgroundNormal=49,54,59
+DecorationFocus=61,174,233
+DecorationHover=61,174,233
+ForegroundActive=61,174,233
+ForegroundInactive=189,195,199
+ForegroundLink=41,128,185
+ForegroundNegative=218,68,83
+ForegroundNeutral=246,116,0
+ForegroundNormal=239,240,241
+ForegroundPositive=39,174,96
+ForegroundVisited=127,140,141
+
+[Colors:View]
+BackgroundAlternate=49,54,59
+BackgroundNormal=35,38,41
+DecorationFocus=61,174,233
+DecorationHover=61,174,233
+ForegroundActive=61,174,233
+ForegroundInactive=189,195,199
+ForegroundLink=41,128,185
+ForegroundNegative=218,68,83
+ForegroundNeutral=246,116,0
+ForegroundNormal=239,240,241
+ForegroundPositive=39,174,96
+ForegroundVisited=127,140,141
+
+[Colors:Window]
+BackgroundAlternate=77,77,77
+BackgroundNormal=49,54,59
+DecorationFocus=61,174,233
+DecorationHover=61,174,233
+ForegroundActive=61,174,233
+ForegroundInactive=189,195,199
+ForegroundLink=41,128,185
+ForegroundNegative=218,68,83
+ForegroundNeutral=246,116,0
+ForegroundNormal=239,240,241
+ForegroundPositive=39,174,96
+ForegroundVisited=127,140,141
+
+[General]
+ColorScheme=Breeze Dark
+Name=Breeze Dark
+shadeSortColumn=true
+
+[KDE]
+contrast=4
+
+[WM]
+activeBackground=49,54,59
+activeBlend=255,255,255
+activeForeground=239,240,241
+inactiveBackground=49,54,59
+inactiveBlend=75,71,67
+inactiveForeground=127,140,141

cursors/index.theme

@@ -2,20 +2,26 @@
 Name=Breeze
 Name[ca]=Brisa
 Name[cs]=Breeze
+Name[da]=Breeze
 Name[de]=Breeze
+Name[el]=Breeze
 Name[en_GB]=Breeze
 Name[es]=Brisa
 Name[fi]=Breeze
 Name[fr]=Brise
 Name[gl]=Breeze
 Name[hu]=Breeze
+Name[ia]=Brisa
+Name[ko]=Breeze
+Name[nb]=Breeze
 Name[nds]=Breeze
 Name[nl]=Breeze
 Name[pl]=Bryza
 Name[pt]=Brisa
 Name[pt_BR]=Breeze
+Name[ru]=Breeze
 Name[sk]=Breeze
-Name[sl]=Vetrič
+Name[sl]=Sapica
 Name[sr]=Поветарац
 Name[sr@ijekavian]=Поветарац
 Name[sr@ijekavianlatin]=Povetarac
@@ -25,21 +31,27 @@ Name[tr]=Breeze
 Name[uk]=Breeze
 Name[x-test]=xxBreezexx
 Name[zh_CN]=微风
+Name[zh_TW]=微風
 Comment=KDE Plasma Cursor Theme
-Comment[ca]=Tema de cursor pel Plasma del KDE
+Comment[ca]=Tema de cursor del Plasma pel KDE
 Comment[cs]=Motiv kurzorů Plasma KDE
+Comment[da]=Markørtema til KDE Plasma
 Comment[de]=Plasma-Zeigerdesign für KDE
+Comment[el]=Θέμα δρομέα του KDE Plasma
 Comment[en_GB]=KDE Plasma Cursor Theme
 Comment[es]=Tema de cursores de KDE Plasma
 Comment[fi]=KDE Plasman osoitinteema
 Comment[fr]=Thème Plasma de curseur
 Comment[gl]=Tema do cursor de Plasma de KDE
 Comment[hu]=KDE plazma kurzortéma
+Comment[ko]=KDE Plasma 커서 테마
+Comment[nb]=KDE Plasma pekertema
 Comment[nds]=KDE-Plasma-Wiesermuster
 Comment[nl]=Cursorthema van KDE Plasma
 Comment[pl]=Zestaw wskaźników Plazmy KDE
 Comment[pt]=Tema de Cursores do Plasma para KDE
 Comment[pt_BR]=Tema de cursor do Plasma
+Comment[ru]=Тема курсоров KDE Plasma
 Comment[sk]=Téma kurzora KDE Plasma
 Comment[sl]=Tema kazalk za KDE Plasma
 Comment[sr]=КДЕ плазма тема показивача
@@ -51,3 +63,4 @@ Comment[tr]=KDE Plasma İmleç Teması
 Comment[uk]=Тема курсорів Плазми KDE
 Comment[x-test]=xxKDE Plasma Cursor Themexx
 Comment[zh_CN]=KDE Plasma 光标主题
+Comment[zh_TW]=KDE Plasma 游標主題

icons-dark/AUTHORS

@@ -0,0 +1,3 @@
+Breeze Icon Theme has been developed by The KDE Visual Design Group.
+
+Main work for the icon theme: Uri Herrera

icons-dark/CMakeLists.txt

@@ -0,0 +1,23 @@
+project(breeze-icons NONE)
+
+cmake_minimum_required(VERSION 2.8)
+# include specific modules
+set (CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+
+if (WIN32)
+   set(ICON_INSTALL_DIR         "share/icons"             ) # The icon install dir (default ${SHARE_INSTALL_PREFIX}/share/icons/)
+else (WIN32)
+   set(SHARE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/share" )
+   set(ICON_INSTALL_DIR     "${SHARE_INSTALL_PREFIX}/icons" )
+endif(WIN32)
+
+########### install files ###############
+
+set( breeze_icon_dark_dirs  actions apps categories mimetypes places devices)
+
+
+set(BREEZE_INSTALL_DIR ${ICON_INSTALL_DIR}/breeze-dark)
+install( DIRECTORY ${breeze_icon_dark_dirs} DESTINATION ${BREEZE_INSTALL_DIR} PATTERN "*.sh" EXCLUDE )
+install( FILES index.theme DESTINATION ${BREEZE_INSTALL_DIR})
+
+