Differential D16689 Diff 44922 krusader/KViewer/panelviewer.cpp

Changeset View

Standalone View

View Options

krusader/KViewer/panelviewer.cpp

Show First 20 Lines • Show All 100 Lines • ▼ Show 20 Line(s)100{
101 closeUrl(); 101​ closeUrl();
102 curl = url; 102​ curl = url;
103 emit urlChanged(this, url); 103​ emit urlChanged(this, url);
104 104​
105 if (url.isLocalFile()) 105​ if (url.isLocalFile())
106 openFile(KFileItem(url)); 106​ openFile(KFileItem(url));
107 else { 107​ else {
108 KIO::StatJob* statJob = KIO::stat(url, KIO::HideProgressInfo); 108​ KIO::StatJob* statJob = KIO::stat(url, KIO::HideProgressInfo);
109 connect(statJob, SIGNAL(result(KJob*)), this, SLOT(slotStatResult(KJob*))); 109​ connect(statJob, &KIO::StatJob::result, this, &PanelViewerBase::slotStatResult);
110 } 110​ }
111} 111​}
112 112​
113 113​
114/* ----==={ PanelViewer }===---- */ 114​/* ----==={ PanelViewer }===---- */
115 115​
116PanelViewer::PanelViewer(QWidget *parent, KrViewer::Mode mode) : 116​PanelViewer::PanelViewer(QWidget *parent, KrViewer::Mode mode) :
117 PanelViewerBase(parent, mode) 117​ PanelViewerBase(parent, mode)
▲ Show 20 Lines • Show All 129 Lines • ▼ Show 20 Line(s)245 if(cpart) {
247 setCurrentWidget(cpart->widget()); 247​ setCurrentWidget(cpart->widget());
248 248​
249 if (cpart->inherits("KParts::ReadWritePart")) 249​ if (cpart->inherits("KParts::ReadWritePart"))
250 static_cast<KParts::ReadWritePart*>(cpart.data())->setReadWrite(false); 250​ static_cast<KParts::ReadWritePart*>(cpart.data())->setReadWrite(false);
251 KParts::OpenUrlArguments args; 251​ KParts::OpenUrlArguments args;
252 args.setReload(true); 252​ args.setReload(true);
253 cpart->setArguments(args); 253​ cpart->setArguments(args);
254 if (cpart->openUrl(curl)) { 254​ if (cpart->openUrl(curl)) {
255 connect(cpart, SIGNAL(destroyed()), this, SLOT(slotCPartDestroyed())); 255​ connect(cpart.data(), &KParts::ReadOnlyPart::destroyed, this, &PanelViewer::slotCPartDestroyed);
256 emit openUrlFinished(this, true); 256​ emit openUrlFinished(this, true);
257 return; 257​ return;
258 } 258​ }
259 } 259​ }
260 260​
261 setCurrentWidget(fallback); 261​ setCurrentWidget(fallback);
262 emit openUrlFinished(this, false); 262​ emit openUrlFinished(this, false);
263} 263​}
Show All 19 Lines282 if (argsProp.isValid())
283 args << argsProp; 283​ args << argsProp;
284 QVariant prop = ptr->property("X-KDE-BrowserView-AllowAsDefault"); 284​ QVariant prop = ptr->property("X-KDE-BrowserView-AllowAsDefault");
285 if (!prop.isValid() || prop.toBool()) // defaults to true 285​ if (!prop.isValid() || prop.toBool()) // defaults to true
286 part = ptr->createInstance<KParts::ReadOnlyPart>(this, this, args); 286​ part = ptr->createInstance<KParts::ReadOnlyPart>(this, this, args);
287 } 287​ }
288 if (part) { 288​ if (part) {
289 KParts::BrowserExtension * ext = KParts::BrowserExtension::childObject(part); 289​ KParts::BrowserExtension * ext = KParts::BrowserExtension::childObject(part);
290 if (ext) { 290​ if (ext) {
291 connect(ext, SIGNAL(openUrlRequestDelayed(QUrl,KParts::OpenUrlArguments,KParts::BrowserArguments)), this, SLOT(openUrl(QUrl))); 291​ connect(ext, &KParts::BrowserExtension::openUrlRequestDelayed, this, &PanelViewer::openUrl);
292 connect(ext, SIGNAL(openUrlRequestDelayed(QUrl,KParts::OpenUrlArguments,KParts::BrowserArguments)), this, SIGNAL(openUrlRequest(QUrl))); 292​ connect(ext, &KParts::BrowserExtension::openUrlRequestDelayed, this, &PanelViewer::openUrlRequest);
293 } 293​ }
294 } 294​ }
295 return part; 295​ return part;
296} 296​}
297 297​
298 298​
299/* ----==={ PanelEditor }===---- */ 299​/* ----==={ PanelEditor }===---- */
300 300​
▲ Show 20 Lines • Show All 56 Lines • ▼ Show 20 Line(s)331{
357 if (cpart) { 357​ if (cpart) {
358 addWidget(cpart->widget()); 358​ addWidget(cpart->widget());
359 setCurrentWidget(cpart->widget()); 359​ setCurrentWidget(cpart->widget());
360 360​
361 KParts::OpenUrlArguments args; 361​ KParts::OpenUrlArguments args;
362 args.setReload(true); 362​ args.setReload(true);
363 cpart->setArguments(args); 363​ cpart->setArguments(args);
364 if (cpart->openUrl(curl)) { 364​ if (cpart->openUrl(curl)) {
365 connect(cpart, SIGNAL(destroyed()), this, SLOT(slotCPartDestroyed())); 365​ connect(cpart.data(), &KParts::ReadOnlyPart::destroyed, this, &PanelEditor::slotCPartDestroyed);
366 emit openUrlFinished(this, true); 366​ emit openUrlFinished(this, true);
367 return; 367​ return;
368 } // else: don't show error message - assume this has been done by the editor part 368​ } // else: don't show error message - assume this has been done by the editor part
369 } else 369​ } else
370 KMessageBox::sorry(this, missingKPartMsg(), i18n("Cannot edit %1", curl.toDisplayString(QUrl::PreferLocalFile)), 370​ KMessageBox::sorry(this, missingKPartMsg(), i18n("Cannot edit %1", curl.toDisplayString(QUrl::PreferLocalFile)),
371 KMessageBox::AllowLink); 371​ KMessageBox::AllowLink);
372 372​
373 setCurrentWidget(fallback); 373​ setCurrentWidget(fallback);
Show All 28 Lines401 if (argsProp.isValid())
402 args << argsProp; 402​ args << argsProp;
403 QVariant prop = ptr->property("X-KDE-BrowserView-AllowAsDefault"); 403​ QVariant prop = ptr->property("X-KDE-BrowserView-AllowAsDefault");
404 if (!prop.isValid() || prop.toBool()) // defaults to true 404​ if (!prop.isValid() || prop.toBool()) // defaults to true
405 part = ptr->createInstance<KParts::ReadWritePart>(this, this, args); 405​ part = ptr->createInstance<KParts::ReadWritePart>(this, this, args);
406 } 406​ }
407 if (part) { 407​ if (part) {
408 KParts::BrowserExtension * ext = KParts::BrowserExtension::childObject(part); 408​ KParts::BrowserExtension * ext = KParts::BrowserExtension::childObject(part);
409 if (ext) { 409​ if (ext) {
410 connect(ext, SIGNAL(openUrlRequestDelayed(QUrl,KParts::OpenUrlArguments,KParts::BrowserArguments)), this, SLOT(openUrl(QUrl))); 410​ connect(ext, &KParts::BrowserExtension::openUrlRequestDelayed, this, &PanelEditor::openUrl);
411 connect(ext, SIGNAL(openUrlRequestDelayed(QUrl,KParts::OpenUrlArguments,KParts::BrowserArguments)), this, SIGNAL(openUrlRequest(QUrl))); 411​ connect(ext, &KParts::BrowserExtension::openUrlRequestDelayed, this, &PanelEditor::openUrlRequest);
412 } 412​ }
413 } 413​ }
414 return part; 414​ return part;
415} 415​}
416 416​
417bool PanelEditor::isModified() 417​bool PanelEditor::isModified()
418{ 418​{
419 if (cpart) 419​ if (cpart)
420 return static_cast<KParts::ReadWritePart *>((KParts::ReadOnlyPart *)cpart)->isModified(); 420​ return static_cast<KParts::ReadWritePart *>((KParts::ReadOnlyPart *)cpart)->isModified();
421 else 421​ else
422 return false; 422​ return false;
423} 423​}
424 424​