← Back to branch summary

~ubuntu-branches/ubuntu/vivid/fbreader/vivid-proposed

« back to all changes in this revision

Viewing changes to fbreader/src/optionsDialog/IntegrationTab.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Joey Hess
  • Date: 2008-01-23 16:51:07 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20080123165107-5q19etahzd72c33a
Tags: 0.8.12-3
http://bugs.debian.org/462299
* Add libzlui-maemo which allows using fbreader on the maemo platform, on
  Debian. Thanks, Riku Voipio. Closes: #462299
* makefiles/arch/maemo.mk: Don't build with -thumb. (Riku)
* Loosen dependency versions some more, so it only depends on the current
  upstream version or higher, ignoring the Debian revision.
* Use binary:Version instead of deprecated Source-Version.

Show diffs side-by-side

added added

removed removed

Lines of Context:
fbreader/src/optionsDialog/IntegrationTab.cpp
1
1
/*
2
 
 * FBReader -- electronic book reader
3
 
 * Copyright (C) 2004-2007 Nikolay Pultsin <geometer@mawhrin.net>
4
 
 * Copyright (C) 2005 Mikhail Sobolev <mss@mawhrin.net>
 
2
 * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
5
3
 *
6
4
 * This program is free software; you can redistribute it and/or modify
7
5
 * it under the terms of the GNU General Public License as published by
26
24
#include <ZLStringUtil.h>
27
25
 
28
26
#include "OptionsDialog.h"
29
 
#include "../FBOptions.h"
 
27
#include "../options/FBOptions.h"
30
28
 
31
29
#include "../external/ProgramCollection.h"
32
30
 
133
131
                        for (std::vector<std::string>::const_iterator it = programNames.begin(); it != programNames.end(); ++it) {
134
132
                                const std::vector<Program::OptionDescription> &options = collection->program(*it)->options();
135
133
                                for (std::vector<Program::OptionDescription>::const_iterator jt = options.begin(); jt != options.end(); ++jt) {
136
 
                                        ZLStringOption *parameterOption = new ZLStringOption(FBOptions::EXTERNAL_CATEGORY, *it, jt->OptionName, jt->DefaultValue);
 
134
                                        ZLStringOption *parameterOption = new ZLStringOption(FBCategoryKey::EXTERNAL, *it, jt->OptionName, jt->DefaultValue);
137
135
                                        storeTemporaryOption(parameterOption);
138
136
                                        ZLOptionEntry *parameterEntry = new ZLSimpleStringOptionEntry(*parameterOption);
139
137
                                        if (programChoiceEntry != 0) {