yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'KDE/4.9'

Browse source 
Conflicts:
	plasma/desktop/shell/activitymanager/package/contents/ui/ActivityDelegate.qml
This commit is contained in:
Martin Gräßlin 2012-10-24 20:40:07 +02:00
commit 5a33974bca
3 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
kcmkwin/kwinscripts/module.cpp
View file

@ -57,9 +57,6 @@ Module::Module(QWidget *parent, const QVariantList &args) :
ui->setupUi(this); ui->setupUi(this);
ui->ghnsButton->setIcon(KIcon("get-hot-new-stuff")); ui->ghnsButton->setIcon(KIcon("get-hot-new-stuff"));
// TODO: remove once the category has been created.
ui->ghnsButton->setVisible(false);
connect(ui->scriptSelector, SIGNAL(changed(bool)), this, SLOT(changed())); connect(ui->scriptSelector, SIGNAL(changed(bool)), this, SLOT(changed()));
connect(ui->importScriptButton, SIGNAL(clicked()), SLOT(importScript())); connect(ui->importScriptButton, SIGNAL(clicked()), SLOT(importScript()));
connect(ui->ghnsButton, SIGNAL(clicked(bool)), SLOT(slotGHNSClicked())); connect(ui->ghnsButton, SIGNAL(clicked(bool)), SLOT(slotGHNSClicked()));

2
kcmkwin/kwintabbox/kwinswitcher.knsrc
View file

@ -1,5 +1,5 @@
[KNewStuff3] [KNewStuff3]
Categories=KWin Window Switcher Categories=KWin Switching Layouts
StandardResource=tmp StandardResource=tmp
InstallationCommand=plasmapkg -t windowswitcher -i %f InstallationCommand=plasmapkg -t windowswitcher -i %f
UninstallCommand=plasmapkg -t windowswitcher -r %f UninstallCommand=plasmapkg -t windowswitcher -r %f

3
kcmkwin/kwintabbox/main.cpp
View file

@ -110,9 +110,6 @@ KWinTabBoxConfig::KWinTabBoxConfig(QWidget* parent, const QVariantList& args)
ui[i]->effectConfigButton->setIcon(KIcon("view-preview")); ui[i]->effectConfigButton->setIcon(KIcon("view-preview"));
ui[i]->ghns->setIcon(KIcon("get-hot-new-stuff")); ui[i]->ghns->setIcon(KIcon("get-hot-new-stuff"));
// TODO: remove once the category has been created.
ui[i]->ghns->setVisible(false);
connect(ui[i]->highlightWindowCheck, SIGNAL(clicked(bool)), SLOT(changed())); connect(ui[i]->highlightWindowCheck, SIGNAL(clicked(bool)), SLOT(changed()));
connect(ui[i]->showOutlineCheck, SIGNAL(clicked(bool)), SLOT(changed())); connect(ui[i]->showOutlineCheck, SIGNAL(clicked(bool)), SLOT(changed()));
connect(ui[i]->showTabBox, SIGNAL(clicked(bool)), SLOT(tabBoxToggled(bool))); connect(ui[i]->showTabBox, SIGNAL(clicked(bool)), SLOT(tabBoxToggled(bool)));