From 1520874dfaec81b5cbfdeacebc9eb8c158c20c0c Mon Sep 17 00:00:00 2001
From: Dirk Wilden <wilden@gmail.com>
Date: Wed, 5 Aug 2009 08:36:18 +0000
Subject: [PATCH] changed viewMode to viewerLayout to remove ambiguity
git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@6740 383ad7c9-94d9-4d36-a494-682f7c89f535
---
Core/optionHandling.cc | 2 +-
widgets/coreWidget/CoreWidget.cc | 48 +++++++++++++++----------------
widgets/coreWidget/CoreWidget.hh | 8 +++---
widgets/coreWidget/keyHandling.cc | 2 +-
4 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/Core/optionHandling.cc b/Core/optionHandling.cc
index 736f5123..807eaadd 100644
--- a/Core/optionHandling.cc
+++ b/Core/optionHandling.cc
@@ -117,7 +117,7 @@ void Core::applyOptions(){
}
if ( OpenFlipper::Options::multiView() )
- coreWidget_->setViewMode( OpenFlipper::Options::defaultViewerLayout() );
+ coreWidget_->setViewerLayout( OpenFlipper::Options::defaultViewerLayout() );
//set defaultBackgroundColor
QColor c = OpenFlipper::Options::defaultBackgroundColor() ;
diff --git a/widgets/coreWidget/CoreWidget.cc b/widgets/coreWidget/CoreWidget.cc
index a502286e..ae1a00da 100644
--- a/widgets/coreWidget/CoreWidget.cc
+++ b/widgets/coreWidget/CoreWidget.cc
@@ -385,29 +385,29 @@ CoreWidget( QVector<ViewMode*>& _viewModes,
connect( questionButton_,SIGNAL( clicked() ), this, SLOT( setQuestionMode() ) );
viewerToolbar_->addWidget( questionButton_)->setText(tr("Question"));
- viewmodeBox_ = new QComboBox( viewerToolbar_ );
- viewmodeBox_->setMinimumSize( 32, 16 );
- viewmodeBox_->setMaximumSize( 64, 32 );
- viewmodeBox_->setToolTip(tr("Switch <b>view mode</b>."));
- viewmodeBox_->setWhatsThis(tr(
- "Switch <b>view mode</b>.<br>"
- "Select the desired view mode. "
- "Possible modes are: "
+ viewerLayoutBox_ = new QComboBox( viewerToolbar_ );
+ viewerLayoutBox_->setMinimumSize( 32, 16 );
+ viewerLayoutBox_->setMaximumSize( 64, 32 );
+ viewerLayoutBox_->setToolTip(tr("Switch <b>viewer layout</b>."));
+ viewerLayoutBox_->setWhatsThis(tr(
+ "Switch <b>viewer layout</b>.<br>"
+ "Select the desired viewer layout. "
+ "Possible layouts are: "
"<ul> "
- "<li>Single view mode</li>"
- "<li>Multi view mode (grid)</li>"
- "<li>Multi view mode (hsplit)</li>"
+ "<li>Single viewer</li>"
+ "<li>Multiple viewers (grid)</li>"
+ "<li>Multiple viewers (hsplit)</li>"
"</ul>"));
- viewmodeBox_->addItem(QIcon(OpenFlipper::Options::iconDirStr()+OpenFlipper::Options::dirSeparator()+"singleviewmode.png"), "");
- viewmodeBox_->addItem(QIcon(OpenFlipper::Options::iconDirStr()+OpenFlipper::Options::dirSeparator()+"multiviewmode1.png"), "");
- viewmodeBox_->addItem(QIcon(OpenFlipper::Options::iconDirStr()+OpenFlipper::Options::dirSeparator()+"multiviewmode2.png"), "");
+ viewerLayoutBox_->addItem(QIcon(OpenFlipper::Options::iconDirStr()+OpenFlipper::Options::dirSeparator()+"singleviewmode.png"), "");
+ viewerLayoutBox_->addItem(QIcon(OpenFlipper::Options::iconDirStr()+OpenFlipper::Options::dirSeparator()+"multiviewmode1.png"), "");
+ viewerLayoutBox_->addItem(QIcon(OpenFlipper::Options::iconDirStr()+OpenFlipper::Options::dirSeparator()+"multiviewmode2.png"), "");
- viewmodeBox_->setIconSize(QSize(22,22));
+ viewerLayoutBox_->setIconSize(QSize(22,22));
- connect( viewmodeBox_,SIGNAL( activated(int) ), this, SLOT( setViewMode(int) ) );
+ connect( viewerLayoutBox_,SIGNAL( activated(int) ), this, SLOT( setViewerLayout(int) ) );
- viewerToolbar_->addWidget( viewmodeBox_ );
+ viewerToolbar_->addWidget( viewerLayoutBox_ );
viewerToolbar_->addSeparator();
@@ -796,10 +796,9 @@ void CoreWidget::showOptionsWidget() {
}
-void CoreWidget::nextViewMode() {
+void CoreWidget::nextViewerLayout() {
if (OpenFlipper::Options::multiView()) {
- emit log(tr("Switch MultiView mode"));
switch (baseLayout_->mode()) {
case QtMultiViewLayout::SingleView:
@@ -807,21 +806,21 @@ void CoreWidget::nextViewMode() {
baseLayout_->setMode(QtMultiViewLayout::Grid);
// Update combo box in the toolbar
- viewmodeBox_->setCurrentIndex(1);
+ viewerLayoutBox_->setCurrentIndex(1);
break;
case QtMultiViewLayout::Grid:
baseLayout_->setPrimary (PluginFunctions::activeExaminer ());
baseLayout_->setMode(QtMultiViewLayout::HSplit);
// Update combo box in the toolbar
- viewmodeBox_->setCurrentIndex(2);
+ viewerLayoutBox_->setCurrentIndex(2);
break;
case QtMultiViewLayout::HSplit:
baseLayout_->setPrimary (PluginFunctions::activeExaminer ());
baseLayout_->setMode(QtMultiViewLayout::SingleView);
// Update combo box in the toolbar
- viewmodeBox_->setCurrentIndex(0);
+ viewerLayoutBox_->setCurrentIndex(0);
break;
}
}
@@ -829,10 +828,9 @@ void CoreWidget::nextViewMode() {
void
-CoreWidget::setViewMode(int _idx) {
+CoreWidget::setViewerLayout(int _idx) {
if (OpenFlipper::Options::multiView()) {
- emit log(tr("Switch MultiView mode"));
switch (_idx) {
case 0:
@@ -848,6 +846,8 @@ CoreWidget::setViewMode(int _idx) {
baseLayout_->setMode(QtMultiViewLayout::HSplit);
break;
}
+
+ viewerLayoutBox_->setCurrentIndex(_idx);
}
}
diff --git a/widgets/coreWidget/CoreWidget.hh b/widgets/coreWidget/CoreWidget.hh
index 1c63ed8f..588df231 100644
--- a/widgets/coreWidget/CoreWidget.hh
+++ b/widgets/coreWidget/CoreWidget.hh
@@ -535,7 +535,7 @@ public:
QToolButton* pickButton_;
QToolButton* questionButton_;
- QComboBox* viewmodeBox_;
+ QComboBox* viewerLayoutBox_;
/** @} */
@@ -549,12 +549,12 @@ public:
void slotUpdateGlobalDrawMenu();
- /// Change view mode that was selected in the combo box
- void setViewMode(int _idx);
+ /// Change viewer layout that was selected in the combo box
+ void setViewerLayout(int _idx);
private slots:
/// Switches over to the next view mode
- void nextViewMode();
+ void nextViewerLayout();
/// Called when the global drawMode is selected
void slotGlobalDrawMenu(QAction * _action);
diff --git a/widgets/coreWidget/keyHandling.cc b/widgets/coreWidget/keyHandling.cc
index 6ab8ae10..80aa5098 100644
--- a/widgets/coreWidget/keyHandling.cc
+++ b/widgets/coreWidget/keyHandling.cc
@@ -596,7 +596,7 @@ void CoreWidget::coreKeyPressEvent (QKeyEvent* _e){
break;
case Qt::Key_Space:
- nextViewMode();
+ nextViewerLayout();
break;
case Qt::Key_Shift :
--
GitLab