← Back to branch summary

~l3on/ubuntu/precise/rkward/rebuild1

« back to all changes in this revision

Viewing changes to rkward/windows/rkworkplace.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/windows/rkworkplace.cpp
39
39
#include "../dataeditor/rkeditor.h"
40
40
#include "../dataeditor/rkeditordataframe.h"
41
41
#include "../robjectviewer.h"
42
 
#include "../settings/rksettingsmoduleoutput.h"
43
42
#include "../settings/rksettingsmodulegeneral.h"
44
43
#include "../rbackend/rinterface.h"
45
44
#include "../windows/rkwindowcatcher.h"
274
273
void RKWorkplace::openOutputWindow (const KUrl &url) {
275
274
        RK_TRACE (APP);
276
275
 
277
 
        RKHTMLWindow::refreshOutput (true, true);
278
 
        if (!windows.contains (RKHTMLWindow::getCurrentOutput ())) {
279
 
                addWindow (RKHTMLWindow::getCurrentOutput ());
280
 
        }
281
 
}
282
 
 
283
 
void RKWorkplace::refreshOutputWindow () {
284
 
        RK_TRACE (APP);
285
 
        RKHTMLWindow *window = RKHTMLWindow::refreshOutput (RKSettingsModuleOutput::autoShow (), RKSettingsModuleOutput::autoRaise ());
286
 
        if (window) {
287
 
                if (!windows.contains (window)) {
288
 
                        addWindow (window);
289
 
                }
 
276
        RKHTMLWindow *w = RKOutputWindowManager::self ()->getCurrentOutputWindow ();
 
277
        if (!windows.contains (w)) {
 
278
                addWindow (w);
 
279
        } else {
 
280
                w->activate ();
290
281
        }
291
282
}
292
283