vitalif
/
kwin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Some code cleanup and style fixing 

svn path=/trunk/KDE/kdebase/workspace/; revision=961920
icc-effect-5.14.5
Darío Andrés Rodríguez 2009-05-01 03:03:54 +00:00
parent e4a80093b3
commit 07ada33d96
2 changed files with 127 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

218
kcmkwin/kwinrules/ruleslist.cpp
View File

@ -29,173 +29,165 @@
namespace KWin namespace KWin
{ {
KCMRulesList::KCMRulesList( QWidget* parent) KCMRulesList::KCMRulesList(QWidget* parent)
: QWidget( parent) : QWidget(parent)
{ {
setupUi( this ); setupUi(this);
// connect both current/selected, so that current==selected (stupid QListBox :( ) connect(rules_listbox, SIGNAL(itemChanged(QListWidgetItem*)), SLOT(activeChanged()));
connect( rules_listbox, SIGNAL(itemChanged(QListWidgetItem*)), connect(rules_listbox, SIGNAL(itemSelectionChanged()), SLOT(activeChanged()));
SLOT(activeChanged())); connect(new_button, SIGNAL(clicked()), SLOT(newClicked()));
connect( rules_listbox, SIGNAL(itemSelectionChanged()), connect(modify_button, SIGNAL(clicked()), SLOT(modifyClicked()));
SLOT( activeChanged())); connect(delete_button, SIGNAL(clicked()), SLOT(deleteClicked()));
connect( new_button, SIGNAL( clicked()), connect(moveup_button, SIGNAL(clicked()), SLOT(moveUpClicked()));
SLOT( newClicked())); connect(movedown_button, SIGNAL(clicked()), SLOT(moveDownClicked()));
connect( modify_button, SIGNAL( clicked()), connect(rules_listbox, SIGNAL(itemDoubleClicked(QListWidgetItem*)), SLOT(modifyClicked()));
SLOT( modifyClicked()));
connect( delete_button, SIGNAL( clicked()),
SLOT( deleteClicked()));
connect( moveup_button, SIGNAL( clicked()),
SLOT( moveupClicked()));
connect( movedown_button, SIGNAL( clicked()),
SLOT( movedownClicked()));
connect( rules_listbox, SIGNAL(itemDoubleClicked(QListWidgetItem*) ),
SLOT( modifyClicked()));
load(); load();
} }
KCMRulesList::~KCMRulesList() KCMRulesList::~KCMRulesList()
{ {
for( QVector< Rules* >::Iterator it = rules.begin(); for (QVector< Rules* >::Iterator it = rules.begin();
it != rules.end(); it != rules.end();
++it ) ++it)
delete *it; delete *it;
rules.clear(); rules.clear();
} }
void KCMRulesList::activeChanged() void KCMRulesList::activeChanged()
{ {
QListWidgetItem *item = rules_listbox->currentItem(); QListWidgetItem *item = rules_listbox->currentItem();
int itemRow = rules_listbox->row(item); int itemRow = rules_listbox->row(item);
if( item != NULL ) // make current==selected if (item != NULL) {
rules_listbox->setCurrentItem( item, QItemSelectionModel::ClearAndSelect ); rules_listbox->setCurrentItem(item, QItemSelectionModel::ClearAndSelect);
modify_button->setEnabled( item != NULL );
delete_button->setEnabled( item != NULL );
moveup_button->setEnabled( item != NULL && itemRow > 0 );
movedown_button->setEnabled( item != NULL && itemRow < (rules_listbox->count()-1) );
} }
modify_button->setEnabled(item != NULL);
delete_button->setEnabled(item != NULL);
moveup_button->setEnabled(item != NULL && itemRow > 0);
movedown_button->setEnabled(item != NULL && itemRow < (rules_listbox->count() - 1));
}
void KCMRulesList::newClicked() void KCMRulesList::newClicked()
{ {
RulesDialog dlg(this); RulesDialog dlg(this);
Rules* rule = dlg.edit( NULL, 0, false ); Rules* rule = dlg.edit(NULL, 0, false);
if( rule == NULL ) if (rule == NULL) {
return; return;
int pos = rules_listbox->currentRow() + 1;
rules_listbox->insertItem( pos , rule->description );
rules_listbox->setCurrentRow( pos, QItemSelectionModel::ClearAndSelect );
rules.insert( rules.begin() + pos, rule );
emit changed( true );
} }
int pos = rules_listbox->currentRow() + 1;
rules_listbox->insertItem(pos , rule->description);
rules_listbox->setCurrentRow(pos, QItemSelectionModel::ClearAndSelect);
rules.insert(rules.begin() + pos, rule);
emit changed(true);
}
void KCMRulesList::modifyClicked() void KCMRulesList::modifyClicked()
{ {
int pos = rules_listbox->currentRow(); int pos = rules_listbox->currentRow();
if ( pos == -1 ) if (pos == -1) {
return; return;
}
RulesDialog dlg(this); RulesDialog dlg(this);
Rules* rule = dlg.edit( rules[ pos ], 0, false ); Rules* rule = dlg.edit(rules[ pos ], 0, false);
if( rule == rules[ pos ] ) if (rule == rules[ pos ]) {
return; return;
}
delete rules[ pos ]; delete rules[ pos ];
rules[ pos ] = rule; rules[ pos ] = rule;
rules_listbox->item(pos)->setText( rule->description ); rules_listbox->item(pos)->setText(rule->description);
emit changed( true ); emit changed(true);
} }
void KCMRulesList::deleteClicked() void KCMRulesList::deleteClicked()
{ {
int pos = rules_listbox->currentRow(); int pos = rules_listbox->currentRow();
assert( pos != -1 ); assert(pos != -1);
delete rules_listbox->takeItem( pos ); delete rules_listbox->takeItem(pos);
rules.erase( rules.begin() + pos ); rules.erase(rules.begin() + pos);
emit changed( true ); emit changed(true);
} }
void KCMRulesList::moveupClicked() void KCMRulesList::moveUpClicked()
{ {
int pos = rules_listbox->currentRow(); int pos = rules_listbox->currentRow();
assert( pos != -1 ); assert(pos != -1);
if( pos > 0 ) if (pos > 0) {
{ QListWidgetItem * item = rules_listbox->takeItem(pos);
QListWidgetItem * item = rules_listbox->takeItem( pos ); rules_listbox->insertItem(pos - 1 , item);
rules_listbox->insertItem( pos - 1 , item ); rules_listbox->setCurrentItem(item, QItemSelectionModel::ClearAndSelect);
rules_listbox->setCurrentItem( item, QItemSelectionModel::ClearAndSelect );
Rules* rule = rules[ pos ]; Rules* rule = rules[ pos ];
rules[ pos ] = rules[ pos - 1 ]; rules[ pos ] = rules[ pos - 1 ];
rules[ pos - 1 ] = rule; rules[ pos - 1 ] = rule;
}
emit changed( true );
} }
emit changed(true);
}
void KCMRulesList::movedownClicked() void KCMRulesList::moveDownClicked()
{ {
int pos = rules_listbox->currentRow(); int pos = rules_listbox->currentRow();
assert( pos != -1 ); assert(pos != -1);
if( pos < int( rules_listbox->count()) - 1 ) if (pos < int(rules_listbox->count()) - 1) {
{ QListWidgetItem * item = rules_listbox->takeItem(pos);
QListWidgetItem * item = rules_listbox->takeItem( pos ); rules_listbox->insertItem(pos + 1 , item);
rules_listbox->insertItem( pos + 1 , item ); rules_listbox->setCurrentItem(item, QItemSelectionModel::ClearAndSelect);
rules_listbox->setCurrentItem( item, QItemSelectionModel::ClearAndSelect );
Rules* rule = rules[ pos ]; Rules* rule = rules[ pos ];
rules[ pos ] = rules[ pos + 1 ]; rules[ pos ] = rules[ pos + 1 ];
rules[ pos + 1 ] = rule; rules[ pos + 1 ] = rule;
}
emit changed( true );
} }
emit changed(true);
}
void KCMRulesList::load() void KCMRulesList::load()
{ {
rules_listbox->clear(); rules_listbox->clear();
for( QVector< Rules* >::Iterator it = rules.begin(); for (QVector< Rules* >::Iterator it = rules.begin();
it != rules.end(); it != rules.end();
++it ) ++it)
delete *it; delete *it;
rules.clear(); rules.clear();
KConfig _cfg( "kwinrulesrc" ); KConfig _cfg("kwinrulesrc");
KConfigGroup cfg(&_cfg, "General" ); KConfigGroup cfg(&_cfg, "General");
int count = cfg.readEntry( "count",0 ); int count = cfg.readEntry("count", 0);
rules.reserve( count ); rules.reserve(count);
for( int i = 1; for (int i = 1;
i <= count; i <= count;
++i ) ++i) {
{ cfg = KConfigGroup(&_cfg, QString::number(i));
cfg = KConfigGroup(&_cfg,QString::number( i )); Rules* rule = new Rules(cfg);
Rules* rule = new Rules( cfg ); rules.append(rule);
rules.append( rule ); rules_listbox->addItem(rule->description);
rules_listbox->addItem( rule->description );
}
if( rules.count() > 0 )
rules_listbox->setCurrentItem( rules_listbox->item( 0 ));
else
rules_listbox->setCurrentItem( NULL );
activeChanged();
} }
if (rules.count() > 0) {
rules_listbox->setCurrentItem(rules_listbox->item(0), QItemSelectionModel::ClearAndSelect);
} else {
rules_listbox->setCurrentItem(NULL);
}
activeChanged();
}
void KCMRulesList::save() void KCMRulesList::save()
{ {
KConfig cfg( QLatin1String("kwinrulesrc") ); KConfig cfg(QLatin1String("kwinrulesrc"));
QStringList groups = cfg.groupList(); QStringList groups = cfg.groupList();
for( QStringList::ConstIterator it = groups.constBegin(); for (QStringList::ConstIterator it = groups.constBegin();
it != groups.constEnd(); it != groups.constEnd();
++it ) ++it)
cfg.deleteGroup( *it ); cfg.deleteGroup(*it);
cfg.group("General").writeEntry( "count", rules.count()); cfg.group("General").writeEntry("count", rules.count());
int i = 1; int i = 1;
for( QVector< Rules* >::ConstIterator it = rules.constBegin(); for (QVector< Rules* >::ConstIterator it = rules.constBegin();
it != rules.constEnd(); it != rules.constEnd();
++it ) ++it) {
{ KConfigGroup cg(&cfg, QString::number(i));
KConfigGroup cg( &cfg, QString::number( i )); (*it)->write(cg);
(*it)->write( cg );
++i; ++i;
}
} }
}
void KCMRulesList::defaults() void KCMRulesList::defaults()
{ {
load(); load();
} }
} // namespace } // namespace

44
kcmkwin/kwinrules/ruleslist.h
View File

@ -17,8 +17,8 @@
*/ */
#ifndef __RULESLIST_H__ #ifndef RULESLIST__H
#define __RULESLIST_H__ #define RULESLIST__H
#include "../../rules.h" #include "../../rules.h"
@ -28,27 +28,27 @@ namespace KWin
{ {
class KCMRulesList class KCMRulesList
: public QWidget, Ui_KCMRulesList : public QWidget, Ui_KCMRulesList
{ {
Q_OBJECT Q_OBJECT
public: public:
KCMRulesList( QWidget* parent = NULL ); KCMRulesList(QWidget* parent = NULL);
virtual ~KCMRulesList(); virtual ~KCMRulesList();
void load(); void load();
void save(); void save();
void defaults(); void defaults();
signals: Q_SIGNALS:
void changed( bool ); void changed(bool);
private slots: private Q_SLOTS:
void newClicked(); void newClicked();
void modifyClicked(); void modifyClicked();
void deleteClicked(); void deleteClicked();
void moveupClicked(); void moveUpClicked();
void movedownClicked(); void moveDownClicked();
void activeChanged(); void activeChanged();
private: private:
QVector< Rules* > rules; QVector< Rules* > rules;
}; };
} // namespace } // namespace