anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GuiPrefs.{cpp,h}: use text/data interface for icon set ui.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38049 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jürgen Spitzmüller 2011-03-25 15:14:52 +00:00
parent 7a9250df6a
commit 6e03eb57fa
2 changed files with 6 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/frontends/qt4/GuiPrefs.cpp
View File

@ -2443,23 +2443,16 @@ PrefUserInterface::PrefUserInterface(GuiPreferences * form)
this, SIGNAL(changed()));
lastfilesSB->setMaximum(maxlastfiles);
icon_names_.clear();
icon_names_.push_back(make_pair("default", qt_("Default")));
icon_names_.push_back(make_pair("liber", qt_("Liber")));
icon_names_.push_back(make_pair("oxygen", qt_("Oxygen")));
iconSetCO->addItem(icon_names_[0].second);
iconSetCO->addItem(icon_names_[1].second);
iconSetCO->addItem(icon_names_[2].second);
iconSetCO->addItem(qt_("Default"), "default");
iconSetCO->addItem(qt_("Liber"), "liber");
iconSetCO->addItem(qt_("Oxygen"), "oxygen");
}
void PrefUserInterface::apply(LyXRC & rc) const
{
int const iconset = iconSetCO->currentIndex();
if (iconset > 0)
rc.icon_set = icon_names_[iconset].first;
else
rc.icon_set.clear();
rc.icon_set = fromqstr(iconSetCO->itemData(
iconSetCO->currentIndex()).toString());
rc.ui_file = internal_path(fromqstr(uiFileED->text()));
rc.use_lastfilepos = restoreCursorCB->isChecked();
@ -2481,14 +2474,7 @@ void PrefUserInterface::apply(LyXRC & rc) const
void PrefUserInterface::update(LyXRC const & rc)
{
int iconset = 0;
if (!rc.icon_set.empty()) {
for ( ; iconset < int(icon_names_.size()); ++iconset) {
if (rc.icon_set == icon_names_[iconset].first)
break;
}
}
iconset = iconSetCO->findText(icon_names_[iconset].second);
int iconset = iconSetCO->findData(toqstr(rc.icon_set));
if (iconset < 0)
iconset = 0;
iconSetCO->setCurrentIndex(iconset);

5
src/frontends/qt4/GuiPrefs.h
View File

@ -46,7 +46,6 @@
#include "ui_ShortcutUi.h"
#include <string>
#include <utility>
#include <vector>
@ -427,10 +426,6 @@ public:
public Q_SLOTS:
void selectUi();
void on_clearSessionPB_clicked();
private:
/// icon names and their translations
std::vector<std::pair<std::string, QString> > icon_names_;
};