Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-12-13 07:38:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

reworked settings

Browse source 
now there is only one global object for loading and saving settings

RshareSettings *Settings;

the class RSettings can be used too, but it is not prefered, because the default settings has no affect

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2964 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2010-05-20 21:53:27 +00:00
parent e68e6b54ef
commit 6baf56285b
39 changed files with 336 additions and 390 deletions
Download patch file Download diff file Expand all files Collapse all files

22
retroshare-gui/src/gui/settings/FileAssociationsPage.cpp
View file

@ -166,12 +166,8 @@ FileAssociationsPage::save (QString &errmsg)
void
FileAssociationsPage::load()
{
RshareSettings settings;
// QSettings* settings = new QSettings( qApp->applicationDirPath()+"/sett.ini",
// QSettings::IniFormat);
//
// settings.beginGroup("FileAssotiations");
QStringList keys = settings.allKeys();
// Settings->beginGroup("FileAssotiations");
QStringList keys = Settings->allKeys();
table->setRowCount( keys.count() );
@ -179,7 +175,7 @@ FileAssociationsPage::load()
QStringList::const_iterator ki;
for(ki=keys.constBegin(); ki!=keys.constEnd(); ki++)
{
QString val = (settings.value(*ki, "")).toString();
QString val = (Settings->value(*ki, "")).toString();
addNewItemToTable( rowi, 0, *ki );
addNewItemToTable( rowi, 1, val );
@ -187,7 +183,6 @@ FileAssociationsPage::load()
rowi++;
}
//delete settings;
if (keys.count()==0)
{
removeAction->setEnabled(false);
@ -206,8 +201,7 @@ FileAssociationsPage::remove()
QTableWidgetItem const * titem = table->item( currentRow,0);
QString key = (titem->data(QTableWidgetItem::Type)).toString();
RshareSettings settings;
settings.remove(key);
Settings->remove(key);
table->removeRow( currentRow );
if ( table->rowCount()==0 )
@ -235,8 +229,7 @@ FileAssociationsPage::addnew()
QString currCmd = afad.resultCommand() ;
RshareSettings settings;
if ( !settings.contains(currType) )//new item should be added only if
if ( !Settings->contains(currType) )//new item should be added only if
{ // it wasn't entered before.
int nridx = table->rowCount();//new row index
table->setRowCount(nridx+1);
@ -257,7 +250,7 @@ FileAssociationsPage::addnew()
}
}
settings.setValue(currType, currCmd);
Settings->setValue(currType, currCmd);
removeAction->setEnabled(true);
editAction->setEnabled(true);
@ -290,8 +283,7 @@ FileAssociationsPage::edit()
titem->setData(QTableWidgetItem::Type, currCmd);
RshareSettings settings;
settings.setValue(currType, currCmd);
Settings->setValue(currType, currCmd);
}
}