← Back to branch summary

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

« back to all changes in this revision

Viewing changes to fbreader/src/optionsDialog/OptionsDialog.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/OptionsDialog.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
24
22
#include <ZLPaintContext.h>
25
23
#include <ZLChineseBreakingAlgorithm.h>
26
24
#include <ZLLanguageList.h>
 
25
#include <ZLEncodingConverter.h>
27
26
 
28
27
#include <optionEntries/ZLToggleBooleanOptionEntry.h>
29
28
#include <optionEntries/ZLColorOptionBuilder.h>
169
168
        EncodingSetEntry *encodingSetEntry = new EncodingSetEntry(*encodingEntry);
170
169
        encodingTab.addOption(ZLResourceKey("defaultEncodingSet"), encodingSetEntry);
171
170
        encodingTab.addOption(ZLResourceKey("defaultEncoding"), encodingEntry);
 
171
        encodingTab.addOption(ZLResourceKey("useWindows1252Hack"), new ZLSimpleBooleanOptionEntry(ZLEncodingCollection::useWindows1252HackOption()));
172
172
        encodingTab.addOption(ZLResourceKey("chineseBreakAtAnyPosition"), new ZLSimpleBooleanOptionEntry(ZLChineseBreakingAlgorithm::instance().AnyPositionBreakingOption));
173
173
 
174
174
        myScrollingPage = new ScrollingOptionsPage(myDialog->createTab(ZLResourceKey("Scrolling")), fbreader);
175
175
 
 
176
        ZLDialogContent &selectionTab = myDialog->createTab(ZLResourceKey("Selection"));
 
177
        selectionTab.addOption(ZLResourceKey("enableSelection"), FBView::selectionOption());
 
178
 
176
179
        ZLDialogContent &marginTab = myDialog->createTab(ZLResourceKey("Margins"));
177
180
        FBMargins &margins = FBView::margins();
178
181
        marginTab.addOptions(
223
226
        createIntegrationTab(fbreader.dictionaryCollection(), ZLResourceKey("Dictionary"), additional);
224
227
        additional.clear();
225
228
        createIntegrationTab(fbreader.webBrowserCollection(), ZLResourceKey("Web"), additional);
 
229
 
 
230
        myDialog->createPlatformDependentTabs();
226
231
}
227
232
 
228
233
void OptionsDialog::storeTemporaryOption(ZLOption *option) {