← Back to branch summary

~l3on/ubuntu/precise/rkward/rebuild1

« back to all changes in this revision

Viewing changes to rkward/settings/rksettingsmoduler.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Thomas Friedrichsmeier
  • Date: 2009-10-26 14:30:00 UTC
  • mfrom: (1.1.13 upstream) (6.1.4 sid)
  • Revision ID: james.westby@ubuntu.com-20091026143000-wzwt6cryjnwce23k
Tags: 0.5.2-1
http://bugs.debian.org/551306
* new upstream release
  closes: #551306 (added support for the new dynamic help system)
* Add "DM-Upload-Allowed: yes" in control
* bump standards version to 3.8.3 (no changes needed)

Show diffs side-by-side

added added

removed removed

Lines of Context:
rkward/settings/rksettingsmoduler.cpp
51
51
QString RKSettingsModuleR::options_pager;
52
52
// static constants
53
53
QString RKSettingsModuleR::builtin_editor = "<rkward>";
 
54
// session constants
 
55
QString RKSettingsModuleR::help_base_url;
54
56
 
55
57
RKSettingsModuleR::RKSettingsModuleR (RKSettings *gui, QWidget *parent) : RKSettingsModule(gui, parent) {
56
58
        RK_TRACE (SETTINGS);
257
259
        list.append ("options (device=\"rk.screen.device\")\n");
258
260
        // register as interactive
259
261
        list.append ("try (deviceIsInteractive(name=\"rk.screen.device\"))\n");
260
 
        list.append ("options (htmlhelp=TRUE); options (chmhelp=FALSE)\n");
 
262
        list.append ("options (help_type=\"html\")\n");         // for R 2.10.0 and above
 
263
        list.append ("options (htmlhelp=TRUE); options (chmhelp=FALSE)\n");     // COMPAT: for R 2.9.x and below
261
264
        list.append ("options (browser=rk.show.html)\n");
262
265
 
263
266
        return list;
316
319
QStringList RKSettingsModuleRPackages::defaultliblocs;
317
320
bool RKSettingsModuleRPackages::archive_packages;
318
321
QStringList RKSettingsModuleRPackages::package_repositories;
 
322
QString RKSettingsModuleRPackages::essential_packages = QString ("base\nmethods\nutils\ngrDevices\ngraphics\nrkward");
319
323
 
320
324
RKSettingsModuleRPackages::RKSettingsModuleRPackages (RKSettings *gui, QWidget *parent) : RKSettingsModule(gui, parent) {
321
325
        RK_TRACE (SETTINGS);