Changeset View
Changeset View
Standalone View
Standalone View
app/viewmainpage.cpp
Show First 20 Lines • Show All 155 Lines • ▼ Show 20 Line(s) | 136 | { | |||
---|---|---|---|---|---|
156 | QCheckBox* mSynchronizeCheckBox; | 156 | QCheckBox* mSynchronizeCheckBox; | ||
157 | 157 | | |||
158 | // Activity Resource events reporting needs to be above KPart, | 158 | // Activity Resource events reporting needs to be above KPart, | ||
159 | // in the shell itself, to avoid problems with other MDI applications | 159 | // in the shell itself, to avoid problems with other MDI applications | ||
160 | // that use this KPart | 160 | // that use this KPart | ||
161 | QHash<DocumentView*, KActivities::ResourceInstance*> mActivityResources; | 161 | QHash<DocumentView*, KActivities::ResourceInstance*> mActivityResources; | ||
162 | 162 | | |||
163 | bool mFullScreenMode; | 163 | bool mFullScreenMode; | ||
164 | bool mCompareMode; | 164 | bool mCompareMode; | ||
165 | bool mThumbnailBarVisibleBeforeFullScreen; | | |||
166 | ZoomMode::Enum mZoomMode; | 165 | ZoomMode::Enum mZoomMode; | ||
rkflx: Still there ;) | |||||
167 | 166 | | |||
168 | void setupThumbnailBar() | 167 | void setupThumbnailBar() | ||
169 | { | 168 | { | ||
170 | mThumbnailBar = new ThumbnailBarView; | 169 | mThumbnailBar = new ThumbnailBarView; | ||
171 | ThumbnailBarItemDelegate* delegate = new ThumbnailBarItemDelegate(mThumbnailBar); | 170 | ThumbnailBarItemDelegate* delegate = new ThumbnailBarItemDelegate(mThumbnailBar); | ||
172 | mThumbnailBar->setItemDelegate(delegate); | 171 | mThumbnailBar->setItemDelegate(delegate); | ||
173 | mThumbnailBar->setVisible(GwenviewConfig::thumbnailBarIsVisible()); | 172 | mThumbnailBar->setVisible(GwenviewConfig::thumbnailBarIsVisible()); | ||
174 | mThumbnailBar->setSelectionMode(QAbstractItemView::ExtendedSelection); | 173 | mThumbnailBar->setSelectionMode(QAbstractItemView::ExtendedSelection); | ||
▲ Show 20 Lines • Show All 222 Lines • ▼ Show 20 Line(s) | |||||
397 | { | 396 | { | ||
398 | d->q = this; | 397 | d->q = this; | ||
399 | d->mDirModelToBarModelProxyMapper = 0; // Initialized later | 398 | d->mDirModelToBarModelProxyMapper = 0; // Initialized later | ||
400 | d->mSlideShow = slideShow; | 399 | d->mSlideShow = slideShow; | ||
401 | d->mActionCollection = actionCollection; | 400 | d->mActionCollection = actionCollection; | ||
402 | d->mGvCore = gvCore; | 401 | d->mGvCore = gvCore; | ||
403 | d->mFullScreenMode = false; | 402 | d->mFullScreenMode = false; | ||
404 | d->mCompareMode = false; | 403 | d->mCompareMode = false; | ||
405 | d->mThumbnailBarVisibleBeforeFullScreen = false; | | |||
406 | 404 | | |||
407 | QShortcut* enterKeyShortcut = new QShortcut(Qt::Key_Return, this); | 405 | QShortcut* enterKeyShortcut = new QShortcut(Qt::Key_Return, this); | ||
408 | connect(enterKeyShortcut, &QShortcut::activated, this, &ViewMainPage::slotEnterPressed); | 406 | connect(enterKeyShortcut, &QShortcut::activated, this, &ViewMainPage::slotEnterPressed); | ||
409 | QShortcut* escapeKeyShortcut = new QShortcut(Qt::Key_Escape, this); | 407 | QShortcut* escapeKeyShortcut = new QShortcut(Qt::Key_Escape, this); | ||
410 | connect(escapeKeyShortcut, &QShortcut::activated, this, &ViewMainPage::slotEscapePressed); | 408 | connect(escapeKeyShortcut, &QShortcut::activated, this, &ViewMainPage::slotEscapePressed); | ||
411 | 409 | | |||
412 | d->setupToolContainer(); | 410 | d->setupToolContainer(); | ||
413 | d->setupStatusBar(); | 411 | d->setupStatusBar(); | ||
414 | 412 | | |||
415 | d->setupAdapterContainer(); | 413 | d->setupAdapterContainer(); | ||
416 | 414 | | |||
417 | d->setupThumbnailBar(); | 415 | d->setupThumbnailBar(); | ||
418 | 416 | | |||
419 | d->setupSplitter(); | 417 | d->setupSplitter(); | ||
420 | 418 | | |||
421 | d->setupDocumentViewController(); | 419 | d->setupDocumentViewController(); | ||
422 | 420 | | |||
423 | KActionCategory* view = new KActionCategory(i18nc("@title actions category - means actions changing smth in interface", "View"), actionCollection); | 421 | KActionCategory* view = new KActionCategory(i18nc("@title actions category - means actions changing smth in interface", "View"), actionCollection); | ||
424 | 422 | | |||
425 | d->mToggleThumbnailBarAction = view->add<KToggleAction>(QString("toggle_thumbnailbar")); | 423 | d->mToggleThumbnailBarAction = view->add<KToggleAction>(QString("toggle_thumbnailbar")); | ||
426 | d->mToggleThumbnailBarAction->setText(i18n("Thumbnail Bar")); | 424 | d->mToggleThumbnailBarAction->setText(i18n("Thumbnail Bar")); | ||
427 | d->mToggleThumbnailBarAction->setIcon(QIcon::fromTheme("folder-image")); | 425 | d->mToggleThumbnailBarAction->setIcon(QIcon::fromTheme("folder-image")); | ||
428 | actionCollection->setDefaultShortcut(d->mToggleThumbnailBarAction, Qt::CTRL + Qt::Key_B); | 426 | actionCollection->setDefaultShortcut(d->mToggleThumbnailBarAction, Qt::CTRL + Qt::Key_B); | ||
429 | d->mToggleThumbnailBarAction->setChecked(GwenviewConfig::thumbnailBarIsVisible()); | | |||
430 | connect(d->mToggleThumbnailBarAction, &KToggleAction::triggered, this, &ViewMainPage::setThumbnailBarVisibility); | 427 | connect(d->mToggleThumbnailBarAction, &KToggleAction::triggered, this, &ViewMainPage::setThumbnailBarVisibility); | ||
431 | d->mToggleThumbnailBarButton->setDefaultAction(d->mToggleThumbnailBarAction); | 428 | d->mToggleThumbnailBarButton->setDefaultAction(d->mToggleThumbnailBarAction); | ||
432 | 429 | | |||
433 | d->mSynchronizeAction = view->add<KToggleAction>("synchronize_views"); | 430 | d->mSynchronizeAction = view->add<KToggleAction>("synchronize_views"); | ||
434 | d->mSynchronizeAction->setText(i18n("Synchronize")); | 431 | d->mSynchronizeAction->setText(i18n("Synchronize")); | ||
435 | actionCollection->setDefaultShortcut(d->mSynchronizeAction, Qt::CTRL + Qt::Key_Y); | 432 | actionCollection->setDefaultShortcut(d->mSynchronizeAction, Qt::CTRL + Qt::Key_Y); | ||
436 | connect(d->mSynchronizeAction, SIGNAL(toggled(bool)), | 433 | connect(d->mSynchronizeAction, SIGNAL(toggled(bool)), | ||
437 | d->mSynchronizer, SLOT(setActive(bool))); | 434 | d->mSynchronizer, SLOT(setActive(bool))); | ||
Show All 17 Lines | 448 | { | |||
455 | Q_FOREACH(DocumentView * view, d->mDocumentViews) { | 452 | Q_FOREACH(DocumentView * view, d->mDocumentViews) { | ||
456 | view->loadAdapterConfig(); | 453 | view->loadAdapterConfig(); | ||
457 | } | 454 | } | ||
458 | 455 | | |||
459 | Qt::Orientation orientation = GwenviewConfig::thumbnailBarOrientation(); | 456 | Qt::Orientation orientation = GwenviewConfig::thumbnailBarOrientation(); | ||
460 | d->mThumbnailSplitter->setOrientation(orientation == Qt::Horizontal ? Qt::Vertical : Qt::Horizontal); | 457 | d->mThumbnailSplitter->setOrientation(orientation == Qt::Horizontal ? Qt::Vertical : Qt::Horizontal); | ||
461 | d->mThumbnailBar->setOrientation(orientation); | 458 | d->mThumbnailBar->setOrientation(orientation); | ||
462 | d->setupThumbnailBarStyleSheet(); | 459 | d->setupThumbnailBarStyleSheet(); | ||
460 | d->mThumbnailBar->setVisible(GwenviewConfig::thumbnailBarIsVisible()); | ||||
As far as I can see this is only called on startup and when you close the config dialog, i.e. too seldom ;) rkflx: As far as I can see this is only called on startup and when you close the config dialog, i.e. | |||||
461 | d->mToggleThumbnailBarAction->setChecked(GwenviewConfig::thumbnailBarIsVisible()); | ||||
463 | 462 | | |||
I would just repeat the call to the static, I don't think the temporary bool gains us anything in terms of performance or readability. rkflx: I would just repeat the call to the `static`, I don't think the temporary `bool` gains us… | |||||
464 | int oldRowCount = d->mThumbnailBar->rowCount(); | 463 | int oldRowCount = d->mThumbnailBar->rowCount(); | ||
465 | int newRowCount = GwenviewConfig::thumbnailBarRowCount(); | 464 | int newRowCount = GwenviewConfig::thumbnailBarRowCount(); | ||
466 | if (oldRowCount != newRowCount) { | 465 | if (oldRowCount != newRowCount) { | ||
467 | d->mThumbnailBar->setUpdatesEnabled(false); | 466 | d->mThumbnailBar->setUpdatesEnabled(false); | ||
468 | int gridSize = d->mThumbnailBar->gridSize().width(); | 467 | int gridSize = d->mThumbnailBar->gridSize().width(); | ||
469 | 468 | | |||
470 | d->mThumbnailBar->setRowCount(newRowCount); | 469 | d->mThumbnailBar->setRowCount(newRowCount); | ||
471 | 470 | | |||
Show All 34 Lines | |||||
506 | } | 505 | } | ||
507 | 506 | | |||
508 | void ViewMainPage::setFullScreenMode(bool fullScreenMode) | 507 | void ViewMainPage::setFullScreenMode(bool fullScreenMode) | ||
509 | { | 508 | { | ||
510 | d->mFullScreenMode = fullScreenMode; | 509 | d->mFullScreenMode = fullScreenMode; | ||
511 | d->mStatusBarContainer->setVisible(!fullScreenMode); | 510 | d->mStatusBarContainer->setVisible(!fullScreenMode); | ||
512 | 511 | | |||
513 | if (fullScreenMode) { | 512 | if (fullScreenMode) { | ||
514 | d->mThumbnailBarVisibleBeforeFullScreen = d->mToggleThumbnailBarAction->isChecked(); | 513 | d->mThumbnailBar->setVisible(false); | ||
515 | if (d->mThumbnailBarVisibleBeforeFullScreen) { | | |||
516 | d->mToggleThumbnailBarAction->trigger(); | | |||
517 | } | | |||
518 | } else { | 514 | } else { | ||
519 | if (d->mThumbnailBarVisibleBeforeFullScreen) { | 515 | d->mThumbnailBar->setVisible(d->mToggleThumbnailBarAction->isChecked()); | ||
520 | d->mToggleThumbnailBarAction->trigger(); | | |||
521 | } | | |||
522 | } | 516 | } | ||
523 | d->applyPalette(fullScreenMode); | 517 | d->applyPalette(fullScreenMode); | ||
524 | d->mToggleThumbnailBarAction->setEnabled(!fullScreenMode); | 518 | d->mToggleThumbnailBarAction->setEnabled(!fullScreenMode); | ||
525 | } | 519 | } | ||
526 | 520 | | |||
527 | bool ViewMainPage::isFullScreenMode() const | 521 | bool ViewMainPage::isFullScreenMode() const | ||
528 | { | 522 | { | ||
529 | return d->mFullScreenMode; | 523 | return d->mFullScreenMode; | ||
▲ Show 20 Lines • Show All 287 Lines • Show Last 20 Lines |
Still there ;)