Merge branch 'master' into 'master'

Update version of Windows 7 Kvantum

See merge request wackyideas/aerothemeplasma-kde6!1

Kvantum/Windows7Kvantum_Aero/Windows7Kvantum_Aero.kvconfig

@@ -2,46 +2,43 @@
 author=DrGordBord+WackyIdeas
 comment=Port Of Windows 7 theme to modern KDE
 left_tabs=true
-min_width=16
-min_height=16
 attach_active_tab=true
 active_tab_overlap=2
 group_toolbar_buttons=false
 spread_progressbar=false
-spread_header=false
-#progressbar_thickness=1.0font
+spread_header=true
+progressbar_thickness=1.4font
 composite=true
-menu_shadow_depth=5
-tooltip_shadow_depth=4
+menu_shadow_depth=0
+tooltip_shadow_depth=3
 scroll_min_extent=32
-slider_width=1
+slider_width=4
 slider_handle_width=18
 slider_handle_length=10
 center_toolbar_handle=false
-center_scrollbar_indicator=false
-toolbar_interior_spacing=2
-toolbar_item_spacing=2
-x11drag=menubar_and_primary_toolbar
-scroll_width=15
+toolbar_interior_spacing=0
+toolbar_item_spacing=0
+x11drag=all
+scroll_width=16
 menubar_mouse_tracking=true
 toolbutton_style=0
 click_behavior=2
 vertical_spin_indicators=true
-translucent_windows=false
-blurring=false
-popup_blurring=false
+translucent_windows=true
+blurring=true
+popup_blurring=true
 toolbar_icon_size=16
 animate_states=true
 alt_mnemonic=true
 button_contents_shift=true
 button_icon_size=16
-combo_as_lineedit=true
-combo_menu=false
+combo_as_lineedit=false
+combo_menu=true
 combo_focus_rect=false
 square_combo_button=true
 fill_rubberband=false
 groupbox_top_label=false
-inline_spin_indicators=false
+inline_spin_indicators=true
 remove_extra_frames=false
 joined_inactive_tabs=false
 no_inactive_tab_expansion=true
@@ -52,16 +49,16 @@ layout_spacing=4
 merge_menubar_with_toolbar=false
 respect_DE=true
 scroll_arrows=true
-scrollbar_in_view=true
+scrollbar_in_view=false
 transient_scrollbar=false
 small_icon_size=16
 spin_button_width=16
-submenu_overlap=2
-tooltip_delay=250
+submenu_overlap=10
+tooltip_delay=-1
 tree_branch_line=true
 bold_active_tab=false
 contrast=1.00
-dialog_button_layout=0
+dialog_button_layout=4
 hide_combo_checkboxes=false
 intensity=1.00
 no_inactiveness=false
@@ -74,17 +71,17 @@ shadowless_popup=false
 submenu_delay=250
 transient_groove=false
 check_size=13
-#min_height=32
-splitter_width=6
+min_width=32
+min_height=32
+splitter_width=10
 drag_from_buttons=false
 opaque=kaffeine,kmplayer,subtitlecomposer,kdenlive,vlc,smplayer,smplayer2,avidemux,avidemux2_qt4,avidemux3_qt4,avidemux3_qt5,kamoso,QtCreator,VirtualBox,VirtualBoxVM,trojita,dragon,digikam,lyx
 menu_blur_radius=0
 tooltip_blur_radius=0
-menu_separator_height=3
 
 [GeneralColors]
 window.color=#f4f4f6
-base.color=#ffffff
+base.color=white
 alt.base.color=#f4f4f6
 button.color=#efebe7
 light.color=white
@@ -98,10 +95,10 @@ window.text.color=black
 inactive.window.text.color=black
 button.text.color=black
 disabled.text.color=#00000070
-tooltip.text.color=#2e2e2e
+tooltip.text.color=black
 highlight.text.color=black
 inactive.highlight.text.color=black
-highlight.color=#3399ff
+highlight.color=#a6a8c1
 link.color=#0000ff
 link.visited.color=#ff00ff
 progress.indicator.text.color=black
@@ -111,7 +108,7 @@ progress.inactive.indicator.text.color=black
 transparent_dolphin_view=false
 #transparent_pcmanfm_sidepane=true
 transparent_ktitle_label=true
-blur_translucent=true
+blur_translucent=false
 transparent_menutitle=false
 kcapacitybar_as_progressbar=true
 respect_darkness=false
@@ -119,21 +116,20 @@ single_top_toolbar=false
 disabled_icon_opacity=50
 force_size_grip=false
 iconless_menu=false
-iconless_pushbutton=true
+iconless_pushbutton=false
 lxqtmainmenu_iconsize=22
 no_selection_tint=true
-normal_default_pushbutton=true
-
+normal_default_pushbutton=false
 #tint_on_mouseover=0
 transparent_pcmanfm_view=false
 transparent_arrow_button=true
 centered_forms=false
 kinetic_scrolling=false
-middle_click_scroll=true
-noninteger_translucency=true
+middle_click_scroll=false
+noninteger_translucency=false
 scroll_jump_workaround=false
 blur_only_active_window=false
-style_vertical_toolbars=true
+style_vertical_toolbars=false
 tint_on_mouseover=0
 transparent_pcmanfm_sidepane=false
 
@@ -151,18 +147,18 @@ frame.left=3
 frame.right=3
 text.margin.top=0
 text.margin.bottom=0
-text.margin.left=0
-text.margin.right=0
+text.margin.left=4
+text.margin.right=4
 frame.expansion=0
 interior.element=btn
 interior=true
 frame=true
 frame.element=btn
-indicator.size=8
+indicator.size=7
 
 [PanelButtonTool]
-text.margin.top=2
-text.margin.bottom=2
+text.margin.top=0
+text.margin.bottom=0
 text.margin.left=2
 text.margin.right=2
 frame.top=3
@@ -173,14 +169,13 @@ interior.element=tbaritem
 interior=true
 frame=true
 frame.element=tbaritem
-indicator.size=6
+indicator.size=7
 
 [Dock]
 inherits=PanelButtonCommand
 interior.element=mubar
 frame.element=mubar
-text.margin.top=0
-text.margin.bottom=0
+
 text.normal.color=#000000c8
 
 [DockTitle]
@@ -191,7 +186,7 @@ frame=true
 interior=true
 text.normal.color=black
 text.focus.color=black
-text.bold=false
+text.bold=true
 frame.top=3
 frame.bottom=3
 frame.left=3
@@ -203,27 +198,25 @@ frame=true
 interior=true
 frame.element=common
 interior.element=common
-frame.top=4
-frame.bottom=4
-frame.left=4
-frame.right=4
+frame.top=1
+frame.bottom=1
+frame.left=1
+frame.right=1
 
 [LineEdit]
 #inherits=PanelButtonCommand
 frame.element=ledit
 interior.element=ledit
-frame.top=4
-frame.bottom=4
-frame.left=4
-frame.right=4
-text.margin.top=0
-text.margin.bottom=0
-text.margin.left=0
-text.margin.right=0
+min_height=22
+frame.top=1
+frame.bottom=1
+frame.left=1
+frame.right=1
+indicator.size=10
 
 [IndicatorSpinBox]
 indicator.element=spind
-indicator.size=12
+indicator.size=10
 frame.top=0
 frame.bottom=0
 frame.left=0
@@ -251,7 +244,7 @@ frame.bottom=0
 frame.left=4
 frame.right=4
 focusFrame=true
-text.margin.top=1
+text.margin.top=0
 frame.expansion=0
 indicator.size=12
 interior.element=tab
@@ -286,10 +279,10 @@ interior=true
 frame=true
 frame.element=gbox
 interior.element=gbox
-frame.top=4
-frame.bottom=4
-frame.left=4
-frame.right=4
+frame.top=2
+frame.bottom=2
+frame.left=2
+frame.right=2
 text.bold=false
 frame.expansion=0
 text.normal.color=black
@@ -307,17 +300,16 @@ frame.right=4
 [SizeGrip]
 inherits=PanelButtonCommand
 frame=false
-interior=true
-#interior.element=resize-grip
+interior=false
 indicator.element=resize-grip
-indicator.size=10
+indicator.size=15
 
 [Toolbar]
 frame.left=2
 frame.right=2
 frame.top=2
 frame.bottom=2
-indicator.size=8
+indicator.size=3
 frame.expansion=0
 interior.element=tlbar
 interior=true
@@ -325,27 +317,6 @@ frame=true
 frame.element=tlbar
 indicator.element=tbar
 text.normal.color=black
-text.margin.top=8
-text.margin.bottom=8
-text.margin.left=4
-text.margin.right=4
-
-[ToolbarButton]
-text.margin.top=8
-text.margin.bottom=8
-text.margin.left=4
-text.margin.right=4
-
-[ToolbarComboBox]
-text.margin.top=8
-text.margin.bottom=8
-text.margin.left=4
-text.margin.right=4
-[ToolbarLineEdit]
-text.margin.top=8
-text.margin.bottom=8
-text.margin.left=4
-text.margin.right=4
 
 [Scrollbar]
 indicator.size=16
@@ -357,16 +328,15 @@ interior=true
 interior.element=trough
 frame.element=trough
 frame=true
-frame.left=1
+frame.left=2
 frame.right=1
 frame.top=1
 frame.bottom=1
 
-
 [ScrollbarSlider]
 interior=true
 frame=true
-frame.left=2
+frame.left=3
 frame.right=2
 frame.top=2
 frame.bottom=2
@@ -377,17 +347,17 @@ indicator.element=sgrip
 indicator.size=10
 
 [Progressbar]
-text.bold=false
+text.bold=true
 text.normal.color=black
 frame=true
 interior=true
 frame.element=pbgutter
 interior.element=pbgutter
 frame.expansion=0
-frame.top=2
-frame.bottom=2
-frame.left=2
-frame.right=2
+frame.top=1
+frame.bottom=1
+frame.left=1
+frame.right=1
 
 [ProgressbarContents]
 frame=false
@@ -411,10 +381,10 @@ interior=true
 interior.element=iview
 frame.element=iview
 frame=true
-frame.top=1
-frame.bottom=1
-frame.left=1
-frame.right=1
+frame.top=3
+frame.bottom=3
+frame.left=3
+frame.right=3
 
 [Menu]
 frame.top=1
@@ -425,17 +395,16 @@ interior.element=mnu
 frame.element=mnu
 frame=true
 interior=true
-text.margin=0
 
 [MenuItem]
 frame=true
 frame.element=menuitem
 interior=true
 interior.element=menuitem
-frame.top=1
-frame.bottom=1
-frame.left=1
-frame.right=1
+frame.top=3
+frame.bottom=3
+frame.left=3
+frame.right=3
 frame.expansion=0
 indicator.element=arrow
 indicator.size=8
@@ -445,24 +414,22 @@ text.normal.color=black
 text.focus.color=black
 text.margin.top=0
 text.margin.bottom=0
-text.margin.left=2
-text.margin.right=2
 
 [MenuBarItem]
 interior=true
-interior.element=mbaritem
-frame.element=mbaritem
+interior.element=barSelect
+frame.element=barSelect
 frame=true
-frame.top=1
-frame.bottom=1
-frame.left=1
-frame.right=1
+frame.top=3
+frame.bottom=3
+frame.left=3
+frame.right=3
 frame.expansion=0
+text.margin.top=-5
+text.margin.bottom=-5
 text.toggle.color=black
 text.press.color=black
 text.normal.color=black
-text.margin.top=0
-text.margin.bottom=0
 
 [MenuBar]
 interior=true
@@ -471,8 +438,8 @@ interior.element=mubar
 frame.element=mubar
 frame.top=1
 frame.bottom=1
-frame.left=1
-frame.right=1
+frame.left=2
+frame.right=2
 frame.expansion=0
 text.margin.top=0
 text.margin.bottom=0
@@ -494,27 +461,7 @@ inherits=PanelButtonCommand
 frame.expandedElement=ebutton
 
 [Splitter]
-indicator.size=16
-
-#[Slider]
-#frame.element=slider
-#interior.element=slider
-#interior=true
-#frame=true
-#frame.top=1
-#frame.bottom=1
-#frame.left=1
-#frame.right=1
-
-#[SliderCursor]
-#frame=true
-#interior=true
-#interior.element=scursor
-#frame.element=scursor
-#frame.top=4
-#frame.bottom=4
-#frame.left=4
-#frame.right=4
+indicator.size=32
 
 [Slider]
 inherits=PanelButtonCommand
@@ -529,27 +476,28 @@ frame.right=2
 interior.element=scursor
 
 
-
 [Focus]
 inherits=PanelButtonCommand
-frame=true
-frame.element=focus
+frame=false
+frame.element=
 frame.top=1
 frame.bottom=1
 frame.left=1
 frame.right=1
-frame.patternsize=4
+frame.patternsize=20
 
 [ToolTip]
 interior=true
 frame=true
 interior.element=ttip
 frame.element=ttip
-frame.top=4
-frame.bottom=4
-frame.left=4
-frame.right=4
-text.normal.color=black
+frame.top=0
+frame.bottom=0
+frame.left=0
+frame.right=0
+text.normal.color=gray
+text.focus.color=gray
+
 
 [RadioButton]
 text.normal.color=black
@@ -564,10 +512,10 @@ interior.element=dtitle
 frame.element=dtitle
 frame=true
 interior=true
-frame.top=2
-frame.bottom=2
-frame.left=2
-frame.right=2
+frame.top=3
+frame.bottom=3
+frame.left=3
+frame.right=3
 indicator.element=dock
 indicator.size=8
 
@@ -582,4 +530,4 @@ frame.left=2
 frame.right=2
 #text.focus.color=#245bf5
 #text.normal.color=#1f4fd5
-text.bold=false
+text.bold=true