1.1 --- a/mainwindow.cpp Fri Jun 29 15:12:04 2007 +0000
1.2 +++ b/mainwindow.cpp Mon Jul 23 12:42:02 2007 +0000
1.3 @@ -202,9 +202,9 @@
1.4 settings.setValue( "/version/builddate", vymBuildDate );
1.5
1.6 settings.setValue( "/mapeditor/autosave/use",actionSettingsAutosaveToggle->isOn() );
1.7 - settings.setValue( "/mapeditor/editmode/autoSelectHeading",actionSettingsAutoSelectHeading->isOn() );
1.8 + settings.setValue( "/mapeditor/editmode/autoSelectNewBranch",actionSettingsAutoSelectNewBranch->isOn() );
1.9 settings.setValue( "/mapeditor/editmode/autoSelectText",actionSettingsAutoSelectText->isOn() );
1.10 - settings.setValue( "/mapeditor/editmode/autoEdit",actionSettingsAutoEdit->isOn() );
1.11 + settings.setValue( "/mapeditor/editmode/autoEditNewBranch",actionSettingsAutoEditNewBranch->isOn() );
1.12 settings.setValue( "/mapeditor/editmode/useDelKey",actionSettingsUseDelKey->isOn() );
1.13 settings.setValue( "/mapeditor/editmode/useFlagGroups",actionSettingsUseFlagGroups->isOn() );
1.14 settings.setValue( "/export/useHideExport",actionSettingsUseHideExport->isOn() );
1.15 @@ -1451,16 +1451,16 @@
1.16 a = new QAction( tr( "Edit branch after adding it","Settings action" ), this );
1.17 a->setStatusTip( tr( "Edit branch after adding it" ));
1.18 a->setToggleAction(true);
1.19 - a->setOn ( settings.value ("/mapeditor/editmode/autoEdit",true).toBool());
1.20 + a->setOn ( settings.value ("/mapeditor/editmode/autoEditNewBranch",true).toBool());
1.21 settingsMenu->addAction (a);
1.22 - actionSettingsAutoEdit=a;
1.23 + actionSettingsAutoEditNewBranch=a;
1.24
1.25 a= new QAction( tr( "Select branch after adding it","Settings action" ), this );
1.26 a->setStatusTip( tr( "Select branch after adding it" ));
1.27 a->setToggleAction(true);
1.28 - a->setOn ( settings.value ("/mapeditor/editmode/autoSelectHeading",false).toBool() );
1.29 + a->setOn ( settings.value ("/mapeditor/editmode/autoSelectNewBranch",false).toBool() );
1.30 settingsMenu->addAction (a);
1.31 - actionSettingsAutoSelectHeading=a;
1.32 + actionSettingsAutoSelectNewBranch=a;
1.33
1.34 a= new QAction(tr( "Select existing heading","Settings action" ), this);
1.35 a->setStatusTip( tr( "Select heading before editing" ));
1.36 @@ -2726,7 +2726,9 @@
1.37 lineedit->hide();
1.38 setFocus();
1.39 #endif
1.40 - if (!prevSelection.isEmpty()) me->select(prevSelection);
1.41 + if (!actionSettingsAutoSelectNewBranch->isOn() &&
1.42 + !prevSelection.isEmpty())
1.43 + me->select(prevSelection);
1.44 prevSelection="";
1.45 }
1.46 }
1.47 @@ -2898,15 +2900,11 @@
1.48 else
1.49 return;
1.50
1.51 - if (actionSettingsAutoEdit->isOn())
1.52 + if (actionSettingsAutoEditNewBranch->isOn())
1.53 {
1.54 editHeading();
1.55 return;
1.56 }
1.57 - /*
1.58 - if (!actionSettingsAutoSelectHeading->isOn())
1.59 - me->select(bo->getSelectString());
1.60 - */
1.61 if (!prevSelection.isEmpty())
1.62 {
1.63 me->select(prevSelection);
1.64 @@ -2929,9 +2927,9 @@
1.65 else
1.66 return;
1.67
1.68 - if (actionSettingsAutoEdit->isOn())
1.69 + if (actionSettingsAutoEditNewBranch->isOn())
1.70 {
1.71 - if (!actionSettingsAutoSelectHeading->isOn())
1.72 + if (!actionSettingsAutoSelectNewBranch->isOn())
1.73 prevSelection=bo->getSelectString();
1.74 editHeading();
1.75 }
1.76 @@ -2951,9 +2949,9 @@
1.77 else
1.78 return;
1.79
1.80 - if (actionSettingsAutoEdit->isOn())
1.81 + if (actionSettingsAutoEditNewBranch->isOn())
1.82 {
1.83 - if (!actionSettingsAutoSelectHeading->isOn())
1.84 + if (!actionSettingsAutoSelectNewBranch->isOn())
1.85 prevSelection=bo->getSelectString();
1.86 editHeading();
1.87 }
1.88 @@ -2973,9 +2971,9 @@
1.89 else
1.90 return;
1.91
1.92 - if (actionSettingsAutoEdit->isOn())
1.93 + if (actionSettingsAutoEditNewBranch->isOn())
1.94 {
1.95 - if (!actionSettingsAutoSelectHeading->isOn())
1.96 + if (!actionSettingsAutoSelectNewBranch->isOn())
1.97 prevSelection=bo->getSelectString();
1.98 editHeading();
1.99 }
1.100 @@ -3580,14 +3578,14 @@
1.101 return ModModeNone;
1.102 }
1.103
1.104 -bool Main::autoEdit()
1.105 +bool Main::autoEditNewBranch()
1.106 {
1.107 - return actionSettingsAutoEdit->isOn();
1.108 + return actionSettingsAutoEditNewBranch->isOn();
1.109 }
1.110
1.111 -bool Main::autoSelectHeading()
1.112 +bool Main::autoSelectNewBranch()
1.113 {
1.114 - return actionSettingsAutoSelectHeading->isOn();
1.115 + return actionSettingsAutoSelectNewBranch->isOn();
1.116 }
1.117
1.118 bool Main::useFlagGroups()
1.119 @@ -3684,7 +3682,7 @@
1.120 QStringList searchList;
1.121 QDir docdir;
1.122 #if defined(Q_OS_MACX)
1.123 - searchList << "./vym.app/Contents";
1.124 + searchList << "./vym.app/Contents/Resources/doc";
1.125 #else
1.126 // default path in SUSE LINUX
1.127 searchList <<"/usr/share/doc/packages/vym/doc";