Merge branch 'Plasma/5.18'

This commit is contained in:
Vlad Zahorodnii 2020-02-21 13:57:14 +02:00
commit b9cb1d0f1d
6 changed files with 4 additions and 18 deletions

View file

@ -604,6 +604,7 @@ void AbstractClient::minimize(bool avoid_animation)
updateWindowRules(Rules::Minimize); updateWindowRules(Rules::Minimize);
FocusChain::self()->update(this, FocusChain::MakeFirstMinimized); FocusChain::self()->update(this, FocusChain::MakeFirstMinimized);
// TODO: merge signal with s_minimized // TODO: merge signal with s_minimized
addWorkspaceRepaint(visibleRect());
emit clientMinimized(this, !avoid_animation); emit clientMinimized(this, !avoid_animation);
emit minimizedChanged(); emit minimizedChanged();
} }

View file

@ -15,6 +15,7 @@ Name[fr]=Jeter un oeil sur le bureau
Name[gl]=Ollo na pantalla Name[gl]=Ollo na pantalla
Name[he]=עין על המסך Name[he]=עין על המסך
Name[hu]=Ide figyelj! Name[hu]=Ide figyelj!
Name[ia]=eye On Screen
Name[id]=mata Di Layar Name[id]=mata Di Layar
Name[it]=eye On Screen Name[it]=eye On Screen
Name[ja]=eye On Screen Name[ja]=eye On Screen

View file

@ -14,6 +14,7 @@ Name[fr]=Désature les applications qui ne répondent pas
Name[gl]=Reducir a saturación das aplicacións que non responden Name[gl]=Reducir a saturación das aplicacións que non responden
Name[he]=מחשיך יישומים שאינם מגיבים Name[he]=מחשיך יישומים שאינם מגיבים
Name[hu]=Nem válaszoló alkalmazások színtelenítése Name[hu]=Nem válaszoló alkalmazások színtelenítése
Name[ia]=Desatura applicationes non responsive
Name[id]=Desaturate-kan Aplikasi Tidak Responsif Name[id]=Desaturate-kan Aplikasi Tidak Responsif
Name[it]=Desatura le applicazioni che non rispondono Name[it]=Desatura le applicazioni che non rispondono
Name[ko]= Name[ko]=
@ -52,6 +53,7 @@ Comment[fr]=Désature les fenêtres des applications qui ne répondent pas (gel
Comment[gl]=Reducir a saturación das xanelas de aplicacións que non responden (conxeladas) Comment[gl]=Reducir a saturación das xanelas de aplicacións que non responden (conxeladas)
Comment[he]=מחשיך חלונות של יישומים שאינם מגיבים (תקועים) Comment[he]=מחשיך חלונות של יישומים שאינם מגיבים (תקועים)
Comment[hu]=Színteleníti a nem válaszoló, lefagyott alkalmazások ablakait Comment[hu]=Színteleníti a nem válaszoló, lefagyott alkalmazások ablakait
Comment[ia]=Destura fenestras de applicationes non responsive (congelate)
Comment[id]=Desaturate-kan window pada aplikasi yang tidak responsif (beku) Comment[id]=Desaturate-kan window pada aplikasi yang tidak responsif (beku)
Comment[it]=Desatura le finestre delle applicazione che non rispondono (bloccate) Comment[it]=Desatura le finestre delle applicazione che non rispondono (bloccate)
Comment[ko]= Comment[ko]=

View file

@ -18,9 +18,6 @@
<entry name="coloredBorder" type="Bool"> <entry name="coloredBorder" type="Bool">
<default>true</default> <default>true</default>
</entry> </entry>
<entry name="titleShadow" type="Bool">
<default>true</default>
</entry>
<entry name="animateButtons" type="Bool"> <entry name="animateButtons" type="Bool">
<default>true</default> <default>true</default>
</entry> </entry>

View file

@ -60,16 +60,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QCheckBox" name="kcfg_titleShadow">
<property name="whatsThis">
<string>Check this option if you want the titlebar text to have a 3D look with a shadow behind it.</string>
</property>
<property name="text">
<string>Use shadowed &amp;text</string>
</property>
</widget>
</item>
<item> <item>
<widget class="QCheckBox" name="kcfg_animateButtons"> <widget class="QCheckBox" name="kcfg_animateButtons">
<property name="whatsThis"> <property name="whatsThis">
@ -92,7 +82,6 @@
</customwidgets> </customwidgets>
<tabstops> <tabstops>
<tabstop>kcfg_animateButtons</tabstop> <tabstop>kcfg_animateButtons</tabstop>
<tabstop>kcfg_titleShadow</tabstop>
</tabstops> </tabstops>
<resources/> <resources/>
<connections/> <connections/>

View file

@ -76,7 +76,6 @@ Decoration {
root.titleAlignment = Text.AlignLeft; root.titleAlignment = Text.AlignLeft;
} }
root.animateButtons = decoration.readConfig("animateButtons", true); root.animateButtons = decoration.readConfig("animateButtons", true);
root.titleShadow = decoration.readConfig("titleShadow", true);
if (decoration.animationsSupported) { if (decoration.animationsSupported) {
root.animationDuration = 150; root.animationDuration = 150;
root.animateButtons = false; root.animateButtons = false;
@ -96,7 +95,6 @@ Decoration {
// set by readConfig after Component completed, ensures that buttons do not flicker // set by readConfig after Component completed, ensures that buttons do not flicker
property int animationDuration: 0 property int animationDuration: 0
property bool animateButtons: true property bool animateButtons: true
property bool titleShadow: true
Behavior on titleBarColor { Behavior on titleBarColor {
ColorAnimation { ColorAnimation {
duration: root.animationDuration duration: root.animationDuration
@ -276,8 +274,6 @@ Decoration {
} }
text: decoration.client.caption text: decoration.client.caption
font: options.titleFont font: options.titleFont
style: root.titleShadow ? Text.Raised : Text.Normal
styleColor: colorHelper.shade(color, ColorHelper.ShadowShade)
elide: Text.ElideMiddle elide: Text.ElideMiddle
renderType: Text.NativeRendering renderType: Text.NativeRendering
} }