Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-11 16:13:05 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added new setting for the position and the margin of the toaster.

Browse source 
Cleaned translation of the toaster GUI.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3906 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2010-12-10 21:49:38 +00:00
parent 4b16ffcc83
commit 3ecb987a4e
11 changed files with 497 additions and 352 deletions
retroshare-gui/src/gui/settings
NotifyPage.cpp

31
retroshare-gui/src/gui/settings/NotifyPage.cpp
View file

@ -118,6 +118,13 @@ NotifyPage::save(QString &errmsg)
Settings->setAddFeedsAtEnd(ui.addFeedsAtEnd->isChecked());
int index = ui.comboBoxToasterPosition->currentIndex();
if (index != -1) {
Settings->setToasterPosition((RshareSettings::enumToasterPosition) ui.comboBoxToasterPosition->itemData(index).toInt());
}
Settings->setToasterMargin(QPoint(ui.spinBoxToasterXMargin->value(), ui.spinBoxToasterYMargin->value()));
load();
return true;
}
@ -158,8 +165,30 @@ void NotifyPage::load()
ui.trayNotify_CombinedIcon->setChecked(traynotifyflags & TRAYNOTIFY_COMBINEDICON);
ui.addFeedsAtEnd->setChecked(Settings->getAddFeedsAtEnd());
}
RshareSettings::enumToasterPosition toasterPosition = Settings->getToasterPosition();
ui.comboBoxToasterPosition->clear();
QMap<int, QString> toasterPositions;
toasterPositions[RshareSettings::TOASTERPOS_TOPLEFT] = tr("Top Left");
toasterPositions[RshareSettings::TOASTERPOS_TOPRIGHT] = tr("Top Right");
toasterPositions[RshareSettings::TOASTERPOS_BOTTOMLEFT] = tr("Bottom Left");
toasterPositions[RshareSettings::TOASTERPOS_BOTTOMRIGHT] = tr("Bottom Right");
QMap<int, QString>::iterator it;
int index = 0;
for (it = toasterPositions.begin(); it != toasterPositions.end(); it++, index++) {
ui.comboBoxToasterPosition->addItem(it.value(), it.key());
if (it.key() == toasterPosition) {
ui.comboBoxToasterPosition->setCurrentIndex(index);
}
}
QPoint margin = Settings->getToasterMargin();
ui.spinBoxToasterXMargin->setValue(margin.x());
ui.spinBoxToasterYMargin->setValue(margin.y());
}
/** Loads the settings for this page */
void NotifyPage::updateStatus()