Katana_mirror/kde-workspace
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-workspace.git synced 2025-02-24 10:52:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kcontrol: remove reundant method from style KCM

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2016-02-12 21:07:36 +02:00
parent 6e04eaa1f5
commit b6bde78ad6
2 changed files with 22 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
kcontrol/style/kcmstyle.cpp
View file

@ -266,7 +266,28 @@ KCMStyle::KCMStyle( QWidget* parent, const QVariantList& )
connect(fineTuningUi.comboSecondaryToolbarIcons, SIGNAL(activated(int)), this, SLOT(setEffectsDirty())); connect(fineTuningUi.comboSecondaryToolbarIcons, SIGNAL(activated(int)), this, SLOT(setEffectsDirty()));
connect(fineTuningUi.comboMenubarStyle, SIGNAL(activated(int)), this, SLOT(setEffectsDirty())); connect(fineTuningUi.comboMenubarStyle, SIGNAL(activated(int)), this, SLOT(setEffectsDirty()));
addWhatsThis(); // Page1
cbStyle->setWhatsThis( i18n("Here you can choose from a list of"
" predefined widget styles (e.g. the way buttons are drawn) which"
" may or may not be combined with a theme (additional information"
" like a marble texture or a gradient).") );
stylePreview->setWhatsThis( i18n("This area shows a preview of the currently selected style "
"without having to apply it to the whole desktop.") );
// Page2
page2->setWhatsThis( i18n("This page allows you to choose details about the widget style options") );
fineTuningUi.comboToolbarIcons->setWhatsThis( i18n( "<p><b>No Text:</b> Shows only icons on toolbar buttons. "
"Best option for low resolutions.</p>"
"<p><b>Text Only: </b>Shows only text on toolbar buttons.</p>"
"<p><b>Text Beside Icons: </b> Shows icons and text on toolbar buttons. "
"Text is aligned beside the icon.</p>"
"<b>Text Below Icons: </b> Shows icons and text on toolbar buttons. "
"Text is aligned below the icon.") );
fineTuningUi.cbIconsOnButtons->setWhatsThis( i18n( "If you enable this option, KDE Applications will "
"show small icons alongside some important buttons.") );
fineTuningUi.cbIconsInMenus->setWhatsThis( i18n( "If you enable this option, KDE Applications will "
"show small icons alongside most menu items.") );
fineTuningUi.comboGraphicEffectsLevel->setWhatsThis( i18n( "If you enable this option, KDE Applications will "
"run internal animations.") );
if (!QFile::exists(QLibraryInfo::location(QLibraryInfo::PluginsPath) + "/menubar/libappmenu-qt.so")) { if (!QFile::exists(QLibraryInfo::location(QLibraryInfo::PluginsPath) + "/menubar/libappmenu-qt.so")) {
fineTuningUi.menubarBox->hide(); fineTuningUi.menubarBox->hide();
@ -837,32 +858,6 @@ void KCMStyle::loadEffects( KConfig& config )
m_bEffectsDirty = false; m_bEffectsDirty = false;
} }
void KCMStyle::addWhatsThis()
{
// Page1
cbStyle->setWhatsThis( i18n("Here you can choose from a list of"
" predefined widget styles (e.g. the way buttons are drawn) which"
" may or may not be combined with a theme (additional information"
" like a marble texture or a gradient).") );
stylePreview->setWhatsThis( i18n("This area shows a preview of the currently selected style "
"without having to apply it to the whole desktop.") );
// Page2
page2->setWhatsThis( i18n("This page allows you to choose details about the widget style options") );
fineTuningUi.comboToolbarIcons->setWhatsThis( i18n( "<p><b>No Text:</b> Shows only icons on toolbar buttons. "
"Best option for low resolutions.</p>"
"<p><b>Text Only: </b>Shows only text on toolbar buttons.</p>"
"<p><b>Text Beside Icons: </b> Shows icons and text on toolbar buttons. "
"Text is aligned beside the icon.</p>"
"<b>Text Below Icons: </b> Shows icons and text on toolbar buttons. "
"Text is aligned below the icon.") );
fineTuningUi.cbIconsOnButtons->setWhatsThis( i18n( "If you enable this option, KDE Applications will "
"show small icons alongside some important buttons.") );
fineTuningUi.cbIconsInMenus->setWhatsThis( i18n( "If you enable this option, KDE Applications will "
"show small icons alongside most menu items.") );
fineTuningUi.comboGraphicEffectsLevel->setWhatsThis( i18n( "If you enable this option, KDE Applications will "
"run internal animations.") );
}
#include "moc_kcmstyle.cpp" #include "moc_kcmstyle.cpp"
// vim: set noet ts=4: // vim: set noet ts=4:

1
kcontrol/style/kcmstyle.h
View file

@ -72,7 +72,6 @@ protected:
void loadStyle( KConfig& config ); void loadStyle( KConfig& config );
void loadEffects( KConfig& config ); void loadEffects( KConfig& config );
void addWhatsThis();
virtual void changeEvent( QEvent *event ); virtual void changeEvent( QEvent *event );